Skip to content
This repository was archived by the owner on Apr 5, 2024. It is now read-only.

Commit 7b12a5b

Browse files
authored
Feature/fix folder structure of project (#116)
* change gitignore * moved the fe dir to the root of the project * also move hidden files * update deps * change demo url
1 parent 40efe8e commit 7b12a5b

File tree

133 files changed

+65
-114
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+65
-114
lines changed

.github/workflows/featureRelease.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ on:
55
branches:
66
- 'feature/**'
77
paths:
8-
- 'webapp_frontend/**'
8+
- 'src/**'
9+
- 'package.json'
910
- 'webapp_provider/**'
1011
- '.github/workflows/featureRelease.yml'
1112

@@ -26,22 +27,19 @@ jobs:
2627
-
2728
name: Checkout frontend
2829
run: |
29-
cd webapp_frontend
3030
npm i
3131
-
3232
name: Update Sonar
3333
run: |
34-
cd webapp_frontend
3534
npm run-script sonar
3635
env:
3736
SONAR_LOGIN: ${{ secrets.SONAR_LOGIN }}
3837
SONAR_PASSWORD: ${{ secrets.SONAR_PASSWORD }}
3938
-
4039
name: Build frontend
4140
run: |
42-
cd webapp_frontend
4341
npm run-script build
44-
cp -r build ../webapp_provider/public
42+
cp -r build webapp_provider/public
4543
-
4644
name: Login to DockerHub
4745
uses: docker/login-action@v1

.github/workflows/latestRelease.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ on:
55
push:
66
branches: "master"
77
paths:
8-
- 'webapp_frontend/**'
8+
- 'src/**'
9+
- 'package.json'
910
- 'webapp_provider/**'
1011

1112
jobs:
@@ -23,22 +24,19 @@ jobs:
2324
-
2425
name: Checkout frontend
2526
run: |
26-
cd webapp_frontend
2727
npm i
2828
-
2929
name: Update Sonar
3030
run: |
31-
cd webapp_frontend
3231
npm run-script sonar
3332
env:
3433
SONAR_LOGIN: ${{ secrets.SONAR_LOGIN }}
3534
SONAR_PASSWORD: ${{ secrets.SONAR_PASSWORD }}
3635
-
3736
name: Build Frontend
3837
run: |
39-
cd webapp_frontend
4038
npm run-script build
41-
cp -r build ../webapp_provider/public
39+
cp -r build webapp_provider/public
4240
-
4341
name: Login to DockerHub
4442
uses: docker/login-action@v1

.github/workflows/stableRelease.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@ jobs:
1717
node-version: 12
1818
- name: Build frontend
1919
run: |
20-
cd webapp_frontend
2120
npm i
2221
npm run-script build
23-
cp -r build ../webapp_provider/public
22+
cp -r build webapp_provider/public
2423
- name: Login to DockerHub
2524
uses: docker/login-action@v1
2625
with:

.github/workflows/storybookBuild.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Storybook Release
33
on:
44
pull_request:
55
paths:
6-
- 'webapp_frontend/src/**'
6+
- 'src/**'
77

88
jobs:
99
Build_Docker_Image:
@@ -17,10 +17,9 @@ jobs:
1717
node-version: 12
1818
- name: Build storybook
1919
run: |
20-
cd webapp_frontend
2120
npm i
2221
npm run build-storybook
23-
cp -r storybook-static ../storybook_provider/public
22+
cp -r storybook-static storybook_provider/public
2423
- name: Login to DockerHub
2524
uses: docker/login-action@v1
2625
with:

.github/workflows/tests.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ name: End-to-end tests
22
on:
33
push:
44
paths:
5-
- 'webapp_frontend/src/**'
6-
- 'webapp_frontend/cypress/**'
5+
- 'src/**'
6+
- 'cypress/**'
77
- '.github/workflows/tests.yml'
8-
- 'webapp_frontend/package.json'
8+
- 'package.json'
99
jobs:
1010
runTests:
1111
runs-on: ubuntu-16.04
@@ -16,7 +16,6 @@ jobs:
1616
# and run all Cypress tests
1717
- name: Start FE and run jest tests
1818
run: |
19-
cd webapp_frontend
2019
npm i
2120
npm test -- --watchAll=false
2221
npm start &
@@ -28,7 +27,6 @@ jobs:
2827
- name: Cypress run
2928
uses: cypress-io/github-action@v2
3029
with:
31-
working-directory: ./webapp_frontend
3230
record: true
3331
env:
3432
# pass the Dashboard record key as an environment variable

.gitignore

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,9 +379,30 @@ $RECYCLE.BIN/
379379

380380
# Cypress
381381

382-
webapp_frontend/cypress/screenshots
383-
webapp_frontend/cypress/videos
382+
cypress/screenshots
383+
cypress/videos
384384

385385

386386

387387
# End of https://www.toptal.com/developers/gitignore/api/node,react,intellij,eclipse,windows,macos,osx,linux
388+
# dependencies
389+
/node_modules
390+
/.pnp
391+
.pnp.js
392+
393+
# testing
394+
/coverage
395+
396+
# production
397+
/build
398+
399+
# misc
400+
.DS_Store
401+
.env.local
402+
.env.development.local
403+
.env.test.local
404+
.env.production.local
405+
406+
npm-debug.log*
407+
yarn-debug.log*
408+
yarn-error.log*
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)