From a9e7330ec3771fc3bdfa7264509d39fc4c934d9c Mon Sep 17 00:00:00 2001 From: EdwinKato Date: Tue, 24 Sep 2024 12:39:58 +0300 Subject: [PATCH 01/12] Add tooltip explaining participation numbers --- .../projects/project/projectHeader/index.tsx | 54 ++++++++++++++++++- .../project/projectHeader/messages.ts | 29 ++++++++++ 2 files changed, 82 insertions(+), 1 deletion(-) diff --git a/front/app/containers/Admin/projects/project/projectHeader/index.tsx b/front/app/containers/Admin/projects/project/projectHeader/index.tsx index 47fa3bfc2b7a..b090166571b8 100644 --- a/front/app/containers/Admin/projects/project/projectHeader/index.tsx +++ b/front/app/containers/Admin/projects/project/projectHeader/index.tsx @@ -7,6 +7,7 @@ import { Text, colors, IconNames, + Tooltip, } from '@citizenlab/cl2-component-library'; import moment from 'moment'; import styled from 'styled-components'; @@ -21,7 +22,7 @@ import otherProjectMessages from 'containers/Admin/projects/all/messages'; import NavigationTabs from 'components/admin/NavigationTabs'; import Button from 'components/UI/Button'; -import { MessageDescriptor, useIntl } from 'utils/cl-intl'; +import { FormattedMessage, MessageDescriptor, useIntl } from 'utils/cl-intl'; import messages from './messages'; @@ -171,6 +172,57 @@ const ProjectHeader = ({ projectId }: Props) => { · + + +
    +
  • + +
    • +
  • + +
    • +
+ + +
    +
  • + +
    • +
  • + +
    • +
+ + + + } + > + + + + {formatMessage(messages.participants, { + participantsCount: project.data.attributes.participants_count, + })} + + + diff --git a/front/app/containers/Admin/projects/project/projectHeader/messages.ts b/front/app/containers/Admin/projects/project/projectHeader/messages.ts index e7766adab4c8..7f043b95d4df 100644 --- a/front/app/containers/Admin/projects/project/projectHeader/messages.ts +++ b/front/app/containers/Admin/projects/project/projectHeader/messages.ts @@ -42,4 +42,33 @@ export default defineMessages({ id: 'app.components.app.containers.AdminPage.ProjectEdit.projectHeader.publishedFinished1', defaultMessage: 'Published - Finished', }, + participantsInfoTitle: { + id: 'app.components.app.containers.AdminPage.ProjectEdit.projectHeader.participantsInfo.participantsInfoTitle', + defaultMessage: 'Participants include:', + }, + users: { + id: 'app.components.app.containers.AdminPage.ProjectEdit.projectHeader.participantsInfo.users', + defaultMessage: 'Users interacting with Go Vocal methods', + }, + attendees: { + id: 'app.components.app.containers.AdminPage.ProjectEdit.projectHeader.participantsInfo.attendees', + defaultMessage: 'Event attendees', + }, + participantsExclusionTitle: { + id: 'app.components.app.containers.AdminPage.ProjectEdit.projectHeader.participantsInfo.participantsExclusionTitle', + defaultMessage: 'Participants do not include:', + }, + followers: { + id: 'app.components.app.containers.AdminPage.ProjectEdit.projectHeader.participantsInfo.followers', + defaultMessage: 'Followers of a project', + }, + embeddedMethods: { + id: 'app.components.app.containers.AdminPage.ProjectEdit.projectHeader.participantsInfo.embeddedMethods', + defaultMessage: 'Participants in embedded methods (e.g., external surveys)', + }, + note: { + id: 'app.components.app.containers.AdminPage.ProjectEdit.projectHeader.participantsInfo.note', + defaultMessage: + 'Note: Enabling anonymous or open participation permissions may allow users to participate multiple times, leading to misleading or incomplete user data.', + }, }); From ebf26e67ab31a395a07587abce1075ca20af8e36 Mon Sep 17 00:00:00 2001 From: CircleCI Date: Tue, 24 Sep 2024 09:43:02 +0000 Subject: [PATCH 02/12] Translations updated by CI (extract-intl) --- front/app/translations/admin/en.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/front/app/translations/admin/en.json b/front/app/translations/admin/en.json index 37248b6d2f37..c95f1d7bf31c 100644 --- a/front/app/translations/admin/en.json +++ b/front/app/translations/admin/en.json @@ -368,6 +368,13 @@ "app.components.app.containers.AdminPage.ProjectEdit.projectHeader.everyone": "Everyone", "app.components.app.containers.AdminPage.ProjectEdit.projectHeader.groups": "Groups", "app.components.app.containers.AdminPage.ProjectEdit.projectHeader.participants": "{participantsCount, plural, one {1 participant} other {{participantsCount} participants}}", + "app.components.app.containers.AdminPage.ProjectEdit.projectHeader.participantsInfo.attendees": "Event attendees", + "app.components.app.containers.AdminPage.ProjectEdit.projectHeader.participantsInfo.embeddedMethods": "Participants in embedded methods (e.g., external surveys)", + "app.components.app.containers.AdminPage.ProjectEdit.projectHeader.participantsInfo.followers": "Followers of a project", + "app.components.app.containers.AdminPage.ProjectEdit.projectHeader.participantsInfo.note": "Note: Enabling anonymous or open participation permissions may allow users to participate multiple times, leading to misleading or incomplete user data.", + "app.components.app.containers.AdminPage.ProjectEdit.projectHeader.participantsInfo.participantsExclusionTitle": "Participants do not include:", + "app.components.app.containers.AdminPage.ProjectEdit.projectHeader.participantsInfo.participantsInfoTitle": "Participants include:", + "app.components.app.containers.AdminPage.ProjectEdit.projectHeader.participantsInfo.users": "Users interacting with Go Vocal methods", "app.components.app.containers.AdminPage.ProjectEdit.projectHeader.projectSettings": "Project settings", "app.components.app.containers.AdminPage.ProjectEdit.projectHeader.publishedActive1": "Published - Active", "app.components.app.containers.AdminPage.ProjectEdit.projectHeader.publishedFinished1": "Published - Finished", From 60993a9bb24e9b29aa27cd76d215ee5bc9698a7f Mon Sep 17 00:00:00 2001 From: EdwinKato Date: Tue, 24 Sep 2024 16:47:36 +0300 Subject: [PATCH 03/12] Change message to participation box --- .../admin/ContentBuilder/Widgets/AboutBox/messages.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/front/app/components/admin/ContentBuilder/Widgets/AboutBox/messages.ts b/front/app/components/admin/ContentBuilder/Widgets/AboutBox/messages.ts index 1980ace19982..6428725b52f9 100644 --- a/front/app/components/admin/ContentBuilder/Widgets/AboutBox/messages.ts +++ b/front/app/components/admin/ContentBuilder/Widgets/AboutBox/messages.ts @@ -1,8 +1,12 @@ import { defineMessages } from 'react-intl'; export default defineMessages({ - aboutBox: { - id: 'app.containers.admin.ContentBuilder.aboutBox', - defaultMessage: 'About Box', + participationBox: { + id: 'app.containers.admin.ContentBuilder.participationBox', + defaultMessage: 'Participation Box', + }, + hideParticipationNumbersText: { + id: 'app.containers.admin.ContentBuilder.hideParticipationNumbersText', + defaultMessage: 'Hide participation numbers', }, }); From a6346f40140f22501e4ced9249fda58c9fcdb0df Mon Sep 17 00:00:00 2001 From: EdwinKato Date: Tue, 24 Sep 2024 16:48:01 +0300 Subject: [PATCH 04/12] Add ability to hide particpation numbers --- .../ContentBuilder/Widgets/AboutBox/index.tsx | 49 +- .../header/ProjectInfoSideBar/index.tsx | 546 +++++++++--------- 2 files changed, 325 insertions(+), 270 deletions(-) diff --git a/front/app/components/admin/ContentBuilder/Widgets/AboutBox/index.tsx b/front/app/components/admin/ContentBuilder/Widgets/AboutBox/index.tsx index e7690db6adc4..edbb20162417 100644 --- a/front/app/components/admin/ContentBuilder/Widgets/AboutBox/index.tsx +++ b/front/app/components/admin/ContentBuilder/Widgets/AboutBox/index.tsx @@ -1,17 +1,24 @@ import React from 'react'; -import { Box } from '@citizenlab/cl2-component-library'; +import { Box, Toggle } from '@citizenlab/cl2-component-library'; +import { useNode } from '@craftjs/core'; import { useParams } from 'react-router-dom'; import useProjectBySlug from 'api/projects/useProjectBySlug'; import ProjectInfoSideBar from 'containers/ProjectsShowPage/shared/header/ProjectInfoSideBar'; +import { useIntl } from 'utils/cl-intl'; + import useCraftComponentDefaultPadding from '../../useCraftComponentDefaultPadding'; import messages from './messages'; -const AboutBox = () => { +type AboutBoxProps = { + hideParticipationNumbers?: boolean; +}; + +const AboutBox = ({ hideParticipationNumbers }: AboutBoxProps) => { const { projectId, slug } = useParams() as { projectId: string; slug: string; @@ -26,14 +33,48 @@ const AboutBox = () => { margin="0 auto" px={componentDefaultPadding} > - {projectID && } + {projectID && ( + + )} + + ); +}; + +const AboutBoxSettings = () => { + const { formatMessage } = useIntl(); + const { + actions: { setProp }, + hideParticipationNumbers, + } = useNode((node) => ({ + hideParticipationNumbers: node.data.props.hideParticipationNumbers, + id: node.id, + })); + + return ( + + { + setProp( + (props: AboutBoxProps) => + (props.hideParticipationNumbers = !hideParticipationNumbers) + ); + }} + label={formatMessage(messages.hideParticipationNumbersText)} + /> ); }; AboutBox.craft = { + related: { + settings: AboutBoxSettings, + }, custom: { - title: messages.aboutBox, + title: messages.participationBox, noPointerEvents: true, }, }; diff --git a/front/app/containers/ProjectsShowPage/shared/header/ProjectInfoSideBar/index.tsx b/front/app/containers/ProjectsShowPage/shared/header/ProjectInfoSideBar/index.tsx index ab1d40b281c6..ee4fc4ee34e1 100644 --- a/front/app/containers/ProjectsShowPage/shared/header/ProjectInfoSideBar/index.tsx +++ b/front/app/containers/ProjectsShowPage/shared/header/ProjectInfoSideBar/index.tsx @@ -123,291 +123,305 @@ const StyledProjectActionButtons = styled(ProjectActionButtons)` interface Props { projectId: string; + hideParticipationNumbers?: boolean; className?: string; } -const ProjectInfoSideBar = memo(({ projectId, className }) => { - const { data: project } = useProjectById(projectId); - const { data: phases } = usePhases(projectId); - const { data: events } = useEvents({ - projectIds: [projectId], - sort: '-start_at', - }); - const { data: authUser } = useAuthUser(); - - const { formatMessage } = useIntl(); - const [currentPhase, setCurrentPhase] = useState(); - const [shareModalOpened, setShareModalOpened] = useState(false); - - useEffect(() => { - setCurrentPhase( - getCurrentPhase(phases?.data) || getLastPhase(phases?.data) +const ProjectInfoSideBar = memo( + ({ projectId, className, hideParticipationNumbers = false }) => { + const { data: project } = useProjectById(projectId); + const { data: phases } = usePhases(projectId); + const { data: events } = useEvents({ + projectIds: [projectId], + sort: '-start_at', + }); + const { data: authUser } = useAuthUser(); + + const { formatMessage } = useIntl(); + const [currentPhase, setCurrentPhase] = useState(); + const [shareModalOpened, setShareModalOpened] = useState(false); + + useEffect(() => { + setCurrentPhase( + getCurrentPhase(phases?.data) || getLastPhase(phases?.data) + ); + }, [phases]); + + const phaseId = currentPhase?.id; + const { data: surveySubmissionCount } = useFormSubmissionCount({ phaseId }); + + const scrollTo = useCallback( + (id: string, shouldSelectCurrentPhase = true) => + (event: FormEvent) => { + event.preventDefault(); + if (!phases || !project) return; + + if (currentPhase && shouldSelectCurrentPhase) { + setPhaseUrl(currentPhase, phases.data, project.data); + } + + setTimeout(() => { + scrollToElement({ id, shouldFocus: true }); + }, 100); + }, + [currentPhase, phases, project] ); - }, [phases]); - - const phaseId = currentPhase?.id; - const { data: surveySubmissionCount } = useFormSubmissionCount({ phaseId }); - - const scrollTo = useCallback( - (id: string, shouldSelectCurrentPhase = true) => - (event: FormEvent) => { - event.preventDefault(); - if (!phases || !project) return; - - if (currentPhase && shouldSelectCurrentPhase) { - setPhaseUrl(currentPhase, phases.data, project.data); - } - - setTimeout(() => { - scrollToElement({ id, shouldFocus: true }); - }, 100); - }, - [currentPhase, phases, project] - ); - - const openShareModal = useCallback((event: FormEvent) => { - event.preventDefault(); - setShareModalOpened(true); - }, []); - - const closeShareModal = useCallback(() => { - setShareModalOpened(false); - }, []); - - if (project) { - const isProjectArchived = - project.data.attributes.publication_status === 'archived'; - const postingIsEnabled = currentPhase?.attributes.submission_enabled; - const projectParticipantsCount = project.data.attributes.participants_count; - const maxBudget = currentPhase?.attributes?.voting_max_total || null; - const hasProjectEnded = currentPhase - ? pastPresentOrFuture([ - currentPhase.attributes.start_at, - currentPhase.attributes.end_at, - ]) === 'past' - : false; - - const ideasCount = currentPhase?.attributes.ideas_count; - const currentPhaseParticipationMethod = - currentPhase?.attributes?.participation_method; - const surveyMessage = messages.oneSurveyInCurrentPhase; - const docAnnotationMessage = messages.oneDocToReviewInCurrentPhase; - - const isParticipatoryBudgeting = - currentPhase?.attributes.participation_method === 'voting' && - currentPhase?.attributes.voting_method === 'budgeting'; - - return ( - - - - <FormattedMessage {...messages.about} /> - - - {currentPhase && - hasProjectEnded && - pastPresentOrFuture([ - currentPhase.attributes.start_at, - currentPhase.attributes.end_at, - ]) === 'past' && ( - - - { + event.preventDefault(); + setShareModalOpened(true); + }, []); + + const closeShareModal = useCallback(() => { + setShareModalOpened(false); + }, []); + + if (project) { + const isProjectArchived = + project.data.attributes.publication_status === 'archived'; + const postingIsEnabled = currentPhase?.attributes.submission_enabled; + const projectParticipantsCount = + project.data.attributes.participants_count; + const maxBudget = currentPhase?.attributes?.voting_max_total || null; + const hasProjectEnded = currentPhase + ? pastPresentOrFuture([ + currentPhase.attributes.start_at, + currentPhase.attributes.end_at, + ]) === 'past' + : false; + + const ideasCount = currentPhase?.attributes.ideas_count; + const currentPhaseParticipationMethod = + currentPhase?.attributes?.participation_method; + const surveyMessage = messages.oneSurveyInCurrentPhase; + const docAnnotationMessage = messages.oneDocToReviewInCurrentPhase; + + const isParticipatoryBudgeting = + currentPhase?.attributes.participation_method === 'voting' && + currentPhase?.attributes.voting_method === 'budgeting'; + + return ( + + + + <FormattedMessage {...messages.about} /> + + + {currentPhase && + hasProjectEnded && + pastPresentOrFuture([ + currentPhase.attributes.start_at, + currentPhase.attributes.end_at, + ]) === 'past' && ( + + + + + )} + + {!hideParticipationNumbers && ( + <> + + + + )} + {isAdmin(authUser) && hasNativeSurvey(phases?.data) && ( + + + + + ), + }} + /> + } + /> + + )} + + {phases && phases.data.length > 1 && ( + + + + + )} - - - - {isAdmin(authUser) && hasNativeSurvey(phases?.data) && ( - - - - - ), - }} - /> - } - /> - - )} - - {phases && phases.data.length > 1 && ( - - - - - - - )} - {(currentPhaseParticipationMethod === 'ideation' || - (currentPhase && - hasProjectEnded && - currentPhase?.attributes.participation_method === - 'ideation')) && - typeof ideasCount === 'number' && - ideasCount > 0 && ( - - - {project.data.attributes.ideas_count > 0 ? ( - - {currentPhase && - currentPhaseParticipationMethod === 'ideation' && - !hasProjectEnded && ( - - )} - {currentPhase && - currentPhaseParticipationMethod === 'ideation' && - hasProjectEnded && ( - 0 && ( + + + {project.data.attributes.ideas_count > 0 ? ( + + {currentPhase && + currentPhaseParticipationMethod === 'ideation' && + !hasProjectEnded && ( + + )} + {currentPhase && + currentPhaseParticipationMethod === 'ideation' && + hasProjectEnded && ( + + )} + + ) : ( + + )} + + )} + {currentPhaseParticipationMethod === 'native_survey' && + surveySubmissionCount && ( + + + + {surveySubmissionCount && + surveySubmissionCount.data.attributes.totalSubmissions} + + + + {hasEmbeddedSurvey(phases?.data) && ( + + - )} - - ) : ( - - )} + + )} + + + )} + {isParticipatoryBudgeting && maxBudget && ( + + + )} - {currentPhaseParticipationMethod === 'native_survey' && - surveySubmissionCount && ( - + {currentPhaseParticipationMethod === 'survey' && + !isProjectArchived && + !hasProjectEnded && ( + + + + + )} + {currentPhaseParticipationMethod === 'document_annotation' && + !isProjectArchived && + !hasProjectEnded && ( - - {surveySubmissionCount && - surveySubmissionCount.data.attributes.totalSubmissions} - - - - {hasEmbeddedSurvey(phases?.data) && ( - - - - )} + + - - )} - {isParticipatoryBudgeting && maxBudget && ( - - - - - )} - {currentPhaseParticipationMethod === 'survey' && - !isProjectArchived && - !hasProjectEnded && ( - + )} + {currentPhaseParticipationMethod === 'native_survey' && + postingIsEnabled && + !isProjectArchived && + !hasProjectEnded && ( + + + + + )} + {currentPhaseParticipationMethod === 'poll' && ( + - + )} - {currentPhaseParticipationMethod === 'document_annotation' && - !isProjectArchived && - !hasProjectEnded && ( - - - - - )} - {currentPhaseParticipationMethod === 'native_survey' && - postingIsEnabled && - !isProjectArchived && - !hasProjectEnded && ( - - - + {!isNilOrError(events) && events.data.length > 0 && ( + + + )} - {currentPhaseParticipationMethod === 'poll' && ( - - - - - )} - {!isNilOrError(events) && events.data.length > 0 && ( - - - + + + + + - )} - - - - - - - - - - - - ); + + + + + + ); + } + + return null; } - - return null; -}); +); export default ProjectInfoSideBar; From 01e2998171afd9ba58355b92a6e1651238ff47e1 Mon Sep 17 00:00:00 2001 From: CircleCI Date: Tue, 24 Sep 2024 13:53:37 +0000 Subject: [PATCH 05/12] Translations updated by CI (extract-intl) --- front/app/translations/admin/ar-MA.json | 1 - front/app/translations/admin/ar-SA.json | 1 - front/app/translations/admin/ca-ES.json | 1 - front/app/translations/admin/cy-GB.json | 1 - front/app/translations/admin/da-DK.json | 1 - front/app/translations/admin/de-DE.json | 1 - front/app/translations/admin/el-GR.json | 1 - front/app/translations/admin/en-CA.json | 1 - front/app/translations/admin/en-GB.json | 1 - front/app/translations/admin/en-IE.json | 1 - front/app/translations/admin/en.json | 3 ++- front/app/translations/admin/es-CL.json | 1 - front/app/translations/admin/es-ES.json | 1 - front/app/translations/admin/fi-FI.json | 1 - front/app/translations/admin/fr-BE.json | 1 - front/app/translations/admin/fr-FR.json | 1 - front/app/translations/admin/hr-HR.json | 1 - front/app/translations/admin/it-IT.json | 1 - front/app/translations/admin/kl-GL.json | 1 - front/app/translations/admin/lb-LU.json | 1 - front/app/translations/admin/lv-LV.json | 1 - front/app/translations/admin/nb-NO.json | 1 - front/app/translations/admin/nl-BE.json | 1 - front/app/translations/admin/nl-NL.json | 1 - front/app/translations/admin/pl-PL.json | 1 - front/app/translations/admin/pt-BR.json | 1 - front/app/translations/admin/ro-RO.json | 1 - front/app/translations/admin/sr-Latn.json | 1 - front/app/translations/admin/sr-SP.json | 1 - front/app/translations/admin/sv-SE.json | 1 - front/app/translations/admin/tr-TR.json | 1 - 31 files changed, 2 insertions(+), 31 deletions(-) diff --git a/front/app/translations/admin/ar-MA.json b/front/app/translations/admin/ar-MA.json index b8b934ec3f0e..895da8869ed3 100644 --- a/front/app/translations/admin/ar-MA.json +++ b/front/app/translations/admin/ar-MA.json @@ -1219,7 +1219,6 @@ "app.containers.AdminPage.widgets.titleStyle": "النمط", "app.containers.AdminPage.widgets.titleWidgets": "عنصر الواجهة", "app.containers.ContentBuilder.Save": "حفظ", - "app.containers.admin.ContentBuilder.aboutBox": "حول مربع الحوار", "app.containers.admin.ContentBuilder.content": "محتوى", "app.containers.admin.ContentBuilder.delete": "حذف", "app.containers.admin.ContentBuilder.error": "خطأ", diff --git a/front/app/translations/admin/ar-SA.json b/front/app/translations/admin/ar-SA.json index 7c3851cf8955..e84f550635af 100644 --- a/front/app/translations/admin/ar-SA.json +++ b/front/app/translations/admin/ar-SA.json @@ -2528,7 +2528,6 @@ "app.containers.admin.ContentBuilder.IframeMultiloc.iframeSupportLink": "https://support.citizenlab.co/en/articles/6354058-embedding-elements-in-the-content-builder-to-enrich-project-descriptions", "app.containers.admin.ContentBuilder.IframeMultiloc.iframeUrlErrorMessage": "أدخل عنوان ويب صالحًا، على سبيل المثال https://example.com", "app.containers.admin.ContentBuilder.IframeMultiloc.url": "تضمين", - "app.containers.admin.ContentBuilder.aboutBox": "حول مربع الحوار", "app.containers.admin.ContentBuilder.accordionMultiloc": "الأكورديون", "app.containers.admin.ContentBuilder.accordionMultilocDefaultOpenLabel": "فتح افتراضيا", "app.containers.admin.ContentBuilder.accordionMultilocTextLabel": "نص", diff --git a/front/app/translations/admin/ca-ES.json b/front/app/translations/admin/ca-ES.json index 796f9dcca90a..9586e1ef0620 100644 --- a/front/app/translations/admin/ca-ES.json +++ b/front/app/translations/admin/ca-ES.json @@ -1580,7 +1580,6 @@ "app.containers.AdminPage.widgets.titleStyle": "Estil", "app.containers.AdminPage.widgets.titleWidgets": "Widget", "app.containers.ContentBuilder.Save": "Save", - "app.containers.admin.ContentBuilder.aboutBox": "Sobre la caixa", "app.containers.admin.ContentBuilder.content": "CONTINGUT", "app.containers.admin.ContentBuilder.delete": "Delete", "app.containers.admin.ContentBuilder.error": "error", diff --git a/front/app/translations/admin/cy-GB.json b/front/app/translations/admin/cy-GB.json index 650b235ac796..d2b85d319fde 100644 --- a/front/app/translations/admin/cy-GB.json +++ b/front/app/translations/admin/cy-GB.json @@ -2528,7 +2528,6 @@ "app.containers.admin.ContentBuilder.IframeMultiloc.iframeSupportLink": "https://support.citizenlab.co/en/articles/6354058-embedding-elements-in-the-content-builder-to-enrich-project-descriptions", "app.containers.admin.ContentBuilder.IframeMultiloc.iframeUrlErrorMessage": "Rhowch gyfeiriad gwe dilys, er enghraifft https://example.com", "app.containers.admin.ContentBuilder.IframeMultiloc.url": "Gwreiddio", - "app.containers.admin.ContentBuilder.aboutBox": "Ynglŷn â blwch", "app.containers.admin.ContentBuilder.accordionMultiloc": "Acordion", "app.containers.admin.ContentBuilder.accordionMultilocDefaultOpenLabel": "Agor yn ddiofyn", "app.containers.admin.ContentBuilder.accordionMultilocTextLabel": "Testun", diff --git a/front/app/translations/admin/da-DK.json b/front/app/translations/admin/da-DK.json index 6f646a192fb4..3acf3b391839 100644 --- a/front/app/translations/admin/da-DK.json +++ b/front/app/translations/admin/da-DK.json @@ -2528,7 +2528,6 @@ "app.containers.admin.ContentBuilder.IframeMultiloc.iframeSupportLink": "https://support.citizenlab.co/en/articles/6354058-embedding-elements-in-the-content-builder-to-enrich-project-descriptions", "app.containers.admin.ContentBuilder.IframeMultiloc.iframeUrlErrorMessage": "Indtast en gyldig webadresse, for eksempel https://example.com", "app.containers.admin.ContentBuilder.IframeMultiloc.url": "Indlejr", - "app.containers.admin.ContentBuilder.aboutBox": "Om Box", "app.containers.admin.ContentBuilder.accordionMultiloc": "Harmonika", "app.containers.admin.ContentBuilder.accordionMultilocDefaultOpenLabel": "Åbnes som standard", "app.containers.admin.ContentBuilder.accordionMultilocTextLabel": "Tekst", diff --git a/front/app/translations/admin/de-DE.json b/front/app/translations/admin/de-DE.json index 3de4825a02f9..7f577d470f52 100644 --- a/front/app/translations/admin/de-DE.json +++ b/front/app/translations/admin/de-DE.json @@ -2528,7 +2528,6 @@ "app.containers.admin.ContentBuilder.IframeMultiloc.iframeSupportLink": "https://support.citizenlab.co/de/articles/7025826-anpassen-von-projektbeschreibungen-mit-dem-content-builder", "app.containers.admin.ContentBuilder.IframeMultiloc.iframeUrlErrorMessage": "Geben Sie eine gültige Webadresse ein, zum Beispiel https://beispiel.de", "app.containers.admin.ContentBuilder.IframeMultiloc.url": "Einbetten", - "app.containers.admin.ContentBuilder.aboutBox": "\"Über\"-Fenster", "app.containers.admin.ContentBuilder.accordionMultiloc": "Akkordeon", "app.containers.admin.ContentBuilder.accordionMultilocDefaultOpenLabel": "Standardmäßig geöffnet", "app.containers.admin.ContentBuilder.accordionMultilocTextLabel": "Text", diff --git a/front/app/translations/admin/el-GR.json b/front/app/translations/admin/el-GR.json index ca3c21af6241..6187beed496b 100644 --- a/front/app/translations/admin/el-GR.json +++ b/front/app/translations/admin/el-GR.json @@ -1580,7 +1580,6 @@ "app.containers.AdminPage.widgets.titleStyle": "Στυλ", "app.containers.AdminPage.widgets.titleWidgets": "Widget", "app.containers.ContentBuilder.Save": "Save", - "app.containers.admin.ContentBuilder.aboutBox": "Πλαίσιο Πληροφορίες", "app.containers.admin.ContentBuilder.content": "ΠΕΡΙΕΧΟΜΕΝΟ", "app.containers.admin.ContentBuilder.delete": "Delete", "app.containers.admin.ContentBuilder.error": "error", diff --git a/front/app/translations/admin/en-CA.json b/front/app/translations/admin/en-CA.json index 37248b6d2f37..b48ad890ffb9 100644 --- a/front/app/translations/admin/en-CA.json +++ b/front/app/translations/admin/en-CA.json @@ -2528,7 +2528,6 @@ "app.containers.admin.ContentBuilder.IframeMultiloc.iframeSupportLink": "https://support.citizenlab.co/en/articles/6354058-embedding-elements-in-the-content-builder-to-enrich-project-descriptions", "app.containers.admin.ContentBuilder.IframeMultiloc.iframeUrlErrorMessage": "Enter a valid web address, for example https://example.com", "app.containers.admin.ContentBuilder.IframeMultiloc.url": "Embed", - "app.containers.admin.ContentBuilder.aboutBox": "About box", "app.containers.admin.ContentBuilder.accordionMultiloc": "Accordion", "app.containers.admin.ContentBuilder.accordionMultilocDefaultOpenLabel": "Open by default", "app.containers.admin.ContentBuilder.accordionMultilocTextLabel": "Text", diff --git a/front/app/translations/admin/en-GB.json b/front/app/translations/admin/en-GB.json index c5e479273c2b..88d050399df7 100644 --- a/front/app/translations/admin/en-GB.json +++ b/front/app/translations/admin/en-GB.json @@ -2528,7 +2528,6 @@ "app.containers.admin.ContentBuilder.IframeMultiloc.iframeSupportLink": "https://support.citizenlab.co/en/articles/6354058-embedding-elements-in-the-content-builder-to-enrich-project-descriptions", "app.containers.admin.ContentBuilder.IframeMultiloc.iframeUrlErrorMessage": "Enter a valid web address, for example https://example.com", "app.containers.admin.ContentBuilder.IframeMultiloc.url": "Embed", - "app.containers.admin.ContentBuilder.aboutBox": "About box", "app.containers.admin.ContentBuilder.accordionMultiloc": "Accordion", "app.containers.admin.ContentBuilder.accordionMultilocDefaultOpenLabel": "Open by default", "app.containers.admin.ContentBuilder.accordionMultilocTextLabel": "Text", diff --git a/front/app/translations/admin/en-IE.json b/front/app/translations/admin/en-IE.json index 37248b6d2f37..b48ad890ffb9 100644 --- a/front/app/translations/admin/en-IE.json +++ b/front/app/translations/admin/en-IE.json @@ -2528,7 +2528,6 @@ "app.containers.admin.ContentBuilder.IframeMultiloc.iframeSupportLink": "https://support.citizenlab.co/en/articles/6354058-embedding-elements-in-the-content-builder-to-enrich-project-descriptions", "app.containers.admin.ContentBuilder.IframeMultiloc.iframeUrlErrorMessage": "Enter a valid web address, for example https://example.com", "app.containers.admin.ContentBuilder.IframeMultiloc.url": "Embed", - "app.containers.admin.ContentBuilder.aboutBox": "About box", "app.containers.admin.ContentBuilder.accordionMultiloc": "Accordion", "app.containers.admin.ContentBuilder.accordionMultilocDefaultOpenLabel": "Open by default", "app.containers.admin.ContentBuilder.accordionMultilocTextLabel": "Text", diff --git a/front/app/translations/admin/en.json b/front/app/translations/admin/en.json index c95f1d7bf31c..d83a68b6a5ad 100644 --- a/front/app/translations/admin/en.json +++ b/front/app/translations/admin/en.json @@ -2535,7 +2535,6 @@ "app.containers.admin.ContentBuilder.IframeMultiloc.iframeSupportLink": "https://support.citizenlab.co/en/articles/6354058-embedding-elements-in-the-content-builder-to-enrich-project-descriptions", "app.containers.admin.ContentBuilder.IframeMultiloc.iframeUrlErrorMessage": "Enter a valid web address, for example https://example.com", "app.containers.admin.ContentBuilder.IframeMultiloc.url": "Embed", - "app.containers.admin.ContentBuilder.aboutBox": "About box", "app.containers.admin.ContentBuilder.accordionMultiloc": "Accordion", "app.containers.admin.ContentBuilder.accordionMultilocDefaultOpenLabel": "Open by default", "app.containers.admin.ContentBuilder.accordionMultilocTextLabel": "Text", @@ -2547,6 +2546,7 @@ "app.containers.admin.ContentBuilder.delete": "Delete", "app.containers.admin.ContentBuilder.error": "error", "app.containers.admin.ContentBuilder.errorMessage": "There is an error on {locale} content, please fix the issue to be able to save your changes", + "app.containers.admin.ContentBuilder.hideParticipationNumbersText": "Hide participation numbers", "app.containers.admin.ContentBuilder.homepage.default": "default", "app.containers.admin.ContentBuilder.homepage.events.eventsTitle": "Events", "app.containers.admin.ContentBuilder.homepage.eventsTitle": "Events", @@ -2573,6 +2573,7 @@ "app.containers.admin.ContentBuilder.imageMultilocAltLabel": "Short description of the image", "app.containers.admin.ContentBuilder.imageMultilocAltTooltip": "Adding \"alt text\" for images is important to make your platform accessible for users using screen readers.", "app.containers.admin.ContentBuilder.layout": "LAYOUT", + "app.containers.admin.ContentBuilder.participationBox": "Participation Box", "app.containers.admin.ContentBuilder.textMultiloc": "Text", "app.containers.admin.ContentBuilder.threeColumnLayout": "3 column", "app.containers.admin.ContentBuilder.twoColumnLayout": "2 column", diff --git a/front/app/translations/admin/es-CL.json b/front/app/translations/admin/es-CL.json index 964c454fefc6..2b0fc28770fe 100644 --- a/front/app/translations/admin/es-CL.json +++ b/front/app/translations/admin/es-CL.json @@ -2528,7 +2528,6 @@ "app.containers.admin.ContentBuilder.IframeMultiloc.iframeSupportLink": "https://support.citizenlab.co/en/articles/6354058-embedding-elements-in-the-content-builder-to-enrich-project-descriptions", "app.containers.admin.ContentBuilder.IframeMultiloc.iframeUrlErrorMessage": "Introduce una dirección web válida, por ejemplo https://example.com", "app.containers.admin.ContentBuilder.IframeMultiloc.url": "Incrustar Url", - "app.containers.admin.ContentBuilder.aboutBox": "Acerca de Box", "app.containers.admin.ContentBuilder.accordionMultiloc": "Acordeón", "app.containers.admin.ContentBuilder.accordionMultilocDefaultOpenLabel": "Abierto por defecto", "app.containers.admin.ContentBuilder.accordionMultilocTextLabel": "Texto", diff --git a/front/app/translations/admin/es-ES.json b/front/app/translations/admin/es-ES.json index f5fbb1661f29..bc842fff6221 100644 --- a/front/app/translations/admin/es-ES.json +++ b/front/app/translations/admin/es-ES.json @@ -2528,7 +2528,6 @@ "app.containers.admin.ContentBuilder.IframeMultiloc.iframeSupportLink": "https://support.citizenlab.co/en/articles/6354058-embedding-elements-in-the-content-builder-to-enrich-project-descriptions", "app.containers.admin.ContentBuilder.IframeMultiloc.iframeUrlErrorMessage": "Introduce una dirección web válida, por ejemplo https://example.com", "app.containers.admin.ContentBuilder.IframeMultiloc.url": "Incrustar Url", - "app.containers.admin.ContentBuilder.aboutBox": "Acerca de Box", "app.containers.admin.ContentBuilder.accordionMultiloc": "Acordeón", "app.containers.admin.ContentBuilder.accordionMultilocDefaultOpenLabel": "Abierto por defecto", "app.containers.admin.ContentBuilder.accordionMultilocTextLabel": "Texto", diff --git a/front/app/translations/admin/fi-FI.json b/front/app/translations/admin/fi-FI.json index 0b4e3cf2aa76..ef83000810f3 100644 --- a/front/app/translations/admin/fi-FI.json +++ b/front/app/translations/admin/fi-FI.json @@ -2528,7 +2528,6 @@ "app.containers.admin.ContentBuilder.IframeMultiloc.iframeSupportLink": "https://support.citizenlab.co/en/articles/6354058-embedding-elements-in-the-content-builder-to-enrich-project-descriptions", "app.containers.admin.ContentBuilder.IframeMultiloc.iframeUrlErrorMessage": "Anna kelvollinen verkko-osoite, esimerkiksi https://example.com", "app.containers.admin.ContentBuilder.IframeMultiloc.url": "Upottaa", - "app.containers.admin.ContentBuilder.aboutBox": "Tietoja laatikosta", "app.containers.admin.ContentBuilder.accordionMultiloc": "Harmonikka", "app.containers.admin.ContentBuilder.accordionMultilocDefaultOpenLabel": "Avaa oletuksena", "app.containers.admin.ContentBuilder.accordionMultilocTextLabel": "Teksti", diff --git a/front/app/translations/admin/fr-BE.json b/front/app/translations/admin/fr-BE.json index 4dcecf092d9a..0d50543326c7 100644 --- a/front/app/translations/admin/fr-BE.json +++ b/front/app/translations/admin/fr-BE.json @@ -2528,7 +2528,6 @@ "app.containers.admin.ContentBuilder.IframeMultiloc.iframeSupportLink": "https://support.citizenlab.co/fr/articles/7025826-personnaliser-la-description-de-vos-projets-avec-l-editeur-de-contenu#h_cf8a993642", "app.containers.admin.ContentBuilder.IframeMultiloc.iframeUrlErrorMessage": "Saisissez une URL valide, par exemple https://example.com", "app.containers.admin.ContentBuilder.IframeMultiloc.url": "URL", - "app.containers.admin.ContentBuilder.aboutBox": "À propos de Box", "app.containers.admin.ContentBuilder.accordionMultiloc": "Section accordéon", "app.containers.admin.ContentBuilder.accordionMultilocDefaultOpenLabel": "Ouvrir par défaut", "app.containers.admin.ContentBuilder.accordionMultilocTextLabel": "Texte", diff --git a/front/app/translations/admin/fr-FR.json b/front/app/translations/admin/fr-FR.json index 1cfd144f49cf..201032689a72 100644 --- a/front/app/translations/admin/fr-FR.json +++ b/front/app/translations/admin/fr-FR.json @@ -2528,7 +2528,6 @@ "app.containers.admin.ContentBuilder.IframeMultiloc.iframeSupportLink": "https://support.citizenlab.co/fr/articles/7025826-personnaliser-la-description-de-vos-projets-avec-l-editeur-de-contenu#h_cf8a993642", "app.containers.admin.ContentBuilder.IframeMultiloc.iframeUrlErrorMessage": "Saisissez une URL valide, par exemple https://example.com", "app.containers.admin.ContentBuilder.IframeMultiloc.url": "URL", - "app.containers.admin.ContentBuilder.aboutBox": "À propos", "app.containers.admin.ContentBuilder.accordionMultiloc": "Section accordéon", "app.containers.admin.ContentBuilder.accordionMultilocDefaultOpenLabel": "Ouvrir par défaut", "app.containers.admin.ContentBuilder.accordionMultilocTextLabel": "Texte", diff --git a/front/app/translations/admin/hr-HR.json b/front/app/translations/admin/hr-HR.json index ed77f543fe40..418bbe92cd39 100644 --- a/front/app/translations/admin/hr-HR.json +++ b/front/app/translations/admin/hr-HR.json @@ -2528,7 +2528,6 @@ "app.containers.admin.ContentBuilder.IframeMultiloc.iframeSupportLink": "https://support.citizenlab.co/en/articles/6354058-embedding-elements-in-the-content-builder-to-enrich-project-descriptions", "app.containers.admin.ContentBuilder.IframeMultiloc.iframeUrlErrorMessage": "Unesite valjanu web adresu, na primjer https://example.com", "app.containers.admin.ContentBuilder.IframeMultiloc.url": "Ugraditi", - "app.containers.admin.ContentBuilder.aboutBox": "Okvir s informacijama", "app.containers.admin.ContentBuilder.accordionMultiloc": "Harmonika", "app.containers.admin.ContentBuilder.accordionMultilocDefaultOpenLabel": "Otvoreno prema zadanim postavkama", "app.containers.admin.ContentBuilder.accordionMultilocTextLabel": "Tekst", diff --git a/front/app/translations/admin/it-IT.json b/front/app/translations/admin/it-IT.json index 7315c033b757..e46a0aa0d7f6 100644 --- a/front/app/translations/admin/it-IT.json +++ b/front/app/translations/admin/it-IT.json @@ -1580,7 +1580,6 @@ "app.containers.AdminPage.widgets.titleStyle": "Style", "app.containers.AdminPage.widgets.titleWidgets": "Widget", "app.containers.ContentBuilder.Save": "Save", - "app.containers.admin.ContentBuilder.aboutBox": "About box", "app.containers.admin.ContentBuilder.content": "CONTENT", "app.containers.admin.ContentBuilder.delete": "Delete", "app.containers.admin.ContentBuilder.error": "error", diff --git a/front/app/translations/admin/kl-GL.json b/front/app/translations/admin/kl-GL.json index 25eec52c7489..e7accb8d6081 100644 --- a/front/app/translations/admin/kl-GL.json +++ b/front/app/translations/admin/kl-GL.json @@ -1292,7 +1292,6 @@ "app.containers.AdminPage.widgets.titleStyle": "Iluseq", "app.containers.AdminPage.widgets.titleWidgets": "Widget", "app.containers.ContentBuilder.Save": "Save", - "app.containers.admin.ContentBuilder.aboutBox": "Suliniut pillugu allaffissaq", "app.containers.admin.ContentBuilder.content": "IMARISAI", "app.containers.admin.ContentBuilder.delete": "Delete", "app.containers.admin.ContentBuilder.error": "error", diff --git a/front/app/translations/admin/lb-LU.json b/front/app/translations/admin/lb-LU.json index 0e6b93cdecd0..5b0e33fa2378 100644 --- a/front/app/translations/admin/lb-LU.json +++ b/front/app/translations/admin/lb-LU.json @@ -1292,7 +1292,6 @@ "app.containers.AdminPage.widgets.titleStyle": "Style", "app.containers.AdminPage.widgets.titleWidgets": "Widget", "app.containers.ContentBuilder.Save": "Save", - "app.containers.admin.ContentBuilder.aboutBox": "About box", "app.containers.admin.ContentBuilder.content": "CONTENT", "app.containers.admin.ContentBuilder.delete": "Delete", "app.containers.admin.ContentBuilder.error": "error", diff --git a/front/app/translations/admin/lv-LV.json b/front/app/translations/admin/lv-LV.json index 8f7374e29cac..c9dbe740c17e 100644 --- a/front/app/translations/admin/lv-LV.json +++ b/front/app/translations/admin/lv-LV.json @@ -2528,7 +2528,6 @@ "app.containers.admin.ContentBuilder.IframeMultiloc.iframeSupportLink": "https://support.citizenlab.co/en/articles/6354058-embedding-elements-in-the-content-builder-to-enrich-project-descriptions", "app.containers.admin.ContentBuilder.IframeMultiloc.iframeUrlErrorMessage": "Ievadiet derīgu tīmekļa adresi, piemēram, https://example.com.", "app.containers.admin.ContentBuilder.IframeMultiloc.url": "Ievietot", - "app.containers.admin.ContentBuilder.aboutBox": "Sadaļa “par”", "app.containers.admin.ContentBuilder.accordionMultiloc": "Akordeons", "app.containers.admin.ContentBuilder.accordionMultilocDefaultOpenLabel": "Atvērt pēc noklusējuma", "app.containers.admin.ContentBuilder.accordionMultilocTextLabel": "Teksts", diff --git a/front/app/translations/admin/nb-NO.json b/front/app/translations/admin/nb-NO.json index ea322c121293..ac06bde398d4 100644 --- a/front/app/translations/admin/nb-NO.json +++ b/front/app/translations/admin/nb-NO.json @@ -2528,7 +2528,6 @@ "app.containers.admin.ContentBuilder.IframeMultiloc.iframeSupportLink": "https://support.citizenlab.co/en/articles/6354058-embedding-elements-in-the-content-builder-to-enrich-project-descriptions", "app.containers.admin.ContentBuilder.IframeMultiloc.iframeUrlErrorMessage": "Skriv inn en gyldig nettadresse, for eksempel https://example.com", "app.containers.admin.ContentBuilder.IframeMultiloc.url": "Bygg inn", - "app.containers.admin.ContentBuilder.aboutBox": "Om-boks", "app.containers.admin.ContentBuilder.accordionMultiloc": "Trekkspill", "app.containers.admin.ContentBuilder.accordionMultilocDefaultOpenLabel": "Åpne som standard", "app.containers.admin.ContentBuilder.accordionMultilocTextLabel": "Tekst", diff --git a/front/app/translations/admin/nl-BE.json b/front/app/translations/admin/nl-BE.json index f5c5d5121d52..2c575c7fb5d7 100644 --- a/front/app/translations/admin/nl-BE.json +++ b/front/app/translations/admin/nl-BE.json @@ -2528,7 +2528,6 @@ "app.containers.admin.ContentBuilder.IframeMultiloc.iframeSupportLink": "https://support.citizenlab.co/nl/articles/7025826-projectbeschrijvingen-aanpassen-met-de-content-builder#h_cf8a993642", "app.containers.admin.ContentBuilder.IframeMultiloc.iframeUrlErrorMessage": "Voer een geldig webadres in, bijvoorbeeld https://example.com", "app.containers.admin.ContentBuilder.IframeMultiloc.url": "Insluiten", - "app.containers.admin.ContentBuilder.aboutBox": "Over Box", "app.containers.admin.ContentBuilder.accordionMultiloc": "Accordeon", "app.containers.admin.ContentBuilder.accordionMultilocDefaultOpenLabel": "Standaard openen", "app.containers.admin.ContentBuilder.accordionMultilocTextLabel": "Tekst", diff --git a/front/app/translations/admin/nl-NL.json b/front/app/translations/admin/nl-NL.json index 63d8fdd444ec..380a529abfe7 100644 --- a/front/app/translations/admin/nl-NL.json +++ b/front/app/translations/admin/nl-NL.json @@ -2528,7 +2528,6 @@ "app.containers.admin.ContentBuilder.IframeMultiloc.iframeSupportLink": "https://support.citizenlab.co/nl/articles/7025826-projectbeschrijvingen-aanpassen-met-de-content-builder#h_cf8a993642", "app.containers.admin.ContentBuilder.IframeMultiloc.iframeUrlErrorMessage": "Voer een geldig webadres in, bijvoorbeeld https://example.com", "app.containers.admin.ContentBuilder.IframeMultiloc.url": "Insluiten", - "app.containers.admin.ContentBuilder.aboutBox": "Over Box", "app.containers.admin.ContentBuilder.accordionMultiloc": "Accordeon", "app.containers.admin.ContentBuilder.accordionMultilocDefaultOpenLabel": "Standaard openen", "app.containers.admin.ContentBuilder.accordionMultilocTextLabel": "Tekst", diff --git a/front/app/translations/admin/pl-PL.json b/front/app/translations/admin/pl-PL.json index 6729d6cb45c1..83eccffe8b3f 100644 --- a/front/app/translations/admin/pl-PL.json +++ b/front/app/translations/admin/pl-PL.json @@ -2528,7 +2528,6 @@ "app.containers.admin.ContentBuilder.IframeMultiloc.iframeSupportLink": "https://support.citizenlab.co/en/articles/6354058-embedding-elements-in-the-content-builder-to-enrich-project-descriptions", "app.containers.admin.ContentBuilder.IframeMultiloc.iframeUrlErrorMessage": "Wprowadź prawidłowy adres internetowy, na przykład https://example.com.", "app.containers.admin.ContentBuilder.IframeMultiloc.url": "Osadzony", - "app.containers.admin.ContentBuilder.aboutBox": "O pudełku", "app.containers.admin.ContentBuilder.accordionMultiloc": "Akordeon", "app.containers.admin.ContentBuilder.accordionMultilocDefaultOpenLabel": "Otwórz domyślnie", "app.containers.admin.ContentBuilder.accordionMultilocTextLabel": "Tekst", diff --git a/front/app/translations/admin/pt-BR.json b/front/app/translations/admin/pt-BR.json index 26259d8164a9..5cdcf27a595c 100644 --- a/front/app/translations/admin/pt-BR.json +++ b/front/app/translations/admin/pt-BR.json @@ -2528,7 +2528,6 @@ "app.containers.admin.ContentBuilder.IframeMultiloc.iframeSupportLink": "https://support.citizenlab.co/en/articles/6354058-embedding-elements-in-the-content-builder-to-enrich-project-descriptions", "app.containers.admin.ContentBuilder.IframeMultiloc.iframeUrlErrorMessage": "Digite um endereço da Web válido, por exemplo, https://example.com", "app.containers.admin.ContentBuilder.IframeMultiloc.url": "Incorporar", - "app.containers.admin.ContentBuilder.aboutBox": "Sobre", "app.containers.admin.ContentBuilder.accordionMultiloc": "Complementos", "app.containers.admin.ContentBuilder.accordionMultilocDefaultOpenLabel": "Aberto por padrão", "app.containers.admin.ContentBuilder.accordionMultilocTextLabel": "Texto", diff --git a/front/app/translations/admin/ro-RO.json b/front/app/translations/admin/ro-RO.json index 160dcaec66ea..2088de4bbe5f 100644 --- a/front/app/translations/admin/ro-RO.json +++ b/front/app/translations/admin/ro-RO.json @@ -1207,7 +1207,6 @@ "app.containers.AdminPage.widgets.titleStyle": "Style", "app.containers.AdminPage.widgets.titleWidgets": "Widget", "app.containers.ContentBuilder.Save": "Save", - "app.containers.admin.ContentBuilder.aboutBox": "About box", "app.containers.admin.ContentBuilder.content": "CONTENT", "app.containers.admin.ContentBuilder.delete": "Delete", "app.containers.admin.ContentBuilder.error": "error", diff --git a/front/app/translations/admin/sr-Latn.json b/front/app/translations/admin/sr-Latn.json index dde4352eb950..6b9a1bf4310a 100644 --- a/front/app/translations/admin/sr-Latn.json +++ b/front/app/translations/admin/sr-Latn.json @@ -2528,7 +2528,6 @@ "app.containers.admin.ContentBuilder.IframeMultiloc.iframeSupportLink": "https://support.citizenlab.co/en/articles/6354058-embedding-elements-in-the-content-builder-to-enrich-project-descriptions", "app.containers.admin.ContentBuilder.IframeMultiloc.iframeUrlErrorMessage": "Enter a valid web address, for example https://example.com", "app.containers.admin.ContentBuilder.IframeMultiloc.url": "Embed", - "app.containers.admin.ContentBuilder.aboutBox": "O kompaniji Box", "app.containers.admin.ContentBuilder.accordionMultiloc": "Accordion", "app.containers.admin.ContentBuilder.accordionMultilocDefaultOpenLabel": "Open by default", "app.containers.admin.ContentBuilder.accordionMultilocTextLabel": "Text", diff --git a/front/app/translations/admin/sr-SP.json b/front/app/translations/admin/sr-SP.json index 9ead535a17a7..c207df3a5a37 100644 --- a/front/app/translations/admin/sr-SP.json +++ b/front/app/translations/admin/sr-SP.json @@ -2528,7 +2528,6 @@ "app.containers.admin.ContentBuilder.IframeMultiloc.iframeSupportLink": "https://support.citizenlab.co/en/articles/6354058-embedding-elements-in-the-content-builder-to-enrich-project-descriptions", "app.containers.admin.ContentBuilder.IframeMultiloc.iframeUrlErrorMessage": "Унесите важећу веб адресу, на пример https://example.com", "app.containers.admin.ContentBuilder.IframeMultiloc.url": "Уграђивање", - "app.containers.admin.ContentBuilder.aboutBox": "О кутији", "app.containers.admin.ContentBuilder.accordionMultiloc": "Хармоника", "app.containers.admin.ContentBuilder.accordionMultilocDefaultOpenLabel": "Отвори подразумевано", "app.containers.admin.ContentBuilder.accordionMultilocTextLabel": "Текст", diff --git a/front/app/translations/admin/sv-SE.json b/front/app/translations/admin/sv-SE.json index cc8ff3d03c6e..eb7587c8a8ec 100644 --- a/front/app/translations/admin/sv-SE.json +++ b/front/app/translations/admin/sv-SE.json @@ -2528,7 +2528,6 @@ "app.containers.admin.ContentBuilder.IframeMultiloc.iframeSupportLink": "https://support.citizenlab.co/en/articles/6354058-embedding-elements-in-the-content-builder-to-enrich-project-descriptions", "app.containers.admin.ContentBuilder.IframeMultiloc.iframeUrlErrorMessage": "Ange en giltig webbadress, t.ex. https://example.com", "app.containers.admin.ContentBuilder.IframeMultiloc.url": "Inbäddning", - "app.containers.admin.ContentBuilder.aboutBox": "Om Box", "app.containers.admin.ContentBuilder.accordionMultiloc": "Dragspel", "app.containers.admin.ContentBuilder.accordionMultilocDefaultOpenLabel": "Öppet som standard", "app.containers.admin.ContentBuilder.accordionMultilocTextLabel": "Text", diff --git a/front/app/translations/admin/tr-TR.json b/front/app/translations/admin/tr-TR.json index 96f3e42f5d8a..721394d5586c 100644 --- a/front/app/translations/admin/tr-TR.json +++ b/front/app/translations/admin/tr-TR.json @@ -2528,7 +2528,6 @@ "app.containers.admin.ContentBuilder.IframeMultiloc.iframeSupportLink": "https://support.citizenlab.co/en/articles/6354058-embedding-elements-in-the-content-builder-to-enrich-project-descriptions", "app.containers.admin.ContentBuilder.IframeMultiloc.iframeUrlErrorMessage": "Geçerli bir web adresi girin, örneğin https://example.com", "app.containers.admin.ContentBuilder.IframeMultiloc.url": "Gömmek", - "app.containers.admin.ContentBuilder.aboutBox": "Hakkında kutusu", "app.containers.admin.ContentBuilder.accordionMultiloc": "Akordeon", "app.containers.admin.ContentBuilder.accordionMultilocDefaultOpenLabel": "Varsayılan olarak açık", "app.containers.admin.ContentBuilder.accordionMultilocTextLabel": "Metin", From a9ddd5c0a5e621bb80f2cca72523de121c6219ef Mon Sep 17 00:00:00 2001 From: EdwinKato Date: Wed, 25 Sep 2024 08:08:20 +0300 Subject: [PATCH 06/12] Fix margin --- .../components/admin/ContentBuilder/Widgets/AboutBox/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/app/components/admin/ContentBuilder/Widgets/AboutBox/index.tsx b/front/app/components/admin/ContentBuilder/Widgets/AboutBox/index.tsx index edbb20162417..037fcbd8c105 100644 --- a/front/app/components/admin/ContentBuilder/Widgets/AboutBox/index.tsx +++ b/front/app/components/admin/ContentBuilder/Widgets/AboutBox/index.tsx @@ -54,7 +54,7 @@ const AboutBoxSettings = () => { })); return ( - + { From 6f1ce5b4fae53b47c75a55f9c469b11834bf830a Mon Sep 17 00:00:00 2001 From: EdwinKato Date: Wed, 25 Sep 2024 08:34:12 +0300 Subject: [PATCH 07/12] Fix condition --- front/app/components/ProjectCard/index.tsx | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/front/app/components/ProjectCard/index.tsx b/front/app/components/ProjectCard/index.tsx index eed03d80b234..6cf28dcb92aa 100644 --- a/front/app/components/ProjectCard/index.tsx +++ b/front/app/components/ProjectCard/index.tsx @@ -717,15 +717,13 @@ const ProjectCard = memo( className={`${size} ${!showFooter ? 'hidden' : ''}`} > - {hasAvatars && ( - - )} + From ffe986113bee21214e431e37a7b819bacf89f2ad Mon Sep 17 00:00:00 2001 From: EdwinKato Date: Wed, 25 Sep 2024 08:34:47 +0300 Subject: [PATCH 08/12] Show avatar bubbles in about box --- .../header/ProjectInfoSideBar/index.tsx | 89 +++++++++++-------- 1 file changed, 54 insertions(+), 35 deletions(-) diff --git a/front/app/containers/ProjectsShowPage/shared/header/ProjectInfoSideBar/index.tsx b/front/app/containers/ProjectsShowPage/shared/header/ProjectInfoSideBar/index.tsx index ee4fc4ee34e1..81c66bfd3064 100644 --- a/front/app/containers/ProjectsShowPage/shared/header/ProjectInfoSideBar/index.tsx +++ b/front/app/containers/ProjectsShowPage/shared/header/ProjectInfoSideBar/index.tsx @@ -16,7 +16,7 @@ import { media, } from '@citizenlab/cl2-component-library'; import moment from 'moment'; -import styled from 'styled-components'; +import styled, { useTheme } from 'styled-components'; import useEvents from 'api/events/useEvents'; import useAuthUser from 'api/me/useAuthUser'; @@ -29,6 +29,8 @@ import useFormSubmissionCount from 'api/submission_count/useSubmissionCount'; import messages from 'containers/ProjectsShowPage/messages'; import setPhaseUrl from 'containers/ProjectsShowPage/timeline/setPhaseURL'; +import AvatarBubbles from 'components/AvatarBubbles'; + import { FormattedMessage, useIntl } from 'utils/cl-intl'; import Link from 'utils/cl-router/Link'; import FormattedBudget from 'utils/currency/FormattedBudget'; @@ -136,6 +138,7 @@ const ProjectInfoSideBar = memo( sort: '-start_at', }); const { data: authUser } = useAuthUser(); + const theme = useTheme(); const { formatMessage } = useIntl(); const [currentPhase, setCurrentPhase] = useState(); @@ -199,6 +202,11 @@ const ProjectInfoSideBar = memo( const isParticipatoryBudgeting = currentPhase?.attributes.participation_method === 'voting' && currentPhase?.attributes.voting_method === 'budgeting'; + const avatarIds = + project.data.relationships.avatars && + project.data.relationships.avatars.data + ? project.data.relationships.avatars.data.map((avatar) => avatar.id) + : []; return ( @@ -225,40 +233,40 @@ const ProjectInfoSideBar = memo( /> )} - - {!hideParticipationNumbers && ( - <> - - - - )} - {isAdmin(authUser) && hasNativeSurvey(phases?.data) && ( - - - - - ), - }} - /> - } - /> - - )} - + {!hideParticipationNumbers && ( + + + + {isAdmin(authUser) && hasNativeSurvey(phases?.data) && ( + + + + + ), + }} + /> + } + /> + + )} + + )} {phases && phases.data.length > 1 && ( ( + {avatarIds.length > 0 && ( + + + + )} From 3a5a3bcc7412a115751c7d66a503953ac8c50878 Mon Sep 17 00:00:00 2001 From: EdwinKato Date: Wed, 25 Sep 2024 08:46:44 +0300 Subject: [PATCH 09/12] Fix failing test --- .../ContentViewer/Viewer/Viewer.test.tsx | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/front/app/components/ProjectDescriptionBuilder/ContentViewer/Viewer/Viewer.test.tsx b/front/app/components/ProjectDescriptionBuilder/ContentViewer/Viewer/Viewer.test.tsx index ca97a9065b90..4f3da5941993 100644 --- a/front/app/components/ProjectDescriptionBuilder/ContentViewer/Viewer/Viewer.test.tsx +++ b/front/app/components/ProjectDescriptionBuilder/ContentViewer/Viewer/Viewer.test.tsx @@ -40,6 +40,20 @@ const mockProjectData = { input_term: 'idea', uses_content_builder: true, }, + relationships: { + avatars: { + data: [ + { + id: '1', + type: 'avatar', + }, + { + id: '2', + type: 'avatar', + }, + ], + }, + }, }; const mockProjectDescriptionBuilderLayoutData: @@ -70,7 +84,7 @@ describe('Preview', () => { screen.queryByTestId('projectDescriptionBuilderProjectDescription') ).not.toBeInTheDocument(); }); - it('should shows description when project description builder is not enabled', () => { + it('should show description when project description builder is not enabled', () => { DEFAULT_PROJECT_DESCRIPTION_BUILDER_LAYOUT_DATA.data.attributes.enabled = false; render(); From e0afec06e0a5d624a233d2153f375797243c43db Mon Sep 17 00:00:00 2001 From: EdwinKato Date: Wed, 25 Sep 2024 08:46:52 +0300 Subject: [PATCH 10/12] Fix import order --- .../ProjectDescriptionBuilder/ContentViewer/Viewer/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/app/components/ProjectDescriptionBuilder/ContentViewer/Viewer/index.tsx b/front/app/components/ProjectDescriptionBuilder/ContentViewer/Viewer/index.tsx index 381f8e442c94..a7ca1a4a14c2 100644 --- a/front/app/components/ProjectDescriptionBuilder/ContentViewer/Viewer/index.tsx +++ b/front/app/components/ProjectDescriptionBuilder/ContentViewer/Viewer/index.tsx @@ -2,9 +2,9 @@ import React from 'react'; import { Box, Spinner, Title } from '@citizenlab/cl2-component-library'; import { isEmpty } from 'lodash-es'; -import useProjectDescriptionBuilderLayout from 'api/project_description_builder/useProjectDescriptionBuilderLayout'; import { Multiloc } from 'typings'; +import useProjectDescriptionBuilderLayout from 'api/project_description_builder/useProjectDescriptionBuilderLayout'; import useProjectFiles from 'api/project_files/useProjectFiles'; import useProjectById from 'api/projects/useProjectById'; From 436cb88bf4d1dd02a0ed370a26fa0df304f835b4 Mon Sep 17 00:00:00 2001 From: EdwinKato Date: Thu, 26 Sep 2024 09:34:34 +0300 Subject: [PATCH 11/12] Clean up --- .../admin/ContentBuilder/Widgets/AboutBox/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/front/app/components/admin/ContentBuilder/Widgets/AboutBox/index.tsx b/front/app/components/admin/ContentBuilder/Widgets/AboutBox/index.tsx index 037fcbd8c105..b5a7ff58c524 100644 --- a/front/app/components/admin/ContentBuilder/Widgets/AboutBox/index.tsx +++ b/front/app/components/admin/ContentBuilder/Widgets/AboutBox/index.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { Box, Toggle } from '@citizenlab/cl2-component-library'; +import { Box, colors, Toggle } from '@citizenlab/cl2-component-library'; import { useNode } from '@craftjs/core'; import { useParams } from 'react-router-dom'; @@ -54,7 +54,7 @@ const AboutBoxSettings = () => { })); return ( - + { From 08e0f7bb4b40d4b399a7a6ba936aecfa2adc6a1b Mon Sep 17 00:00:00 2001 From: EdwinKato Date: Fri, 27 Sep 2024 18:27:40 +0300 Subject: [PATCH 12/12] Remove duplicate participants --- .../Admin/projects/project/projectHeader/index.tsx | 8 -------- 1 file changed, 8 deletions(-) diff --git a/front/app/containers/Admin/projects/project/projectHeader/index.tsx b/front/app/containers/Admin/projects/project/projectHeader/index.tsx index b090166571b8..a30017579a6e 100644 --- a/front/app/containers/Admin/projects/project/projectHeader/index.tsx +++ b/front/app/containers/Admin/projects/project/projectHeader/index.tsx @@ -223,14 +223,6 @@ const ProjectHeader = ({ projectId }: Props) => { - - - - {formatMessage(messages.participants, { - participantsCount: project.data.attributes.participants_count, - })} - -