Skip to content
Snippets Groups Projects
Commit 58ac68e4 authored by moon's avatar moon
Browse files

Merge branch 'menu_font' into develop

parents 743f9847 4d7f42ad
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
web/src/components/Navigation/TheNavBar.vue
+ 20
− 20
View file @ 58ac68e4
......@@ -39,8 +39,8 @@
py-4
flex
items-center
text-3xl
font-medium
text-4xl
font-semibold
hover:text-pink-base
"
>Home</span>
......@@ -59,8 +59,8 @@
flex
items-center
hover:text-pink-base
text-3xl
font-medium
text-4xl
font-semibold
"
>About</span>
</router-link>
......@@ -78,8 +78,8 @@
flex
items-center
hover:text-pink-base
text-3xl
font-medium
text-4xl
font-semibold
leading-snug
"
>Proteins</span>
......@@ -104,8 +104,8 @@
flex
items-center
hover:text-pink-base
text-3xl
font-medium
text-4xl
font-semibold
leading-snug
"
>Condensates</span>
......@@ -140,8 +140,8 @@
text-black
hover:text-pink-base
items-center
text-3xl
font-medium
text-4xl
font-semibold
"
:class="
$route.name === 'biomolecular' ? 'text-pink-base' : ''
......@@ -163,8 +163,8 @@
hover:text-pink-base
flex
items-center
text-3xl
font-medium
text-4xl
font-semibold
"
:class="$route.name === 'synthetic' ? 'text-pink-base' : ''"
>Synthetic Condensates</span>
......@@ -190,8 +190,8 @@
hover:text-pink-base
flex
items-center
text-3xl
font-medium
text-4xl
font-semibold
"
:class="
$route.name === 'addCondensate' ? 'text-pink-base' : ''
......@@ -215,8 +215,8 @@
hover:text-pink-base
flex
items-center
text-3xl
font-medium
text-4xl
font-semibold
"
>Statistics</span>
</router-link>
......@@ -234,8 +234,8 @@
hover:text-pink-base
flex
items-center
text-3xl
font-medium
text-4xl
font-semibold
"
>Encyclopedia</span>
</a>
......@@ -253,8 +253,8 @@
hover:text-pink-base
flex
items-center
text-3xl
font-medium
text-4xl
font-semibold
"
>Help</span>
</router-link>
......
web/src/views/ForgotPassword.vue
+ 62
− 53
View file @ 58ac68e4
......@@ -24,7 +24,17 @@
</div>
</base-toaster>
<div class="flex items-center justify-center">
<div class="sm:block border border-gray-300 rounded-lg mt-6 w-1/3">
<div
class="
sm:block
border
bg-white bg-opacity-80
border-gray-300
rounded-lg
mt-6
w-1/3
"
>
<div class="p-5 mx-auto text-left">
<h1
class="
......@@ -93,7 +103,7 @@
{{ errorMsg }}
</p>
</div>
<button
type="submit"
class="
......@@ -176,65 +186,64 @@ export default {
// const res= this.axios.post(`${host}/api/auth/forgot-password`, {
// email: this.email.val
// })
try{
const res = await fetch(`${host}/api/auth/forgot-password`, {
method: 'POST',
mode: 'cors', // no-cors, *cors, same-origin
cache: 'no-cache', // *default, no-cache, reload, force-cache,
headers: {
'Content-Type': 'application/json',
// 'Content-Type': 'application/x-www-form-urlencoded',
},
body: JSON.stringify({
email: this.email.val,
}),
});
if(!res.ok){
this.isLoading = false;
this.error = true;
this.errorMsg = `${res.status} Internal Error, please write a mail to CDCode Admin`;
try {
const res = await fetch(`${host}/api/auth/forgot-password`, {
method: 'POST',
mode: 'cors', // no-cors, *cors, same-origin
cache: 'no-cache', // *default, no-cache, reload, force-cache,
headers: {
'Content-Type': 'application/json',
// 'Content-Type': 'application/x-www-form-urlencoded',
},
body: JSON.stringify({
email: this.email.val,
}),
});
if (!res.ok) {
this.isLoading = false;
this.error = true;
this.errorMsg = `${res.status} Internal Error, please write a mail to CDCode Admin`;
return;
}
if (!res.ok && res.status === 500) {
this.isLoading = false;
this.error = true;
this.errorMsg = `${res.status} Internal Error, please write a mail to CDCode Admin`;
return;
}
if (!res.ok && res.status === 500) {
this.isLoading = false;
this.error = true;
this.errorMsg = `${res.status} Internal Error, please write a mail to CDCode Admin`;
return;
}
if (!res.ok && res.status === 405) {
this.isLoading = false;
this.error = true;
this.errorMsg = `${res.status} Internal Error, please write a mail to CDCode Admin`;
return;
}
if (!res.ok && res.status === 405) {
this.isLoading = false;
this.error = true;
this.errorMsg = `${res.status} Internal Error, please write a mail to CDCode Admin`;
return;
}
const response = await res.json();
return;
}
const response = await res.json();
if (
!res.ok &&
response.error.status === 400 &&
response.error.message === 'This email does not exist'
) {
this.isLoading = false;
this.error = true;
this.errorMsg =
'Provided email address is not yet registered with any existing account (User has not signed up yet)';
if (
!res.ok &&
response.error.status === 400 &&
response.error.message === 'This email does not exist'
) {
this.isLoading = false;
this.error = true;
this.errorMsg =
'Provided email address is not yet registered with any existing account (User has not signed up yet)';
return;
}
return;
}
this.isLoading = false;
this.error= false;
this.toasterIsOpen = true;
}catch(err){
console.log(err);
this.isLoading = false;
this.isLoading = false;
this.error = false;
this.toasterIsOpen = true;
} catch (err) {
console.log(err);
this.isLoading = false;
this.error = true;
this.errorMsg = `Internal Error, please write a mail to CDCode Admin`;
}
}
},
},
};
......
web/src/views/Login.vue
+ 10
− 1
View file @ 58ac68e4
......@@ -4,7 +4,16 @@
<base-spinner />
</div>
<div class="flex items-center justify-center">
<div class="sm:block border border-gray-300 rounded-lg mt-6 w-1/3">
<div
class="
sm:block
border border-gray-300
bg-white bg-opacity-60
rounded-lg
mt-6
w-1/3
"
>
<div class="p-5 mx-auto text-left font-raleway">
<h1
class="
......
web/src/views/SignUp.vue
+ 1
− 0
View file @ 58ac68e4
......@@ -33,6 +33,7 @@
class="
sm:block
border border-gray-300
bg-white bg-opacity-75
rounded-lg
w-2/5
mt-6
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment