Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/jankrnac/tovel
Browse files Browse the repository at this point in the history
  • Loading branch information
jankrnac committed Jul 28, 2024
2 parents 1151df0 + e5e4350 commit 759f97a
Show file tree
Hide file tree
Showing 6 changed files with 186 additions and 58 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/studio.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
node: [18]
node: [20]

steps:
- name: Checkout
Expand All @@ -45,14 +45,14 @@ jobs:
echo "cache=$cache" >> $GITHUB_OUTPUT
echo "package_manager=$package_manager" >> $GITHUB_OUTPUT
- uses: pnpm/action-setup@v2.4.0
- uses: pnpm/action-setup@v4
if: ${{ steps.pkgman.outputs.package_manager == 'pnpm' }}
name: Install pnpm
id: pnpm-install
with:
version: 8
version: 9

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
version: ${{ matrix.node }}
cache: ${{ steps.pkgman.outputs.cache }}
Expand Down
1 change: 0 additions & 1 deletion app/app.config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// app.config.ts
export default defineAppConfig({
appName: "JK Eshop",
dataSource: 'medusa', //[api, content]
maxWidth: '1900px',
nuxtIcon: {
size: '24px', // default <Icon> size applied
Expand Down
20 changes: 20 additions & 0 deletions app/nuxt.schema.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { field, group } from '@nuxthq/studio/theme'

export default defineNuxtSchema({
appConfig: {
parent: group({
title: 'Parent title',
description: 'Parent description.',
icon: 'i-icon-to-display',
fields: {
leaf: field({
type: 'string',
title: 'Field title',
description: 'Field Description',
icon: 'i-icon-to-display',
default: 'default value'
})
}
})
}
})
59 changes: 30 additions & 29 deletions nuxt.config.ts
Original file line number Diff line number Diff line change
@@ -1,47 +1,48 @@
export default defineNuxtConfig({
devtools: {
enabled: true
devtools: {
enabled: true
},

devServer: {
port: 3000
devServer: {
port: 3000
},

runtimeConfig: {
public:{
apiBase: ''
}
runtimeConfig: {
public: {
apiBase: ''
}
},

future: {
compatibilityVersion: 4,
future: {
compatibilityVersion: 4,
},

modules: [
'@nuxt/content',
'@nuxt/image',
'@nuxtjs/google-fonts',
"@nuxt/ui"
modules: [
'@nuxt/content',
'@nuxt/image',
'@nuxtjs/google-fonts',
'@nuxt/ui',
'@nuxthq/studio'
],

supabase: {
cookieOptions: {
secure: process.env.NODE_ENV === 'production',
},
redirect: false
supabase: {
cookieOptions: {
secure: process.env.NODE_ENV === 'production',
},
redirect: false
},

googleFonts: {
families: {
Pacifico: true,
}
googleFonts: {
families: {
Pacifico: true,
}
},

content: {
experimental: {
search: true
}
content: {
experimental: {
search: true
}
},

compatibilityDate: '2024-07-16'
compatibilityDate: '2024-07-16'
})
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"zod": "^3.23.8"
},
"devDependencies": {
"@nuxthq/studio": "^2.0.3",
"@nuxtjs/google-fonts": "^3.2.0"
}
}
Loading

0 comments on commit 759f97a

Please sign in to comment.