+ {#if $page.path === '/database/new'}
+
+
(type = 'mongodb')}
+ >
+
+
+
+
MongoDB
-
MongoDB
-
-
(type = 'couchdb')}
- >
-
-
+
(type = 'couchdb')}
+ >
+
+
+
+
Couchdb
-
Couchdb
-
-
(type = 'postgresql')}
- >
-
-
+
(type = 'postgresql')}
+ >
+
+
PostgreSQL
-
PostgreSQL
-
-
(type = 'mysql')}
- >
-
-
+
(type = 'mysql')}
+ >
+
+
+
+
MySQL
+
+
(type = 'redis')}
+ >
+
+
+
+
Redis
-
MySQL
-
-
-
- {#if type}
-
-
-
-
-
+ {#if type}
+
+ {#if type !== 'redis'}
+
+
+ {/if}
+
+
+
+ {/if}
{/if}
- {/if}
-
+
+{/if}
diff --git a/src/components/Database/SVGs/Redis.svelte b/src/components/Database/SVGs/Redis.svelte
new file mode 100644
index 0000000000..d35b5f9739
--- /dev/null
+++ b/src/components/Database/SVGs/Redis.svelte
@@ -0,0 +1,37 @@
+
+
+
diff --git a/src/components/Service/Plausible.svelte b/src/components/Service/Plausible.svelte
index 97e40bad46..43ceb8f97b 100644
--- a/src/components/Service/Plausible.svelte
+++ b/src/components/Service/Plausible.svelte
@@ -3,7 +3,7 @@
import { toast } from '@zerodevx/svelte-toast';
import Loading from '../Loading.svelte';
import Tooltip from '$components/Tooltip.svelte';
- import { request } from '$lib/api/request';
+ import { request } from '$lib/request';
import { page, session } from '$app/stores';
import PasswordField from '$components/PasswordField.svelte';
import { browser } from '$app/env';
diff --git a/src/global.d.ts b/src/global.d.ts
index 39ed4217f2..aa2cf612cc 100644
--- a/src/global.d.ts
+++ b/src/global.d.ts
@@ -43,6 +43,7 @@ export type Application = {
command: {
build: string | null;
installation: string;
+ start: string;
};
container: {
name: string;
diff --git a/src/hooks/index.ts b/src/hooks/index.ts
index 5e2077680e..975b64710a 100644
--- a/src/hooks/index.ts
+++ b/src/hooks/index.ts
@@ -4,6 +4,9 @@ import { publicPages } from '$lib/consts';
import mongoose from 'mongoose';
import { verifyUserId } from '$lib/api/common';
import { initializeSession } from 'svelte-kit-cookie-session';
+import { cleanupStuckedDeploymentsInDB } from '$lib/api/applications/cleanup';
+import { docker } from '$lib/api/docker';
+import Configuration from '$models/Configuration';
process.on('SIGINT', function () {
mongoose.connection.close(function () {
@@ -13,6 +16,7 @@ process.on('SIGINT', function () {
});
async function connectMongoDB() {
+ // TODO: Save configurations on start?
const { MONGODB_USER, MONGODB_PASSWORD, MONGODB_HOST, MONGODB_PORT, MONGODB_DB } = process.env;
try {
if (process.env.NODE_ENV === 'production') {
@@ -27,12 +31,65 @@ async function connectMongoDB() {
);
}
console.log('Connected to mongodb.');
+
} catch (error) {
console.log(error);
}
+
}
-if (mongoose.connection.readyState !== 1) connectMongoDB();
+(async () => {
+ console.log(mongoose.connection.readyState)
+ if (mongoose.connection.readyState !== 1) await connectMongoDB();
+ try {
+ await mongoose.connection.db.dropCollection('logs-servers');
+ } catch (error) {
+ //
+ }
+ try {
+ await cleanupStuckedDeploymentsInDB();
+ } catch (error) {
+ console.log(error)
+ }
+ try {
+ const dockerServices = await docker.engine.listServices();
+ let applications: any = dockerServices.filter(
+ (r) =>
+ r.Spec.Labels.managedBy === 'coolify' &&
+ r.Spec.Labels.type === 'application' &&
+ r.Spec.Labels.configuration
+ );
+ applications = applications.map((r) => {
+ if (JSON.parse(r.Spec.Labels.configuration)) {
+ return {
+ configuration: JSON.parse(r.Spec.Labels.configuration),
+ UpdatedAt: r.UpdatedAt
+ };
+ }
+ return {};
+ });
+ applications = [
+ ...new Map(
+ applications.map((item) => [
+ item.configuration.publish.domain + item.configuration.publish.path,
+ item
+ ])
+ ).values()
+ ];
+ for (const application of applications) {
+ await Configuration.findOneAndUpdate({
+ 'repository.name': application.configuration.repository.name,
+ 'repository.organization': application.configuration.repository.organization,
+ 'repository.branch': application.configuration.repository.branch,
+ }, {
+ ...application.configuration
+ }, { upsert: true })
+ }
+ } catch (error) {
+ console.log(error)
+ }
+})()
+
export async function handle({ request, render }) {
const { SECRETS_ENCRYPTION_KEY } = process.env;
diff --git a/src/lib/api/applications/buildContainer.ts b/src/lib/api/applications/buildContainer.ts
index aad916aec5..e971747f6f 100644
--- a/src/lib/api/applications/buildContainer.ts
+++ b/src/lib/api/applications/buildContainer.ts
@@ -1,4 +1,4 @@
-import Deployment from '$models/Logs/Deployment';
+import Deployment from '$models/Deployment';
import { saveAppLog } from './logging';
import * as packs from './packs';
diff --git a/src/lib/api/applications/cleanup.ts b/src/lib/api/applications/cleanup.ts
index 28a3fd6be3..bb632932f8 100644
--- a/src/lib/api/applications/cleanup.ts
+++ b/src/lib/api/applications/cleanup.ts
@@ -1,4 +1,5 @@
import { docker } from '$lib/api/docker';
+import Deployment from '$models/Deployment';
import { execShellAsync } from '../common';
export async function deleteSameDeployments(configuration) {
@@ -17,29 +18,49 @@ export async function deleteSameDeployments(configuration) {
});
}
+export async function cleanupStuckedDeploymentsInDB() {
+ // Cleanup stucked deployments.
+ await Deployment.updateMany(
+ { progress: { $in: ['queued', 'inprogress'] } },
+ { progress: 'failed' }
+ );
+}
export async function purgeImagesContainers(configuration, deleteAll = false) {
const { name, tag } = configuration.build.container;
- await execShellAsync('docker container prune -f');
- if (deleteAll) {
- const IDsToDelete = (
- await execShellAsync(`docker images ls --filter=reference='${name}' --format '{{json .ID }}'`)
- )
- .trim()
- .replace(/"/g, '')
- .split('\n');
- if (IDsToDelete.length > 0)
- await execShellAsync(`docker rmi -f ${IDsToDelete.toString().replace(',', ' ')}`);
- } else {
- const IDsToDelete = (
- await execShellAsync(
- `docker images ls --filter=reference='${name}' --filter=before='${name}:${tag}' --format '{{json .ID }}'`
+ try {
+ await execShellAsync('docker container prune -f');
+ } catch (error) {
+ //
+ }
+ try {
+ if (deleteAll) {
+ const IDsToDelete = (
+ await execShellAsync(
+ `docker images ls --filter=reference='${name}' --format '{{json .ID }}'`
+ )
+ )
+ .trim()
+ .replace(/"/g, '')
+ .split('\n');
+ if (IDsToDelete.length > 0) await execShellAsync(`docker rmi -f ${IDsToDelete.join(' ')}`);
+ } else {
+ const IDsToDelete = (
+ await execShellAsync(
+ `docker images ls --filter=reference='${name}' --filter=before='${name}:${tag}' --format '{{json .ID }}'`
+ )
)
- )
- .trim()
- .replace(/"/g, '')
- .split('\n');
- if (IDsToDelete.length > 1)
- await execShellAsync(`docker rmi -f ${IDsToDelete.toString().replace(',', ' ')}`);
+ .trim()
+ .replace(/"/g, '')
+ .split('\n');
+ if (IDsToDelete.length > 1) await execShellAsync(`docker rmi -f ${IDsToDelete.join(' ')}`);
+ }
+
+ } catch (error) {
+ console.log(error);
+ }
+ try {
+ await execShellAsync('docker image prune -f');
+ } catch (error) {
+ //
}
- await execShellAsync('docker image prune -f');
}
diff --git a/src/lib/api/applications/logging.ts b/src/lib/api/applications/logging.ts
index 10f7aac1c2..e4df3117a0 100644
--- a/src/lib/api/applications/logging.ts
+++ b/src/lib/api/applications/logging.ts
@@ -1,9 +1,10 @@
import Settings from '$models/Settings';
-import ServerLog from '$models/Logs/Server';
-import ApplicationLog from '$models/Logs/Application';
+import ServerLog from '$models/ServerLog';
+import ApplicationLog from '$models/ApplicationLog';
import dayjs from 'dayjs';
import { version } from '../../../../package.json';
+
function generateTimestamp() {
return `${dayjs().format('YYYY-MM-DD HH:mm:ss.SSS')} `;
}
diff --git a/src/lib/api/applications/packs/helpers.ts b/src/lib/api/applications/packs/helpers.ts
index 80d54179ec..5aca1396c5 100644
--- a/src/lib/api/applications/packs/helpers.ts
+++ b/src/lib/api/applications/packs/helpers.ts
@@ -1,20 +1,21 @@
import { docker, streamEvents } from '$lib/api/docker';
import { promises as fs } from 'fs';
-const buildImageNodeDocker = (configuration) => {
+const buildImageNodeDocker = (configuration, prodBuild) => {
return [
'FROM node:lts',
'WORKDIR /usr/src/app',
`COPY ${configuration.build.directory}/package*.json ./`,
configuration.build.command.installation && `RUN ${configuration.build.command.installation}`,
`COPY ./${configuration.build.directory} ./`,
- `RUN ${configuration.build.command.build}`
+ `RUN ${configuration.build.command.build}`,
+ prodBuild && `RUN rm -fr node_modules && ${configuration.build.command.installation} --prod`
].join('\n');
};
-export async function buildImage(configuration, cacheBuild?: boolean) {
+export async function buildImage(configuration, cacheBuild?: boolean, prodBuild?: boolean) {
await fs.writeFile(
`${configuration.general.workdir}/Dockerfile`,
- buildImageNodeDocker(configuration)
+ buildImageNodeDocker(configuration, prodBuild)
);
const stream = await docker.engine.buildImage(
{ src: ['.'], context: configuration.general.workdir },
diff --git a/src/lib/api/applications/packs/index.ts b/src/lib/api/applications/packs/index.ts
index 1741fa7216..cad73a1858 100644
--- a/src/lib/api/applications/packs/index.ts
+++ b/src/lib/api/applications/packs/index.ts
@@ -7,6 +7,7 @@ import php from './php';
import nuxtjs from './nuxtjs';
import nodejs from './nodejs';
import nextjs from './nextjs';
+import nestjs from './nestjs';
import gatsby from './gatsby';
import docker from './docker';
@@ -20,6 +21,7 @@ export {
nuxtjs,
nodejs,
nextjs,
+ nestjs,
gatsby,
docker
};
diff --git a/src/lib/api/applications/packs/nestjs/index.ts b/src/lib/api/applications/packs/nestjs/index.ts
new file mode 100644
index 0000000000..9443f3220b
--- /dev/null
+++ b/src/lib/api/applications/packs/nestjs/index.ts
@@ -0,0 +1,31 @@
+import { docker, streamEvents } from '$lib/api/docker';
+import { promises as fs } from 'fs';
+import { buildImage } from '../helpers';
+// `HEALTHCHECK --timeout=10s --start-period=10s --interval=5s CMD curl -I -s -f http://localhost:${configuration.publish.port}${configuration.publish.path} || exit 1`,
+const publishNodejsDocker = (configuration) => {
+ return [
+ 'FROM node:lts',
+ 'WORKDIR /usr/src/app',
+ configuration.build.command.build
+ ? `COPY --from=${configuration.build.container.name}:${configuration.build.container.tag} /usr/src/app/${configuration.publish.directory} ./`
+ : `
+ COPY ${configuration.build.directory}/package*.json ./
+ RUN ${configuration.build.command.installation}
+ COPY ./${configuration.build.directory} ./`,
+ `EXPOSE ${configuration.publish.port}`,
+ `CMD ${configuration.build.command.start}`
+ ].join('\n');
+};
+
+export default async function (configuration) {
+ if (configuration.build.command.build) await buildImage(configuration, false, true);
+ await fs.writeFile(
+ `${configuration.general.workdir}/Dockerfile`,
+ publishNodejsDocker(configuration)
+ );
+ const stream = await docker.engine.buildImage(
+ { src: ['.'], context: configuration.general.workdir },
+ { t: `${configuration.build.container.name}:${configuration.build.container.tag}` }
+ );
+ await streamEvents(stream, configuration);
+}
diff --git a/src/lib/api/applications/packs/nextjs/index.ts b/src/lib/api/applications/packs/nextjs/index.ts
index af6821c02a..0e550f78ec 100644
--- a/src/lib/api/applications/packs/nextjs/index.ts
+++ b/src/lib/api/applications/packs/nextjs/index.ts
@@ -13,7 +13,7 @@ const publishNodejsDocker = (configuration) => {
RUN ${configuration.build.command.installation}
COPY ./${configuration.build.directory} ./`,
`EXPOSE ${configuration.publish.port}`,
- 'CMD [ "yarn", "start" ]'
+ `CMD ${configuration.build.command.start}`
].join('\n');
};
export default async function (configuration) {
diff --git a/src/lib/api/applications/packs/nodejs/index.ts b/src/lib/api/applications/packs/nodejs/index.ts
index 8001921ea0..eef7842ae4 100644
--- a/src/lib/api/applications/packs/nodejs/index.ts
+++ b/src/lib/api/applications/packs/nodejs/index.ts
@@ -13,7 +13,7 @@ const publishNodejsDocker = (configuration) => {
RUN ${configuration.build.command.installation}
COPY ./${configuration.build.directory} ./`,
`EXPOSE ${configuration.publish.port}`,
- 'CMD [ "yarn", "start" ]'
+ `CMD ${configuration.build.command.start}`
].join('\n');
};
diff --git a/src/lib/api/applications/packs/nuxtjs/index.ts b/src/lib/api/applications/packs/nuxtjs/index.ts
index eee103ca1d..a444dcf39b 100644
--- a/src/lib/api/applications/packs/nuxtjs/index.ts
+++ b/src/lib/api/applications/packs/nuxtjs/index.ts
@@ -13,7 +13,7 @@ const publishNodejsDocker = (configuration) => {
RUN ${configuration.build.command.installation}
COPY ./${configuration.build.directory} ./`,
`EXPOSE ${configuration.publish.port}`,
- 'CMD [ "yarn", "start" ]'
+ `CMD ${configuration.build.command.start}`
].join('\n');
};
diff --git a/src/lib/api/applications/templates.ts b/src/lib/api/applications/packs/templates.ts
similarity index 84%
rename from src/lib/api/applications/templates.ts
rename to src/lib/api/applications/packs/templates.ts
index 41de3b756f..dd48f47f70 100644
--- a/src/lib/api/applications/templates.ts
+++ b/src/lib/api/applications/packs/templates.ts
@@ -1,6 +1,7 @@
const defaultBuildAndDeploy = {
installation: 'yarn install',
- build: 'yarn build'
+ build: 'yarn build',
+ start: 'yarn start'
};
const templates = {
@@ -10,6 +11,13 @@ const templates = {
directory: 'public',
name: 'Svelte'
},
+ '@nestjs/core': {
+ pack: 'nestjs',
+ ...defaultBuildAndDeploy,
+ start: 'yarn start:prod',
+ port: 3000,
+ name: 'NestJS'
+ },
next: {
pack: 'nextjs',
...defaultBuildAndDeploy,
diff --git a/src/lib/api/applications/queueAndBuild.ts b/src/lib/api/applications/queueAndBuild.ts
index a8a3ed892a..e8705fa259 100644
--- a/src/lib/api/applications/queueAndBuild.ts
+++ b/src/lib/api/applications/queueAndBuild.ts
@@ -1,4 +1,5 @@
-import Deployment from '$models/Logs/Deployment';
+
+import Deployment from '$models/Deployment';
import dayjs from 'dayjs';
import buildContainer from './buildContainer';
import { updateServiceLabels } from './configuration';
@@ -9,23 +10,21 @@ import { saveAppLog } from './logging';
export default async function (configuration, imageChanged) {
const { id, organization, name, branch } = configuration.repository;
const { domain } = configuration.publish;
- const { deployId, nickname } = configuration.general;
- await new Deployment({
- repoId: id,
- branch,
- deployId,
- domain,
- organization,
- name,
- nickname
- }).save();
- await saveAppLog(`${dayjs().format('YYYY-MM-DD HH:mm:ss.SSS')} Queued.`, configuration);
- await copyFiles(configuration);
- await buildContainer(configuration);
- await deploy(configuration, imageChanged);
- await Deployment.findOneAndUpdate(
- { repoId: id, branch, deployId, organization, name, domain },
- { repoId: id, branch, deployId, organization, name, domain, progress: 'done' }
- );
- await updateServiceLabels(configuration);
+ const { deployId} = configuration.general;
+ try {
+ await saveAppLog(`${dayjs().format('YYYY-MM-DD HH:mm:ss.SSS')} Queued.`, configuration);
+ await copyFiles(configuration);
+ await buildContainer(configuration);
+ await deploy(configuration, imageChanged);
+ await Deployment.findOneAndUpdate(
+ { repoId: id, branch, deployId, organization, name, domain },
+ { repoId: id, branch, deployId, organization, name, domain, progress: 'done' }
+ );
+ await updateServiceLabels(configuration);
+ } catch (error) {
+ await Deployment.findOneAndUpdate(
+ { repoId: id, branch, deployId, organization, name, domain },
+ { repoId: id, branch, deployId, organization, name, domain, progress: 'failed' }
+ );
+ }
}
diff --git a/src/lib/api/common.ts b/src/lib/api/common.ts
index 1b077bd64f..df022e1e87 100644
--- a/src/lib/api/common.ts
+++ b/src/lib/api/common.ts
@@ -1,13 +1,17 @@
import shell from 'shelljs';
import User from '$models/User';
import jsonwebtoken from 'jsonwebtoken';
+import { saveServerLog } from './applications/logging';
export function execShellAsync(cmd, opts = {}) {
try {
return new Promise(function (resolve, reject) {
shell.config.silent = true;
- shell.exec(cmd, opts, function (code, stdout, stderr) {
- if (code !== 0) return reject(new Error(stderr));
+ shell.exec(cmd, opts, async function (code, stdout, stderr) {
+ if (code !== 0) {
+ await saveServerLog({ message: JSON.stringify({ cmd, opts, code, stdout, stderr }) })
+ return reject(new Error(stderr));
+ }
return resolve(stdout);
});
});
diff --git a/src/lib/api/github.ts b/src/lib/api/github.ts
new file mode 100644
index 0000000000..7ffef6cc4a
--- /dev/null
+++ b/src/lib/api/github.ts
@@ -0,0 +1,23 @@
+import type { Request } from '@sveltejs/kit';
+
+export async function githubAPI(
+ request: Request,
+ resource: string,
+ token?: string,
+ data?: Record
+) {
+ const base = 'https://api.github.com';
+ const res = await fetch(`${base}${resource}`, {
+ method: request.method,
+ headers: {
+ 'content-type': 'application/json',
+ accept: 'application/json',
+ authorization: token ? `token ${token}` : ''
+ },
+ body: data && JSON.stringify(data)
+ });
+ return {
+ status: res.status,
+ body: await res.json()
+ };
+}
diff --git a/src/lib/api/request.ts b/src/lib/request.ts
similarity index 95%
rename from src/lib/api/request.ts
rename to src/lib/request.ts
index 108fdbf9b4..dea12898a7 100644
--- a/src/lib/api/request.ts
+++ b/src/lib/request.ts
@@ -61,7 +61,6 @@ export async function request(
} else if (response.headers.get('content-type').match(/multipart\/form-data/)) {
return await response.formData();
} else {
- console.log(response);
if (response.headers.get('content-disposition')) {
const blob = await response.blob();
console.log(blob);
@@ -86,10 +85,10 @@ export async function request(
});
} else if (response.status >= 500) {
const error = (await response.json()).error;
- browser && toast.push(error);
+ browser && toast.push(error.message || error);
return Promise.reject({
status: response.status,
- error: error || 'Oops, something is not okay. Are you okay?'
+ error: error.message || error || 'Oops, something is not okay. Are you okay?'
});
} else {
browser && toast.push(response.statusText);
diff --git a/src/models/Logs/Application.ts b/src/models/ApplicationLog.ts
similarity index 68%
rename from src/models/Logs/Application.ts
rename to src/models/ApplicationLog.ts
index 7e8291dadf..5e6d4f1b59 100644
--- a/src/models/Logs/Application.ts
+++ b/src/models/ApplicationLog.ts
@@ -8,4 +8,4 @@ const ApplicationLogsSchema = new Schema({
ApplicationLogsSchema.set('timestamps', true);
-export default mongoose.model('logs-application', ApplicationLogsSchema);
+export default mongoose.models['logs-application'] || mongoose.model('logs-application', ApplicationLogsSchema);
\ No newline at end of file
diff --git a/src/models/Configuration.ts b/src/models/Configuration.ts
new file mode 100644
index 0000000000..9fbe1685fc
--- /dev/null
+++ b/src/models/Configuration.ts
@@ -0,0 +1,48 @@
+import mongoose from 'mongoose';
+const { Schema } = mongoose;
+const ConfigurationSchema = new Schema({
+ github: {
+ installation: {
+ id: { type: Number, required: true }
+ },
+ app: {
+ id: { type: Number, required: true }
+ }
+ },
+ repository: {
+ id: { type: Number, required: true },
+ organization: { type: String, required: true },
+ name: { type: String, required: true },
+ branch: { type: String, required: true },
+ },
+ general: {
+ deployId: { type: String, required: true },
+ nickname: { type: String, required: true },
+ workdir: { type: String, required: true },
+ },
+ build: {
+ pack: { type: String, required: true },
+ directory: { type: String },
+ command: {
+ build: { type: String },
+ installation: { type: String },
+ start: { type: String },
+ },
+ container: {
+ name: { type: String, required: true },
+ tag: { type: String, required: true },
+ baseSHA: { type: String, required: true },
+ },
+ },
+ publish: {
+ directory: { type: String },
+ domain: { type: String, required: true },
+ path: { type: String },
+ port: { type: Number },
+ secrets: { type: Array },
+ }
+});
+
+ConfigurationSchema.set('timestamps', true);
+
+export default mongoose.models['configuration'] || mongoose.model('configuration', ConfigurationSchema);
diff --git a/src/models/Logs/Deployment.ts b/src/models/Deployment.ts
similarity index 84%
rename from src/models/Logs/Deployment.ts
rename to src/models/Deployment.ts
index 34d5df654e..94a4735393 100644
--- a/src/models/Logs/Deployment.ts
+++ b/src/models/Deployment.ts
@@ -14,4 +14,4 @@ const DeploymentSchema = new Schema({
DeploymentSchema.set('timestamps', true);
-export default mongoose.model('deployment', DeploymentSchema);
+export default mongoose.models['deployment'] || mongoose.model('deployment', DeploymentSchema);
diff --git a/src/models/Logs/Server.ts b/src/models/ServerLog.ts
similarity index 79%
rename from src/models/Logs/Server.ts
rename to src/models/ServerLog.ts
index 0c949b4d8b..fb1bcfa7f8 100644
--- a/src/models/Logs/Server.ts
+++ b/src/models/ServerLog.ts
@@ -1,5 +1,5 @@
import mongoose from 'mongoose';
-import { version } from '../../../package.json';
+import { version } from '../../package.json'
const { Schema, Document } = mongoose;
// export interface ILogsServer extends Document {
@@ -20,4 +20,4 @@ const LogsServerSchema = new Schema({
LogsServerSchema.set('timestamps', { createdAt: 'createdAt', updatedAt: false });
-export default mongoose.model('logs-server', LogsServerSchema);
+export default mongoose.models['logs-server'] || mongoose.model('logs-server', LogsServerSchema);
diff --git a/src/models/Settings.ts b/src/models/Settings.ts
index 63686c9804..fcc1fa8175 100644
--- a/src/models/Settings.ts
+++ b/src/models/Settings.ts
@@ -14,4 +14,4 @@ const SettingsSchema = new Schema({
SettingsSchema.set('timestamps', true);
-export default mongoose.model('settings', SettingsSchema);
+export default mongoose.models['settings'] || mongoose.model('settings', SettingsSchema);
diff --git a/src/models/User.ts b/src/models/User.ts
index 818aa4946f..bd69ce5bfb 100644
--- a/src/models/User.ts
+++ b/src/models/User.ts
@@ -14,4 +14,4 @@ const UserSchema = new Schema({
UserSchema.set('timestamps', true);
-export default mongoose.model('user', UserSchema);
+export default mongoose.models['user'] || mongoose.model('user', UserSchema);
diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte
index dce2976752..b61fa79df3 100644
--- a/src/routes/__layout.svelte
+++ b/src/routes/__layout.svelte
@@ -1,6 +1,6 @@
+ {:else if application.configuration.build.pack === 'nestjs'}
+
{:else if application.configuration.build.pack === 'react'}