diff --git a/@types/index.d.ts b/@types/index.d.ts deleted file mode 100644 index 05d978a..0000000 --- a/@types/index.d.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { NuxtAxiosInstance } from '@nuxtjs/axios' -import VueI18n, {IVueI18n} from "vue-i18n"; -import {ColorModeInstance} from "@nuxtjs/color-mode/types/color-mode"; -import {NuxtApp} from "@nuxt/types/app"; -import {NuxtStorage} from "@nuxtjs/universal-storage"; - -declare module 'vue/types/vue' { - - interface Vue { - $axios: NuxtAxiosInstance, - i18n: VueI18n & IVueI18n - } -} -declare module '@nuxt/types' { - - interface NuxtAppOptions { - $axios: NuxtAxiosInstance, - i18n: VueI18n & IVueI18n - } - - interface Context { - $axios: NuxtAxiosInstance, - i18n: VueI18n & IVueI18n - $colorMode: ColorModeInstance, - $app: NuxtApp, - $storage: NuxtStorage - } -} - -declare module 'vuex/types/index' { - interface Store { - $axios: NuxtAxiosInstance, - i18n: VueI18n & IVueI18n - } -} diff --git a/@types/types.ts b/@types/types.ts deleted file mode 100644 index ac0cb8c..0000000 --- a/@types/types.ts +++ /dev/null @@ -1,64 +0,0 @@ -interface Form { - email: string, - name: string, - content: string, - subject: string -} - -interface InfoData { - age: number - hiring: { - status: string, - color: string - } -} - -interface Skill { - title: string, - color: string, - cover: string, - slug: string -} - -interface Experience { - slug: string, - title: string, - company: string, - location: string, - begin_date: string, - end_date: string -} - -interface Formation { - slug: string, - title: string, - description: string, - location: string, - begin_date: string, - end_date: string -} - -interface Tag { - slug: string -} - -interface Post { - slug: string, - title: string, - description: string, - reading_time: number, - tags: Array, - cover: string, - date: string -} - -interface Project { - slug: string, - title: string, - description: string, - url: string, - cover: string, - tags: Array, -} - -export { Form, InfoData, Skill, Experience, Formation, Post, Tag, Project } diff --git a/@types/vue-shim.d.ts b/@types/vue-shim.d.ts deleted file mode 100644 index d9f24fa..0000000 --- a/@types/vue-shim.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -declare module '*.vue' { - import Vue from 'vue' - export default Vue -} diff --git a/package.json b/package.json index d9a6f2d..1fbb2e7 100644 --- a/package.json +++ b/package.json @@ -10,26 +10,32 @@ }, "dependencies": { "@nuxt/content": "^1.14.0", - "@nuxtjs/axios": "^5.13.1", + "@nuxtjs/axios": "^5.13.5", "@nuxtjs/composition-api": "0.23.4", "@nuxtjs/dotenv": "^1.4.1", "@nuxtjs/redirect-module": "^0.3.1", "@nuxtjs/robots": "^2.5.0", - "@nuxtjs/sentry": "^5.0.3", + "@nuxtjs/sentry": "^5.1.0", "@nuxtjs/sitemap": "^2.4.0", "@nuxtjs/universal-storage": "^0.5.9", - "core-js": "^3.12.1", - "nuxt": "^2.15.5", + "core-js": "^3.13.1", + "ipx": "^0.6.1", + "nuxt": "^2.15.6", "nuxt-i18n": "^6.27.0", "prism-themes": "^1.7.0", - "sass": "^1.32.12", - "windicss": "^2.5.14" + "sass": "^1.34.0", + "windicss": "^3.0.12" }, "devDependencies": { - "@nuxt/types": "^2.15.5", + "@nuxt/types": "^2.15.6", "@nuxt/typescript-build": "^2.1.0", - "@nuxtjs/color-mode": "^2.0.5", - "nuxt-windicss": "^0.6.0", - "sass-loader": "10.1.1" + "@nuxtjs/color-mode": "^2.0.9", + "markdown-it-prism": "^2.1.6", + "nuxt-vite": "^0.1.1", + "nuxt-windicss": "^0.8.2", + "sass-loader": "10.1.1", + "vite-plugin-components": "^0.10.4", + "vite-plugin-md": "^0.6.7", + "vite-plugin-windicss": "^0.16.7" } } diff --git a/settings/BuildModules.ts b/settings/BuildModules.ts index 1c17d58..e363d1c 100644 --- a/settings/BuildModules.ts +++ b/settings/BuildModules.ts @@ -1,5 +1,10 @@ // Modules for dev and build (recommended): https://go.nuxtjs.dev/config-modules import {NuxtOptionsModule} from "@nuxt/types/config/module"; +import {resolve} from 'path' +import ViteComponents from 'vite-plugin-components' +import WindiCSS from 'vite-plugin-windicss' +import Markdown from 'vite-plugin-md' +import Prism from 'markdown-it-prism' const color_mode = { preference: 'system', @@ -32,9 +37,39 @@ const windicss = { } } +const vite = { + vue: { + include: [/\.vue$/, /\.md$/], + }, + plugins: [ + ViteComponents({ + dirs: [ + resolve('./components'), + ], + extensions: ['vue', 'md'], + customLoaderMatcher: path => path.endsWith('.md'), + }), + WindiCSS({ + scan: { + dirs: [ + resolve('./pages'), + resolve('./components'), + ], + }, + }), + Markdown({ + markdownItSetup(md) { + md.use(Prism) + }, + }), + ], + ssr: true +} + export default [ '@nuxt/typescript-build', '@nuxtjs/composition-api/module', ['nuxt-windicss', windicss], ['@nuxtjs/color-mode', color_mode], + //['nuxt-vite', vite] ] as NuxtOptionsModule[] diff --git a/settings/Modules.ts b/settings/Modules.ts index 820fe46..5a99c48 100644 --- a/settings/Modules.ts +++ b/settings/Modules.ts @@ -99,5 +99,5 @@ export default [ ['@nuxtjs/sitemap', sitemap], ['@nuxtjs/redirect-module', redirect], ['@nuxtjs/dotenv', env], - ['@nuxtjs/sentry', sentry] + ['@nuxtjs/sentry', sentry], ] as NuxtOptionsModule[] diff --git a/settings/Plugins.ts b/settings/Plugins.ts index 5bd91da..c8e40b7 100644 --- a/settings/Plugins.ts +++ b/settings/Plugins.ts @@ -1,4 +1,9 @@ // Plugins to run before rendering page: https://go.nuxtjs.dev/config-plugins export default [ - { src: '~/plugins/i18n.ts' } + { + src: '~/plugins/i18n.ts' + }, + { + src: '~/plugins/main.ts', + } ] diff --git a/src/assets/css/style.scss b/src/assets/css/style.scss index b3c1df6..0f7711e 100644 --- a/src/assets/css/style.scss +++ b/src/assets/css/style.scss @@ -21,7 +21,6 @@ body { @apply dark:(bg-dark-800 text-white) border dark:border-white border-black border-solid; } -//TODO remove with windicss/typography .nuxt-content-container, .nuxt-content { p { @apply text-gray-700 dark:text-gray-400 diff --git a/src/static/favicon.ico b/src/assets/images/favicon.ico similarity index 100% rename from src/static/favicon.ico rename to src/assets/images/favicon.ico diff --git a/src/static/favicon.png b/src/assets/images/favicon.png similarity index 100% rename from src/static/favicon.png rename to src/assets/images/favicon.png diff --git a/src/assets/images/socials/twitch.svg b/src/assets/images/socials/twitch.svg index 1d90555..93a085c 100644 --- a/src/assets/images/socials/twitch.svg +++ b/src/assets/images/socials/twitch.svg @@ -1,9 +1,8 @@ - - - + + + diff --git a/src/assets/images/socials/twitter.svg b/src/assets/images/socials/twitter.svg index 8d984bc..b3acfff 100644 --- a/src/assets/images/socials/twitter.svg +++ b/src/assets/images/socials/twitter.svg @@ -1 +1,2 @@ -twitter-original \ No newline at end of file + + diff --git a/src/components/AboutHome.vue b/src/components/AboutHome.vue index 493fce6..707462c 100644 --- a/src/components/AboutHome.vue +++ b/src/components/AboutHome.vue @@ -2,7 +2,7 @@
- It's me ! + It's me !

@@ -21,7 +21,7 @@