diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7be59a0..3b29dfd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,19 +1,34 @@ 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: @@ -21,10 +36,17 @@ jobs: - 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/scp-action@v0.1.4 with: diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..6b78363 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,4 @@ +{ + "plugins": ["prettier-plugin-svelte"], + "overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }] +} diff --git a/README.md b/README.md index 36e1b79..cae86b6 100644 --- 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 index 2d79a39..3e84e80 100644 --- 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 index ce41ead..d15deb1 100644 --- a/index.html +++ b/index.html @@ -1,4 +1,8 @@ +<<<<<<< HEAD +======= + +>>>>>>> dev diff --git a/package-lock.json b/package-lock.json index 9960e35..80de0c9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,11 +7,22 @@ "": { "name": "misfits", "version": "0.0.0", +<<<<<<< HEAD +======= + "dependencies": { + "svelte-nerdfonts": "^1.0.3" + }, +>>>>>>> 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", @@ -1888,6 +1899,34 @@ "node": ">= 0.8.0" } }, +<<<<<<< HEAD +======= + "node_modules/prettier": { + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", + "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", + "dev": true, + "bin": { + "prettier": "bin/prettier.cjs" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, + "node_modules/prettier-plugin-svelte": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-3.2.3.tgz", + "integrity": "sha512-wJq8RunyFlWco6U0WJV5wNCM7zpBFakS76UBSbmzMGpncpK98NZABaE+s7n8/APDCEVNHXC5Mpq+MLebQtsRlg==", + "dev": true, + "peerDependencies": { + "prettier": "^3.0.0", + "svelte": "^3.2.0 || ^4.0.0-next.0 || ^5.0.0-next.0" + } + }, +>>>>>>> dev "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", @@ -2358,6 +2397,14 @@ "svelte": "^3.19.0 || ^4.0.0" } }, +<<<<<<< HEAD +======= + "node_modules/svelte-nerdfonts": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/svelte-nerdfonts/-/svelte-nerdfonts-1.0.3.tgz", + "integrity": "sha512-/54CyC50n1eDPgsz79nMheYGYALKndMeXPvbstB7f/VxPconR6pIiAWnA0dwy+GBEUkJ6cW0GSp6svsv836sWg==" + }, +>>>>>>> dev "node_modules/text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", diff --git a/package.json b/package.json index 0d42110..0772379 100644 --- 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 index 15c6579..a6157fe 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -1,4 +1,5 @@ + +
+
+

Resume Under Construction...

+ A carp. +>>>>>>> dev
@@ -27,11 +40,17 @@

Built with Vite & Svelte

+<<<<<<< HEAD
diff --git a/src/lib/Counter.svelte b/src/lib/Counter.svelte index e09a3e8..8bab4f5 100644 --- a/src/lib/Counter.svelte +++ b/src/lib/Counter.svelte @@ -1,4 +1,5 @@ diff --git a/src/main.ts b/src/main.ts index 8a909a1..eea8808 100644 --- 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 index b0683fd..251ec5b 100644 --- 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 index d701969..2430ad1 100644 --- 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