fix: endpoints and schema bugs

src/components/inputs/image.jsx

@@ -43,7 +43,7 @@ const DropPicture = ({ defaultPicture }) => {
       try {
         const compressedFile = await imageCompression(acceptedFiles[0], options);
         formData.append('file', compressedFile);
-        const { data } = await http.post(
+        const { data } = await http.patch(
           `${apiUrl}/${endPoints.user.updateProfilePicture}`,
           formData,
           {

src/config.json

@@ -6,13 +6,13 @@
         "login": "api/user/login",
         "signup": "api/user/signup"
       },
-      "allUsers": "api/user/info/all",
-      "loggedInUser": "api/user/info",
-      "getClassStudents": "api/user/class/all",
-      "updateProfilePicture": "api/user/update/profile_picture"
+      "allUsers": "api/users/all",
+      "loggedInUser": "api/user",
+      "getClassStudents": "api/users/class",
+      "updateProfilePicture": "api/user/update-profile-picture"
     },
     "slamBook": {
-      "getUserAnswers": "api/user/answers",
+      "getUserAnswers": "api/answers",
       "deleteAnswerById": "api/slambook/answer/delete",
       "upsertAnswer": "api/slambook/answer/upsert",
       "createQuestion": "api/slambook/question/new",

src/layouts/private/user/navbar.jsx

@@ -41,9 +41,9 @@ const Navbar = () => {
               <MDBNavItem>
                 <MDBNavLink to="/write">Writes</MDBNavLink>
               </MDBNavItem>
-              <MDBNavItem>
+              {/* <MDBNavItem>
                 <MDBNavLink to="/polls">Polls</MDBNavLink>
-              </MDBNavItem>
+              </MDBNavItem> */}
             </MDBNavbarNav>
             <MDBNavbarNav right>
               <MDBNavItem>

src/pages/private/user/messages/index.jsx

@@ -25,10 +25,10 @@ class PeopleCards extends Component {
     const { data: persons } = await http.get(`${apiUrl}/${endPoints.user.allUsers}`);
 
     let departments = persons.map((e) => {
-      return e.deptSection.department;
+      return e.department;
     });
     let sections = persons.map((e) => {
-      return e.deptSection.section;
+      return e.section;
     });
     departments.sort();
     departments = ['ALL', ...new Set(departments)];
@@ -51,7 +51,7 @@ class PeopleCards extends Component {
   filterPeople = (e) => {
     const people = this.state.persons.filter(
       (person) =>
-        person.credentials.name
+        person.name
           .toLowerCase()
           .search(e.target.value.trim().toLowerCase()) !== -1,
     );
@@ -65,7 +65,7 @@ class PeopleCards extends Component {
 
       return this.setState({
         people: persons.filter((e) => {
-          return e.deptSection.section === sectionSelect;
+          return e.section === sectionSelect;
         }),
         departmentSelect: input.value,
       });
@@ -75,11 +75,11 @@ class PeopleCards extends Component {
       people: persons.filter((e) => {
         if (sectionSelect !== 'ALL') {
           return (
-            e.deptSection.department === input.value &&
-            e.deptSection.section === sectionSelect
+            e.department === input.value &&
+            e.section === sectionSelect
           );
         }
-        return e.deptSection.department === input.value;
+        return e.department === input.value;
       }),
       departmentSelect: input.value,
     });
@@ -92,7 +92,7 @@ class PeopleCards extends Component {
 
       return this.setState({
         people: persons.filter((e) => {
-          return e.deptSection.department === departmentSelect;
+          return e.department === departmentSelect;
         }),
         sectionSelect: input.value,
       });
@@ -102,11 +102,11 @@ class PeopleCards extends Component {
       people: persons.filter((e) => {
         if (departmentSelect !== 'ALL') {
           return (
-            e.deptSection.section === input.value &&
-            e.deptSection.department === departmentSelect
+            e.section === input.value &&
+            e.department === departmentSelect
           );
         }
-        return e.deptSection.section === input.value;
+        return e.section === input.value;
       }),
       sectionSelect: input.value,
     });
@@ -162,9 +162,9 @@ class PeopleCards extends Component {
                 <UserCard
                   person={person}
                   key={person._id}
-                  personName={person.credentials.name}
-                  personImageUrl={person.info.profilePicture}
-                  personBio={person.info.bio}
+                  personName={person.name}
+                  personImageUrl={person.profilePicture}
+                  personBio={person.bio}
                   triggerModal={this.triggerModal}
                 />
               </div>

src/pages/private/user/messages/single.jsx

@@ -39,7 +39,7 @@ const UserCard = ({ person, personName, personBio, personImageUrl }) => {
       'secondary',
       'dark',
     ];
-    classes += badgeClass[person.deptSection.section.charCodeAt(0) - 65];
+    classes += badgeClass[person.section.charCodeAt(0) - 65];
     return classes;
   };
   const classes = useStyles();
@@ -61,7 +61,7 @@ const UserCard = ({ person, personName, personBio, personImageUrl }) => {
         </div>
         <div className="text-center">
           <span className={getBadgeClass()}>
-            {person.deptSection.department} - {person.deptSection.section}
+            {person.department} - {person.section}
           </span>
         </div>
         {personBio ? (

src/pages/private/user/profile/details.jsx

@@ -48,23 +48,23 @@ const UserInfo = () => {
       try {
         const { data } = await http.get(`${apiUrl}/${endPoints.user.loggedInUser}`);
         setCredentials({
-          name: data.credentials.name,
-          phoneNo: data.credentials.phoneNo,
-          email: data.credentials.email,
+          name: data.name,
+          phoneNo: data.socialHandles.phone,
+          email: data.socialHandles.email,
         });
         setDeptSection({
-          department: data.deptSection.department,
-          section: data.deptSection.section,
+          department: data.department,
+          section: data.section,
         });
         setInfo({
-          bio: data.info.bio,
-          profilePicture: data.info.profilePicture,
+          bio: data.bio,
+          profilePicture: data.profilePicture,
         });
         setSocialHandles({
-          contactEmail: data.socialHandles.contactEmail,
-          contactNo: data.socialHandles.contactNo,
+          contactEmail: data.socialHandles.email,
+          contactNo: data.socialHandles.phone,
           instagram: data.socialHandles.instagram,
-          whatsappNo: data.socialHandles.whatsappNo,
+          whatsappNo: data.socialHandles.whatsapp,
           facebook: data.socialHandles.facebook,
           linkedin: data.socialHandles.linkedin,
           snapchat: data.socialHandles.snapchat,
@@ -201,14 +201,14 @@ const UserInfo = () => {
                       isDisabled
                     />
 
-                    <Input
+                    {/* <Input
                       name="email"
                       label="Account Email"
                       value={credentials.email}
                       handleChange={handleChange}
                       icon="envelope"
                       isDisabled
-                    />
+                    /> */}
                     <Input
                       name="department"
                       label="Department"

src/pages/private/user/profile/index.jsx

@@ -73,9 +73,9 @@ const Profile = () => {
                       className="card-title text-left h6-responsive mb-2"
                       style={{ textDecoration: 'underline' }}
                     >
-                      {index + 1}. {item.questionId.title}
+                      {index + 1}. {item.title}
                     </h6>
-                    <p className="card-text">{item.answer}</p>
+                    <p className="card-text">{item.content}</p>
                   </div>
                 ))}
               </div>

src/pages/private/user/profile/profileCard/socialCard.jsx

@@ -9,19 +9,17 @@ const PersonalCard = () => {
   const [Name, setName] = useState('');
   const [info, setInfo] = useState({ bio: '', profilePicture: '' });
   const [socialHandles, setSocialHandles] = useState({
-    contactEmail: '',
-    contactNo: '',
+    email: '',
+    phone: '',
     instagram: '',
-    whatsappNo: '',
     facebook: '',
     linkedin: '',
     snapchat: '',
   });
 
   const {
-    contactEmail,
-    contactNo,
-    whatsappNo,
+    email,
+    phone,
     instagram,
     linkedin,
     facebook,
@@ -32,20 +30,21 @@ const PersonalCard = () => {
     const fetchUserData = async () => {
       try {
         const { data } = await http.get(`${apiUrl}/${endPoints.user.loggedInUser}`);
-        setName(data.credentials.name);
+        setName(data.name);
         setInfo({
-          bio: data.info.bio,
-          profilePicture: data.info.profilePicture,
+          bio: data.bio,
+          profilePicture: data.profilePicture,
         });
         setSocialHandles({
-          contactEmail: data.socialHandles.contactEmail,
-          contactNo: data.socialHandles.contactNo,
+          email: data.socialHandles.email,
+          phone: data.socialHandles.phone,
           instagram: data.socialHandles.instagram,
-          whatsappNo: data.socialHandles.whatsappNo,
+          // whatsappNo: data.socialHandles.whatsappNo,
           facebook: data.socialHandles.facebook,
           linkedin: data.socialHandles.linkedin,
           snapchat: data.socialHandles.snapchat,
         });
+        console.log('socialss', data)
       } catch (ex) {
         if (ex.response && ex.response.status === 400) {
           TimerAlert('Error', ex.response.data, 'error');
@@ -90,24 +89,24 @@ const PersonalCard = () => {
           <div>
             <Tooltip title="You can add more details from update details section">
               <div className="row">
-                {contactEmail && (
+                {email && (
                   <SocialHandle
-                    platform={contactEmail}
+                    platform={email}
                     iconClass="fas fa-lg fa-envelope"
                   />
                 )}
-                {contactNo && (
+                {phone && (
                   <SocialHandle
-                    platform={contactNo}
+                    platform={phone}
                     iconClass="fas fa-lg fa-phone-square-alt"
                   />
                 )}
-                {whatsappNo && (
+                {/* {whatsappNo && (
                   <SocialHandle
                     platform={whatsappNo}
                     iconClass="fab fa-lg fa-whatsapp"
                   />
-                )}
+                )} */}
                 {linkedin && (
                   <SocialHandle
                     platform={linkedin}

src/pages/public/admin/login.jsx

@@ -28,10 +28,10 @@ const AdminLogin = () => {
       TimerAlert('Success', data, 'success');
       history.push('/');
     } catch (ex) {
-      if (ex.response && ex.reponse.status && ex.response.status === 400) {
+      if (ex.response && ex.response.status && ex.response.status === 400) {
         TimerAlert('Error', ex.response.data, 'error');
       }
-      if (ex.reponse && ex.response.status && ex.response.status === 401) {
+      if (ex.response && ex.response.status && ex.response.status === 401) {
         TimerAlert('Error', 'Invalid Username or Password', 'error');
       }
       setLoading(false);

src/pages/public/user/login.jsx

@@ -10,9 +10,9 @@ import { apiUrl, endPoints } from '../../../config.json';
 import { http } from '../../../services';
 
 const UserLogin = () => {
-  const [credentials, setCredentials] = useState({ email: '', password: '' });
+  const [credentials, setCredentials] = useState({ userId: '', password: '' });
   const [validationErrors, setValidationErrors] = useState({
-    email: '',
+    userId: '',
     password: '',
   });
   const [Loading, setLoading] = useState(false);
@@ -65,9 +65,9 @@ const UserLogin = () => {
   const submitHandler = async (e) => {
     e.preventDefault();
     e.target.className += ' was-validated';
-    const errors = validateForm();
-    setValidationErrors(errors || {});
-    if (errors) return;
+    // const errors = validateForm();
+    // setValidationErrors(errors || {});
+    // if (errors) return;
     try {
       setLoading(true);
       const { headers } = await http.post(
@@ -109,12 +109,12 @@ const UserLogin = () => {
                     Sign In <Emoji symbol="🔐" />
                   </p>
                   <Input
-                    name="email"
-                    label="Email"
-                    value={credentials.email}
+                    name="userId"
+                    label="Roll No."
+                    value={credentials.userId}
                     handleChange={handleChange}
-                    error={validationErrors.email}
-                    feedback={validationErrors.email}
+                    error={validationErrors.userId}
+                    feedback={validationErrors.userId}
                   />
 
                   <Input

src/services/httpService.js

@@ -21,5 +21,6 @@ export default {
   post: axios.post,
   put: axios.put,
   delete: axios.delete,
+  patch: axios.patch,
   setJwt,
 };

src/utils/schemas.js

@@ -2,11 +2,11 @@ import Joi from 'joi-browser';
 
 const LoginSchema = () => {
   return {
-    email: Joi.string()
-      .email()
+    userId: Joi
+      .number()
       .error(() => {
         return {
-          message: 'Please enter a valid Email ID',
+          message: 'Please enter a valid enrollment number',
         };
       })
       .required(),
@@ -27,7 +27,7 @@ const SignUpSchema = () => {
       .min(7)
       .error(() => {
         return {
-          message: 'Password should be atleast 7 characters long',
+          message: 'Password should be at least 7 characters long',
         };
       })
       .required(),