♻️ Chore: Update Database Start page to reflect new theme and utilize batch transactions

packages/studioCMS/src/db/tables.ts

@@ -1,6 +1,6 @@
 // @ts-expect-error - This is a missing type definition for the `astro:db` import since its a virtual module during Astro Runtime
 import { NOW, column, defineTable, sql } from 'astro:db';
-import { randomUUID } from 'crypto';
+import { randomUUID } from 'node:crypto';
 
 export const Session = defineTable({
 	columns: {
@@ -48,6 +48,7 @@ export const Blog = defineTable({
 export const Pages = defineTable({
 	columns: {
 		id: column.number({ primaryKey: true }),
+		content: column.text({ multiline: true }),
 		title: column.text(),
 		description: column.text(),
 		publishedAt: column.date({ default: NOW }),
@@ -56,10 +57,10 @@ export const Pages = defineTable({
 			default:
 				'https://images.unsplash.com/photo-1707343843982-f8275f3994c5?q=80&w=1032&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDF8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D',
 		}),
-		content: column.text({ multiline: true }),
 	},
 });
 
+
 export const SiteConfig = defineTable({
 	columns: {
 		id: column.number({ primaryKey: true }),

packages/studioCMS/src/integrations/studioCMSDashboard/index.ts

@@ -200,18 +200,66 @@ export default defineIntegration({
 						content: studioCMSDTS.text(),
 					});
 
+					// Add Dashboard Integrations
+					integrationLogger(logger, verbose, 'info', 'Adding Dashboard Integrations');
+
+					// CSS Management
+					addIntegration(params, {
+						integration: UnoCSSAstroIntegration({
+							configFile: false,
+							injectReset: injectReset,
+							injectEntry: injectEntry,
+							presets: [
+								presetUno(),
+								presetDaisy({
+									themes: themes,
+									darkTheme: darkTheme,
+								}),
+								presetWind(), 
+								presetTypography(),
+								presetIcons({
+									collections: {
+										mdi: () => import('@iconify-json/mdi/icons.json').then(i => i.default),
+										google: FileSystemIconLoader(resolve('./icons/google')),
+										discord: FileSystemIconLoader(resolve('./icons/discord')),
+										github: FileSystemIconLoader(resolve('./icons/github')),
+										auth0: FileSystemIconLoader(resolve('./icons/auth0')),
+									}
+								}),
+								presetScrollbar({
+								}),
+								presetWebFonts({
+									provider: 'google',
+									fonts: {
+										// Required Fonts for Google Icons
+										  sans: 'Roboto',
+										  mono: ['Fira Code', 'Fira Mono:400,700'],
+									},
+								}),
+							],
+							transformers: [
+								transformerDirectives()
+							],
+						}),
+					});
+
 					// In the case of First time Setup run the Start Pages
 					if ( dbStartPage ) {
 						injectRoute({
 							pattern: 'start/',
-							entrypoint: resolve('./routes/databaseSetup/start.astro'),
+							entrypoint: resolve('./routes/databaseSetup/main.astro'),
+						});
+						injectRoute({
+							pattern: 'api/setup',
+							entrypoint: resolve('./routes/databaseSetup/setup.ts'),
 						});
 						injectRoute({
 							pattern: 'done/',
 							entrypoint: resolve('./routes/databaseSetup/done.astro'),
 						});
 					}
 
+
 					// Check if the Dashboard is enabled
 					if ( dashboardEnabled && !dbStartPage ) {
 
@@ -229,49 +277,6 @@ export default defineIntegration({
 						// Log that the Dashboard is enabled
 						integrationLogger(logger, verbose, 'info', 'Dashboard is Enabled');
 
-						// Add Dashboard Integrations
-						integrationLogger(logger, verbose, 'info', 'Adding Dashboard Integrations');
-
-						// CSS Management
-						addIntegration(params, {
-							integration: UnoCSSAstroIntegration({
-								configFile: false,
-								injectReset: injectReset,
-								injectEntry: injectEntry,
-								presets: [
-									presetUno(),
-									presetDaisy({
-										themes: themes,
-										darkTheme: darkTheme,
-									}),
-									presetWind(), 
-									presetTypography(),
-									presetIcons({
-										collections: {
-											mdi: () => import('@iconify-json/mdi/icons.json').then(i => i.default),
-											google: FileSystemIconLoader(resolve('./icons/google')),
-											discord: FileSystemIconLoader(resolve('./icons/discord')),
-											github: FileSystemIconLoader(resolve('./icons/github')),
-											auth0: FileSystemIconLoader(resolve('./icons/auth0')),
-										}
-									}),
-									presetScrollbar({
-									}),
-									presetWebFonts({
-										provider: 'google',
-										fonts: {
-											// Required Fonts for Google Icons
-										  	sans: 'Roboto',
-										  	mono: ['Fira Code', 'Fira Mono:400,700'],
-										},
-									}),
-								],
-								transformers: [
-									transformerDirectives()
-								],
-							}),
-						});
-
 						// Setup the Dashboard Routes
 						injectRoute({
 							pattern: makeRoute("/"),

packages/studioCMS/src/integrations/studioCMSDashboard/routes/dashboard/components/Footer.astro

@@ -4,10 +4,11 @@ const today = new Date();
 
 <footer class="footer footer-center block mb-5 pt-10">
   <div class="pb-2">
-    &copy; {today.getFullYear()} astrolicious/studiocms - MIT License
+    <div class="inline">
+      &copy; {today.getFullYear()} <a href="https://github.com/astrolicious/studiocms" target="_blank"><i>astrolicious/studiocms</i></a> - <a href="https://github.com/astrolicious/studiocms?tab=MIT-1-ov-file#readme" target="_blank" class="font-bold">MIT Licensed</a>
+    </div>
   </div>
   <div class="inline opacity-75">
-    Developed by <a href="https://github.com/astrolicious/studiocms" target="_blank" class="font-bold">The StudioCMS Team</a>
+    Developed by <a href="https://github.com/astrolicious/studiocms/graphs/contributors" target="_blank" class="font-bold">The StudioCMS Contributors</a>
   </div>
-</footer>
-<style></style>
+</footer>

packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/done.astro

@@ -1,34 +1,47 @@
 ---
 import { Code } from 'astro:components';
-import SetupLayout from './Setup.astro';
+import { Layout } from 'studiocms-dashboard:components';
 import Config from 'virtual:studiocms/config';
 
 if (Config.includedIntegrations.useInoxSitemap) {
     import('sitemap-ext:config').then((sitemap) => {
         sitemap.default(false)
     })
 }
----
-<SetupLayout>
-	<center>
-		<h1>Setup Done!</h1>
-	</center>
-
-	<p>You can now stop your dev server and add the following option in your astro.config to start using StudioCMS then start back up to see your new CMS data</p>
 
-	<Code lang="diff" code={`import { defineConfig } from "astro/config";
+const codeBlob = `import { defineConfig } from "astro/config";
 import astroStudioCMS from "@astrolicious/studiocms";
 import db from '@astrojs/db';
 
 // https://astro.build/config
 export default defineConfig({
-    // other config options,
+	// other config options,
 	integrations: [
 		db(),
 		astroStudioCMS({ 
 +			dbStartPage: false,
 		}),
 	],
-});`}/>
+});`
+---
+<Layout title='Setup Done | StudioCMS' description="Welcome to StudioCMS" sideBarActiveItemID='start' includeSidebar={false}>
+	<div class="container lg:max-w-[50vw]">
+        <div class="py-8">
+          <div class="bg-base-300 p-8 md:p-12 lg:p-16 rounded-lg">
+			<div class="text-5xl font-bold pb-4 text-center">Setup Done!</div>
+			<div class="py-4">
+				<text class="text-xl py-2">
+				  <text class="font-bold">Next Step</text> 
+				  <br />
+				  You can now stop your dev server and add the following option in your astro.config to start using StudioCMS then start back up to see your new CMS data
+				</text>
+			</div>
+
+
+			<Code lang="diff" class="p-6" code={codeBlob} wrap/>
+		  </div>
+		</div>
+
+	</div>
 
-</SetupLayout>
+</Layout>