478 implement text changes (#481)

* Changes to join public group * Update texts * WIP * Latest text changes
lexicongovernance · May 16, 2024 · e52d884 · e52d884
1 parent cfe4337
commit e52d884
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 44 deletions.
diff --git a/packages/berlin/src/components/dialog/Dialog.tsx b/packages/berlin/src/components/dialog/Dialog.tsx
@@ -12,7 +12,7 @@ import { DialogContent, DialogOverlay } from './Dialog.styled';
 
 type DialogProps = {
   trigger?: React.ReactNode;
-  title: string;
+  title?: string;
   description?: string;
   content?: React.ReactNode;
   dialogButtons?: boolean;

diff --git a/packages/berlin/src/components/research-group-form/ResearchGroupForm.tsx b/packages/berlin/src/components/research-group-form/ResearchGroupForm.tsx
@@ -12,7 +12,6 @@ import { FlexRow } from '../containers/FlexRow.styled';
 type ResearchGroupFormProps = {
   formData: {
     input: {
-      label: string;
       placeholder: string;
       requiredMessage: string;
     };
@@ -48,7 +47,6 @@ function ResearchGroupForm({ formData, handleCreateGroup, setGroupName }: Resear
   return (
     <Form onSubmit={handleSubmit(onSubmit)}>
       <Input
-        label={formData.input.label}
         placeholder={formData.input.placeholder}
         autoComplete="off"
         {...register('name', {

diff --git a/packages/berlin/src/components/secret-code/SecretCode.tsx b/packages/berlin/src/components/secret-code/SecretCode.tsx
@@ -21,9 +21,7 @@ function SecretCode({ groupName, secretCode }: SecretCodeProps) {
   };
   return (
     <SecretCodeContainer>
-      <Body>
-        Secret code for <i>{groupName}</i> research group:
-      </Body>
+      <Body>Access code for {groupName} research group</Body>
       <FlexRow $align="center" $justify="space-between">
         <Subtitle>{secretCode}</Subtitle>
         <IconButton

diff --git a/packages/berlin/src/data/groups.ts b/packages/berlin/src/data/groups.ts
@@ -4,23 +4,16 @@ const groups = {
     body: [
       {
         id: 0,
-        text: 'If you are the Lead Researcher or a Solo Researcher, please create a research group.',
-      },
-      {
-        id: 1,
-        text: 'You will get a code that you can share with your collaborators.',
+        text: 'Share the access code with your collaborators',
       },
     ],
     buttonText: 'Create group',
     dialog: {
-      title: 'Do you want to create a Research Group?',
-      description: 'This action will create a Research Group and join you to it.',
       actionButtonText: 'Create group',
       form: {
         input: {
-          label: 'Research Group name',
-          placeholder: 'Enter your group name',
-          requiredMessage: 'Group name must be 2 characters long or more',
+          placeholder: 'Research group name',
+          requiredMessage: 'Research group name must be 2 characters long or more',
         },
         buttonText: 'Create group',
       },
@@ -29,16 +22,11 @@ const groups = {
   },
   join: {
     subtitle: 'Join a Research Group',
-    body: [
-      {
-        id: 0,
-        text: 'As a collaborator, you can join a research group. Please ask to your Lead Researcher for the group code.',
-      },
-    ],
+    body: [],
     input: {
-      label: 'Research Group Code',
-      placeholder: 'Enter the secret code here...',
-      requiredMessage: 'Code is required',
+      label: 'Ask the group creator for the access code',
+      placeholder: 'Enter access code',
+      requiredMessage: 'Access code is required',
     },
     buttonText: 'Join group',
   },

diff --git a/packages/berlin/src/data/publicGroups.ts b/packages/berlin/src/data/publicGroups.ts
diff --git a/packages/berlin/src/pages/PublicGroupRegistration.tsx b/packages/berlin/src/pages/PublicGroupRegistration.tsx
@@ -10,14 +10,9 @@ import useUser from '../hooks/useUser';
 // API
 import { fetchGroups, postUsersToGroups, fetchUsersToGroups, putUsersToGroups } from 'api';
 
-// Data
-import publicGroups from '../data/publicGroups';
-
 // Components
-import { Body } from '../components/typography/Body.styled';
 import { FlexColumn } from '../components/containers/FlexColum.styled';
 import { Form } from '../components/containers/Form.styled';
-import { Subtitle } from '../components/typography/Subtitle.styled';
 import Button from '../components/button';
 import Select from '../components/select';
 import { useMemo } from 'react';
@@ -133,8 +128,6 @@ function PublicGroupRegistration() {
 
   return (
     <FlexColumn $gap="1.5rem">
-      <Subtitle>{publicGroups.copy.subtitle}</Subtitle>
-      <Body>{publicGroups.copy.body}</Body>
       <Form onSubmit={handleSubmit(onSubmit)}>
         <Controller
           name="group"
@@ -144,11 +137,10 @@ function PublicGroupRegistration() {
           }}
           render={({ field }) => (
             <Select
-              label={`${capitalizedParam} group`}
               placeholder={
                 prevUserToGroup
                   ? prevUserToGroup.group.name
-                  : `Select a ${groupCategoryNameParam} group`
+                  : `Select your ${groupCategoryNameParam} group`
               }
               options={selectData}
               value={field.value}

diff --git a/packages/berlin/src/pages/SecretGroupRegistration.tsx b/packages/berlin/src/pages/SecretGroupRegistration.tsx
@@ -130,8 +130,6 @@ function SecretGroupRegistration() {
             trigger={
               <Button onClick={() => setIsDialogOpen(true)}>{groups.create.buttonText}</Button>
             }
-            title={groups.create.dialog.title}
-            description={groups.create.dialog.description}
             content={
               <ResearchGroupForm
                 formData={groups.create.dialog.form}