Student/Teacher/Officer | Password Operations Screens | SIS-116

.env.sis.live

@@ -1,3 +1,4 @@
 
 SIS_PROFILE=live
-SIS_API_URL=https://sis-be.herokuapp.com
+SIS_API_URL=https://sis-be.herokuapp.com
+SIS_FE_URL=https://sis-fe.herokuapp.com

.env.sis.local

@@ -1,4 +1,5 @@
 
 PORT=8586
 SIS_PROFILE=local
-SIS_API_URL=http://localhost:8585
+SIS_API_URL=http://localhost:8585
+SIS_FE_URL=http://localhost:8586

pages/login/officer/forgot-password/index.js

@@ -7,12 +7,13 @@ import {Dialog, Transition} from "@headlessui/react";
 export async function getServerSideProps() {
     return {
         props: {
-            SIS_API_URL: process.env.SIS_API_URL
+            SIS_API_URL: process.env.SIS_API_URL,
+            SIS_FE_URL: process.env.SIS_FE_URL
         }
     }
 }
 
-export default function OfficerForgotPassword({SIS_API_URL}) {
+export default function OfficerForgotPassword({SIS_API_URL, SIS_FE_URL}) {
 
     const router = useRouter();
 
@@ -58,8 +59,11 @@ export default function OfficerForgotPassword({SIS_API_URL}) {
         openProcessingModal();
 
         event.preventDefault();
-        const res = await fetch(`${SIS_API_URL}/login/officer/forgot-password`, {
-            body: JSON.stringify({officerId: officerNumber}),
+        const res = await fetch(`${SIS_API_URL}/officer/password-operation/forgot-password`, {
+            body: JSON.stringify({
+                officerId: officerNumber,
+                feUrl: SIS_FE_URL
+            }),
             headers: {'Content-Type': 'application/json'},
             method: 'POST'
         });

pages/login/student/forgot-password/index.js

@@ -7,12 +7,13 @@ import {Dialog, Transition} from "@headlessui/react";
 export async function getServerSideProps() {
     return {
         props: {
-            SIS_API_URL: process.env.SIS_API_URL
+            SIS_API_URL: process.env.SIS_API_URL,
+            SIS_FE_URL: process.env.SIS_FE_URL
         }
     }
 }
 
-export default function StudentForgotPassword({SIS_API_URL}) {
+export default function StudentForgotPassword({SIS_API_URL, SIS_FE_URL}) {
 
     const router = useRouter();
 
@@ -58,8 +59,11 @@ export default function StudentForgotPassword({SIS_API_URL}) {
         openProcessingModal();
 
         event.preventDefault();
-        const res = await fetch(`${SIS_API_URL}/login/student/forgot-password`, {
-            body: JSON.stringify({studentId: studentNumber}),
+        const res = await fetch(`${SIS_API_URL}/student/password-operation/forgot-password`, {
+            body: JSON.stringify({
+                studentId: studentNumber,
+                feUrl: SIS_FE_URL
+            }),
             headers: {'Content-Type': 'application/json'},
             method: 'POST'
         });

pages/login/teacher/forgot-password/index.js

@@ -7,12 +7,13 @@ import {Dialog, Transition} from "@headlessui/react";
 export async function getServerSideProps() {
     return {
         props: {
-            SIS_API_URL: process.env.SIS_API_URL
+            SIS_API_URL: process.env.SIS_API_URL,
+            SIS_FE_URL: process.env.SIS_FE_URL
         }
     }
 }
 
-export default function TeacherForgotPassword({SIS_API_URL}) {
+export default function TeacherForgotPassword({SIS_API_URL, SIS_FE_URL}) {
 
     const router = useRouter();
 
@@ -58,8 +59,11 @@ export default function TeacherForgotPassword({SIS_API_URL}) {
         openProcessingModal();
 
         event.preventDefault();
-        const res = await fetch(`${SIS_API_URL}/login/teacher/forgot-password`, {
-            body: JSON.stringify({teacherId: teacherNumber}),
+        const res = await fetch(`${SIS_API_URL}/teacher/password-operation/forgot-password`, {
+            body: JSON.stringify({
+                teacherId: teacherNumber,
+                feUrl: SIS_FE_URL
+            }),
             headers: {'Content-Type': 'application/json'},
             method: 'POST'
         });

pages/officer/operation/staff/save/index.js

@@ -17,6 +17,7 @@ export async function getServerSideProps(context) {
     }
 
     const SIS_API_URL = process.env.SIS_API_URL;
+    const SIS_FE_URL = process.env.SIS_FE_URL;
     const facultyResponses = await fetch(`${SIS_API_URL}/faculty?status=ACTIVE`, {
         headers: {'Content-Type': 'application/json'},
         method: 'GET'
@@ -28,13 +29,14 @@ export async function getServerSideProps(context) {
                 isPagePermissionSuccess: true,
                 operationUserId: officerId,
                 SIS_API_URL: SIS_API_URL,
+                SIS_FE_URL: SIS_FE_URL,
                 faculties: facultyDatas.response
             }
         }
     }
 }
 
-export default function SaveOfficer({isPagePermissionSuccess, operationUserId, SIS_API_URL, faculties}) {
+export default function SaveOfficer({isPagePermissionSuccess, operationUserId, SIS_API_URL, SIS_FE_URL, faculties}) {
 
     if (!isPagePermissionSuccess) {
         return (
@@ -142,7 +144,8 @@ export default function SaveOfficer({isPagePermissionSuccess, operationUserId, S
                     phoneNumber: officerPhone
                 },
                 operationInfoRequest: {
-                    userId: operationUserId
+                    userId: operationUserId,
+                    feUrl: SIS_FE_URL
                 },
                 personalInfoRequest: {
                     address: officerAddress,

pages/officer/operation/student/save/index.js

@@ -18,6 +18,7 @@ export async function getServerSideProps(context) {
     }
 
     const SIS_API_URL = process.env.SIS_API_URL;
+    const SIS_FE_URL = process.env.SIS_FE_URL;
     const departmentResponses = await fetch(`${SIS_API_URL}/department?status=ACTIVE`, {
         headers: {'Content-Type': 'application/json'},
         method: 'GET'
@@ -29,14 +30,15 @@ export async function getServerSideProps(context) {
                 isPagePermissionSuccess: true,
                 operationUserId: officerId,
                 SIS_API_URL: SIS_API_URL,
+                SIS_FE_URL: SIS_FE_URL,
                 departments: departmentDatas.response
             }
         }
     }
 }
 
 
-export default function SaveStudent({isPagePermissionSuccess, operationUserId, SIS_API_URL, departments}) {
+export default function SaveStudent({isPagePermissionSuccess, operationUserId, SIS_API_URL, SIS_FE_URL, departments}) {
 
     if (!isPagePermissionSuccess) {
         return (
@@ -151,7 +153,8 @@ export default function SaveStudent({isPagePermissionSuccess, operationUserId, S
                     classLevel: studentClassLevel,
                 },
                 operationInfoRequest: {
-                    userId: operationUserId
+                    userId: operationUserId,
+                    feUrl: SIS_FE_URL
                 },
                 personalInfoRequest: {
                     address: studentAddress,
@@ -250,13 +253,13 @@ export default function SaveStudent({isPagePermissionSuccess, operationUserId, S
                                                     let birthdayLength = e.target.value.length;
                                                     if (birthdayLength > 1 && birthdayLength < 3) {
                                                         if (e.target.value <= 31) {
-                                                            e.target.value =  e.target.value + ".";
+                                                            e.target.value = e.target.value + ".";
                                                         } else {
                                                             e.target.value = "";
                                                         }
                                                     }
                                                     if (birthdayLength > 4 && birthdayLength < 7) {
-                                                        e.target.value =  e.target.value + ".";
+                                                        e.target.value = e.target.value + ".";
                                                     }
                                                     changeStudentBirthday(e)
                                                 }}
@@ -298,13 +301,13 @@ export default function SaveStudent({isPagePermissionSuccess, operationUserId, S
                                                         e.target.value = "+90 (" + e.target.value;
                                                     }
                                                     if (pNumberLength > 7 && pNumberLength < 10) {
-                                                        e.target.value =  e.target.value + ") ";
+                                                        e.target.value = e.target.value + ") ";
                                                     }
                                                     if (pNumberLength > 12 && pNumberLength < 15) {
-                                                        e.target.value =  e.target.value + " ";
+                                                        e.target.value = e.target.value + " ";
                                                     }
                                                     if (pNumberLength > 15 && pNumberLength < 18) {
-                                                        e.target.value =  e.target.value + " ";
+                                                        e.target.value = e.target.value + " ";
                                                     }
                                                     changeStudentPhoneNumber(e)
                                                 }}
@@ -575,4 +578,4 @@ export default function SaveStudent({isPagePermissionSuccess, operationUserId, S
             </div>
         </div>
     )
-}
+}

pages/officer/operation/teacher/save/index.js

@@ -18,6 +18,7 @@ export async function getServerSideProps(context) {
     }
 
     const SIS_API_URL = process.env.SIS_API_URL;
+    const SIS_FE_URL = process.env.SIS_FE_URL;
     const departmentResponses = await fetch(`${SIS_API_URL}/department?status=ACTIVE`, {
         headers: {'Content-Type': 'application/json'},
         method: 'GET'
@@ -29,14 +30,15 @@ export async function getServerSideProps(context) {
                 isPagePermissionSuccess: true,
                 operationUserId: officerId,
                 SIS_API_URL: SIS_API_URL,
+                SIS_FE_URL: SIS_FE_URL,
                 departments: departmentDatas.response
             }
         }
     }
 }
 
 
-export default function SaveTeacher({isPagePermissionSuccess, operationUserId, SIS_API_URL, departments}) {
+export default function SaveTeacher({isPagePermissionSuccess, operationUserId, SIS_API_URL, SIS_FE_URL, departments}) {
 
     if (!isPagePermissionSuccess) {
         return (
@@ -165,7 +167,8 @@ export default function SaveTeacher({isPagePermissionSuccess, operationUserId, S
                     role: teacherRole
                 },
                 operationInfoRequest: {
-                    userId: operationUserId
+                    userId: operationUserId,
+                    feUrl: SIS_FE_URL
                 },
                 personalInfoRequest: {
                     address: teacherAddress,

pages/student/schedule/exam/file/index.js

@@ -33,6 +33,7 @@ export async function getServerSideProps(context) {
     } else {
         return {
             props: {
+                isPagePermissionSuccess: true,
                 examScheduleFile: null
             }
         }