merge conflicts

.eslintrc.js

@@ -0,0 +1,32 @@
+module.exports = {
+    "env": {
+        "browser": true,
+        "es2021": true
+    },
+    "extends": [
+        "eslint:recommended",
+        "plugin:react/recommended"
+    ],
+    "overrides": [
+        {
+            "env": {
+                "node": true
+            },
+            "files": [
+                ".eslintrc.{js,cjs}"
+            ],
+            "parserOptions": {
+                "sourceType": "script"
+            }
+        }
+    ],
+    "parserOptions": {
+        "ecmaVersion": "latest",
+        "sourceType": "module"
+    },
+    "plugins": [
+        "react"
+    ],
+    "rules": {
+    }
+}

.github/workflows/gh-deploy.yaml

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 name: Build and Deploy
 on:
   push:
@@ -35,3 +36,48 @@ jobs:
           BRANCH: gh-pages
           FOLDER: out
           CLEAN: true
+=======
+name: Build and Deploy to GitHub Pages
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+        with:
+          persist-credentials: false
+
+      - name: Cache Node Modules
+        uses: actions/cache@v4
+        with:
+          path: |
+            **/node_modules
+          key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
+
+      - name: Setup Node.js Environment
+        uses: actions/setup-node@v4
+        with:
+          node-version: '16'
+
+      - name: Install Dependencies
+        run: yarn install
+
+      - name: Build Project
+        run: yarn build
+        env:
+          CI: true
+
+      - name: Deploy to GitHub Pages
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./docs
+          user_name: 'github-actions[bot]'
+          user_email: 'github-actions[bot]@users.noreply.github.com'
+>>>>>>> origin/main

.github/workflows/jek.yaml

@@ -0,0 +1,30 @@
+name: Deploy 🚀 to GitHub Pages
+on:
+  push:
+    branches:
+      - gh-pages
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Pages
+        uses: actions/configure-pages@v4
+      - name: Build with Jekyll
+        uses: actions/jekyll-build-pages@v1
+        with:
+          source: ./
+          destination: ./_site
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+  deploy-to-github-pages:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build-and-deploy
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.gitignore

@@ -1 +1,3 @@
-.node_modules
+/dist
+/node_modules
+.DS_Store

.next/build-manifest.json

@@ -1,49 +1,46 @@
 {
   "polyfillFiles": [
-    "static/chunks/polyfills-c67a75d1b6f99dc8.js"
+    "static/chunks/polyfills.js"
+  ],
+  "devFiles": [
+    "static/chunks/react-refresh.js"
   ],
-  "devFiles": [],
   "ampDevFiles": [],
   "lowPriorityFiles": [
-    "static/ykvcM1KaXQ-xb8OcjQQ5b/_buildManifest.js",
-    "static/ykvcM1KaXQ-xb8OcjQQ5b/_ssgManifest.js"
+    "static/development/_buildManifest.js",
+    "static/development/_ssgManifest.js"
   ],
   "rootMainFiles": [],
   "pages": {
     "/": [
-      "static/chunks/webpack-6ef43a8d4a395f49.js",
-      "static/chunks/framework-5429a50ba5373c56.js",
-      "static/chunks/main-145f833db83c1e47.js",
-      "static/chunks/pages/index-e3543ffa5857f51b.js"
+      "static/chunks/webpack.js",
+      "static/chunks/main.js",
+      "static/chunks/pages/index.js"
     ],
     "/_app": [
-      "static/chunks/webpack-6ef43a8d4a395f49.js",
-      "static/chunks/framework-5429a50ba5373c56.js",
-      "static/chunks/main-145f833db83c1e47.js",
-      "static/css/30240d624d8fdf24.css",
-      "static/chunks/pages/_app-23331e9d9e8c9ffc.js"
+      "static/chunks/webpack.js",
+      "static/chunks/main.js",
+      "static/chunks/pages/_app.js"
     ],
     "/_error": [
-      "static/chunks/webpack-6ef43a8d4a395f49.js",
-      "static/chunks/framework-5429a50ba5373c56.js",
-      "static/chunks/main-145f833db83c1e47.js",
-      "static/chunks/pages/_error-5a00309fd5f4b49e.js"
+      "static/chunks/webpack.js",
+      "static/chunks/main.js",
+      "static/chunks/pages/_error.js"
     ],
     "/experience": [
-      "static/chunks/webpack-6ef43a8d4a395f49.js",
-      "static/chunks/framework-5429a50ba5373c56.js",
-      "static/chunks/main-145f833db83c1e47.js",
-      "static/css/445c4173ffc2bf04.css",
-      "static/chunks/377-61a9680bfb71b9fa.js",
-      "static/chunks/pages/experience-eb9a5582c0d3f32b.js"
+      "static/chunks/webpack.js",
+      "static/chunks/main.js",
+      "static/chunks/pages/experience.js"
     ],
     "/projects": [
-      "static/chunks/webpack-6ef43a8d4a395f49.js",
-      "static/chunks/framework-5429a50ba5373c56.js",
-      "static/chunks/main-145f833db83c1e47.js",
-      "static/css/445c4173ffc2bf04.css",
-      "static/chunks/377-61a9680bfb71b9fa.js",
-      "static/chunks/pages/projects-347571824ca86ecb.js"
+      "static/chunks/webpack.js",
+      "static/chunks/main.js",
+      "static/chunks/pages/projects.js"
+    ],
+    "/resume": [
+      "static/chunks/webpack.js",
+      "static/chunks/main.js",
+      "static/chunks/pages/resume.js"
     ]
   },
   "ampFirstPages": []