Merge origin/main into main

alexis-opolka · Aug 17, 2023 · e1536d4 · e1536d4
2 parents 26cfde9 + 0b99511
commit e1536d4
Show file tree

Hide file tree

Showing 57 changed files with 9,930 additions and 110 deletions.
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -0,0 +1,11 @@
+/* eslint-env node */
+module.exports = {
+  extends: [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "next/core-web-vitals",
+  ],
+  parser: "@typescript-eslint/parser",
+  plugins: ["@typescript-eslint"],
+  root: true,
+};
diff --git a/.eslintrc.json b/.eslintrc.json
diff --git a/.github/workflows/nextjs.yml b/.github/workflows/nextjs.yml
@@ -2,12 +2,12 @@
 #
 # To get started with Next.js see: https://nextjs.org/docs/getting-started
 #
-name: Deploy Dev Next.js site to Pages
+name: Deploy Next.js site to Pages
 
 on:
   # Runs on pushes targeting a specific branch
   push:
-    branches: ["theme-system-github-primer"]
+    branches: ["main"]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

diff --git a/next.config.js b/next.config.js
@@ -11,6 +11,13 @@ const nextConfig = {
       ["@lingui/swc-plugin", {}],
     ]
   },
+  webpack: function (config) {
+    config.module.rules.push({
+      test: /\.ya?ml$/,
+      use: "yaml-loader",
+    });
+    return config;
+  },
   i18n: {
     // These are all the locales we want to support
     locales: ["en", "fr"],

diff --git a/package.json b/package.json
@@ -12,14 +12,18 @@
     "lingui:compile": "lingui compile"
   },
   "dependencies": {
+    "@apollo/client": "^3.8.1",
     "@lingui/format-json": "^4.3.0",
     "@lingui/react": "^4.3.0",
     "@primer/react": "^35.26.1",
     "@types/node": "20.4.5",
     "@types/react": "18.2.17",
     "@types/react-dom": "18.2.7",
-    "eslint": "8.45.0",
+    "dotenv": "^16.3.1",
+    "eslint": "^8.47.0",
     "eslint-config-next": "13.4.12",
+    "graphql": "^16.7.1",
+    "js-yaml-loader": "^1.2.2",
     "next": "13.4.12",
     "react": "^18.2.0",
     "react-circle-flags": "^0.0.18",
@@ -28,11 +32,14 @@
     "sass": "^1.65.1",
     "sharp": "^0.32.4",
     "styled-components": "^5.3.11",
-    "typescript": "5.1.6"
+    "typescript": "^5.1.6"
   },
   "devDependencies": {
     "@lingui/cli": "^4.3.0",
     "@lingui/macro": "^4.3.0",
-    "@lingui/swc-plugin": "^4.0.4"
+    "@lingui/swc-plugin": "^4.0.4",
+    "@typescript-eslint/eslint-plugin": "^6.4.0",
+    "@typescript-eslint/parser": "^6.4.0",
+    "yaml-loader": "^0.8.0"
   }
 }
diff --git a/src/app/(portfolio)/(landing-page)/layout.tsx b/src/app/(portfolio)/(landing-page)/layout.tsx
@@ -1,8 +1,5 @@
 "use client"
 
-// Stylesheets and Types imports
-import type { Metadata } from 'next';
-
 // NextJS imports
 import { PageLayout, Box, Breadcrumbs } from "@primer/react";
 
@@ -11,12 +8,6 @@ import PortfolioHeader from "@/components/PortfolioHeader";
 import PortfolioFooter from "@/components/PortfolioFooter";
 
 
-// Exports (Functions, Components, Variables/Constants)
-const metadata: Metadata = {
-  title: 'Alexis Opolka Portfolio',
-  description: 'The website & portfolio of Alexis Opolka',
-}
-
 export default function RootLayout({
   children,
 }: {
@@ -25,7 +16,7 @@ export default function RootLayout({
 
   const rootBreadCrumbs = (
     <Breadcrumbs>
-      <Breadcrumbs.Item href="/" sx={{color: "fg.default"}}>A/O</Breadcrumbs.Item>
+      <Breadcrumbs.Item href="/" sx={{color: "header.logo"}}>A/O</Breadcrumbs.Item>
     </Breadcrumbs>
   );
 
@@ -37,16 +28,14 @@ export default function RootLayout({
           top: 0,
           height: 64,
           placeItems: 'center',
-          bg: 'PageHeaderBg',
+          bg: 'header.bg',
           zIndex: 1,
         }}
       >
         <PortfolioHeader breadCrumbs={rootBreadCrumbs}/>
       </Box>
-      <PageLayout sx={{ overflow: "hidden", bg: 'canvas.default' }}>
-        <PageLayout.Content sx={{
-          border: "border.default",
-        }}>
+      <PageLayout sx={{ overflow: "hidden", bg: 'canvas.inset' }}>
+        <PageLayout.Content>
           <Box sx={{ minHeight: "100vh"}}>
             {children}
           </Box>

diff --git a/src/app/(portfolio)/(landing-page)/page.tsx b/src/app/(portfolio)/(landing-page)/page.tsx
@@ -1,7 +1,7 @@
 "use client"
 
 // NextJS Imports
-import { Box, Heading, Text } from '@primer/react';
+import { Box, Heading } from '@primer/react';
 
 // Intern Imports
 import PhoneComponent from '@/components/phoneComponents/PhoneComponent';

diff --git a/src/app/(portfolio)/about/layout.tsx b/src/app/(portfolio)/about/layout.tsx
@@ -0,0 +1,56 @@
+"use client"
+
+// NextJS imports
+import { PageLayout, Box, Breadcrumbs } from "@primer/react";
+
+
+// Intern Imports
+import PortfolioHeader from "@/components/PortfolioHeader";
+import PortfolioFooter from "@/components/PortfolioFooter";
+
+
+export default function AboutLayout({
+  children,
+}: {
+  children: React.ReactNode
+}) {
+
+
+
+
+  const AboutBreadCrumbs = (
+    <Breadcrumbs>
+        <Breadcrumbs.Item href="/" sx={{color: "header.logo"}}>A/O</Breadcrumbs.Item>
+        <Breadcrumbs.Item href="/about" sx={{color: "header.text"}}>About</Breadcrumbs.Item>
+    </Breadcrumbs>
+  );
+
+  return (
+    <Box sx={{ minHeight: "100vh", overflowY: 'auto' }}>
+      <Box
+        sx={{
+          position: 'sticky',
+          top: 0,
+          height: 64,
+          placeItems: 'center',
+          bg: 'header.bg',
+          zIndex: 1,
+        }}
+      >
+        <PortfolioHeader breadCrumbs={AboutBreadCrumbs}/>
+      </Box>
+      <PageLayout sx={{ overflow: "hidden", bg: "canvas.inset" }}>
+        <PageLayout.Content sx={{
+          border: "border.default",
+        }}>
+          <Box sx={{ minHeight: "100vh"}}>
+            {children}
+          </Box>
+        </PageLayout.Content>
+        <PageLayout.Footer divider={"line"}>
+          <PortfolioFooter />
+        </PageLayout.Footer>
+      </PageLayout>
+    </Box>
+  )
+}