Merge branch 'master' into nutzungsbedingungen

2019-12-19 14:40:14 +01:00 · 2019-12-19 14:40:14 +01:00 · da99d3e198
commit da99d3e198
parent 2599e86a59 badc325714
8 changed files with 119 additions and 62 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -13,7 +13,7 @@ variables:
  POSTGRES_DB: uniworx_test
  POSTGRES_USER: uniworx
  POSTGRES_PASSWORD: uniworx
-
+  
 stages:
  - setup
  - frontend:build
@ -34,9 +34,9 @@ npm install:
    - npm install -g npm
    - hash -r
    - apt-get install openssh-client -y
-    - install -m 0700 -d ~/.ssh
-    - install -T -m 0644 ${SSH_KNOWN_HOSTS} ~/.ssh/known_hosts
-    - for keyVar in ${!SSH_PRIVATE_KEY_NPM_*}; do install -T -m 0400 ${!keyVar} ~/.ssh/${keyVar}; echo "IdentityFile ~/.ssh/${keyVar}" >> ~/.ssh/config; done
+    - 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; 
  artifacts:
    paths:
      - node_modules/
@ -82,10 +82,10 @@ yesod:build:dev:
    - apt-get update -y
    - apt-get install -y --no-install-recommends locales-all
    - ln -s $(which g++-7) $(dirname $(which g++-7))/g++
-    - 'which ssh-agent || apt-get install openssh-client -y'
-    - install -m 0700 -d ~/.ssh
-    - install -T -m 0644 ${SSH_KNOWN_HOSTS} ~/.ssh/known_hosts
-    - for keyVar in ${!SSH_PRIVATE_KEY_STACK_*}; do install -T -m 0400 ${!keyVar} ~/.ssh/${keyVar}; echo "IdentityFile ~/.ssh/${keyVar}" >> ~/.ssh/config; done
+    - apt-get install openssh-client -y
+    - 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; 
  artifacts:
    paths:
      - bin/
@ -110,9 +110,9 @@ yesod:build:
    - apt-get install -y --no-install-recommends locales-all
    - ln -s $(which g++-7) $(dirname $(which g++-7))/g++
    - apt-get install -y --no-install-recommends openssh-client
-    - install -m 0700 -d ~/.ssh
-    - install -T -m 0644 ${SSH_KNOWN_HOSTS} ~/.ssh/known_hosts
-    - for keyVar in ${!SSH_PRIVATE_KEY_STACK_*}; do install -T -m 0400 ${!keyVar} ~/.ssh/${keyVar}; echo "IdentityFile ~/.ssh/${keyVar}" >> ~/.ssh/config; done
+    - 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; 
  artifacts:
    paths:
      - bin/
@ -237,9 +237,9 @@ deploy:uniworx3:
  before_script:
    - apt-get update -y
    - apt-get install -y --no-install-recommends openssh-client
-    - install -m 0700 -d ~/.ssh
-    - install -T -m 0644 ${SSH_KNOWN_HOSTS} ~/.ssh/known_hosts
-    - install -T -m 0400 ${SSH_PRIVATE_KEY_UNIWORX3} ~/.ssh/SSH_PRIVATE_KEY_UNIWORX3; echo "IdentityFile ~/.ssh/SSH_PRIVATE_KEY_UNIWORX3" >> ~/.ssh/config; 
+    - install -v -m 0700 -d ~/.ssh
+    - install -v -T -m 0644 ${SSH_KNOWN_HOSTS} ~/.ssh/known_hosts
+    - install -v -T -m 0400 ${SSH_PRIVATE_KEY_UNIWORX3} ~/.ssh/uniworx3; echo "IdentityFile ~/.ssh/uniworx3" >> ~/.ssh/config; 
  dependencies:
    - yesod:build
        
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,6 +2,66 @@

 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

+### [10.0.1](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v10.0.0...v10.0.1) (2019-12-19)
+
+
+### Bug Fixes
+
+* fix grid blowout on definition lists ([3cb3dcd](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/3cb3dcd))
+* remove link icon on table sorting links ([e7e7d2b](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/e7e7d2b))
+
+
+
+## [10.0.0](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v9.0.3...v10.0.0) (2019-12-18)
+
+
+### Bug Fixes
+
+* **allocation-list:** fix default sorting ([9eff3cf](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/9eff3cf))
+* **allocation-list:** fix sorting ([33d9bac](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/33d9bac))
+* **datepicker:** fixes [#456](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/456) ([613426b](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/613426b))
+* **hide-columns:** check for content div in isEmptyColumn ([615555e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/615555e))
+* **hide-columns:** correctly hide hiders of previously hidden columns ([364991c](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/364991c))
+* **hide-columns:** fix crash if no row is present ([827cecd](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/827cecd))
+* **hide-columns:** fix repositioning of table hiders onclick ([9d8ca38](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/9d8ca38))
+* **hide-columns:** fix vertical positioning of hider and minor refactor ([3fbb4db](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/3fbb4db))
+* **hide-columns:** improve positioning ([e371412](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/e371412))
+* **hide-columns:** remove debug text from template ([9e449dd](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/9e449dd))
+* **pageaction:** fixes [#463](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/issues/463) ([849c6c4](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/849c6c4))
+* fix hlint ([37f0936](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/37f0936))
+* **submission:** allow not modifying submissionUsers ([030fd7a](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/030fd7a))
+
+
+### Features
+
+* **default-layout:** save handler ident to main content ([ba846be](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/ba846be))
+* **foundation:** move stuff out of Foundation ([e27beba](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/e27beba))
+* **frontend:** use webpack more extensively ([5d8c2af](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/5d8c2af))
+* **hide-columns:** better positioning of hiders ([761c6d3](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/761c6d3))
+* **hide-columns:** correct storage keys ([610d13a](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/610d13a))
+* **hide-columns:** fadein transformation ([506f94e](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/506f94e))
+* **hide-columns:** first stub of hide-column util with manual styling ([111821d](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/111821d))
+* **hide-columns:** get table wrapper ident for storage ident ([d55d3ef](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d55d3ef))
+* **hide-columns:** hide empty columns per default ([d1232ce](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/d1232ce))
+* **hide-columns:** more (broken) styling; move hider elements in DOM ([e655bc6](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/e655bc6))
+* **hide-columns:** more styling ([4908702](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/4908702))
+* **hide-columns:** refactor and auto-hide empty columns ([047c0a5](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/047c0a5))
+* **hide-columns:** set attributes for hide-columns and extra-stuff div ([169a479](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/169a479))
+* **hide-columns:** styling stub with repositioning ([a9c17d7](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/a9c17d7))
+* **hide-columns:** support colspan & don't persist autohide ([0798d68](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/0798d68))
+* **storage-manager:** add storage manager library ([1023240](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/1023240))
+* **storage-manager:** location hierarchy ([80ff4ac](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/80ff4ac))
+* **submission:** edit notifications ([98c0d69](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/98c0d69))
+* **submission:** warn about deleting co-submissions ([e87f607](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/commit/e87f607))
+
+
+### BREAKING CHANGES
+
+* **hide-columns:** StorageManager version numbers
+* **frontend:** Major frontend refactor
+
+
+
 ### [9.0.3](https://gitlab2.rz.ifi.lmu.de/uni2work/uni2work/compare/v9.0.2...v9.0.3) (2019-12-03)


--- a/frontend/src/app.sass
+++ b/frontend/src/app.sass
@ -157,12 +157,19 @@ h4
  position: relative

 .main__content
+  --current-header-height: var(--header-height-collapsed)
  position: relative
  background-color: white
  transition: padding-left .2s ease-out
-  margin-top: var(--header-height-collapsed)
+  margin-top: var(--current-header-height)
  margin-left: 0

+  :target::before
+    content: ""
+    display: block
+    height: var(--current-header-height)
+    margin: calc(-1 * var(--current-header-height)) 0 0
+
  > .container
    margin: 20px 0

@ -185,8 +192,8 @@ h4

@media (min-width: 769px)
  .main__content
+    --current-header-height: var(--header-height)
    margin-left: var(--asidenav-width-lg, 20%)
-    margin-top: var(--header-height)

@media (min-width: 1200px)
  .main__content
@ -352,6 +359,9 @@ input[type="button"].btn-info:hover,
      content: fa-content($fa-var-link)
      margin-right: 0.25em

+    &.table__th-link::before
+      display: none
+
@media (max-width: 1200px)
  .table th
    padding: 4px 6px
@ -360,12 +370,6 @@ input[type="button"].btn-info:hover,
  max-height: 200px
  overflow-y: auto

-.table__th-link
-  font-weight: bold
-
-  &::before
-    display: none
-
 .table--vertical
  th
    background-color: transparent
@ -434,7 +438,7 @@ ul.list--inline
 // DEFINITION LIST
 .deflist
  display: grid
-  grid-template-columns: 100%
+  grid-template-columns: minmax(0,100%)

 .deflist__dt,
 .deflist__dd
@ -452,7 +456,7 @@ ul.list--inline

@media (min-width: 768px)
  .deflist
-    grid-template-columns: fit-content(25vw) 1fr
+    grid-template-columns: fit-content(25vw) minmax(0,1fr)

    .deflist
      margin-top: -10px
--- a/karma.conf.js
+++ b/karma.conf.js
@ -44,7 +44,7 @@ module.exports = function(config) {
            }
          },
          {
-            test: /\.(css|scss)$/i,
+            test: /\.(css|scss|sass)$/i,
            loader:'null-loader',
          }
        ]
--- a/package-lock.json
+++ b/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "uni2work",
-  "version": "9.0.3",
+  "version": "10.0.1",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "uni2work",
-  "version": "9.0.3",
+  "version": "10.0.1",
  "description": "",
  "keywords": [],
  "author": "",
--- a/package.yaml
+++ b/package.yaml
@ -1,41 +1,37 @@
 name:    uniworx
-version: 9.0.3
+version: 10.0.1

 dependencies:
-  - base >=4.9.1.0 && <5
-  - yesod >=1.6 && <1.7
-  - yesod-core >=1.6 && <1.7
-  - yesod-auth >=1.6 && <1.7
-  - yesod-static >=1.6 && <1.7
-  - yesod-form >=1.6 && <1.7
-  - classy-prelude >=1.5 && <1.6
-  - classy-prelude-conduit >=1.5 && <1.6
-  - classy-prelude-yesod >=1.5 && <1.6
-  - bytestring >=0.10 && <0.11
-  - text >=0.11 && <2.0
-  - persistent >=2.9 && <2.10
-  - persistent-postgresql >=2.9 && <2.10
-  - persistent-template >=2.5 && <2.9
-  - persistent-qq >=2.9 && <2.10
+  - base
+  - yesod
+  - yesod-core
+  - yesod-auth
+  - yesod-static
+  - yesod-form
+  - classy-prelude
+  - classy-prelude-yesod
+  - bytestring
+  - text
+  - persistent
+  - persistent-postgresql
+  - persistent-template
+  - persistent-qq
  - template-haskell
-  - shakespeare >=2.0 && <2.1
-  - hjsmin >=0.1 && <0.3
-  - monad-control >=0.3 && <1.1
-  - wai-extra >=3.0 && <3.1
-  - yaml >=0.11 && <0.12
-  - http-conduit >=2.3 && <2.4
-  - directory >=1.1 && <1.4
-  - warp >=3.0 && <3.3
+  - shakespeare
+  - monad-control
+  - wai-extra
+  - yaml
+  - http-conduit
+  - directory
+  - warp
  - data-default
-  - aeson >=1.4 && <1.5
-  - conduit >=1.0 && <2.0
-  - conduit-combinators
-  - monad-logger >=0.3 && <0.4
-  - fast-logger >=2.2 && <2.5
-  - wai-logger >=2.2 && <2.4
+  - aeson
+  - conduit
+  - monad-logger
+  - fast-logger
+  - wai-logger
  - foreign-store
  - file-embed
-  - safe
  - unordered-containers
  - containers
  - vector
@ -67,7 +63,6 @@ dependencies:
  - binary
  - cereal
  - mtl
-  - sandi
  - esqueleto >=3.1.0
  - mime-types
  - generic-deriving
@ -78,8 +73,6 @@ dependencies:
  - uuid
  - exceptions
  - stm
-  - stm-chans
-  - stm-conduit
  - lens
  - MonadRandom
  - email-validate
--- a/shell.nix
+++ b/shell.nix
@ -19,7 +19,7 @@ let
  '';

  override = oldAttrs: {
-  nativeBuildInputs = oldAttrs.nativeBuildInputs ++ (with pkgs; [ nodejs-12_x postgresql openldap google-chrome ]) ++ (with haskellPackages; [ stack yesod-bin hlint cabal-install ]);
+  nativeBuildInputs = oldAttrs.nativeBuildInputs ++ (with pkgs; [ nodejs-12_x postgresql openldap google-chrome ]) ++ (with haskellPackages; [ stack yesod-bin hlint cabal-install weeder ]);
    shellHook = ''
      export PROMPT_INFO="${oldAttrs.name}"