diff --git a/flake.lock b/flake.lock index faa79accc..b941695ef 100644 --- a/flake.lock +++ b/flake.lock @@ -605,18 +605,18 @@ "yesod-auth-oauth2": { "flake": false, "locked": { - "lastModified": 1717165233, - "narHash": "sha256-j12y/Tjqv6aqQDqjlXElECmormeAgnjZ8WIfnEGZHvU=", + "lastModified": 1717297679, + "narHash": "sha256-IhPGedmDNoN1lJDHTjgZk2LC0WAmQ1D9bB6su3pgt0U=", "ref": "ghc-8.10.4", - "rev": "1a67089e5c075ca9474a647bbf26c3354c49036a", - "revCount": 416, + "rev": "da676b530887306b645d0170f82e7dd0611d9601", + "revCount": 423, "type": "git", - "url": "https://gitlab.uniworx.de/haskell/yesod-auth-oauth2.git" + "url": "https://gitlab.uniworx.de/haskell/yesod-auth-oauth2.git?commit=da676b530887306b645d0170f82e7dd0611d9601" }, "original": { "ref": "ghc-8.10.4", "type": "git", - "url": "https://gitlab.uniworx.de/haskell/yesod-auth-oauth2.git" + "url": "https://gitlab.uniworx.de/haskell/yesod-auth-oauth2.git?commit=da676b530887306b645d0170f82e7dd0611d9601" } }, "zip-stream": { diff --git a/flake.nix b/flake.nix index 2490b59e4..040b716b2 100644 --- a/flake.nix +++ b/flake.nix @@ -77,7 +77,7 @@ flake = false; }; yesod-auth-oauth2 = { - url = "git+https://gitlab.uniworx.de/haskell/yesod-auth-oauth2.git?ref=ghc-8.10.4"; + url = "git+https://gitlab.uniworx.de/haskell/yesod-auth-oauth2.git?ref=ghc-8.10.4&commit=da676b530887306b645d0170f82e7dd0611d9601"; flake = false; }; cryptonite = { diff --git a/frontend/src/_common.sass b/frontend/src/_common.sass index 041f2ce81..1eae7cf4f 100644 --- a/frontend/src/_common.sass +++ b/frontend/src/_common.sass @@ -3,11 +3,11 @@ // SPDX-License-Identifier: AGPL-3.0-or-later // SPDX-License-Identifier: LicenseRef-Fraport-Corporate-Design -@use "~@fortawesome/fontawesome-pro/scss/fontawesome" with ( $fa-font-path: "~@fortawesome/fontawesome-pro/webfonts" ) - -@forward "~@fortawesome/fontawesome-pro/scss/fontawesome" - -@use "~@fortawesome/fontawesome-pro/scss/solid" +// @use "~@fortawesome/fontawesome-pro/scss/fontawesome" with ( $fa-font-path: "~@fortawesome/fontawesome-pro/webfonts" ) +// +// @forward "~@fortawesome/fontawesome-pro/scss/fontawesome" +// +// @use "~@fortawesome/fontawesome-pro/scss/solid" @use "~typeface-roboto" as roboto @use "~typeface-source-sans-pro" as source-sans-pro diff --git a/frontend/src/app.sass b/frontend/src/app.sass index 07326f03d..dfab06b7c 100644 --- a/frontend/src/app.sass +++ b/frontend/src/app.sass @@ -450,9 +450,9 @@ input[type="button"].btn-info:not(.btn-link):hover, color: inherit &::before - @extend .fas + // @extend .fas - content: fa-content($fa-var-link) + // content: fa-content($fa-var-link) margin-right: 0.25em &.table__th-link::before @@ -655,7 +655,7 @@ section margin: 0 auto 0.5rem &::before - @extend .fas + // @extend .fas position: absolute display: flex diff --git a/frontend/src/utils/alerts/alerts.sass b/frontend/src/utils/alerts/alerts.sass index 2011be88e..b0463b7a9 100644 --- a/frontend/src/utils/alerts/alerts.sass +++ b/frontend/src/utils/alerts/alerts.sass @@ -24,9 +24,9 @@ cursor: pointer &::before - @extend .fas + // @extend .fas - content: fa-content($fa-var-chevron-up) + // content: fa-content($fa-var-chevron-up) position: absolute left: 50% top: 0 @@ -152,9 +152,9 @@ color: white &::before - @extend .fas + // @extend .fas - content: fa-content($fa-var-times) + // content: fa-content($fa-var-times) position: absolute top: 50% left: 50% diff --git a/frontend/src/utils/modal/modal.sass b/frontend/src/utils/modal/modal.sass index 4622f1f69..1c907f4bf 100644 --- a/frontend/src/utils/modal/modal.sass +++ b/frontend/src/utils/modal/modal.sass @@ -98,9 +98,9 @@ div.modal__trigger z-index: 20 &::before - @extend .fas + // @extend .fas - content: fa-content($fa-var-times) + // content: fa-content($fa-var-times) color: white .modal__content diff --git a/frontend/src/utils/tooltips/tooltips.sass b/frontend/src/utils/tooltips/tooltips.sass index 888dfc87d..73cc01cee 100644 --- a/frontend/src/utils/tooltips/tooltips.sass +++ b/frontend/src/utils/tooltips/tooltips.sass @@ -123,8 +123,8 @@ padding: 4px 17px 4px 4px &::after - @extend .fas - @extend .fa-fw + // @extend .fas + // @extend .fa-fw content: '\f129' position: absolute diff --git a/nix/frontend/node-packages.nix b/nix/frontend/node-packages.nix index d985d3771..5152fb220 100644 --- a/nix/frontend/node-packages.nix +++ b/nix/frontend/node-packages.nix @@ -1264,15 +1264,6 @@ let sha512 = "UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw=="; }; }; - "@fortawesome/fontawesome-pro-6.1.1" = { - name = "_at_fortawesome_slash_fontawesome-pro"; - packageName = "@fortawesome/fontawesome-pro"; - version = "6.1.1"; - src = fetchurlBoot { - url = "https://npm.fontawesome.com/@fortawesome/fontawesome-pro/-/6.1.1/fontawesome-pro-6.1.1.tgz"; - hash = "sha256-Pq+n8YWCwwQ9B1Etfqs5sypghBMPWPAJFQ49UAlnS18="; - }; - }; "@humanwhocodes/config-array-0.9.5" = { name = "_at_humanwhocodes_slash_config-array"; packageName = "@humanwhocodes/config-array"; @@ -10338,7 +10329,6 @@ let sources."strip-json-comments-3.1.1" ]; }) - sources."@fortawesome/fontawesome-pro-6.1.1" (sources."@humanwhocodes/config-array-0.9.5" // { dependencies = [ sources."brace-expansion-1.1.11" diff --git a/nix/uniworx/backend.nix b/nix/uniworx/backend.nix index fdd129cd9..d92bb7d16 100644 --- a/nix/uniworx/backend.nix +++ b/nix/uniworx/backend.nix @@ -22,8 +22,28 @@ in { ''; installPhase = '' + runHook preInstall mkdir -p $out cp -pr --reflink=auto ./. $out + echo "Hello from installPhase" + exit 1 + ''; + unpackPhase = '' + runHook postUnpack + ''; + postUnpack = '' + ${final.xorg.lndir}/bin/lndir -silent ${prev.uniworxFrontend} $sourceRoot + chmod -R a+w $sourceRoot + echo "Hello from postUnpack" + exit 1 + ''; + preInstall = '' + echo "Hello from preInstall" + exit 1 + export TZDIR=${final.tzdata}/share/zoneinfo + ${optionalString (gitRevision != null) '' + export GIT_REVISION=${gitRevision} + ''} ''; }; compiler-nix-name = "ghc8104"; @@ -61,16 +81,6 @@ in { } { packages.uniworx = { - postUnpack = '' - ${final.xorg.lndir}/bin/lndir -silent ${prev.uniworxFrontend} $sourceRoot - chmod a+w -R $sourceRoot - ''; - preBuild = '' - export TZDIR=${final.tzdata}/share/zoneinfo - ${optionalString (gitRevision != null) '' - export GIT_REVISION=${gitRevision} - ''} - ''; components.library.build-tools = with final.pkgs; [ llvm_9 ]; components.exes.uniworx.build-tools = with final.pkgs; [ llvm_9 ]; components.exes.uniworxdb.build-tools = with final.pkgs; [ llvm_9 ]; diff --git a/package-lock.json b/package-lock.json index ffe435572..d063b8416 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1733,12 +1733,6 @@ } } }, - "@fortawesome/fontawesome-pro": { - "version": "6.1.1", - "resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-pro/-/6.1.1/fontawesome-pro-6.1.1.tgz", - "integrity": "sha512-0w6GM8sCXNpcBLUz4bx61JvjjoCvfEIz5wBz2KjLNw9qk1F2XiUWuifXobvLbwaA7kqPGBRPo3U8Zw7zyaJ9sA==", - "dev": true - }, "@humanwhocodes/config-array": { "version": "0.9.5", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.5.tgz", diff --git a/package.json b/package.json index 34caec563..bbe3f0e44 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,6 @@ "@babel/preset-env": "^7.18.2", "@commitlint/cli": "^17.0.2", "@commitlint/config-conventional": "^17.0.2", - "@fortawesome/fontawesome-pro": "^6.1.1", "autoprefixer": "^10.4.7", "babel-core": "^6.26.3", "babel-loader": "^8.2.5",