Skip to content

Commit

Permalink
Merge pull request #44 from gisktzh/develop
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
Tugark authored Nov 20, 2024
2 parents bd6c64b + 617f127 commit 6d4df2b
Show file tree
Hide file tree
Showing 125 changed files with 1,096 additions and 690 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/node-deploy.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: Deploy to GH Pages

on: workflow_call
on:
workflow_call:
workflow_dispatch:


env:
NODE_VERSION: '20'
Expand Down Expand Up @@ -39,6 +42,9 @@ jobs:
path: ./dist/browser
deploy:
name: Deploy to GH pages
permissions:
pages: write
id-token: write
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.17
20.18
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,8 @@ helper files in our `\styles` folder:
notable the color palettes that are used everywhere. Try to avoid hard-coded color values inside some local SCSS file.
- **variables/\_z-index-variables.scss** contains all z-indices ordered by the highest value first. This is used to keep
track of which element should be on top of which element in one place.
- **\_headings.scss** contains all heading styles used in the application. This is used to keep track of all heading styles in
one place. They are based on the design system of the Canton of Zurich [(see Figma)](https://www.figma.com/design/MsFtPBJrdzPPevIAZwtxDn/GB3-mit-KTZH-Design-System?node-id=10-5055&node-type=canvas&t=BCmKrCIFSSdxjNgz-0).

To use those global styles within a local SCSS file use the following syntax (or part of it):

Expand Down
26 changes: 26 additions & 0 deletions docker-compose.ktzh.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
services:
gb3-frontend:
restart: always
ports:
- 8081:8080
environment:
- TZ=Europe/Zurich
build:
context: ./
args:
- http_proxy=http://igw-axzh.abxsec.com:8080
- https_proxy=http://igw-axzh.abxsec.com:8080
- TARGET_ENVIRONMENT=$STAGE
image: gitlab.ktzh.ch:5050/gis/gb3-web_ui/gb3-frontend:latest
container_name: gb3-frontend
volumes:
- nginx-logs:/var/log/nginx
logging:
options:
max-size: "50m"
max-file: "5"

volumes:
nginx-logs:
external: true
name: nginx-logs
186 changes: 103 additions & 83 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6d4df2b

Please sign in to comment.