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

Merge pull request #479 from SamR1/minor-fixes-and-improvements

Browse Source 
Minor fixes and improvements
This commit is contained in:
Sam
2024-01-06 16:04:17 +01:00
committed by GitHub
parent 07e9a3c840 7272d2c5c0
commit acb0cb6cff
7 changed files with 64 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fittrackee/dist/index.html vendored
View File

@@ -7,11 +7,11 @@
<link rel="stylesheet" href="/static/css/fork-awesome.min.css"/> <link rel="stylesheet" href="/static/css/fork-awesome.min.css"/>
<link rel="stylesheet" href="/static/css/leaflet.css"/> <link rel="stylesheet" href="/static/css/leaflet.css"/>
<title>FitTrackee</title> <title>FitTrackee</title>
<script type="module" crossorigin src="/static/index-BA6z0v4S.js"></script> <script type="module" crossorigin src="/static/index-yGgqHaCO.js"></script>
<link rel="modulepreload" crossorigin href="/static/charts-_RwsDDkL.js"> <link rel="modulepreload" crossorigin href="/static/charts-_RwsDDkL.js">
<link rel="modulepreload" crossorigin href="/static/maps-ZyuCPqes.js"> <link rel="modulepreload" crossorigin href="/static/maps-ZyuCPqes.js">
<link rel="stylesheet" crossorigin href="/static/css/maps-B7qTrBCW.css"> <link rel="stylesheet" crossorigin href="/static/css/maps-B7qTrBCW.css">
<link rel="stylesheet" crossorigin href="/static/css/index-7UpHGdf8.css"> <link rel="stylesheet" crossorigin href="/static/css/index-OmPmue5R.css">
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>

1
fittrackee/dist/static/css/index-7UpHGdf8.css vendored
View File

File diff suppressed because one or more lines are too long

1
fittrackee/dist/static/css/index-OmPmue5R.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

88
fittrackee/dist/static/index-BA6z0v4S.js → fittrackee/dist/static/index-yGgqHaCO.js vendored
View File

File diff suppressed because one or more lines are too long

10
fittrackee_client/src/components/NavBar.vue
View File

@@ -10,7 +10,7 @@
/> />
<div class="nav-container"> <div class="nav-container">
<div class="nav-app-name"> <div class="nav-app-name">
<div class="nav-item app-name">FitTrackee</div> <router-link class="nav-item app-name" to="/"> FitTrackee </router-link>
</div> </div>
<div class="nav-icon-open" :class="{ 'menu-open': isMenuOpen }"> <div class="nav-icon-open" :class="{ 'menu-open': isMenuOpen }">
<button class="menu-button transparent" @click="openMenu()"> <button class="menu-button transparent" @click="openMenu()">
@@ -19,7 +19,9 @@
</div> </div>
<div class="nav-items" :class="{ 'menu-open': isMenuOpen }"> <div class="nav-items" :class="{ 'menu-open': isMenuOpen }">
<div class="nav-items-close"> <div class="nav-items-close">
<div class="app-name">FitTrackee</div> <router-link class="nav-item app-name" to="/">
FitTrackee
</router-link>
<button class="menu-button transparent" @click="closeMenu()"> <button class="menu-button transparent" @click="closeMenu()">
<i <i
class="fa fa-close close-icon nav-item" class="fa fa-close close-icon nav-item"
@@ -220,10 +222,14 @@
&.router-link-exact-active { &.router-link-exact-active {
color: var(--nav-bar-link-active); color: var(--nav-bar-link-active);
font-weight: bold; font-weight: bold;
&.app-name {
color: var(--app-color);
}
} }
} }
.app-name { .app-name {
color: var(--app-color);
font-size: 1.2em; font-size: 1.2em;
font-weight: bold; font-weight: bold;
margin-right: 10px; margin-right: 10px;

3
fittrackee_client/src/components/User/ProfileEdition/UserPreferencesEdition.vue
View File

@@ -369,6 +369,9 @@
border-bottom: 1px solid var(--card-border-color); border-bottom: 1px solid var(--card-border-color);
margin-bottom: $default-padding * 0.5; margin-bottom: $default-padding * 0.5;
} }
.preferences-section:not(:first-child) {
margin-top: $default-padding * 1.5;
}
#language, #language,
#date_format, #date_format,

7
fittrackee_client/src/components/User/ProfileEdition/UserPrivacyPolicyValidation.vue
View File

@@ -13,7 +13,7 @@
{{ $t('user.PROFILE.BACK_TO_PROFILE') }} {{ $t('user.PROFILE.BACK_TO_PROFILE') }}
</button> </button>
</div> </div>
<form v-else @submit.prevent="onSubmit()"> <form v-else :class="{ errors: formErrors }" @submit.prevent="onSubmit()">
<div class="policy-content"> <div class="policy-content">
<PrivacyPolicy /> <PrivacyPolicy />
</div> </div>
@@ -23,6 +23,7 @@
id="accepted_policy" id="accepted_policy"
required required
v-model="acceptedPolicy" v-model="acceptedPolicy"
@invalid="invalidateForm"
/> />
<span> <span>
<i18n-t keypath="user.READ_AND_ACCEPT_PRIVACY_POLICY"> <i18n-t keypath="user.READ_AND_ACCEPT_PRIVACY_POLICY">
@@ -66,6 +67,7 @@
() => store.getters[ROOT_STORE.GETTERS.ERROR_MESSAGES] () => store.getters[ROOT_STORE.GETTERS.ERROR_MESSAGES]
) )
const acceptedPolicy = ref(false) const acceptedPolicy = ref(false)
const formErrors = ref(false)
function onSubmit() { function onSubmit() {
store.dispatch( store.dispatch(
@@ -73,6 +75,9 @@
acceptedPolicy.value acceptedPolicy.value
) )
} }
function invalidateForm() {
formErrors.value = true
}
onUnmounted(() => { onUnmounted(() => {
store.commit(ROOT_STORE.MUTATIONS.EMPTY_ERROR_MESSAGES) store.commit(ROOT_STORE.MUTATIONS.EMPTY_ERROR_MESSAGES)