diff --git a/.editorconfig b/.editorconfig old mode 100644 new mode 100755 diff --git a/.env.example b/.env.example old mode 100644 new mode 100755 diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/config/admin.ts b/config/admin.ts old mode 100644 new mode 100755 diff --git a/config/api.ts b/config/api.ts old mode 100644 new mode 100755 diff --git a/config/database.ts b/config/database.ts old mode 100644 new mode 100755 diff --git a/config/middlewares.ts b/config/middlewares.ts old mode 100644 new mode 100755 diff --git a/config/plugins.ts b/config/plugins.ts old mode 100644 new mode 100755 diff --git a/config/server.ts b/config/server.ts old mode 100644 new mode 100755 diff --git a/database/migrations/.gitkeep b/database/migrations/.gitkeep old mode 100644 new mode 100755 diff --git a/favicon.png b/favicon.png old mode 100644 new mode 100755 diff --git a/package-lock.json b/package-lock.json old mode 100644 new mode 100755 diff --git a/package.json b/package.json old mode 100644 new mode 100755 diff --git a/public/robots.txt b/public/robots.txt old mode 100644 new mode 100755 diff --git a/public/uploads/.gitkeep b/public/uploads/.gitkeep old mode 100644 new mode 100755 diff --git a/src/admin/app.example.tsx b/src/admin/app.example.tsx old mode 100644 new mode 100755 diff --git a/src/admin/tsconfig.json b/src/admin/tsconfig.json old mode 100644 new mode 100755 diff --git a/src/admin/webpack.config.example.js b/src/admin/webpack.config.example.js old mode 100644 new mode 100755 diff --git a/src/api/.gitkeep b/src/api/.gitkeep old mode 100644 new mode 100755 diff --git a/src/api/display1/content-types/display1/schema.json b/src/api/display1/content-types/display1/schema.json deleted file mode 100644 index b47e1b1..0000000 --- a/src/api/display1/content-types/display1/schema.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "kind": "collectionType", - "collectionName": "display1s", - "info": { - "singularName": "display1", - "pluralName": "display1s", - "displayName": "display1", - "description": "" - }, - "options": { - "draftAndPublish": true - }, - "pluginOptions": {}, - "attributes": { - "text1": { - "type": "string" - }, - "ck1": { - "type": "customField", - "options": { - "preset": "default" - }, - "customField": "plugin::ckeditor5.CKEditor" - } - } -} diff --git a/src/api/display1/controllers/display1.ts b/src/api/display1/controllers/display1.ts deleted file mode 100644 index c5daf12..0000000 --- a/src/api/display1/controllers/display1.ts +++ /dev/null @@ -1,7 +0,0 @@ -/** - * display1 controller - */ - -import { factories } from '@strapi/strapi' - -export default factories.createCoreController('api::display1.display1'); diff --git a/src/api/display1/routes/display1.ts b/src/api/display1/routes/display1.ts deleted file mode 100644 index f8e02f9..0000000 --- a/src/api/display1/routes/display1.ts +++ /dev/null @@ -1,7 +0,0 @@ -/** - * display1 router - */ - -import { factories } from '@strapi/strapi'; - -export default factories.createCoreRouter('api::display1.display1'); diff --git a/src/api/display1/services/display1.ts b/src/api/display1/services/display1.ts deleted file mode 100644 index c9b46ff..0000000 --- a/src/api/display1/services/display1.ts +++ /dev/null @@ -1,7 +0,0 @@ -/** - * display1 service - */ - -import { factories } from '@strapi/strapi'; - -export default factories.createCoreService('api::display1.display1'); diff --git a/src/api/display2/content-types/display2/schema.json b/src/api/display2/content-types/display2/schema.json deleted file mode 100644 index 6a0b8e4..0000000 --- a/src/api/display2/content-types/display2/schema.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "kind": "collectionType", - "collectionName": "display2s", - "info": { - "singularName": "display2", - "pluralName": "display2s", - "displayName": "display2" - }, - "options": { - "draftAndPublish": true - }, - "pluginOptions": {}, - "attributes": { - "json1": { - "type": "json" - } - } -} diff --git a/src/api/display2/controllers/display2.ts b/src/api/display2/controllers/display2.ts deleted file mode 100644 index 51601ab..0000000 --- a/src/api/display2/controllers/display2.ts +++ /dev/null @@ -1,7 +0,0 @@ -/** - * display2 controller - */ - -import { factories } from '@strapi/strapi' - -export default factories.createCoreController('api::display2.display2'); diff --git a/src/api/display2/routes/display2.ts b/src/api/display2/routes/display2.ts deleted file mode 100644 index e65e6d4..0000000 --- a/src/api/display2/routes/display2.ts +++ /dev/null @@ -1,7 +0,0 @@ -/** - * display2 router - */ - -import { factories } from '@strapi/strapi'; - -export default factories.createCoreRouter('api::display2.display2'); diff --git a/src/api/display2/services/display2.ts b/src/api/display2/services/display2.ts deleted file mode 100644 index 1b87eba..0000000 --- a/src/api/display2/services/display2.ts +++ /dev/null @@ -1,7 +0,0 @@ -/** - * display2 service - */ - -import { factories } from '@strapi/strapi'; - -export default factories.createCoreService('api::display2.display2'); diff --git a/src/api/janlist/controllers/janlist.ts b/src/api/janlist/controllers/janlist.ts deleted file mode 100644 index 3a6d29d..0000000 --- a/src/api/janlist/controllers/janlist.ts +++ /dev/null @@ -1,7 +0,0 @@ -/** - * janlist controller - */ - -import { factories } from '@strapi/strapi' - -export default factories.createCoreController('api::janlist.janlist'); diff --git a/src/api/janlist/routes/janlist.ts b/src/api/janlist/routes/janlist.ts deleted file mode 100644 index 0be0877..0000000 --- a/src/api/janlist/routes/janlist.ts +++ /dev/null @@ -1,7 +0,0 @@ -/** - * janlist router - */ - -import { factories } from '@strapi/strapi'; - -export default factories.createCoreRouter('api::janlist.janlist'); diff --git a/src/api/janlist/services/janlist.ts b/src/api/janlist/services/janlist.ts deleted file mode 100644 index a9e44e7..0000000 --- a/src/api/janlist/services/janlist.ts +++ /dev/null @@ -1,7 +0,0 @@ -/** - * janlist service - */ - -import { factories } from '@strapi/strapi'; - -export default factories.createCoreService('api::janlist.janlist'); diff --git a/src/api/janlist/content-types/janlist/schema.json b/src/api/news-post/content-types/news-post/schema.json old mode 100644 new mode 100755 similarity index 54% rename from src/api/janlist/content-types/janlist/schema.json rename to src/api/news-post/content-types/news-post/schema.json index 188d9c2..0e5ce41 --- a/src/api/janlist/content-types/janlist/schema.json +++ b/src/api/news-post/content-types/news-post/schema.json @@ -1,24 +1,27 @@ { "kind": "collectionType", - "collectionName": "janlists", + "collectionName": "news_posts", "info": { - "singularName": "janlist", - "pluralName": "janlists", - "displayName": "janlist" + "singularName": "news-post", + "pluralName": "news-posts", + "displayName": "NewsPost" }, "options": { "draftAndPublish": true }, "pluginOptions": {}, "attributes": { - "product": { - "type": "string" - }, - "jan": { + "title": { "type": "string" }, "description": { "type": "string" + }, + "pageUrl": { + "type": "string" + }, + "imageUrl": { + "type": "string" } } } diff --git a/src/api/news-post/controllers/news-post.ts b/src/api/news-post/controllers/news-post.ts new file mode 100755 index 0000000..4d1555d --- /dev/null +++ b/src/api/news-post/controllers/news-post.ts @@ -0,0 +1,7 @@ +/** + * news-post controller + */ + +import { factories } from '@strapi/strapi' + +export default factories.createCoreController('api::news-post.news-post'); diff --git a/src/api/news-post/routes/news-post.ts b/src/api/news-post/routes/news-post.ts new file mode 100755 index 0000000..afb48c3 --- /dev/null +++ b/src/api/news-post/routes/news-post.ts @@ -0,0 +1,7 @@ +/** + * news-post router + */ + +import { factories } from '@strapi/strapi'; + +export default factories.createCoreRouter('api::news-post.news-post'); diff --git a/src/api/news-post/services/news-post.ts b/src/api/news-post/services/news-post.ts new file mode 100755 index 0000000..5878a5c --- /dev/null +++ b/src/api/news-post/services/news-post.ts @@ -0,0 +1,7 @@ +/** + * news-post service + */ + +import { factories } from '@strapi/strapi'; + +export default factories.createCoreService('api::news-post.news-post'); diff --git a/src/api/point-balance/content-types/point-balance/schema.json b/src/api/point-balance/content-types/point-balance/schema.json new file mode 100755 index 0000000..9d745e1 --- /dev/null +++ b/src/api/point-balance/content-types/point-balance/schema.json @@ -0,0 +1,24 @@ +{ + "kind": "collectionType", + "collectionName": "point_balances", + "info": { + "singularName": "point-balance", + "pluralName": "point-balances", + "displayName": "PointBalance", + "description": "" + }, + "options": { + "draftAndPublish": true + }, + "pluginOptions": {}, + "attributes": { + "total_points": { + "type": "integer" + }, + "users_permissions_user": { + "type": "relation", + "relation": "oneToOne", + "target": "plugin::users-permissions.user" + } + } +} diff --git a/src/api/point-balance/controllers/point-balance.ts b/src/api/point-balance/controllers/point-balance.ts new file mode 100755 index 0000000..cc1637c --- /dev/null +++ b/src/api/point-balance/controllers/point-balance.ts @@ -0,0 +1,7 @@ +/** + * point-balance controller + */ + +import { factories } from '@strapi/strapi' + +export default factories.createCoreController('api::point-balance.point-balance'); diff --git a/src/api/point-balance/routes/point-balance.ts b/src/api/point-balance/routes/point-balance.ts new file mode 100755 index 0000000..3e9f81a --- /dev/null +++ b/src/api/point-balance/routes/point-balance.ts @@ -0,0 +1,7 @@ +/** + * point-balance router + */ + +import { factories } from '@strapi/strapi'; + +export default factories.createCoreRouter('api::point-balance.point-balance'); diff --git a/src/api/point-balance/services/point-balance.ts b/src/api/point-balance/services/point-balance.ts new file mode 100755 index 0000000..c14362f --- /dev/null +++ b/src/api/point-balance/services/point-balance.ts @@ -0,0 +1,7 @@ +/** + * point-balance service + */ + +import { factories } from '@strapi/strapi'; + +export default factories.createCoreService('api::point-balance.point-balance'); diff --git a/src/api/point-exchange-request/content-types/point-exchange-request/schema.json b/src/api/point-exchange-request/content-types/point-exchange-request/schema.json new file mode 100755 index 0000000..1d6bb77 --- /dev/null +++ b/src/api/point-exchange-request/content-types/point-exchange-request/schema.json @@ -0,0 +1,45 @@ +{ + "kind": "collectionType", + "collectionName": "point_exchange_requests", + "info": { + "singularName": "point-exchange-request", + "pluralName": "point-exchange-requests", + "displayName": "PointExchangeRequest", + "description": "" + }, + "options": { + "draftAndPublish": true + }, + "pluginOptions": {}, + "attributes": { + "type": { + "type": "enumeration", + "enum": [ + "add", + "subtract" + ] + }, + "amount": { + "type": "integer" + }, + "reason": { + "type": "string" + }, + "status": { + "type": "enumeration", + "enum": [ + "pending", + "approved", + "rejected" + ] + }, + "admin_note": { + "type": "string" + }, + "users_permissions_users": { + "type": "relation", + "relation": "oneToMany", + "target": "plugin::users-permissions.user" + } + } +} diff --git a/src/api/point-exchange-request/controllers/point-exchange-request.ts b/src/api/point-exchange-request/controllers/point-exchange-request.ts new file mode 100755 index 0000000..3caa15d --- /dev/null +++ b/src/api/point-exchange-request/controllers/point-exchange-request.ts @@ -0,0 +1,7 @@ +/** + * point-exchange-request controller + */ + +import { factories } from '@strapi/strapi' + +export default factories.createCoreController('api::point-exchange-request.point-exchange-request'); diff --git a/src/api/point-exchange-request/routes/point-exchange-request.ts b/src/api/point-exchange-request/routes/point-exchange-request.ts new file mode 100755 index 0000000..bf4ea6d --- /dev/null +++ b/src/api/point-exchange-request/routes/point-exchange-request.ts @@ -0,0 +1,7 @@ +/** + * point-exchange-request router + */ + +import { factories } from '@strapi/strapi'; + +export default factories.createCoreRouter('api::point-exchange-request.point-exchange-request'); diff --git a/src/api/point-exchange-request/services/point-exchange-request.ts b/src/api/point-exchange-request/services/point-exchange-request.ts new file mode 100755 index 0000000..f3f8079 --- /dev/null +++ b/src/api/point-exchange-request/services/point-exchange-request.ts @@ -0,0 +1,7 @@ +/** + * point-exchange-request service + */ + +import { factories } from '@strapi/strapi'; + +export default factories.createCoreService('api::point-exchange-request.point-exchange-request'); diff --git a/src/api/point-transaction/content-types/point-transaction/schema.json b/src/api/point-transaction/content-types/point-transaction/schema.json new file mode 100755 index 0000000..bcebeb9 --- /dev/null +++ b/src/api/point-transaction/content-types/point-transaction/schema.json @@ -0,0 +1,35 @@ +{ + "kind": "collectionType", + "collectionName": "point_transactions", + "info": { + "singularName": "point-transaction", + "pluralName": "point-transactions", + "displayName": "PointTransaction", + "description": "" + }, + "options": { + "draftAndPublish": true + }, + "pluginOptions": {}, + "attributes": { + "Enumeration": { + "type": "enumeration", + "enum": [ + "add", + "subtract", + "adjust" + ] + }, + "amount": { + "type": "integer" + }, + "description": { + "type": "string" + }, + "users_permissions_users": { + "type": "relation", + "relation": "oneToMany", + "target": "plugin::users-permissions.user" + } + } +} diff --git a/src/api/point-transaction/controllers/point-transaction.ts b/src/api/point-transaction/controllers/point-transaction.ts new file mode 100755 index 0000000..f5808e3 --- /dev/null +++ b/src/api/point-transaction/controllers/point-transaction.ts @@ -0,0 +1,7 @@ +/** + * point-transaction controller + */ + +import { factories } from '@strapi/strapi' + +export default factories.createCoreController('api::point-transaction.point-transaction'); diff --git a/src/api/point-transaction/routes/point-transaction.ts b/src/api/point-transaction/routes/point-transaction.ts new file mode 100755 index 0000000..4c16c16 --- /dev/null +++ b/src/api/point-transaction/routes/point-transaction.ts @@ -0,0 +1,7 @@ +/** + * point-transaction router + */ + +import { factories } from '@strapi/strapi'; + +export default factories.createCoreRouter('api::point-transaction.point-transaction'); diff --git a/src/api/point-transaction/services/point-transaction.ts b/src/api/point-transaction/services/point-transaction.ts new file mode 100755 index 0000000..0d7ddbc --- /dev/null +++ b/src/api/point-transaction/services/point-transaction.ts @@ -0,0 +1,7 @@ +/** + * point-transaction service + */ + +import { factories } from '@strapi/strapi'; + +export default factories.createCoreService('api::point-transaction.point-transaction'); diff --git a/src/extensions/.gitkeep b/src/extensions/.gitkeep old mode 100644 new mode 100755 diff --git a/src/index.ts b/src/index.ts old mode 100644 new mode 100755 diff --git a/tsconfig.json b/tsconfig.json old mode 100644 new mode 100755 diff --git a/types/generated/components.d.ts b/types/generated/components.d.ts old mode 100644 new mode 100755 diff --git a/types/generated/contentTypes.d.ts b/types/generated/contentTypes.d.ts old mode 100644 new mode 100755 index fe2a66b..dd4679a --- a/types/generated/contentTypes.d.ts +++ b/types/generated/contentTypes.d.ts @@ -362,50 +362,12 @@ export interface AdminUser extends Schema.CollectionType { }; } -export interface ApiDisplay1Display1 extends Schema.CollectionType { - collectionName: 'display1s'; +export interface ApiNewsPostNewsPost extends Schema.CollectionType { + collectionName: 'news_posts'; info: { - description: ''; - displayName: 'display1'; - pluralName: 'display1s'; - singularName: 'display1'; - }; - options: { - draftAndPublish: true; - }; - attributes: { - ck1: Attribute.RichText & - Attribute.CustomField< - 'plugin::ckeditor5.CKEditor', - { - preset: 'default'; - } - >; - createdAt: Attribute.DateTime; - createdBy: Attribute.Relation< - 'api::display1.display1', - 'oneToOne', - 'admin::user' - > & - Attribute.Private; - publishedAt: Attribute.DateTime; - text1: Attribute.String; - updatedAt: Attribute.DateTime; - updatedBy: Attribute.Relation< - 'api::display1.display1', - 'oneToOne', - 'admin::user' - > & - Attribute.Private; - }; -} - -export interface ApiDisplay2Display2 extends Schema.CollectionType { - collectionName: 'display2s'; - info: { - displayName: 'display2'; - pluralName: 'display2s'; - singularName: 'display2'; + displayName: 'NewsPost'; + pluralName: 'news-posts'; + singularName: 'news-post'; }; options: { draftAndPublish: true; @@ -413,48 +375,19 @@ export interface ApiDisplay2Display2 extends Schema.CollectionType { attributes: { createdAt: Attribute.DateTime; createdBy: Attribute.Relation< - 'api::display2.display2', - 'oneToOne', - 'admin::user' - > & - Attribute.Private; - json1: Attribute.JSON; - publishedAt: Attribute.DateTime; - updatedAt: Attribute.DateTime; - updatedBy: Attribute.Relation< - 'api::display2.display2', - 'oneToOne', - 'admin::user' - > & - Attribute.Private; - }; -} - -export interface ApiJanlistJanlist extends Schema.CollectionType { - collectionName: 'janlists'; - info: { - displayName: 'janlist'; - pluralName: 'janlists'; - singularName: 'janlist'; - }; - options: { - draftAndPublish: true; - }; - attributes: { - createdAt: Attribute.DateTime; - createdBy: Attribute.Relation< - 'api::janlist.janlist', + 'api::news-post.news-post', 'oneToOne', 'admin::user' > & Attribute.Private; description: Attribute.String; - jan: Attribute.String; - product: Attribute.String; + imageUrl: Attribute.String; + pageUrl: Attribute.String; publishedAt: Attribute.DateTime; + title: Attribute.String; updatedAt: Attribute.DateTime; updatedBy: Attribute.Relation< - 'api::janlist.janlist', + 'api::news-post.news-post', 'oneToOne', 'admin::user' > & @@ -462,6 +395,122 @@ export interface ApiJanlistJanlist extends Schema.CollectionType { }; } +export interface ApiPointBalancePointBalance extends Schema.CollectionType { + collectionName: 'point_balances'; + info: { + description: ''; + displayName: 'PointBalance'; + pluralName: 'point-balances'; + singularName: 'point-balance'; + }; + options: { + draftAndPublish: true; + }; + attributes: { + createdAt: Attribute.DateTime; + createdBy: Attribute.Relation< + 'api::point-balance.point-balance', + 'oneToOne', + 'admin::user' + > & + Attribute.Private; + publishedAt: Attribute.DateTime; + total_points: Attribute.Integer; + updatedAt: Attribute.DateTime; + updatedBy: Attribute.Relation< + 'api::point-balance.point-balance', + 'oneToOne', + 'admin::user' + > & + Attribute.Private; + users_permissions_user: Attribute.Relation< + 'api::point-balance.point-balance', + 'oneToOne', + 'plugin::users-permissions.user' + >; + }; +} + +export interface ApiPointExchangeRequestPointExchangeRequest + extends Schema.CollectionType { + collectionName: 'point_exchange_requests'; + info: { + description: ''; + displayName: 'PointExchangeRequest'; + pluralName: 'point-exchange-requests'; + singularName: 'point-exchange-request'; + }; + options: { + draftAndPublish: true; + }; + attributes: { + admin_note: Attribute.String; + amount: Attribute.Integer; + createdAt: Attribute.DateTime; + createdBy: Attribute.Relation< + 'api::point-exchange-request.point-exchange-request', + 'oneToOne', + 'admin::user' + > & + Attribute.Private; + publishedAt: Attribute.DateTime; + reason: Attribute.String; + status: Attribute.Enumeration<['pending', 'approved', 'rejected']>; + type: Attribute.Enumeration<['add', 'subtract']>; + updatedAt: Attribute.DateTime; + updatedBy: Attribute.Relation< + 'api::point-exchange-request.point-exchange-request', + 'oneToOne', + 'admin::user' + > & + Attribute.Private; + users_permissions_users: Attribute.Relation< + 'api::point-exchange-request.point-exchange-request', + 'oneToMany', + 'plugin::users-permissions.user' + >; + }; +} + +export interface ApiPointTransactionPointTransaction + extends Schema.CollectionType { + collectionName: 'point_transactions'; + info: { + description: ''; + displayName: 'PointTransaction'; + pluralName: 'point-transactions'; + singularName: 'point-transaction'; + }; + options: { + draftAndPublish: true; + }; + attributes: { + amount: Attribute.Integer; + createdAt: Attribute.DateTime; + createdBy: Attribute.Relation< + 'api::point-transaction.point-transaction', + 'oneToOne', + 'admin::user' + > & + Attribute.Private; + description: Attribute.String; + Enumeration: Attribute.Enumeration<['add', 'subtract', 'adjust']>; + publishedAt: Attribute.DateTime; + updatedAt: Attribute.DateTime; + updatedBy: Attribute.Relation< + 'api::point-transaction.point-transaction', + 'oneToOne', + 'admin::user' + > & + Attribute.Private; + users_permissions_users: Attribute.Relation< + 'api::point-transaction.point-transaction', + 'oneToMany', + 'plugin::users-permissions.user' + >; + }; +} + export interface PluginContentReleasesRelease extends Schema.CollectionType { collectionName: 'strapi_releases'; info: { @@ -898,9 +947,10 @@ declare module '@strapi/types' { 'admin::transfer-token': AdminTransferToken; 'admin::transfer-token-permission': AdminTransferTokenPermission; 'admin::user': AdminUser; - 'api::display1.display1': ApiDisplay1Display1; - 'api::display2.display2': ApiDisplay2Display2; - 'api::janlist.janlist': ApiJanlistJanlist; + 'api::news-post.news-post': ApiNewsPostNewsPost; + 'api::point-balance.point-balance': ApiPointBalancePointBalance; + 'api::point-exchange-request.point-exchange-request': ApiPointExchangeRequestPointExchangeRequest; + 'api::point-transaction.point-transaction': ApiPointTransactionPointTransaction; 'plugin::content-releases.release': PluginContentReleasesRelease; 'plugin::content-releases.release-action': PluginContentReleasesReleaseAction; 'plugin::i18n.locale': PluginI18NLocale;