diff --git a/Frontend/speedcart-react/src/App.css b/Frontend/speedcart-react/src/App.css
index 869f0f5..3d5035d 100644
--- a/Frontend/speedcart-react/src/App.css
+++ b/Frontend/speedcart-react/src/App.css
@@ -15,12 +15,6 @@ body {
box-sizing: border-box;
}
-.main-content {
- flex: 1;
- overflow-y: auto; /* Allow content area to scroll */
- max-height: calc(100vh - 60px); /* Adjust based on header and footer height */
-}
-
#policyFooter a {
text-decoration: none;
color: white;
diff --git a/Frontend/speedcart-react/src/components/CustomCheckbox/CustomCheckbox.module.css b/Frontend/speedcart-react/src/components/CustomCheckbox/CustomCheckbox.module.css
index cd14b6c..9a98351 100644
--- a/Frontend/speedcart-react/src/components/CustomCheckbox/CustomCheckbox.module.css
+++ b/Frontend/speedcart-react/src/components/CustomCheckbox/CustomCheckbox.module.css
@@ -1,13 +1,19 @@
.labelContainer {
- display: flex;
align-items: center; /* Vertically center the checkbox and label */
- justify-content: center; /* Horizontally center the checkbox and label */
position: relative;
cursor: pointer;
user-select: none;
text-align: center; /* Ensures text is also centered if used */
}
+.flex {
+ display: flex;
+}
+
+.inlineFlex {
+ display: inline-flex;
+}
+
.input {
position: absolute;
opacity: 0;
@@ -22,12 +28,15 @@
width: 16px;
background-color: #eee;
border-radius: 4px;
- margin-right: 8px;
display: flex; /* Use flex to center the checkmark visually */
align-items: center; /* Vertical center */
justify-content: center; /* Horizontal center */
}
+.marginRightDistance {
+ margin-right: 8px;
+}
+
.labelContainer:hover .checkmark {
background-color: #ccc;
}
diff --git a/Frontend/speedcart-react/src/components/CustomCheckbox/CustomCheckbox.tsx b/Frontend/speedcart-react/src/components/CustomCheckbox/CustomCheckbox.tsx
index 7310ad3..0970938 100644
--- a/Frontend/speedcart-react/src/components/CustomCheckbox/CustomCheckbox.tsx
+++ b/Frontend/speedcart-react/src/components/CustomCheckbox/CustomCheckbox.tsx
@@ -1,9 +1,9 @@
import React from 'react';
import styles from './CustomCheckbox.module.css';
-const CustomCheckbox = ({ name = '', className = '', checked = false, onChange = null, disabled = false, children = null}) => {
+const CustomCheckbox = ({ name = '', className = '', flexType = 'inlineFlex', checked = false, onChange = null, disabled = false, children = null}) => {
return (
-
-
+
);
}
diff --git a/Frontend/speedcart-react/src/pages/Login/Login.tsx b/Frontend/speedcart-react/src/pages/Login/Login.tsx
index 077d5dc..bc38662 100644
--- a/Frontend/speedcart-react/src/pages/Login/Login.tsx
+++ b/Frontend/speedcart-react/src/pages/Login/Login.tsx
@@ -4,7 +4,7 @@ import { GoogleLogin } from '@react-oauth/google';
import { useAuth } from 'shared';
-import StatusModal from '@components/StatusModal';
+import PageLayout from '@components/PageLayout';
import { RequestStatus } from '@constants/enums';
import { AppRoute } from '@constants/routes';
@@ -56,26 +56,25 @@ function Login() {
};
return (
- <>
-
+
+
{isAuthenticated ? (
- <>
-
- >
-
+
) : (
)}
-
-
- >
+
+
);
}
diff --git a/Frontend/speedcart-react/src/pages/NewShoppingListWithProvider/NewShoppingListWithProvider.tsx b/Frontend/speedcart-react/src/pages/NewShoppingListWithProvider/NewShoppingListWithProvider.tsx
index b9cdca3..7c61973 100644
--- a/Frontend/speedcart-react/src/pages/NewShoppingListWithProvider/NewShoppingListWithProvider.tsx
+++ b/Frontend/speedcart-react/src/pages/NewShoppingListWithProvider/NewShoppingListWithProvider.tsx
@@ -1,10 +1,11 @@
import React, { useState, useEffect } from 'react';
import { useNavigate } from 'react-router-dom'; // Necessary for redirects
+
import { useAuth, AuthContextType } from 'shared';
+import PageLayout from '@components/PageLayout';
import SaveButton from '@components/SaveButton';
import AddShoppingListItemButton from '@components/AddShoppingListItemButton';
-import StatusModal from '@components/StatusModal'; // Import StatusModal to provide UI info on list save status
import ShoppingListSection from '@components/ShoppingListSection';
import { ShoppingListProvider, useShoppingListContext } from '@customHooks/ShoppingListContext';
@@ -71,7 +72,14 @@ const NewShoppingList: React.FC = () => {
return (
<>
-
+