TurTaskProject/TurTaskWeb
1
0
Fork 0
mirror of https://github.com/TurTaskProject/TurTaskWeb.git synced 2025-12-20 06:24:07 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/dashboard

Browse Source
This commit is contained in:
Sirin Puenggun 2023-11-23 05:04:33 +07:00 committed by GitHub
commit 050def4b26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/EisenhowerMatrix/Eisenhower.jsx
View File

@ -1,4 +1,4 @@
import React, { useState, useEffect } from "react"; import { useState, useEffect } from "react";
import { FiAlertCircle, FiClock, FiXCircle, FiCheckCircle } from "react-icons/fi"; import { FiAlertCircle, FiClock, FiXCircle, FiCheckCircle } from "react-icons/fi";
import { readTodoTasks } from "../../api/TaskApi"; import { readTodoTasks } from "../../api/TaskApi";
import axiosInstance from "src/api/AxiosConfig"; import axiosInstance from "src/api/AxiosConfig";

10
frontend/src/components/ProfileUpdateComponent.jsx
View File

@ -1,4 +1,4 @@
import React, { useState, useRef } from "react"; import { useState, useRef } from "react";
import { ApiUpdateUserProfile } from "../api/UserProfileApi"; import { ApiUpdateUserProfile } from "../api/UserProfileApi";
function ProfileUpdateComponent() { function ProfileUpdateComponent() {
@ -15,7 +15,7 @@ function ProfileUpdateComponent() {
} }
}; };
const handleFileChange = e => { const handleFileChange = (e) => {
const selectedFile = e.target.files[0]; const selectedFile = e.target.files[0];
if (selectedFile) { if (selectedFile) {
setFile(selectedFile); setFile(selectedFile);
@ -66,7 +66,7 @@ function ProfileUpdateComponent() {
placeholder="Enter your username" placeholder="Enter your username"
className="input w-full" className="input w-full"
value={username} value={username}
onChange={e => setUsername(e.target.value)} onChange={(e) => setUsername(e.target.value)}
/> />
</div> </div>
@ -78,7 +78,7 @@ function ProfileUpdateComponent() {
placeholder="Enter your full name" placeholder="Enter your full name"
className="input w-full" className="input w-full"
value={fullName} value={fullName}
onChange={e => setFullName(e.target.value)} onChange={(e) => setFullName(e.target.value)}
/> />
</div> </div>
@ -89,7 +89,7 @@ function ProfileUpdateComponent() {
placeholder="Tell us about yourself" placeholder="Tell us about yourself"
className="textarea w-full h-32" className="textarea w-full h-32"
value={about} value={about}
onChange={e => setAbout(e.target.value)} onChange={(e) => setAbout(e.target.value)}
/> />
</div> </div>

3
frontend/src/components/authentication/SignUpPage.jsx
View File

@ -4,9 +4,12 @@ import axiosapi from "../../api/AuthenticationApi";
import { FcGoogle } from "react-icons/fc"; import { FcGoogle } from "react-icons/fc";
import { useGoogleLogin } from "@react-oauth/google"; import { useGoogleLogin } from "@react-oauth/google";
import { NavPreLogin } from "../navigations/NavPreLogin"; import { NavPreLogin } from "../navigations/NavPreLogin";
import { useAuth } from "src/hooks/AuthHooks";
export default function SignUp() { export default function SignUp() {
const Navigate = useNavigate(); const Navigate = useNavigate();
const { setIsAuthenticated } = useAuth();
const [formData, setFormData] = useState({ const [formData, setFormData] = useState({
email: "", email: "",

33
frontend/src/components/profilePage.jsx
View File

@ -1,4 +1,3 @@
import * as React from "react";
import ProfileUpdateComponent from "./ProfileUpdateComponent"; import ProfileUpdateComponent from "./ProfileUpdateComponent";
function ProfileUpdatePage() { function ProfileUpdatePage() {
@ -47,7 +46,7 @@ function ProfileUpdatePage() {
</div> </div>
</div> </div>
<div className="stat-desc py-2">3213/321312321 points</div> <div className="stat-desc py-2">3213/321312321 points</div>
<progress class="progress progress-info w-36" value="10" max="100"></progress> <progress className="progress progress-info w-36" value="10" max="100"></progress>
</div> </div>
<div className="stat"> <div className="stat">
@ -75,10 +74,10 @@ function ProfileUpdatePage() {
</div> </div>
<div className="card bg-base-100 shadow"> <div className="card bg-base-100 shadow">
<div class="card-body"> <div className="card-body">
<h2 class="card-title">About me</h2> <h2 className="card-title">About me</h2>
<div class="card-actions justify-end"></div> <div className="card-actions justify-end"></div>
<textarea class="textarea textarea-bordered textarea-lg w-full" disabled> <textarea className="textarea textarea-bordered textarea-lg w-full" disabled>
Lorem ipsum dolor sit amet consectetur adipisicing elit. Nostrum dolores recusandae, officiis consequuntur Lorem ipsum dolor sit amet consectetur adipisicing elit. Nostrum dolores recusandae, officiis consequuntur
nam, non ab commodi totam mollitia iusto nemo voluptatum error aliquam similique perspiciatis, eligendi nam, non ab commodi totam mollitia iusto nemo voluptatum error aliquam similique perspiciatis, eligendi
nulla. Animi, sit? nulla. Animi, sit?
@ -89,31 +88,31 @@ function ProfileUpdatePage() {
<div className="grid grid-cols-2 grid-rows-2 gap-4 my-2"> <div className="grid grid-cols-2 grid-rows-2 gap-4 my-2">
<div className="col-span-full"> <div className="col-span-full">
<div className="card bg-base-100 shadow"> <div className="card bg-base-100 shadow">
<div class="card-body"> <div className="card-body">
<h2 class="card-title">Overall Statistics</h2> <h2 className="card-title">Overall Statistics</h2>
<div class="card-actions justify-end"></div> <div className="card-actions justify-end"></div>
</div> </div>
</div> </div>
</div> </div>
<div className="col-start-2 row-start-2"> <div className="col-start-2 row-start-2">
<div className="card bg-base-100 shadow"> <div className="card bg-base-100 shadow">
<div class="card-body"> <div className="card-body">
<h2 class="card-title">Achievements</h2> <h2 className="card-title">Achievements</h2>
<div class="card-actions justify-end"></div> <div className="card-actions justify-end"></div>
</div> </div>
</div> </div>
</div> </div>
<div className="col-start-1 row-start-2"> <div className="col-start-1 row-start-2">
<div className="card bg-base-100 shadow"> <div className="card bg-base-100 shadow">
<div class="card-body"> <div className="card-body">
<h2 class="card-title">Friends</h2> <h2 className="card-title">Friends</h2>
<div class="card-actions justify-end"></div> <div className="card-actions justify-end"></div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="fixed bottom-4 right-4"> <div className="fixed bottom-4 right-4">
<ul className="menu menu-horizontal bg-base-200 rounded-box"> <ul className="menu menu-horizontal bg-base-200 rounded-box">
<li> <li>
<a onClick={() => document.getElementById("my_modal_4").showModal()}> <a onClick={() => document.getElementById("my_modal_4").showModal()}>
@ -136,7 +135,7 @@ function ProfileUpdatePage() {
<div className="modal-box w-11/12 max-w-5xl flex flex-col"> <div className="modal-box w-11/12 max-w-5xl flex flex-col">
<form method="dialog"> <form method="dialog">
<ProfileUpdateComponent /> <ProfileUpdateComponent />
<button class="btn btn-sm btn-circle btn-ghost absolute right-2 top-2">✕</button> <button className="btn btn-sm btn-circle btn-ghost absolute right-2 top-2">✕</button>
</form> </form>
</div> </div>
</dialog> </dialog>

8
frontend/src/components/signup.jsx
View File

@ -1,4 +1,4 @@
import React, { useState } from "react"; import { useState } from "react";
import axiosapi from "../api/axiosapi"; import axiosapi from "../api/axiosapi";
import TextField from "@material-ui/core/TextField"; import TextField from "@material-ui/core/TextField";
import Typography from "@material-ui/core/Typography"; import Typography from "@material-ui/core/Typography";
@ -7,7 +7,7 @@ import Container from "@material-ui/core/Container";
import Button from "@material-ui/core/Button"; import Button from "@material-ui/core/Button";
import { makeStyles } from "@material-ui/core/styles"; import { makeStyles } from "@material-ui/core/styles";
const useStyles = makeStyles(theme => ({ const useStyles = makeStyles((theme) => ({
// Styles for various elements // Styles for various elements
paper: { paper: {
marginTop: theme.spacing(8), marginTop: theme.spacing(8),
@ -38,7 +38,7 @@ const Signup = () => {
const [error, setError] = useState(null); const [error, setError] = useState(null);
const [isSubmitting, setIsSubmitting] = useState(false); const [isSubmitting, setIsSubmitting] = useState(false);
const handleSubmit = async e => { const handleSubmit = async (e) => {
e.preventDefault(); e.preventDefault();
setIsSubmitting(true); setIsSubmitting(true);
setError(null); setError(null);
@ -53,7 +53,7 @@ const Signup = () => {
} }
}; };
const handleChange = e => { const handleChange = (e) => {
const { name, value } = e.target; const { name, value } = e.target;
setFormData({ ...formData, [name]: value }); setFormData({ ...formData, [name]: value });
}; };

10
frontend/src/components/testAuth.jsx
View File

@ -1,4 +1,4 @@
import React, { useState, useEffect } from "react"; import { useState, useEffect } from "react";
import axiosapi from "../api/AuthenticationApi"; import axiosapi from "../api/AuthenticationApi";
import { Button } from "@mui/material"; import { Button } from "@mui/material";
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
@ -12,11 +12,11 @@ function TestAuth() {
// Fetch the "hello" data from the server when the component mounts // Fetch the "hello" data from the server when the component mounts
axiosapi axiosapi
.getGreeting() .getGreeting()
.then(res => { .then((res) => {
console.log(res.data); console.log(res.data);
setMessage(res.data.user); setMessage(res.data.user);
}) })
.catch(err => { .catch((err) => {
console.log(err); console.log(err);
setMessage(""); setMessage("");
}); });
@ -32,14 +32,14 @@ function TestAuth() {
<div> <div>
{message !== "" && ( {message !== "" && (
<div> <div>
<h1 class="text-xl font-bold">Login! Hello!</h1> <h1 className="text-xl font-bold">Login! Hello!</h1>
<h2>{message}</h2> <h2>{message}</h2>
<Button variant="contained" onClick={logout}> <Button variant="contained" onClick={logout}>
Logout Logout
</Button> </Button>
</div> </div>
)} )}
{message === "" && <h1 class="text-xl font-bold">Need to sign in, No authentication found</h1>} {message === "" && <h1 className="text-xl font-bold">Need to sign in, No authentication found</h1>}
</div> </div>
); );
} }