From 88367a9219b0d342def394a997f53d1910f2ed12 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Thu, 16 Jan 2025 11:27:59 +0100 Subject: [PATCH] chore(frontend): splice PROJECT_DIR into icon import sass --- .gitignore | 1 + Makefile | 8 +++++--- frontend/src/icons.scss | 5 +++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 0c90b8a6f..fdaf213a9 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,7 @@ uniworx.nix .kateproject src/Handler/Assist.bak src/Handler/Course.SnapCustom.hs +frontend/src/env.sass *.orig /instance .stack-work-* diff --git a/Makefile b/Makefile index e85fd602b..81da7bbfe 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ help: # HELP: stop all running containers and remove all compilation results in the directory (but leave images including dependencies unharmed) clean: rm -rf develop - -rm -rf node_modules .npm .cache assets/icons assets/favicons static well-known config/manifest.json + -rm -rf node_modules .npm .cache assets/icons assets/favicons static well-known config/manifest.json frontend/src/env.sass -rm -rf .stack-work .stack-work.lock -rm -rf bin .Dockerfile develop -$(CONTAINER_COMMAND) container prune --force @@ -293,7 +293,7 @@ uniworx.cabal: stack exec -- hpack --force # HELP(compile-frontend): compile frontend assets ---compile-frontend: node_modules assets esbuild.config.mjs +--compile-frontend: node_modules assets esbuild.config.mjs frontend/src/env.sass npm run build --start-frontend: --compile-frontend; --dependencies-frontend: node_modules assets static well-known; @@ -308,7 +308,9 @@ assets/icons: node_modules assets/icons-src/fontawesome.json ./utils/renamer.pl node_modules/@fortawesome/fontawesome-free/svgs/solid assets/icons-src/fontawesome.json assets/icons/fradrive ./utils/renamer.pl node_modules/@fortawesome/fontawesome-free/svgs/regular assets/icons-src/fontawesome.json assets/icons/fradrive -cp assets/icons-src/*.svg assets/icons/fradrive -static: node_modules assets esbuild.config.mjs +frontend/src/env.sass: + echo "\$$path: '$${PROJECT_DIR}'" > frontend/src/env.sass +static: node_modules assets esbuild.config.mjs frontend/src/env.sass npm run build well-known: static; diff --git a/frontend/src/icons.scss b/frontend/src/icons.scss index 2b65e5e88..0392849aa 100644 --- a/frontend/src/icons.scss +++ b/frontend/src/icons.scss @@ -1,8 +1,9 @@ -// SPDX-FileCopyrightText: 2024 David Mosbach , Sarah Vaupel +// SPDX-FileCopyrightText: 2024-2025 David Mosbach , Sarah Vaupel // // SPDX-License-Identifier: AGPL-3.0-or-later // SPDX-License-Identifier: LicenseRef-Fraport-Corporate-Design +@import 'env'; $ico-width: 30px; @@ -102,7 +103,7 @@ $icons: new, @each $name in $icons { .ico-#{$name} { - background-image: url('/mnt/fradrive/assets/icons/fradrive/#{$name}.svg'); + background-image: url('#{$path}/assets/icons/fradrive/#{$name}.svg'); background-size: contain; background-repeat: no-repeat; background-position: center;