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

Minor fixes and improvements
This commit is contained in:
Sam 2024-01-06 16:04:17 +01:00 committed by GitHub
commit acb0cb6cff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 64 additions and 50 deletions

@ -7,11 +7,11 @@
<link rel="stylesheet" href="/static/css/fork-awesome.min.css"/>
<link rel="stylesheet" href="/static/css/leaflet.css"/>
<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/maps-ZyuCPqes.js">
<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>
<body>
<div id="app"></div>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

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

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

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