diff --git a/apps/web/next.config.js b/apps/web/next.config.js index 9811d72..0852a72 100644 --- a/apps/web/next.config.js +++ b/apps/web/next.config.js @@ -30,6 +30,12 @@ const config = { port: "", pathname: "/**", }, + { + protocol: "https", + hostname: "lh3.googleusercontent.com", + port: "", + pathname: "/**", + }, ], }, }; diff --git a/apps/web/public/fonts/AltivoMedium.otf b/apps/web/public/fonts/AltivoMedium.otf deleted file mode 100644 index f6bd593..0000000 Binary files a/apps/web/public/fonts/AltivoMedium.otf and /dev/null differ diff --git a/apps/web/public/fonts/AltivoRegular.otf b/apps/web/public/fonts/AltivoRegular.otf deleted file mode 100644 index d536c3b..0000000 Binary files a/apps/web/public/fonts/AltivoRegular.otf and /dev/null differ diff --git a/apps/web/public/fonts/BentonSansBold.otf b/apps/web/public/fonts/BentonSansBold.otf deleted file mode 100644 index 260c90d..0000000 Binary files a/apps/web/public/fonts/BentonSansBold.otf and /dev/null differ diff --git a/apps/web/public/fonts/BentonSansBook.otf b/apps/web/public/fonts/BentonSansBook.otf deleted file mode 100644 index a24ba5a..0000000 Binary files a/apps/web/public/fonts/BentonSansBook.otf and /dev/null differ diff --git a/apps/web/public/fonts/BentonSansMedium.otf b/apps/web/public/fonts/BentonSansMedium.otf deleted file mode 100644 index a2b974d..0000000 Binary files a/apps/web/public/fonts/BentonSansMedium.otf and /dev/null differ diff --git a/apps/web/public/fonts/BentonSansRegular.otf b/apps/web/public/fonts/BentonSansRegular.otf deleted file mode 100644 index 68c3394..0000000 Binary files a/apps/web/public/fonts/BentonSansRegular.otf and /dev/null differ diff --git a/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-Black.ttf b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-Black.ttf new file mode 100644 index 0000000..ab43a5b Binary files /dev/null and b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-Black.ttf differ diff --git a/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-BlackItalic.ttf b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-BlackItalic.ttf new file mode 100644 index 0000000..d2bfc12 Binary files /dev/null and b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-BlackItalic.ttf differ diff --git a/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-Bold.ttf b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-Bold.ttf new file mode 100644 index 0000000..59eb24c Binary files /dev/null and b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-Bold.ttf differ diff --git a/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-BoldItalic.ttf b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-BoldItalic.ttf new file mode 100644 index 0000000..1809358 Binary files /dev/null and b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-BoldItalic.ttf differ diff --git a/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-ExtraBold.ttf b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-ExtraBold.ttf new file mode 100644 index 0000000..386d2c3 Binary files /dev/null and b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-ExtraBold.ttf differ diff --git a/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-ExtraBoldItalic.ttf b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-ExtraBoldItalic.ttf new file mode 100644 index 0000000..4f49c5c Binary files /dev/null and b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-ExtraBoldItalic.ttf differ diff --git a/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-ExtraLight.ttf b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-ExtraLight.ttf new file mode 100644 index 0000000..b149440 Binary files /dev/null and b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-ExtraLight.ttf differ diff --git a/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-ExtraLightItalic.ttf b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-ExtraLightItalic.ttf new file mode 100644 index 0000000..fc6d5ad Binary files /dev/null and b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-ExtraLightItalic.ttf differ diff --git a/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-Italic.ttf b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-Italic.ttf new file mode 100644 index 0000000..7507e7c Binary files /dev/null and b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-Italic.ttf differ diff --git a/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-Light.ttf b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-Light.ttf new file mode 100644 index 0000000..6615d70 Binary files /dev/null and b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-Light.ttf differ diff --git a/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-LightItalic.ttf b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-LightItalic.ttf new file mode 100644 index 0000000..75e0c44 Binary files /dev/null and b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-LightItalic.ttf differ diff --git a/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-Medium.ttf b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-Medium.ttf new file mode 100644 index 0000000..81d89ef Binary files /dev/null and b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-Medium.ttf differ diff --git a/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-MediumItalic.ttf b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-MediumItalic.ttf new file mode 100644 index 0000000..357fd91 Binary files /dev/null and b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-MediumItalic.ttf differ diff --git a/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-Regular.ttf b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-Regular.ttf new file mode 100644 index 0000000..8b01d15 Binary files /dev/null and b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-Regular.ttf differ diff --git a/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-SemiBold.ttf b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-SemiBold.ttf new file mode 100644 index 0000000..e27b84e Binary files /dev/null and b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-SemiBold.ttf differ diff --git a/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-SemiBoldItalic.ttf b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-SemiBoldItalic.ttf new file mode 100644 index 0000000..ccd75e6 Binary files /dev/null and b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-SemiBoldItalic.ttf differ diff --git a/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-Thin.ttf b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-Thin.ttf new file mode 100644 index 0000000..30f5ae2 Binary files /dev/null and b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-Thin.ttf differ diff --git a/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-ThinItalic.ttf b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-ThinItalic.ttf new file mode 100644 index 0000000..5d6d727 Binary files /dev/null and b/apps/web/public/fonts/hanken-grotesk/HankenGrotesk-ThinItalic.ttf differ diff --git a/apps/web/public/svg/defaultProfile.svg b/apps/web/public/svg/defaultProfile.svg new file mode 100644 index 0000000..5a02643 --- /dev/null +++ b/apps/web/public/svg/defaultProfile.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/web/public/svg/logoOutline.svg b/apps/web/public/svg/logoOutline.svg new file mode 100644 index 0000000..4381595 --- /dev/null +++ b/apps/web/public/svg/logoOutline.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/web/src/app/(pages)/(dashboard)/roles/page.tsx b/apps/web/src/app/(pages)/(dashboard)/(roles)/page.tsx similarity index 94% rename from apps/web/src/app/(pages)/(dashboard)/roles/page.tsx rename to apps/web/src/app/(pages)/(dashboard)/(roles)/page.tsx index 9ca95c1..9d5868d 100644 --- a/apps/web/src/app/(pages)/(dashboard)/roles/page.tsx +++ b/apps/web/src/app/(pages)/(dashboard)/(roles)/page.tsx @@ -27,7 +27,7 @@ export default function Roles() { return ( <> {roles.isSuccess && roles.data.length > 0 && ( -
+
{roles.data.map((role, i) => { return ( diff --git a/apps/web/src/app/(pages)/(dashboard)/companies/page.tsx b/apps/web/src/app/(pages)/(dashboard)/companies/page.tsx index f8659bf..f4b33d5 100644 --- a/apps/web/src/app/(pages)/(dashboard)/companies/page.tsx +++ b/apps/web/src/app/(pages)/(dashboard)/companies/page.tsx @@ -2,7 +2,6 @@ import { unstable_noStore as noStore } from "next/cache"; import NoResults from "~/app/_components/no-results"; import { RoleReviewCard } from "~/app/_components/reviews/role-review-card"; -import SearchFilter from "~/app/_components/search/search-filter"; import { api } from "~/trpc/server"; export default async function Companies() { @@ -20,9 +19,8 @@ export default async function Companies() { return ( <> - {roles.length > 0 ? ( -
+
{roles.map((role) => { return ( diff --git a/apps/web/src/app/(pages)/(dashboard)/page.tsx b/apps/web/src/app/(pages)/(dashboard)/page.tsx deleted file mode 100644 index c660326..0000000 --- a/apps/web/src/app/(pages)/(dashboard)/page.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import SearchFilter from "~/app/_components/search/search-filter"; - -export default function Home() { - return ( -
-
- -
-
- ); -} diff --git a/apps/web/src/app/_components/auth/login-button.tsx b/apps/web/src/app/_components/auth/login-button.tsx index ebecdc1..4bab7a6 100644 --- a/apps/web/src/app/_components/auth/login-button.tsx +++ b/apps/web/src/app/_components/auth/login-button.tsx @@ -5,7 +5,7 @@ export default function LoginButton() { return (
+
+ ); +} diff --git a/apps/web/src/app/_components/search/search-filter.tsx b/apps/web/src/app/_components/search/search-filter.tsx index 5cb5093..c07e552 100644 --- a/apps/web/src/app/_components/search/search-filter.tsx +++ b/apps/web/src/app/_components/search/search-filter.tsx @@ -7,6 +7,7 @@ import { useForm } from "react-hook-form"; import { z } from "zod"; import { WorkEnvironment, WorkTerm } from "@cooper/db/schema"; +import { cn } from "@cooper/ui"; import { Form } from "@cooper/ui/form"; import { ReviewSearchBar } from "~/app/_components/search/review-search-bar"; @@ -33,6 +34,7 @@ interface SearchFilterProps { cycle?: "FALL" | "SPRING" | "SUMMER"; term?: "INPERSON" | "HYBRID" | "REMOTE"; alternatePathname?: string; + searchClassName?: string; searchType?: "REVIEWS" | "SIMPLE"; } @@ -47,6 +49,7 @@ export default function SearchFilter({ cycle, term, alternatePathname, + searchClassName, searchType = "SIMPLE", }: SearchFilterProps) { const form = useForm>({ @@ -89,8 +92,11 @@ export default function SearchFilter({ return (
- -
+ +
{searchType === "SIMPLE" && } {searchType === "REVIEWS" && ( diff --git a/apps/web/src/app/_components/search/simple-search-bar.tsx b/apps/web/src/app/_components/search/simple-search-bar.tsx index 0ab110c..affc78f 100644 --- a/apps/web/src/app/_components/search/simple-search-bar.tsx +++ b/apps/web/src/app/_components/search/simple-search-bar.tsx @@ -17,17 +17,17 @@ export function SimpleSearchBar() { const form = useFormContext(); const newLocal = - "h-14 border-2 border-l-0 border-cooper-blue-700 text-lg text-cooper-blue-600 placeholder:text-cooper-blue-400 rounded-r-lg rounded-l-none"; + "h-12 border-2 border-l-0 border-cooper-blue-700 text-lg text-cooper-blue-600 placeholder:text-cooper-blue-400 rounded-r-lg rounded-l-none"; return ( -
+
diff --git a/apps/web/src/app/layout.tsx b/apps/web/src/app/layout.tsx index 28aa0d7..1445a36 100644 --- a/apps/web/src/app/layout.tsx +++ b/apps/web/src/app/layout.tsx @@ -2,7 +2,7 @@ import type { Metadata } from "next"; import { cn } from "@cooper/ui"; -import { bentonSansFont } from "~/app/styles/font"; +import { hankenGroteskFont } from "~/app/styles/font"; import { TRPCReactProvider } from "~/trpc/react"; import "~/app/styles/globals.css"; @@ -28,7 +28,7 @@ export const metadata: Metadata = { export default function RootLayout(props: { children: React.ReactNode }) { return ( diff --git a/apps/web/src/app/styles/font.ts b/apps/web/src/app/styles/font.ts index 74de8e2..fa8040a 100644 --- a/apps/web/src/app/styles/font.ts +++ b/apps/web/src/app/styles/font.ts @@ -1,39 +1,24 @@ import localFont from "next/font/local"; -export const altivoFont = localFont({ +export const hankenGroteskFont = localFont({ src: [ { - path: "./../../../public/fonts/AltivoRegular.otf", - weight: "400", - style: "normal", - }, - { - path: "./../../../public/fonts/AltivoMedium.otf", - weight: "600", - style: "normal", - }, - ], -}); - -export const bentonSansFont = localFont({ - src: [ - { - path: "./../../../public/fonts/BentonSansBook.otf", + path: "./../../../public/fonts/hanken-grotesk/HankenGrotesk-Light.ttf", weight: "200", style: "normal", }, { - path: "./../../../public/fonts/BentonSansRegular.otf", + path: "./../../../public/fonts/hanken-grotesk/HankenGrotesk-Regular.ttf", weight: "400", style: "normal", }, { - path: "./../../../public/fonts/BentonSansMedium.otf", + path: "./../../../public/fonts/hanken-grotesk/HankenGrotesk-Medium.ttf", weight: "600", style: "normal", }, { - path: "./../../../public/fonts/BentonSansBold.otf", + path: "./../../../public/fonts/hanken-grotesk/HankenGrotesk-Bold.ttf", weight: "800", style: "normal", },