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

feat: submission flow #26

Closed
wants to merge 79 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
5039169
feat: submission service addded
geeky-abhishek Sep 20, 2023
d4bf118
feat: submission service setup
geeky-abhishek Sep 20, 2023
db826db
feat: docker-compose added for submission
geeky-abhishek Sep 20, 2023
16c4ee9
Init Changes
amit-s19 Sep 20, 2023
9b043a3
Update README.md
amit-s19 Sep 20, 2023
d1b0f0c
Commit - 2
amit-s19 Sep 21, 2023
215ad54
Merge pull request #18 from Samagra-Anamaya/feat/new-app-changes
amit-s19 Sep 21, 2023
0b97c77
pwa changes
amit-s19 Sep 21, 2023
c1bc820
feat: submission service added
geeky-abhishek Sep 26, 2023
26c9060
Merge pull request #19 from Samagra-Anamaya/main
geeky-abhishek Sep 26, 2023
2e6c7bb
chore: remove env
geeky-abhishek Sep 26, 2023
c8cf96e
Merge pull request #16 from Samagra-Anamaya/feat-submission
geeky-abhishek Sep 26, 2023
09b89bb
chore: name changed to bff
geeky-abhishek Sep 26, 2023
33f915d
Merge pull request #20 from Samagra-Anamaya/feat-submission
geeky-abhishek Sep 26, 2023
a12329c
Create build-and-push-bff.yml
singhalkarun Sep 26, 2023
bb8e1f7
Update Dockerfile
geeky-abhishek Sep 28, 2023
23d10e6
Update package.json
geeky-abhishek Sep 28, 2023
6f4e190
feat: submission done
geeky-abhishek Sep 28, 2023
c31b119
chore: small changes
geeky-abhishek Sep 28, 2023
f50d9aa
Update .gitignore
geeky-abhishek Sep 28, 2023
f7b9365
Merge branch 'dev' into feat-submission
geeky-abhishek Sep 28, 2023
2310e28
Merge pull request #21 from Samagra-Anamaya/feat-submission
geeky-abhishek Sep 28, 2023
db27cc1
Progress TT_TT
amit-s19 Sep 28, 2023
11f717d
Merge pull request #22 from Samagra-Anamaya/feat/new-app-changes
amit-s19 Sep 28, 2023
2ba6a1d
feat: pagination added
geeky-abhishek Sep 28, 2023
d11dfc4
Merge branch 'feat-submission' of https://github.com/Samagra-Anamaya/…
geeky-abhishek Sep 28, 2023
760efaf
Merge pull request #25 from Samagra-Anamaya/feat-submission
geeky-abhishek Sep 28, 2023
e616e25
feat: added prisma migrate in dockerfile
geeky-abhishek Sep 29, 2023
f6d1f66
Merge pull request #27 from Samagra-Anamaya/feat-submission
geeky-abhishek Sep 29, 2023
18f76db
chore: updated docker-compose
geeky-abhishek Sep 29, 2023
aa19437
Merge pull request #28 from Samagra-Anamaya/feat-submission
geeky-abhishek Sep 29, 2023
40178de
feat: swagger added
geeky-abhishek Sep 29, 2023
6d3df57
Merge pull request #29 from Samagra-Anamaya/feat-submission
geeky-abhishek Sep 29, 2023
8584194
chore: updating swagger properties
geeky-abhishek Sep 29, 2023
859f0f4
Merge pull request #30 from Samagra-Anamaya/feat-submission
geeky-abhishek Sep 29, 2023
0f4929c
fix: submission pagination logic fix
geeky-abhishek Sep 29, 2023
b6d23a9
Merge pull request #31 from Samagra-Anamaya/feat-submission
geeky-abhishek Sep 29, 2023
33c31ad
chore: pushing migrations
geeky-abhishek Sep 29, 2023
5207084
Update .gitignore
geeky-abhishek Sep 29, 2023
d4ecae2
Merge pull request #32 from Samagra-Anamaya/feat-submission
geeky-abhishek Sep 29, 2023
38fb14b
chore: changin the port
geeky-abhishek Sep 29, 2023
9908f56
Merge pull request #33 from Samagra-Anamaya/feat-submission
geeky-abhishek Sep 29, 2023
92d788a
New Changes
amit-s19 Sep 29, 2023
eff3127
addded firebase
amit-s19 Sep 29, 2023
b9720d1
Merge pull request #34 from Samagra-Anamaya/feat/new-app-changes
amit-s19 Sep 29, 2023
dcd1381
pnpm lockfile
amit-s19 Sep 29, 2023
c38b29d
Merge pull request #35 from Samagra-Anamaya/feat/new-app-changes
amit-s19 Sep 29, 2023
9c846f7
Filling through aadhar
amit-s19 Oct 1, 2023
9a7c064
Merge pull request #36 from Samagra-Anamaya/feat/new-app-changes
amit-s19 Oct 1, 2023
fb5f116
Logout Modal Fix
amit-s19 Oct 1, 2023
a3093d3
Added QR scanner Fix
amit-s19 Oct 1, 2023
84a6e85
Merge pull request #37 from Samagra-Anamaya/feat/new-app-changes
amit-s19 Oct 1, 2023
6a0d253
feat: logger,swagger and auth added
geeky-abhishek Oct 1, 2023
8582045
Merge pull request #38 from Samagra-Anamaya/feat-submission
geeky-abhishek Oct 1, 2023
0157c75
Search Functionality
amit-s19 Oct 3, 2023
3cd0f84
feat: hashing added
geeky-abhishek Oct 3, 2023
0a54895
Update .gitignore
geeky-abhishek Oct 3, 2023
9a50f73
chore: port restore
geeky-abhishek Oct 3, 2023
335a9bf
Merge pull request #60 from Samagra-Anamaya/feat-submission
geeky-abhishek Oct 3, 2023
625fd1e
Search Api FIx
amit-s19 Oct 4, 2023
2ae2493
Merge pull request #59 from Samagra-Anamaya/feat/new-app-changes
amit-s19 Oct 4, 2023
b828bc3
chore: saving temporal progress
geeky-abhishek Oct 4, 2023
7e98e3e
feat: bulk submission and search optimisation added
geeky-abhishek Oct 6, 2023
c71405d
chore: code clean
geeky-abhishek Oct 6, 2023
78f4575
Merge pull request #61 from Samagra-Anamaya/feat-temporal
geeky-abhishek Oct 6, 2023
28d9600
chore: saving progres
geeky-abhishek Oct 9, 2023
8ca79d8
feat: search by enumeratorid added
geeky-abhishek Oct 9, 2023
6d492da
chore: port used 3000
geeky-abhishek Oct 9, 2023
54e5590
Merge pull request #69 from Samagra-Anamaya/feat-search-by-enumerator
geeky-abhishek Oct 9, 2023
c9dafbc
chore: search limit increase to 30
geeky-abhishek Oct 10, 2023
669a1a4
Merge pull request #73 from Samagra-Anamaya/feat-search-by-enumerator
geeky-abhishek Oct 10, 2023
cec58bb
chore: last 4 digits added to bulk submission api
geeky-abhishek Oct 12, 2023
e5cceab
feat: delete all submission api added
geeky-abhishek Oct 12, 2023
7906b0a
feat: auth setup
geeky-abhishek Oct 12, 2023
12b0376
Merge pull request #74 from Samagra-Anamaya/feat-search-by-enumerator
geeky-abhishek Oct 12, 2023
bacaf59
chore: port set to 3000
geeky-abhishek Oct 12, 2023
8a1ad47
Merge pull request #75 from Samagra-Anamaya/feat-search-by-enumerator
geeky-abhishek Oct 12, 2023
82a0c69
feat: authorization added
geeky-abhishek Oct 12, 2023
f73eef9
Merge pull request #76 from Samagra-Anamaya/feat-search-by-enumerator
geeky-abhishek Oct 12, 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
Binary file added .DS_Store
Binary file not shown.
47 changes: 47 additions & 0 deletions .github/workflows/build-and-push-bff.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Build and Push Bff Image

on:
push:
branches:
- dev
- main

env:
DOCKER_USERNAME: ${{ github.actor }}
DOCKER_IMAGE_NAME: ${{ github.repository }}
DOCKER_REGISTRY: ghcr.io
DOCKER_IMAGE_TAG: ${{ github.ref_name }}

jobs:
build-and-push:
runs-on: ubuntu-latest
steps:
- id: lower-repo
shell: pwsh
run: |
"::set-output name=repository::$($env:DOCKER_IMAGE_NAME.ToLowerInvariant())"

- name: Checkout code
uses: actions/checkout@v2

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Login to Docker registry
uses: docker/login-action@v1
with:
registry: ${{ env.DOCKER_REGISTRY }}
username: ${{ env.DOCKER_USERNAME }}
password: ${{ secrets.PAT }}

- name: Build and Push Docker image
uses: docker/build-push-action@v4
with:
build-args: |
"SERVER_RELEASE_VERSION=${{ github.sha }}"
context: packages/bff/.
push: true
cache-from: type=gha
cache-to: type=gha,mode=max
tags: ${{ env.DOCKER_REGISTRY }}/${{ steps.lower-repo.outputs.repository }}-bff:${{env.DOCKER_IMAGE_TAG}}
labels: org.opencontainers.image.source=https://github.com/${{steps.lower-repo.outputs.repository}}
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
.turbo
node_modules
.idea
.env
/dist
pgdata
.DS_Store
/apps/wrapper/scripts
/packages/bff/dist

pgdata
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<div align="center">

[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/Samagra-Development/workflow/tree/dev)
[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/Samagra-Anamaya/workflow/tree/feat/new-app-changes)

</div>

Expand Down
5 changes: 5 additions & 0 deletions apps/wrapper/next-env.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/// <reference types="next" />
/// <reference types="next/image-types/global" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/basic-features/typescript for more information.
51 changes: 49 additions & 2 deletions apps/wrapper/next.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,51 @@
// /** @type {import('next').NextConfig} */


// const runtimeCaching = require("next-pwa/cache");
// const withPWA = require("next-pwa")({
// dest: "public",
// register: true,
// skipWaiting: true,
// disable: process.env.NODE_ENV === "development",
// runtimeCaching
// });

// module.exports = withPWA({
// reactStrictMode: true,
// });

const withPWAInit = require("next-pwa");

const isDev = process.env.NODE_ENV !== "production";
const runtimeCaching = require("next-pwa/cache");
const withPWA = withPWAInit({
dest: 'public',
disable: isDev,
skipWaiting: true,
disable: process.env.NODE_ENV === "development",
runtimeCaching,
exclude: [
// add buildExcludes here
({ asset, compilation }) => {
if (
asset.name.startsWith("server/") ||
asset.name.match(/^((app-|^)build-manifest\.json|react-loadable-manifest\.json)$/)
) {
return true;
}
if (isDev && !asset.name.startsWith("static/runtime/")) {
return true;
}
return false;
}
],
});

/** @type {import('next').NextConfig} */
const nextConfig = {}
const nextConfig = {
experimental: {
appDir: true,
},
}

module.exports = nextConfig
module.exports = withPWA(nextConfig);
17 changes: 16 additions & 1 deletion apps/wrapper/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,30 +10,44 @@
"cypress": "cypress open"
},
"dependencies": {
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@fontsource/roboto": "^5.0.8",
"@fortawesome/fontawesome-svg-core": "^6.4.0",
"@fortawesome/free-solid-svg-icons": "^6.4.0",
"@fortawesome/react-fontawesome": "^0.2.0",
"@mui/material": "^5.14.10",
"@reduxjs/toolkit": "^1.9.5",
"@xstate/react": "^3.2.2",
"@yudiel/react-qr-scanner": "^1.1.10",
"animate.css": "^4.1.1",
"autoprefixer": "10.4.14",
"axios": "^1.4.0",
"debounce": "^1.2.1",
"dexie-react-hooks": "^1.1.6",
"dotenv": "^16.3.1",
"firebase": "^10.4.0",
"is-online": "^10.0.0",
"js-cookie": "^3.0.5",
"localforage": "^1.10.0",
"next": "13.4.9",
"next-pwa": "^5.6.0",
"offline-sync-handler": "^0.1.10",
"postcss": "8.4.25",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-hot-toast": "^2.4.1",
"react-lottie": "^1.2.3",
"react-otp-input": "^3.0.2",
"react-redux": "^8.1.1",
"react-router-dom": "^6.14.1",
"react-toastify": "^9.1.3",
"react-xml-parser": "^1.1.8",
"redux": "^4.2.1",
"redux-persist": "^6.0.0",
"sass": "^1.67.0",
"semantic-ui-css": "^2.5.0",
"semantic-ui-react": "^2.1.4",
"tailwindcss": "3.3.2",
"web-vitals": "^3.4.0",
"workbox-background-sync": "^7.0.0",
Expand All @@ -58,6 +72,7 @@
"cypress": "^12.17.4",
"identity-obj-proxy": "^3.0.0",
"jest": "^29.6.2",
"jest-environment-jsdom": "^29.6.2"
"jest-environment-jsdom": "^29.6.2",
"typescript": "5.2.2"
}
}
Loading