forked from City-of-Helsinki/varaamo
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #191 from City-of-Turku/develop
Release tku-v1.3 Changes: - added customer group support for reservation payments - added support for paid reservations that require manual confirmation - added reservation order details to be included among other reservation details in staff pages - updated Matomo tracking code and renamed tracking env variable from PIWIK_SITE_ID to MATOMO_SITE_ID - changed home page purpose banners to be more compact on phones - added support for service announcements via a header banner - changed minimum node version requirement to be v14 - various minor improvements and fixes
- Loading branch information
Showing
127 changed files
with
7,849 additions
and
5,043 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
Dockerfile | ||
.dockerignore | ||
.editorconfig | ||
.env.example | ||
.github | ||
.git | ||
.gitattributes | ||
.gitignore | ||
.travis.yml | ||
.vscode | ||
node_modules | ||
coverage | ||
dist | ||
docker-compose.yml | ||
docker-compose.dev.yml | ||
docker-compose.prod.yml | ||
CHANGELOG.md | ||
README.md | ||
yarn.lock |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
# For most projects, this workflow file will not need changing; you simply need | ||
# to commit it to your repository. | ||
# | ||
# You may wish to alter this file to override the set of languages analyzed, | ||
# or to provide custom queries or build logic. | ||
# | ||
# ******** NOTE ******** | ||
# We have attempted to detect the languages in your repository. Please check | ||
# the `language` matrix defined below to confirm you have the correct set of | ||
# supported CodeQL languages. | ||
# | ||
name: "CodeQL" | ||
|
||
on: | ||
push: | ||
branches: [ develop ] | ||
pull_request: | ||
# The branches below must be a subset of the branches above | ||
branches: [ develop ] | ||
schedule: | ||
- cron: '41 14 * * 3' | ||
|
||
jobs: | ||
analyze: | ||
name: Analyze | ||
runs-on: ubuntu-latest | ||
permissions: | ||
actions: read | ||
contents: read | ||
security-events: write | ||
|
||
strategy: | ||
fail-fast: false | ||
matrix: | ||
language: [ 'javascript' ] | ||
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] | ||
# Learn more about CodeQL language support at https://git.io/codeql-language-support | ||
|
||
steps: | ||
- name: Checkout repository | ||
uses: actions/checkout@v2 | ||
|
||
# Initializes the CodeQL tools for scanning. | ||
- name: Initialize CodeQL | ||
uses: github/codeql-action/init@v1 | ||
with: | ||
languages: ${{ matrix.language }} | ||
# If you wish to specify custom queries, you can do so here or in a config file. | ||
# By default, queries listed here will override any specified in a config file. | ||
# Prefix the list here with "+" to use these queries and those in the config file. | ||
# queries: ./path/to/local/query, your-org/your-repo/queries@main | ||
|
||
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java). | ||
# If this step fails, then you should remove it and run the build manually (see below) | ||
- name: Autobuild | ||
uses: github/codeql-action/autobuild@v1 | ||
|
||
# ℹ️ Command-line programs to run using the OS shell. | ||
# 📚 https://git.io/JvXDl | ||
|
||
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines | ||
# and modify them (or add more) to build your code if your project | ||
# uses a compiled language | ||
|
||
#- run: | | ||
# make bootstrap | ||
# make release | ||
|
||
- name: Perform CodeQL Analysis | ||
uses: github/codeql-action/analyze@v1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,53 @@ | ||
# Docker image for Varaamo | ||
FROM node:14-alpine AS appbase | ||
|
||
# Pull node image with locked node version | ||
FROM node:10.15.1 | ||
# Install dependencies | ||
FROM appbase AS deps | ||
ENV NPM_CONFIG_LOGLEVEL warn | ||
|
||
# Make guest app dir | ||
RUN mkdir -p /usr/src/app | ||
# defaults to production, docker-compose dev overrides this to development on build and run. | ||
ARG NODE_ENV=production | ||
ENV NODE_ENV $NODE_ENV | ||
|
||
WORKDIR /app | ||
COPY package.json package-lock.json ./ | ||
|
||
RUN if [ "$NODE_ENV" = "production" ]; \ | ||
then npm ci --only=production && npm cache clean --force; \ | ||
else npm install; \ | ||
fi | ||
|
||
# Create build | ||
FROM appbase AS builder | ||
WORKDIR /app | ||
COPY --from=deps /app/node_modules /app/node_modules | ||
COPY --from=deps /app/package.json /app/package-lock.json ./ | ||
COPY . . | ||
RUN npm run build | ||
|
||
# Create production image | ||
FROM appbase AS runner | ||
|
||
# defaults to production, docker-compose dev overrides this to development on build and run. | ||
ARG NODE_ENV=production | ||
ENV NODE_ENV $NODE_ENV | ||
|
||
# set babel cache under tmp to allow writes for non root users | ||
ENV BABEL_CACHE_PATH=/tmp/babel_cache.json | ||
|
||
# Set workdir | ||
WORKDIR /usr/src/app | ||
|
||
COPY package.json package.json | ||
# copy desired files | ||
COPY --from=builder /app/package.json /app/.babelrc ./ | ||
|
||
COPY yarn.lock yarn.lock | ||
# copy individual folders | ||
COPY --from=builder /app/config ./config | ||
COPY --from=builder /app/server ./server | ||
COPY --from=builder /app/node_modules ./node_modules | ||
COPY --from=builder /app/dist ./dist | ||
|
||
RUN yarn install --silent | ||
EXPOSE 8080 | ||
|
||
CMD ["yarn", "start"] | ||
# set user to not be root | ||
USER node | ||
CMD ["node", "server/index.js"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,7 +18,6 @@ describe('Actions: userActions', () => { | |
args: [ | ||
'User', | ||
'user-get', | ||
id, | ||
], | ||
}); | ||
}); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.