v1 admin synapse

ipti · Jul 17, 2024 · 23dcdb5 · 23dcdb5
1 parent d7b7eb1
commit 23dcdb5
Show file tree

Hide file tree

Showing 9 changed files with 90 additions and 118 deletions.
diff --git a/src/Components/Layout/TopBar/style.ts b/src/Components/Layout/TopBar/style.ts
@@ -11,7 +11,7 @@ export const Container = styled.div`
    padding: 10px;
 
    .iconResponsive {
-      @media screen and (min-width: 750px) {
+      @media screen and (min-width: 1080px) {
         display: none ;
     }
    }

diff --git a/src/Pages/Classroom/ClassroomOne/RegistrationList/ModalAddStudent/index.tsx b/src/Pages/Classroom/ClassroomOne/RegistrationList/ModalAddStudent/index.tsx
@@ -1,16 +1,13 @@
 import { Form, Formik } from "formik";
 import { Button } from "primereact/button";
 import { Dialog } from "primereact/dialog";
+import { useContext } from "react";
 import { useParams } from "react-router-dom";
 import DropdownComponent from "../../../../../Components/Dropdown";
-import { Column, Padding, Row } from "../../../../../Styles/styles";
-import { RadioButton } from "primereact/radiobutton";
-import { useContext, useState } from "react";
-import UsersProvider from "../../../../../Context/Users/context";
-import { CreateUserPage } from "../../../../Users/CreateUser";
-import { useFetchRequestAllRegistration } from "../../../../../Services/Beneficiaries/query";
 import { RegistrationClassroomContext } from "../../../../../Context/Classroom/RegistrationsList/context";
 import { RegistrationClassroomTypes } from "../../../../../Context/Classroom/RegistrationsList/type";
+import { useFetchRequestAllRegistration } from "../../../../../Services/Beneficiaries/query";
+import { Column, Padding, Row } from "../../../../../Styles/styles";
 
 const ModalAddStudent = ({
   onHide,
@@ -26,16 +23,12 @@ const ModalAddStudent = ({
   ) as RegistrationClassroomTypes;
 
 
-  const [isNew, setIsNew] = useState(false);
-
-
   const { data: registrationsRequests } = useFetchRequestAllRegistration();
 
   const initialValues = {
     classroom_id: id,
-    student_id: ""
-  }
-
+    student_id: "",
+  };
 
   return (
     <Dialog
@@ -45,72 +38,48 @@ const ModalAddStudent = ({
       style={{ width: "30vw" }}
     >
       <Padding padding="8px" />
-      <div className="flex justify-content-center">
-        <div className="flex flex-wrap gap-3">
-          <div className="flex align-items-center">
-            <RadioButton
-              value={false}
-              onChange={(e) => setIsNew(e.value)}
-              checked={isNew === false}
-            />
-            <label htmlFor="ingredient1" className="ml-2">
-              Aluno existente
-            </label>
-          </div>
-          <div className="flex align-items-center">
-            <RadioButton
-              value={true}
-              onChange={(e) => setIsNew(e.value)}
-              checked={isNew === true}
-            />
-            <label className="ml-2">Novo aluno</label>
-          </div>
-        </div>
-      </div>
-      {isNew ? (
-        <UsersProvider>
-          <CreateUserPage isStudent />
-        </UsersProvider>
-      ) : (
-        <Formik
-          initialValues={initialValues}
-          onSubmit={(values) => {
-            props.AddStudentClassroom({ student_id: parseInt(values.student_id), classroom_id: parseInt(id!) })
-            onHide();
-          }}
-        >
-          {({ values, handleChange, errors, touched }) => {
-            return (
-              <Form>
-                <div className="col-12">
-                  <label>Alunos</label>
-                  <Padding />
-                  <DropdownComponent
-                    value={values.student_id}
-                    placerholder="Selecione o aluno"
-                    name="student_id"
-                    optionsValue="id"
-                    optionsLabel="name"
-                    onChange={handleChange}
-                    options={registrationsRequests}
-                  />
-                  {errors.student_id && touched.student_id ? (
-                    <div style={{ color: "red", marginTop: "8px" }}>
-                      {errors.student_id}
-                    </div>
-                  ) : null}
-                </div>
-                <Padding padding="16px" />
-                <Column style={{ width: "100%" }}>
-                  <Row id="end">
-                    <Button label="Adicionar" type="submit" />
-                  </Row>
-                </Column>
-              </Form>
-            );
-          }}
-        </Formik>
-      )}
+
+      <Formik
+        initialValues={initialValues}
+        onSubmit={(values) => {
+          props.AddStudentClassroom({
+            student_id: parseInt(values.student_id),
+            classroom_id: parseInt(id!),
+          });
+          onHide();
+        }}
+      >
+        {({ values, handleChange, errors, touched }) => {
+          return (
+            <Form>
+              <div className="col-12">
+                <label>Alunos</label>
+                <Padding />
+                <DropdownComponent
+                  value={values.student_id}
+                  placerholder="Selecione o aluno"
+                  name="student_id"
+                  optionsValue="id"
+                  optionsLabel="name"
+                  onChange={handleChange}
+                  options={registrationsRequests}
+                />
+                {errors.student_id && touched.student_id ? (
+                  <div style={{ color: "red", marginTop: "8px" }}>
+                    {errors.student_id}
+                  </div>
+                ) : null}
+              </div>
+              <Padding padding="16px" />
+              <Column style={{ width: "100%" }}>
+                <Row id="end">
+                  <Button label="Adicionar" type="submit" />
+                </Row>
+              </Column>
+            </Form>
+          );
+        }}
+      </Formik>
     </Dialog>
   );
 };

diff --git a/src/Pages/School/SchoolList/index.tsx b/src/Pages/School/SchoolList/index.tsx
@@ -35,7 +35,7 @@ const TecnologySocial = () => {
       <div className="grid">
         {propsAplication.project?.map((item, index) => {
           return (
-            <div className="col-12 md:col-6 lg:col-4">
+            <div key={index} className="col-12 md:col-6 lg:col-4">
               <CardTs title={item.name} id={item.id} />
             </div>
           );

diff --git a/src/Pages/Student/StudentList/index.tsx b/src/Pages/Student/StudentList/index.tsx
@@ -89,7 +89,6 @@ const BeneficiariesListPage = () => {
           value={props.registrations}
           tableStyle={{ minWidth: "50rem" }}
           header={renderHeader}
-          showGridlines
           paginator
           rows={10}
         >

diff --git a/src/Pages/Users/CreateUser/index.tsx b/src/Pages/Users/CreateUser/index.tsx
@@ -40,7 +40,7 @@ export const CreateUserPage = ({ isStudent }: { isStudent: boolean }) => {
   });
 
   return (
-    <ContentPage title="Criar professor" description="Crie o professor.">
+    <ContentPage title={isStudent ? "Criar Aluno" : "Criar Professor"} description={isStudent ? "Crie o Aluno." : "Crie o Professor."}>
       <Padding />
       <Formik
         initialValues={{
@@ -59,7 +59,6 @@ export const CreateUserPage = ({ isStudent }: { isStudent: boolean }) => {
         validationSchema={CreateUserSchema}
       >
         {({ values, handleChange, errors, touched }) => {
-          console.log(errors);
           return (
             <Form>
               <InputsUser

diff --git a/src/Services/Classroom/controller.tsx b/src/Services/Classroom/controller.tsx
@@ -47,7 +47,7 @@ export const ControllerClassroom = () => {
           confirmButtonColor: styles.colors.colorsBaseProductNormal,
         }).then((result) => {
           if (result.isConfirmed) {
-            queryClient.refetchQueries("")
+            queryClient.refetchQueries("useRequestsClassroomRegistration")
           }
         });
       },

diff --git a/src/Services/#/controller.tsx b/src/Services/#/controller.tsx
@@ -6,28 +6,34 @@ import { idUser, login, logout, menuItem } from "../localstorage";
 import { LoginRequest, LoginSystemRequest } from "./request";
 import { LoginTypes } from "./types";
 
-export const LoginController = ({ setError }: { setError: any, }) => {
+export const LoginController = ({ setError }: { setError: any }) => {
   const history = useNavigate();
 
   const LoginRequestMutation = useMutation(
     (data: LoginTypes) => LoginRequest(data),
     {
       onError: (error: any) => {
         Swal.fire({
-          icon: 'error',
+          icon: "error",
           title: error.response.data.message,
           confirmButtonColor: styles.colors.colorsBaseProductNormal,
-        })
-        setError(error.response.data.message)
+        });
+        setError(error.response.data.message);
       },
       onSuccess: (data) => {
-        idUser(JSON.stringify(data.data));
-
-        history("/");
-        menuItem("1");
-        window.location.reload();
+        if (data.data?.student?.id) {
+          Swal.fire({
+            icon: "error",
+            title: "Seu usuário não tem permissão para acessar o sistema.",
+            confirmButtonColor: styles.colors.colorsBaseProductNormal,
+          });
+        } else {
+          idUser(JSON.stringify(data.data));
+          history("/");
+          menuItem("1");
+          window.location.reload();
+        }
       },
-
     }
   );
 
@@ -36,25 +42,26 @@ export const LoginController = ({ setError }: { setError: any, }) => {
     {
       onError: (error: any) => {
         Swal.fire({
-          icon: 'error',
+          icon: "error",
           title: error.response.data.message,
           confirmButtonColor: styles.colors.colorsBaseProductNormal,
-        })
-        setError(error.response.data.message)
+        });
+        setError(error.response.data.message);
       },
       onSuccess: (data, variables) => {
-        logout()
+        logout();
         login(data.data.token);
 
-        LoginRequestMutation.mutate({user_name: variables.user_name, password: variables.password})
-
+        LoginRequestMutation.mutate({
+          user_name: variables.user_name,
+          password: variables.password,
+        });
       },
-
     }
   );
 
   return {
     LoginRequestMutation,
-    LoginSystemRequestMutation
-  }
-}
+    LoginSystemRequestMutation,
+  };
+};
diff --git a/src/Services/#/request.tsx b/src/Services/#/request.tsx
@@ -2,11 +2,9 @@ import http from "../axios";
 import { LoginTypes } from "./types";
 
 export const LoginSystemRequest = async (body: LoginTypes) => {
-
-    console.log(process.env.REACT_APP_API_PATH_USERNAME)
   return await http.post("/user/#-system-auth", {
-    user_name: "editor",
-    password: "iptisynpaseeditor2022",
+    user_name: process.env.REACT_APP_API_PATH_USERNAME,
+    password: process.env.REACT_APP_API_PATH_PASSWORD,
   });
 };
 

diff --git a/src/Services/SocialTechnology/request.tsx b/src/Services/SocialTechnology/request.tsx
@@ -1,8 +1,7 @@
 import http from "../axios";
-import { GetIdUser } from "../localstorage";
+import { GetIdUser, logout } from "../localstorage";
 
 export const requestSocialTechnologytList = async () => {
-  console.log(GetIdUser())
   if (false) {
     return await http
       .get("/user/teacher-school/" + GetIdUser().id)
@@ -22,10 +21,11 @@ export const requestSocialTechnologytList = async () => {
       .get("/school")
       .then((response) => response.data)
       .catch((err) => {
-        // if(err.response.status === 401){
-        //   logout()
-        //   window.location.reload()
-        // }
+
+        if(err.response.status === 401){
+          logout()
+          window.location.reload()
+        }
 
         throw err;
       });
@@ -55,10 +55,10 @@ export const requestCreateSocialTechnology = async (body: {name: string, uf: str
       .post("/school", body)
       .then((response) => response.data)
       .catch((err) => {
-        // if(err.response.status === 401){
-        //   logout()
-        //   window.location.reload()
-        // }
+        if(err.response.status === 401){
+          logout()
+          window.location.reload()
+        }
 
         throw err;
       });