From 7e3dc4ace4c6b21bc68264dc76c8c442aec8031a Mon Sep 17 00:00:00 2001 From: Ashelyn Rose Date: Mon, 8 May 2023 14:45:55 -0600 Subject: standardize component structure more --- app/Footer.tsx | 9 ----- app/Header.tsx | 43 ---------------------- app/layout.tsx | 4 +- app/not-found.tsx | 6 ++- app/page.tsx | 7 ++-- app/pay-transparency/page.tsx | 85 +++++++++++++++++++++++++++++++++++++++++++ app/posts/page.tsx | 12 ++++++ 7 files changed, 106 insertions(+), 60 deletions(-) delete mode 100644 app/Footer.tsx delete mode 100644 app/Header.tsx create mode 100644 app/pay-transparency/page.tsx create mode 100644 app/posts/page.tsx (limited to 'app') diff --git a/app/Footer.tsx b/app/Footer.tsx deleted file mode 100644 index 49089b4..0000000 --- a/app/Footer.tsx +++ /dev/null @@ -1,9 +0,0 @@ -export default function Footer() { - return ( - - ) -} diff --git a/app/Header.tsx b/app/Header.tsx deleted file mode 100644 index b5749ba..0000000 --- a/app/Header.tsx +++ /dev/null @@ -1,43 +0,0 @@ -'use client' - -import React from 'react' -import Image from 'next/image' - -import { usePathname } from 'next/navigation' - -import header from '~/images/aurora-1197753.jpg' - -export default function Title() { - const pathname = usePathname() - - const isHomepage = pathname === '/' - - return ( -
- {isHomepage - ?

tempest.dev

- : tempest.dev - } - -
- -
-
- ) -} diff --git a/app/layout.tsx b/app/layout.tsx index 3d25c44..22e1191 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -4,8 +4,8 @@ import 'victormono' import '~/styles/layout.css' import '~/styles/text.css' -import Header from './Header' -import Footer from './Footer' +import Header from '~/components/layout/Header' +import Footer from '~/components/layout/Footer' export default function SiteLayout({ children }: { children: ReactNode }) { return ( diff --git a/app/not-found.tsx b/app/not-found.tsx index 44753b0..b3a0fd4 100644 --- a/app/not-found.tsx +++ b/app/not-found.tsx @@ -1,12 +1,14 @@ +import InfoBar from "~/components/InfoBar/" + export default function NotFound() { return ( <>

Not Found (404)

- +

Feel free to start again from the home page, or diff --git a/app/page.tsx b/app/page.tsx index 49d887c..bc84594 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -24,8 +24,8 @@ export default function Index() { Cohort: millenial - Poly: - yes + Orientation: + ace Partners: three @@ -39,9 +39,8 @@ export default function Index() {

Note: This is the information for our system in aggregate, - for individual info see system + for individual info see our about page

-
) } diff --git a/app/pay-transparency/page.tsx b/app/pay-transparency/page.tsx new file mode 100644 index 0000000..cb4b053 --- /dev/null +++ b/app/pay-transparency/page.tsx @@ -0,0 +1,85 @@ +import InfoBar from "~/components/InfoBar/" + +import styles from '~/styles/pay-transparency.module.css' + +export default function PayTransparency() { + return ( + <> +

+ Pay Transparency +

+
+ +

+ This page lists the title and pay rate of every job we have held + since university graduation, and is inspired by{' '} + Rin's pay transparency + {' '}page. That page is what inspired us to make this one, and we hope the + idea continues to spread, as the more people know what common compensation is + across the industry, the more we can all benefit. +

+ +
+
+ Role + Start + End + Rate / Salary + + Software Developer + Jan 2020 + Sept 2020 + $35 USD / hour + + Software Engineer + Jan 2021 + Sept 2021 + $90,000 USD / year + * + + + Software Engineer + Sept 2021 + Oct 2022 + $100,800 USD / year + * + + + Software Engineer + Oct 2021 + Jan 2022 + $105,840 USD / year + * + + + Senior Software Engineer + Jan 2022 + May 2022 + $121,716 USD / year + * + + + Senior Software Engineer + June 2022 + March 2023 + $158,000 USD / year + ** + +
+
+ +

+ All positions listed here included health, dental, and vision insurance. +

+

+ The positions listed with * came with + a retirement account. +

+

+ The position listed with ** came with + stock options and a retirement account. +

+
+ + ) +} diff --git a/app/posts/page.tsx b/app/posts/page.tsx new file mode 100644 index 0000000..34f0e7f --- /dev/null +++ b/app/posts/page.tsx @@ -0,0 +1,12 @@ +export default function Posts() { + return ( + <> +

+ Posts +

+
+

This will have posts here eventually we promise

+
+ + ) +} -- cgit 1.4.1