diff --git a/package-lock.json b/package-lock.json index 74069c3..c4a84a4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,9 +9,10 @@ "version": "0.1.0", "dependencies": { "@fortawesome/fontawesome-free": "^6.4.2", - "@fortawesome/fontawesome-svg-core": "^6.4.2", - "@fortawesome/free-brands-svg-icons": "^6.4.2", - "@fortawesome/free-solid-svg-icons": "^6.4.2", + "@fortawesome/fontawesome-svg-core": "^6.5.2", + "@fortawesome/free-brands-svg-icons": "^6.5.2", + "@fortawesome/free-regular-svg-icons": "^6.5.2", + "@fortawesome/free-solid-svg-icons": "^6.5.2", "@fortawesome/react-fontawesome": "^0.2.0", "@react-spring/web": "^9.7.3", "@testing-library/jest-dom": "^5.17.0", @@ -753,9 +754,9 @@ } }, "node_modules/@fortawesome/fontawesome-common-types": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.4.2.tgz", - "integrity": "sha512-1DgP7f+XQIJbLFCTX1V2QnxVmpLdKdzzo2k8EmvDOePfchaIGQ9eCHj2up3/jNEbZuBqel5OxiaOJf37TWauRA==", + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.5.2.tgz", + "integrity": "sha512-gBxPg3aVO6J0kpfHNILc+NMhXnqHumFxOmjYCFfOiLZfwhnnfhtsdA2hfJlDnj+8PjAs6kKQPenOTKj3Rf7zHw==", "hasInstallScript": true, "engines": { "node": ">=6" @@ -771,36 +772,48 @@ } }, "node_modules/@fortawesome/fontawesome-svg-core": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.4.2.tgz", - "integrity": "sha512-gjYDSKv3TrM2sLTOKBc5rH9ckje8Wrwgx1CxAPbN5N3Fm4prfi7NsJVWd1jklp7i5uSCVwhZS5qlhMXqLrpAIg==", + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.5.2.tgz", + "integrity": "sha512-5CdaCBGl8Rh9ohNdxeeTMxIj8oc3KNBgIeLMvJosBMdslK/UnEB8rzyDRrbKdL1kDweqBPo4GT9wvnakHWucZw==", "hasInstallScript": true, "dependencies": { - "@fortawesome/fontawesome-common-types": "6.4.2" + "@fortawesome/fontawesome-common-types": "6.5.2" }, "engines": { "node": ">=6" } }, "node_modules/@fortawesome/free-brands-svg-icons": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.4.2.tgz", - "integrity": "sha512-LKOwJX0I7+mR/cvvf6qIiqcERbdnY+24zgpUSouySml+5w8B4BJOx8EhDR/FTKAu06W12fmUIcv6lzPSwYKGGg==", + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.5.2.tgz", + "integrity": "sha512-zi5FNYdmKLnEc0jc0uuHH17kz/hfYTg4Uei0wMGzcoCL/4d3WM3u1VMc0iGGa31HuhV5i7ZK8ZlTCQrHqRHSGQ==", + "hasInstallScript": true, + "dependencies": { + "@fortawesome/fontawesome-common-types": "6.5.2" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/free-regular-svg-icons": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.5.2.tgz", + "integrity": "sha512-iabw/f5f8Uy2nTRtJ13XZTS1O5+t+anvlamJ3zJGLEVE2pKsAWhPv2lq01uQlfgCX7VaveT3EVs515cCN9jRbw==", "hasInstallScript": true, "dependencies": { - "@fortawesome/fontawesome-common-types": "6.4.2" + "@fortawesome/fontawesome-common-types": "6.5.2" }, "engines": { "node": ">=6" } }, "node_modules/@fortawesome/free-solid-svg-icons": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.4.2.tgz", - "integrity": "sha512-sYwXurXUEQS32fZz9hVCUUv/xu49PEJEyUOsA51l6PU/qVgfbTb2glsTEaJngVVT8VqBATRIdh7XVgV1JF1LkA==", + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.5.2.tgz", + "integrity": "sha512-QWFZYXFE7O1Gr1dTIp+D6UcFUF0qElOnZptpi7PBUMylJh+vFmIedVe1Ir6RM1t2tEQLLSV1k7bR4o92M+uqlw==", "hasInstallScript": true, "dependencies": { - "@fortawesome/fontawesome-common-types": "6.4.2" + "@fortawesome/fontawesome-common-types": "6.5.2" }, "engines": { "node": ">=6" @@ -2383,9 +2396,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001543", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001543.tgz", - "integrity": "sha512-qxdO8KPWPQ+Zk6bvNpPeQIOH47qZSYdFZd6dXQzb2KzhnSXju4Kd7H1PkSJx6NICSMgo/IhRZRhhfPTHYpJUCA==", + "version": "1.0.30001616", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001616.tgz", + "integrity": "sha512-RHVYKov7IcdNjVHJFNY/78RdG4oGVjbayxv8u5IO74Wv7Hlq4PnJE6mo/OjFijjVFNy5ijnCt6H3IIo4t+wfEw==", "funding": [ { "type": "opencollective", @@ -5215,9 +5228,9 @@ } }, "node_modules/vite": { - "version": "4.5.2", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.2.tgz", - "integrity": "sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==", + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.3.tgz", + "integrity": "sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==", "dependencies": { "esbuild": "^0.18.10", "postcss": "^8.4.27", @@ -6038,9 +6051,9 @@ "optional": true }, "@fortawesome/fontawesome-common-types": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.4.2.tgz", - "integrity": "sha512-1DgP7f+XQIJbLFCTX1V2QnxVmpLdKdzzo2k8EmvDOePfchaIGQ9eCHj2up3/jNEbZuBqel5OxiaOJf37TWauRA==" + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.5.2.tgz", + "integrity": "sha512-gBxPg3aVO6J0kpfHNILc+NMhXnqHumFxOmjYCFfOiLZfwhnnfhtsdA2hfJlDnj+8PjAs6kKQPenOTKj3Rf7zHw==" }, "@fortawesome/fontawesome-free": { "version": "6.4.2", @@ -6048,27 +6061,35 @@ "integrity": "sha512-m5cPn3e2+FDCOgi1mz0RexTUvvQibBebOUlUlW0+YrMjDTPkiJ6VTKukA1GRsvRw+12KyJndNjj0O4AgTxm2Pg==" }, "@fortawesome/fontawesome-svg-core": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.4.2.tgz", - "integrity": "sha512-gjYDSKv3TrM2sLTOKBc5rH9ckje8Wrwgx1CxAPbN5N3Fm4prfi7NsJVWd1jklp7i5uSCVwhZS5qlhMXqLrpAIg==", + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.5.2.tgz", + "integrity": "sha512-5CdaCBGl8Rh9ohNdxeeTMxIj8oc3KNBgIeLMvJosBMdslK/UnEB8rzyDRrbKdL1kDweqBPo4GT9wvnakHWucZw==", "requires": { - "@fortawesome/fontawesome-common-types": "6.4.2" + "@fortawesome/fontawesome-common-types": "6.5.2" } }, "@fortawesome/free-brands-svg-icons": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.4.2.tgz", - "integrity": "sha512-LKOwJX0I7+mR/cvvf6qIiqcERbdnY+24zgpUSouySml+5w8B4BJOx8EhDR/FTKAu06W12fmUIcv6lzPSwYKGGg==", + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.5.2.tgz", + "integrity": "sha512-zi5FNYdmKLnEc0jc0uuHH17kz/hfYTg4Uei0wMGzcoCL/4d3WM3u1VMc0iGGa31HuhV5i7ZK8ZlTCQrHqRHSGQ==", "requires": { - "@fortawesome/fontawesome-common-types": "6.4.2" + "@fortawesome/fontawesome-common-types": "6.5.2" + } + }, + "@fortawesome/free-regular-svg-icons": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.5.2.tgz", + "integrity": "sha512-iabw/f5f8Uy2nTRtJ13XZTS1O5+t+anvlamJ3zJGLEVE2pKsAWhPv2lq01uQlfgCX7VaveT3EVs515cCN9jRbw==", + "requires": { + "@fortawesome/fontawesome-common-types": "6.5.2" } }, "@fortawesome/free-solid-svg-icons": { - "version": "6.4.2", - "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.4.2.tgz", - "integrity": "sha512-sYwXurXUEQS32fZz9hVCUUv/xu49PEJEyUOsA51l6PU/qVgfbTb2glsTEaJngVVT8VqBATRIdh7XVgV1JF1LkA==", + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.5.2.tgz", + "integrity": "sha512-QWFZYXFE7O1Gr1dTIp+D6UcFUF0qElOnZptpi7PBUMylJh+vFmIedVe1Ir6RM1t2tEQLLSV1k7bR4o92M+uqlw==", "requires": { - "@fortawesome/fontawesome-common-types": "6.4.2" + "@fortawesome/fontawesome-common-types": "6.5.2" } }, "@fortawesome/react-fontawesome": { @@ -7139,9 +7160,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001543", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001543.tgz", - "integrity": "sha512-qxdO8KPWPQ+Zk6bvNpPeQIOH47qZSYdFZd6dXQzb2KzhnSXju4Kd7H1PkSJx6NICSMgo/IhRZRhhfPTHYpJUCA==" + "version": "1.0.30001616", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001616.tgz", + "integrity": "sha512-RHVYKov7IcdNjVHJFNY/78RdG4oGVjbayxv8u5IO74Wv7Hlq4PnJE6mo/OjFijjVFNy5ijnCt6H3IIo4t+wfEw==" }, "chai": { "version": "4.3.10", @@ -9152,9 +9173,9 @@ } }, "vite": { - "version": "4.5.2", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.2.tgz", - "integrity": "sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==", + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.3.tgz", + "integrity": "sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==", "requires": { "esbuild": "^0.18.10", "fsevents": "~2.3.2", diff --git a/package.json b/package.json index b8a1ee2..6a80cd4 100644 --- a/package.json +++ b/package.json @@ -4,9 +4,10 @@ "private": true, "dependencies": { "@fortawesome/fontawesome-free": "^6.4.2", - "@fortawesome/fontawesome-svg-core": "^6.4.2", - "@fortawesome/free-brands-svg-icons": "^6.4.2", - "@fortawesome/free-solid-svg-icons": "^6.4.2", + "@fortawesome/fontawesome-svg-core": "^6.5.2", + "@fortawesome/free-brands-svg-icons": "^6.5.2", + "@fortawesome/free-regular-svg-icons": "^6.5.2", + "@fortawesome/free-solid-svg-icons": "^6.5.2", "@fortawesome/react-fontawesome": "^0.2.0", "@react-spring/web": "^9.7.3", "@testing-library/jest-dom": "^5.17.0", diff --git a/src/App.tsx b/src/App.tsx index 299146c..69b9034 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,8 +1,7 @@ import React from "react"; -import FrontPage from "./components/FrontPage"; +import FrontPage from "./pages/FrontPage"; import Login from "./components/Login"; import { Route, Routes } from "react-router-dom"; - import "./App.css"; import Register from "./components/Register"; @@ -16,4 +15,4 @@ function App() { ); } -export default App; +export default App; \ No newline at end of file diff --git a/src/assets/cardData.ts b/src/assets/cardData.ts index 0d792ad..c1e0e75 100644 --- a/src/assets/cardData.ts +++ b/src/assets/cardData.ts @@ -1,19 +1,30 @@ import { Orientation, ICardData } from "../components/IconCard" export const iconCards: ICardData[] = [ + { + headingText: "LuminosityLEDs", + bodyText: "Illuminate individual expression and creativity", + orientation: Orientation.east, + // https://fontawesome.com/icons/lightbulb?f=classic&s=solid + buttons: ["Login", "Register"], + }, { headingText: "Illuminate individual expression and creativity...", bodyText: "...with just the touch of a button. A service that makes it easy to light up a room.", - orientation: Orientation.south + orientation: Orientation.west, + // https://fontawesome.com/icons/lightbulb?f=classic&s=solid + icon: "lightbulb", }, { headingText: "Seamless integration and connection", bodyText: "Lights are setup to hook up straight to Wi-Fi with a few easy steps.", - orientation: Orientation.east + orientation: Orientation.east, + icon: "wifi", }, { headingText: "Track metrics and trends", bodyText: "Color, brightness, and whether or not the lights are on or off are tracked and easily accessible.", - orientation: Orientation.west + orientation: Orientation.west, + icon: "signal", } ] diff --git a/src/components/Content.tsx b/src/components/Content.tsx index bb734f1..4a6215d 100644 --- a/src/components/Content.tsx +++ b/src/components/Content.tsx @@ -1,23 +1,6 @@ import React from "react"; import { IconCard } from "./IconCard"; import { iconCards } from "../assets/cardData"; -import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; -import { icon } from "@fortawesome/fontawesome-svg-core/import.macro"; - -var icons = [ - , - , - , -]; export const Content = () => { const cards = iconCards.map((card, index) => ( @@ -29,7 +12,8 @@ export const Content = () => { ? "bg-white dark:bg-black" : "bg-card-light-blue dark:bg-card-dark-blue" } - icon={icons[index]} + icon={card.icon} + buttons={card.buttons} /> )); diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx index 4ffc5e8..57cfbe1 100644 --- a/src/components/Footer.tsx +++ b/src/components/Footer.tsx @@ -2,11 +2,11 @@ import React from 'react'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { icon } from '@fortawesome/fontawesome-svg-core/import.macro' -const darkMode = 'dark:text-white dark:hover:text-suva-grey'; -const lightMode = 'text-black hover:text-electric-blue'; +const darkMode = 'cursor-pointer dark:text-dark dark:hover:text-hover-dark'; +const lightMode = 'text-light hover:text-hover-light cursor-pointer'; const footerButtonUtils = 'flex items-center py-2 px-4'; -const textPaddingSize = 'text-[32pt] p-3'; -const footerDivStyle = 'dark:bg-black flex justify-between position:static py-8 pt-4 '; +const textPaddingSize = 'text-2xl p-3'; +const footerDivStyle = 'bg-electric-blue dark:bg-duke-blue flex position:static space-x-48 px-48 py-8 pt-4 '; const ICON_HEIGHT = "h-[48px]" const iconsFA = [ @@ -45,7 +45,7 @@ function FooterButton ({ href, icon, iconTextName}: FooterProps)
{icon}
-

{iconTextName}

+

{iconTextName}

); } @@ -54,11 +54,17 @@ function Footer() { return (
- - - - - +
+ Organization + + + +
+
+ Contact Us + + +
); } diff --git a/src/components/IconCard.tsx b/src/components/IconCard.tsx index 7e8c9eb..2cf1bc6 100644 --- a/src/components/IconCard.tsx +++ b/src/components/IconCard.tsx @@ -1,72 +1,113 @@ -import React from 'react'; +import React from "react"; +import { Link, useNavigate } from "react-router-dom"; +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import { library } from "@fortawesome/fontawesome-svg-core"; +import { fas } from "@fortawesome/free-solid-svg-icons"; +import { useToggle } from "../ts/ToggleHeader"; + +// Add the solid icons to the library +library.add(fas); //Tailwind Classes -const HORIZONTAL_TEXT_WIDTH = "w-[500px]" -const VERTICAL_TEXT_WIDTH = "w-[1200px]" -const HORIZONTAL_CENTER = "justify-around" -const VERTICAL_CENTER = "items-center" -const HORIZONTAL_GAP = "" //"gap-20" -const VERTICAL_GAP = "" //"gap-10" -const HEADING_SIZE = "text-[64px]" -const BODY_SIZE = "text-[48px]" +const HORIZONTAL_TEXT_WIDTH = "w-[500px]"; +const VERTICAL_TEXT_WIDTH = "w-[1200px]"; +const HORIZONTAL_CENTER = "justify-around"; +const VERTICAL_CENTER = "items-center"; +const HORIZONTAL_GAP = ""; //"gap-20" +const VERTICAL_GAP = ""; //"gap-10" +const HEADING_SIZE = "text-5xl"; +const BODY_SIZE = "text-3xl"; export const enum Orientation { // orientation % 2 gives 0 for horizontal, 1 for vertical - north, - east, - south, - west + north, + east, + south, + west, } export interface ICardData { - headingText: string, - bodyText: string, - orientation: Orientation // orientation of icon with respect to text + headingText: string; + bodyText: string; + orientation: Orientation; // orientation of icon with respect to text + icon?: string; + buttons?: string[]; } export type IconCardProps = { - data: ICardData, - bgColor: string - icon: React.ReactNode + data: ICardData; + bgColor: string; + icon?: string; + buttons?: string[]; +}; +const routeChange = () => { + console.log("new route") } -export const IconCard = ({data, bgColor, icon}: IconCardProps) => { - - var size, center, flexDirection, gap, align +export const IconCard = ({ data, bgColor, icon, buttons }: IconCardProps) => { + const lightMode = useToggle((state) => state.light); + var size, center, flexDirection, gap, align; - if (isHorizontal(data.orientation)) { - size = HORIZONTAL_TEXT_WIDTH - center = HORIZONTAL_CENTER - gap = HORIZONTAL_GAP - flexDirection = (data.orientation===Orientation.west) ? "flex-row-reverse" : "flex-row" - } - else { //vertical - size = VERTICAL_TEXT_WIDTH - center = VERTICAL_CENTER - gap = VERTICAL_GAP - flexDirection = (data.orientation===Orientation.north) ? "flex-col-reverse" : "flex-col" - } + if (isHorizontal(data.orientation)) { + size = HORIZONTAL_TEXT_WIDTH; + center = HORIZONTAL_CENTER; + gap = HORIZONTAL_GAP; + flexDirection = + data.orientation === Orientation.west ? "flex-row-reverse" : "flex-row"; + } else { + //vertical + size = VERTICAL_TEXT_WIDTH; + center = VERTICAL_CENTER; + gap = VERTICAL_GAP; + flexDirection = + data.orientation === Orientation.north ? "flex-col-reverse" : "flex-col"; + } - return( -
- {textContainer(data.headingText, data.bodyText, size)} -
- {icon} -
-
- ) -} + return ( +
+ {textContainer(data.headingText, data.bodyText, size)} + {icon && ( + + )} + {buttons && buttons.map((button) => { + console.log(button); + return ( +
+ + + +
+ ); + })} +
+ ); +}; function textContainer(headingText: string, bodyText: string, width: string) { - return( -
-

{headingText}

-

{bodyText}

-
- ) + return ( +
+

{headingText}

+

{bodyText}

+
+ ); } export function isHorizontal(orientation: Orientation) { - return(Boolean(orientation % 2)) + return Boolean(orientation % 2); } -export default IconCard; \ No newline at end of file +export default IconCard; diff --git a/src/components/Login.tsx b/src/components/Login.tsx index 0105b9e..7c6e7a2 100644 --- a/src/components/Login.tsx +++ b/src/components/Login.tsx @@ -1,87 +1,94 @@ -import { FontAwesomeIcon} from "@fortawesome/react-fontawesome"; -import { icon } from '@fortawesome/fontawesome-svg-core/import.macro' +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import { icon } from "@fortawesome/fontawesome-svg-core/import.macro"; import Header from "./Header"; import { useToggle } from "../ts/ToggleHeader"; +import { Link } from "react-router-dom"; export const Login = () => { - const lightMode = useToggle((state) => state.light); + const lightMode = useToggle((state) => state.light); + return ( +
+
+
+
+ - return( -
-
-
-
- - - - - -
- Forgot Password? - | - Register -
-
+ + +
+ + {/* TODO: Change link to Forgot Password */} + Forgot Password?{" "} + + + | + + + {" "} + Register + +
+
- - ) -} + ); +}; -export default Login; \ No newline at end of file +export default Login; diff --git a/src/components/Register.tsx b/src/components/Register.tsx index daa0373..f45b704 100644 --- a/src/components/Register.tsx +++ b/src/components/Register.tsx @@ -30,7 +30,7 @@ export const Login = () => {

Sign Up with Github @@ -52,7 +52,7 @@ export const Login = () => {

Sign Up with Google @@ -64,22 +64,22 @@ export const Login = () => { {" "} - Already have an account? Login + Already have an account?

diff --git a/src/components/FrontPage.tsx b/src/pages/FrontPage.tsx similarity index 67% rename from src/components/FrontPage.tsx rename to src/pages/FrontPage.tsx index e9a1cf8..2213e23 100644 --- a/src/components/FrontPage.tsx +++ b/src/pages/FrontPage.tsx @@ -1,6 +1,6 @@ -import Header from "./Header"; -import Content from "./Content"; -import Footer from "./Footer"; +import Header from "../components/Header"; +import Content from "../components/Content"; +import Footer from "../components/Footer"; import { useToggle } from "../ts/ToggleHeader"; export const FrontPage = () => { diff --git a/tailwind.config.js b/tailwind.config.js index 7894601..f1db682 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -13,9 +13,12 @@ module.exports = { "charcoal-black": "#131313", "duke-blue": "#000274", "suva-grey": "#8D8D8D", - "light": "#000274", + // white + "light": "#000000", "dark": "#ffffff", - "hover-light": "#0005ff", + // dark gray + "hover-light": "#A9A9A9", + // light gray "hover-dark": "#8d8d8d" }, diff --git a/yarn.lock b/yarn.lock index 1b8956b..20166fe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -249,36 +249,43 @@ resolved "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz" integrity sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w== -"@fortawesome/fontawesome-common-types@6.4.2": - version "6.4.2" - resolved "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.4.2.tgz" - integrity sha512-1DgP7f+XQIJbLFCTX1V2QnxVmpLdKdzzo2k8EmvDOePfchaIGQ9eCHj2up3/jNEbZuBqel5OxiaOJf37TWauRA== +"@fortawesome/fontawesome-common-types@6.5.2": + version "6.5.2" + resolved "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.5.2.tgz" + integrity sha512-gBxPg3aVO6J0kpfHNILc+NMhXnqHumFxOmjYCFfOiLZfwhnnfhtsdA2hfJlDnj+8PjAs6kKQPenOTKj3Rf7zHw== "@fortawesome/fontawesome-free@^6.4.2": version "6.4.2" resolved "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.2.tgz" integrity sha512-m5cPn3e2+FDCOgi1mz0RexTUvvQibBebOUlUlW0+YrMjDTPkiJ6VTKukA1GRsvRw+12KyJndNjj0O4AgTxm2Pg== -"@fortawesome/fontawesome-svg-core@^6.4.2", "@fortawesome/fontawesome-svg-core@~1 || ~6": - version "6.4.2" - resolved "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.4.2.tgz" - integrity sha512-gjYDSKv3TrM2sLTOKBc5rH9ckje8Wrwgx1CxAPbN5N3Fm4prfi7NsJVWd1jklp7i5uSCVwhZS5qlhMXqLrpAIg== +"@fortawesome/fontawesome-svg-core@^6.5.2", "@fortawesome/fontawesome-svg-core@~1 || ~6": + version "6.5.2" + resolved "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.5.2.tgz" + integrity sha512-5CdaCBGl8Rh9ohNdxeeTMxIj8oc3KNBgIeLMvJosBMdslK/UnEB8rzyDRrbKdL1kDweqBPo4GT9wvnakHWucZw== dependencies: - "@fortawesome/fontawesome-common-types" "6.4.2" + "@fortawesome/fontawesome-common-types" "6.5.2" -"@fortawesome/free-brands-svg-icons@^6.4.2": - version "6.4.2" - resolved "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.4.2.tgz" - integrity sha512-LKOwJX0I7+mR/cvvf6qIiqcERbdnY+24zgpUSouySml+5w8B4BJOx8EhDR/FTKAu06W12fmUIcv6lzPSwYKGGg== +"@fortawesome/free-brands-svg-icons@^6.5.2": + version "6.5.2" + resolved "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.5.2.tgz" + integrity sha512-zi5FNYdmKLnEc0jc0uuHH17kz/hfYTg4Uei0wMGzcoCL/4d3WM3u1VMc0iGGa31HuhV5i7ZK8ZlTCQrHqRHSGQ== dependencies: - "@fortawesome/fontawesome-common-types" "6.4.2" + "@fortawesome/fontawesome-common-types" "6.5.2" -"@fortawesome/free-solid-svg-icons@^6.4.2": - version "6.4.2" - resolved "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.4.2.tgz" - integrity sha512-sYwXurXUEQS32fZz9hVCUUv/xu49PEJEyUOsA51l6PU/qVgfbTb2glsTEaJngVVT8VqBATRIdh7XVgV1JF1LkA== +"@fortawesome/free-regular-svg-icons@^6.5.2": + version "6.5.2" + resolved "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.5.2.tgz" + integrity sha512-iabw/f5f8Uy2nTRtJ13XZTS1O5+t+anvlamJ3zJGLEVE2pKsAWhPv2lq01uQlfgCX7VaveT3EVs515cCN9jRbw== + dependencies: + "@fortawesome/fontawesome-common-types" "6.5.2" + +"@fortawesome/free-solid-svg-icons@^6.5.2": + version "6.5.2" + resolved "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.5.2.tgz" + integrity sha512-QWFZYXFE7O1Gr1dTIp+D6UcFUF0qElOnZptpi7PBUMylJh+vFmIedVe1Ir6RM1t2tEQLLSV1k7bR4o92M+uqlw== dependencies: - "@fortawesome/fontawesome-common-types" "6.4.2" + "@fortawesome/fontawesome-common-types" "6.5.2" "@fortawesome/react-fontawesome@^0.2.0": version "0.2.0" @@ -984,9 +991,9 @@ camelcase@^6.2.0: integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== caniuse-lite@^1.0.30001538, caniuse-lite@^1.0.30001541: - version "1.0.30001543" - resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001543.tgz" - integrity sha512-qxdO8KPWPQ+Zk6bvNpPeQIOH47qZSYdFZd6dXQzb2KzhnSXju4Kd7H1PkSJx6NICSMgo/IhRZRhhfPTHYpJUCA== + version "1.0.30001616" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001616.tgz" + integrity sha512-RHVYKov7IcdNjVHJFNY/78RdG4oGVjbayxv8u5IO74Wv7Hlq4PnJE6mo/OjFijjVFNy5ijnCt6H3IIo4t+wfEw== chai@^4.3.10: version "4.3.10" @@ -2738,9 +2745,9 @@ vite-tsconfig-paths@^4.2.1: tsconfck "^2.1.0" vite@*, "vite@^2.6.0 || 3 || 4", "vite@^3.0.0 || ^4.0.0 || ^5.0.0-0", "vite@^3.1.0 || ^4.0.0 || ^5.0.0-0", vite@^4, vite@^4.4.10, vite@>=2: - version "4.5.2" - resolved "https://registry.npmjs.org/vite/-/vite-4.5.2.tgz" - integrity sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w== + version "4.5.3" + resolved "https://registry.npmjs.org/vite/-/vite-4.5.3.tgz" + integrity sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg== dependencies: esbuild "^0.18.10" postcss "^8.4.27"