slrmun_ravindu

.gitignore

@@ -12,10 +12,10 @@
 /build
 
 # firebase service account
-/push_data/serviceAccountKey.json
+# /push_data/serviceAccountKey.json
 
 # google apis
-/src/constants/secrets.js
+#/src/constants/secrets.js
 
 # misc
 .DS_Store

package.json

@@ -23,6 +23,7 @@
     "react-firebase-hooks": "^5.0.2",
     "react-router-dom": "^6.2.1",
     "react-scripts": "5.0.0",
+    "react-toastify": "^9.1.3",
     "web-vitals": "^2.1.4"
   },
   "scripts": {

src/App.js

@@ -11,6 +11,11 @@ import "./App.css";
 
 import { AuthProvider } from "./firebase/Auth";
 
+
+import React from 'react';
+import { ToastContainer, toast } from 'react-toastify';
+import 'react-toastify/dist/ReactToastify.css';
+
 function App() {
   const bas_theme = createTheme();
   const styles = theme_config(bas_theme);

src/components/grouped-drop-down/GroupedDropDown.jsx

@@ -7,20 +7,22 @@ import {
 } from "@material-ui/core";
 import React from "react";
 
-const GroupedDropDown = ({ data, selected, groupLabel, categorized }) => {
+const GroupedDropDown = ({ data, selected, groupLabel, categorized , onSelectionChange }) => {
   return (
     <FormControl sx={{ m: 1, minWidth: 120 }}>
       <InputLabel htmlFor="grouped-select">{groupLabel}</InputLabel>
 
       {data ? (
         categorized ? (
-          <Select
-            defaultValue={selected.id}
+          <Select 
+            defaultValue={selected!=undefined? (selected.id):("0")}
             id="grouped-select"
             label={groupLabel}
+            onChange={(e) => onSelectionChange(e.target.value)}
           >
             <ListSubheader>Selected</ListSubheader>
-            <MenuItem value={selected.id}>{selected.text}</MenuItem>
+            {selected!=undefined ? (<MenuItem value={selected.id}>{selected.text}</MenuItem>):(null)}
+            {/* <MenuItem value={selected.id}>{selected.text}</MenuItem> */}
             {Object.entries(data).map((group, key) => {
               return [
                 <ListSubheader key={key}>{group[0]}</ListSubheader>,
@@ -33,7 +35,7 @@ const GroupedDropDown = ({ data, selected, groupLabel, categorized }) => {
             })}
           </Select>
         ) : (
-          <Select value={selected.id} id="grouped-select" label={groupLabel}>
+          <Select value={selected.id} id="grouped-select" label={groupLabel} onChange={(e) => onSelectionChange(e.target.value)}>
             <ListSubheader>Selected</ListSubheader>
             <MenuItem value={selected.id}>{selected.text}</MenuItem>
             <ListSubheader>Available</ListSubheader>
@@ -45,7 +47,7 @@ const GroupedDropDown = ({ data, selected, groupLabel, categorized }) => {
           </Select>
         )
       ) : (
-        <Select defaultValue={0} id="grouped-select" label={groupLabel}>
+        <Select defaultValue={0} id="grouped-select" label={groupLabel} onChange={(e) => onSelectionChange(e.target.value)}>
           <MenuItem value={0}>None</MenuItem>
         </Select>
       )}

src/components/side-panel/SidePanel.jsx

@@ -103,16 +103,6 @@ const SidePanel = ({ cross, setShowSidePanel }) => {
               onClick={() => setShowSidePanel(false)}
             />
           ) : null}
-          {visibilityArray[1] ? (
-            <ListItem
-              text={"Committee Selection"}
-              DispIcon={AccountBalanceIcon}
-              link={COMMITTEE_SELECTION}
-              active={current_path === COMMITTEE_SELECTION}
-              collapsed={collapsed}
-              onClick={() => setShowSidePanel(false)}
-            />
-          ) : null}
           {visibilityArray[2] ? (
             <ListItem
               text={"Payments"}
@@ -123,6 +113,16 @@ const SidePanel = ({ cross, setShowSidePanel }) => {
               onClick={() => setShowSidePanel(false)}
             />
           ) : null}
+          {visibilityArray[1] ? (
+            <ListItem
+              text={"Committee Selection"}
+              DispIcon={AccountBalanceIcon}
+              link={COMMITTEE_SELECTION}
+              active={current_path === COMMITTEE_SELECTION}
+              collapsed={collapsed}
+              onClick={() => setShowSidePanel(false)}
+            />
+          ) : null}
           {visibilityArray[3] ? (
             <ListItem
               text={"FPS Submission"}

src/components/user-details-form/UserDetailsForm.jsx

@@ -86,24 +86,41 @@ const UserDetailsForm = ({ userData, setUserData, getPassword }) => {
         value={userData.email ? userData.email : ""}
         onChange={(e) => setUserData({ ...userData, email: e.target.value })}
       />
-      <div className={classes.inputPair}>
+      <div>
         <TextField
           id="mobile_number"
           label="Mobile Number"
           required
+          fullWidth
+          variant="outlined"
+          margin="normal"
+          value={userData.mobile_number ? userData.mobile_number : ""}
+          onChange={(e) => setUserData({ ...userData, mobile_number: e.target.value })}
+        />
+      </div>
+        {/* <TextField
+          id="mun_experience"
+          label="MUN Experience (years)"
+          required
           InputProps={{
-            className: [classes.marginR, classes.input].join(" "),
+            className: [classes.marginL, classes.input].join(" "),
           }}
+          type="number"
           variant="outlined"
           margin="normal"
-          value={userData.mobile_number ? userData.mobile_number : ""}
+          value={
+            userData.mun_experience ? parseInt(userData.mun_experience) : 0
+          }
           onChange={(e) =>
-            setUserData({ ...userData, mobile_number: e.target.value })
+            setUserData({ ...userData, mun_experience: e.target.value })
           }
-        />
+        /> */}
+
+
+      <div className={classes.inputPair}>
         <TextField
           id="mun_experience"
-          label="MUN Experience (years)"
+          label="No. of MUN Conferences"
           required
           InputProps={{
             className: [classes.marginL, classes.input].join(" "),
@@ -118,7 +135,30 @@ const UserDetailsForm = ({ userData, setUserData, getPassword }) => {
             setUserData({ ...userData, mun_experience: e.target.value })
           }
         />
+        <TextField
+          id="mun_awards"
+          label="MUN Awards"
+          required
+          InputProps={{
+            className: [classes.marginR, classes.input].join(" "),
+          }}
+          type="number"
+          variant="outlined"
+          margin="normal"
+          value={
+            userData.mun_awards ? parseInt(userData.mun_awards) : 0
+          }
+          onChange={(e) =>
+            setUserData({ ...userData, mun_awards: e.target.value })
+          }
+        />
       </div>
+
+
+
+
+
+
       <div className={classes.root}>
         <FormControl component="fieldset" className={classes.formControl}>
           <FormLabel component="legend">Current Status</FormLabel>
@@ -185,6 +225,7 @@ const UserDetailsForm = ({ userData, setUserData, getPassword }) => {
           id="residence_address"
           label="Residence Address"
           fullWidth
+          required
           variant="outlined"
           margin="normal"
           value={userData.residence_address ? userData.residence_address : ""}

src/constants/secrets.js

@@ -0,0 +1,7 @@
+export const FIREBASE_API_KEY =  "AIzaSyDEkgZGfXIWn2maHMjGDC3uM2K2TRCUDGw";
+export const FIREBASE_AUTH_DOMAIN =  "slrmun-24.firebaseapp.com";
+export const FIREBASE_DATABSE_URL =  "https://slrmun-24-default-rtdb.asia-southeast1.firebasedatabase.app";
+export const FIREBASE_PROJECT_ID =  "slrmun-24";
+export const FIREBASE_STORAGE_BUCKET =  "slrmun-24.appspot.com";
+export const FIREBASE_MESSAGING_SENDER_ID =  "1091767194271";
+export const FIREBASE_APP_ID= "1:1091767194271:web:a0abfc27df30661a5cc8aa";