Skip to content

Commit 8cb2ad7

Browse files
home-serverhome-server
authored andcommitted
Update Strapi to latest and fix some CSS issues
1 parent e9b631a commit 8cb2ad7

File tree

6 files changed

+2031
-1287
lines changed

6 files changed

+2031
-1287
lines changed

client/src/components/blocks/markdown-text.tsx

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,27 @@ export interface IMarkdownText {
88

99
const markdownStyles = {
1010
richText:
11-
"rich-text py-6 dark:bg-black dark:text-gray-50 prose prose-lg max-w-none text-gray-700",
12-
h1: "text-3xl font-bold mb-4 text-gray-900 dark:text-white",
13-
h2: "text-2xl font-bold mb-3 text-gray-900 dark:text-white",
14-
h3: "text-xl font-semibold mb-2 text-gray-800 dark:text-gray-100",
15-
p: "mb-4 leading-relaxed",
16-
a: "text-blue-600 hover:text-blue-700 dark:text-blue-400 dark:hover:text-blue-300 underline",
11+
"rich-text py-6 prose prose-lg max-w-none text-foreground",
12+
h1: "text-3xl font-bold mb-4 text-foreground",
13+
h2: "text-2xl font-bold mb-3 text-foreground",
14+
h3: "text-xl font-semibold mb-2 text-foreground",
15+
p: "mb-4 leading-relaxed text-foreground",
16+
a: "text-primary hover:opacity-80 underline",
1717
ul: "list-disc pl-6 mb-4 space-y-2",
1818
ol: "list-decimal pl-6 mb-4 space-y-2",
1919
li: "leading-relaxed",
2020
blockquote:
21-
"border-l-4 border-blue-500 pl-4 italic text-gray-600 dark:text-gray-400 mb-4",
21+
"border-l-4 border-primary pl-4 italic text-muted-foreground mb-4",
2222
codeBlock:
23-
"block bg-gray-100 dark:bg-gray-800 p-4 rounded-lg text-sm overflow-x-auto",
24-
codeInline: "bg-gray-100 dark:bg-gray-800 px-2 py-1 rounded text-sm",
25-
pre: "bg-gray-100 dark:bg-gray-800 p-4 rounded-lg overflow-x-auto mb-4",
23+
"block bg-muted p-4 rounded-lg text-sm overflow-x-auto text-foreground",
24+
codeInline: "bg-muted px-2 py-1 rounded text-sm text-foreground",
25+
pre: "bg-muted p-4 rounded-lg overflow-x-auto mb-4",
2626
table:
27-
"w-full border-collapse border border-gray-300 dark:border-gray-600 mb-4",
28-
th: "border border-gray-300 dark:border-gray-600 p-2 bg-gray-100 dark:bg-gray-800 font-semibold text-left",
29-
td: "border border-gray-300 dark:border-gray-600 p-2",
27+
"w-full border-collapse border border-border mb-4",
28+
th: "border border-border p-2 bg-muted font-semibold text-left text-foreground",
29+
td: "border border-border p-2 text-foreground",
3030
img: "max-w-full h-auto rounded-lg mb-4",
31-
hr: "border-gray-300 dark:border-gray-600 my-8",
31+
hr: "border-border my-8",
3232
};
3333

3434
export function MarkdownText(props: Readonly<IMarkdownText>) {

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,6 @@
2222
},
2323
"devDependencies": {
2424
"ts-node": "^10.9.2"
25-
}
26-
}
25+
},
26+
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
27+
}

seed-data.tar.gz

520 Bytes
Binary file not shown.

server/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
"upgrade:dry": "npx @strapi/upgrade latest --dry"
1616
},
1717
"dependencies": {
18-
"@strapi/plugin-cloud": "5.20.0",
19-
"@strapi/plugin-users-permissions": "5.20.0",
20-
"@strapi/strapi": "5.20.0",
18+
"@strapi/plugin-cloud": "5.27.0",
19+
"@strapi/plugin-users-permissions": "5.27.0",
20+
"@strapi/strapi": "5.27.0",
2121
"better-sqlite3": "11.3.0",
2222
"react": "^18.0.0",
2323
"react-dom": "^18.0.0",

server/types/generated/contentTypes.d.ts

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,63 @@ export interface AdminRole extends Struct.CollectionTypeSchema {
203203
};
204204
}
205205

206+
export interface AdminSession extends Struct.CollectionTypeSchema {
207+
collectionName: 'strapi_sessions';
208+
info: {
209+
description: 'Session Manager storage';
210+
displayName: 'Session';
211+
name: 'Session';
212+
pluralName: 'sessions';
213+
singularName: 'session';
214+
};
215+
options: {
216+
draftAndPublish: false;
217+
};
218+
pluginOptions: {
219+
'content-manager': {
220+
visible: false;
221+
};
222+
'content-type-builder': {
223+
visible: false;
224+
};
225+
i18n: {
226+
localized: false;
227+
};
228+
};
229+
attributes: {
230+
absoluteExpiresAt: Schema.Attribute.DateTime & Schema.Attribute.Private;
231+
childId: Schema.Attribute.String & Schema.Attribute.Private;
232+
createdAt: Schema.Attribute.DateTime;
233+
createdBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
234+
Schema.Attribute.Private;
235+
deviceId: Schema.Attribute.String &
236+
Schema.Attribute.Required &
237+
Schema.Attribute.Private;
238+
expiresAt: Schema.Attribute.DateTime &
239+
Schema.Attribute.Required &
240+
Schema.Attribute.Private;
241+
locale: Schema.Attribute.String & Schema.Attribute.Private;
242+
localizations: Schema.Attribute.Relation<'oneToMany', 'admin::session'> &
243+
Schema.Attribute.Private;
244+
origin: Schema.Attribute.String &
245+
Schema.Attribute.Required &
246+
Schema.Attribute.Private;
247+
publishedAt: Schema.Attribute.DateTime;
248+
sessionId: Schema.Attribute.String &
249+
Schema.Attribute.Required &
250+
Schema.Attribute.Private &
251+
Schema.Attribute.Unique;
252+
status: Schema.Attribute.String & Schema.Attribute.Private;
253+
type: Schema.Attribute.String & Schema.Attribute.Private;
254+
updatedAt: Schema.Attribute.DateTime;
255+
updatedBy: Schema.Attribute.Relation<'oneToOne', 'admin::user'> &
256+
Schema.Attribute.Private;
257+
userId: Schema.Attribute.String &
258+
Schema.Attribute.Required &
259+
Schema.Attribute.Private;
260+
};
261+
}
262+
206263
export interface AdminTransferToken extends Struct.CollectionTypeSchema {
207264
collectionName: 'strapi_transfer_tokens';
208265
info: {
@@ -1109,6 +1166,7 @@ declare module '@strapi/strapi' {
11091166
'admin::api-token-permission': AdminApiTokenPermission;
11101167
'admin::permission': AdminPermission;
11111168
'admin::role': AdminRole;
1169+
'admin::session': AdminSession;
11121170
'admin::transfer-token': AdminTransferToken;
11131171
'admin::transfer-token-permission': AdminTransferTokenPermission;
11141172
'admin::user': AdminUser;

0 commit comments

Comments
 (0)