[fix] several detail bugs of Type package & Import script

Author: TechQuery

.gitignore

@@ -70,7 +70,7 @@ $RECYCLE.BIN/
 *.sql
 *.sqlite
 *.sqlite3
-
+*.xlsx
 
 ############################
 # Misc.

README.md

@@ -1,8 +1,8 @@
-# Strapi-PNPM-Docker-ts
+# China-NGO-database
 
 [Strapi][7] scaffold with [TypeScript][5], [PNPM][6] & [Docker][9], which is made with ❤️ by [idea2app][1].
 
-[![Deploy to Production environment](https://github.com/idea2app/Strapi-PNPM-Docker-ts/actions/workflows/deploy-production.yml/badge.svg)][2]
+[![Deploy to Production environment](https://github.com/Open-Source-Bazaar/China-NGO-database/actions/workflows/deploy-production.yml/badge.svg)][2]
 
 [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)][3]
 [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)][4]
@@ -143,9 +143,9 @@ Feel free to check out the [Strapi GitHub repository][35]. Your feedback and con
 <sub>🤫 Psst! [Strapi is hiring][39].</sub>
 
 [1]: https://idea2.app/
-[2]: https://github.com/idea2app/Strapi-PNPM-Docker-ts/actions/workflows/deploy-production.yml
-[3]: https://codespaces.new/idea2app/Strapi-PNPM-Docker-ts
-[4]: https://gitpod.io/?autostart=true#https://github.com/idea2app/Strapi-PNPM-Docker-ts
+[2]: https://github.com/Open-Source-Bazaar/China-NGO-database/actions/workflows/deploy-production.yml
+[3]: https://codespaces.new/Open-Source-Bazaar/China-NGO-database
+[4]: https://gitpod.io/?autostart=true#https://github.com/Open-Source-Bazaar/China-NGO-database
 [5]: https://www.typescriptlang.org/
 [6]: https://pnpm.io/
 [7]: https://strapi.io/
@@ -161,11 +161,11 @@ Feel free to check out the [Strapi GitHub repository][35]. Your feedback and con
 [17]: https://github.com/ckeditor/strapi-plugin-ckeditor
 [18]: https://github.com/wisnuwiry/strapi-geodata
 [19]: https://github.com/apps/settings
-[20]: https://github.com/new?template_name=Strapi-PNPM-Docker-ts&template_owner=idea2app
-[21]: https://codespaces.new/idea2app/Strapi-PNPM-Docker-ts
+[20]: https://github.com/new?template_name=China-NGO-database&template_owner=Open-Source-Bazaar
+[21]: https://codespaces.new/Open-Source-Bazaar/China-NGO-database
 [22]: https://github.com/FreeCodeCamp-Chengdu/FreeCodeCamp-Chengdu.github.io/blob/8df9944449002758f7ec809deeb260ce08182259/.github/workflows/main.yml#L34-L63
-[23]: https://github.com/idea2app/Strapi-PNPM-Docker-ts/issues/new/choose
-[24]: https://github.com/idea2app/Strapi-PNPM-Docker-ts/projects
+[23]: https://github.com/Open-Source-Bazaar/China-NGO-database/issues/new/choose
+[24]: https://github.com/Open-Source-Bazaar/China-NGO-database/projects
 [25]: https://docs.strapi.io/dev-docs/cli#strapi-develop
 [26]: https://docs.strapi.io/dev-docs/cli#strapi-start
 [27]: https://docs.strapi.io/dev-docs/cli#strapi-build

docker-compose.yml

@@ -17,7 +17,7 @@ services:
   strapi-server:
     depends_on:
       - postgres-server
-    image: idea2app/strapi-pnpm-docker-ts
+    image: open-source-bazaar/china-ngo-database
     environment:
       - DATABASE_CLIENT=postgres
       - DATABASE_URL=postgres://postgres:${ADMIN_JWT_SECRET}@postgres-server:5432/postgres

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@idea2app/strapi-pnpm-docker-ts",
-  "version": "0.5.0",
+  "name": "@open-source-bazaar/china-ngo-database",
+  "version": "0.6.0",
   "private": true,
   "engines": {
     "node": ">=20.0.0",
@@ -71,9 +71,9 @@
     "build-type": "rm -rf types/client/  &&  npm run make-type",
     "build": "npm run clean  &&  strapi ts:generate-types  &&  cross-env NODE_ENV=production  strapi build",
     "start": "cross-env NODE_ENV=production  strapi start",
-    "pack-image": "docker build -t idea2app/strapi-pnpm-docker-ts .",
+    "pack-image": "docker build -t open-source-bazaar/china-ngo-database .",
     "database": "docker rm -f postgres-server  &&  docker run --name postgres-server -v ./.data:/var/lib/postgresql/data/ -e POSTGRES_PASSWORD=tobemodified -p 5432:5432 -d postgres",
-    "container": "docker rm -f strapi-server  &&  docker run --name strapi-server -p 1337:1337 -d idea2app/strapi-pnpm-docker-ts",
+    "container": "docker rm -f strapi-server  &&  docker run --name strapi-server -p 1337:1337 -d open-source-bazaar/china-ngo-database",
     "deploy": "strapi deploy",
     "console": "strapi console"
   }

scripts/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "moduleResolution": "Node",
+    "strict": false
+  }
+}

scripts/utils/strapi-api.ts

@@ -6,17 +6,17 @@ export class StrapiAPI {
   constructor(
     private baseURL: string,
     private token: string,
-  ) {}
-
-  client = new HTTPClient({ baseURI: this.baseURL, responseType: 'json' }).use(
-    ({ request }, next) => {
-      request.headers = {
-        Authorization: `Bearer ${this.token}`,
-        ...request.headers,
-      };
-      return next();
-    },
-  );
+  ) {
+    this.client.baseURI = this.baseURL;
+  }
+
+  client = new HTTPClient({ responseType: 'json' }).use(({ request }, next) => {
+    request.headers = {
+      Authorization: `Bearer ${this.token}`,
+      ...request.headers,
+    };
+    return next();
+  });
 
   async createOrganization(data: OrganizationData) {
     const { body } = await this.client.post<OrganizationData>(

tsconfig.json

@@ -37,6 +37,7 @@
     // Do not include test files
     "**/*.test.*",
     // Do not include plugins in the server compilation
-    "src/plugins/**"
+    "src/plugins/**",
+    "scripts/**"
   ]
 }

types/ReadMe.md

@@ -1,4 +1,4 @@
-# Strapi-PNPM-Docker-ts - Type package
+# China-NGO-database - Type package
 
 ## Usage
 
@@ -15,7 +15,7 @@
 ```shell
 npm i pnpm -g
 
-pnpm i @idea2app/strapi-pnpm-docker-ts -D
+pnpm i @open-source-bazaar/china-ngo-database -D
 ```
 
 [1]: https://github.com/settings/tokens

types/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@idea2app/strapi-pnpm-docker-ts",
-  "version": "0.5.0",
+  "name": "@open-source-bazaar/china-ngo-database",
+  "version": "0.6.0",
   "types": "index.ts"
 }