feat: Change space configs structure (sismo-core#158)

* feat: change space configs structure * fix: readme
OPuserWasTaken · Jul 7, 2023 · 8388ec2 · 8388ec2
1 parent ba19f17
commit 8388ec2
Show file tree

Hide file tree

Showing 49 changed files with 50 additions and 45 deletions.
diff --git a/README.md b/README.md
@@ -15,17 +15,23 @@ Available templates include:
 
 ### Configuration
 
-All configurations for templates are located in the [space-config](./space-config/) folder.
+All configurations for templates are located in the [space-configs](./space-configs/) folder.
 
-For example, the [configuration](./space-config/aave-chan-initiative/demo.ts) for the [aave-chan-initiative](https://demo.apps.sismo.io/aave-chan-initiative/aci-swag) the configuration is setup in this files tree.
+For example, the [configuration](./space-configs/demo/aave-chan-initiative.ts) for the [aave-chan-initiative](https://demo.apps.sismo.io/aave-chan-initiative/aci-swag) the configuration is setup in this files tree.
 ```bash
-space-config/
-├── aave-chan-initiative
-│   ├── demo.ts
-│   ├── main.ts
-│   └── images
-│       ├── aave_chan_initiative_apps_swag_1014x720.png
-│       ├── ...
+space-configs/
+├── main
+│   ├── aave-chan-initiative.ts
+│   ├── cow-swap.ts
+│   ├── ...
+├── demo
+│   ├── aave-chan-initiative.ts
+│   ├── cow-swap.ts
+│   ├── ...
+├── images
+│   ├── aave_chan_initiative_apps_swag_1014x720.png
+│   ├── aave_chan_initiative_apps_swag_400x400.png
+│   └── ...
 ├── index.ts
 └── types.ts
 ```

diff --git a/space-config/index.ts b/space-config/index.ts
diff --git a/space-config/aave-chan-initiative/demo.ts → space-configs/demo/aave-chan-initiative.ts b/space-config/aave-chan-initiative/demo.ts → space-configs/demo/aave-chan-initiative.ts
diff --git a/space-config/cow-swap/demo.ts → space-configs/demo/cow-swap.ts b/space-config/cow-swap/demo.ts → space-configs/demo/cow-swap.ts
diff --git a/space-config/privacy-is-normal/demo.ts → space-configs/demo/privacy-is-normal.ts b/space-config/privacy-is-normal/demo.ts → space-configs/demo/privacy-is-normal.ts
diff --git a/space-config/sismo/demo.ts → space-configs/demo/sismo.ts b/space-config/sismo/demo.ts → space-configs/demo/sismo.ts
@@ -1,4 +1,3 @@
-import { initAppDataSource } from "../../src/services/user-store/postgres-user-store/initAppDataSource";
 // add an images folder in your space folder if you would like Sismo to host your images
 import { AuthType } from "@sismo-core/sismo-connect-server";
 import { SpaceConfig } from "../types";

diff --git a/space-config/the-merge-contributors/demo.ts → space-configs/demo/the-merge-contributors.ts b/space-config/the-merge-contributors/demo.ts → space-configs/demo/the-merge-contributors.ts
diff --git a/...r_Space_TheMergeContributors_1160x340.png → ...r_Space_TheMergeContributors_1160x340.png b/...r_Space_TheMergeContributors_1160x340.png → ...r_Space_TheMergeContributors_1160x340.png
diff --git a/...butors/images/EthCCtickets_1014x720px.png → ...onfigs/images/EthCCtickets_1014x720px.png b/...butors/images/EthCCtickets_1014x720px.png → ...onfigs/images/EthCCtickets_1014x720px.png
diff --git a/...butors/images/Mergooor NFT_1014x720px.png → ...onfigs/images/Mergooor NFT_1014x720px.png b/...butors/images/Mergooor NFT_1014x720px.png → ...onfigs/images/Mergooor NFT_1014x720px.png
diff --git a/...butors/images/Mergooor_NFT_1014x720px.png → ...onfigs/images/Mergooor_NFT_1014x720px.png b/...butors/images/Mergooor_NFT_1014x720px.png → ...onfigs/images/Mergooor_NFT_1014x720px.png
diff --git a/...ve_chan_initiative_apps_swag_1014x720.png → ...ve_chan_initiative_apps_swag_1014x720.png b/...ve_chan_initiative_apps_swag_1014x720.png → ...ve_chan_initiative_apps_swag_1014x720.png
diff --git a/...ave_chan_initiative_apps_swag_400x400.png → ...ave_chan_initiative_apps_swag_400x400.png b/...ave_chan_initiative_apps_swag_400x400.png → ...ave_chan_initiative_apps_swag_400x400.png
diff --git a/...s/cowswap_app_store_cow_event_400x400.png → ...s/cowswap_app_store_cow_event_400x400.png b/...s/cowswap_app_store_cow_event_400x400.png → ...s/cowswap_app_store_cow_event_400x400.png
diff --git a/...es/cowswap_app_store_cow_swag_400x400.png → ...es/cowswap_app_store_cow_swag_400x400.png b/...es/cowswap_app_store_cow_swag_400x400.png → ...es/cowswap_app_store_cow_swag_400x400.png
diff --git a/...fp_Space_TheMergeContributors_400x400.png → ...fp_Space_TheMergeContributors_400x400.png b/...fp_Space_TheMergeContributors_400x400.png → ...fp_Space_TheMergeContributors_400x400.png
diff --git a/...rivacy_is_normal_apps_lotery_1014x720.png → ...rivacy_is_normal_apps_lotery_1014x720.png b/...rivacy_is_normal_apps_lotery_1014x720.png → ...rivacy_is_normal_apps_lotery_1014x720.png
diff --git a/...s/privacy_is_normal_apps_nft_1014x720.png → ...s/privacy_is_normal_apps_nft_1014x720.png b/...s/privacy_is_normal_apps_nft_1014x720.png → ...s/privacy_is_normal_apps_nft_1014x720.png
diff --git a/...privacy_is_normal_apps_print_1014x720.png → ...privacy_is_normal_apps_print_1014x720.png b/...privacy_is_normal_apps_print_1014x720.png → ...privacy_is_normal_apps_print_1014x720.png
diff --git a/...smo/images/sismo_appstore_fof_tickets.png → ...igs/images/sismo_appstore_fof_tickets.png b/...smo/images/sismo_appstore_fof_tickets.png → ...igs/images/sismo_appstore_fof_tickets.png
diff --git a/...mages/sismoapps_alpha_tester_1014x720.png → ...mages/sismoapps_alpha_tester_1014x720.png b/...mages/sismoapps_alpha_tester_1014x720.png → ...mages/sismoapps_alpha_tester_1014x720.png
diff --git a/...o/images/sismoapps_anon_wall_1014x720.png → ...s/images/sismoapps_anon_wall_1014x720.png b/...o/images/sismoapps_anon_wall_1014x720.png → ...s/images/sismoapps_anon_wall_1014x720.png
diff --git a/...mo/images/sismoapps_feedback_1014x720.png → ...gs/images/sismoapps_feedback_1014x720.png b/...mo/images/sismoapps_feedback_1014x720.png → ...gs/images/sismoapps_feedback_1014x720.png
diff --git a/...o/images/sismoapps_newletter_1014x720.png → ...s/images/sismoapps_newletter_1014x720.png b/...o/images/sismoapps_newletter_1014x720.png → ...s/images/sismoapps_newletter_1014x720.png
diff --git a/...mages/sismoapps_sismo_events_1014x720.png → ...mages/sismoapps_sismo_events_1014x720.png b/...mages/sismoapps_sismo_events_1014x720.png → ...mages/sismoapps_sismo_events_1014x720.png
diff --git a/...images/sismoapps_swag_lotery_1014x720.png → ...images/sismoapps_swag_lotery_1014x720.png b/...images/sismoapps_swag_lotery_1014x720.png → ...images/sismoapps_swag_lotery_1014x720.png
diff --git a/...o/images/sismoapps_tg_zk_bot_1014x720.png → ...s/images/sismoapps_tg_zk_bot_1014x720.png b/...o/images/sismoapps_tg_zk_bot_1014x720.png → ...s/images/sismoapps_tg_zk_bot_1014x720.png
diff --git a/...es/sismoapps_zkbadge_contrib_1014x720.png → ...es/sismoapps_zkbadge_contrib_1014x720.png b/...es/sismoapps_zkbadge_contrib_1014x720.png → ...es/sismoapps_zkbadge_contrib_1014x720.png
diff --git a/...e_aave_chan_initiative_cover_1740x540.png → ...e_aave_chan_initiative_cover_1740x540.png b/...e_aave_chan_initiative_cover_1740x540.png → ...e_aave_chan_initiative_cover_1740x540.png
diff --git a/...pace_aave_chan_initiative_pfp_400x400.png → ...pace_aave_chan_initiative_pfp_400x400.png b/...pace_aave_chan_initiative_pfp_400x400.png → ...pace_aave_chan_initiative_pfp_400x400.png
diff --git a/...wap/images/space_cow_swap_pfp_500x500.png → ...igs/images/space_cow_swap_pfp_500x500.png b/...wap/images/space_cow_swap_pfp_500x500.png → ...igs/images/space_cow_swap_pfp_500x500.png
diff --git a/...pace_privacy_is_normal_cover_1740x540.png → ...pace_privacy_is_normal_cover_1740x540.png b/...pace_privacy_is_normal_cover_1740x540.png → ...pace_privacy_is_normal_cover_1740x540.png
diff --git a/...s/space_privacy_is_normal_pfp_400x400.png → ...s/space_privacy_is_normal_pfp_400x400.png b/...s/space_privacy_is_normal_pfp_400x400.png → ...s/space_privacy_is_normal_pfp_400x400.png
diff --git a/...smo/images/space_sismo_cover_1740x540.png → ...igs/images/space_sismo_cover_1740x540.png b/...smo/images/space_sismo_cover_1740x540.png → ...igs/images/space_sismo_cover_1740x540.png
diff --git a/.../sismo/images/space_sismo_pfp_400x400.png → ...onfigs/images/space_sismo_pfp_400x400.png b/.../sismo/images/space_sismo_pfp_400x400.png → ...onfigs/images/space_sismo_pfp_400x400.png
diff --git a/space-configs/index.ts b/space-configs/index.ts
@@ -0,0 +1,27 @@
+import { SpaceConfig } from "./types";
+import { theMergeContributorsConfigMain } from "@/space-configs/main/the-merge-contributors";
+import { privacyIsNormalConfigMain } from "@/space-configs/main/privacy-is-normal";
+import { aaveChanInitiativeConfigMain } from "./main/aave-chan-initiative";
+import { sismoConfigMain } from "@/space-configs/main/sismo";
+import { cowSwapConfigMain } from "@/space-configs/main/cow-swap";
+import { theMergeContributorsConfigDemo } from "@/space-configs/demo/the-merge-contributors";
+import { sismoConfigDemo } from "@/space-configs/demo/sismo";
+import { privacyIsNormalConfigDemo } from "@/space-configs/demo/privacy-is-normal";
+import { aaveChanInitiativeConfigDemo } from "@/space-configs/demo/aave-chan-initiative";
+import { cowSwapConfigDemo } from "@/space-configs/demo/cow-swap";
+
+export const configsMain: SpaceConfig[] = [
+  theMergeContributorsConfigMain,
+  privacyIsNormalConfigMain,
+  aaveChanInitiativeConfigMain,
+  sismoConfigMain,
+  cowSwapConfigMain,
+];
+
+export const configsDemo: SpaceConfig[] = [
+  theMergeContributorsConfigDemo,
+  sismoConfigDemo,
+  privacyIsNormalConfigDemo,
+  aaveChanInitiativeConfigDemo,
+  cowSwapConfigDemo,
+];
diff --git a/space-config/aave-chan-initiative/main.ts → space-configs/main/aave-chan-initiative.ts b/space-config/aave-chan-initiative/main.ts → space-configs/main/aave-chan-initiative.ts
diff --git a/space-config/cow-swap/main.ts → space-configs/main/cow-swap.ts b/space-config/cow-swap/main.ts → space-configs/main/cow-swap.ts
diff --git a/space-config/privacy-is-normal/main.ts → space-configs/main/privacy-is-normal.ts b/space-config/privacy-is-normal/main.ts → space-configs/main/privacy-is-normal.ts
diff --git a/space-config/sismo/main.ts → space-configs/main/sismo.ts b/space-config/sismo/main.ts → space-configs/main/sismo.ts
diff --git a/space-config/the-merge-contributors/main.ts → space-configs/main/the-merge-contributors.ts b/space-config/the-merge-contributors/main.ts → space-configs/main/the-merge-contributors.ts
diff --git a/space-config/types.ts → space-configs/types.ts b/space-config/types.ts → space-configs/types.ts
diff --git a/src/app/api/zk-form/mocks.ts b/src/app/api/zk-form/mocks.ts
@@ -1,4 +1,4 @@
-import { AppConfig, SpaceConfig } from "@/space-config/types";
+import { AppConfig, SpaceConfig } from "@/space-configs/types";
 import { Field } from "@/src/app/api/zk-form/verify/route";
 import { MockedRequest } from "@/src/libs/helper";
 import { AuthType, ClaimType, SismoConnectResponse } from "@sismo-core/sismo-connect-server";

diff --git a/src/app/api/zk-telegram-bot/mocks.ts b/src/app/api/zk-telegram-bot/mocks.ts
@@ -1,4 +1,4 @@
-import { SpaceConfig } from "@/space-config/types";
+import { SpaceConfig } from "@/space-configs/types";
 
 export const mockTelegramTestSpaceType = (
   appSlug: string = "appSlug",

diff --git a/src/app/explore/apps/page.tsx b/src/app/explore/apps/page.tsx
@@ -1,4 +1,4 @@
-import { SpaceConfig } from "@/space-config/types";
+import { SpaceConfig } from "@/space-configs/types";
 import ExploreAppsMain from "@/src/components/ExploreAppsMain";
 import { ZkAppType, getApps } from "@/src/libs/spaces";
 

diff --git a/src/app/explore/spaces/page.tsx b/src/app/explore/spaces/page.tsx
@@ -1,4 +1,4 @@
-import { SpaceConfig } from "@/space-config/types";
+import { SpaceConfig } from "@/space-configs/types";
 import ExploreSpacesMain from "@/src/components/ExploreSpacesMain";
 import { SpaceType, getSpaces } from "@/src/libs/spaces";
 

diff --git a/src/components/Apps/ZkFormApp/components/ShortTextField.tsx b/src/components/Apps/ZkFormApp/components/ShortTextField.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { ShortText } from "@/space-config/types";
+import { ShortText } from "@/space-configs/types";
 import TextInput from "@/src/ui/TextInput";
 import React from "react";
 import { styled } from "styled-components";

diff --git a/src/services/service-factory/service-factory.ts b/src/services/service-factory/service-factory.ts
@@ -1,5 +1,5 @@
-import { configsDemo, configsMain } from "@/space-config";
-import { SpaceConfig } from "@/space-config/types";
+import { configsDemo, configsMain } from "@/space-configs";
+import { SpaceConfig } from "@/space-configs/types";
 import { mockZkFormTestSpaceType } from "@/src/app/api/zk-form/mocks";
 import { mockTelegramTestSpaceType } from "@/src/app/api/zk-telegram-bot/mocks";
 import env from "@/src/environments";

diff --git a/src/utils/getImgSrcFromConfig.ts b/src/utils/getImgSrcFromConfig.ts
@@ -20,7 +20,7 @@ export default async function getImgSrcFromConfig({
     if (fileName?.startsWith("http")) {
       return fileName;
     } else {
-      const importedImg = await import(`@/space-config/${configSlug}/images/${fileName}`);
+      const importedImg = await import(`@/space-configs/images/${fileName}`);
       return importedImg.default;
     }
   } catch (e) {