Skip to content

prod: Main to Prod Merge #20

Closed
kushalmahawar2005 wants to merge 13 commits into
prodfrom
main
Closed

prod: Main to Prod Merge #20
kushalmahawar2005 wants to merge 13 commits into
prodfrom
main

Conversation

@kushalmahawar2005

Copy link
Copy Markdown
Contributor

Main to prod

mohitkumhar and others added 6 commits September 23, 2025 16:49
* chore: added labeler

* fix: fix minor issues

* chore: testing jobs

* chore: updated workflows
* chore: added labeler

* fix: fix minor issues

* chore: updated ci jobs
* chore: added labeler

* fix: fix minor issues

* feat: #1 Auth Working and complete signup and login Funtionallity

* fix : Fix Bugs or error

* Fix : Env Variable Hided

* Fix

* init

* chore: update workflows

* chore: update workflows

---------

Co-authored-by: kushal <kushalmahawar71@gmail.com>
* chore: added labeler

* fix: fix minor issues

* feat: #1 Auth Working and complete signup and login Funtionallity

* fix : Fix Bugs or error

* Fix : Env Variable Hided

* Fix

* init

* chore: update workflows

* chore: update workflows

* chore: fix ci jobs

* chore: Trigger CI re-run

---------

Co-authored-by: kushal <kushalmahawar71@gmail.com>
* feat: #1 Auth Working and complete signup and login Funtionallity

* fix : Fix Bugs or error

* Fix : Env Variable Hided

* Fix

* init

* chore: fix file name

* chore: Trigger CI re-run

* fix: updated package json

* fix: added eslint

* chore(web): run eslint on src and add minimal config

* fix : eslint

---------

Co-authored-by: Mohit Kumhar <mohitmolela@gmail.com>
Copilot AI review requested due to automatic review settings September 24, 2025 04:27
@vercel

vercel Bot commented Sep 24, 2025

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Preview Comments Updated (UTC)
shield-x-web-new Ready Ready Preview Comment Sep 25, 2025 6:48pm
shield-x-web-slr4 Ready Ready Preview Comment Sep 25, 2025 6:48pm
1 Skipped Deployment
Project Deployment Preview Comments Updated (UTC)
shield-x-web Ignored Ignored Preview Sep 25, 2025 6:48pm

@kushalmahawar2005 kushalmahawar2005 requested review from mohitkumhar and removed request for Copilot September 24, 2025 04:27
@kushalmahawar2005 kushalmahawar2005 requested review from Muskankhan512 and removed request for mohitkumhar September 24, 2025 05:49
Muskankhan512
Muskankhan512 previously approved these changes Sep 24, 2025

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull Request Overview

This PR merges the main branch to the production branch, introducing a comprehensive web application implementation for ShieldX alongside server-side authentication capabilities.

  • Complete React web application (ShieldX-Web) with authentication, UI screens, and responsive design
  • Express.js server with MongoDB integration for user authentication
  • Updated CI/CD workflows to support the new web application structure

Reviewed Changes

Copilot reviewed 37 out of 56 changed files in this pull request and generated 4 comments.

Show a summary per file
File Description
src/pages/Signup.jsx File removed from original location
src/pages/Login.jsx File removed from original location
ShieldX-Web/* Complete new React web application with pages, components, and styling
server/* New Express.js backend with authentication routes and MongoDB integration
.github/workflows/* Updated CI/CD workflows to build and test the new web application
Comments suppressed due to low confidence (1)

Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.



<div style={{ textAlign: 'center', marginTop: 12 }}>
<button className="link" type="button" onClick={() => navigate('/Signup')}>Don't have an account? <span style={{ color: 'red' }}>Sign Up</span></button>

Copilot AI Sep 24, 2025

Copy link

Choose a reason for hiding this comment

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

The navigation route '/Signup' uses uppercase 'S' but the route is defined as '/signup' (lowercase) in App.jsx. This will cause navigation to fail.

Suggested change
<button className="link" type="button" onClick={() => navigate('/Signup')}>Don't have an account? <span style={{ color: 'red' }}>Sign Up</span></button>
<button className="link" type="button" onClick={() => navigate('/signup')}>Don't have an account? <span style={{ color: 'red' }}>Sign Up</span></button>

Copilot uses AI. Check for mistakes.
Comment thread server/README.md
Comment on lines +22 to +23
- POST /api/signup { name, email, password }
- POST /api/login { email, password }

Copilot AI Sep 24, 2025

Copy link

Choose a reason for hiding this comment

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

The API endpoint documentation is inconsistent with the actual implementation. The server uses '/api/register' not '/api/signup', and expects 'username' field, not 'email' field for both endpoints.

Suggested change
- POST /api/signup { name, email, password }
- POST /api/login { email, password }
- POST /api/register { name, username, password }
- POST /api/login { username, password }

Copilot uses AI. Check for mistakes.
Comment thread ShieldX-Web/index.html
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>SafeCam Converted Web</title>

Copilot AI Sep 24, 2025

Copy link

Choose a reason for hiding this comment

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

The page title 'SafeCam Converted Web' doesn't match the application name 'ShieldX' used throughout the codebase.

Suggested change
<title>SafeCam Converted Web</title>
<title>ShieldX</title>

Copilot uses AI. Check for mistakes.
Comment thread ShieldX-Web/package.json
@@ -0,0 +1,22 @@
{
"name": "safe-cam-converted-web",

Copilot AI Sep 24, 2025

Copy link

Choose a reason for hiding this comment

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

The package name 'safe-cam-converted-web' doesn't match the application name 'ShieldX' used throughout the codebase.

Suggested change
"name": "safe-cam-converted-web",
"name": "shieldx",

Copilot uses AI. Check for mistakes.
@mohitkumhar mohitkumhar changed the title Main to Prod Merge prod: Main to Prod Merge Sep 24, 2025
* chore: test

* chore: fixes
* chore: test (#10)

* chore: added ci jobs (#13)

* chore: test (#9)

* chore: added labeler

* fix: fix minor issues

* chore: testing jobs

* chore: updated workflows

* chore: updated wordflows (#11)

* chore: added labeler

* fix: fix minor issues

* chore: testing jobs

* chore: updated workflows

* chore: updated ci jobs (#15)

* chore: added labeler

* fix: fix minor issues

* chore: updated ci jobs

* chore: update workflows (#17)

* chore: added labeler

* fix: fix minor issues

* feat: #1 Auth Working and complete signup and login Funtionallity

* fix : Fix Bugs or error

* Fix : Env Variable Hided

* Fix

* init

* chore: update workflows

* chore: update workflows

---------

Co-authored-by: kushal <kushalmahawar71@gmail.com>

* chore: updated ci jobs (#18)

* chore: added labeler

* fix: fix minor issues

* feat: #1 Auth Working and complete signup and login Funtionallity

* fix : Fix Bugs or error

* Fix : Env Variable Hided

* Fix

* init

* chore: update workflows

* chore: update workflows

* chore: fix ci jobs

* chore: Trigger CI re-run

---------

Co-authored-by: kushal <kushalmahawar71@gmail.com>

* Kushal (#19)

* feat: #1 Auth Working and complete signup and login Funtionallity

* fix : Fix Bugs or error

* Fix : Env Variable Hided

* Fix

* init

* chore: fix file name

* chore: Trigger CI re-run

* fix: updated package json

* fix: added eslint

* chore(web): run eslint on src and add minimal config

* fix : eslint

---------

Co-authored-by: Mohit Kumhar <mohitmolela@gmail.com>

* chore: test (#10)

* chore: fix authMiddlewere case-sensitive error

* fix: conflicts

* feat: Profile Section With All user detail Added

* feat: Location Page Updated

* fix: fix conflicts 2

---------

Co-authored-by: Mohit Kumhar <mohitmolela@gmail.com>
Copilot AI review requested due to automatic review settings September 25, 2025 17:24

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

Copilot AI review requested due to automatic review settings September 25, 2025 17:48

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

Copilot AI review requested due to automatic review settings September 25, 2025 18:20

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

* chore: test (#10)

* chore: added ci jobs (#13)

* chore: test (#9)

* chore: added labeler

* fix: fix minor issues

* chore: testing jobs

* chore: updated workflows

* chore: updated wordflows (#11)

* chore: added labeler

* fix: fix minor issues

* chore: testing jobs

* chore: updated workflows

* chore: updated ci jobs (#15)

* chore: added labeler

* fix: fix minor issues

* chore: updated ci jobs

* chore: update workflows (#17)

* chore: added labeler

* fix: fix minor issues

* feat: #1 Auth Working and complete signup and login Funtionallity

* fix : Fix Bugs or error

* Fix : Env Variable Hided

* Fix

* init

* chore: update workflows

* chore: update workflows

---------

Co-authored-by: kushal <kushalmahawar71@gmail.com>

* chore: updated ci jobs (#18)

* chore: added labeler

* fix: fix minor issues

* feat: #1 Auth Working and complete signup and login Funtionallity

* fix : Fix Bugs or error

* Fix : Env Variable Hided

* Fix

* init

* chore: update workflows

* chore: update workflows

* chore: fix ci jobs

* chore: Trigger CI re-run

---------

Co-authored-by: kushal <kushalmahawar71@gmail.com>

* Kushal (#19)

* feat: #1 Auth Working and complete signup and login Funtionallity

* fix : Fix Bugs or error

* Fix : Env Variable Hided

* Fix

* init

* chore: fix file name

* chore: Trigger CI re-run

* fix: updated package json

* fix: added eslint

* chore(web): run eslint on src and add minimal config

* fix : eslint

---------

Co-authored-by: Mohit Kumhar <mohitmolela@gmail.com>

* chore: test (#10)

* chore: fix authMiddlewere case-sensitive error

* fix: conflicts

* feat: Profile Section With All user detail Added

* feat: Location Page Updated

* fix: fix conflicts 2

* Fix conflicts

---------

Co-authored-by: Mohit Kumhar <mohitmolela@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants