Skip to content

Commit

Permalink
Merge pull request #12 from strapi/upgrade/5.0.1
Browse files Browse the repository at this point in the history
chore: upgrade to 5.0.1
  • Loading branch information
Mcastres authored Oct 2, 2024
2 parents f01a146 + b2507c4 commit 9ca4944
Show file tree
Hide file tree
Showing 7 changed files with 279 additions and 296 deletions.
8 changes: 4 additions & 4 deletions next/components/dynamic-zone/features/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const Features = ({ heading, sub_heading, globe_card, ray_card, graph_car

<div className="grid grid-cols-1 lg:grid-cols-3 gap-4 py-10">
{globe_card && (
<Card className={`lg:col-span-${convertWordToNumber(globe_card?.span) || '2'}`} >
<Card className={`md:col-span-${convertWordToNumber(globe_card?.span) || '2'}`} >
<CardTitle>{globe_card.title}</CardTitle>
<CardDescription>
{globe_card.description}
Expand All @@ -52,7 +52,7 @@ export const Features = ({ heading, sub_heading, globe_card, ray_card, graph_car
)}

{ray_card && (
<Card className={`lg:col-span-${convertWordToNumber(ray_card?.span) || '1'}`} >
<Card className={`md:col-span-${convertWordToNumber(ray_card?.span) || '1'}`} >
<CardSkeletonContainer className="max-w-[16rem] mx-auto">
<SkeletonTwo />
</CardSkeletonContainer>
Expand All @@ -64,7 +64,7 @@ export const Features = ({ heading, sub_heading, globe_card, ray_card, graph_car
)}

{graph_card && (
<Card className={`lg:col-span-${convertWordToNumber(graph_card?.span) || '2'}`} >
<Card className={`md:col-span-${convertWordToNumber(graph_card?.span) || '2'}`} >
<CardSkeletonContainer
showGradient={false}
className="max-w-[16rem] mx-auto"
Expand All @@ -79,7 +79,7 @@ export const Features = ({ heading, sub_heading, globe_card, ray_card, graph_car
)}

{social_media_card && (
<Card className={`lg:col-span-${convertWordToNumber(social_media_card?.span) || '1'}`} >
<Card className={`md:col-span-${convertWordToNumber(social_media_card?.span) || '1'}`} >
<CardSkeletonContainer showGradient={false}>
<SkeletonFour />
</CardSkeletonContainer>
Expand Down
2 changes: 1 addition & 1 deletion strapi/config/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ export default ({ env }) => ({
host: env('HOST', '0.0.0.0'),
port: env.int('PORT', 1337),
app: {
keys: env.array('APP_KEYS'),
keys: env.array('APP_KEYS') || ["tobemodified1", "tobemodified2"],
},
});
Binary file not shown.
8 changes: 4 additions & 4 deletions strapi/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build": "strapi build",
"strapi": "strapi",
"deploy": "strapi deploy",
"seed": "strapi import -f ./data/export_20240925113338.tar.gz",
"seed": "strapi import -f ./data/export_20241002155953.tar.gz",
"postinstall": "node ./scripts/updateUuid.ts"
},
"devDependencies": {
Expand All @@ -19,9 +19,9 @@
"typescript": "^5"
},
"dependencies": {
"@strapi/plugin-cloud": "5.0.0",
"@strapi/plugin-users-permissions": "5.0.0",
"@strapi/strapi": "5.0.0",
"@strapi/plugin-cloud": "5.0.1",
"@strapi/plugin-users-permissions": "5.0.1",
"@strapi/strapi": "5.0.1",
"better-sqlite3": "9.4.3",
"patch-package": "^8.0.0",
"pluralize": "^8.0.0",
Expand Down
15 changes: 0 additions & 15 deletions strapi/patches/@strapi+admin+5.0.0.patch

This file was deleted.

166 changes: 83 additions & 83 deletions strapi/types/generated/components.d.ts
Original file line number Diff line number Diff line change
@@ -1,84 +1,5 @@
import type { Struct, Schema } from '@strapi/strapi';

export interface ItemsRayItems extends Struct.ComponentSchema {
collectionName: 'components_items_ray_items';
info: {
displayName: 'Ray_Card_Items';
icon: 'bulletList';
description: '';
};
attributes: {
item_1: Schema.Attribute.String;
item_2: Schema.Attribute.String;
item_3: Schema.Attribute.String;
};
}

export interface ItemsLeftNavbarItems extends Struct.ComponentSchema {
collectionName: 'components_items_left_navbar_items';
info: {
displayName: 'Left_Navbar_Items';
icon: 'bulletList';
};
attributes: {
name: Schema.Attribute.String;
URL: Schema.Attribute.String;
};
}

export interface ItemsInput extends Struct.ComponentSchema {
collectionName: 'components_items_inputs';
info: {
displayName: 'Input';
icon: 'apps';
description: '';
};
attributes: {
type: Schema.Attribute.Enumeration<
[
'text',
'email',
'password',
'submit',
'textarea',
'button',
'checkbox',
'color',
'date',
'datetime-local',
'file',
'hidden',
'image',
'month',
'number',
'radio',
'range',
'reset',
'search',
'tel',
'time',
'url',
'week',
]
> &
Schema.Attribute.DefaultTo<'text'>;
name: Schema.Attribute.String;
placeholder: Schema.Attribute.String;
};
}

export interface ItemsGraphCardTopItems extends Struct.ComponentSchema {
collectionName: 'components_items_graph_card_top_items';
info: {
displayName: 'Graph_Card_Top_Items';
icon: 'bulletList';
};
attributes: {
number: Schema.Attribute.String;
text: Schema.Attribute.String;
};
}

export interface SharedUser extends Struct.ComponentSchema {
collectionName: 'components_shared_users';
info: {
Expand Down Expand Up @@ -232,6 +153,85 @@ export interface SharedButton extends Struct.ComponentSchema {
};
}

export interface ItemsRayItems extends Struct.ComponentSchema {
collectionName: 'components_items_ray_items';
info: {
displayName: 'Ray_Card_Items';
icon: 'bulletList';
description: '';
};
attributes: {
item_1: Schema.Attribute.String;
item_2: Schema.Attribute.String;
item_3: Schema.Attribute.String;
};
}

export interface ItemsLeftNavbarItems extends Struct.ComponentSchema {
collectionName: 'components_items_left_navbar_items';
info: {
displayName: 'Left_Navbar_Items';
icon: 'bulletList';
};
attributes: {
name: Schema.Attribute.String;
URL: Schema.Attribute.String;
};
}

export interface ItemsInput extends Struct.ComponentSchema {
collectionName: 'components_items_inputs';
info: {
displayName: 'Input';
icon: 'apps';
description: '';
};
attributes: {
type: Schema.Attribute.Enumeration<
[
'text',
'email',
'password',
'submit',
'textarea',
'button',
'checkbox',
'color',
'date',
'datetime-local',
'file',
'hidden',
'image',
'month',
'number',
'radio',
'range',
'reset',
'search',
'tel',
'time',
'url',
'week',
]
> &
Schema.Attribute.DefaultTo<'text'>;
name: Schema.Attribute.String;
placeholder: Schema.Attribute.String;
};
}

export interface ItemsGraphCardTopItems extends Struct.ComponentSchema {
collectionName: 'components_items_graph_card_top_items';
info: {
displayName: 'Graph_Card_Top_Items';
icon: 'bulletList';
};
attributes: {
number: Schema.Attribute.String;
text: Schema.Attribute.String;
};
}

export interface GlobalNavbar extends Struct.ComponentSchema {
collectionName: 'components_global_navbars';
info: {
Expand Down Expand Up @@ -508,10 +508,6 @@ export interface CardsGlobeCard extends Struct.ComponentSchema {
declare module '@strapi/strapi' {
export module Public {
export interface ComponentSchemas {
'items.ray-items': ItemsRayItems;
'items.left-navbar-items': ItemsLeftNavbarItems;
'items.input': ItemsInput;
'items.graph-card-top-items': ItemsGraphCardTopItems;
'shared.user': SharedUser;
'shared.steps': SharedSteps;
'shared.social-media-icon-links': SharedSocialMediaIconLinks;
Expand All @@ -522,6 +518,10 @@ declare module '@strapi/strapi' {
'shared.launches': SharedLaunches;
'shared.form': SharedForm;
'shared.button': SharedButton;
'items.ray-items': ItemsRayItems;
'items.left-navbar-items': ItemsLeftNavbarItems;
'items.input': ItemsInput;
'items.graph-card-top-items': ItemsGraphCardTopItems;
'global.navbar': GlobalNavbar;
'global.footer': GlobalFooter;
'dynamic-zone.testimonials': DynamicZoneTestimonials;
Expand Down
Loading

0 comments on commit 9ca4944

Please sign in to comment.