Starting fresh with strapi 5 and beginning to pull in old code

distributeaid · Aug 15, 2024 · 055dc17 · 055dc17
1 parent eea96b6
commit 055dc17
Show file tree

Hide file tree

Showing 115 changed files with 10,269 additions and 11,178 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -10,4 +10,9 @@ liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
 lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
-custom: ['https://distributeaid.org/donate', 'https://www.paypal.com/donate/?hosted_button_id=VCREWCLA6WTB4']
+custom:
+  [
+    "https://distributeaid.org/donate",
+    "https://www.paypal.com/donate/?hosted_button_id=VCREWCLA6WTB4",
+    "https://www.omprakash.org/global/distribute-aid/donate",
+  ]
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,5 @@
+## What changed?
+
+<!-- include a link to a GitHub issue, if applicable -->
+
+## How can you test this?
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -0,0 +1,29 @@
+name: Checks
+on:
+  - pull_request
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    env:
+      DATABASE_FILENAME: .tmp/test_data.db
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: package.json
+          cache: yarn
+          cache-dependency-path: yarn.lock
+      - name: Install modules
+        run: corepack yarn
+      - name: "Configure"
+        run: cp .env.example .env
+      - name: Run type check
+        run: corepack yarn run check:types
+      - name: Run lint check
+        run: corepack yarn run check:lint
+      - name: Run format check
+        run: corepack yarn run check:format
+      - name: Run build check
+        run: corepack yarn run check:build
+      - name: Run test check
+        run: corepack yarn run check:test
diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,7 @@
 # Ignore the generated documentation since it updates a timestamp on each build.
 # Manually override the git ignore using `git add -f` in order to update the docs.
 src/extensions/documentation/documentation/1.0.0/full_documentation.json
-
+src/extensions/documentation/public/index.html
 
 ############################
 # OS X
@@ -91,7 +91,8 @@ ssl
 nbproject
 public/uploads/*
 !public/uploads/.gitkeep
-.vscode
+.tsbuildinfo
+.eslintcache
 
 ############################
 # Node.js
@@ -105,6 +106,20 @@ results
 node_modules
 .node_history
 
+############################
+# Package managers
+############################
+
+.yarn/*
+!.yarn/cache
+!.yarn/unplugged
+!.yarn/patches
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+.pnp.*
+yarn-error.log
+
 ############################
 # Tests
 ############################
@@ -118,10 +133,11 @@ coverage
 .env
 license.txt
 exports
-*.cache
+.strapi
 dist
 build
 .strapi-updater.json
+.strapi-cloud.json
 
 ############################
 # Yarn

diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+20.16.0
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1,13 @@
+# Ignore artifacts:
+build
+coverage
+dist
+.strapi
+.yarn
+.tmp
+*.example.ts
+*.example.js
+types/generated/*
+src/api/*/documentation
+src/extensions/documentation
+
diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1 @@
+{}
diff --git a/.strapi/client/app.js b/.strapi/client/app.js
@@ -3,16 +3,12 @@
  * Any modifications made will be discarded.
  */
 import documentation from "@strapi/plugin-documentation/strapi-admin";
-import i18N from "@strapi/plugin-i18n/strapi-admin";
 import usersPermissions from "@strapi/plugin-users-permissions/strapi-admin";
-import multiSelect from "strapi-plugin-multi-select/strapi-admin";
 import { renderAdmin } from "@strapi/strapi/admin";
 
 renderAdmin(document.getElementById("strapi"), {
   plugins: {
     documentation: documentation,
-    i18n: i18N,
     "users-permissions": usersPermissions,
-    "multi-select": multiSelect,
   },
 });
diff --git a/.strapi/client/index.html b/.strapi/client/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <!--
 This file was automatically generated by Strapi.
@@ -58,5 +58,6 @@ <h1>JavaScript disabled</h1>
         </div>
       </div></noscript
     >
+    <script type="module" src="/.strapi/client/app.js"></script>
   </body>
 </html>
diff --git a/.yarn/releases/yarn-4.3.1.cjs b/.yarn/releases/yarn-4.3.1.cjs
diff --git a/.yarn/releases/yarn-4.4.0.cjs b/.yarn/releases/yarn-4.4.0.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -1,3 +1,3 @@
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.3.1.cjs
+yarnPath: .yarn/releases/yarn-4.4.0.cjs
diff --git a/README.md b/README.md
@@ -1,47 +1,39 @@
-# 🚀 Getting started with Strapi
+# 🚀 Aggregated Public Information
 
-Strapi comes with a full featured [Command Line Interface](https://docs.strapi.io/dev-docs/cli) (CLI) which lets you scaffold and manage your project in seconds.
+This project uses [Strapi](https://strapi.io) as a CMS backend.
 
-### `develop`
+## Development
 
-Start your Strapi application with autoReload enabled. [Learn more](https://docs.strapi.io/dev-docs/cli#strapi-develop)
+1. Run this to install your packages:
 
-```
-npm run develop
-# or
-yarn develop
+```sh
+yarn
 ```
 
-### `start`
-
-Start your Strapi application with autoReload disabled. [Learn more](https://docs.strapi.io/dev-docs/cli#strapi-start)
+2. In one terminal, run `develop`:
 
-```
-npm run start
-# or
-yarn start
+```sh
+yarn run develop
 ```
 
-### `build`
+This will launch the development server. `yarn test` depends on you running this!
 
-Build your admin panel. [Learn more](https://docs.strapi.io/dev-docs/cli#strapi-build)
+3. In another terminal, run tests:
 
+```sh
+yarn test
 ```
-npm run build
-# or
-yarn build
-```
-
-## ⚙️ Deployment
 
-Strapi gives you many possible deployment options for your project including [Strapi Cloud](https://cloud.strapi.io). Browse the [deployment section of the documentation](https://docs.strapi.io/dev-docs/deployment) to find the best solution for your use case.
+> [!NOTE]
+> If you don't run `yarn run develop` then you must run `yarn build` before running `yarn test`. We have provided `yarn test:with-build` as a convenience in this case.
 
 # 🚀 Getting started with Gitpod
+
 Gitpod provides a fully automated development environment for your Strapi project, and the development environment is set up with just a single click. Follow these steps to get started:
 
 [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/distributeaid/aggregated-public-information)
 
-1. Click the ``Open in Gitpod`` button above. Note: you'll need to have an account on [Gitpod](https://gitpod.io/login/) before proceeding with the next steps (this requires a GitHub account)..
+1. Click the `Open in Gitpod` button above. Note: you'll need to have an account on [Gitpod](https://gitpod.io/login/) before proceeding with the next steps (this requires a GitHub account)..
 2. Click the `Continue` button.
 3. Relax, a development environment is being set up for you in the first terminal. There's currently a bug that will stop the setup from being completed, but we'll fix that in the next steps.
 4. Create a new file called `.env` to store the environment variables.
@@ -54,7 +46,39 @@ Gitpod provides a fully automated development environment for your Strapi projec
 11. Run `yarn develop`. This starts the development server at [http://localhost:1337/admin](http://localhost:1337/admin).
 12. To access your workspace later, go to [Gitpod Workspaces](https://gitpod.io/workspaces). Pin the `aggregated-public-information` workspace to prevent auto-deletion after 14 days by clicking the three dots next to the workspace name and selecting "Pin".
 
+## Strapi Guide
+
+Strapi comes with a full featured [Command Line Interface](https://docs.strapi.io/dev-docs/cli) (CLI) which lets you scaffold and manage your project in seconds.
 
+### `develop`
+
+Start your Strapi application with autoReload enabled. [Learn more](https://docs.strapi.io/dev-docs/cli#strapi-develop)
+
+```
+npm run develop
+# or
+yarn develop
+```
+
+### `start`
+
+Start your Strapi application with autoReload disabled. [Learn more](https://docs.strapi.io/dev-docs/cli#strapi-start)
+
+```
+npm run start
+# or
+yarn start
+```
+
+### `build`
+
+Build your admin panel. [Learn more](https://docs.strapi.io/dev-docs/cli#strapi-build)
+
+```
+npm run build
+# or
+yarn build
+```
 
 ## 📚 Learn more
 
@@ -71,7 +95,3 @@ Feel free to check out the [Strapi GitHub repository](https://github.com/strapi/
 - [Discord](https://discord.strapi.io) - Come chat with the Strapi community including the core team.
 - [Forum](https://forum.strapi.io/) - Place to discuss, ask questions and find answers, show your Strapi project and get feedback or just talk with other Community members.
 - [Awesome Strapi](https://github.com/strapi/awesome-strapi) - A curated list of awesome things related to Strapi.
-
----
-
-<sub>🤫 Psst! [Strapi is hiring](https://strapi.io/careers).</sub>
diff --git a/config/admin.ts b/config/admin.ts
@@ -1,22 +1,27 @@
 export default ({ env }) => ({
   auth: {
-    secret: env('ADMIN_JWT_SECRET'),
+    secret: env("ADMIN_JWT_SECRET"),
   },
+  autoOpen: !env.bool("NO_OPEN_BROWSER", false),
   apiToken: {
-    salt: env('API_TOKEN_SALT'),
+    salt: env("API_TOKEN_SALT"),
   },
   transfer: {
     token: {
-      salt: env('TRANSFER_TOKEN_SALT'),
+      salt: env("TRANSFER_TOKEN_SALT"),
     },
   },
+  flags: {
+    nps: env.bool("FLAG_NPS", true),
+    promoteEE: env.bool("FLAG_PROMOTE_EE", true),
+  },
   watchIgnoreFiles: [
     /* NOTE: this isn't a very specific path, but various combinations of
      * "./src/scripts/**" didn't work. Might need to make it more specific
      * if there's a reason to ever include script files in our Strapi server
      * build. Or better yet just refactor that functioality out of the
      * "src/scripts" folder and import it.
-    */
-    '**/scripts/**'
-  ]
+     */
+    "**/scripts/**",
+  ],
 });