@solidstarters/create-solid-app 1.2.12 → 1.2.14

package/helpers.js

@@ -11,13 +11,13 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
-export async function copyAndInstallTemplate(source, target) {
+export async function copyAndInstallTemplate(source, target, showLogs) {
   try {
     // Copy the source folder to the target folder
     await copyTemplate(source, target); 
 
     // Run `npm install` in the target directory
-    return await installTemplate(target);
+    return await installTemplate(target, showLogs);
     // console.log(chalk.green(`Dependencies installed in ${target}`));
   } catch (error) {
     console.error(chalk.red('Error in copyAndInstallTemplate:', error));
@@ -25,8 +25,8 @@ export async function copyAndInstallTemplate(source, target) {
   }
 }
 
-async function installTemplate(target) {
-  const output = await execa('npm', ['install'], { stdio: 'inherit', cwd: target });
+async function installTemplate(target, showLogs) {
+  const output = await execa('npm', ['install'], { stdio: showLogs ? "inherit" : "ignore", cwd: target });
   return output;
 }
 
@@ -185,20 +185,19 @@ function generateJwtSecret() {
   return crypto.randomBytes(64).toString('hex'); // 64 bytes => 128 characters in hexadecimal
 };
 
-export async function installSolidAsGlobalBinary(cwd) {
+export async function installSolidAsGlobalBinary(cwd, showLogs) {
   try {
-    await execa('npm', ['run', 'build'], { stdio: 'inherit', cwd });
+    await execa('npm', ['run', 'build'], { stdio: showLogs ? "inherit" : "ignore", cwd });
 
     const nodeVersion = process.version;
     const homeDir = os.homedir();
     const binaryPath = path.join(homeDir, `.nvm/versions/node/${nodeVersion}/bin/solid`);
-
     try {
       await execa('rm', [binaryPath], { stdio: 'inherit' });
     } catch (error) {
     }
 
-    await execa('npm', ['i', '-g'], { stdio: 'inherit', cwd });
+    await execa('npm', ['i', '-g'], { stdio: showLogs ? "inherit" : "ignore", cwd });
   } catch (error) {
     console.error(chalk.red('Error during installation:', error.message));
     process.exit(1);

package/index.js

@@ -11,6 +11,10 @@ import _ from 'lodash';
 
 async function main() {
     try {
+        // Check if --debug=true or --verbose=true exists in args
+        const args = process.argv;
+        const showLogs = args.some(arg => arg.includes("--verbose"));
+
         console.log(chalk.cyan("Hello, Let's setup your Solid project!"));
 
         // Questions for the user to setup backend
@@ -30,13 +34,13 @@ async function main() {
         const templatesPath = getSourceFolderPath('templates');
         // copyTemplate(path.join(templatesPath, 'dot.templates'), targetPath);
 
-        await copyAndInstallTemplate(path.join(templatesPath, 'nest-template'), path.join(targetPath, 'solid-api'));
+        await copyAndInstallTemplate(path.join(templatesPath, 'nest-template'), path.join(targetPath, 'solid-api'), showLogs);
         
         console.log(prettyOutput('Step 2','Installing solid binary globally'));
-        const ignore = await installSolidAsGlobalBinary(path.join(targetPath, 'solid-api'));
+        const ignore = await installSolidAsGlobalBinary(path.join(targetPath, 'solid-api'), showLogs);
 
         console.log(prettyOutput('Step 3',`Setting up boilerplate for the frontend`));
-        await copyAndInstallTemplate(path.join(templatesPath, 'next-template'), path.join(targetPath, 'solid-ui'));
+        await copyAndInstallTemplate(path.join(templatesPath, 'next-template'), path.join(targetPath, 'solid-ui'), showLogs);
 
         // Step 3: Update project package json details
         updatePackageName(targetPath, 'solid-ui', `@${projectName}/solid-ui`);
@@ -57,8 +61,20 @@ async function main() {
         console.log(chalk.cyan(`\nNext steps:`));
         console.log(chalk.cyan(`Run the api:`));
         console.log(prettyOutput('',`cd ${projectName}/solid-api`));
-        console.log(prettyOutput('','solid seed -s ModuleMetadataSeederService','This will seed the database with the required metadata'));
-        console.log(prettyOutput('','npm run start',`This will start the backend server @http://localhost:${answers.solidApiPort}`));
+        console.log(prettyOutput('','solid seed','This will seed the database with the required metadata'));
+
+        // Development mode (with watch )
+        console.log(prettyOutput('', 'npm run start:dev', `Starts the backend in development mode with live reload on @http://localhost:${answers.solidApiPort}`));
+
+        // Development mode (debug)
+        console.log(prettyOutput('', 'npm run start:debug', `Starts the backend in development mode with debugging on @http://localhost:${answers.solidApiPort}`));
+
+        // Production mode
+        console.log(prettyOutput('', 'npm run start', `Starts the backend in production mode on @http://localhost:${answers.solidApiPort}`));
+
+        console.log(prettyOutput('',`api documentation is available on @http://localhost:${answers.solidApiPort}/docs`));
+
+        // console.log(prettyOutput('','npm run start',`This will start the backend server @http://localhost:${answers.solidApiPort}`));
         console.log(chalk.cyan(`\nRun the frontend:`));
         console.log(prettyOutput('',`cd ${projectName}/solid-ui`));
         console.log(prettyOutput('','npm run dev',`This will start the frontend server @http://localhost:${answers.solidUiPort}`));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/create-solid-app",
-  "version": "1.2.12",
+  "version": "1.2.14",
   "main": "index.js",
   "private": false,
   "publishConfig": {

package/templates/nest-template/package-lock.json

@@ -27,7 +27,7 @@
         "@nestjs/serve-static": "^4.0.2",
         "@nestjs/swagger": "^7.2.0",
         "@nestjs/typeorm": "^10.0.1",
-        "@solidstarters/solid-core": "^1.2.17",
+        "@solidstarters/solid-core": "^1.2.24",
         "@types/luxon": "^3.4.2",
         "amqplib": "^0.10.4",
         "axios": "^1.7.0",
@@ -67,7 +67,7 @@
       "devDependencies": {
         "@nestjs/cli": "^10.0.0",
         "@nestjs/testing": "^10.0.0",
-        "@solidstarters/solid-code-builder": "^1.0.9",
+        "@solidstarters/solid-code-builder": "^1.0.13",
         "@types/express": "^4.17.17",
         "@types/hapi__joi": "^17.1.12",
         "@types/jest": "^29.5.2",
@@ -4424,9 +4424,9 @@
       }
     },
     "node_modules/@solidstarters/solid-code-builder": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@solidstarters/solid-code-builder/-/solid-code-builder-1.0.9.tgz",
-      "integrity": "sha512-GRmzKFP6zyqLVaP6kMdSvpozeiuZphA6bELY2BcFtvwo5RiR9dolk4PfcnVPxB13wFnKzIWXKhtVrg8/geYbcA==",
+      "version": "1.0.13",
+      "resolved": "https://registry.npmjs.org/@solidstarters/solid-code-builder/-/solid-code-builder-1.0.13.tgz",
+      "integrity": "sha512-JIF7IdugJyucIumAR/NB8SRC1umSSCzqeNK1yhcI6BePaA5T3RIqeZhJ1Ys5xNpfvcp7pMK5A1KdiMTvNOWSHA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4469,9 +4469,9 @@
       }
     },
     "node_modules/@solidstarters/solid-core": {
-      "version": "1.2.17",
-      "resolved": "https://registry.npmjs.org/@solidstarters/solid-core/-/solid-core-1.2.17.tgz",
-      "integrity": "sha512-zyjUtukhip1vfiafG+SzDv5Hta6sXA/9FmIA9YDiW4is8uy4jg72+yau/aRaMzMKPz6f2Mhrqj0kork7naCupg==",
+      "version": "1.2.24",
+      "resolved": "https://registry.npmjs.org/@solidstarters/solid-core/-/solid-core-1.2.24.tgz",
+      "integrity": "sha512-RBXssYLq68kHIh8YBabp6xK77SOJKVIjoR5ljMAfU+QhbMe1fY2pJJW+r/ZSjEcYPt4pdj3Z7y5920xFSLNHXA==",
       "license": "ISC",
       "dependencies": {
         "@angular-devkit/core": "^18.0.3",
@@ -4492,6 +4492,7 @@
         "luxon": "^3.4.4",
         "mailgen": "^2.0.28",
         "mongoose": "^8.7.0",
+        "mysql2": "^3.13.0",
         "nodemailer": "^6.9.13",
         "passport": "^0.7.0",
         "passport-google-oauth2": "^0.2.0",
@@ -5830,6 +5831,15 @@
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
       "license": "MIT"
     },
+    "node_modules/aws-ssl-profiles": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/aws-ssl-profiles/-/aws-ssl-profiles-1.1.2.tgz",
+      "integrity": "sha512-NZKeq9AfyQvEeNlN0zSYAaWrmBffJh3IELMZfRpJVWgrpEbtEpnjvzqBPf+mxoI287JohRDoa+/nsfqqiZmF6g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
     "node_modules/axios": {
       "version": "1.7.9",
       "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.9.tgz",
@@ -9011,6 +9021,15 @@
         "node": ">=10"
       }
     },
+    "node_modules/generate-function": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz",
+      "integrity": "sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==",
+      "license": "MIT",
+      "dependencies": {
+        "is-property": "^1.0.2"
+      }
+    },
     "node_modules/generic-pool": {
       "version": "3.9.0",
       "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-3.9.0.tgz",
@@ -9745,6 +9764,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/is-property": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
+      "integrity": "sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==",
+      "license": "MIT"
+    },
     "node_modules/is-stream": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
@@ -11064,6 +11089,12 @@
         "node": ">=0.1.90"
       }
     },
+    "node_modules/long": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/long/-/long-5.3.1.tgz",
+      "integrity": "sha512-ka87Jz3gcx/I7Hal94xaN2tZEOPoUOEVftkQqZx2EeQRN7LGdfLlI3FvZ+7WDplm+vK2Urx9ULrvSowtdCieng==",
+      "license": "Apache-2.0"
+    },
     "node_modules/longest": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
@@ -11083,6 +11114,21 @@
         "yallist": "^3.0.2"
       }
     },
+    "node_modules/lru.min": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/lru.min/-/lru.min-1.1.2.tgz",
+      "integrity": "sha512-Nv9KddBcQSlQopmBHXSsZVY5xsdlZkdH/Iey0BlcBYggMd4two7cZnKOK9vmy3nY0O5RGH99z1PCeTpPqszUYg==",
+      "license": "MIT",
+      "engines": {
+        "bun": ">=1.0.0",
+        "deno": ">=1.30.0",
+        "node": ">=8.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wellwelwel"
+      }
+    },
     "node_modules/luxon": {
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.5.0.tgz",
@@ -11614,6 +11660,38 @@
       "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
       "license": "ISC"
     },
+    "node_modules/mysql2": {
+      "version": "3.13.0",
+      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.13.0.tgz",
+      "integrity": "sha512-M6DIQjTqKeqXH5HLbLMxwcK5XfXHw30u5ap6EZmu7QVmcF/gnh2wS/EOiQ4MTbXz/vQeoXrmycPlVRM00WSslg==",
+      "license": "MIT",
+      "dependencies": {
+        "aws-ssl-profiles": "^1.1.1",
+        "denque": "^2.1.0",
+        "generate-function": "^2.3.1",
+        "iconv-lite": "^0.6.3",
+        "long": "^5.2.1",
+        "lru.min": "^1.0.0",
+        "named-placeholders": "^1.1.3",
+        "seq-queue": "^0.0.5",
+        "sqlstring": "^2.3.2"
+      },
+      "engines": {
+        "node": ">= 8.0"
+      }
+    },
+    "node_modules/mysql2/node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "license": "MIT",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/mz": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
@@ -11625,6 +11703,27 @@
         "thenify-all": "^1.0.0"
       }
     },
+    "node_modules/named-placeholders": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/named-placeholders/-/named-placeholders-1.1.3.tgz",
+      "integrity": "sha512-eLoBxg6wE/rZkJPhU/xRX1WTpkFEwDJEN96oxFrTsqBdbT5ec295Q+CoHrL9IT0DipqKhmGcaZmwOt8OON5x1w==",
+      "license": "MIT",
+      "dependencies": {
+        "lru-cache": "^7.14.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/named-placeholders/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -13622,6 +13721,11 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/seq-queue": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/seq-queue/-/seq-queue-0.0.5.tgz",
+      "integrity": "sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q=="
+    },
     "node_modules/serialize-javascript": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
@@ -13936,6 +14040,15 @@
       "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
       "license": "BSD-3-Clause"
     },
+    "node_modules/sqlstring": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.3.tgz",
+      "integrity": "sha512-qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/ssf": {
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/ssf/-/ssf-0.11.2.tgz",

package/templates/nest-template/package.json

@@ -42,7 +42,7 @@
     "@nestjs/serve-static": "^4.0.2",
     "@nestjs/swagger": "^7.2.0",
     "@nestjs/typeorm": "^10.0.1",
-    "@solidstarters/solid-core": "^1.2.17",
+    "@solidstarters/solid-core": "^1.2.24",
     "@types/luxon": "^3.4.2",
     "amqplib": "^0.10.4",
     "axios": "^1.7.0",
@@ -79,7 +79,7 @@
   "devDependencies": {
     "@nestjs/cli": "^10.0.0",
     "@nestjs/testing": "^10.0.0",
-    "@solidstarters/solid-code-builder": "^1.0.9",
+    "@solidstarters/solid-code-builder": "^1.0.13",
     "@types/express": "^4.17.17",
     "@types/hapi__joi": "^17.1.12",
     "@types/jest": "^29.5.2",

package/templates/nest-template/refresh.bat

@@ -0,0 +1,15 @@
+@echo off
+echo Installing dependencies...
+call npm i
+
+echo Building the project...
+call npm run build
+
+echo Removing Solid binary...
+del "C:\Users\Lenovo\AppData\Roaming\npm\solid" 2>nul
+
+echo Installing global dependencies...
+call npm i -g
+
+echo Refresh complete!
+pause

package/templates/nest-template/src/main-cli.ts

@@ -2,18 +2,28 @@
 
 import { CommandFactory } from "nest-commander";
 import { AppModule } from "./app.module";
-import { INestApplication, INestApplicationContext } from "@nestjs/common";
+import { INestApplication, INestApplicationContext, Logger } from "@nestjs/common";
 import { setTimeout } from "timers/promises";
 import { NestFactory } from "@nestjs/core";
+import { existsSync } from "fs";
+import { resolve } from "path";
+
+const logger = new Logger("Bootstrap");
 
 async function bootstrap() {
+    const args = process?.argv;
+    // validate project existence
+    validateProjectRootPath();
+    const showLogs = args.some(arg =>arg.includes("--verbose"));
+    // Define log levels based on the flag
+    const logLevels = showLogs ? ['debug', 'error', 'fatal', 'log', 'verbose', 'warn'] : ['fatal', 'error', 'log'];
 
     const appModule = await AppModule.forRoot();
     // const app = await NestFactory.create(appModule);
 
     // Create an instance of the application, capture the application context so we can inject it into a service in itself.
     // @ts-ignore
-    const app = await CommandFactory.createWithoutRunning(appModule, ['debug', 'error', 'fatal', 'log', 'verbose', 'warn']);
+    const app = await CommandFactory.createWithoutRunning(appModule, logLevels);
     // const app = await CommandFactory.createWithoutRunning(AppModule, ['debug', 'error', 'fatal', 'log', 'verbose', 'warn']);
     // const app = await CommandFactory.createWithoutRunning(AppModule, ['error', 'fatal']);
 
@@ -35,4 +45,13 @@ async function bootstrap() {
 //   return parseInt(val)
 // });
 
-bootstrap();
+bootstrap();
+
+// Check if the current directory is a valid Solid API project
+function validateProjectRootPath() {
+    const packageJsonPath = resolve(process.cwd(), "package.json");
+    if (!existsSync(packageJsonPath)) {
+        logger.log("Does not seem to be a valid solid-api project.");
+        process.exit(1);
+    }
+}

package/templates/next-template/app/admin/core/[moduleName]/[modelName]/form/[id]/page.tsx

@@ -1,13 +1,5 @@
 "use client"
-import { SolidFormView } from "@solidstarters/solid-core-ui";
-import { CreateModel } from "@solidstarters/solid-core-ui";
-import { CreateModule } from "@solidstarters/solid-core-ui";
-import { CreateUser } from "@solidstarters/solid-core-ui";
-import { useGetmodelByIdQuery } from "@solidstarters/solid-core-ui";
-import { useGetmoduleByIdQuery } from "@solidstarters/solid-core-ui";
-import { useGetusersByIdQuery } from "@solidstarters/solid-core-ui";
-import { camelCase, kebabCase } from "change-case";
-import React, { useEffect } from "react";
+import { SolidFormLayouts } from "@solidstarters/solid-core-ui";
 
 type SolidViewParams = {
   params: {
@@ -17,78 +9,11 @@ type SolidViewParams = {
   };
 };
 
-const page = (props: SolidViewParams) => {
-  const { params } = props;
-
-  const {
-    data: modelData,
-    error,
-    isLoading,
-    isError,
-    refetch
-  } = useGetmodelByIdQuery(params.id);
-  useEffect(() => {
-    refetch();
-  }, [refetch]);
-
-  const {
-    data: moduleData,
-    error: moduleError,
-    isLoading: isModuleLoading,
-    isError: isModuleError,
-    refetch: refetchModule
-  } = useGetmoduleByIdQuery(params.id);
-  useEffect(() => {
-    refetchModule();
-  }, [refetchModule]);
-
-  const {
-    data: userData,
-    error: usererror,
-    isLoading: isuserLoading,
-    isError: isuserError,
-    refetch: refetchuser
-  } = useGetusersByIdQuery(params.id);
-  useEffect(() => {
-    refetchuser();
-  }, [refetchuser]);
+const page = ({ params }: SolidViewParams) => {
 
   return (
-    <div className="page-parent-wrapper">
-      {params.modelName === "model-metadata" &&
-        // <SolidFormView {...params} embeded={false} modelName={camelCase(params.modelName)} />
-        (params.id === "new" ?
-          <CreateModel params={params}></CreateModel>
-          :
-          <CreateModel params={params} data={modelData?.data}></CreateModel>
-        )
-      }
-      {params.modelName === "module-metadata" &&
-        // <SolidFormView {...params} embeded={false} modelName={camelCase(params.modelName)} />
-        (params.id === "new" ?
-          <CreateModule params={params}></CreateModule>
-          :
-          <CreateModule params={params} data={moduleData?.data}></CreateModule>
-        )
-      }
-
-      {params.modelName === "user" &&
-        // <SolidFormView {...params} embeded={false} modelName={camelCase(params.modelName)} />
-        (params.id === "new" ?
-          <CreateUser params={params}></CreateUser>
-          :
-          <CreateUser params={params} data={userData?.data}></CreateUser>
-        )
-      }
-
-      {params.modelName === "field-metadata" &&
-        <SolidFormView {...params} embeded={false} modelName={camelCase(params.modelName)} />
-      }
-      {params.modelName !== "field-metadata" && params.modelName !== "model-metadata" && params.modelName !== "module-metadata" && params.modelName !== "user" &&
-        <SolidFormView {...params} embeded={false} modelName={camelCase(params.modelName)} />
-      }
-    </div>
+    <SolidFormLayouts params={params} />
   );
 };
 
-export default page;
+export default page;

package/templates/next-template/app/admin/core/[moduleName]/[modelName]/kanban/page.tsx

@@ -10,13 +10,8 @@ type SolidViewParams = {
 };
 
 const page = ({ params }: SolidViewParams) => {
-
   return (
-    <>
-      <div className="page-parent-wrapper">
-        <SolidKanbanView {...params} embeded={false} modelName={camelCase(params.modelName)} />
-      </div>
-    </>
+    <SolidKanbanView {...params} embeded={false} modelName={camelCase(params.modelName)} />
   );
 };
 

package/templates/next-template/app/admin/core/[moduleName]/[modelName]/list/page.tsx

@@ -10,13 +10,8 @@ type SolidViewParams = {
 };
 
 const page = ({ params }: SolidViewParams) => {
-
   return (
-    <>
-      <div className="page-parent-wrapper">
-        <SolidListView {...params} embeded={false} modelName={camelCase(params.modelName)} />
-      </div>
-    </>
+    <SolidListView {...params} embeded={false} modelName={camelCase(params.modelName)} />
   );
 };
 

package/templates/next-template/app/admin/layout.tsx

@@ -1,62 +1,13 @@
 "use client"; // This line ensures that the component is rendered on the client side
 
-import { handleError, Header, ListingHeader } from "@solidstarters/solid-core-ui";
-import { getSession, signOut, useSession } from "next-auth/react";
-import { usePathname, useRouter } from "next/navigation";
-import React, { useEffect, useState } from "react";
-import { Layout, SolidChangeForcePassword } from "@solidstarters/solid-core-ui";
-import { Dialog } from "primereact/dialog";
-import { Divider } from "primereact/divider";
-const AdminLayout = ({ children }: { children: React.ReactNode }) => {
-  // const theme = useSelector((state: any) => state.theme.mode);
-  const { data: session, status } = useSession();
-  const [isForcePasswordChange, setIsForcePasswordChange] = useState(false)
-  useEffect(() => {
-    // @ts-expect-error: Handling potential case where 'data?.user?.user' might be undefined or null
-    if (session?.user?.user?.forcePasswordChange === true) {
-      setIsForcePasswordChange(true)
-    } else {
-      setIsForcePasswordChange(false)
-    }
-  }, [session])
-  const pathname = usePathname();
-  const router = useRouter();
-  useEffect(() => {
-    const handleRouteChange = async () => {
-      const session = await getSession(); // Force refetch session on navigation
-      if (session?.error === "RefreshAccessTokenError") {
-        handleError(["Session Expired. Please Login Again."])
-        signOut({ callbackUrl: "/auth/login" });
-      }
-
-
-    };
-    // Listen to routeChangeComplete event
-    handleRouteChange()
-
-  }, [pathname])
+import { AdminLayout } from "@solidstarters/solid-core-ui";
+const layout = ({ children }: { children: React.ReactNode }) => {
 
   return (
-    <Layout>
-      {/* <div className={`${process.env.NEXT_PUBLIC_ENABLE_CUSTOM_HEADER_FOOTER == "true" && 'header-margin-top'}`} style={{ minHeight: `${process.env.NEXT_PUBLIC_ENABLE_CUSTOM_HEADER_FOOTER == "true" ? 'calc(100vh - 70px)' : 'calc(100vh)'}` }}> */}
-
-      {/* <div className="min-h-full max-h-full flex flex-column relative flex-auto overflow-x-auto"> */}
-      {/* <DashboardHeader /> */}
-      {/* <SolidListingHeader></SolidListingHeader> */}
-      {/* {pathname.includes('all') && <ListingHeader />} */}
-      {/* <div className="flex flex-column flex-auto" style={{ backgroundColor: '#f6f6f9', padding: '1.5rem 1.5rem 1.5rem', }}> */}
+    <AdminLayout>
       {children}
-      {/* </div> */}
-      {/* </div> */}
-      {/* </div> */}
-      {isForcePasswordChange &&
-        <Dialog header="Change Default Password" visible={isForcePasswordChange} closable={false}  draggable={false} style={{ width: '25vw' }} onHide={() => setIsForcePasswordChange(false)}>
-         <Divider className="mt-0"/>
-          <SolidChangeForcePassword />
-        </Dialog>
-      }
-    </Layout>
+    </AdminLayout>
   );
 };
 
-export default AdminLayout;
+export default layout;

package/templates/next-template/app/admin/page.tsx

@@ -1,11 +1,10 @@
 "use client";
+import { SolidAdmin } from "@solidstarters/solid-core-ui"
 
 const page = () => {
   return (
-    <div className="mainLayout">
-      <div className="layoutPage">Solid Page</div>
-    </div>
+    <SolidAdmin />
   );
 };
 
-export default page;
+export default page;

package/templates/next-template/app/admin/settings/app-settings/page.tsx

@@ -0,0 +1,11 @@
+"use client"
+
+import { GeneralSettings } from "@solidstarters/solid-core-ui"
+
+const Page = () => {
+    return (
+         <GeneralSettings />
+    )
+}
+
+export default Page

package/templates/next-template/app/admin/settings/authentication-settings/page.tsx

@@ -0,0 +1,10 @@
+"use client"
+import { GeneralSettings } from "@solidstarters/solid-core-ui"
+
+const Page = () => {
+    return (
+         <GeneralSettings />
+    )
+}
+
+export default Page

package/templates/next-template/app/admin/settings/misc-settings/page.tsx

@@ -0,0 +1,10 @@
+"use client"
+import { GeneralSettings } from "@solidstarters/solid-core-ui"
+
+const Page = () => {
+    return (
+         <GeneralSettings />
+    )
+}
+
+export default Page