Skip to content

Commit

Permalink
Merge pull request #147 from amosproj/feature/#118-preset-save-save-p…
Browse files Browse the repository at this point in the history
…reset-button-and-text-box

Add preset save button #118
  • Loading branch information
jandegen authored Jan 18, 2023
2 parents 2ce33fe + 4eafd0a commit a373917
Show file tree
Hide file tree
Showing 70 changed files with 6,767 additions and 612 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-backend-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- 'Apps/backend/**.*'
- '.github/workflows/build-backend-automation.yml'
pull_request:
branches:
branches:
- "dev"
- "int"
- "main"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-frontend-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- 'Apps/frontend/**.*'
- '.github/workflows/build-frontend-automation.yml'
pull_request:
branches:
branches:
- "dev"
- "int"
- "main"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-generator-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- 'Apps/generator/**.*'
- '.github/workflows/build-generator-automation.yml'
pull_request:
branches:
branches:
- "dev"
- "int"
- "main"
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/push-backend-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,27 +61,27 @@ jobs:
- "build-push"

steps:
-
-
if: github.event.pull_request.base.ref == 'dev'
name: Invoke deployment hook
uses: distributhor/workflow-webhook@v2
env:
webhook_url: ${{ secrets.WEBHOOK_URL_DEV }}?VERSION_TAG=nightly
webhook_url: ${{ secrets.WEBHOOK_URL_DEV }}?VERSION_TAG=nightly&API_KEY=${{ secrets.FRONTEND_API_KEY }}
webhook_secret: "none"
verbose: true
-
-
if: github.event.pull_request.base.ref == 'int'
name: Invoke deployment hook
uses: distributhor/workflow-webhook@v2
env:
webhook_url: ${{ secrets.WEBHOOK_URL_INT }}?VERSION_TAG=${{ github.event.pull_request.title }}
webhook_url: ${{ secrets.WEBHOOK_URL_INT }}?VERSION_TAG=${{ github.event.pull_request.title }}&API_KEY=${{ secrets.FRONTEND_API_KEY }}
webhook_secret: "none"
verbose: true
-
-
if: github.event.pull_request.base.ref == 'main'
name: Invoke deployment hook
uses: distributhor/workflow-webhook@v2
env:
webhook_url: ${{ secrets.WEBHOOK_URL_PROD }}?VERSION_TAG=${{ github.event.pull_request.title }}
webhook_url: ${{ secrets.WEBHOOK_URL_PROD }}?VERSION_TAG=${{ github.event.pull_request.title }}&API_KEY=${{ secrets.FRONTEND_API_KEY }}
webhook_secret: "none"
verbose: true
12 changes: 6 additions & 6 deletions .github/workflows/push-frontend-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,27 +67,27 @@ jobs:
- "build-push"

steps:
-
-
if: github.event.pull_request.base.ref == 'dev'
name: Invoke deployment hook
uses: distributhor/workflow-webhook@v2
env:
webhook_url: ${{ secrets.WEBHOOK_URL_DEV }}?VERSION_TAG=nightly
webhook_url: ${{ secrets.WEBHOOK_URL_DEV }}?VERSION_TAG=nightly&API_KEY=${{ secrets.FRONTEND_API_KEY }}
webhook_secret: "none"
verbose: true
-
-
if: github.event.pull_request.base.ref == 'int'
name: Invoke deployment hook
uses: distributhor/workflow-webhook@v2
env:
webhook_url: ${{ secrets.WEBHOOK_URL_INT }}?VERSION_TAG=${{ github.event.pull_request.title }}
webhook_url: ${{ secrets.WEBHOOK_URL_INT }}?VERSION_TAG=${{ github.event.pull_request.title }}&API_KEY=${{ secrets.FRONTEND_API_KEY }}
webhook_secret: "none"
verbose: true
-
-
if: github.event.pull_request.base.ref == 'main'
name: Invoke deployment hook
uses: distributhor/workflow-webhook@v2
env:
webhook_url: ${{ secrets.WEBHOOK_URL_PROD }}?VERSION_TAG=${{ github.event.pull_request.title }}
webhook_url: ${{ secrets.WEBHOOK_URL_PROD }}?VERSION_TAG=${{ github.event.pull_request.title }}&API_KEY=${{ secrets.FRONTEND_API_KEY }}
webhook_secret: "none"
verbose: true
6 changes: 3 additions & 3 deletions .github/workflows/push-generator-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,23 +61,23 @@ jobs:
- "build-push"

steps:
-
-
if: github.event.pull_request.base.ref == 'dev'
name: Invoke deployment hook
uses: distributhor/workflow-webhook@v2
env:
webhook_url: ${{ secrets.WEBHOOK_URL_DEV }}?VERSION_TAG=nightly
webhook_secret: "none"
verbose: true
-
-
if: github.event.pull_request.base.ref == 'int'
name: Invoke deployment hook
uses: distributhor/workflow-webhook@v2
env:
webhook_url: ${{ secrets.WEBHOOK_URL_INT }}?VERSION_TAG=${{ github.event.pull_request.title }}
webhook_secret: "none"
verbose: true
-
-
if: github.event.pull_request.base.ref == 'main'
name: Invoke deployment hook
uses: distributhor/workflow-webhook@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
id: create_release
uses: actions/create-release@latest
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ github.event.pull_request.title }}
release_name: ${{ github.event.pull_request.title }}
Expand All @@ -39,7 +39,7 @@ jobs:
id: create_release
uses: actions/create-release@latest
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ github.event.pull_request.title }}
release_name: ${{ github.event.pull_request.title }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-frontend-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- 'Apps/frontend/**.*'
- '.github/workflows/test-frontend-automation.yml'
pull_request:
branches:
branches:
- "dev"
- "int"
- "main"
Expand All @@ -26,10 +26,10 @@ jobs:
# Disable running of tests within install job
runTests: false
build: npm run build

- name: Cypress Test Execution
uses: cypress-io/github-action@v4
with:
with:
working-directory: ./Apps/frontend
start: npm run dev
wait-on: 'http://127.0.0.1:5173'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-generator-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- 'Apps/generator/**.*'
- '.github/workflows/test-generator-automation.yml'
pull_request:
branches:
branches:
- "dev"
- "int"
- "main"
Expand Down
7 changes: 7 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v1.2.3
hooks:
- id: trailing-whitespace
- id: check-yaml
- id: end-of-file-fixer
1 change: 1 addition & 0 deletions Apps/backend/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules/**
16 changes: 16 additions & 0 deletions Apps/backend/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"env": {
"browser": true,
"es2021": true
},
"extends": ["eslint:recommended", "plugin:cypress/recommended", "prettier"],
"plugins": ["prettier"],
"parserOptions": {
"ecmaVersion": "latest",
"sourceType": "module"
},
"rules": {
"prettier/prettier": "error"
},
"ignorePatterns": ["src/assets/**/*"]
}
6 changes: 6 additions & 0 deletions Apps/backend/.prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"trailingComma": "es5",
"tabWidth": 2,
"semi": true,
"singleQuote": false
}
2 changes: 1 addition & 1 deletion Apps/backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ RUN npm install
# Copy source code into docker container
COPY . ./

CMD [ "npm", "start" ]
CMD [ "npm", "start" ]
Loading

0 comments on commit a373917

Please sign in to comment.