Skip to content

Commit

Permalink
fix frontend faliure workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
amitamrutiya committed Jan 25, 2024
1 parent e5931e2 commit 473e64e
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 13 deletions.
9 changes: 3 additions & 6 deletions .github/workflows/workflow_backend.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Node.js CI
name: Backend CI

on:
push:
Expand Down Expand Up @@ -30,11 +30,8 @@ jobs:
node-version: '20.x'

- name: Install Dependencies
run: npm install --prefix backend
run: npm install

- name: Run ESLint
run: cd.. && npm run format

- name: Run Tests
run: npm test --prefix backend
run: npm run format

7 changes: 5 additions & 2 deletions .github/workflows/workflow_frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ jobs:
build:

runs-on: ubuntu-latest
defaults:
run:
working-directory: ./frontend

steps:
- uses: actions/checkout@v2
Expand All @@ -28,10 +31,10 @@ jobs:
node-version: '20.x'

- name: Install Dependencies
run: npm install --prefix frontend
run: npm install

- name: Run ESLint
run: npx eslint . --ext .js,.jsx
run: npm run format

- name: Build
run: npm run build
3 changes: 2 additions & 1 deletion backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"start": "node -r dotenv/config --experimental-json-modules index.js",
"dev": "nodemon -r dotenv/config --experimental-json-modules index.js",
"test": "jest",
"build": "npm i"
"build": "npm i",
"format": "cd .. && npm run format"
},
"keywords": [],
"author": "",
Expand Down
1 change: 1 addition & 0 deletions backend/utils/secToDuration.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// Helper function to convert total seconds to the duration format

export default function convertSecondsToDuration (totalSeconds) {
const hours = Math.floor(totalSeconds / 3600)
const minutes = Math.floor((totalSeconds % 3600) / 60)
Expand Down
3 changes: 2 additions & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"build": "vite build",
"lint": "eslint . --ext js,jsx --report-unused-disable-directives --max-warnings 0",
"preview": "vite preview",
"test": "vitest"
"test": "vitest",
"format": "cd .. && npm run format"
},
"dependencies": {
"@ramonak/react-progress-bar": "^5.0.3",
Expand Down
2 changes: 0 additions & 2 deletions frontend/src/components/common/Footer.jsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import { FooterLink2 } from '../../data/footer-links'
import { Link } from 'react-router-dom'
// Images
import Logo from '../../assets/Logo/Logo-Full-Light.png'
// Icons
import { FaFacebook, FaGoogle, FaTwitter, FaYoutube } from 'react-icons/fa'

const BottomFooter = ['Privacy Policy', 'Cookie Policy', 'Terms']
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"start:server": "cd backend && npm run dev",
"start:client": "cd frontend && npm run dev",
"dev": "concurrently -n \"server,client\" -c \"red,blue\" \"npm run start:server\" \"npm run start:client\"",
"format": "eslint --fix . && eslint --ext .jsx . --fix"
"format": "npx eslint . --ext .js,.jsx"
},
"devDependencies": {
"eslint-config-standard": "^17.1.0",
Expand Down

0 comments on commit 473e64e

Please sign in to comment.