Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Frontend updates #140

Merged
merged 29 commits into from
Apr 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
06a9193
Added ESLint for React for local #116
shmansa Apr 12, 2023
4ab57c4
Resolved merge conflicts
shmansa Apr 12, 2023
ad6b8f3
updated eslintrc and files to fix remaining warnings and errors
AbhinavReddy-Dev Apr 12, 2023
f363fc1
Merge branch 'frontend' into frontend_linter
AbhinavReddy-Dev Apr 12, 2023
b8a50d2
Donor page improvements #77 (#115)
prasannarajezzzy Apr 12, 2023
ede8bc8
Merge branch 'frontend' into frontend_linter
AbhinavReddy-Dev Apr 12, 2023
8e6920c
Frontend linter (#134)
skrlett Apr 12, 2023
cc131a2
resolved issues in frontend
AbhinavReddy-Dev Apr 13, 2023
9022a50
moved .eslintrc from root to backend
AbhinavReddy-Dev Apr 13, 2023
50ba56e
Merge branch 'main' into frontend
AbhinavReddy-Dev Apr 13, 2023
0048390
resolving package-lock and lint errors
AbhinavReddy-Dev Apr 13, 2023
70e0138
resolving frontend build errors and lint errors
AbhinavReddy-Dev Apr 13, 2023
b6fd8e7
removed duplicate SalesTable component in pages
AbhinavReddy-Dev Apr 13, 2023
3061f1b
add miragejs for all the API routes
sathyanarayanan-v Apr 13, 2023
429cf62
Merge branch 'frontend' into mirage-js-integration
sathyanarayanan-v Apr 13, 2023
6d28b4d
Merge branch 'frontend' into mirage-js-integration
sathyanarayanan-v Apr 13, 2023
41a2692
resolve conflicts with frontend branch
sathyanarayanan-v Apr 13, 2023
1cc370b
Merge branch 'frontend' into mirage-js-integration
sathyanarayanan-v Apr 13, 2023
250c2b3
eslintrc.cjs and linter.yml conflicts resolved
AbhinavReddy-Dev Apr 13, 2023
b2b9614
no-const-assign in backend lint error fix
AbhinavReddy-Dev Apr 13, 2023
16d8afe
Stock Summary Page (#142)
decoles Apr 13, 2023
6d735ba
Merge branch 'frontend' into mirage-js-integration
sathyanarayanan-v Apr 14, 2023
af86a69
Add mirageJS support to mock API (#145)
sathyanarayanan-v Apr 14, 2023
817266c
conflict resolve: Merge branch 'main' into frontend
AbhinavReddy-Dev Apr 14, 2023
1dcf5cb
Linter error on frontend (#150)
hardikpatil Apr 14, 2023
04751ca
how to linter test update on readme
hardikpatil Apr 14, 2023
59ae5fc
remnamed PantryNodeReact to frontend, added .env.example file and upd…
AbhinavReddy-Dev Apr 14, 2023
87909e6
remnamed PantryNodeReact to frontend, updated actions.yml, added .env…
AbhinavReddy-Dev Apr 14, 2023
aab812b
resolved warnings on the container logs
hardikpatil Apr 14, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#DB CONFIG
DB_USER='postgres'
DB_HOST='database'
DB_NAME='pantrynode'
DB_PASSWORD='pantrynode'
DB_PORT=5432

#DB ADMIN
PGADMIN_EMAIL='[email protected]'
PGADMIN_PASSWORD='pantrynode'
20 changes: 12 additions & 8 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Build Node

on:
push:
branches: [main]
branches: [main, frontend]
pull_request:
branches: [main]
branches: [main, frontend]

jobs:
backend:
Expand All @@ -14,10 +14,12 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 16
- run: |
- name: Install dependencies
run: |
cd backend
npm ci
- run: |
- name: Build
run: |
cd backend
npm run build
frontend:
Expand All @@ -27,9 +29,11 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 16
- run: |
cd PantryNodeReact
- name: Install dependencies
run: |
cd frontend
npm ci
- run: |
cd PantryNodeReact
- name: Build
run: |
cd frontend
npm run build
20 changes: 13 additions & 7 deletions .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: ES Lint

on:
pull_request:
branches: [main]
branches: [main, frontend]
jobs:
lint:
runs-on: ubuntu-latest
Expand All @@ -11,11 +11,17 @@ jobs:
uses: actions/checkout@v3
- name: Setup node
uses: actions/setup-node@v3
- name: Install dependencies
- name: Install lint dependencies
run: |
cd backend
npm init @eslint/config
- name: Install typescript and eslint
run: npm install --save-dev @typescript-eslint/parser @typescript-eslint/eslint-plugin eslint-config-react-app eslint@^8.0.0 typescript
- name: Lint it
run: npx eslint .
npm ci
cd ../frontend
npm ci
- name: Lint backend
run: |
cd backend
npm run lint
- name: Lint frontend
run: |
cd frontend
npm run lint
14 changes: 0 additions & 14 deletions PantryNodeReact/src/App.test.js

This file was deleted.

15 changes: 0 additions & 15 deletions PantryNodeReact/src/Components/Copyright.tsx

This file was deleted.

127 changes: 0 additions & 127 deletions PantryNodeReact/src/Components/Feed/Feed.tsx

This file was deleted.

60 changes: 0 additions & 60 deletions PantryNodeReact/src/pages/SaleTable.tsx

This file was deleted.

Loading