diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml index 9e730b6..4b16e2d 100644 --- a/.github/workflows/firebase-hosting-merge.yml +++ b/.github/workflows/firebase-hosting-merge.yml @@ -1,7 +1,4 @@ -# This file was auto-generated by the Firebase CLI -# https://github.com/firebase/firebase-tools - -name: Deploy to Firebase Hosting on merge +name: Deploy to Firebase 'on': push: branches: @@ -10,11 +7,23 @@ jobs: build_and_deploy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - run: >- - npm ci && npm run lint && npm run prettier && npm run stylelint && npm run - test:coverage && npm run build - - uses: FirebaseExtended/action-hosting-deploy@v0 + - name: Checkout + uses: actions/checkout@v2 + + - name: Install Dependencies + run: npm ci + + - name: Lint Checks + run: npm run lint && npm run prettier && npm run stylelint + + - name: Unit Tests + run: npm run test:coverage + + - name: Build + run: npm run build + + - name: Deploy + uses: FirebaseExtended/action-hosting-deploy@v0 with: repoToken: '${{ secrets.GITHUB_TOKEN }}' firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_THE_VIS_SHARMA }}' diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml deleted file mode 100644 index 8900c81..0000000 --- a/.github/workflows/firebase-hosting-pull-request.yml +++ /dev/null @@ -1,19 +0,0 @@ -# This file was auto-generated by the Firebase CLI -# https://github.com/firebase/firebase-tools - -name: Deploy to Firebase Hosting on PR -'on': pull_request -jobs: - build_and_preview: - if: '${{ github.event.pull_request.head.repo.full_name == github.repository }}' - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: >- - npm ci && npm run lint && npm run prettier && npm run stylelint && npm run - test:coverage && npm run build - - uses: FirebaseExtended/action-hosting-deploy@v0 - with: - repoToken: '${{ secrets.GITHUB_TOKEN }}' - firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_THE_VIS_SHARMA }}' - projectId: the-vis-sharma diff --git a/README.md b/README.md index 11c8d02..94ceaa3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Netlify Status](https://api.netlify.com/api/v1/badges/8ce17763-366b-4f26-af3d-428a928f882b/deploy-status)](https://app.netlify.com/sites/the-vis-sharma/deploys) +![Deploy to Firebase Hosting on merge](https://github.com/the-vis-sharma/my-portfolio/actions/workflows/firebase-hosting-merge.yml/badge.svg) # Vishnu's Portfolio diff --git a/jest.config.js b/jest.config.js index e13f99d..2aabfd7 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,54 +1,55 @@ module.exports = { - roots: ["/src"], - setupFilesAfterEnv: ["/jest-config/setupTests.ts"], - testMatch: [ - "**/__specs__/**/*.+(ts|tsx|js|jsx)", - "**/?(*.)+(spec|test).+(ts|tsx|js|jsx)", - ], - moduleNameMapper: { - "\\.(css|less|sass|scss)$": "/jest-config/__mocks__/styleMock.js", - "\\.(gif|ttf|eot|svg|jpg|jpeg|png|ico|webp)$": - "/jest-config/__mocks__/fileMock.js", - }, - transformIgnorePatterns: ["node_modules", "dist"], - preset: "ts-jest", - testEnvironment: "jsdom", - transform: { - "^.+\\.(ts|tsx)?$": "ts-jest", - "^.+\\.(js|jsx)$": "babel-jest", - }, - reporters: [ - "default", - [ - "jest-junit", - { - outputDirectory: "./coverage/junit", - outputName: "junit.xml", - }, + roots: ["/src"], + setupFilesAfterEnv: ["/jest-config/setupTests.ts"], + testMatch: [ + "**/__specs__/**/*.+(ts|tsx|js|jsx)", + "**/?(*.)+(spec|test).+(ts|tsx|js|jsx)", ], - [ - "jest-html-reporters", - { - publicPath: "./coverage/html-report", - filename: "report.html", - }, + moduleNameMapper: { + "\\.(css|less|sass|scss)$": "/jest-config/__mocks__/styleMock.js", + "\\.(gif|ttf|eot|svg|jpg|jpeg|png|ico|webp)$": + "/jest-config/__mocks__/fileMock.js", + }, + transformIgnorePatterns: ["node_modules", "dist"], + preset: "ts-jest", + testEnvironment: "jsdom", + transform: { + "^.+\\.(ts|tsx)?$": "ts-jest", + "^.+\\.(js|jsx)$": "babel-jest", + }, + reporters: [ + "default", + [ + "jest-junit", + { + outputDirectory: "./coverage/junit", + outputName: "junit.xml", + }, + ], + [ + "jest-html-reporters", + { + publicPath: "./coverage/html-report", + filename: "report.html", + }, + ], + ], + collectCoverageFrom: [ + "src/**/*.{js,ts,jsx,tsx}", + "!src/**/index.{ts,tsx}", + "!src/reportWebVitals.ts", + "!src/react-app-env.d.ts", + "!src/service-worker.ts", + "!src/serviceWorkerRegistration.ts", + "!src/firebase-util.ts" ], - ], - collectCoverageFrom: [ - "src/**/*.{js,ts,jsx,tsx}", - "!src/**/index.{ts,tsx}", - "!src/reportWebVitals.ts", - "!src/react-app-env.d.ts", - "!src/service-worker.ts", - "!src/serviceWorkerRegistration.ts", - ], - coverageReporters: ["json", "lcov", "text", "clover", "cobertura"], - coverageThreshold: { - global: { - branches: 90, - functions: 90, - lines: 90, - statements: 90, + coverageReporters: ["json", "lcov", "text", "clover", "cobertura"], + coverageThreshold: { + global: { + branches: 90, + functions: 90, + lines: 90, + statements: 90, + }, }, - }, }; diff --git a/package-lock.json b/package-lock.json index d66e220..ecb18e8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vishnu-portfolio", - "version": "1.2.0", + "version": "1.2.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vishnu-portfolio", - "version": "1.2.0", + "version": "1.2.1", "hasInstallScript": true, "dependencies": { "@emotion/react": "^11.7.1", diff --git a/package.json b/package.json index df3ed63..0a32f95 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "vishnu-portfolio", "description": "This is portfolio website created by Vishnu Bochiwal using ReactJS and MUI", "repository": "https://github.com/the-vis-sharma/my-portfolio", - "version": "1.2.0", + "version": "1.2.1", "private": true, "dependencies": { "@emotion/react": "^11.7.1", diff --git a/src/components/app/__specs__/__snapshots__/App.spec.tsx.snap b/src/components/app/__specs__/__snapshots__/App.spec.tsx.snap index 02e114d..f3d4eec 100644 --- a/src/components/app/__specs__/__snapshots__/App.spec.tsx.snap +++ b/src/components/app/__specs__/__snapshots__/App.spec.tsx.snap @@ -738,7 +738,7 @@ exports[`should verify the snapshot for dark mode 1`] = `

- Working at Device OS team + Working on Next Big Thing

@@ -1103,7 +1103,7 @@ exports[`should verify the snapshot for dark mode 1`] = ` class="MuiCardContent-root css-46bh2p-MuiCardContent-root" >
Paisa Vasool @@ -1156,7 +1156,7 @@ exports[`should verify the snapshot for dark mode 1`] = ` class="MuiCardContent-root css-46bh2p-MuiCardContent-root" >
U-Move: Bike Rental App @@ -1209,7 +1209,7 @@ exports[`should verify the snapshot for dark mode 1`] = ` class="MuiCardContent-root css-46bh2p-MuiCardContent-root" >
Smart Queuing System @@ -1262,7 +1262,7 @@ exports[`should verify the snapshot for dark mode 1`] = ` class="MuiCardContent-root css-46bh2p-MuiCardContent-root" >
People Counter App @@ -1315,7 +1315,7 @@ exports[`should verify the snapshot for dark mode 1`] = ` class="MuiCardContent-root css-46bh2p-MuiCardContent-root" >
Status Downloader for WhatsApp @@ -1368,7 +1368,7 @@ exports[`should verify the snapshot for dark mode 1`] = ` class="MuiCardContent-root css-46bh2p-MuiCardContent-root" >
DP & Videos Downloader @@ -1421,7 +1421,7 @@ exports[`should verify the snapshot for dark mode 1`] = ` class="MuiCardContent-root css-46bh2p-MuiCardContent-root" >
Red Basket - Groceries Shopping App @@ -1474,7 +1474,7 @@ exports[`should verify the snapshot for dark mode 1`] = ` class="MuiCardContent-root css-46bh2p-MuiCardContent-root" >
Fuel Trades @@ -3720,7 +3720,7 @@ exports[`should verify the snapshot for dark mode 1`] = `

- © 2022 Vishnu Bochiwal | All Right Reserved |  v1.2.0 + © 2022 Vishnu Bochiwal | All Right Reserved |  v1.2.1

@@ -4192,7 +4192,7 @@ exports[`should verify the snapshot for light mode 1`] = `

- Working at Device OS team + Working on Next Big Thing

@@ -4626,7 +4626,7 @@ exports[`should verify the snapshot for light mode 1`] = ` class="MuiCardContent-root css-46bh2p-MuiCardContent-root" >
Paisa Vasool @@ -4679,7 +4679,7 @@ exports[`should verify the snapshot for light mode 1`] = ` class="MuiCardContent-root css-46bh2p-MuiCardContent-root" >
U-Move: Bike Rental App @@ -4732,7 +4732,7 @@ exports[`should verify the snapshot for light mode 1`] = ` class="MuiCardContent-root css-46bh2p-MuiCardContent-root" >
Smart Queuing System @@ -4785,7 +4785,7 @@ exports[`should verify the snapshot for light mode 1`] = ` class="MuiCardContent-root css-46bh2p-MuiCardContent-root" >
People Counter App @@ -4838,7 +4838,7 @@ exports[`should verify the snapshot for light mode 1`] = ` class="MuiCardContent-root css-46bh2p-MuiCardContent-root" >
Status Downloader for WhatsApp @@ -4891,7 +4891,7 @@ exports[`should verify the snapshot for light mode 1`] = ` class="MuiCardContent-root css-46bh2p-MuiCardContent-root" >
DP & Videos Downloader @@ -4944,7 +4944,7 @@ exports[`should verify the snapshot for light mode 1`] = ` class="MuiCardContent-root css-46bh2p-MuiCardContent-root" >
Red Basket - Groceries Shopping App @@ -4997,7 +4997,7 @@ exports[`should verify the snapshot for light mode 1`] = ` class="MuiCardContent-root css-46bh2p-MuiCardContent-root" >
Fuel Trades @@ -7243,7 +7243,7 @@ exports[`should verify the snapshot for light mode 1`] = `

- © 2022 Vishnu Bochiwal | All Right Reserved |  v1.2.0 + © 2022 Vishnu Bochiwal | All Right Reserved |  v1.2.1

diff --git a/src/components/experiences/__specs__/__snapshots__/Experience.spec.tsx.snap b/src/components/experiences/__specs__/__snapshots__/Experience.spec.tsx.snap index 931f715..aee19d3 100644 --- a/src/components/experiences/__specs__/__snapshots__/Experience.spec.tsx.snap +++ b/src/components/experiences/__specs__/__snapshots__/Experience.spec.tsx.snap @@ -70,7 +70,7 @@ exports[`test experiences component verify snapshot for larger display 1`] = `

- Working at Device OS team + Working on Next Big Thing

@@ -459,7 +459,7 @@ exports[`test experiences component verify snapshot for tablet or lesser size di

- Working at Device OS team + Working on Next Big Thing

diff --git a/src/components/experiences/data.ts b/src/components/experiences/data.ts index 40acc3e..72b15d9 100644 --- a/src/components/experiences/data.ts +++ b/src/components/experiences/data.ts @@ -17,7 +17,7 @@ const companies: Company[] = [ location: "Bangalore, IN", description: "Amazon.com, Inc. is an American multinational technology company which focuses on e-commerce, cloud computing, digital streaming, and artificial intelligence. It is one of the Big Five companies in the U.S. information technology industry, along with Google, Apple, Meta, and Microsoft.", - accomplishments: ["Working at Device OS team"], + accomplishments: ["Working on Next Big Thing"], duration: "Jan 2022 - Present", }, { diff --git a/src/components/footer/__specs__/__snapshots__/Footer.spec.tsx.snap b/src/components/footer/__specs__/__snapshots__/Footer.spec.tsx.snap index 4e5d12e..b8a0e5d 100644 --- a/src/components/footer/__specs__/__snapshots__/Footer.spec.tsx.snap +++ b/src/components/footer/__specs__/__snapshots__/Footer.spec.tsx.snap @@ -137,7 +137,7 @@ exports[`should verify snapshot 1`] = `

- © 2022 Vishnu Bochiwal | All Right Reserved |  v1.2.0 + © 2022 Vishnu Bochiwal | All Right Reserved |  v1.2.1

diff --git a/src/components/projects/Projects.tsx b/src/components/projects/Projects.tsx index 0830127..8487b3c 100644 --- a/src/components/projects/Projects.tsx +++ b/src/components/projects/Projects.tsx @@ -87,7 +87,7 @@ const Projects = forwardRef((_, ref) => { color="primary" sx={{ textOverflow: "ellipsis", - whiteSpace: "nowrap", + whiteSpace: { xs: "inherit", sm: "nowrap" }, overflow: "hidden", }} > diff --git a/src/components/projects/__specs__/__snapshots__/Projects.spec.tsx.snap b/src/components/projects/__specs__/__snapshots__/Projects.spec.tsx.snap index b419362..ab7dab1 100644 --- a/src/components/projects/__specs__/__snapshots__/Projects.spec.tsx.snap +++ b/src/components/projects/__specs__/__snapshots__/Projects.spec.tsx.snap @@ -50,7 +50,7 @@ exports[`Projects verify snapshot for projects 1`] = ` class="MuiCardContent-root css-46bh2p-MuiCardContent-root" >
Paisa Vasool @@ -103,7 +103,7 @@ exports[`Projects verify snapshot for projects 1`] = ` class="MuiCardContent-root css-46bh2p-MuiCardContent-root" >
U-Move: Bike Rental App @@ -156,7 +156,7 @@ exports[`Projects verify snapshot for projects 1`] = ` class="MuiCardContent-root css-46bh2p-MuiCardContent-root" >
Smart Queuing System @@ -209,7 +209,7 @@ exports[`Projects verify snapshot for projects 1`] = ` class="MuiCardContent-root css-46bh2p-MuiCardContent-root" >
People Counter App @@ -262,7 +262,7 @@ exports[`Projects verify snapshot for projects 1`] = ` class="MuiCardContent-root css-46bh2p-MuiCardContent-root" >
Status Downloader for WhatsApp @@ -315,7 +315,7 @@ exports[`Projects verify snapshot for projects 1`] = ` class="MuiCardContent-root css-46bh2p-MuiCardContent-root" >
DP & Videos Downloader @@ -368,7 +368,7 @@ exports[`Projects verify snapshot for projects 1`] = ` class="MuiCardContent-root css-46bh2p-MuiCardContent-root" >
Red Basket - Groceries Shopping App @@ -421,7 +421,7 @@ exports[`Projects verify snapshot for projects 1`] = ` class="MuiCardContent-root css-46bh2p-MuiCardContent-root" >
Fuel Trades