Skip to content

Commit

Permalink
Merge pull request #77 from Samagra-Anamaya/dev
Browse files Browse the repository at this point in the history
Merging changes to main
  • Loading branch information
geeky-abhishek authored Nov 2, 2023
2 parents 698d506 + e59105b commit c3aabb8
Show file tree
Hide file tree
Showing 142 changed files with 81,621 additions and 7,398 deletions.
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

1 comment on commit c3aabb8

@vercel
Copy link

@vercel vercel bot commented on c3aabb8 Nov 2, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

workflow-wrapper-1 – ./apps/wrapper

workflow-wrapper-1-git-main-anamaya.vercel.app
workflow-wrapper-1.vercel.app
workflow-wrapper-1-anamaya.vercel.app

Please sign in to comment.