From a9ec21235ad1485c53d45dcedb11abd0faac745b Mon Sep 17 00:00:00 2001
From: Max Wu <chengmaxwu@gmail.com>
Date: Mon, 6 May 2024 21:35:16 -1000
Subject: [PATCH 1/5] Add production docker-compose

---
 hasura/.gitignore             |  2 +-
 hasura/docker-compose.dev.yml | 47 +++++++++++++++++++++++++++++++++++
 hasura/docker-compose.yml     | 35 ++++----------------------
 3 files changed, 53 insertions(+), 31 deletions(-)
 create mode 100644 hasura/docker-compose.dev.yml

diff --git a/hasura/.gitignore b/hasura/.gitignore
index 7748252..a7adbe4 100644
--- a/hasura/.gitignore
+++ b/hasura/.gitignore
@@ -1,2 +1,2 @@
-.env
+.env*
 /db_data
\ No newline at end of file
diff --git a/hasura/docker-compose.dev.yml b/hasura/docker-compose.dev.yml
new file mode 100644
index 0000000..9cc5d76
--- /dev/null
+++ b/hasura/docker-compose.dev.yml
@@ -0,0 +1,47 @@
+version: "3.6"
+services:
+  postgres:
+    image: postgres:12
+    restart: always
+    volumes:
+      - db_data:/var/lib/postgresql/data
+    ports:
+      - "5432:5432"
+    environment:
+      POSTGRES_PASSWORD: postgrespassword
+  graphql-engine:
+    image: hasura/graphql-engine:v2.16.0
+    ports:
+      - "8080:8080"
+    depends_on:
+      - "postgres"
+    restart: always
+    environment:
+      ## postgres database to store Hasura metadata
+      HASURA_GRAPHQL_METADATA_DATABASE_URL: postgres://postgres:postgrespassword@postgres:5432/postgres
+      ## this env var can be used to add the above postgres database to Hasura as a data source. this can be removed/updated based on your needs
+      PG_DATABASE_URL: postgres://postgres:postgrespassword@postgres:5432/postgres
+      HASURA_GRAPHQL_DATABASE_URL: postgres://postgres:postgrespassword@postgres:5432/postgres
+      ## enable the console served by server
+      HASURA_GRAPHQL_ENABLE_CONSOLE: "true" # set to "false" to disable console
+      ## enable debugging mode. It is recommended to disable this in production
+      HASURA_GRAPHQL_DEV_MODE: "true"
+      HASURA_GRAPHQL_ENABLED_LOG_TYPES: startup, http-log, webhook-log, websocket-log, query-log
+      ## uncomment next line to set an admin secret
+      HASURA_GRAPHQL_ADMIN_SECRET: myadminsecretkey
+      ## Hasura JWT Secret
+      HASURA_GRAPHQL_JWT_SECRET: "${HASURA_GRAPHQL_JWT_SECRET}"
+      ## Unauthorized role
+      HASURA_GRAPHQL_UNAUTHORIZED_ROLE: "public"
+
+      ## CRON Webhook URL
+      CANOPY_CRON_WEBHOOK_URL: "${CANOPY_CRON_WEBHOOK_URL}"
+      ## CRON Client Key
+      CANOPY_CRON_CLIENT_KEY: "${CANOPY_CRON_CLIENT_KEY}"
+
+      ## Event Webhook URL
+      CANOPY_EVENT_WEBHOOK_URL: "${CANOPY_EVENT_WEBHOOK_URL}"
+      ## Event Client Key
+      CANOPY_EVENT_CLIENT_KEY: "${CANOPY_EVENT_CLIENT_KEY}"
+volumes:
+  db_data:
diff --git a/hasura/docker-compose.yml b/hasura/docker-compose.yml
index 9cc5d76..fe136ea 100644
--- a/hasura/docker-compose.yml
+++ b/hasura/docker-compose.yml
@@ -4,11 +4,11 @@ services:
     image: postgres:12
     restart: always
     volumes:
-      - db_data:/var/lib/postgresql/data
+      - canopy_prod_db:/var/lib/postgresql/data
     ports:
       - "5432:5432"
     environment:
-      POSTGRES_PASSWORD: postgrespassword
+      POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}"
   graphql-engine:
     image: hasura/graphql-engine:v2.16.0
     ports:
@@ -16,32 +16,7 @@ services:
     depends_on:
       - "postgres"
     restart: always
-    environment:
-      ## postgres database to store Hasura metadata
-      HASURA_GRAPHQL_METADATA_DATABASE_URL: postgres://postgres:postgrespassword@postgres:5432/postgres
-      ## this env var can be used to add the above postgres database to Hasura as a data source. this can be removed/updated based on your needs
-      PG_DATABASE_URL: postgres://postgres:postgrespassword@postgres:5432/postgres
-      HASURA_GRAPHQL_DATABASE_URL: postgres://postgres:postgrespassword@postgres:5432/postgres
-      ## enable the console served by server
-      HASURA_GRAPHQL_ENABLE_CONSOLE: "true" # set to "false" to disable console
-      ## enable debugging mode. It is recommended to disable this in production
-      HASURA_GRAPHQL_DEV_MODE: "true"
-      HASURA_GRAPHQL_ENABLED_LOG_TYPES: startup, http-log, webhook-log, websocket-log, query-log
-      ## uncomment next line to set an admin secret
-      HASURA_GRAPHQL_ADMIN_SECRET: myadminsecretkey
-      ## Hasura JWT Secret
-      HASURA_GRAPHQL_JWT_SECRET: "${HASURA_GRAPHQL_JWT_SECRET}"
-      ## Unauthorized role
-      HASURA_GRAPHQL_UNAUTHORIZED_ROLE: "public"
-
-      ## CRON Webhook URL
-      CANOPY_CRON_WEBHOOK_URL: "${CANOPY_CRON_WEBHOOK_URL}"
-      ## CRON Client Key
-      CANOPY_CRON_CLIENT_KEY: "${CANOPY_CRON_CLIENT_KEY}"
-
-      ## Event Webhook URL
-      CANOPY_EVENT_WEBHOOK_URL: "${CANOPY_EVENT_WEBHOOK_URL}"
-      ## Event Client Key
-      CANOPY_EVENT_CLIENT_KEY: "${CANOPY_EVENT_CLIENT_KEY}"
+    env_file:
+      - .env.prod
 volumes:
-  db_data:
+  canopy_prod_db:

From ef11654d0dcfd5463d558ee42888b1087c7c80ec Mon Sep 17 00:00:00 2001
From: Max Wu <chengmaxwu@gmail.com>
Date: Tue, 7 May 2024 09:00:59 -1000
Subject: [PATCH 2/5] Edit docker compose

---
 hasura/docker-compose.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/hasura/docker-compose.yml b/hasura/docker-compose.yml
index fe136ea..83eca98 100644
--- a/hasura/docker-compose.yml
+++ b/hasura/docker-compose.yml
@@ -7,8 +7,8 @@ services:
       - canopy_prod_db:/var/lib/postgresql/data
     ports:
       - "5432:5432"
-    environment:
-      POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}"
+    env_file:
+      - .env.prod
   graphql-engine:
     image: hasura/graphql-engine:v2.16.0
     ports:
@@ -18,5 +18,6 @@ services:
     restart: always
     env_file:
       - .env.prod
+
 volumes:
   canopy_prod_db:

From c4b8a6fbc601b21f63227e4b6b43527e400427be Mon Sep 17 00:00:00 2001
From: Max Wu <chengmaxwu@gmail.com>
Date: Tue, 7 May 2024 12:56:55 -1000
Subject: [PATCH 3/5] Use node 16

---
 .github/workflows/dev.yml  | 2 +-
 .github/workflows/prod.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index bc51e7d..73fe3bc 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 16.x
           cache: "npm"
 
       - name: Install Hasura CLI
diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml
index fa0703a..2b46836 100644
--- a/.github/workflows/prod.yml
+++ b/.github/workflows/prod.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 16.x
           cache: "npm"
 
       - name: Install Hasura CLI

From 6cd54c0ec0b4154e77e060bb77a095a8a92f2104 Mon Sep 17 00:00:00 2001
From: Max Wu <chengmaxwu@gmail.com>
Date: Wed, 26 Jun 2024 09:43:18 -0700
Subject: [PATCH 4/5] Add community guidelines settings

---
 web/components/EditProfileListing.tsx         | 48 ++++++++++++-
 web/components/admin/SetPrivacySettings.tsx   | 72 +++++++++++++------
 web/components/atomic/CheckBox.tsx            |  3 +-
 .../space-homepage/SpaceLandingPage.tsx       |  4 +-
 web/hooks/usePrivacySettings.ts               | 39 ----------
 web/hooks/useSpaceAttributes.ts               | 30 ++++++++
 web/hooks/useValidateProfileCompletion.ts     | 15 +++-
 web/lib/profileAttributes.ts                  |  2 +
 web/lib/spaceAttributes.ts                    |  6 +-
 web/pages/api/invite/joinProgram.ts           |  7 --
 .../space/[slug]/join/[inviteLinkId].tsx      | 15 +---
 11 files changed, 156 insertions(+), 85 deletions(-)
 delete mode 100644 web/hooks/usePrivacySettings.ts
 create mode 100644 web/hooks/useSpaceAttributes.ts

diff --git a/web/components/EditProfileListing.tsx b/web/components/EditProfileListing.tsx
index 695973c..a2394a8 100644
--- a/web/components/EditProfileListing.tsx
+++ b/web/components/EditProfileListing.tsx
@@ -18,6 +18,10 @@ import { EditResponse } from "./edit-profile/EditResponse";
 import { ProfileSocialsDisplay } from "./edit-socials-info/ProfileSocialsDisplay";
 import { ProfileSocialsModal } from "./edit-socials-info/ProfileSocialsModal";
 import PublishedToggleSwitch from "./PublishedToggleSwitch";
+import { useSpaceAttributes } from "../hooks/useSpaceAttributes";
+import { CheckBox } from "./atomic/CheckBox";
+import { handleError } from "../lib/error";
+import toast from "react-hot-toast";
 
 function EditProfileImage() {
   const { currentProfile } = useCurrentProfile();
@@ -53,9 +57,15 @@ interface EditProfileListingProps {
 export function EditProfileListing(props: EditProfileListingProps) {
   const { showPublishedToggle = true } = props;
 
-  const { currentProfile, currentProfileHasRole } = useCurrentProfile();
+  const {
+    currentProfile,
+    currentProfileHasRole,
+    profileAttributes,
+    updateProfileAttributes,
+  } = useCurrentProfile();
   const { currentSpace } = useCurrentSpace();
   const { userData } = useUserData();
+  const { attributes } = useSpaceAttributes();
 
   const [socialsOpened, socialsHandlers] = useDisclosure(false);
 
@@ -78,7 +88,43 @@ export function EditProfileListing(props: EditProfileListingProps) {
           profileListingId={currentProfile.profile_listing?.id ?? ""}
         />
       )}
+
       <div className="h-4"></div>
+      {attributes?.communityGuidelinesUrl && (
+        <>
+          <CheckBox
+            label={
+              <span>
+                I agree to the{" "}
+                <a
+                  href={attributes.communityGuidelinesUrl}
+                  target="_blank"
+                  rel="noreferrer"
+                  className="text-lime-700 underline"
+                >
+                  community guidelines
+                </a>
+              </span>
+            }
+            checked={profileAttributes.agreedToCommunityGuidelines}
+            onChange={(e) => {
+              const newVal = e.target?.checked ?? false;
+
+              toast.promise(
+                updateProfileAttributes({
+                  agreedToCommunityGuidelines: newVal,
+                }),
+                {
+                  loading: "Loading",
+                  success: `${newVal ? "Agreed" : "Disagreed"} to guidelines`,
+                  error: (err) => err.message,
+                }
+              );
+            }}
+          />
+          <div className="h-4"></div>
+        </>
+      )}
       <div className="flex w-full max-w-3xl flex-col rounded-lg border border-black bg-white pb-12">
         <div className="h-20 rounded-t-lg bg-gray-100"></div>
         <div className="-mt-4 px-4 sm:px-12">
diff --git a/web/components/admin/SetPrivacySettings.tsx b/web/components/admin/SetPrivacySettings.tsx
index 0534c11..a52fa85 100644
--- a/web/components/admin/SetPrivacySettings.tsx
+++ b/web/components/admin/SetPrivacySettings.tsx
@@ -2,37 +2,36 @@ import { useEffect, useMemo, useState } from "react";
 
 import toast from "react-hot-toast";
 
-import { Button, Text } from "../../components/atomic";
+import { Button, Input, Text } from "../../components/atomic";
 import {
   useUpdateSpaceAttributesMutation,
   useUpdateSpaceMutation,
 } from "../../generated/graphql";
 import { useCurrentSpace } from "../../hooks/useCurrentSpace";
-import {
-  PrivacySettings,
-  usePrivacySettings,
-} from "../../hooks/usePrivacySettings";
+import { useSpaceAttributes } from "../../hooks/useSpaceAttributes";
 import { useSaveChangesState } from "../../hooks/useSaveChangesState";
 import { CheckBox } from "../atomic/CheckBox";
+import { TextInput } from "../inputs/TextInput";
+import { SpaceAttributes } from "../../lib/spaceAttributes";
 
 export function SetPrivacySettings() {
   const { currentSpace } = useCurrentSpace();
 
-  const { privacySettings } = usePrivacySettings();
+  const { attributes } = useSpaceAttributes();
 
-  const [settings, setSettings] = useState<PrivacySettings>();
+  const [attributesState, setAttributesState] = useState<SpaceAttributes>();
   const { mustSave, setMustSave } = useSaveChangesState();
 
   useEffect(() => {
-    if (privacySettings) {
-      setSettings(privacySettings);
+    if (attributes) {
+      setAttributesState(attributes);
     }
-  }, [privacySettings]);
+  }, [attributes]);
 
   const [loading, setLoading] = useState(false);
   const [_, updateSpaceAttributes] = useUpdateSpaceAttributesMutation();
 
-  if (!settings) {
+  if (!attributesState) {
     return null;
   }
 
@@ -48,24 +47,24 @@ export function SetPrivacySettings() {
       <div className="h-4"></div>
       <CheckBox
         label={`Public (visible to anyone who visits ${window.location.origin}/space/${currentSpace?.slug}, not just members in your space)`}
-        checked={settings.public}
+        checked={attributesState.public}
         onChange={(e) => {
           const newVal = e.target?.checked ?? false;
 
           setMustSave(true);
-          setSettings({ ...settings, public: newVal });
+          setAttributesState({ ...attributesState, public: newVal });
         }}
       />
       <div className="h-4"></div>
 
       <CheckBox
         label={`Only allow members with published profiles to view other profiles. (Admins will still be able to view all published profiles)`}
-        checked={settings.allowOnlyPublicMembersToViewProfiles}
+        checked={attributesState.allowOnlyPublicMembersToViewProfiles}
         onChange={(e) => {
           const newVal = e.target?.checked ?? false;
           setMustSave(true);
-          setSettings({
-            ...settings,
+          setAttributesState({
+            ...attributesState,
             allowOnlyPublicMembersToViewProfiles: newVal,
           });
         }}
@@ -74,19 +73,52 @@ export function SetPrivacySettings() {
       <div className="h-4"></div>
       <CheckBox
         label={`Opt new users in to matches by default (when they join the space)`}
-        checked={settings.optUsersInToMatchesByDefault}
+        checked={attributesState.optUsersInToMatchesByDefault}
         onChange={(e) => {
           const newVal = e.target?.checked ?? false;
 
           setMustSave(true);
-          setSettings({
-            ...settings,
+          setAttributesState({
+            ...attributesState,
             optUsersInToMatchesByDefault: newVal,
           });
         }}
       />
 
+      <div className="h-12"></div>
+      <TextInput
+        label="Comma-separated allowed domains to join space. Empty = allow all domains"
+        placeholder="example.com,example.org"
+        value={attributesState.domainWhitelists?.join(",") ?? ""}
+        onChange={(e) => {
+          const newVal = e.target.value;
+
+          setMustSave(true);
+          setAttributesState({
+            ...attributesState,
+            domainWhitelists: newVal
+              ? newVal.split(",").map((x) => x.trim())
+              : null,
+          });
+        }}
+      />
+
+      <div className="h-4"></div>
+      <TextInput
+        label="Community guidelines URL (users must agree to guidelines before publishing profile)"
+        value={attributesState.communityGuidelinesUrl || ""}
+        onChange={(e) => {
+          const newVal = e.target.value;
+          setMustSave(true);
+          setAttributesState({
+            ...attributesState,
+            communityGuidelinesUrl: newVal || null,
+          });
+        }}
+      />
+
       <div className="h-8"></div>
+      {/* <pre>{JSON.stringify(settings, null, 2)}</pre> */}
       <Button
         disabled={!mustSave}
         rounded
@@ -97,7 +129,7 @@ export function SetPrivacySettings() {
           }
           setLoading(true);
           updateSpaceAttributes({
-            changes: settings,
+            changes: attributesState,
             space_id: currentSpace.id,
           })
             .then((res) => {
diff --git a/web/components/atomic/CheckBox.tsx b/web/components/atomic/CheckBox.tsx
index 7ee5290..efa2c07 100644
--- a/web/components/atomic/CheckBox.tsx
+++ b/web/components/atomic/CheckBox.tsx
@@ -1,8 +1,9 @@
+import { ReactNode } from "react";
 import { Text } from ".";
 
 export function CheckBox(
   props: {
-    label?: string;
+    label?: ReactNode;
   } & React.InputHTMLAttributes<HTMLInputElement>
 ) {
   const { label, ...rest } = props;
diff --git a/web/components/space-homepage/SpaceLandingPage.tsx b/web/components/space-homepage/SpaceLandingPage.tsx
index 0b2cdb1..c64f6f0 100644
--- a/web/components/space-homepage/SpaceLandingPage.tsx
+++ b/web/components/space-homepage/SpaceLandingPage.tsx
@@ -16,7 +16,7 @@ import {
 } from "../../generated/graphql";
 import { useCurrentProfile } from "../../hooks/useCurrentProfile";
 import { useCurrentSpace } from "../../hooks/useCurrentSpace";
-import { usePrivacySettings } from "../../hooks/usePrivacySettings";
+import { useSpaceAttributes } from "../../hooks/useSpaceAttributes";
 import { useQueryParam } from "../../hooks/useQueryParam";
 import { useUserData } from "../../hooks/useUserData";
 import {
@@ -87,7 +87,7 @@ const FUSE_OPTIONS = {
 
 export function SpaceLandingPage() {
   const { currentSpace } = useCurrentSpace();
-  const { privacySettings } = usePrivacySettings();
+  const { attrs: privacySettings } = useSpaceAttributes();
   const { currentProfileHasRole, currentProfile } = useCurrentProfile();
 
   const isAdmin = currentProfileHasRole(Profile_Role_Enum.Admin);
diff --git a/web/hooks/usePrivacySettings.ts b/web/hooks/usePrivacySettings.ts
deleted file mode 100644
index 01da3d2..0000000
--- a/web/hooks/usePrivacySettings.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { useMemo } from "react";
-
-import {
-  DEFAULT_SPACE_ATTRIBUTES,
-  SpaceAttributes,
-} from "./../lib/spaceAttributes";
-import { useCurrentSpace } from "./useCurrentSpace";
-
-export type PrivacySettings = Pick<
-  SpaceAttributes,
-  | "public"
-  | "allowOnlyPublicMembersToViewProfiles"
-  | "optUsersInToMatchesByDefault"
->;
-
-export function usePrivacySettings(): {
-  privacySettings: PrivacySettings | undefined;
-} {
-  const { currentSpace } = useCurrentSpace();
-
-  const settings: PrivacySettings | undefined = useMemo(() => {
-    if (!currentSpace) return undefined;
-
-    return {
-      public: DEFAULT_SPACE_ATTRIBUTES.public,
-      allowOnlyPublicMembersToViewProfiles:
-        DEFAULT_SPACE_ATTRIBUTES.allowOnlyPublicMembersToViewProfiles,
-      domainWhitelist: DEFAULT_SPACE_ATTRIBUTES.domainWhitelist,
-      ...currentSpace.attributes,
-    };
-  }, [currentSpace]);
-
-  return useMemo(
-    () => ({
-      privacySettings: settings,
-    }),
-    [settings]
-  );
-}
diff --git a/web/hooks/useSpaceAttributes.ts b/web/hooks/useSpaceAttributes.ts
new file mode 100644
index 0000000..49ad742
--- /dev/null
+++ b/web/hooks/useSpaceAttributes.ts
@@ -0,0 +1,30 @@
+import { useMemo } from "react";
+
+import {
+  DEFAULT_SPACE_ATTRIBUTES,
+  SpaceAttributes,
+} from "../lib/spaceAttributes";
+import { useCurrentSpace } from "./useCurrentSpace";
+
+export function useSpaceAttributes(): {
+  attributes: SpaceAttributes | undefined;
+} {
+  const { currentSpace } = useCurrentSpace();
+
+  const settings: SpaceAttributes | undefined = useMemo(() => {
+    if (!currentSpace) return undefined;
+
+    return {
+      // Pick out only privacy settings defaults
+      ...DEFAULT_SPACE_ATTRIBUTES,
+      ...currentSpace.attributes,
+    };
+  }, [currentSpace]);
+
+  return useMemo(
+    () => ({
+      attributes: settings,
+    }),
+    [settings]
+  );
+}
diff --git a/web/hooks/useValidateProfileCompletion.ts b/web/hooks/useValidateProfileCompletion.ts
index e559dce..c7c6ad6 100644
--- a/web/hooks/useValidateProfileCompletion.ts
+++ b/web/hooks/useValidateProfileCompletion.ts
@@ -11,6 +11,7 @@ import {
 import { useCurrentProfile } from "./useCurrentProfile";
 import { useCurrentSpace } from "./useCurrentSpace";
 import { useUserData } from "./useUserData";
+import { useSpaceAttributes } from "./useSpaceAttributes";
 
 /**
  * This hook is used to validate that a profile is complete.
@@ -20,8 +21,9 @@ import { useUserData } from "./useUserData";
 export function useValidateProfileCompletion() {
   const client = useClient();
   const { userData } = useUserData();
-  const { currentProfile } = useCurrentProfile();
+  const { currentProfile, profileAttributes } = useCurrentProfile();
   const { currentSpace } = useCurrentSpace();
+  const { attributes } = useSpaceAttributes();
 
   const validateProfileCompletion: () => Promise<
     | {
@@ -59,6 +61,17 @@ export function useValidateProfileCompletion() {
       };
     }
 
+    if (
+      !!attributes?.communityGuidelinesUrl &&
+      profileAttributes.agreedToCommunityGuidelines === false
+    ) {
+      return {
+        valid: false,
+        error:
+          "Please agree to the community guidelines before publishing your profile",
+      };
+    }
+
     const questions = currentSpace?.space_listing_questions.filter(
       (q) => q.deleted === false
     );
diff --git a/web/lib/profileAttributes.ts b/web/lib/profileAttributes.ts
index a8c2838..8ec86f9 100644
--- a/web/lib/profileAttributes.ts
+++ b/web/lib/profileAttributes.ts
@@ -1,8 +1,10 @@
 export type ProfileAttributes = {
   enableChatIntros: boolean;
+  agreedToCommunityGuidelines: boolean;
 };
 const DEFAULT_PROFILE_ATTRIBUTES: ProfileAttributes = {
   enableChatIntros: false,
+  agreedToCommunityGuidelines: false,
 };
 
 export function resolveProfileAttributes(attrs: Partial<ProfileAttributes>) {
diff --git a/web/lib/spaceAttributes.ts b/web/lib/spaceAttributes.ts
index 3bc2002..3ba99d2 100644
--- a/web/lib/spaceAttributes.ts
+++ b/web/lib/spaceAttributes.ts
@@ -1,12 +1,14 @@
 export type SpaceAttributes = {
   public: boolean;
   allowOnlyPublicMembersToViewProfiles: boolean;
-  domainWhitelist: string | null;
+  domainWhitelists: string[] | null;
+  communityGuidelinesUrl: string | null;
   optUsersInToMatchesByDefault: boolean;
 };
 export const DEFAULT_SPACE_ATTRIBUTES: SpaceAttributes = {
   public: false,
   allowOnlyPublicMembersToViewProfiles: false,
-  domainWhitelist: null,
+  domainWhitelists: null,
+  communityGuidelinesUrl: null,
   optUsersInToMatchesByDefault: false,
 };
diff --git a/web/pages/api/invite/joinProgram.ts b/web/pages/api/invite/joinProgram.ts
index 94c5aef..27d72aa 100644
--- a/web/pages/api/invite/joinProgram.ts
+++ b/web/pages/api/invite/joinProgram.ts
@@ -60,15 +60,8 @@ export default applyMiddleware({
 
   const { email } = req.token;
 
-  const domainWhitelist = attributes.domainWhitelist as string | undefined;
   const domainWhitelists = attributes.domainWhitelists as string[] | undefined;
   if (email) {
-    if (domainWhitelist && !email.endsWith(domainWhitelist)) {
-      throw makeApiFail(
-        `Your email, ${email}, is not allowed to join this space`
-      );
-    }
-
     if (domainWhitelists) {
       if (!domainWhitelists.some((domain) => email.endsWith(domain))) {
         throw makeApiFail(
diff --git a/web/pages/space/[slug]/join/[inviteLinkId].tsx b/web/pages/space/[slug]/join/[inviteLinkId].tsx
index 5da9290..4a543d8 100644
--- a/web/pages/space/[slug]/join/[inviteLinkId].tsx
+++ b/web/pages/space/[slug]/join/[inviteLinkId].tsx
@@ -14,7 +14,7 @@ import {
 } from "../../../../generated/graphql";
 import { useCurrentProfile } from "../../../../hooks/useCurrentProfile";
 import { useCurrentSpace } from "../../../../hooks/useCurrentSpace";
-import { usePrivacySettings } from "../../../../hooks/usePrivacySettings";
+import { useSpaceAttributes } from "../../../../hooks/useSpaceAttributes";
 import { useQueryParam } from "../../../../hooks/useQueryParam";
 import { useUserData } from "../../../../hooks/useUserData";
 import { apiClient } from "../../../../lib/apiClient";
@@ -60,7 +60,6 @@ function JoinSpace() {
   });
   const publicSpace = publicSpaceData?.public_space[0];
 
-  const domainWhiteList = publicSpace?.domainWhitelist as string | undefined;
   const domainWhitelists = publicSpace?.domainWhitelists as
     | string[]
     | undefined;
@@ -78,12 +77,8 @@ function JoinSpace() {
       return false;
     }
 
-    if (domainWhiteList && !email.endsWith(domainWhiteList)) {
-      return false;
-    }
-
     return true;
-  }, [domainWhiteList, domainWhitelists, userData?.email]);
+  }, [domainWhitelists, userData?.email]);
 
   const joinSpace = useCallback(async () => {
     if (!inviteLinkId) {
@@ -126,11 +121,7 @@ function JoinSpace() {
           <div>
             <Text variant="body1">
               You are not allowed to join this space because your email address
-              does not end with one of:{" "}
-              {[domainWhiteList, ...(domainWhitelists ?? [])]
-                .filter(Boolean)
-                .join(", ")}
-              .
+              does not end with one of: {domainWhitelists?.join(", ")}.
             </Text>
             <div className="h-4"></div>
           </div>

From 4c5e24e353f7a0837c2aa1dcd1f3c52d47e06604 Mon Sep 17 00:00:00 2001
From: Max Wu <chengmaxwu@gmail.com>
Date: Wed, 26 Jun 2024 09:52:58 -0700
Subject: [PATCH 5/5] Fix build errors

---
 web/components/account-settings/ProfileSettings.tsx | 8 +++++---
 web/components/space-homepage/SpaceLandingPage.tsx  | 4 ++--
 web/lib/profileAttributes.ts                        | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/web/components/account-settings/ProfileSettings.tsx b/web/components/account-settings/ProfileSettings.tsx
index 0f8708b..136ca5f 100644
--- a/web/components/account-settings/ProfileSettings.tsx
+++ b/web/components/account-settings/ProfileSettings.tsx
@@ -17,7 +17,10 @@ import { useCurrentSpace } from "../../hooks/useCurrentSpace";
 import { usePrevious } from "../../hooks/usePrevious";
 import { useSaveChangesState } from "../../hooks/useSaveChangesState";
 import { useUserData } from "../../hooks/useUserData";
-import { ProfileAttributes } from "../../lib/profileAttributes";
+import {
+  DEFAULT_PROFILE_ATTRIBUTES,
+  ProfileAttributes,
+} from "../../lib/profileAttributes";
 import { Button, Text } from "../atomic";
 import { CheckBox } from "../atomic/CheckBox";
 
@@ -57,8 +60,6 @@ export function ProfileSettings() {
     return true;
   }, [client, currentProfile?.profile_listing]);
 
-  console.log(settings);
-
   return (
     <>
       <Text variant="heading3">Settings for {currentSpace?.name}</Text>
@@ -88,6 +89,7 @@ export function ProfileSettings() {
           }
 
           setSettings((prev) => ({
+            ...DEFAULT_PROFILE_ATTRIBUTES,
             ...prev,
             enableChatIntros: newVal,
           }));
diff --git a/web/components/space-homepage/SpaceLandingPage.tsx b/web/components/space-homepage/SpaceLandingPage.tsx
index c64f6f0..28c9ccf 100644
--- a/web/components/space-homepage/SpaceLandingPage.tsx
+++ b/web/components/space-homepage/SpaceLandingPage.tsx
@@ -87,7 +87,7 @@ const FUSE_OPTIONS = {
 
 export function SpaceLandingPage() {
   const { currentSpace } = useCurrentSpace();
-  const { attrs: privacySettings } = useSpaceAttributes();
+  const { attributes } = useSpaceAttributes();
   const { currentProfileHasRole, currentProfile } = useCurrentProfile();
 
   const isAdmin = currentProfileHasRole(Profile_Role_Enum.Admin);
@@ -237,7 +237,7 @@ export function SpaceLandingPage() {
             ></div>
           ))}
         </div>
-      ) : privacySettings?.allowOnlyPublicMembersToViewProfiles &&
+      ) : attributes?.allowOnlyPublicMembersToViewProfiles &&
         !currentProfile?.profile_listing?.public &&
         !adminBypass ? (
         <>
diff --git a/web/lib/profileAttributes.ts b/web/lib/profileAttributes.ts
index 8ec86f9..94b7da2 100644
--- a/web/lib/profileAttributes.ts
+++ b/web/lib/profileAttributes.ts
@@ -2,7 +2,7 @@ export type ProfileAttributes = {
   enableChatIntros: boolean;
   agreedToCommunityGuidelines: boolean;
 };
-const DEFAULT_PROFILE_ATTRIBUTES: ProfileAttributes = {
+export const DEFAULT_PROFILE_ATTRIBUTES: ProfileAttributes = {
   enableChatIntros: false,
   agreedToCommunityGuidelines: false,
 };