diff --git a/frontend/.eslintrc.cjs b/frontend/.eslintrc.cjs index d6c9537..6e8698b 100644 --- a/frontend/.eslintrc.cjs +++ b/frontend/.eslintrc.cjs @@ -2,17 +2,17 @@ module.exports = { root: true, env: { browser: true, es2020: true }, extends: [ - 'eslint:recommended', - 'plugin:@typescript-eslint/recommended', - 'plugin:react-hooks/recommended', + "eslint:recommended", + "plugin:@typescript-eslint/recommended", + "plugin:react-hooks/recommended", ], - ignorePatterns: ['dist', '.eslintrc.cjs'], - parser: '@typescript-eslint/parser', - plugins: ['react-refresh'], + ignorePatterns: ["dist", ".eslintrc.cjs"], + parser: "@typescript-eslint/parser", + plugins: ["react-refresh"], rules: { - 'react-refresh/only-export-components': [ - 'warn', + "react-refresh/only-export-components": [ + "warn", { allowConstantExport: true }, ], }, -} +}; diff --git a/frontend/README.md b/frontend/README.md index 0d6babe..bb15685 100644 --- a/frontend/README.md +++ b/frontend/README.md @@ -17,12 +17,12 @@ If you are developing a production application, we recommend updating the config export default { // other rules... parserOptions: { - ecmaVersion: 'latest', - sourceType: 'module', - project: ['./tsconfig.json', './tsconfig.node.json'], + ecmaVersion: "latest", + sourceType: "module", + project: ["./tsconfig.json", "./tsconfig.node.json"], tsconfigRootDir: __dirname, }, -} +}; ``` - Replace `plugin:@typescript-eslint/recommended` to `plugin:@typescript-eslint/recommended-type-checked` or `plugin:@typescript-eslint/strict-type-checked` diff --git a/frontend/package.json b/frontend/package.json index 34ad351..82587d5 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -6,7 +6,7 @@ "scripts": { "dev": "vite", "build": "tsc && vite build", - "lint": "npx eslint . --report-unused-disable-directives --max-warnings 0 && npx prettier --check .", + "lint": "npx eslint --report-unused-disable-directives --max-warnings 0 && npx prettier --check .", "preview": "vite preview" }, "dependencies": { diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index 86c4b74..519f413 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -25,7 +25,7 @@ function App() { width="300px" onSearch={() => console.log( - "Wow, you really just submitted information. How dare you." + "Wow, you really just submitted information. How dare you.", ) } placeholder="DO NOT USE THIS." diff --git a/frontend/src/components/NavbarSignedIn.tsx b/frontend/src/components/NavbarSignedIn.tsx index b41cd5b..f2351c9 100644 --- a/frontend/src/components/NavbarSignedIn.tsx +++ b/frontend/src/components/NavbarSignedIn.tsx @@ -11,55 +11,67 @@ import { MenuDivider, HStack, Image, - Link -} from '@chakra-ui/react'; -import logo from '../../public/target.png'; -import { ReactNode } from 'react'; + Link, +} from "@chakra-ui/react"; +import logo from "../../public/target.png"; +import { ReactNode } from "react"; -const NavLink = ({ children, href = '#' }: { children: ReactNode, href?: string }) => ( +const NavLink = ({ + children, + href = "#", +}: { + children: ReactNode; + href?: string; +}) => ( {children} ); -const NavbarSignedIn = ({ userName = "User", userImage = "/path-to-user-image.png" }) => { +const NavbarSignedIn = ({ + userName = "User", + userImage = "/path-to-user-image.png", +}) => { return ( - + + minH={"60px"} + alignItems={"center"} + justifyContent={"space-between"} + > Logo - Welcome, {userName}! + + Welcome, {userName}! + - + My Items My Groups - + Profile diff --git a/frontend/src/components/NavbarSignedOut.tsx b/frontend/src/components/NavbarSignedOut.tsx index cc347d0..e606190 100644 --- a/frontend/src/components/NavbarSignedOut.tsx +++ b/frontend/src/components/NavbarSignedOut.tsx @@ -1,54 +1,52 @@ -import { Link } from 'react-router-dom'; -import { - Box, - Flex, - Text, - Button, - HStack, - Image, -} from '@chakra-ui/react'; -import logo from '../../public/target.png'; +import { Link } from "react-router-dom"; +import { Box, Flex, Text, Button, HStack, Image } from "@chakra-ui/react"; +import logo from "../../public/target.png"; const NavbarSignedOut = () => { return ( - + + align={"center"} + justify={"space-between"} + > Logo - Welcome, Gatherer! + + Welcome, Gatherer! + - + diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx index 9b67590..27481e0 100644 --- a/frontend/src/main.tsx +++ b/frontend/src/main.tsx @@ -6,5 +6,5 @@ import "./index.css"; ReactDOM.createRoot(document.getElementById("root")!).render( - + , ); diff --git a/frontend/src/pages/HomePage.tsx b/frontend/src/pages/HomePage.tsx index 7ae745b..78d11b7 100644 --- a/frontend/src/pages/HomePage.tsx +++ b/frontend/src/pages/HomePage.tsx @@ -1,21 +1,23 @@ const HomePage = () => { return ( -
+

Welcome to Gather!

Your go to place to keep track of your stuff

); -} +}; export default HomePage; diff --git a/frontend/src/pages/LoginPage.tsx b/frontend/src/pages/LoginPage.tsx index 9c99326..a8ff3fc 100644 --- a/frontend/src/pages/LoginPage.tsx +++ b/frontend/src/pages/LoginPage.tsx @@ -8,7 +8,7 @@ import { Link, Flex, Text, -} from '@chakra-ui/react'; +} from "@chakra-ui/react"; const LoginPage = () => { // Responsive styles for input fields @@ -23,20 +23,44 @@ const LoginPage = () => { width="100vw" bg="#DCE1DE" > - + - Login + + Login + Email - + Password - + - - Create New Account - Forgot Your Password? + + + Create New Account + + + Forgot Your Password? + diff --git a/frontend/src/pages/SignupPage.tsx b/frontend/src/pages/SignupPage.tsx index 60defb1..47363c5 100644 --- a/frontend/src/pages/SignupPage.tsx +++ b/frontend/src/pages/SignupPage.tsx @@ -7,8 +7,8 @@ import { Box, Link, Flex, - Text -} from '@chakra-ui/react'; + Text, +} from "@chakra-ui/react"; const SignupPage = () => { return ( @@ -19,35 +19,69 @@ const SignupPage = () => { width="100vw" bg="#DCE1DE" > - + - Create New Account + + Create New Account + First Name - + Last Name - + Email - + Password - + Confirm Password - + - - Already have an account? Log In + + + Already have an account? Log In + ); }; -export default SignupPage; \ No newline at end of file +export default SignupPage; diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts index 5a33944..9cc50ea 100644 --- a/frontend/vite.config.ts +++ b/frontend/vite.config.ts @@ -1,7 +1,7 @@ -import { defineConfig } from 'vite' -import react from '@vitejs/plugin-react' +import { defineConfig } from "vite"; +import react from "@vitejs/plugin-react"; // https://vitejs.dev/config/ export default defineConfig({ plugins: [react()], -}) +});