From fdb1f717fcbed03507520fdf81dc2badd15b60ed Mon Sep 17 00:00:00 2001 From: BenediktMKuehne Date: Wed, 5 Jul 2023 17:47:14 +0200 Subject: [PATCH 1/3] update offline useability --- embark/templates/base.html | 10 ++++++++-- installer.sh | 8 ++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/embark/templates/base.html b/embark/templates/base.html index 82584b274..111459d2b 100644 --- a/embark/templates/base.html +++ b/embark/templates/base.html @@ -15,8 +15,13 @@ {% block title %}{% endblock title %} {# Load CSS and JavaScript #} - {% bootstrap_css %} - {% bootstrap_javascript %} + + + + + @@ -43,6 +48,7 @@ + {% block js %}{% endblock js %} diff --git a/installer.sh b/installer.sh index 632c76fbb..e8b6971fb 100755 --- a/installer.sh +++ b/installer.sh @@ -329,11 +329,11 @@ install_embark_default(){ mkdir -p ./embark/static/external/{scripts,css} wget -O ./embark/static/external/scripts/jquery.js https://code.jquery.com/jquery-3.6.0.min.js wget -O ./embark/static/external/scripts/confirm.js https://cdnjs.cloudflare.com/ajax/libs/jquery-confirm/3.3.2/jquery-confirm.min.js - wget -O ./embark/static/external/scripts/bootstrap.js https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js + wget -O ./embark/static/external/scripts/bootstrap.js https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js wget -O ./embark/static/external/scripts/datatable.js https://cdn.datatables.net/v/bs5/dt-1.11.2/datatables.min.js wget -O ./embark/static/external/scripts/charts.js https://cdn.jsdelivr.net/npm/chart.js@3.5.1/dist/chart.min.js wget -O ./embark/static/external/css/confirm.css https://cdnjs.cloudflare.com/ajax/libs/jquery-confirm/3.3.2/jquery-confirm.min.css - wget -O ./embark/static/external/css/bootstrap.css https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/css/bootstrap.min.css + wget -O ./embark/static/external/css/bootstrap.css https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css wget -O ./embark/static/external/css/datatable.css https://cdn.datatables.net/v/bs5/dt-1.11.2/datatables.min.css find ./embark/static/external/ -type f -exec sed -i '/sourceMappingURL/d' {} \; fi @@ -404,11 +404,11 @@ install_embark_dev(){ mkdir -p ./embark/static/external/{scripts,css} wget -O ./embark/static/external/scripts/jquery.js https://code.jquery.com/jquery-3.6.0.min.js wget -O ./embark/static/external/scripts/confirm.js https://cdnjs.cloudflare.com/ajax/libs/jquery-confirm/3.3.2/jquery-confirm.min.js - wget -O ./embark/static/external/scripts/bootstrap.js https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/js/bootstrap.bundle.min.js + wget -O ./embark/static/external/scripts/bootstrap.js https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js wget -O ./embark/static/external/scripts/datatable.js https://cdn.datatables.net/v/bs5/dt-1.11.2/datatables.min.js wget -O ./embark/static/external/scripts/charts.js https://cdn.jsdelivr.net/npm/chart.js@3.5.1/dist/chart.min.js wget -O ./embark/static/external/css/confirm.css https://cdnjs.cloudflare.com/ajax/libs/jquery-confirm/3.3.2/jquery-confirm.min.css - wget -O ./embark/static/external/css/bootstrap.css https://cdn.jsdelivr.net/npm/bootstrap@5.1.1/dist/css/bootstrap.min.css + wget -O ./embark/static/external/css/bootstrap.css https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css wget -O ./embark/static/external/css/datatable.css https://cdn.datatables.net/v/bs5/dt-1.11.2/datatables.min.css find ./embark/static/external/ -type f -exec sed -i '/sourceMappingURL/d' {} \; fi From 59f4ad5c5907551d2d33b34ce0bb36ce49138452 Mon Sep 17 00:00:00 2001 From: BenediktMKuehne Date: Thu, 6 Jul 2023 16:18:25 +0200 Subject: [PATCH 2/3] rm safe on uninstall get rid of mysql warning --- helper/helper_embark_general.sh | 2 +- installer.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/helper/helper_embark_general.sh b/helper/helper_embark_general.sh index 04b20dc30..9230987d9 100644 --- a/helper/helper_embark_general.sh +++ b/helper/helper_embark_general.sh @@ -105,7 +105,7 @@ check_db() { fi sleep 5s echo -e "$BLUE""$BOLD""2. checking password""$NC\\n" - if ! mysql --host="$HOST_ENV" --user="$USER_ENV" --password="$PW_ENV" -e"quit"; then # PW_ENV=$(grep DATABASE_PASSWORD ./.env | sed 's/DATABASE\_PASSWORD\=//')mysql -h 172.22.0.5 -u embark -p $PW_ENV -e "quit" + if ! mysql --host="$HOST_ENV" --user="$USER_ENV" --password="$PW_ENV" -e"quit" &>/dev/null; then echo -e "$ORANGE""$BOLD""Failed logging into database with password""$NC" echo -e "---------------------------------------------------------------------------" echo -e "$CYAN""Old passwords are stored in the \"safe\" folder when uninstalling EMBArk""$NC\\n" diff --git a/installer.sh b/installer.sh index e8b6971fb..d9415f962 100755 --- a/installer.sh +++ b/installer.sh @@ -525,6 +525,7 @@ uninstall (){ # final if [[ "$REFORCE" -eq 0 ]]; then sudo -u "${SUDO_USER:-${USER}}" git reset + rm -r ./safe/* fi echo -e "$ORANGE""$BOLD""Consider""$CYAN""\$git pull""$NC" } From d76dbc196e5948e29a7cfe05c26149b63e5034ff Mon Sep 17 00:00:00 2001 From: BenediktMKuehne Date: Thu, 6 Jul 2023 16:28:18 +0200 Subject: [PATCH 3/3] typo --- embark/templates/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/embark/templates/base.html b/embark/templates/base.html index 111459d2b..b565003ac 100644 --- a/embark/templates/base.html +++ b/embark/templates/base.html @@ -20,7 +20,7 @@ {% bootstrap_javascript %}--> - +