Develop

.env.example

@@ -0,0 +1,7 @@
+NEXT_PUBLIC_API-KEY= ""
+NEXT_PUBLIC_AUTH-DOMAIN= ""
+NEXT_PUBLIC_PROJECT-ID= ""
+NEXT_PUBLIC_STORAGE-BUCKET= ""
+NEXT_PUBLIC_MSG-SENDER-ID= ""
+NEXT_PUBLIC_APP-ID= ""
+NEXT_PUBLIC_MEASUREMENT-ID= ""

.github/workflows/nextjs.yml

@@ -8,6 +8,9 @@ on:
   # Runs on pushes targeting the default branch
   push:
     branches: ["develop"]
+  pull_request:  
+    branches: ["develop"]
+
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -87,6 +90,8 @@ jobs:
       url: ${{ steps.deployment.outputs.page_url }}
     runs-on: ubuntu-latest
     needs: build
+    if: github.event_name != 'pull_request'
+
     steps:
       - name: Deploy to GitHub Pages
         id: deployment

.gitignore

@@ -20,6 +20,7 @@ npm-debug.log*
 
 # local env files
 .env*.local
+.env
 
 # vercel
-.vercel
+.vercel

package.json

@@ -18,10 +18,13 @@
     "@mui/icons-material": "^5.14.18",
     "@mui/material": "^5.14.18",
     "@mui/styles": "^5.14.18",
-    "firebase": "^10.6.0",
+    "firebase": "^10.7.1",
+    "firebase-auth": "^0.1.2",
+    "@mui/x-date-pickers-pro": "^6.18.4",
     "mui-datatables": "^4.3.0",
     "next": "14.0.3",
     "react": "^18",
+    "react-date-range": "^1.4.0",
     "react-dom": "^18",
     "react-router-dom": "^6.20.1"
   },

src/app/change-password/page.js

@@ -22,6 +22,7 @@ import {
   import IconButton from "@material-ui/core/IconButton";
   import Visibility from "@material-ui/icons/Visibility";
   import VisibilityOff from "@material-ui/icons/VisibilityOff";
+import CustomButton from "../components/common/Button";
 
 
   const ChangePassword = (props) => {
@@ -49,22 +50,7 @@ import {
       message: "",
       variant: "success",
   });
-
-    // const apiLoading = useSelector(state => state.apiStatus.loading);
-    // const apiMessage = useSelector(state => state.apiStatus.message);
-    // const apiError = useSelector(state => state.apiStatus.error);
-//     useEffect(() => {
-//       setSnackbarInfo({
-//           open: apiMessage ? true : false,
-//           variant: apiError ? "error" : "success",
-//           message: apiMessage ,
-//       });
-//   }, [apiMessage, apiError])
-
-    // useEffect(() => {
-    //   setLoading(apiLoading);
-    // }, [apiLoading])
-
+
     const handleClickShowPassword = () => {
       setValues({ ...values, showPassword: !values.showPassword });
   };
@@ -79,70 +65,7 @@ import {
   const handleMouseDownPassword = (event) => {
       event.preventDefault();
   };
-//   const loggedInUserData = useSelector(
-//     (state) => state.fetchLoggedInUserData.data
-//   );
-
-//     const handleChangePassword = async () => {
-//       setNewPassword("")
-//       setCurrentPassword("")
-//       setConfirmPassword("")
-//       const ChangePassword = {
-//         new_password: newPassword,
-//         current_password: currentPassword,
-//         confirm_password: confirmPassword
-//       }
-//       if(newPassword!==confirmPassword){
-//         setSnackbarInfo({
-//           ...snackbar,
-//           open: true,
-//           message: "New Password and Confirm Password must match",
-//           variant: 'error'
-//       })
-//       }
-//       else{
-//         const userObj = new ChangePasswordAPI(loggedInUserData.id,ChangePassword);
-//         const res = await fetch(userObj.apiEndPoint(), {
-//             method: "PATCH",
-//             body: JSON.stringify(userObj.getBody()),
-//             headers: userObj.getHeaders().headers,
-//         });
-//         const resp = await res.json();
-//         if (res.ok) {
-//             setSnackbarInfo({
-//                 open: true,
-//                 message: resp?.message,
-//                 variant: "success",
-//             })
-
-//         } else {
-//             setSnackbarInfo({
-//                 open: true,
-//                 message: resp?.message,
-//                 variant: "error",
-//             })
-//         }
-//         }
-
-//     }
-
-
-
-//     const renderSnackBar = () => {
-//       return (
-//           <CustomizedSnackbars
-//               open={snackbar.open}
-//               handleClose={() =>
-//                   setSnackbarInfo({ open: false, message: "", variant: "" })
-//               }
-//               anchorOrigin={{ vertical: "top", horizontal: "right" }}
-//               variant={snackbar.variant}
-//               message={[snackbar.message]}
-//           />
-//       );
-//   };
-
-
+
     return (
       <ThemeProvider theme={themeDefault}>
         {loading && <Spinner />}