Skip to content

Commit

Permalink
Merge pull request #18 from Serveis-Neby/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
JayexDesigns authored Mar 29, 2024
2 parents 1ee77e8 + 8beea82 commit f08bce5
Show file tree
Hide file tree
Showing 39 changed files with 2,352 additions and 6,151 deletions.
41 changes: 28 additions & 13 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,21 +1,36 @@
# build output
dist/

# generated types
.astro/
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
node_modules/
/node_modules
/.pnp
.pnp.js
.yarn/install-state.gz

# testing
/coverage

# next.js
/.next/
/out/

# production
/build

# logs
# misc
.DS_Store
*.pem

# debug
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*

# environment variables
.env
.env.production
# local env files
.env*.local

# macOS-specific files
.DS_Store
# vercel
.vercel

# typescript
*.tsbuildinfo
next-env.d.ts
18 changes: 0 additions & 18 deletions astro.config.mjs

This file was deleted.

32 changes: 16 additions & 16 deletions components.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"$schema": "https://ui.shadcn.com/schema.json",
"style": "default",
"rsc": false,
"tsx": true,
"tailwind": {
"config": "tailwind.config.js",
"css": "src/globals.css",
"baseColor": "slate",
"cssVariables": true,
"prefix": ""
},
"aliases": {
"components": "@/components",
"utils": "@/lib/utils"
}
}
"$schema": "https://ui.shadcn.com/schema.json",
"style": "default",
"rsc": true,
"tsx": true,
"tailwind": {
"config": "tailwind.config.ts",
"css": "src/app/globals.css",
"baseColor": "slate",
"cssVariables": true,
"prefix": ""
},
"aliases": {
"components": "@/components",
"utils": "@/lib/utils"
}
}
4 changes: 4 additions & 0 deletions next.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/** @type {import('next').NextConfig} */
const nextConfig = {};

export default nextConfig;
Loading

0 comments on commit f08bce5

Please sign in to comment.