Alexander/FitTrackee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Client - add links to register/login below login/register form

Browse Source
This commit is contained in:
Sam 2021-11-06 18:24:53 +01:00
parent 4765064042
commit bc81c94988
21 changed files with 44 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fittrackee/dist/index.html vendored
View File

@ -1 +1 @@
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><!--[if IE]><link rel="icon" href="/favicon.ico"><![endif]--><link rel="stylesheet" href="/static/css/fork-awesome.min.css"><link rel="stylesheet" href="/static/css/leaflet.css"><title>FitTrackee</title><link href="/static/css/admin.9f104fd3.css" rel="prefetch"><link href="/static/css/main.193b6e89.css" rel="prefetch"><link href="/static/css/main~workouts.539c93e4.css" rel="prefetch"><link href="/static/css/profile.1e84a078.css" rel="prefetch"><link href="/static/css/reset.b58d9cb4.css" rel="prefetch"><link href="/static/css/workouts.0c5cfad5.css" rel="prefetch"><link href="/static/js/admin.4f80b9a8.js" rel="prefetch"><link href="/static/js/chunk-2d0c9189.c81458cc.js" rel="prefetch"><link href="/static/js/chunk-2d0cf391.020c75ea.js" rel="prefetch"><link href="/static/js/chunk-2d0da8f3.c8c3e7e8.js" rel="prefetch"><link href="/static/js/chunk-2d2248b6.d84473c1.js" rel="prefetch"><link href="/static/js/chunk-2d22523a.4b710d99.js" rel="prefetch"><link href="/static/js/main.a0127c7a.js" rel="prefetch"><link href="/static/js/main~workouts.896585f2.js" rel="prefetch"><link href="/static/js/profile.459d43b2.js" rel="prefetch"><link href="/static/js/reset.ac1dbf71.js" rel="prefetch"><link href="/static/js/workouts.8d9e217b.js" rel="prefetch"><link href="/static/css/app.6a674693.css" rel="preload" as="style"><link href="/static/js/app.f8c1d4ae.js" rel="preload" as="script"><link href="/static/js/chunk-vendors.61765c73.js" rel="preload" as="script"><link href="/static/css/app.6a674693.css" rel="stylesheet"><link rel="icon" type="image/png" sizes="32x32" href="/img/icons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/img/icons/favicon-16x16.png"><link rel="manifest" href="/manifest.json"><meta name="theme-color" content="#4DBA87"><meta name="apple-mobile-web-app-capable" content="no"><meta name="apple-mobile-web-app-status-bar-style" content="default"><meta name="apple-mobile-web-app-title" content="fittrackee_client"><link rel="apple-touch-icon" href="/img/icons/apple-touch-icon-152x152.png"><link rel="mask-icon" href="/img/icons/safari-pinned-tab.svg" color="#4DBA87"><meta name="msapplication-TileImage" content="/img/icons/msapplication-icon-144x144.png"><meta name="msapplication-TileColor" content="#000000"></head><body><noscript><strong>We're sorry but FitTrackee doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/static/js/chunk-vendors.61765c73.js"></script><script src="/static/js/app.f8c1d4ae.js"></script></body></html>
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><!--[if IE]><link rel="icon" href="/favicon.ico"><![endif]--><link rel="stylesheet" href="/static/css/fork-awesome.min.css"><link rel="stylesheet" href="/static/css/leaflet.css"><title>FitTrackee</title><link href="/static/css/admin.9f104fd3.css" rel="prefetch"><link href="/static/css/main.37fe4113.css" rel="prefetch"><link href="/static/css/main~workouts.539c93e4.css" rel="prefetch"><link href="/static/css/profile.1e84a078.css" rel="prefetch"><link href="/static/css/reset.d2d36969.css" rel="prefetch"><link href="/static/css/workouts.0c5cfad5.css" rel="prefetch"><link href="/static/js/admin.4f80b9a8.js" rel="prefetch"><link href="/static/js/chunk-2d0c9189.c81458cc.js" rel="prefetch"><link href="/static/js/chunk-2d0cf391.020c75ea.js" rel="prefetch"><link href="/static/js/chunk-2d0da8f3.c8c3e7e8.js" rel="prefetch"><link href="/static/js/chunk-2d2248b6.d84473c1.js" rel="prefetch"><link href="/static/js/chunk-2d22523a.4b710d99.js" rel="prefetch"><link href="/static/js/main.2b9e3dee.js" rel="prefetch"><link href="/static/js/main~workouts.896585f2.js" rel="prefetch"><link href="/static/js/profile.459d43b2.js" rel="prefetch"><link href="/static/js/reset.8adc8d46.js" rel="prefetch"><link href="/static/js/workouts.8d9e217b.js" rel="prefetch"><link href="/static/css/app.6a674693.css" rel="preload" as="style"><link href="/static/js/app.88680240.js" rel="preload" as="script"><link href="/static/js/chunk-vendors.61765c73.js" rel="preload" as="script"><link href="/static/css/app.6a674693.css" rel="stylesheet"><link rel="icon" type="image/png" sizes="32x32" href="/img/icons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/img/icons/favicon-16x16.png"><link rel="manifest" href="/manifest.json"><meta name="theme-color" content="#4DBA87"><meta name="apple-mobile-web-app-capable" content="no"><meta name="apple-mobile-web-app-status-bar-style" content="default"><meta name="apple-mobile-web-app-title" content="fittrackee_client"><link rel="apple-touch-icon" href="/img/icons/apple-touch-icon-152x152.png"><link rel="mask-icon" href="/img/icons/safari-pinned-tab.svg" color="#4DBA87"><meta name="msapplication-TileImage" content="/img/icons/msapplication-icon-144x144.png"><meta name="msapplication-TileColor" content="#000000"></head><body><noscript><strong>We're sorry but FitTrackee doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/static/js/chunk-vendors.61765c73.js"></script><script src="/static/js/app.88680240.js"></script></body></html>

24
fittrackee/dist/precache-manifest.e160be091aaedbd3e755a2b0384e4a2a.js → fittrackee/dist/precache-manifest.dc67090435b223d2598cd1d6380e6a40.js vendored
View File

@ -64,7 +64,7 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "/img/workouts/mountains.svg"
},
{
"revision": "16918c7bc7e9e951de0d67968fc42c13",
"revision": "0f701b46724b878bacb40b61b91b4162",
"url": "/index.html"
},
{
@ -80,7 +80,7 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "/static/css/admin.9f104fd3.css"
},
{
"revision": "f68d30a28e82808aefcf",
"revision": "5e29eadb778e369ca91b",
"url": "/static/css/app.6a674693.css"
},
{
@ -92,8 +92,8 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "/static/css/leaflet.css"
},
{
"revision": "9d4e907e4ecf135246bd",
"url": "/static/css/main.193b6e89.css"
"revision": "ce9711136bd312e20159",
"url": "/static/css/main.37fe4113.css"
},
{
"revision": "1bb79b46d79d1d317530",
@ -104,8 +104,8 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "/static/css/profile.1e84a078.css"
},
{
"revision": "1cf5eba19d75171de9f1",
"url": "/static/css/reset.b58d9cb4.css"
"revision": "07d0f54ecab2e0bd8eee",
"url": "/static/css/reset.d2d36969.css"
},
{
"revision": "4ffc14773cab41b5e035",
@ -196,8 +196,8 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "/static/js/admin.4f80b9a8.js"
},
{
"revision": "f68d30a28e82808aefcf",
"url": "/static/js/app.f8c1d4ae.js"
"revision": "5e29eadb778e369ca91b",
"url": "/static/js/app.88680240.js"
},
{
"revision": "bd7d183c9f68e5f4027d",
@ -224,8 +224,8 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "/static/js/chunk-vendors.61765c73.js"
},
{
"revision": "9d4e907e4ecf135246bd",
"url": "/static/js/main.a0127c7a.js"
"revision": "ce9711136bd312e20159",
"url": "/static/js/main.2b9e3dee.js"
},
{
"revision": "1bb79b46d79d1d317530",
@ -236,8 +236,8 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "/static/js/profile.459d43b2.js"
},
{
"revision": "1cf5eba19d75171de9f1",
"url": "/static/js/reset.ac1dbf71.js"
"revision": "07d0f54ecab2e0bd8eee",
"url": "/static/js/reset.8adc8d46.js"
},
{
"revision": "4ffc14773cab41b5e035",

2
fittrackee/dist/service-worker.js vendored
View File

@ -14,7 +14,7 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
importScripts(
"/precache-manifest.e160be091aaedbd3e755a2b0384e4a2a.js"
"/precache-manifest.dc67090435b223d2598cd1d6380e6a40.js"
);
workbox.core.setCacheNameDetails({prefix: "fittrackee_client"});

2
fittrackee/dist/static/css/main.193b6e89.css → fittrackee/dist/static/css/main.37fe4113.css vendored
View File

File diff suppressed because one or more lines are too long

1
fittrackee/dist/static/css/reset.b58d9cb4.css vendored
View File

File diff suppressed because one or more lines are too long

1
fittrackee/dist/static/css/reset.d2d36969.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
fittrackee/dist/static/js/app.88680240.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
fittrackee/dist/static/js/app.88680240.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
fittrackee/dist/static/js/app.f8c1d4ae.js vendored
View File

File diff suppressed because one or more lines are too long

1
fittrackee/dist/static/js/app.f8c1d4ae.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
fittrackee/dist/static/js/main.2b9e3dee.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
fittrackee/dist/static/js/main.2b9e3dee.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
fittrackee/dist/static/js/main.a0127c7a.js vendored
View File

File diff suppressed because one or more lines are too long

1
fittrackee/dist/static/js/main.a0127c7a.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
fittrackee/dist/static/js/reset.8adc8d46.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
fittrackee/dist/static/js/reset.8adc8d46.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
fittrackee/dist/static/js/reset.ac1dbf71.js vendored
View File

File diff suppressed because one or more lines are too long

1
fittrackee/dist/static/js/reset.ac1dbf71.js.map vendored
View File

File diff suppressed because one or more lines are too long

20
fittrackee_client/src/components/User/UserAuthForm.vue
View File

@ -66,10 +66,20 @@
</button>
</form>
<div v-if="action === 'login'">
<router-link class="password-forgotten" to="/password-reset/request">
<router-link class="links" to="/register">
{{ $t('user.REGISTER') }}
</router-link>
-
<router-link class="links" to="/password-reset/request">
{{ $t('user.PASSWORD_FORGOTTEN') }}
</router-link>
</div>
<div v-else>
<span class="account">{{ $t('user.ALREADY_HAVE_ACCOUNT') }}</span>
<router-link class="links" to="/login">
{{ $t('user.LOGIN') }}
</router-link>
</div>
<ErrorMessage :message="errorMessages" v-if="errorMessages" />
</div>
</div>
@ -198,10 +208,14 @@
#user-form {
width: 60%;
.password-forgotten {
.account {
font-size: 0.9em;
padding-left: $default-padding;
}
.links {
font-size: 0.9em;
font-style: italic;
padding-left: $default-padding;
padding: 0 $default-padding;
}
button {

1
fittrackee_client/src/locales/en/user.json
View File

@ -1,5 +1,6 @@
{
"ADMIN": "Admin",
"ALREADY_HAVE_ACCOUNT": "Already have an account?",
"CONFIRM_ACCOUNT_DELETION": "Are you sure you want to delete your account? All data will be deleted, this cannot be undone",
"EMAIL": "Email",
"ENTER_EMAIL": "Enter an email address",

1
fittrackee_client/src/locales/fr/user.json
View File

@ -1,5 +1,6 @@
{
"ADMIN": "Admin",
"ALREADY_HAVE_ACCOUNT": "Vous avez déjà un compte ?",
"CONFIRM_ACCOUNT_DELETION": "Etes-vous sûr de vouloir supprimer votre compte ? Toutes les données seront définitivement effacés.",
"EMAIL": "Email",
"ENTER_EMAIL": "Saisir une adresse email",