Merging dev into main.

corigne · May 6, 2024 · a0a4c9c · a0a4c9c
2 parents cc204ea + f35cee7
commit a0a4c9c
Show file tree

Hide file tree

Showing 12 changed files with 198 additions and 0 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,30 +1,52 @@
 name: Build and Publish
 
+<<<<<<< HEAD
 on: 
+=======
+on:
+>>>>>>> dev
   workflow_dispatch:
   push:
     branches:
       - main
+<<<<<<< HEAD
 
+=======
+
+>>>>>>> dev
 jobs:
   build:
     name: Build and Deploy
     runs-on: ubuntu-latest
+<<<<<<< HEAD
 
     steps:
       - uses: actions/checkout@v3
 
+=======
+
+    steps:
+      - uses: actions/checkout@v3
+
+>>>>>>> dev
       - name: Setup Node
         uses: actions/setup-node@v1
         with:
           node-version: 16
 
       - name: Install dependencies
         uses: bahmutov/npm-install@v1
+<<<<<<< HEAD
 
       - name: Build Project
         run: npm run build
 
+=======
+
+      - name: Build Project
+        run: npm run build
+
+>>>>>>> dev
       - name: Copy to webserver folder
         uses: appleboy/[email protected]
         with:

diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,4 @@
+{
+  "plugins": ["prettier-plugin-svelte"],
+  "overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }]
+}
diff --git a/README.md b/README.md
@@ -1,6 +1,10 @@
 # Nathan Jodoin - Resume Site
 
 ### UNDER CONSTRUCTION
+<<<<<<< HEAD
+=======
+
+>>>>>>> dev
 Currently this is just a slightly modified Sveltkit template.
 I have been working on other personal projects in the meantime, including maintaining a fork of
 [polybar-spotify-module](https://github.com/corigne/polybar-spotify-module)
@@ -11,6 +15,7 @@ I will be turning the resume site into a feature rich blog, and interactive resu
 I'm also working on a new polybar module in rust for handling music players via dbus.
 
 ## CI/CD Deployment Status
+<<<<<<< HEAD
 ![Build and Publish Workflow Status](https://github.com/corigne/misfits/actions/workflows/build.yml/badge.svg)
 
 ## Features
@@ -23,6 +28,23 @@ I'm also working on a new polybar module in rust for handling music players via
 - Svelte  
 - Vite  
 - nodejs 
+=======
+
+![Build and Publish Workflow Status](https://github.com/corigne/misfits/actions/workflows/build.yml/badge.svg)
+
+## Features
+
+- Persistent Click Counter
+- TODO: Database Functionality
+- CI/CD
+
+## Tools Used
+
+- Sveltekit
+- Svelte
+- Vite
+- nodejs
+>>>>>>> dev
 - Github Actions
 - AWS Lightsail
 - Neovim
diff --git a/eslint.config.js b/eslint.config.js
@@ -1,12 +1,25 @@
+<<<<<<< HEAD
 import eslintPluginSvelte from 'eslint-plugin-svelte';
 export default [
   // add more generic rule sets here, such as:
   // js.configs.recommended,
   ...eslintPluginSvelte.configs['flat/recommended'],
+=======
+import eslintPluginSvelte from "eslint-plugin-svelte";
+export default [
+  // add more generic rule sets here, such as:
+  // js.configs.recommended,
+  ...eslintPluginSvelte.configs["flat/recommended"],
+>>>>>>> dev
   {
     rules: {
       // override/add rules settings here, such as:
       // 'svelte/rule-name': 'error'
+<<<<<<< HEAD
     }
   }
+=======
+    },
+  },
+>>>>>>> dev
 ];
diff --git a/index.html b/index.html
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 <!DOCTYPE html>
+=======
+<!doctype html>
+>>>>>>> dev
 <html lang="en">
   <head>
     <meta charset="UTF-8" />

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -7,17 +7,33 @@
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview",
+<<<<<<< HEAD
     "check": "svelte-check --tsconfig ./tsconfig.json"
+=======
+    "check": "svelte-check --tsconfig ./tsconfig.json",
+    "format": "prettier --write ."
+>>>>>>> dev
   },
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "^2.0.3",
     "@tsconfig/svelte": "^4.0.1",
     "eslint": "^9.2.0",
     "eslint-plugin-svelte": "^2.38.0",
+<<<<<<< HEAD
+=======
+    "prettier": "^3.2.5",
+    "prettier-plugin-svelte": "^3.2.3",
+>>>>>>> dev
     "svelte": "^3.59.2",
     "svelte-check": "^2.10.3",
     "tslib": "^2.5.0",
     "typescript": "^5.0.2",
     "vite": "^4.3.2"
+<<<<<<< HEAD
+=======
+  },
+  "dependencies": {
+    "svelte-nerdfonts": "^1.0.3"
+>>>>>>> dev
   }
 }
diff --git a/src/App.svelte b/src/App.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+<<<<<<< HEAD
   import svelteLogo from './assets/svelte.svg'
   import viteLogo from '/vite.svg'
   import carp from './assets/carp.jpg'
@@ -12,6 +13,18 @@
       Resume Under Construction...
     </h2>
     <img src={carp} alt="A carp.">
+=======
+  import svelteLogo from "./assets/svelte.svg";
+  import viteLogo from "/vite.svg";
+  import carp from "./assets/carp.jpg";
+  import Counter from "./lib/Counter.svelte";
+</script>
+
+<main>
+  <div>
+    <h2>Resume Under Construction...</h2>
+    <img src={carp} alt="A carp." />
+>>>>>>> dev
   </div>
 
   <div class="card">
@@ -27,11 +40,17 @@
     </a>
     <h3>Built with Vite & Svelte</h3>
   </div>
+<<<<<<< HEAD
 
 </main>
 
 <style>
 
+=======
+</main>
+
+<style>
+>>>>>>> dev
   .logo {
     height: 3em;
     padding: 1em;
@@ -44,5 +63,8 @@
   .logo.svelte:hover {
     filter: drop-shadow(0 0 2em #ff3e00aa);
   }
+<<<<<<< HEAD
 
+=======
+>>>>>>> dev
 </style>
diff --git a/src/lib/Counter.svelte b/src/lib/Counter.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+<<<<<<< HEAD
   let count: number = parseInt(localStorage.getItem("click_count"))
 
   if (!count) {
@@ -17,5 +18,24 @@
 </script>
 
 <button on:click={increment} on:load={load_count} >
+=======
+  let count: number = parseInt(localStorage.getItem("click_count"));
+
+  if (!count) {
+    count = 0;
+  }
+
+  const increment = () => {
+    count += 1;
+    localStorage.setItem("click_count", count);
+  };
+
+  const load_count = () => {
+    count = localStorage.getItem("click_count");
+  };
+</script>
+
+<button on:click={increment} on:load={load_count}>
+>>>>>>> dev
   count is {count}
 </button>
diff --git a/src/main.ts b/src/main.ts
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 import './app.css'
 import App from './App.svelte'
 
@@ -6,3 +7,13 @@ const app = new App({
 })
 
 export default app
+=======
+import "./app.css";
+import App from "./App.svelte";
+
+const app = new App({
+  target: document.getElementById("app"),
+});
+
+export default app;
+>>>>>>> dev
diff --git a/svelte.config.js b/svelte.config.js
@@ -1,7 +1,15 @@
+<<<<<<< HEAD
 import { vitePreprocess } from '@sveltejs/vite-plugin-svelte'
+=======
+import { vitePreprocess } from "@sveltejs/vite-plugin-svelte";
+>>>>>>> dev
 
 export default {
   // Consult https://svelte.dev/docs#compile-time-svelte-preprocess
   // for more information about preprocessors
   preprocess: vitePreprocess(),
+<<<<<<< HEAD
 }
+=======
+};
+>>>>>>> dev
diff --git a/vite.config.ts b/vite.config.ts
@@ -1,7 +1,16 @@
+<<<<<<< HEAD
 import { defineConfig } from 'vite'
 import { svelte } from '@sveltejs/vite-plugin-svelte'
+=======
+import { defineConfig } from "vite";
+import { svelte } from "@sveltejs/vite-plugin-svelte";
+>>>>>>> dev
 
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [svelte()],
+<<<<<<< HEAD
 })
+=======
+});
+>>>>>>> dev