Changeset f5b256e for my-react-app/src/components/AppContent.js

Timestamp:

04/28/25 14:20:18 (3 weeks ago)

Author:

Aleksandar Panovski <apano77@…>

Branches:

main

Children:

deea3c4

Parents:

8ca35dc

Message:

Big change done works with handle_reservation_update() trigger

File:

• my-react-app/src/components/AppContent.js (modified) (5 diffs)

my-react-app/src/components/AppContent.js

@@ -15 +15 @@
             isAuthenticated: false,
             user: null,
-            loading: false // Add loading state
+            loading: false
         };
     }
@@ -29 +29 @@
 
     fetchUserDetails = (token) => {
-        console.log("Fetch");
+        console.log("Fetching User Details...");
         axios.get("/api/user")
             .then((response) => {
-                this.setState({ user: response.data, componentToShow: "restaurants", isAuthenticated: true });
+                this.setState({
+                    user: response.data,
+                    componentToShow: "restaurants",
+                    isAuthenticated: true
+                });
             })
             .catch((error) => {
                 console.error("Failed to fetch user details:", error);
-                this.logout();
             });
     };
@@ -52 +55 @@
     onLogin = (e, email, password) => {
         e.preventDefault();
-        // After successful login, save the token
+
         axios.post("/api/login", { email, password })
             .then((response) => {
                 const token = response.data.token;
-                localStorage.setItem('token', token);  // Save the token
-                console.log(token);
-                this.setAuthToken(token);  // Set the token for future requests
-                this.setState({ componentToShow: "restaurants", isAuthenticated: true });
+                localStorage.setItem('token', token);
+                console.log("Login Token:", token);
+                this.setAuthToken(token);
+                this.fetchUserDetails(token);
             })
             .catch((error) => {
@@ -65 +68 @@
                 this.setState({ componentToShow: "welcome" });
             });
-
     };
 
@@ -93 +95 @@
 
     render() {
+        if (this.state.isAuthenticated) {
+            return (
+                <div>
+                    <Buttons login={this.login} logout={this.logout} />
+                    <AuthContent />
+                </div>
+            );
+        }
+
         return (
             <div>
                 <Buttons login={this.login} logout={this.logout} />
                 {this.state.componentToShow === "welcome" && <WelcomeContent />}
-                {this.state.componentToShow === "restaurants" && <AuthContent />}
                 {this.state.componentToShow === "login" && <LoginForm onLogin={this.onLogin} onRegister={this.onRegister} />}
-                {this.state.loading && <div>Loading...</div>} {/* Show loading state */}
             </div>
         );
+        // return (
+        //     <div>
+        //         <Buttons login={this.login} logout={this.logout} />
+        //         {this.state.componentToShow === "welcome" && <WelcomeContent />}
+        //         {this.state.componentToShow === "restaurants" && <AuthContent />}
+        //         {this.state.componentToShow === "login" && <LoginForm onLogin={this.onLogin} onRegister={this.onRegister} />}
+        //         {this.state.loading && <div>Loading...</div>} {/* Show loading state */}
+        //     </div>
+        // );
     }
 }