diff --git a/my-saas-template/src/app.html b/my-saas-template/src/app.html deleted file mode 100644 index decfc90..0000000 --- a/my-saas-template/src/app.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - %sveltekit.head% - - - -
%sveltekit.body%
- - diff --git a/my-saas-template/src/routes/+layout.svelte b/my-saas-template/src/routes/+layout.svelte deleted file mode 100644 index 4afc8b4..0000000 --- a/my-saas-template/src/routes/+layout.svelte +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - -
- -
diff --git a/my-saas-template/src/routes/+page.svelte b/my-saas-template/src/routes/+page.svelte deleted file mode 100644 index cc88df0..0000000 --- a/my-saas-template/src/routes/+page.svelte +++ /dev/null @@ -1,2 +0,0 @@ -

Welcome to SvelteKit

-

Visit svelte.dev/docs/kit to read the documentation

diff --git a/my-saas-template/tailwind.config.cjs b/my-saas-template/tailwind.config.cjs deleted file mode 100644 index 0ac6f13..0000000 --- a/my-saas-template/tailwind.config.cjs +++ /dev/null @@ -1,24 +0,0 @@ -// @ts-check -import { join } from 'path'; -import forms from '@tailwindcss/forms'; -import typography from '@tailwindcss/typography'; - -/** @type {import('tailwindcss').Config} */ -export default { - darkMode: 'class', - content: [ - './src/**/*.{html,js,svelte,ts}', - // Path to Skeleton Svelte components - join(require.resolve('@skeletonlabs/skeleton-svelte'), '../**/*.{html,js,svelte,ts}'), - // Path to Skeleton core - join(require.resolve('@skeletonlabs/skeleton'), '../**/*.{html,js,svelte,ts}') - ], - theme: { - extend: {}, - }, - plugins: [ - forms, - typography - // Skeleton plugin is removed - ] -}; diff --git a/my-saas-template/vite.config.ts b/my-saas-template/vite.config.ts deleted file mode 100644 index bbf8c7d..0000000 --- a/my-saas-template/vite.config.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { sveltekit } from '@sveltejs/kit/vite'; -import { defineConfig } from 'vite'; - -export default defineConfig({ - plugins: [sveltekit()] -}); diff --git a/package.json b/package.json index 42e404c..1032954 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,6 @@ { - "name": "my-saas-template", + "name": "saasy", + "description": "Saasy is a SaaS template for SvelteKit", "private": true, "version": "0.0.1", "type": "module", @@ -12,24 +13,6 @@ "check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch" }, "devDependencies": { -<<<<<<< HEAD:my-saas-template/package.json - "@sveltejs/adapter-auto": "^6.0.0", - "@sveltejs/kit": "^2.16.0", - "@sveltejs/vite-plugin-svelte": "^5.0.0", - "svelte": "^5.0.0", - "svelte-check": "^4.0.0", - "typescript": "^5.0.0", - "vite": "^6.2.6" - }, - "dependencies": { - "@skeletonlabs/skeleton": "^3.1.3", - "@skeletonlabs/skeleton-svelte": "^1.2.3", - "@tailwindcss/forms": "^0.5.10", - "@tailwindcss/typography": "^0.5.16", - "autoprefixer": "^10.4.21", - "postcss": "^8.5.3", - "tailwindcss": "^4.1.7" -======= "@eslint/compat": "^1.2.5", "@eslint/js": "^9.18.0", "@floating-ui/dom": "^1.7.0", @@ -69,6 +52,5 @@ "remark-toc": "^9.0.0", "remark-unwrap-images": "^4.0.1", "shiki": "^3.4.2" ->>>>>>> 3c705b9 (Overhaul):package.json } } diff --git a/src/app.css b/src/app.css index 76d1099..3dbebc3 100644 --- a/src/app.css +++ b/src/app.css @@ -1,21 +1,3 @@ -<<<<<<< HEAD:my-saas-template/src/app.css -/* Tailwind base, components, and utilities */ -@import 'tailwindcss'; - -/* Skeleton core and base theme system */ -@import '@skeletonlabs/skeleton'; - -/* Optional: Skeleton presets (recommended by v3 docs) */ -@import '@skeletonlabs/skeleton/optional/presets'; - -/* Skeleton chosen theme (e.g., modern) */ -@import '@skeletonlabs/skeleton/themes/theme-modern.css'; -/* You can switch 'theme-modern.css' to other available themes like 'theme-cerberus.css', etc. */ - -/* Your own global styles can go here */ - -/* The @source line from docs is a comment, so it's omitted here */ -======= @import 'tailwindcss'; @plugin '@tailwindcss/forms'; @plugin '@tailwindcss/typography'; @@ -50,4 +32,3 @@ @import '@skeletonlabs/skeleton/themes/wintry'; @custom-variant dark (&:where(.dark, .dark *)); ->>>>>>> 3c705b9 (Overhaul):src/app.css diff --git a/src/routes/pricing/+page.svelte b/src/routes/pricing/+page.svelte index 711144d..d752511 100644 --- a/src/routes/pricing/+page.svelte +++ b/src/routes/pricing/+page.svelte @@ -84,7 +84,7 @@
{#each plans as plan} -
+
{#if plan.popular}
diff --git a/svelte.config.js b/svelte.config.js index 31db866..0c11c04 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -1,7 +1,4 @@ import adapter from '@sveltejs/adapter-auto'; -<<<<<<< HEAD:my-saas-template/svelte.config.js -import { vitePreprocess } from '@sveltejs/vite-plugin-svelte'; -======= import { mdsvex } from 'mdsvex'; import remarkUnwrapImages from 'remark-unwrap-images'; import remarkToc from 'remark-toc'; @@ -14,7 +11,6 @@ const mdsvexOptions = { remarkPlugins: [remarkUnwrapImages, remarkToc, remarkAbbr], rehypePlugins: [rehypeSlug] }; ->>>>>>> 3c705b9 (Overhaul):svelte.config.js /** @type {import('@sveltejs/kit').Config} */ const config = {