Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions apps/cms/config/admin.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
export default ({ env }) => ({
auth: {
secret: env('ADMIN_JWT_SECRET'),
// The 'sessions' object replaces the deprecated 'options.expiresIn'
sessions: {
// maxSessionLifespan is the absolute maximum time a session can be valid for.
// It is expressed in seconds. Default is 7 days.
maxSessionLifespan: 60 * 60 * 24 * 7, // 7 days in seconds
// maxRefreshTokenLifespan is the maximum time a refresh token can be used to get a new session.
// It is expressed in seconds. Default is 30 days.
maxRefreshTokenLifespan: 60 * 60 * 24 * 30, // 30 days in seconds
},
},
apiToken: {
salt: env('API_TOKEN_SALT'),
Expand Down
1 change: 1 addition & 0 deletions apps/cms/config/server.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
export default ({ env }) => ({
host: env('HOST', '0.0.0.0'),
port: env.int('PORT', 1337),
proxy: true,
app: {
keys: env.array('APP_KEYS'),
},
Expand Down
28 changes: 14 additions & 14 deletions apps/cms/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@
"upgrade:dry": "npx @strapi/upgrade latest --dry"
},
"dependencies": {
"@strapi/plugin-cloud": "5.12.6",
"@strapi/plugin-users-permissions": "5.12.6",
"@strapi/strapi": "5.12.6",
"better-sqlite3": "11.3.0",
"pg": "^8.15.6",
"react": "^18.0.0",
"react-dom": "^18.0.0",
"react-router-dom": "^6.0.0",
"styled-components": "^6.0.0"
"@strapi/plugin-cloud": "5.25.0",
"@strapi/plugin-users-permissions": "5.25.0",
"@strapi/strapi": "5.25.0",
"better-sqlite3": "11.10.0",
"pg": "^8.16.3",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router-dom": "^6.30.1",
"styled-components": "^6.1.19"
},
"devDependencies": {
"@types/node": "^20",
"@types/react": "^18",
"@types/react-dom": "^18",
"typescript": "^5"
"@types/node": "^22.18.8",
"@types/react": "^18.3.25",
"@types/react-dom": "^18.3.7",
"typescript": "^5.9.3"
},
"engines": {
"node": ">=18.0.0 <=22.x.x",
Expand All @@ -38,5 +38,5 @@
"strapi": {
"uuid": "4306fc8e-678a-43c9-a46c-6335a583c9f7"
},
"packageManager": "pnpm@10.8.1+sha512.c50088ba998c67b8ca8c99df8a5e02fd2ae2e2b29aaf238feaa9e124248d3f48f9fb6db2424949ff901cffbb5e0f0cc1ad6aedb602cd29450751d11c35023677"
"packageManager": "pnpm@10.18.0"
}
2,020 changes: 936 additions & 1,084 deletions apps/cms/pnpm-lock.yaml

Large diffs are not rendered by default.

64 changes: 64 additions & 0 deletions apps/cms/src/api/artikkel/content-types/artikkel/schema.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
{
"kind": "collectionType",
"collectionName": "artikler",
"info": {
"singularName": "artikkel",
"pluralName": "artikler",
"displayName": "Artikkel"
},
"options": {
"draftAndPublish": true
},
"pluginOptions": {
"i18n": {
"localized": true
}
},
"attributes": {
"Tittel": {
"type": "string",
"pluginOptions": {
"i18n": {
"localized": true
}
},
"required": true
},
"Ingress": {
"type": "text",
"pluginOptions": {
"i18n": {
"localized": true
}
}
},
"Brodtekst": {
"type": "blocks",
"pluginOptions": {
"i18n": {
"localized": true
}
}
},
"Bunntekst": {
"type": "text",
"pluginOptions": {
"i18n": {
"localized": true
}
}
},
"artikkel": {
"type": "relation",
"relation": "manyToOne",
"target": "api::artikkel.artikkel",
"inversedBy": "artikler"
},
"artikler": {
"type": "relation",
"relation": "oneToMany",
"target": "api::artikkel.artikkel",
"mappedBy": "artikkel"
}
}
}
7 changes: 7 additions & 0 deletions apps/cms/src/api/artikkel/controllers/artikkel.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/**
* artikkel controller
*/

import { factories } from '@strapi/strapi'

export default factories.createCoreController('api::artikkel.artikkel');
7 changes: 7 additions & 0 deletions apps/cms/src/api/artikkel/routes/artikkel.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/**
* artikkel router
*/

import { factories } from '@strapi/strapi';

export default factories.createCoreRouter('api::artikkel.artikkel');
7 changes: 7 additions & 0 deletions apps/cms/src/api/artikkel/services/artikkel.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/**
* artikkel service
*/

import { factories } from '@strapi/strapi';

export default factories.createCoreService('api::artikkel.artikkel');
44 changes: 0 additions & 44 deletions apps/cms/src/api/service/content-types/service/schema.json

This file was deleted.

7 changes: 0 additions & 7 deletions apps/cms/src/api/service/controllers/service.ts

This file was deleted.

7 changes: 0 additions & 7 deletions apps/cms/src/api/service/routes/service.ts

This file was deleted.

7 changes: 0 additions & 7 deletions apps/cms/src/api/service/services/service.ts

This file was deleted.

47 changes: 34 additions & 13 deletions apps/cms/types/generated/contentTypes.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -369,13 +369,12 @@ export interface AdminUser extends Struct.CollectionTypeSchema {
};
}

export interface ApiServiceService extends Struct.CollectionTypeSchema {
collectionName: 'services';
export interface ApiArtikkelArtikkel extends Struct.CollectionTypeSchema {
collectionName: 'artikler';
info: {
description: '';
displayName: 'Service';
pluralName: 'services';
singularName: 'service';
displayName: 'Artikkel';
pluralName: 'artikler';
singularName: 'artikkel';
};
options: {
draftAndPublish: true;
Expand All @@ -386,20 +385,42 @@ export interface ApiServiceService extends Struct.CollectionTypeSchema {
};
};
attributes: {
artikkel: Schema.Attribute.Relation<'manyToOne', 'api::artikkel.artikkel'>;
artikler: Schema.Attribute.Relation<'oneToMany', 'api::artikkel.artikkel'>;
Brodtekst: Schema.Attribute.Blocks &
Schema.Attribute.SetPluginOptions<{
i18n: {
localized: true;
};
}>;
Bunntekst: Schema.Attribute.Text &
Schema.Attribute.SetPluginOptions<{
i18n: {
localized: true;
};
}>;
createdAt: Schema.Attribute.DateTime;
createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
Schema.Attribute.Private;
Description: Schema.Attribute.Text;
icon: Schema.Attribute.Media<'images' | 'files'>;
Ingress: Schema.Attribute.Text &
Schema.Attribute.SetPluginOptions<{
i18n: {
localized: true;
};
}>;
locale: Schema.Attribute.String;
localizations: Schema.Attribute.Relation<
'oneToMany',
'api::service.service'
'api::artikkel.artikkel'
>;
Provider: Schema.Attribute.String & Schema.Attribute.Required;
provider_link_address: Schema.Attribute.String;
publishedAt: Schema.Attribute.DateTime;
Title: Schema.Attribute.String & Schema.Attribute.Required;
Tittel: Schema.Attribute.String &
Schema.Attribute.Required &
Schema.Attribute.SetPluginOptions<{
i18n: {
localized: true;
};
}>;
updatedAt: Schema.Attribute.DateTime;
updatedBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
Schema.Attribute.Private;
Expand Down Expand Up @@ -915,7 +936,7 @@ declare module '@strapi/strapi' {
'admin::transfer-token': AdminTransferToken;
'admin::transfer-token-permission': AdminTransferTokenPermission;
'admin::user': AdminUser;
'api::service.service': ApiServiceService;
'api::artikkel.artikkel': ApiArtikkelArtikkel;
'plugin::content-releases.release': PluginContentReleasesRelease;
'plugin::content-releases.release-action': PluginContentReleasesReleaseAction;
'plugin::i18n.locale': PluginI18NLocale;
Expand Down