Skip to content

Commit

Permalink
fix: user and admin login
Browse files Browse the repository at this point in the history
  • Loading branch information
daddygi committed Dec 16, 2023
1 parent fcf1dec commit ebb4c3e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
4 changes: 2 additions & 2 deletions backend/app/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def get_user_by_id(user_id):
try:
cursor = connection.cursor(dictionary=True)
query = """
SELECT UserID, GoogleID, Username, Email, FirstName, LastName, PhoneNumber, UName, Birthday, Gender, Occupation
SELECT UserID, GoogleID, Username, Email, FirstName, LastName, PhoneNumber, UName, Birthday, Gender, Occupation, Level
FROM Users
WHERE UserID = %s
"""
Expand Down Expand Up @@ -314,7 +314,7 @@ def sign_in():
'PhoneNumber': user_data['PhoneNumber'],
'Gender': user_data['Gender'],
'Occupation': user_data['Occupation'],

'Level': user_data['Level'],
# Add other user data fields as needed
}
}
Expand Down
12 changes: 8 additions & 4 deletions frontend/app/sign_in/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@ import Link from "next/link";
import { useState } from "react";
import { motion } from "framer-motion";
import { signIn, useSession } from "next-auth/react";
import { useRouter } from "next/navigation";

function Page() {
const [username, setUsername] = useState("");
const [password, setPassword] = useState("");
const router = useRouter();

const handleUsernameChange = (value: string) => {
setUsername(value);
Expand All @@ -33,10 +35,12 @@ function Page() {

if (response.ok) {
const data = await response.json();
console.log("login success", data);
console.log("data", data.user_data);
localStorage.setItem("user", JSON.stringify(data.user_data));
window.location.href = "/reservation";
if (data.user_data.Level === "User") {
console.log("login success", data);
console.log("data", data.user_data);
localStorage.setItem("user", JSON.stringify(data.user_data));
router.push("/reservation");
} else router.push("/admin_dashboard");
} else {
const errorData = await response.json();
console.error("Login failed:", errorData.message);
Expand Down

0 comments on commit ebb4c3e

Please sign in to comment.