Changeset 07f4e8b for frontend/src/Components/Hooks

Timestamp:

01/24/24 17:42:28 (10 months ago)

Author:

darsov2 <62809499+darsov2@…>

Branches:

master

Children:

0f5aa27

Parents:

5528b99

Message:

prefinal fixes

Location:

frontend/src/Components/Hooks

Files:

• Hotel/useCreateHotel.js (modified) (2 diffs)
• Restaurant/useCreateRestaurant.js (modified) (1 diff)
• Restaurant/useCreateTable.js (modified) (1 diff)
• Transport/useCreateTransport.js (modified) (1 diff)
• User/useLogin.js (modified) (2 diffs)
• useCreate.js (modified) (1 diff)
• useGet.js (modified) (3 diffs)

frontend/src/Components/Hooks/Hotel/useCreateHotel.js

@@ -6 +6 @@
 const useCreateHotel = () => {
 
-    //const history = useNavigate();
     const createHotel = async (hotel, edit) => {
                 console.log({hotel})
                 console.log(hotel)
+                console.log("vo createhotel")
 
                 if(!edit)
@@ -16 +16 @@
                         .post(`/hotel/add`, hotel, {
                                 params: {
-                                        userId: localStorage.getItem("userId")
+                                        userId: JSON.parse(localStorage.getItem("user")).userId
                                 }
                         }) 

frontend/src/Components/Hooks/Restaurant/useCreateRestaurant.js

@@ -15 +15 @@
                         .post(`/restaurant/add`, restaurant, {
                                 params: {
-                                        userId: localStorage.getItem('userId')
+                                        userId: JSON.parse(localStorage.getItem('user')).userId,
                                 }
                         }) 

frontend/src/Components/Hooks/Restaurant/useCreateTable.js

@@ -13 +13 @@
                     .then((res) => {
                                         console.log(res)
-                                        refresh(prev => ++prev)
+                                        refresh(Math.random())
                         //history.push('/restaurant');
                     })

frontend/src/Components/Hooks/Transport/useCreateTransport.js

@@ -4 +4 @@
 
 const useCreateTransport = () => {
-
+        const userId = JSON.parse(localStorage.getItem('user')).userId
     const createTransport = async (transport, edit) => {
                         if(!edit)
                         {
                                 await axios
-                    .post(`/transport/add`, transport) 
+                    .post(`/transport/add/` + userId, transport)
                     .then((res) => {
                         //history.push('/transport');

frontend/src/Components/Hooks/User/useLogin.js

@@ -4 +4 @@
 import { Navigate, useAsyncValue, useNavigate } from "react-router-dom";
 import LoginForm from "../../Login/LoginForm.js";
+import {useAuth} from "../../Context/AuthContext";
 
 const useLogin = () => {
 
     const navigator = useNavigate()
+        const Auth = useAuth();
     //const history = useNavigate();
     const login = async (loginData) => {
@@ -22 +24 @@
                 }) 
                     .then((res) => {
+                                        console.log("RES LOGIN")
+                                        console.log(res)
+                                        if(res.status === 200)
+                                        {
+                                                const user = {
+                                                        sessionId: res.data.auth.details.sessionId,
+                                                        userId: res.data.auth.principal.userID,
+                                                        username: res.data.auth.principal.username,
+                                                        role: res.data.auth.principal.role,
+                                                        name: res.data.auth.principal.name,
+                                                        surname: res.data.auth.principal.surname,
+                                                }
+                                                Auth.userLogin(user);
+                                                console.log(user)
+                                        }
                                         const sessionId = res.data.auth.details.sessionId;
                                         const userId = res.data.auth.principal.userID;
-                                        
+
                                         localStorage.setItem("sessionId", sessionId);
                                         localStorage.setItem("userId", userId);

frontend/src/Components/Hooks/useCreate.js

@@ -16 +16 @@
                 //history.push('/hotel');
                 console.log(res)
+                console.log("gotovo")
                 getData(prev => ++prev)
                 getData2(prev => ++prev)

frontend/src/Components/Hooks/useGet.js

@@ -11 +11 @@
         console.log(localStorage.getItem("sessionId"))
         console.log("url od get " + uurl)
-<<<<<<< HEAD
         await axios.get(uurl, {maxRedirects: 0}).then((res) => {
             console.log(res);
@@ -23 +22 @@
             // window.location.href = '/error'
         })
-=======
-        await axios.
-            get(uurl).then((res) => {
-                setData(res.data);
-            }).catch((err) => {
-                console.log(err)
-            })
->>>>>>> parent of ac19a0c (authContext impl, admin panel impl, search bar fixes, reservations listings impl)
             .finally(() => {
                 setIsLoading(false);
@@ -40 +31 @@
         getData(url);
     }, [dep, url, changed]);
-    
+
     return {
         data,