From 47b7accdf7e6ed8609a14108ea1acfb4e1465069 Mon Sep 17 00:00:00 2001 From: Nicholas Ciechanowski Date: Mon, 9 Oct 2023 22:06:44 +1100 Subject: [PATCH 1/3] feat: clean up vite --- package.json | 15 +++++++++++++-- vite.config.js | 8 -------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index af1f575..59e9470 100644 --- a/package.json +++ b/package.json @@ -2,9 +2,16 @@ "private": true, "type": "module", "scripts": { - "dev": "vite --host", - "build": "vite build" + "dev": "npm run development", + "development": "vue-tsc --noEmit && NODE_ENV=development vite build --sourcemap -m development", + "watch": "vite build -m development --watch", + "prod": "npm run production", + "production": "vue-tsc --noEmit && NODE_ENV=production vite build -m production", + "lint": "eslint --ext .js,.ts,.vue --fix resources/js" }, + "browserslist": [ + "last 3 versions" + ], "devDependencies": { "@tailwindcss/forms": "^0.5.2", "autoprefixer": "^10.4.2", @@ -13,5 +20,9 @@ "postcss": "^8.4.6", "tailwindcss": "^3.1.0", "vite": "^4.0.0" + }, + "dependencies": { + "@fontsource/cooper-hewitt": "^5.0.7", + "@fortawesome/fontawesome-free": "^6.4.2" } } diff --git a/vite.config.js b/vite.config.js index 7337f42..89f26f5 100644 --- a/vite.config.js +++ b/vite.config.js @@ -11,12 +11,4 @@ export default defineConfig({ refresh: true, }), ], - server: { - hmr: { - host: '10.6.9.126', - }, - watch: { - usePolling: true, - }, - } }); From e8d97c62c812769e8a569cfc5173d983c9843a3b Mon Sep 17 00:00:00 2001 From: Nicholas Ciechanowski Date: Mon, 9 Oct 2023 22:07:13 +1100 Subject: [PATCH 2/3] feat: add nexi font --- package-lock.json | 20 +++++++++++++++++++- resources/css/_fonts.scss | 9 +++++++++ tailwind.config.js | 3 ++- 3 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 resources/css/_fonts.scss diff --git a/package-lock.json b/package-lock.json index 73ad443..f7a3428 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,9 +1,13 @@ { - "name": "priceybot", + "name": "html", "lockfileVersion": 3, "requires": true, "packages": { "": { + "dependencies": { + "@fontsource/cooper-hewitt": "^5.0.7", + "@fortawesome/fontawesome-free": "^6.4.2" + }, "devDependencies": { "@tailwindcss/forms": "^0.5.2", "autoprefixer": "^10.4.2", @@ -378,6 +382,20 @@ "node": ">=12" } }, + "node_modules/@fontsource/cooper-hewitt": { + "version": "5.0.7", + "resolved": "https://registry.npmjs.org/@fontsource/cooper-hewitt/-/cooper-hewitt-5.0.7.tgz", + "integrity": "sha512-TDbBV/TJGWeHxuBKIgF+yq1sQcOvRswEF0kwJ07FbEXEWYW4fR3uqrpMrGmlUWQKoMlSgo6EKe+u5dr3rJhrnQ==" + }, + "node_modules/@fortawesome/fontawesome-free": { + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.2.tgz", + "integrity": "sha512-m5cPn3e2+FDCOgi1mz0RexTUvvQibBebOUlUlW0+YrMjDTPkiJ6VTKukA1GRsvRw+12KyJndNjj0O4AgTxm2Pg==", + "hasInstallScript": true, + "engines": { + "node": ">=6" + } + }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", diff --git a/resources/css/_fonts.scss b/resources/css/_fonts.scss new file mode 100644 index 0000000..64d15c3 --- /dev/null +++ b/resources/css/_fonts.scss @@ -0,0 +1,9 @@ +// Cooper Hewitt +@import "@fontsource/cooper-hewitt/latin.css"; + +// Font Awesome +$fa-font-path: "@fortawesome/fontawesome-free/webfonts"; +@import '@fortawesome/fontawesome-free/scss/fontawesome'; +@import '@fortawesome/fontawesome-free/scss/regular'; +@import '@fortawesome/fontawesome-free/scss/solid'; +@import '@fortawesome/fontawesome-free/scss/brands'; \ No newline at end of file diff --git a/tailwind.config.js b/tailwind.config.js index 886cbb7..8fe4d9f 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -46,7 +46,8 @@ export default { 'nexi-orange': "rgb(241, 124, 37)", }, fontFamily: { - sans: ['Figtree', ...defaultTheme.fontFamily.sans], + sans: ['Cooper Hewitt', ...defaultTheme.fontFamily.sans], + serif: ['Cooper Hewitt', ...defaultTheme.fontFamily.sans], }, }, }, From 5f4ed6228f687ad660627427cbae172504f8d5f5 Mon Sep 17 00:00:00 2001 From: Nicholas Ciechanowski Date: Mon, 9 Oct 2023 22:07:34 +1100 Subject: [PATCH 3/3] fix: dark mode issues kyle found --- resources/views/components/darkmode.blade.php | 8 ++++---- resources/views/layouts/app.blade.php | 2 +- resources/views/layouts/guest.blade.php | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/views/components/darkmode.blade.php b/resources/views/components/darkmode.blade.php index 284dd66..bc2badb 100644 --- a/resources/views/components/darkmode.blade.php +++ b/resources/views/components/darkmode.blade.php @@ -1,5 +1,5 @@
- - +
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 5f951f0..1c398d3 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -1,5 +1,5 @@ -getLocale()) }}" +