diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 433136558..c53b81cf1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/Makefile b/Makefile index edc6631ec..5adf403ea 100644 --- a/Makefile +++ b/Makefile @@ -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=" 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 diff --git a/frontend/src/utils/exam-correct/exam-correct.js b/frontend/src/utils/exam-correct/exam-correct.js index ba12d641a..c7978325e 100644 --- a/frontend/src/utils/exam-correct/exam-correct.js +++ b/frontend/src/utils/exam-correct/exam-correct.js @@ -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); diff --git a/frontend/src/utils/inputs/inputs.sass b/frontend/src/utils/inputs/inputs.sass index fb1a68069..8eda7ad8b 100644 --- a/frontend/src/utils/inputs/inputs.sass +++ b/frontend/src/utils/inputs/inputs.sass @@ -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