Skip to content

Commit 1287a8e

Browse files
authored
Merge pull request #49 from js-template/blank-theme-setup
Mobile menu, Dropdown onclick, backend schema updated and much more issues fixed
2 parents 7029e38 + ea6b221 commit 1287a8e

File tree

32 files changed

+1212
-781
lines changed

32 files changed

+1212
-781
lines changed

apps/backend/src/api/dashboard-home/content-types/dashboard-home/schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"description": ""
99
},
1010
"options": {
11-
"draftAndPublish": true
11+
"draftAndPublish": false
1212
},
1313
"pluginOptions": {},
1414
"attributes": {

apps/backend/src/api/home-page/content-types/home-page/schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"description": ""
99
},
1010
"options": {
11-
"draftAndPublish": true
11+
"draftAndPublish": false
1212
},
1313
"pluginOptions": {
1414
"i18n": {

apps/backend/src/api/layout/content-types/layout/schema.json

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"description": ""
99
},
1010
"options": {
11-
"draftAndPublish": true
11+
"draftAndPublish": false
1212
},
1313
"pluginOptions": {
1414
"i18n": {
@@ -23,7 +23,10 @@
2323
}
2424
},
2525
"type": "dynamiczone",
26-
"components": ["block.public-header", "block.private-header"],
26+
"components": [
27+
"block.public-header",
28+
"block.private-header"
29+
],
2730
"required": false
2831
},
2932
"footer": {
@@ -33,7 +36,10 @@
3336
}
3437
},
3538
"type": "dynamiczone",
36-
"components": ["block.footer", "widget.footer-top"],
39+
"components": [
40+
"block.footer",
41+
"widget.footer-top"
42+
],
3743
"required": false
3844
},
3945
"private_sidebar_menus": {
@@ -43,7 +49,9 @@
4349
}
4450
},
4551
"type": "dynamiczone",
46-
"components": ["shared.share-menu"],
52+
"components": [
53+
"shared.share-menu"
54+
],
4755
"required": false
4856
}
4957
}

apps/backend/src/api/permalink/content-types/permalink/schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"description": ""
99
},
1010
"options": {
11-
"draftAndPublish": true
11+
"draftAndPublish": false
1212
},
1313
"pluginOptions": {},
1414
"attributes": {

apps/backend/src/api/sidebar/content-types/sidebar/schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"description": ""
99
},
1010
"options": {
11-
"draftAndPublish": true
11+
"draftAndPublish": false
1212
},
1313
"pluginOptions": {},
1414
"attributes": {

apps/backend/src/components/header/logo.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,24 @@
1717
},
1818
"link": {
1919
"type": "string"
20+
},
21+
"xs_width": {
22+
"type": "integer",
23+
"required": true,
24+
"default": 150,
25+
"min": 0
26+
},
27+
"sm_width": {
28+
"type": "integer",
29+
"required": true,
30+
"min": 0,
31+
"default": 160
32+
},
33+
"md_width": {
34+
"type": "integer",
35+
"default": 175,
36+
"required": true,
37+
"min": 0
2038
}
2139
}
2240
}

apps/backend/types/generated/components.d.ts

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1264,6 +1264,24 @@ export interface HeaderLogo extends Schema.Component {
12641264
attributes: {
12651265
logo: Attribute.Media;
12661266
link: Attribute.String;
1267+
xs_width: Attribute.Integer &
1268+
Attribute.Required &
1269+
Attribute.SetMinMax<{
1270+
min: 0;
1271+
}> &
1272+
Attribute.DefaultTo<150>;
1273+
sm_width: Attribute.Integer &
1274+
Attribute.Required &
1275+
Attribute.SetMinMax<{
1276+
min: 0;
1277+
}> &
1278+
Attribute.DefaultTo<160>;
1279+
md_width: Attribute.Integer &
1280+
Attribute.Required &
1281+
Attribute.SetMinMax<{
1282+
min: 0;
1283+
}> &
1284+
Attribute.DefaultTo<175>;
12671285
};
12681286
}
12691287

apps/backend/types/generated/contentTypes.d.ts

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,7 @@ export interface ApiDashboardHomeDashboardHome extends Schema.SingleType {
946946
description: '';
947947
};
948948
options: {
949-
draftAndPublish: true;
949+
draftAndPublish: false;
950950
};
951951
attributes: {
952952
title: Attribute.String;
@@ -992,7 +992,6 @@ export interface ApiDashboardHomeDashboardHome extends Schema.SingleType {
992992
styles: Attribute.Component<'component.gird-container'>;
993993
createdAt: Attribute.DateTime;
994994
updatedAt: Attribute.DateTime;
995-
publishedAt: Attribute.DateTime;
996995
createdBy: Attribute.Relation<
997996
'api::dashboard-home.dashboard-home',
998997
'oneToOne',
@@ -1108,7 +1107,7 @@ export interface ApiHomePageHomePage extends Schema.SingleType {
11081107
description: '';
11091108
};
11101109
options: {
1111-
draftAndPublish: true;
1110+
draftAndPublish: false;
11121111
};
11131112
pluginOptions: {
11141113
i18n: {
@@ -1150,7 +1149,6 @@ export interface ApiHomePageHomePage extends Schema.SingleType {
11501149
}>;
11511150
createdAt: Attribute.DateTime;
11521151
updatedAt: Attribute.DateTime;
1153-
publishedAt: Attribute.DateTime;
11541152
createdBy: Attribute.Relation<
11551153
'api::home-page.home-page',
11561154
'oneToOne',
@@ -1181,7 +1179,7 @@ export interface ApiLayoutLayout extends Schema.SingleType {
11811179
description: '';
11821180
};
11831181
options: {
1184-
draftAndPublish: true;
1182+
draftAndPublish: false;
11851183
};
11861184
pluginOptions: {
11871185
i18n: {
@@ -1211,7 +1209,6 @@ export interface ApiLayoutLayout extends Schema.SingleType {
12111209
}>;
12121210
createdAt: Attribute.DateTime;
12131211
updatedAt: Attribute.DateTime;
1214-
publishedAt: Attribute.DateTime;
12151212
createdBy: Attribute.Relation<
12161213
'api::layout.layout',
12171214
'oneToOne',
@@ -1356,14 +1353,13 @@ export interface ApiPermalinkPermalink extends Schema.SingleType {
13561353
description: '';
13571354
};
13581355
options: {
1359-
draftAndPublish: true;
1356+
draftAndPublish: false;
13601357
};
13611358
attributes: {
13621359
structure: Attribute.Enumeration<['Plain', 'Name and display']>;
13631360
singlePage: Attribute.Component<'config.single-page', true>;
13641361
createdAt: Attribute.DateTime;
13651362
updatedAt: Attribute.DateTime;
1366-
publishedAt: Attribute.DateTime;
13671363
createdBy: Attribute.Relation<
13681364
'api::permalink.permalink',
13691365
'oneToOne',
@@ -1576,7 +1572,7 @@ export interface ApiSidebarSidebar extends Schema.SingleType {
15761572
description: '';
15771573
};
15781574
options: {
1579-
draftAndPublish: true;
1575+
draftAndPublish: false;
15801576
};
15811577
attributes: {
15821578
adsSidebar: Attribute.DynamicZone<
@@ -1587,7 +1583,6 @@ export interface ApiSidebarSidebar extends Schema.SingleType {
15871583
>;
15881584
createdAt: Attribute.DateTime;
15891585
updatedAt: Attribute.DateTime;
1590-
publishedAt: Attribute.DateTime;
15911586
createdBy: Attribute.Relation<
15921587
'api::sidebar.sidebar',
15931588
'oneToOne',

apps/site/src/app/(private)/dashboard/[slug]/page.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@ export default async function DynamicPrivatePages({
5454
const pageSlug = params?.slug
5555
const session = await auth()
5656

57-
// console.log("Page Slug", pageSlug)
58-
5957
if (!session) {
6058
redirect("/login")
6159
}

apps/site/src/app/(private)/dashboard/body.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ interface BodyProps {
1919
}
2020

2121
const Body: React.FC<BodyProps> = ({ blocks, styles, session, language, currentThemeComponents }) => {
22-
//console.log("Blocks", blocks)
2322
return (
2423
<Grid
2524
container

0 commit comments

Comments
 (0)