YunoHost-Apps · ericgaspar · Apr 7, 2022 · May 11, 2021 · May 11, 2021 · May 13, 2021
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,55 @@
+---
+name: Bug report
+about: When creating a bug report, please use the following template to provide all the relevant information and help debugging efficiently.
+
+---
+
+**How to post a meaningful bug report**
+1. *Read this whole template first.*
+2. *Determine if you are on the right place:*
+ - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!*
+ - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.*
+ - *When in doubt, post here and we will figure it out together.*
+3. *Delete the italic comments as you write over them below, and remove this guide.*
+--- 
+
+### Describe the bug
+
+*A clear and concise description of what the bug is.*
+
+### Context
+
+- Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...*
+- YunoHost version: x.x.x
+- I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...*
+- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes*
+ - If yes, please explain:
+- Using, or trying to install package version/branch:
+- If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`*
+
+### Steps to reproduce
+
+- *If you performed a command from the CLI, the command itself is enough. For example:*
+ ```sh
+ sudo yunohost app install the_app
+ ```
+- *If you used the webadmin, please perform the equivalent command from the CLI first.*
+- *If the error occurs in your browser, explain what you did:*
+ 1. *Go to '...'*
+ 2. *Click on '...'*
+ 3. *Scroll down to '...'*
+ 4. *See error*
+
+### Expected behavior
+
+*A clear and concise description of what you expected to happen. You can remove this section if the command above is enough to understand your intent.*
+
+### Logs
+
+*When an operation fails, YunoHost provides a simple way to share the logs.*
+- *In the webadmin, the error message contains a link to the relevant log page. On that page, you will be able to 'Share with Yunopaste'. If you missed it, the logs of previous operations are also available under Tools > Logs.*
+- *In command line, the command to share the logs is displayed at the end of the operation and looks like `yunohost log display [log name] --share`. If you missed it, you can find the log ID of a previous operation using `yunohost log list`.*
+
+*After sharing the log, please copypaste directly the link provided by YunoHost (to help readability, no need to copypaste the entire content of the log here, just the link is enough...)*
+
+*If applicable and useful, add screenshots to help explain your problem.*
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,16 @@
+## Problem
+
+- *Description of why you made this PR*
+
+## Solution
+
+- *And how do you fix that problem*
+
+## PR Status
+
+- [ ] Code finished and ready to be reviewed/tested
+- [ ] The fix/enhancement were manually tested (if applicable)
+
+## Automatic tests
+
+Automatic tests can be triggered on https://ci-apps-dev.yunohost.org/ *after creating the PR*, by commenting "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!". (N.B. : for this to work you need to be a member of the Yunohost-Apps organization)
diff --git a/README.md b/README.md
@@ -1,42 +1,31 @@
+<!--
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+It shall NOT be edited by hand.
+-->
+
 # Strut for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/strut.svg)](https://dash.yunohost.org/appci/app/strut) ![](https://ci-apps.yunohost.org/ci/badges/strut.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/strut.maintain.svg) 
 [![Install Strut with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=strut)
 
 *[Lire ce readme en français.](./README_fr.md)*
 
-> *This package allow you to install Strut quickly and simply on a YunoHost server. 
-If you don't have YunoHost, please see [here](https://yunohost.org/install) to know how to install and enjoy it.*
+> *This package allows you to install Strut quickly and simply on a YunoHost server.
+If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
 
 ## Overview
-Strut is a simple, online editor that doesn't even require registration to operate. Everything you do is recoverable and re-usable.
-
-**Shipped version:** 20171224-1
-
-## Screenshots
-
-![](https://f.cloud.github.com/assets/1009003/515405/f1003c6a-be74-11e2-84b9-14776c652afb.png)
-
-## Demo
 
-* [Official demo](http:https://strut.io/editor/index.html)
-
-## Configuration
-
-If configuration is needed, feel free to contribute.
-
-## Documentation
+Strut is a simple, online editor that doesn't even require registration to operate. Everything you do is recoverable and re-usable.
 
- * YunoHost documentation: If specific documentation is needed, feel free to contribute.
+**Shipped version:** 20220404~ynh1
 
-## YunoHost specific features
+**Demo:** http:https://strut.io/dist/
 
-#### Multi-users support
+## Screenshots
 
-#### Supported architectures
+![](./doc/screenshots/f1003c6a-be74-11e2-84b9-14776c652afb.png)
 
-* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/strut.svg)](https://ci-apps.yunohost.org/ci/apps/strut/)
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/strut.svg)](https://ci-apps-arm.yunohost.org/ci/apps/strut/)
+## Disclaimers / important information
 
 ## Limitations
 No import/export from/to OpenDocument or pptx.
@@ -49,22 +38,22 @@ Initial Strut software includes Google Analytics and is bind to Imgur to upload
 
 To avoid to take time to build this html/js app, this package setups a builded version of Strut with the patch that remove Google Analytics and Imgur dependencies. It is a build of this version https://github.com/tantaman/Strut/commits/6761b141ee7aa622916e2d23cced84ee95618cce . So it's not the more recent version.
 
-## Links
-
- * Report a bug: https://github.com/YunoHost-Apps/strut_ynh/issues
- * Strut website: http:https://strut.io
- * Strut repository: https://github.com/MohannadNaj/Strut
- * YunoHost website: https://yunohost.org/
+## Documentation and resources
 
----
+* Official app website: http:https://strut.io
+* Upstream app code repository: https://github.com/MohannadNaj/Strut
+* YunoHost documentation for this app: https://yunohost.org/app_strut
+* Report a bug: https://github.com/YunoHost-Apps/strut_ynh/issues
 
-## Developers info
+## Developer info
 
-Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/strut_ynh/tree/testing).
+Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/strut_ynh/tree/testing).
 
 To try the testing branch, please proceed like that.
 ```
 sudo yunohost app install https://github.com/YunoHost-Apps/strut_ynh/tree/testing --debug
 or
 sudo yunohost app upgrade strut -u https://github.com/YunoHost-Apps/strut_ynh/tree/testing --debug
 ```
+
+**More info regarding app packaging:** https://yunohost.org/packaging_apps
diff --git a/README_fr.md b/README_fr.md
@@ -1,42 +1,28 @@
 # Strut pour YunoHost
 
-[![Niveau d'integration](https://dash.yunohost.org/integration/strut.svg)](https://dash.yunohost.org/appci/app/strut) 
+[![Niveau d'intégration](https://dash.yunohost.org/integration/strut.svg)](https://dash.yunohost.org/appci/app/strut) ![](https://ci-apps.yunohost.org/ci/badges/strut.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/strut.maintain.svg) 
 [![Installer Strut avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=strut)
 
-*[Read this readme in english.](./README.md)* 
+*[Read this readme in english.](./README.md)*
+*[Lire ce readme en français.](./README_fr.md)*
 
 > *Ce package vous permet d'installer Strut rapidement et simplement sur un serveur YunoHost.
-Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/install) pour savoir comment l'installer et en profiter*
+Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
 
 ## Vue d'ensemble
-Strut est un éditeur WEB de présentations fonctionnant en HTML/JS. Tout se passe en local. Il fonctinne grâce à [impress.js](http:https://bartaz.github.com/impress.js/#/bored).
-
-**Version incluse :** 20171224-1
-
-## Captures d'écran
-
-![](https://f.cloud.github.com/assets/1009003/515405/f1003c6a-be74-11e2-84b9-14776c652afb.png)
-
-## Démo
 
-* [Démo officielle](http:https://strut.io/editor/index.html)
-
-## Configuration
-
-S'il y a une configuration possible, sentez vous libre d'y contribuer.
+Strut est un éditeur WEB de présentations fonctionnant en HTML/JS. Tout se passe en local. Il fonctinne grâce à [impress.js](http:https://bartaz.github.com/impress.js/#/bored).
 
-## Documentation
 
- * S'il y a une documentation spéficique, sentez vous libre d'y contribuer.
+**Version incluse :** 20220404~ynh1
 
-## Caractéristiques spécifiques à YunoHost
+**Démo :** http:https://strut.io/dist/
 
-#### Support multi-utilisateurs
+## Captures d'écran
 
-#### Architectures supportées
+![](./doc/screenshots/f1003c6a-be74-11e2-84b9-14776c652afb.png)
 
-* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/strut.svg)](https://ci-apps.yunohost.org/ci/apps/strut/)
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/strut.svg)](https://ci-apps-arm.yunohost.org/ci/apps/strut/)
+## Avertissements / informations importantes
 
 ## Limitations
 
@@ -53,14 +39,12 @@ Pour compiler le logiciel, cela nécessite grunt, ce qui ne peut pas être suppr
 Pour éviter de devoir générer cette application HTML/JS, ce package créé une version compilée de Strut avec le patch qui supprime les dépendances à Google Analytics et Imgur.
 Voici la version compilée https://github.com/tantaman/Strut/commits/6761b141ee7aa622916e2d23cced84ee95618cce. Ce n'est pas la version la plus récente.
 
-## Liens
-
- * Signaler un bug : https://github.com/YunoHost-Apps/strut_ynh/issues
- * Site web de Strut : http:https://strut.io
- * Dépôt de Strut : https://github.com/MohannadNaj/Strut
- * Site web de YunoHost : https://yunohost.org/
+## Documentations et ressources
 
----
+* Site officiel de l'app : http:https://strut.io
+* Dépôt de code officiel de l'app : https://github.com/MohannadNaj/Strut
+* Documentation YunoHost pour cette app : https://yunohost.org/app_strut
+* Signaler un bug : https://github.com/YunoHost-Apps/strut_ynh/issues
 
 ## Informations pour les développeurs
 
@@ -72,3 +56,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/strut_ynh/tree/testin
 ou
 sudo yunohost app upgrade strut -u https://github.com/YunoHost-Apps/strut_ynh/tree/testing --debug
 ```
+
+**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps
diff --git a/check_process b/check_process
@@ -1,8 +1,8 @@
 ;; Test complet
  ; Manifest
- domain="domain.tld" (DOMAIN)
- path="/path" (PATH)
- is_public=1 (PUBLIC|public=1|private=0)
+ domain="domain.tld"
+ path="/path"
+ is_public=1
  ; Checks
  pkg_linter=1
  setup_sub_dir=1

diff --git a/conf/nginx.conf b/conf/nginx.conf
@@ -4,11 +4,6 @@ location __PATH__/ {
  # Path to source
  alias __FINALPATH__/ ;
 
- # Force usage of https
- if ($scheme = http) {
- rewrite ^ https://$server_name$request_uri? permanent;
- }
-
  index index.html;
  try_files $uri $uri/ /index.html;
 

diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md
@@ -0,0 +1 @@
+Strut is a simple, online editor that doesn't even require registration to operate. Everything you do is recoverable and re-usable.
diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md
@@ -0,0 +1 @@
+Strut est un éditeur WEB de présentations fonctionnant en HTML/JS. Tout se passe en local. Il fonctinne grâce à [impress.js](http:https://bartaz.github.com/impress.js/#/bored).
diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md
@@ -0,0 +1,10 @@
+## Limitations
+No import/export from/to OpenDocument or pptx.
+
+## Additional information
+
+* This package doesn't contained the exact sources of the upstream https://github.com/tantaman/Strut. 
+
+Initial Strut software includes Google Analytics and is bind to Imgur to upload images. This kind of trackers or external services are not accepted by the package team of YunoHost. So this trackers are removed from sources, a pull request has been done and merged but has finally be removed from the strut upstream with no explanation. In more, Strut developers don't deliver builded versions. To build a version it needs grunt, that can't be removed easily.
+
+To avoid to take time to build this html/js app, this package setups a builded version of Strut with the patch that remove Google Analytics and Imgur dependencies. It is a build of this version https://github.com/tantaman/Strut/commits/6761b141ee7aa622916e2d23cced84ee95618cce . So it's not the more recent version.
diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md
@@ -0,0 +1,14 @@
+## Limitations
+
+Pas d'import/export possible depuis ou vers des fichiers OpenDocument ou pptx.
+
+## Information supplémentaires
+
+* Ce package ne contient pas les sources exactes de [la version originale de Strut](https://github.com/tantaman/Strut)
+
+Strut, à l'origine, inclut Google Analytics et est lié à Imgur pour téléverser des images. Ces pisteurs ou services externes ne sont pas acceptés par l'équipe de YunoHost.
+Ils sont donc supprimés par rapport aux sources. 
+Une pull request pour les supprimer de leur côté a été validée et mergée mais finalement supprimée sans explication. De plus, les développeurs de Strut ne fournissent pas le logiciel compilé.
+Pour compiler le logiciel, cela nécessite grunt, ce qui ne peut pas être supprimé facilement.
+Pour éviter de devoir générer cette application HTML/JS, ce package créé une version compilée de Strut avec le patch qui supprime les dépendances à Google Analytics et Imgur.
+Voici la version compilée https://github.com/tantaman/Strut/commits/6761b141ee7aa622916e2d23cced84ee95618cce. Ce n'est pas la version la plus récente.
diff --git a/doc/screenshots/f1003c6a-be74-11e2-84b9-14776c652afb.png b/doc/screenshots/f1003c6a-be74-11e2-84b9-14776c652afb.png
diff --git a/manifest.json b/manifest.json
@@ -2,20 +2,26 @@
  "name": "Strut",
  "id": "strut",
  "packaging_format": 1,
- "version": "20171224-1~ynh2",
- "url": "http:https://strut.io",
- "license": "AGPL-3.0",
- "requirements": {
- "yunohost": ">= 4.1.7"
- },
  "description": {
- "en": "Slide editor for creating impress.js presentations.",
- "fr": "Éditeur de diapositives permettant de créer des présentations impress.js."
+ "en": "Slide editor for creating impress.js presentations",
+ "fr": "Éditeur de diapositives permettant de créer des présentations impress.js"
  },
+ "version": "20220404~ynh1",
+ "url": "http:https://strut.io",
+ "upstream": {
+ "license": "AGPL-3.0",
+ "website": "http:https://strut.io",
+ "demo": "http:https://strut.io/dist/",
+ "code": "https://github.com/MohannadNaj/Strut"
+ },
+ "license": "AGPL-3.0",
  "maintainer": {
  "name": "ljf",
  "email": "[email protected]"
  },
+ "requirements": {
+ "yunohost": ">= 4.3.0"
+ },
  "multi_instance": true,
  "services": [
  "nginx"
@@ -24,8 +30,7 @@
  "install" : [
  {
  "name": "domain",
- "type": "domain",
- "example": "example.com"
+ "type": "domain"
  },
  {
  "name": "path",

diff --git a/pull_request_template.md b/pull_request_template.md
diff --git a/scripts/change_url b/scripts/change_url
@@ -82,7 +82,7 @@ fi
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_script_progression --message="Reloading NGINX web server..."
+ynh_script_progression --message="Reloading NGINX web server..." --weight=1
 
 ynh_systemd_action --service_name=nginx --action=reload