From 17839474e157a63bd06cad4f345d70f008ae91e5 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Wed, 1 Sep 2021 11:20:41 +0200 Subject: [PATCH] ui: Fix base url mess --- configs/nginx-chbase.sh | 11 +++++++++-- frontend/ui/src/app.html | 3 ++- frontend/ui/src/components/ExerciceFlags.svelte | 2 +- frontend/ui/src/components/ExerciceHints.svelte | 2 +- frontend/ui/src/components/FlagKey.svelte | 2 +- frontend/ui/src/components/Header.svelte | 14 +++++++------- frontend/ui/src/components/HeaderClock.svelte | 4 ++-- frontend/ui/src/components/HeaderIssues.svelte | 2 +- frontend/ui/src/components/HeaderPartners.svelte | 6 +++--- frontend/ui/src/components/NavTags.svelte | 2 +- frontend/ui/src/components/NavThemes.svelte | 2 +- frontend/ui/src/components/TeamChangeName.svelte | 2 +- frontend/ui/src/components/ThemeNav.svelte | 2 +- frontend/ui/src/routes/[theme]/[exercice].svelte | 8 ++++---- frontend/ui/src/routes/[theme]/__layout.svelte | 2 +- frontend/ui/src/routes/[theme]/index.svelte | 4 ++-- frontend/ui/src/routes/__error.svelte | 15 +++++++++++++++ frontend/ui/src/routes/__layout.svelte | 10 +++++----- frontend/ui/src/routes/edit.svelte | 2 +- frontend/ui/src/routes/index.svelte | 4 ++-- frontend/ui/src/routes/issues.svelte | 4 ++-- frontend/ui/src/routes/register.svelte | 4 ++-- frontend/ui/src/routes/tags/[tag].svelte | 2 +- 23 files changed, 66 insertions(+), 43 deletions(-) create mode 100644 frontend/ui/src/routes/__error.svelte diff --git a/configs/nginx-chbase.sh b/configs/nginx-chbase.sh index b7dd14e3..d7fd73ef 100755 --- a/configs/nginx-chbase.sh +++ b/configs/nginx-chbase.sh @@ -10,15 +10,22 @@ run() { if [ -d "${FILE}" ] then - for f in "${FILE}/"*.html "${FILE}/"*.js + for f in "${FILE}/"*.html "${FILE}/"*.js "${FILE}/"*.css do run "${NEWBASE}" "${f}" done [ -d "${FILE}/js/" ] && run "${NEWBASE}" "${FILE}/js" [ -d "${FILE}/views/" ] && run "${NEWBASE}" "${FILE}/views" + [ -d "${FILE}/_app/" ] && run "${NEWBASE}" "${FILE}/_app" + [ -d "${FILE}/_app/assets/pages/" ] && run "${NEWBASE}" "${FILE}/_app/assets/pages" elif [ -f "${FILE}" ] then - sed -ri "s@(href|src)=\"${CURRENT_BASE}@\1=\"${NEWBASE}@g;s@\\\$http.get\(\"${CURRENT_BASE}@\$http.get\(\"${NEWBASE}@g;s@\\\$http\((.*)\"${CURRENT_BASE}@\$http(\1\"${NEWBASE}@g" ${FILE} + if [ "${FILE##*.}" == "css" ] + then + sed -ri "s@${CURRENT_BASE}_app/@${NEWBASE}_app/@g" ${FILE} + else + sed -ri "s@(href|src)=\"${CURRENT_BASE}@\1=\"${NEWBASE}@g;s@\\\$http.get\(\"${CURRENT_BASE}@\$http.get\(\"${NEWBASE}@g;s@\\\$http\((.*)\"${CURRENT_BASE}@\$http(\1\"${NEWBASE}@g;s@from \"${CURRENT_BASE}_app@from \"${NEWBASE}_app@g;s@\`${CURRENT_BASE}_app/\\\$@\`${NEWBASE}_app/\\\$@g;s@paths: \{\"base\":\"${CURRENT_BASE%/}\",\"assets\":\"${CURRENT_BASE%/}\"\},@paths: {\"base\":\"${NEWBASE%/}\",\"assets\":\"${NEWBASE%/}\"},@" ${FILE} + fi fi } diff --git a/frontend/ui/src/app.html b/frontend/ui/src/app.html index f39adf0b..132594a5 100644 --- a/frontend/ui/src/app.html +++ b/frontend/ui/src/app.html @@ -4,9 +4,10 @@ - + + %svelte.head% diff --git a/frontend/ui/src/components/ExerciceFlags.svelte b/frontend/ui/src/components/ExerciceFlags.svelte index 8d0407c6..814165c6 100644 --- a/frontend/ui/src/components/ExerciceFlags.svelte +++ b/frontend/ui/src/components/ExerciceFlags.svelte @@ -40,7 +40,7 @@ message = ""; const response = await fetch( - "/submit/" + exercice.id, + "submit/" + exercice.id, { method: "POST", body: JSON.stringify(responses), diff --git a/frontend/ui/src/components/ExerciceHints.svelte b/frontend/ui/src/components/ExerciceHints.svelte index e92f6d94..41bb643e 100644 --- a/frontend/ui/src/components/ExerciceHints.svelte +++ b/frontend/ui/src/components/ExerciceHints.svelte @@ -44,7 +44,7 @@ hinterror = ""; const response = await fetch( - "/openhint/" + exercice.id, + "openhint/" + exercice.id, { method: "POST", body: JSON.stringify({ id: hint.id }), diff --git a/frontend/ui/src/components/FlagKey.svelte b/frontend/ui/src/components/FlagKey.svelte index b227fd96..1e149db1 100644 --- a/frontend/ui/src/components/FlagKey.svelte +++ b/frontend/ui/src/components/FlagKey.svelte @@ -38,7 +38,7 @@ wcsubmitted = true; const response = await fetch( - "/wantchoices/" + exercice_id, + "wantchoices/" + exercice_id, { method: "POST", body: JSON.stringify({ id: Number(flag.id) }), diff --git a/frontend/ui/src/components/Header.svelte b/frontend/ui/src/components/Header.svelte index 244ebafa..7a82b9ff 100644 --- a/frontend/ui/src/components/Header.svelte +++ b/frontend/ui/src/components/Header.svelte @@ -45,8 +45,8 @@ - - Forum International de la Cybersécurité + + Forum International de la Cybersécurité @@ -57,7 +57,7 @@