Skip to content

Commit

Permalink
Dependencies downgrade (#15)
Browse files Browse the repository at this point in the history
* fix: downgrade to nuxt/content 2.8.1

* fix: adjust versions

* fix: fix nuxt build conflict

* fix: downgrade nuxt

* feat: move image locations to public

* fix: update image imports

* fix: set provider to ipx explicitly

* fix: try nuxt 3.6.5

* fix: fix blog images

* fix: downgrade nuxt-simple-sitemap

* fix: update image size
  • Loading branch information
alexgrozav authored Nov 7, 2023
1 parent dcea672 commit 91a2da6
Show file tree
Hide file tree
Showing 63 changed files with 2,884 additions and 5,629 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ dist
dist-ssr
.vite-ssg-dist
.vite-ssg-temp
public/assets/images/blog

# Generated
src/components.d.ts
Expand Down
6 changes: 5 additions & 1 deletion components/app/Error.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ export default defineComponent({
<IContainer class="app-error">
<IRow>
<IColumn>
<NuxtImg class="image -fluid" src="/images/illustrations/404.svg" alt="Error 404" />
<NuxtImg
class="image -fluid"
src="/assets/images/illustrations/404.svg"
alt="Error 404"
/>
<h1 class="d5 _margin-top:1/2">
{{ t('errors.404.title') }}
</h1>
Expand Down
4 changes: 2 additions & 2 deletions components/app/Navbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import { useI18n } from 'vue-i18n';
import { useLocalePath } from 'vue-i18n-routing';
import { useNavbarNavigation, useSidebarNavigation, useTelemetry } from '~/composables';
import { off, on } from '@grozav/utils';
import logoBlack from '~/assets/images/logo/logo-black.svg';
import logoWhite from '~/assets/images/logo/logo-white.svg';
import logoBlack from '~/public/assets/images/logo/logo-black.svg';
import logoWhite from '~/public/assets/images/logo/logo-white.svg';
import { useRoute } from 'vue-router';
export default defineComponent({
Expand Down
4 changes: 2 additions & 2 deletions components/cards/OsAwards.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts">
import { computed, defineComponent } from 'vue';
import logoWhite from '~/assets/images/brands/osawards-white.svg';
import logoBlack from '~/assets/images/brands/osawards-black.svg';
import logoWhite from '~/public/assets/images/brands/osawards-white.svg';
import logoBlack from '~/public/assets/images/brands/osawards-black.svg';
import { useComponentColor } from '@inkline/inkline';
const componentName = 'OsAwards';
Expand Down
6 changes: 3 additions & 3 deletions components/headers/IndexPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ const today = new Date();
const year = today.getFullYear();
const seasonalThemes: SeasonalTheme[] = [
{
image: '/images/header/index-christmas.svg',
image: '/assets/images/header/index-christmas.svg',
from: new Date(year, 0, 1),
to: new Date(year, 0, 10)
},
{
image: '/images/header/index-christmas.svg',
image: '/assets/images/header/index-christmas.svg',
from: new Date(year, 11, 1),
to: new Date(year, 11, 31)
}
];
const defaultImage = '/images/header/index.svg';
const defaultImage = '/assets/images/header/index.svg';
export default defineComponent({
setup() {
Expand Down
2 changes: 1 addition & 1 deletion components/sections/Newsletter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default defineComponent({
<SectionsComponentsSection class="newsletter-section">
<NuxtImg
class="newsletter-image"
src="/images/illustrations/pro-preview.svg"
src="/assets/images/illustrations/pro-preview.svg"
alt="Inkline Pro - Preview"
/>
<IRow>
Expand Down
16 changes: 8 additions & 8 deletions components/sections/Sponsors.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ const sponsors = [
name: 'VueSchool',
url: 'https://vueschool.io',
image: {
light: '/images/sponsors/vueschool-light.png',
dark: '/images/sponsors/vueschool-dark.png',
light: '/assets/images/sponsors/vueschool-light.png',
dark: '/assets/images/sponsors/vueschool-dark.png',
height: 60,
width: 282
}
Expand All @@ -17,8 +17,8 @@ const sponsors = [
name: 'DigitalOcean',
url: 'https://m.do.co/c/b3ab46156be7',
image: {
light: '/images/sponsors/digitalocean-light.png',
dark: '/images/sponsors/digitalocean-dark.png',
light: '/assets/images/sponsors/digitalocean-light.png',
dark: '/assets/images/sponsors/digitalocean-dark.png',
height: 60,
width: 358
}
Expand All @@ -27,8 +27,8 @@ const sponsors = [
name: 'Icons8',
url: 'https://icons8.com?ref=alexgrozav',
image: {
light: '/images/sponsors/icons8-light.png',
dark: '/images/sponsors/icons8-dark.png',
light: '/assets/images/sponsors/icons8-light.png',
dark: '/assets/images/sponsors/icons8-dark.png',
height: 60,
width: 195
}
Expand All @@ -47,8 +47,8 @@ const sponsors = [
name: 'Nuxt',
url: 'https://nuxtjs.org',
image: {
light: '/images/sponsors/nuxt-light.png',
dark: '/images/sponsors/nuxt-dark.png',
light: '/assets/images/sponsors/nuxt-light.png',
dark: '/assets/images/sponsors/nuxt-dark.png',
height: 60,
width: 288
}
Expand Down
12 changes: 6 additions & 6 deletions components/sections/UIUXDX.vue
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<script lang="ts">
import UIIcon from '~/assets/images/features/icon-ui.svg';
import UXIcon from '~/assets/images/features/icon-ux.svg';
import DXIcon from '~/assets/images/features/icon-dx.svg';
import ModularIcon from '~/assets/images/features/icon-modular.svg';
import CustomizableIcon from '~/assets/images/features/icon-customizable.svg';
import OSAwardsIcon from '~/assets/images/features/icon-osawards.svg';
import UIIcon from '~/public/assets/images/features/icon-ui.svg';
import UXIcon from '~/public/assets/images/features/icon-ux.svg';
import DXIcon from '~/public/assets/images/features/icon-dx.svg';
import ModularIcon from '~/public/assets/images/features/icon-modular.svg';
import CustomizableIcon from '~/public/assets/images/features/icon-customizable.svg';
import OSAwardsIcon from '~/public/assets/images/features/icon-osawards.svg';
import { defineComponent } from 'vue';
import { useI18n } from 'vue-i18n';
Expand Down
4 changes: 3 additions & 1 deletion composables/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ export * from './useErrorHandler';
export * from './useManifest';
export * from './usePageMeta';
export * from './useTelemetry';
export * from './navigation';
export * from './useAppsNavigation';
export * from './useNavbarNavigation';
export * from './useSidebarNavigation';
3 changes: 0 additions & 3 deletions composables/navigation/index.ts

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion content/blog/2023-04-04/introducing-inkline-4.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: Introducing Inkline 4 - Inkline
description: Discover Inkline 4, the next-gen Vue.js 3 UI Components library with exciting features like Design Tokens, Configuration File, Inkline CLI, and more. Explore the future of developer-friendly, accessible, and customizable design systems through Inkline!
image:
src: /images/blog/introducing-inkline-4.webp
src: /assets/images/blog/introducing-inkline-4.webp
alt: Introducing Inkline 4
width: 1280
height: 600
Expand Down
2 changes: 1 addition & 1 deletion content/blog/2023-06-06/inkline-preset-for-unocss.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: On-demand CSS Utility Classes with UnoCSS - Inkline
description: Discover the Inkline Preset for UnoCSS, a world where you can write custom CSS utility classes on the fly, without being limited by pre-defined stylesheets. You can now create and apply utility classes right where you need them!
image:
src: /images/blog/inkline-preset-for-unocss.webp
src: /assets/images/blog/inkline-preset-for-unocss.webp
alt: On-demand CSS Utility Classes with UnoCSS
width: 1280
height: 600
Expand Down
7 changes: 6 additions & 1 deletion css/plugins/_shiki.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
.shiki {
.shiki,
.configuration-table pre,
#page > div >pre,
.content-tabs .tab pre,
.design-token-content pre,
pre[class*="language-"] {
--shiki-color-background: var(--code--background);
}
2 changes: 1 addition & 1 deletion layouts/BlogArticle.vue
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export default defineComponent({
img {
border-radius: var(--border-radius);
box-shadow: var(--box-shadow);
max-width: calc(100% + 144px);
width: calc(100% + 144px);
margin-bottom: var(--margin-bottom-3);
}
}
Expand Down
5 changes: 2 additions & 3 deletions nuxt.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,11 @@ export default defineNuxtConfig({
}
},
/**
* @docs https://v1.image.nuxtjs.org/configuration
* @docs https://image.nuxt.com/get-started/configuration
*/
image: {
provider: 'ipx',
dir: 'assets',
domains: ['next.inkline.io', 'inkline.io']
domains: ['*.inkline.io', 'inkline.io']
},
/**
* @docs https://nuxt.com/docs/api/configuration/nuxt-config/#vite
Expand Down
Loading

1 comment on commit 91a2da6

@vercel
Copy link

@vercel vercel bot commented on 91a2da6 Nov 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.