-
+
);
};
diff --git a/frontend/src/pages/log_history/__tests__/LogHistory.test.js b/frontend/src/pages/log_history/__tests__/LogHistory.test.js
new file mode 100644
index 00000000..d8d52d4b
--- /dev/null
+++ b/frontend/src/pages/log_history/__tests__/LogHistory.test.js
@@ -0,0 +1,3 @@
+test("empty test", () => {
+ expect(true).toBe(true)
+})
\ No newline at end of file
diff --git a/frontend/src/pages/login/Login.jsx b/frontend/src/pages/login/Login.jsx
index 8045046a..ff249a1a 100644
--- a/frontend/src/pages/login/Login.jsx
+++ b/frontend/src/pages/login/Login.jsx
@@ -13,7 +13,7 @@ export default function Login() {
useEffect(() => {
if (session) {
- navigate("/dashboard");
+ navigate("/homepage");
}
}, [session, navigate]);
@@ -23,7 +23,7 @@ export default function Login() {
try {
setLoading(true);
await login(email, password);
- navigate("/dashboard");
+ navigate("/homepage");
} catch {
alert("Failed to login: Email or Password Incorrect");
}
diff --git a/frontend/src/pages/ManualEdit.jsx b/frontend/src/pages/manual_entry/ManualEntry.jsx
similarity index 100%
rename from frontend/src/pages/ManualEdit.jsx
rename to frontend/src/pages/manual_entry/ManualEntry.jsx
diff --git a/frontend/src/pages/manual_entry/__tests__/ManualEntry.test.js b/frontend/src/pages/manual_entry/__tests__/ManualEntry.test.js
new file mode 100644
index 00000000..d8d52d4b
--- /dev/null
+++ b/frontend/src/pages/manual_entry/__tests__/ManualEntry.test.js
@@ -0,0 +1,3 @@
+test("empty test", () => {
+ expect(true).toBe(true)
+})
\ No newline at end of file
diff --git a/frontend/src/pages/styles/NewLog.css b/frontend/src/pages/new_log/NewLog.css
similarity index 91%
rename from frontend/src/pages/styles/NewLog.css
rename to frontend/src/pages/new_log/NewLog.css
index 828ee3d4..12708c0b 100644
--- a/frontend/src/pages/styles/NewLog.css
+++ b/frontend/src/pages/new_log/NewLog.css
@@ -2,6 +2,7 @@
display: flex;
flex-direction: column;
align-items: center;
+ justify-content: center;
margin-left: 64px;
margin-right: 64px;
margin-top: 200px;
diff --git a/frontend/src/pages/NewLog.jsx b/frontend/src/pages/new_log/NewLog.jsx
similarity index 58%
rename from frontend/src/pages/NewLog.jsx
rename to frontend/src/pages/new_log/NewLog.jsx
index f434b282..1f07f767 100644
--- a/frontend/src/pages/NewLog.jsx
+++ b/frontend/src/pages/new_log/NewLog.jsx
@@ -1,19 +1,19 @@
import { useNavigate } from "react-router-dom";
+import { NavContentWrapper } from "../../components/NavContentWrapper/NavContentWrapper";
import ImageIcon from "@mui/icons-material/Image";
import ModeIcon from "@mui/icons-material/Mode";
-import Navbar from "../components/Navbar/Navbar";
-import "./styles/NewLog.css";
+import { CLButtonPrimary, CLButtonSecondary } from "../../components/Buttons/CLButtons";
+import "./NewLog.css";
export default function NewLog() {
return (
-
-
-
-
+
+
+
);
}
-function CTASection() {
+function MainContent() {
const navigate = useNavigate();
const handleUploadPhoto = () => {
@@ -28,14 +28,14 @@ function CTASection() {
How would you like to create a new log?
-
-
+
);
diff --git a/frontend/src/pages/new_log/__tests__/NewLog.test.js b/frontend/src/pages/new_log/__tests__/NewLog.test.js
new file mode 100644
index 00000000..d8d52d4b
--- /dev/null
+++ b/frontend/src/pages/new_log/__tests__/NewLog.test.js
@@ -0,0 +1,3 @@
+test("empty test", () => {
+ expect(true).toBe(true)
+})
\ No newline at end of file
diff --git a/frontend/src/pages/sign_up/SignUp.jsx b/frontend/src/pages/sign_up/SignUp.jsx
index 6399c404..1dac43a7 100644
--- a/frontend/src/pages/sign_up/SignUp.jsx
+++ b/frontend/src/pages/sign_up/SignUp.jsx
@@ -16,7 +16,7 @@ export default function SignUp() {
useEffect(() => {
if (session) {
- navigate("/dashboard");
+ navigate("/homepage");
}
}, [session, navigate]);
@@ -32,7 +32,7 @@ export default function SignUp() {
try {
setLoading(true);
await register(firstName, lastName, email, password);
- navigate("/dashboard");
+ navigate("/homepage");
} catch (error) {
if (error.code === "weak_password") {
alert(
diff --git a/frontend/src/pages/styles/Dashboard.css b/frontend/src/pages/styles/Dashboard.css
deleted file mode 100644
index d2a593a5..00000000
--- a/frontend/src/pages/styles/Dashboard.css
+++ /dev/null
@@ -1,20 +0,0 @@
-.main-content-text {
- font-size: 20px;
- font-weight: 800;
- margin-top: -100px;
-}
-
-.main-content-buttons {
- font-size: 17px;
- display: flex;
- flex-direction: column;
- align-items: center;
- margin-top: 30px;
- gap: 10px;
-}
-
-.buttons-container {
- display: flex;
- flex-direction: column;
- gap: 10px;
-}
\ No newline at end of file
diff --git a/frontend/src/pages/styles/Homepage.css b/frontend/src/pages/styles/Homepage.css
deleted file mode 100644
index 73cb697c..00000000
--- a/frontend/src/pages/styles/Homepage.css
+++ /dev/null
@@ -1,16 +0,0 @@
-.cta-section {
- display: flex;
- flex-direction: column;
- align-items: center;
- margin-left: 64px;
- margin-right: 64px;
- margin-top: 200px;
-}
-
-.cta-paragraph {
- text-align: center;
- font-size: 1.1rem;
- color: #64748b;
- width: 450px;
- margin-top: -1rem;
-}
\ No newline at end of file
diff --git a/frontend/src/pages/styles/LogHistory.css b/frontend/src/pages/styles/LogHistory.css
deleted file mode 100644
index 0cf0e828..00000000
--- a/frontend/src/pages/styles/LogHistory.css
+++ /dev/null
@@ -1,9 +0,0 @@
-.log-history-container {
- display: flex;
- flex-direction: column;
- align-items: center;
- }
-
-.container {
- width: 80%;
-}
\ No newline at end of file
diff --git a/frontend/src/pages/styles/UploadPhoto.css b/frontend/src/pages/upload_photo/UploadPhoto.css
similarity index 90%
rename from frontend/src/pages/styles/UploadPhoto.css
rename to frontend/src/pages/upload_photo/UploadPhoto.css
index 3eaf9b45..29bf172f 100644
--- a/frontend/src/pages/styles/UploadPhoto.css
+++ b/frontend/src/pages/upload_photo/UploadPhoto.css
@@ -54,19 +54,6 @@
border-right: 1px solid #e5e7eb;
}
-.page-container {
- display: flex;
- height: 100vh;
-}
-
-.main-content {
- flex-grow: 1;
- display: flex;
- justify-content: center;
- align-items: center;
- text-align: center;
-}
-
.nav-icon-left {
margin-right: 3px;
margin-left: -2px;
diff --git a/frontend/src/pages/UploadPhoto.jsx b/frontend/src/pages/upload_photo/UploadPhoto.jsx
similarity index 91%
rename from frontend/src/pages/UploadPhoto.jsx
rename to frontend/src/pages/upload_photo/UploadPhoto.jsx
index 57cefc46..c3c0b2ca 100644
--- a/frontend/src/pages/UploadPhoto.jsx
+++ b/frontend/src/pages/upload_photo/UploadPhoto.jsx
@@ -1,11 +1,11 @@
import { useState } from "react";
import ArrowBackIcon from "@mui/icons-material/ArrowBack";
import { useNavigate } from "react-router-dom";
-import UploadArea from "../components/UploadPhoto/UploadArea";
-import PreviewSection from "../components/UploadPhoto/PreviewSection";
+import UploadArea from "../../components/UploadPhoto/UploadArea";
+import PreviewSection from "../../components/UploadPhoto/PreviewSection";
import ArrowForwardIosIcon from "@mui/icons-material/ArrowForwardIos";
import ArrowBackIosIcon from "@mui/icons-material/ArrowBackIos";
-import "./styles/UploadPhoto.css";
+import "./UploadPhoto.css";
export default function UploadPhotos() {
const [imageFiles, setImageFiles] = useState([]);
diff --git a/frontend/src/pages/upload_photo/__tests__/UploadPhoto.test.js b/frontend/src/pages/upload_photo/__tests__/UploadPhoto.test.js
new file mode 100644
index 00000000..d8d52d4b
--- /dev/null
+++ b/frontend/src/pages/upload_photo/__tests__/UploadPhoto.test.js
@@ -0,0 +1,3 @@
+test("empty test", () => {
+ expect(true).toBe(true)
+})
\ No newline at end of file
diff --git a/frontend/src/utils/ProtectedRoutes.jsx b/frontend/src/utils/ProtectedRoutes.jsx
index 78eecd6f..0e84b34c 100644
--- a/frontend/src/utils/ProtectedRoutes.jsx
+++ b/frontend/src/utils/ProtectedRoutes.jsx
@@ -3,5 +3,5 @@ import { useAuth } from '../contexts/AuthContext';
export const ProtectedRoutes = () => {
const { session } = useAuth();
- return session ?
:
;
+ return session ?
:
;
}
\ No newline at end of file
+