mirror of
https://github.com/joaovitoriasilva/endurain.git
synced 2026-01-10 08:17:59 -05:00
Added unspecified gender
[frontend] added unspecified gender [frontend] bumped version [backend] bumped version [backend] added unspecified gender comment to gender column in user models
This commit is contained in:
@@ -3,7 +3,7 @@ import os
|
||||
import core.logger as core_logger
|
||||
|
||||
# Constant related to version
|
||||
API_VERSION = "v0.10.2"
|
||||
API_VERSION = "v0.10.3"
|
||||
LICENSE_NAME = "GNU Affero General Public License v3.0 or later"
|
||||
LICENSE_IDENTIFIER = "AGPL-3.0-or-later"
|
||||
LICENSE_URL = "https://spdx.org/licenses/AGPL-3.0-or-later.html"
|
||||
|
||||
@@ -48,7 +48,7 @@ class User(Base):
|
||||
Integer,
|
||||
nullable=False,
|
||||
default=1,
|
||||
comment="User gender (one digit)(1 - male, 2 - female)",
|
||||
comment="User gender (one digit)(1 - male, 2 - female, 3 - unspecified)",
|
||||
)
|
||||
units = Column(
|
||||
Integer,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[tool.poetry]
|
||||
name = "endurain"
|
||||
version = "0.10.2"
|
||||
version = "0.10.3"
|
||||
description = "Endurain API for the Endurain app"
|
||||
authors = ["João Vitória Silva <8648976+joaovitoriasilva@users.noreply.github.com>"]
|
||||
readme = "README.md"
|
||||
|
||||
4
frontend/app/package-lock.json
generated
4
frontend/app/package-lock.json
generated
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "endurain",
|
||||
"version": "0.10.2",
|
||||
"version": "0.10.3",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "endurain",
|
||||
"version": "0.10.2",
|
||||
"version": "0.10.3",
|
||||
"dependencies": {
|
||||
"@fortawesome/fontawesome-svg-core": "^6.7.1",
|
||||
"@fortawesome/free-brands-svg-icons": "^6.7.1",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "endurain",
|
||||
"version": "0.10.2",
|
||||
"version": "0.10.3",
|
||||
"private": true,
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
|
||||
BIN
frontend/app/src/assets/avatar/unspecified1.png
Normal file
BIN
frontend/app/src/assets/avatar/unspecified1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.3 MiB |
@@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<footer class="py-5 bg-body-tertiary">
|
||||
<div class="container">
|
||||
<p class="text-center text-muted">© {{ new Date().getFullYear() === 2023 ? '2023' : '2023 - ' + new Date().getFullYear() }} Endurain • <a class="link-body-emphasis" href="https://github.com/joaovitoriasilva/endurain" role="button"><font-awesome-icon :icon="['fab', 'fa-github']" /></a> • <a class="link-body-emphasis" href="https://docs.endurain.com"><font-awesome-icon :icon="['fas', 'book']" /></a> • <a class="link-body-emphasis" href="https://fosstodon.org/@endurain"><font-awesome-icon :icon="['fab', 'fa-mastodon']" /></a> • v0.10.2</p>
|
||||
<p class="text-center text-muted">© {{ new Date().getFullYear() === 2023 ? '2023' : '2023 - ' + new Date().getFullYear() }} Endurain • <a class="link-body-emphasis" href="https://github.com/joaovitoriasilva/endurain" role="button"><font-awesome-icon :icon="['fab', 'fa-github']" /></a> • <a class="link-body-emphasis" href="https://docs.endurain.com"><font-awesome-icon :icon="['fas', 'book']" /></a> • <a class="link-body-emphasis" href="https://fosstodon.org/@endurain"><font-awesome-icon :icon="['fab', 'fa-mastodon']" /></a> • v0.10.3</p>
|
||||
<p class="text-center text-muted"><img src="/src/assets/strava/api_logo_cptblWith_strava_horiz_light.png" alt="Compatible with STRAVA image" height="25" /> • <img src="/src/assets/garminconnect/Garmin_connect_badge_print_RESOURCE_FILE-01.png" alt="Works with Garmin Connect image" height="25" /></p>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
@@ -54,10 +54,12 @@
|
||||
<!-- user gender -->
|
||||
<p>
|
||||
<font-awesome-icon :icon="['fas', 'mars']" class="me-2" v-if="authStore.user.gender == 1"/>
|
||||
<font-awesome-icon :icon="['fas', 'venus']" class="me-2" v-else/>
|
||||
<font-awesome-icon :icon="['fas', 'venus']" class="me-2" v-else-if="authStore.user.gender == 2"/>
|
||||
<font-awesome-icon :icon="['fas', 'genderless']" class="me-2" v-else/>
|
||||
<b>{{ $t("settingsUserProfileZone.genderLabel") }}: </b>
|
||||
<span v-if="authStore.user.gender == 1">{{ $t("settingsUserProfileZone.genderOption1") }}</span>
|
||||
<span v-else>{{ $t("settingsUserProfileZone.genderOption2") }}</span>
|
||||
<span v-else-if="authStore.user.gender == 2">{{ $t("settingsUserProfileZone.genderOption2") }}</span>
|
||||
<span v-else>{{ $t("settingsUserProfileZone.genderOption3") }}</span>
|
||||
</p>
|
||||
<!-- user units -->
|
||||
<p>
|
||||
|
||||
@@ -64,6 +64,7 @@
|
||||
<select class="form-select" name="userGenderAddEdit" v-model="newEditUserGender" required>
|
||||
<option :value="1">{{ $t("usersAddEditUserModalComponent.addEditUserModalGenderOption1") }}</option>
|
||||
<option :value="2">{{ $t("usersAddEditUserModalComponent.addEditUserModalGenderOption2") }}</option>
|
||||
<option :value="3">{{ $t("usersAddEditUserModalComponent.addEditUserModalGenderOption3") }}</option>
|
||||
</select>
|
||||
<!-- units fields -->
|
||||
<label for="userUnitsAddEdit"><b>* {{ $t("usersAddEditUserModalComponent.addEditUserModalUnitsLabel") }}</b></label>
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
<template>
|
||||
<img :src="userPhotoUrl" :alt="altText" :width="width" :height="height" class="rounded-circle" :class="{ 'align-top': alignTopValue == 2 }" v-if="user && user.photo_path">
|
||||
<img src="/src/assets/avatar/male1.png" alt="Default Female Avatar" :width="width" :height="height" class="rounded-circle" :class="{ 'align-top': alignTopValue == 2 }" v-else-if="(user && !user.photo_path && user.gender === 1) || !user">
|
||||
<img src="/src/assets/avatar/female1.png" alt="Default Male Avatar" :width="width" :height="height" class="rounded-circle" :class="{ 'align-top': alignTopValue == 2 }" v-else-if="(user && !user.photo_path && user.gender === 2) || !user">
|
||||
<img src="/src/assets/avatar/male1.png" alt="Default Female Avatar" :width="width" :height="height" class="rounded-circle" :class="{ 'align-top': alignTopValue == 2 }" v-else>
|
||||
<img src="/src/assets/avatar/unspecified1.png" alt="Default Unspecified Avatar" :width="width" :height="height" class="rounded-circle" :class="{ 'align-top': alignTopValue == 2 }" v-else>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
"genderLabel": "Gender",
|
||||
"genderOption1": "Male",
|
||||
"genderOption2": "Female",
|
||||
"genderOption3": "Unspecified",
|
||||
"unitsLabel": "Units",
|
||||
"unitsOption1": "Metric",
|
||||
"unitsOption2": "Imperial",
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
"addEditUserModalGenderLabel": "Gender",
|
||||
"addEditUserModalGenderOption1": "Male",
|
||||
"addEditUserModalGenderOption2": "Female",
|
||||
"addEditUserModalGenderOption3": "Unspecified",
|
||||
"addEditUserModalUnitsLabel": "Units",
|
||||
"addEditUserModalUnitsOption1": "Metric",
|
||||
"addEditUserModalUnitsOption2": "Imperial",
|
||||
|
||||
Reference in New Issue
Block a user