Skip to content

Commit

Permalink
Merge pull request #59 from zstenger93/setup
Browse files Browse the repository at this point in the history
workflow patch 1.0
  • Loading branch information
zstenger93 authored Dec 22, 2023
2 parents f2d2b95 + e481096 commit c6ae0ff
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 10 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/build_and_deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,16 @@ jobs:

steps:
- name: Checkout Repository
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 16
node-version: 16

- name: Install Dependencies
working-directory: frontend # Specify the frontend folder
working-directory: frontend
run: npm install

- name: Run Tests
Expand All @@ -37,8 +38,8 @@ jobs:

steps:
- name: Deploy to GitHub Pages
uses: JamesIves/github-pages-deploy-action@3.7.1
uses: JamesIves/github-pages-deploy-action@v4
with:
ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
BRANCH: gh-pages
FOLDER: frontend/build # Adjust this path to match your structure
FOLDER: frontend/build
4 changes: 3 additions & 1 deletion docker/frontend/frontend.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ RUN npm install && \
npm install react-router-dom --save && \
npm install tailwindcss postcss autoprefixer --save && \
npm install react-slick slick-carousel --save && \
npm install react-i18next i18next --save
npm install react-i18next i18next --save && \
npm install --save-dev @babel/plugin-proposal-private-property-in-object && \
npm install matchmedia-polyfill

COPY . .

Expand Down
23 changes: 20 additions & 3 deletions frontend/package-lock.json

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

6 changes: 5 additions & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"@testing-library/user-event": "^13.5.0",
"autoprefixer": "^10.4.16",
"i18next": "^23.7.11",
"matchmedia-polyfill": "^0.3.2",
"postcss": "^8.4.32",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand All @@ -27,7 +28,7 @@
"watch:css": "postcss src/styles/tailwind.css -o src/index.css --watch",
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"test": "react-scripts test --detectOpenHandles",
"eject": "react-scripts eject"
},
"eslintConfig": {
Expand All @@ -47,5 +48,8 @@
"last 1 firefox version",
"last 1 safari version"
]
},
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11"
}
}
1 change: 1 addition & 0 deletions frontend/src/setupTests.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
// expect(element).toHaveTextContent(/react/i)
// learn more: https://github.com/testing-library/jest-dom
import '@testing-library/jest-dom';
import 'matchmedia-polyfill';

0 comments on commit c6ae0ff

Please sign in to comment.