From f4ef664f0b2525a4de5b39316784a68f6c1f054a Mon Sep 17 00:00:00 2001 From: Nick Bland Date: Fri, 19 Apr 2024 14:20:02 +1000 Subject: [PATCH] Prettier Format + Add in formatting config, and apply --- .prettierrc | 11 +++++ bun.lockb | Bin 167770 -> 167770 bytes package.json | 2 +- postcss.config.js | 2 +- src/app.css | 6 +-- src/app.d.ts | 14 +++---- src/app.html | 22 +++++----- src/components/countdown.svelte | 4 +- src/components/divider.svelte | 57 +++++++------------------- src/routes/+layout.svelte | 2 +- src/routes/api/healthcheck/+server.ts | 4 +- src/routes/portfolio/+page.svelte | 53 +++++++++++------------- svelte.config.js | 22 +++++----- tsconfig.json | 32 +++++++-------- vite.config.ts | 6 +-- 15 files changed, 108 insertions(+), 129 deletions(-) create mode 100644 .prettierrc diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..6701bb1 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,11 @@ +{ + "arrowParens": "avoid", + "singleQuote": false, + "printWidth": 90, + "plugins": ["prettier-plugin-svelte"], + "semi": true, + "svelteSortOrder": "options-styles-scripts-markup", + "svelteStrictMode": false, + "svelteBracketNewLine": true, + "svelteIndentScriptAndStyle": true +} diff --git a/bun.lockb b/bun.lockb index 49dc54fc23eb5d5da6804a98af1a14fabc0deaae..2d477febca8521490b54331392bea42680a52bea 100755 GIT binary patch delta 172 zcmcaLkL%Vvt_gYy8Nvlj+ssT$N?D3O8TO?M^a|WjwZ2_z^|8Zu&o#44GdB9o@|(Ou z*I=`RzwS(j1GDzHz5FB=I%n}xlZdI62QKuyw{jF+DfE6Rqvy`e23hGvllFeN=D@np zZu8DRf0z$*xcbT#>@=FS&tUs(r`v+lHn+Z5bXAdw0SeXuX)y+dhF7V#0%syj{e~&-c;@{X;F0xUzh2T2$J diff --git a/package.json b/package.json index 86f6ee3..9111082 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "eslint-plugin-svelte": "^2.36.0", "postcss": "^8.4.38", "prettier": "^3.2.5", - "prettier-plugin-svelte": "^3.2.2", + "prettier-plugin-svelte": "^3.2.3", "svelte": "^4.2.12", "svelte-check": "^3.6.9", "tailwindcss": "^3.4.3", diff --git a/postcss.config.js b/postcss.config.js index 2e7af2b..2aa7205 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -3,4 +3,4 @@ export default { tailwindcss: {}, autoprefixer: {}, }, -} +}; diff --git a/src/app.css b/src/app.css index 0f694d6..54d0fd6 100644 --- a/src/app.css +++ b/src/app.css @@ -3,6 +3,6 @@ @tailwind utilities; .height-minus-nav { - min-height: calc(100vh - 4.75rem); - /* this is the full view height - the navbar(4rem + 0.75rem padding) */ -} \ No newline at end of file + min-height: calc(100vh - 4.75rem); + /* this is the full view height - the navbar(4rem + 0.75rem padding) */ +} diff --git a/src/app.d.ts b/src/app.d.ts index d712a34..103486c 100644 --- a/src/app.d.ts +++ b/src/app.d.ts @@ -1,13 +1,13 @@ // See https://kit.svelte.dev/docs/types#app // for information about these interfaces declare global { - namespace App { - interface Error {} - // interface Locals {} - // interface PageData {} - // interface PageState {} - // interface Platform {} - } + namespace App { + interface Error {} + // interface Locals {} + // interface PageData {} + // interface PageState {} + // interface Platform {} + } } export {}; diff --git a/src/app.html b/src/app.html index effef91..107ae2b 100644 --- a/src/app.html +++ b/src/app.html @@ -1,12 +1,12 @@ - + - - - - - %sveltekit.head% - - -
%sveltekit.body%
- - \ No newline at end of file + + + + + %sveltekit.head% + + +
%sveltekit.body%
+ + diff --git a/src/components/countdown.svelte b/src/components/countdown.svelte index fc9ea5a..2ed3341 100644 --- a/src/components/countdown.svelte +++ b/src/components/countdown.svelte @@ -35,9 +35,7 @@

Time to Graduation

-
+
diff --git a/src/components/divider.svelte b/src/components/divider.svelte index ba6c0d5..f4291cf 100644 --- a/src/components/divider.svelte +++ b/src/components/divider.svelte @@ -6,52 +6,25 @@ > - - + + - - - - - + + + + diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 1eed466..c63a57d 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -8,4 +8,4 @@ -
\ No newline at end of file +
diff --git a/src/routes/api/healthcheck/+server.ts b/src/routes/api/healthcheck/+server.ts index 647de08..ef99279 100644 --- a/src/routes/api/healthcheck/+server.ts +++ b/src/routes/api/healthcheck/+server.ts @@ -1,5 +1,5 @@ import type { RequestHandler } from "./$types"; export const GET: RequestHandler = ({ url }) => { - return new Response(); -}; \ No newline at end of file + return new Response(); +}; diff --git a/src/routes/portfolio/+page.svelte b/src/routes/portfolio/+page.svelte index fee89ee..83d1bad 100644 --- a/src/routes/portfolio/+page.svelte +++ b/src/routes/portfolio/+page.svelte @@ -1,6 +1,7 @@
my name is Nick

- I am an IT Student at Griffith University with a passion for developing - neat things. + I am an IT Student at Griffith University with a passion for developing neat + things.

- +

About Me

- Since 2014, I've had an interest in programming and making things. I've made - this portfolio as a place for me to collate and show off some of the work that - I've done. + Since 2014, I've had an interest in programming and making things. I've made this + portfolio as a place for me to collate and show off some of the work that I've done.

- At the moment, I've returned back to Uni to finish my degree after achieving a - point in my career that I am happy with. With the experience I've gained, and - after finishing my studies, my plan is to work in the cybersecurity field. + At the moment, I've returned back to Uni to finish my degree after achieving a point in + my career that I am happy with. With the experience I've gained, and after finishing my + studies, my plan is to work in the cybersecurity field.

-

- Education & Goals -

+

Education & Goals

- I am currently studying a Bachelor of Information Technology at Griffith - University, opting for a no major or minor option. Having previously studied - Computer Science at QUT from 2019-2021, I decided to take a break from study - and focus on work experience. As of 2023, I returned to studying at Griffith - using the experiences I gained from both QUT and from work. + I am currently studying a Bachelor of Information Technology at Griffith University, + opting for a no major or minor option. Having previously studied Computer Science at QUT + from 2019-2021, I decided to take a break from study and focus on work experience. As of + 2023, I returned to studying at Griffith using the experiences I gained from both QUT + and from work.

- From my previous work experience, employers look more for relevant skills and - industry knowledge over the type of degree or the majors and minors you study. - The mentorship I gained from those jobs was what influenced me to change my - degree over, and to not choose a major. + From my previous work experience, employers look more for relevant skills and industry + knowledge over the type of degree or the majors and minors you study. The mentorship I + gained from those jobs was what influenced me to change my degree over, and to not + choose a major.

- As time has progressed, my goals and ambitions have also adapted. Initially, I - wanted to be a systems administrator. Upon reaching that goal, I shifted my - gaze to what I wanted to do work towards, setting on cybersecurity. Given that - the industry is ever-changing, I felt it appropriate to not hem myself in to a - single major or minor. + As time has progressed, my goals and ambitions have also adapted. Initially, I wanted to + be a systems administrator. Upon reaching that goal, I shifted my gaze to what I wanted + to do work towards, setting on cybersecurity. Given that the industry is ever-changing, + I felt it appropriate to not hem myself in to a single major or minor.

+ +

Skills

diff --git a/svelte.config.js b/svelte.config.js index 2b35fe1..84b8c1a 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -1,18 +1,18 @@ -import adapter from '@sveltejs/adapter-auto'; -import { vitePreprocess } from '@sveltejs/vite-plugin-svelte'; +import adapter from "@sveltejs/adapter-auto"; +import { vitePreprocess } from "@sveltejs/vite-plugin-svelte"; /** @type {import('@sveltejs/kit').Config} */ const config = { - // Consult https://kit.svelte.dev/docs/integrations#preprocessors - // for more information about preprocessors - preprocess: vitePreprocess(), + // Consult https://kit.svelte.dev/docs/integrations#preprocessors + // for more information about preprocessors + preprocess: vitePreprocess(), - kit: { - // adapter-auto only supports some environments, see https://kit.svelte.dev/docs/adapter-auto for a list. - // If your environment is not supported or you settled on a specific environment, switch out the adapter. - // See https://kit.svelte.dev/docs/adapters for more information about adapters. - adapter: adapter() - } + kit: { + // adapter-auto only supports some environments, see https://kit.svelte.dev/docs/adapter-auto for a list. + // If your environment is not supported or you settled on a specific environment, switch out the adapter. + // See https://kit.svelte.dev/docs/adapters for more information about adapters. + adapter: adapter(), + }, }; export default config; diff --git a/tsconfig.json b/tsconfig.json index 82081ab..34aadc0 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,18 +1,18 @@ { - "extends": "./.svelte-kit/tsconfig.json", - "compilerOptions": { - "allowJs": true, - "checkJs": true, - "esModuleInterop": true, - "forceConsistentCasingInFileNames": true, - "resolveJsonModule": true, - "skipLibCheck": true, - "sourceMap": true, - "strict": true, - "moduleResolution": "bundler" - } - // Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias - // - // If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes - // from the referenced tsconfig.json - TypeScript does not merge them in + "extends": "./.svelte-kit/tsconfig.json", + "compilerOptions": { + "allowJs": true, + "checkJs": true, + "esModuleInterop": true, + "forceConsistentCasingInFileNames": true, + "resolveJsonModule": true, + "skipLibCheck": true, + "sourceMap": true, + "strict": true, + "moduleResolution": "bundler" + } + // Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias + // + // If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes + // from the referenced tsconfig.json - TypeScript does not merge them in } diff --git a/vite.config.ts b/vite.config.ts index bbf8c7d..80864b9 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,6 +1,6 @@ -import { sveltekit } from '@sveltejs/kit/vite'; -import { defineConfig } from 'vite'; +import { sveltekit } from "@sveltejs/kit/vite"; +import { defineConfig } from "vite"; export default defineConfig({ - plugins: [sveltekit()] + plugins: [sveltekit()], });