diff --git a/README.md b/README.md index a8c2f00..b18f39b 100644 --- a/README.md +++ b/README.md @@ -1,63 +1,53 @@ -# diagrams.net for YunoHost + + +# Diagrams.net for YunoHost [![Integration level](https://dash.yunohost.org/integration/diagramsnet.svg)](https://dash.yunohost.org/appci/app/diagramsnet) ![](https://ci-apps.yunohost.org/ci/badges/diagramsnet.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/diagramsnet.maintain.svg) -[![Install diagramsnet with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=diagramsnet) +[![Install Diagrams.net with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=diagramsnet) -> *This package allow you to install diagrams.net 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.* +*[Lire ce readme en français.](./README_fr.md)* + +> *This package allows you to install Diagrams.net 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 -diagrams.net (formerly draw.io) lets you create a wide range of diagrams, from simple tree and flow diagrams, to highly technical network, rack and electrical diagrams. +Online diagram software for making flowcharts, process diagrams, org charts, UML, ER and network diagrams. -**Shipped version:** 14.6.5 +**Shipped version:** 15.6.8~ynh1 + +**Demo:** https://app.diagrams.net/ ## Screenshots -![Exemple de diagramme](home-dia1.svg) +![](./doc/screenshots/screenshot.png) -## Demo - -* [Official demo](https://app.diagrams.net/) - -## Documentation - -* Official documentation: +## Disclaimers / important information ## YunoHost specific features -* Disable third party website integration with Dropbox, Google, Trello, etc +* Integration of third-party websites (Dropbox, Google, Trello, etc.) is disabled. -### Supported architectures - -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/diagramsnet.svg)](https://ci-apps.yunohost.org/ci/apps/diagramsnet/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/diagramsnet.svg)](https://ci-apps-arm.yunohost.org/ci/apps/diagramsnet/) - -## Limitations - -* Any known limitations. - -## Additional information - -* Other information you would add about this application - -## Links +## Documentation and resources +* Official app website: https://www.diagrams.net/ +* Official admin documentation: https://www.diagrams.net/doc +* Upstream app code repository: https://drawio-app.com +* YunoHost documentation for this app: https://yunohost.org/app_diagramsnet * Report a bug: https://github.com/YunoHost-Apps/diagramsnet_ynh/issues -* App website: https://drawio-app.com> -* Upstream app repository: https://github.com/jgraph/drawio -* YunoHost website: https://yunohost.org> ---- +## Developer info -## Developers info - -Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/diagramsnet_ynh/tree/testing). +Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/diagramsnet_ynh/tree/testing). To try the testing branch, please proceed like that. - -```bash +``` sudo yunohost app install https://github.com/YunoHost-Apps/diagramsnet_ynh/tree/testing --debug or sudo yunohost app upgrade diagramsnet -u https://github.com/YunoHost-Apps/diagramsnet_ynh/tree/testing --debug ``` + +**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file diff --git a/README_fr.md b/README_fr.md new file mode 100644 index 0000000..08b2474 --- /dev/null +++ b/README_fr.md @@ -0,0 +1,49 @@ +# Diagrams.net pour YunoHost + +[![Niveau d'intégration](https://dash.yunohost.org/integration/diagramsnet.svg)](https://dash.yunohost.org/appci/app/diagramsnet) ![](https://ci-apps.yunohost.org/ci/badges/diagramsnet.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/diagramsnet.maintain.svg) +[![Installer Diagrams.net avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=diagramsnet) + +*[Read this readme in english.](./README.md)* +*[Lire ce readme en français.](./README_fr.md)* + +> *Ce package vous permet d'installer Diagrams.net 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.* + +## Vue d'ensemble + +Application en ligne qui permet de faire des schémas et du dessin vectoriel. + +**Version incluse :** 15.6.8~ynh1 + +**Démo :** https://app.diagrams.net/ + +## Captures d'écran + +![](./doc/screenshots/screenshot.png) + +## Avertissements / informations importantes + +## YunoHost specific features + +* Integration of third-party websites (Dropbox, Google, Trello, etc.) is disabled. + +## Documentations et ressources + +* Site officiel de l'app : https://www.diagrams.net/ +* Documentation officielle de l'admin : https://www.diagrams.net/doc +* Dépôt de code officiel de l'app : https://drawio-app.com +* Documentation YunoHost pour cette app : https://yunohost.org/app_diagramsnet +* Signaler un bug : https://github.com/YunoHost-Apps/diagramsnet_ynh/issues + +## Informations pour les développeurs + +Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/diagramsnet_ynh/tree/testing). + +Pour essayer la branche testing, procédez comme suit. +``` +sudo yunohost app install https://github.com/YunoHost-Apps/diagramsnet_ynh/tree/testing --debug +ou +sudo yunohost app upgrade diagramsnet -u https://github.com/YunoHost-Apps/diagramsnet_ynh/tree/testing --debug +``` + +**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file diff --git a/conf/app.src b/conf/app.src index 9949538..fbbad2e 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,5 @@ -SOURCE_URL=https://github.com/jgraph/drawio/archive/v14.6.5.tar.gz -SOURCE_SUM=cba9b5be4f16830211342450f847817055315f510c5b15479b8c6472d26e4c91 +SOURCE_URL=https://github.com/jgraph/drawio/archive/v15.6.8.tar.gz +SOURCE_SUM=f8e73c988c8875ab8cd102ebacfa46b6267b9e77215a1cd6510fa1ee138d8293 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= diff --git a/doc/.DS_Store b/doc/.DS_Store new file mode 100644 index 0000000..c90376b Binary files /dev/null and b/doc/.DS_Store differ diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md new file mode 100644 index 0000000..3dc306c --- /dev/null +++ b/doc/DISCLAIMER.md @@ -0,0 +1,3 @@ +## YunoHost specific features + +* Integration of third-party websites (Dropbox, Google, Trello, etc.) is disabled. diff --git a/doc/screenshots/screenshot.png b/doc/screenshots/screenshot.png new file mode 100644 index 0000000..31e7bae Binary files /dev/null and b/doc/screenshots/screenshot.png differ diff --git a/home-dia1.svg b/home-dia1.svg deleted file mode 100644 index edd5155..0000000 --- a/home-dia1.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -
AWS Cloud
AWS CloudActors
User
User
Payers
PayersChannels
Mobile / Web
Mobile / Web
Wearables
Wearables
Echo
Echo
API
API
1
1
4
4
Amazon Lex
Amazon Lex
Amazon S3
Amazon S3
Amazon API
Gateway
Amazon API<br>Gateway<br>
Amazon Kinesis
Data Streams
Amazon Kinesis<br>Data Streams<br>
Amazon
ElasticSearch
Amazon<br>ElasticSearch<br>
DynamoDB
Streams
DynamoDB<br>Streams<br>
Subscriber
Processor
[Not supported by viewer]
Request
Processor
[Not supported by viewer]
Amazon
DynamoDB
Amazon<br>DynamoDB<br>
ERL Function
ERL Function
Amazon Cognito
Amazon Cognito
Amazon Polly
Amazon Polly
AWS IoT Core
AWS IoT Core
Amazon Pinpoint
Amazon Pinpoint
IoT Rule
IoT Rule
Users
Users<br>
Amazon
Comprehend
Medical
[Not supported by viewer]
Amazon Personalize
Amazon Personalize
Amazon
Pinpoint
[Not supported by viewer]
User
User
API
API
API
API<br>
AWS Lake
Formation
[Not supported by viewer]
Execute Model
Execute Model
Related "Casual"
Data
Related "Casual"<br>Data<br>
Research
Research<br>
2
2
3
3
5
5
6
6
7
7
8
8
9
9
Amazon
SageMaker
Amazon<br>SageMaker<br> \ No newline at end of file diff --git a/manifest.json b/manifest.json index 69626b7..4fc9a9a 100644 --- a/manifest.json +++ b/manifest.json @@ -6,8 +6,15 @@ "en": "Online diagram software for making flowcharts, process diagrams, org charts, UML, ER and network diagrams.", "fr": "Application en ligne qui permet de faire des schémas et du dessin vectoriel." }, - "version": "14.6.5~ynh1", + "version": "15.6.8~ynh1", "url": "https://www.diagrams.net/", + "upstream": { + "license": "Apache-2.0", + "website": "https://www.diagrams.net/", + "demo": "https://app.diagrams.net/", + "admindoc": "https://www.diagrams.net/doc", + "code": "https://drawio-app.com" + }, "license": "Apache-2.0", "maintainer": { "name": "Gofannon", @@ -24,8 +31,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" }, { "name": "path", diff --git a/scripts/_common.sh b/scripts/_common.sh index eea5970..944a65e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,9 +4,6 @@ # COMMON VARIABLES #================================================= -# dependencies used by the app -#pkg_dependencies="deb1 deb2" - #================================================= # PERSONAL HELPERS #================================================= diff --git a/scripts/install b/scripts/install index 91f9080..4ce66da 100644 --- a/scripts/install +++ b/scripts/install @@ -83,7 +83,6 @@ ynh_add_nginx_config # Add "offline" parameter in index.html # See https://desk.draw.io/support/solutions/articles/16000042546-what-url-parameters-are-supported- -# and https://shelter.moe/@Neil/103928506546498078 [French] sed_pattern="s/var params = window.location.search.slice(1).split('&');/&\n\t\t\tparams.push(\"offline=1\");/g" sed -i "$sed_pattern" "$final_path/src/main/webapp/index.html" diff --git a/scripts/restore b/scripts/restore index 46a60dd..acf1d72 100644 --- a/scripts/restore +++ b/scripts/restore @@ -37,8 +37,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=2 -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path " diff --git a/scripts/upgrade b/scripts/upgrade index 667569e..6b35514 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -26,18 +26,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) upgrade_type=$(ynh_check_app_version_changed) -#================================================= -# ENSURE DOWNWARD COMPATIBILITY -#================================================= -ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 - -# Cleaning legacy permissions -if ynh_legacy_permissions_exists; then - ynh_legacy_permissions_delete_all - - ynh_app_setting_delete --app=$app --key=is_public -fi - #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= @@ -52,6 +40,18 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors +#================================================= +# ENSURE DOWNWARD COMPATIBILITY +#================================================= +ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 + +# Cleaning legacy permissions +if ynh_legacy_permissions_exists; then + ynh_legacy_permissions_delete_all + + ynh_app_setting_delete --app=$app --key=is_public +fi + #================================================= # CREATE DEDICATED USER #================================================= @@ -75,7 +75,6 @@ then # Add "offline" parameter in index.html # See https://desk.draw.io/support/solutions/articles/16000042546-what-url-parameters-are-supported- - # and https://shelter.moe/@Neil/103928506546498078 [French] sed_pattern="s/var params = window.location.search.slice(1).split('&');/&\n\t\t\tparams.push(\"offline=1\");/g" sed -i "$sed_pattern" "$final_path/src/main/webapp/index.html" fi