YunoHost-Apps/fittrackee_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/fittrackee_ynh.git synced 2024-09-03 18:36:16 +02:00
Code Issues Activity Actions

Merge pull request #47 from YunoHost-Apps/testing

Browse source 
Upgrade to 0.7.27 and fix #44
This commit is contained in:
Thomas 2023-12-21 10:05:37 +01:00 committed by GitHub
commit 33f7a78c70
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 47 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -20,7 +20,7 @@ FitTrackee allows you to track your outdoor activities (workouts) from gpx files
No mobile app has been developed yet, but several existing mobile apps can store workouts data locally and export them into a gpx file.
**Shipped version:** 0.7.26~ynh1
**Shipped version:** 0.7.27~ynh1
## Screenshots

2
README_fr.md
View file

@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
FitTrackee vous permet de suivre vos activités de plein air (séances d'entraînement) à partir de fichiers gpx et de conserver vos données sur votre propre serveur.
Aucune application mobile n'a encore été développée, mais plusieurs applications mobiles existantes peuvent stocker localement les données des séances d'entraînement et les exporter dans un fichier gpx.
**Version incluse :** 0.7.26~ynh1
**Version incluse :** 0.7.27~ynh1
## Captures d’écran

4
conf/.env.production
View file

@ -36,6 +36,6 @@ STATICMAP_SUBDOMAINS=''
# Weather
# available weather API providers: darksky, visualcrossing
WEATHER_API_PROVIDER=__WEATHER_PROVIDER__
WEATHER_API_KEY=__WEATHER_KEY__
WEATHER_API_PROVIDER=__WEATHER_API_PROVIDER__
WEATHER_API_KEY=__WEATHER_API_KEY__

4
config_panel.toml
View file

@ -26,7 +26,7 @@ services = ["__APP__", "__APP___workers"]
help.fr = "Change le répertoire de données où sont stockés tous les fichiers .gpx téléversés et les photos de profil"
bind = "UPLOAD_FOLDER:/var/www/__APP__/.env"
[main.config.weather_provider]
[main.config.weather_api_provider]
ask.en = "Change weather provider"
ask.fr = "Changer le fournisseur météo"
type = "select"
@ -36,7 +36,7 @@ services = ["__APP__", "__APP___workers"]
help.fr = "Changer votre fournisseur météo en choisissant un de ceux qui vous sont proposés"
bind = "WEATHER_API_PROVIDER:/var/www/__APP__/.env"
[main.config.WEATHER_API_KEY]
[main.config.weather_api_key]
ask.en = "Change weather api key"
ask.fr = "Changer la clé api pour la météo"
type = "string"

6
doc/ADMIN.md
View file

@ -3,9 +3,9 @@ After the installation, you can login with the user and password you choose befo
If you have to use the [command line interface (cli)](https://samr1.github.io/FitTrackee/cli.html), you can go like this:
```
pushd $install_dir/
source $install_dir/venv/bin/activate
pushd __INSTALL_DIR__/
source __INSTALL_DIR__/venv/bin/activate
ftcli [OPTIONS] COMMAND [ARGS]...
popd
```
`$install_dir` has to be changed with the actual FitTrackee installed directory. Most of the time it will be `/var/www/fittrackee/`.

6
doc/ADMIN_fr.md
View file

@ -3,9 +3,9 @@ Après l’installation, vous pouvez vous connecter avec les nom d’utilisateur
Si vous avez besoin d’utiliser la [ligne de commande](https://samr1.github.io/FitTrackee/cli.html) vous pouvez suivre ces étapes :
```
pushd $install_dir/
source $install_dir/venv/bin/activate
pushd __INSTALL_DIR__/
source __INSTALL_DIR__/venv/bin/activate
ftcli [OPTIONS] COMMAND [ARGS]...
popd
```
`$install_dir` doit être modifié en l’adresse du répertoire où FitTrackee est installé. La majorité du temps ce sera `/var/www/fittrackee/`.

12
doc/PRE_UPGRADE.d/0.7.27~ynh1.md Normal file
View file

@ -0,0 +1,12 @@
### Features and enhancements
- add a dark mode
- update user preferences display
- add new sport: "Cycling (Trekking)"
### Bugs Fixed
- change UI display only on login ou user preferences update
- fix redirection when resetting password
A packaging bug is also fixed, where the weather api key was removed on upgrade for poeple who didn't set it during installation but only after, via the config panel.
If you are in this situation, your api key will be removed one last time during this upgrade (which fixes the issue). The following ones should not have this bug anymore 🥳
Thanks to @microniko for reporting this bug and to @alexAubin for helping resolving it.

6
manifest.toml
View file

@ -5,7 +5,7 @@ name = "FitTrackee"
description.en = "Self-hosted outdoor activity tracker 🚴"
description.fr = "Traqueur d’activités extérieures auto-hébergé 🚴"
version = "0.7.26~ynh1"
version = "0.7.27~ynh1"
maintainers = ["Thovi98"]
@ -47,7 +47,7 @@ ram.runtime = "50M"
help.fr = "Choisissez un mot de passe pour l’utilisateur admin ici."
type = "password"
[install.weather_provider]
[install.weather_api_provider]
ask.en = "(Optional) Choose your weather provider between Darksky and Visual Crossing"
ask.fr = "(Optionnel) Choisissez votre fournisseur météo entre Darksky et Visual Crossing"
help.en = "Since Fittrackee 0.7.15, only Visual Crossing is supported"
@ -57,7 +57,7 @@ ram.runtime = "50M"
default = "visualcrossing"
optional = true
[install.weather_key]
[install.weather_api_key]
ask.en = "(Optional) Insert here the api key from the chosen weather provider"
ask.fr = "(Optionnel) Insérez ici la clé API du fournisseur de météo choisi"
type = "string"

2
scripts/_common.sh
View file

@ -4,7 +4,7 @@
# COMMON VARIABLES
#=================================================
fittrackee_version="0.7.26"
fittrackee_version="0.7.27"
#=================================================
# PERSONAL HELPERS

4
scripts/install
View file

@ -11,8 +11,8 @@ source /usr/share/yunohost/helpers
admin=$(ynh_user_get_info --username=$admin --key=username)
admin_mail=$(ynh_user_get_info --username=$admin --key=mail)
ynh_app_setting_set --app=$app --key=weather_provider --value=$weather_provider
ynh_app_setting_set --app=$app --key=weather_key --value=$weather_key
ynh_app_setting_set --app=$app --key=weather_api_provider --value=$weather_api_provider
ynh_app_setting_set --app=$app --key=weather_api_key --value=$weather_api_key
#=================================================

19
scripts/upgrade
View file

@ -9,6 +9,21 @@
source _common.sh
source /usr/share/yunohost/helpers
#=================================================
# ENSURE DOWNWARD COMPATIBILITY
#=================================================
ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
if [ -z "${weather_api_provider:-}" ]; then
weather_api_provider=$weather_provider
ynh_app_setting_set --app=$app --key=weather_api_provider --value=$weather_api_provider
fi
if [ -z "${weather_api_key:-}" ]; then
weather_api_key=$weather_key
ynh_app_setting_set --app=$app --key=weather_api_key --value=$weather_api_key
fi
#=================================================
# LOAD SETTINGS
#=================================================
@ -16,10 +31,6 @@ source /usr/share/yunohost/helpers
admin=$(ynh_user_get_info --username=$admin --key=username)
admin_mail=$(ynh_user_get_info --username=$admin --key=mail)
ynh_app_setting_set --app=$app --key=weather_provider --value=$weather_provider
ynh_app_setting_set --app=$app --key=weather_key --value=$weather_key
#=================================================
# CHECK VERSION
#=================================================

1
tests.toml
View file

@ -22,3 +22,4 @@ test_format = 1.0
test_upgrade_from.a446e8c.name = "0.7.23"
test_upgrade_from.316dea4.name = "0.7.24"
test_upgrade_from.d682f12.name = "0.7.25~ynh3"
test_upgrade_from.e48197d.name = "0.7.26"