+
- {/* Add a footer for additional links or info */}
+
diff --git a/src/components/SettingsButton.tsx b/src/components/SettingsButton.tsx
index a421b04..8f93ae4 100644
--- a/src/components/SettingsButton.tsx
+++ b/src/components/SettingsButton.tsx
@@ -1,26 +1,29 @@
import { useState } from "react";
-import SettingsDashboard from "./SettingsDashboard"
+import SettingsDashboard from "./SettingsDashboard";
-export default function SettingsButton(){
+export default function SettingsButton() {
const [isPopupOpen, setIsPopupOpen] = useState(false);
- return(
+ return (
-
- {isPopupOpen && (
-
);
-
}
\ No newline at end of file
diff --git a/src/components/SettingsDashboard.tsx b/src/components/SettingsDashboard.tsx
index a84aaf3..87a7b3c 100644
--- a/src/components/SettingsDashboard.tsx
+++ b/src/components/SettingsDashboard.tsx
@@ -1,24 +1,3 @@
-/*
-const newUser = {
- email,
- password: pass, // Store hashed password
- name: (fName + " " + lName),
- phone: phone,
- role: isTutor ? "tutor" : "student",
- chats: [],
- // the following is information which is later defined by the user
- description: "",
- languages: ["en"],
- state: "",
- GPA: 0.0,
- // tutor specific (leave blank for students)
- teaches: [], // all the classes this tutor teaches
- rating: 0.0,
-
- createdAt: new Date(),
- };
- */
-
import { useEffect, useState } from "react";
import useAuthUser from "react-auth-kit/hooks/useAuthUser";
@@ -34,7 +13,6 @@ export default function SettingsDashboard() {
teaches: [],
});
-
useEffect(() => {
fetch("http://localhost:3000/api/user/user-data", {
method: "POST",
@@ -44,7 +22,7 @@ export default function SettingsDashboard() {
body: JSON.stringify({ token: authUser.token }),
}).then(async (res) => {
const data = await res.json();
- setSettings(() => ({
+ setSettings(() => ({
name: data.name,
role: data.role,
description: data.description,
@@ -52,52 +30,50 @@ export default function SettingsDashboard() {
state: data.state,
GPA: data.GPA,
teaches: data.teaches,
- }))
- })
- },[])
-
+ }));
+ });
+ }, []);
const handleChange = (e) => {
const { name, value, options } = e.target;
if (e.target.multiple) {
const selectedValues = Array.from(options)
- .filter((option) => option?.selected)
- .map((option) => option?.value);
-
+ .filter((option) => option?.selected)
+ .map((option) => option?.value);
+
setSettings((prevSettings) => ({
- ...prevSettings,
- [name]: selectedValues,
+ ...prevSettings,
+ [name]: selectedValues,
}));
} else {
setSettings((prevSettings) => ({
- ...prevSettings,
- [name]: value,
+ ...prevSettings,
+ [name]: value,
}));
}
- };
+ };
const handleToggle = (e) => {
const { value, checked } = e.target;
-
+
setSettings((prevSettings) => ({
...prevSettings,
language: checked
- ? [...(prevSettings.language || []), value] // Add if checked
- : (prevSettings.language || []).filter((lang) => lang !== value), // Remove if unchecked
+ ? [...(prevSettings.language || []), value] // Add if checked
+ : (prevSettings.language || []).filter((lang) => lang !== value), // Remove if unchecked
}));
};
-
+
const handleTeachesToggle = (e) => {
const { value, checked } = e.target;
-
+
setSettings((prevSettings) => ({
...prevSettings,
teaches: checked
- ? [...prevSettings.teaches, value] // Add if checked
- : prevSettings.teaches.filter((teach) => teach !== value), // Remove if unchecked
+ ? [...prevSettings.teaches, value] // Add if checked
+ : prevSettings.teaches.filter((teach) => teach !== value), // Remove if unchecked
}));
};
-
const saveSettings = () => {
console.log("Updated Settings:", settings);
@@ -109,124 +85,131 @@ export default function SettingsDashboard() {
body: JSON.stringify({ token: authUser.token, ...settings }),
}).then(async (res) => {
console.log("data modified", await res.json());
- })
+ });
};
- return (
- setIsPopupOpen(true)}
+ className="bg-blue-600 text-white font-bold py-2 px-4 rounded hover:bg-blue-700 transition"
>
-
-
)}
+ Settings
+
+ {isPopupOpen && (
+
+
+ )}
+
+
+
- ();
- let email = "Not authenticated";
- if(authUser)
- {
- email = authUser.email;
- }
-
-
- const [message, setMessage] = useState({message: ''})
+ const [message, setMessage] = useState({ message: '' });
useEffect(() => {
fetch("http://localhost:3000/api").then(
response => response.json()
).then(
data => setMessage(data)
- )
-
- }, [])
-
+ );
+ }, []);
return (
-
Settings
- {settings.name === "LOADING" ? ( -Loading Page
- ) : ( -
-
-
-
-
- - -
- - -
- - + return ( +
- );
-}
+ );
+}
\ No newline at end of file
diff --git a/src/pages/Contact.tsx b/src/pages/Contact.tsx
index 32f496d..fefcca8 100644
--- a/src/pages/Contact.tsx
+++ b/src/pages/Contact.tsx
@@ -19,11 +19,11 @@ export default function Contact() {
const authenticated = isAuthenticated ? "You are authenticated" : "You are not logged in";
return (
- - - -
- - -
- - + return ( +
+
- - -
- - -
- - {settings.role === "tutor" ? ( -
- -
- )}
- Settings
+ {settings.name === "LOADING" ? ( +Loading Page
+ ) : (
- {["en", "es", "fr", "de"].map((lang) => (
-
- - - -
- - -
- - {settings.role === "tutor" ? ( -
-
-
- ) : (
-
)}
-
-
- {["math", "english", "science", "history"].map((subject) => (
-
+
+
+
+
+ {settings.role === "tutor" && (
+
+
+
+ )}
+
+
+ {["math", "english", "science", "history"].map((subject) => (
+
+ ))}
+
+ - -
- Go back
-
-
- )
+ -
This is the contact page, also I use it for my silly tests
- {authenticated || "loading"}
-
+
)
}
\ No newline at end of file
diff --git a/src/pages/Dashboard.tsx b/src/pages/Dashboard.tsx
index 4778977..b9b528c 100644
--- a/src/pages/Dashboard.tsx
+++ b/src/pages/Dashboard.tsx
@@ -1,53 +1,46 @@
-import { useState, useEffect } from 'react'
-import '../App.css'
-import TextField from '../components/TextField'
+import { useState, useEffect } from 'react';
+import '../App.css';
+import TextField from '../components/TextField';
import SettingsButton from '../components/SettingsButton';
import useAuthUser from 'react-auth-kit/hooks/useAuthUser';
-
export default function Dashboard() {
const authUser = useAuthUser
+ Go back
+
+ This is the contact page, also I use it for my silly tests
+ {authenticated || "loading"}
+
-
-
DASHBOARD
+
+
- Find tutor -
- Chat - -
- )
+ );
}
\ No newline at end of file
diff --git a/src/pages/Home.tsx b/src/pages/Home.tsx
index 7ebc9e4..aae32b3 100644
--- a/src/pages/Home.tsx
+++ b/src/pages/Home.tsx
@@ -1,21 +1,9 @@
-import { useState, useEffect } from 'react'
-import '../App.css'
-import { useNavigate } from 'react-router';
-import useIsAuthenticated from 'react-auth-kit/hooks/useIsAuthenticated'
-import TextField from '../components/TextField'
-import useAuthUser from 'react-auth-kit/hooks/useAuthUser';
+import React, { useEffect, useState } from 'react';
import axios from 'axios';
-interface IUserData { // this is how we tell typescript that auth will return email
- email: string;
- token: string;
-};
+const Home = () => {
+ const [message, setMessage] = useState({ message: '' });
-export default function Home() {
- const navigate = useNavigate();
- const [message, setMessage] = useState({message: ''})
- const isAuthenticated = useIsAuthenticated();
-
useEffect(() => {
axios({
method: 'GET',
@@ -23,19 +11,24 @@ export default function Home() {
}).then(
response => setMessage(response.data)
);
- }, [])
-
+ }, []);
return (
-
+
- Dashboard
++ {message.message || "Loading..."} +
++ {authUser ? authUser.email : "Not authenticated"} +
+
+
+
+
+
- {message.message || "Loading..."} -
-- {email || "Loading"} -
-- Find tutor -
- Chat - -
-
- { message.message || "Loading..." } -
-- Welcome to the website, hello hello -
- Sign In - Sign Up + - ) -} \ No newline at end of file + ); +}; + +export default Home; \ No newline at end of file diff --git a/src/pages/TutorPage.tsx b/src/pages/TutorPage.tsx index f428a00..15ff080 100644 --- a/src/pages/TutorPage.tsx +++ b/src/pages/TutorPage.tsx @@ -30,15 +30,28 @@ export default function TutorPage() { return ( -
-
- GPA: {tutor?.GPA}
- Description: {tutor?.description}
- RATING: {tutor?.rating} - -
- +
ABC
- Name: {tutor?.name}- GPA: {tutor?.GPA}
- Description: {tutor?.description}
- RATING: {tutor?.rating} - -
- +
+
)
}
\ No newline at end of file
From eaadb461669d1a941f1f7a2fcfaf1172f232ff32 Mon Sep 17 00:00:00 2001
From: Korrectional <156260369+korrectional@users.noreply.github.com>
Date: Sun, 2 Feb 2025 10:33:51 -0500
Subject: [PATCH 2/3] Fix
---
src/App.css | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/App.css b/src/App.css
index 9bb628e..f48d773 100644
--- a/src/App.css
+++ b/src/App.css
@@ -185,6 +185,7 @@ html, body {
.bg-gray-300 {
background-color: #e2e8f0;
+}
.chats-form {
margin-left: 16%;
From ac90fb99e21c9812e1eb421afcd3a8db8e1ded42 Mon Sep 17 00:00:00 2001
From: Korrectional <156260369+korrectional@users.noreply.github.com>
Date: Sun, 2 Feb 2025 10:35:37 -0500
Subject: [PATCH 3/3] Another fix
---
src/App.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/App.css b/src/App.css
index f48d773..7ef2cd8 100644
--- a/src/App.css
+++ b/src/App.css
@@ -137,7 +137,7 @@ html, body {
.rounded {
border-radius: 0.25rem;
-
+}
.logo {
height: 6em;
+
Tutor Information
++ Name: {tutor?.name} +
++ GPA: {tutor?.GPA} +
++ Description: {tutor?.description} +
++ Rating: {tutor?.rating} +
+ +