fraport/fradrive
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Manual copy from branch 145-build-system-rewrite due to botched-merge

Browse Source
This commit is contained in:
Steffen Jost 2025-03-03 11:56:07 +01:00
parent aae5a5f997
commit 3929bccd6e
4 changed files with 4 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
.gitlab-ci.yml
View File

@ -54,33 +54,6 @@ stages:
- backend
- release
node dependencies:
stage: frontend:build
script:
- nix -L build -o result ".#uniworxNodeDependencies"
- nix-store --export $(nix-store -qR result) | xz -T0 -2 > node-dependencies.nar.xz
before_script: &nix-before
- git config --global init.defaultBranch master
- install -v -m 0700 -d ~/.ssh
- install -v -T -m 0644 "${SSH_KNOWN_HOSTS}" ~/.ssh/known_hosts
- install -v -T -m 0400 "${SSH_DEPLOY_KEY}" ~/.ssh/deploy && echo "IdentityFile ~/.ssh/deploy" >> ~/.ssh/config;
- install -v -T -m 0644 "${FONTAWESOME_NPM_AUTH_FILE}" /etc/fontawesome-token
- install -v -T -m 0644 "${FONTBASE64_STONE_SANS_FRAPORT_II_MD}" /etc/fonts/Stone-Sans-Fraport-II-Md.base64
- base64 --decode /etc/fonts/Stone-Sans-Fraport-II-Md.base64 > /etc/fonts/Stone-Sans-Fraport-II-Md.ttf
- install -v -T -m 0644 "${FONTBASE64_STONE_SANS_FRAPORT_II_MDIT}" /etc/fonts/Stone-Sans-Fraport-II-MdIt.base64
- base64 --decode /etc/fonts/Stone-Sans-Fraport-II-MdIt.base64 > /etc/fonts/Stone-Sans-Fraport-II-MdIt.ttf
- install -v -T -m 0644 "${FONTBASE64_STONE_SANS_FRAPORT_II_SMBD}" /etc/fonts/Stone-Sans-Fraport-II-SmBd.base64
- base64 --decode /etc/fonts/Stone-Sans-Fraport-II-SmBd.base64 > /etc/fonts/Stone-Sans-Fraport-II-SmBd.ttf
- install -v -T -m 0644 "${FONTBASE64_STONE_SANS_FRAPORT_II_SMBDIT}" /etc/fonts/Stone-Sans-Fraport-II-SmBdIt.base64
- base64 --decode /etc/fonts/Stone-Sans-Fraport-II-SmBdIt.base64 > /etc/fonts/Stone-Sans-Fraport-II-SmBdIt.ttf
- install -v -T -m 0644 "${NIX_NETRC}" /etc/nix/netrc
artifacts:
paths:
- node-dependencies.nar.xz
name: "${CI_JOB_NAME}-${CI_COMMIT_SHORT_SHA}"
expire_in: "1 day"
retry: 2
interruptible: true
setup:dynamic:
stage: setup

4
Makefile
View File

@ -266,7 +266,6 @@ endif
export DEV_PORT_HTTP=`cat $(CONTAINER_FILE) | grep 'DEV_PORT_HTTP=' | sed 's/DEV_PORT_HTTP=//'`; \
export DEV_PORT_HTTPS=`cat $(CONTAINER_FILE) | grep 'DEV_PORT_HTTPS=' | sed 's/DEV_PORT_HTTPS=//'`; \
export HOST=127.0.0.1 ; \
export HOST=127.0.0.1 ; \
export PORT=$${PORT:-$${DEV_PORT_HTTP}} ; \
export DETAILED_LOGGING=$${DETAILED_LOGGING:-true} ; \
export LOG_ALL=$${LOG_ALL:-false} ; \
@ -280,7 +279,7 @@ endif
export RIBBON=$${RIBBON:-$${HOST:-localhost}} ; \
export APPROOT=$${APPROOT:-http://localhost:$${DEV_PORT_HTTP}} ; \
export AVSPASS=$${AVSPASS:-nopasswordset} ; \
stack $(STACK_CORES) exec --local-bin-path $$(pwd)/bin --copy-bins -- yesod devel -n -p "$${DEV_PORT_HTTP}" -q "$${DEV_PORT_HTTPS}"
stack $(STACK_CORES) exec --local-bin-path $$(pwd)/bin --copy-bins -- yesod devel -p "$${DEV_PORT_HTTP}" -q "$${DEV_PORT_HTTPS}"
# HELP(compile-backend): compile backend binaries
--compile-backend:
stack build $(STACK_CORES) --fast --profile --library-profiling --executable-profiling --flag uniworx:-library-only $(--DEVELOPMENT) --local-bin-path $$(pwd)/bin --copy-bins
@ -333,7 +332,6 @@ well-known: static;
# HELP(shell-ghci): enter ghci shell. Use "make ghci SRC=<MODULE_FILE.hs>" to load specific source modules."
--shell-ghci:
stack ghci -- $(SRC)
stack ghci -- $(SRC)
# --main-is uniworx:exe:uniworx
# HELP(shell-{backend,frontend,memcached,minio,postgres}): enter (bash) shell inside a new container of a given service

2
frontend/src/utils/exam-correct/exam-correct.js
View File

@ -301,7 +301,7 @@ export class ExamCorrect {
users: [user],
status: STATUS.LOADING,
};
if (results && Object.keys(results).length > 0) rowInfo.results = results;
if (results && results != {}) rowInfo.results = results;
if (result !== undefined) rowInfo.result = result;
this._addRow(rowInfo);

6
frontend/src/utils/inputs/inputs.sass
View File

@ -163,6 +163,7 @@ input[type*='time'],
// TEXTAREAS
textarea
width: 100%
height: 170px
max-width: 600px
line-height: 1.5
color: #363636
@ -175,8 +176,6 @@ textarea
border-radius: 2px
box-shadow: inset 0 1px 2px 1px rgba(50, 50, 50, 0.05)
vertical-align: top
&:not(.uwx-short)
height: 172px
// SHARED STATE RELATED STYLES
@ -212,11 +211,10 @@ option
border-radius: 2px
outline: 0
color: #363636
min-width: 250px
width: auto
background-color: #f3f3f3
box-shadow: inset 0 1px 2px 1px rgba(50, 50, 50, 0.05)
&:not(.uwx-narrow)
min-width: 250px
@media (max-width: 425px)
select, option