Merge branch 'main' into ft/techlabblog-workflow

CodeForAfrica · Sep 26, 2024 · 4381049 · 4381049
2 parents 62ccf5f + 159a220
commit 4381049
Show file tree

Hide file tree

Showing 26 changed files with 452 additions and 4,342 deletions.
diff --git a/apps/civicsignalblog/payload.config.ts b/apps/civicsignalblog/payload.config.ts
@@ -12,16 +12,21 @@ import nestedDocs from "@payloadcms/plugin-nested-docs";
 import { s3Adapter } from "@payloadcms/plugin-cloud-storage/s3";
 import { loadEnvConfig } from "@next/env";
 
-import Authors from "./src/payload/collections/Authors";
-import Media from "./src/payload/collections/Media";
-import Pages from "./src/payload/collections/Pages";
-import Posts from "./src/payload/collections/Posts";
+import Authors from "./src/payload/collections/Research/Authors";
+import Media from "./src/payload/collections/Research/Media";
+import Pages from "./src/payload/collections/Research/Pages";
+import CivicSignalPages from "./src/payload/collections/Main/Pages";
+
+import Posts from "./src/payload/collections/Research/Posts";
 import Publication from "./src/payload/globals/Publication";
-import Site from "./src/payload/globals/Site";
-import Tags from "./src/payload/collections/Tags";
+import Research from "./src/payload/globals/Site/research";
+import Main from "./src/payload/globals/Site/main";
+import Tags from "./src/payload/collections/Research/Tags";
 import Users from "./src/payload/collections/Users";
 import { defaultLocale, locales } from "./src/payload/utils/locales";
 
+import Actions from "./src/payload/components/actions";
+
 const dev = process.env.NODE_ENV !== "production";
 const projectDir = process.cwd();
 loadEnvConfig(projectDir, dev);
@@ -62,9 +67,10 @@ export default buildConfig({
     Pages,
     Posts,
     Tags,
+    CivicSignalPages,
     Users,
   ] as CollectionConfig[],
-  globals: [Publication, Site] as GlobalConfig[],
+  globals: [Publication, Research, Main] as GlobalConfig[],
   ...(locales?.length
     ? {
         localization: {
@@ -77,6 +83,9 @@ export default buildConfig({
   admin: {
     css: path.resolve(__dirname, "./src/payload/admin/scss/custom.scss"),
     user: Users.slug,
+    components: {
+      actions: [Actions],
+    },
     livePreview: {
       breakpoints: [
         {