diff --git a/src/core/i18n/ach/translation.ach.json b/src/core/i18n/ach/translation.ach.json index c9480e3843..362e86dece 100644 --- a/src/core/i18n/ach/translation.ach.json +++ b/src/core/i18n/ach/translation.ach.json @@ -2684,8 +2684,8 @@ }, "operations": { "user-group": { - "updated-successfuly": "crwdns10706:0{{name}}crwdne10706:0", - "deleted-successfuly": "crwdns10708:0{{name}}crwdne10708:0" + "updated-successfully": "crwdns10706:0{{name}}crwdne10706:0", + "deleted-successfully": "crwdns10708:0{{name}}crwdne10708:0" } }, "kratos": { diff --git a/src/core/i18n/bg/translation.bg.json b/src/core/i18n/bg/translation.bg.json index a1e78a88e7..57a3ff226a 100644 --- a/src/core/i18n/bg/translation.bg.json +++ b/src/core/i18n/bg/translation.bg.json @@ -2675,8 +2675,8 @@ }, "operations": { "user-group": { - "updated-successfuly": "Групата {{name}} е обновена!", - "deleted-successfuly": "Групата {{name}} е изтрита успешно" + "updated-successfully": "Групата {{name}} е обновена!", + "deleted-successfully": "Групата {{name}} е изтрита успешно" } }, "kratos": { diff --git a/src/core/i18n/de/translation.de.json b/src/core/i18n/de/translation.de.json index 8d1eff9ba6..1413b59267 100644 --- a/src/core/i18n/de/translation.de.json +++ b/src/core/i18n/de/translation.de.json @@ -2675,8 +2675,8 @@ }, "operations": { "user-group": { - "updated-successfuly": "Die Gruppe %name% wurde aktuallisiert!", - "deleted-successfuly": "Die Gruppe wurde erfolgreich gelöscht" + "updated-successfully": "Die Gruppe %name% wurde aktuallisiert!", + "deleted-successfully": "Die Gruppe wurde erfolgreich gelöscht" } }, "kratos": { diff --git a/src/core/i18n/en/translation.en.json b/src/core/i18n/en/translation.en.json index 470ee370bb..cf6dd66e22 100644 --- a/src/core/i18n/en/translation.en.json +++ b/src/core/i18n/en/translation.en.json @@ -2764,8 +2764,8 @@ }, "operations": { "user-group": { - "updated-successfuly": "Group {{name}} has been updated!", - "deleted-successfuly": "Group {{name}} deleted successfully" + "updated-successfully": "Group {{name}} has been updated!", + "deleted-successfully": "Group {{name}} deleted successfully" } }, "kratos": { @@ -3065,7 +3065,7 @@ "cancel": { "title": "Discard Virtual Contributor", "description": "Are you sure you want to stop creating your Virtual Contributor? Your work will not be saved. A space/subspace might already be created for you. Please, reload the page if you confirm the cancellation.", - "deleted": "Virtual Contributor deleted successfuly!" + "deleted": "Virtual Contributor deleted successfully!" }, "addContent": { "title": "Add knowledge", diff --git a/src/core/i18n/es/translation.es.json b/src/core/i18n/es/translation.es.json index 63e2fc876a..dbc079a458 100644 --- a/src/core/i18n/es/translation.es.json +++ b/src/core/i18n/es/translation.es.json @@ -2675,8 +2675,8 @@ }, "operations": { "user-group": { - "updated-successfuly": "El grupo {{name}} ha sido actualizado", - "deleted-successfuly": "El grupo {{name}} ha sido eliminado" + "updated-successfully": "El grupo {{name}} ha sido actualizado", + "deleted-successfully": "El grupo {{name}} ha sido eliminado" } }, "kratos": { diff --git a/src/core/i18n/fr/translation.fr.json b/src/core/i18n/fr/translation.fr.json index 994d09f9be..f36bc0016d 100644 --- a/src/core/i18n/fr/translation.fr.json +++ b/src/core/i18n/fr/translation.fr.json @@ -2675,8 +2675,8 @@ }, "operations": { "user-group": { - "updated-successfuly": "Le groupe {{name}} a été mis à jour !", - "deleted-successfuly": "Groupe {{name}} supprimé avec succès" + "updated-successfully": "Le groupe {{name}} a été mis à jour !", + "deleted-successfully": "Groupe {{name}} supprimé avec succès" } }, "kratos": { diff --git a/src/core/i18n/nl/translation.nl.json b/src/core/i18n/nl/translation.nl.json index e2745d63a1..da6cb99d78 100644 --- a/src/core/i18n/nl/translation.nl.json +++ b/src/core/i18n/nl/translation.nl.json @@ -2675,8 +2675,8 @@ }, "operations": { "user-group": { - "updated-successfuly": "Groep {{name}} is geupdate!", - "deleted-successfuly": "Groep {{name}} is succesvol verwijderd" + "updated-successfully": "Groep {{name}} is geupdate!", + "deleted-successfully": "Groep {{name}} is succesvol verwijderd" } }, "kratos": { diff --git a/src/core/i18n/pt/translation.pt.json b/src/core/i18n/pt/translation.pt.json index 6202de3e88..84b69b2cc5 100644 --- a/src/core/i18n/pt/translation.pt.json +++ b/src/core/i18n/pt/translation.pt.json @@ -2675,8 +2675,8 @@ }, "operations": { "user-group": { - "updated-successfuly": "O grupo {{name}} foi atualizado!", - "deleted-successfuly": "Grupo {{name}} excluído com sucesso" + "updated-successfully": "O grupo {{name}} foi atualizado!", + "deleted-successfully": "Grupo {{name}} excluído com sucesso" } }, "kratos": { diff --git a/src/core/i18n/ua/translation.ua.json b/src/core/i18n/ua/translation.ua.json index 2f8a403c46..c282c27136 100644 --- a/src/core/i18n/ua/translation.ua.json +++ b/src/core/i18n/ua/translation.ua.json @@ -2675,8 +2675,8 @@ }, "operations": { "user-group": { - "updated-successfuly": "Група {{name}} успішно оновлена!", - "deleted-successfuly": "Група {{name}} успішно видалена" + "updated-successfully": "Група {{name}} успішно оновлена!", + "deleted-successfully": "Група {{name}} успішно видалена" } }, "kratos": { diff --git a/src/domain/journey/common/JourneyCard/JourneyCard.tsx b/src/domain/journey/common/JourneyCard/JourneyCard.tsx index 415a4cc799..f6819ca131 100644 --- a/src/domain/journey/common/JourneyCard/JourneyCard.tsx +++ b/src/domain/journey/common/JourneyCard/JourneyCard.tsx @@ -1,5 +1,5 @@ -import React, { ComponentType, PropsWithChildren, ReactNode, useState } from 'react'; -import { Box, SvgIconProps } from '@mui/material'; +import { memo, ComponentType, PropsWithChildren, ReactNode, useState } from 'react'; +import { Box, Paper, SvgIconProps } from '@mui/material'; import { LockOutlined } from '@mui/icons-material'; import ContributeCard, { ContributeCardProps } from '../../../../core/ui/card/ContributeCard'; import BadgeCardView from '../../../../core/ui/list/BadgeCardView'; @@ -64,7 +64,9 @@ const JourneyCard = ({ : {}; return ( - + + {isPrivate && } + { + return ( + ({ + position: 'absolute', + zIndex: theme.zIndex.fab, + top: theme.spacing(top / 10), + right: theme.spacing(right / 10), + + display: 'flex', + alignItems: 'center', + justifyContent: 'center', + + width: size, + height: size, + borderRadius: '50%', + padding: theme.spacing(1.8), + backgroundColor: theme.palette.background.paper, + })} + aria-label={ariaLabel} + > + + + ); + } +); diff --git a/src/domain/journey/common/JourneyTile/JourneyTile.tsx b/src/domain/journey/common/JourneyTile/JourneyTile.tsx index ffcf39c179..b5e8c68299 100644 --- a/src/domain/journey/common/JourneyTile/JourneyTile.tsx +++ b/src/domain/journey/common/JourneyTile/JourneyTile.tsx @@ -1,4 +1,4 @@ -import React, { memo } from 'react'; +import { memo } from 'react'; import { Visual } from '../../../common/visual/Visual'; import { Avatar, Box, Paper, Skeleton } from '@mui/material'; import RouterLink from '../../../../core/ui/link/RouterLink'; @@ -11,8 +11,9 @@ import webkitLineClamp from '../../../../core/ui/utils/webkitLineClamp'; import { BlockTitle } from '../../../../core/ui/typography'; import InsertPhotoOutlinedIcon from '@mui/icons-material/InsertPhotoOutlined'; import defaultJourneyCardBanner from '../../../../domain/journey/defaultVisuals/Card.jpg'; +import { PrivacyIcon } from '../JourneyCard/JourneyCard'; -interface JourneyTileProps { +type JourneyTileProps = { journey: | { profile: { @@ -23,16 +24,17 @@ interface JourneyTileProps { } | undefined; journeyTypeName: JourneyTypeName; + columns?: number; -} + isPrivate?: boolean; +}; export const RECENT_JOURNEY_CARD_ASPECT_RATIO = '175/100'; const JOURNEY_TITLE_CLASS_NAME = 'JourneyTitle'; - const ElevatedPaper = withElevationOnHover(Paper) as typeof Paper; -const JourneyTile = ({ journey, columns = 3 }: JourneyTileProps) => { +const JourneyTile = ({ journey, isPrivate, columns = 3 }: JourneyTileProps) => { return ( { /> ) : ( <> + {isPrivate && } + = ({ group }) => { const [updateGroup] = useUpdateGroupMutation({ onCompleted: data => - success(t('operations.user-group.updated-successfuly', { name: data.updateUserGroup.profile?.displayName })), + success(t('operations.user-group.updated-successfully', { name: data.updateUserGroup.profile?.displayName })), }); const [createTagset] = useCreateTagsetOnProfileMutation({ diff --git a/src/domain/platform/admin/components/Group/useDeleteUserGroup.ts b/src/domain/platform/admin/components/Group/useDeleteUserGroup.ts index d1c39fb586..1164004dda 100644 --- a/src/domain/platform/admin/components/Group/useDeleteUserGroup.ts +++ b/src/domain/platform/admin/components/Group/useDeleteUserGroup.ts @@ -17,7 +17,7 @@ export const useDeleteUserGroup = (options?: Options) => { const [deleteGroup, { loading, error }] = useDeleteGroupMutation({ onCompleted: data => { - success(t('operations.user-group.deleted-successfuly', { name: data.deleteUserGroup.profile?.displayName })); + success(t('operations.user-group.deleted-successfully', { name: data.deleteUserGroup.profile?.displayName })); options && options.onComplete && options.onComplete(data); }, onError: options && options.onError && options.onError, diff --git a/src/main/topLevelPages/myDashboard/DashboardWithMemberships/DashboardSpaces/DashboardSpaces.tsx b/src/main/topLevelPages/myDashboard/DashboardWithMemberships/DashboardSpaces/DashboardSpaces.tsx index 3286bad08e..0377d40fbf 100644 --- a/src/main/topLevelPages/myDashboard/DashboardWithMemberships/DashboardSpaces/DashboardSpaces.tsx +++ b/src/main/topLevelPages/myDashboard/DashboardWithMemberships/DashboardSpaces/DashboardSpaces.tsx @@ -51,7 +51,6 @@ const DashboardSpaces = () => { const { id, profile } = space; const { tagline } = profile; - const hasChildMemberships = childMemberships?.length > 0; return ( diff --git a/src/main/topLevelPages/myDashboard/ExploreSpaces/ExploreSpacesView.tsx b/src/main/topLevelPages/myDashboard/ExploreSpaces/ExploreSpacesView.tsx index 70337becc7..0601d17342 100644 --- a/src/main/topLevelPages/myDashboard/ExploreSpaces/ExploreSpacesView.tsx +++ b/src/main/topLevelPages/myDashboard/ExploreSpaces/ExploreSpacesView.tsx @@ -1,4 +1,4 @@ -import React, { useState } from 'react'; +import { useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Caption, CaptionSmall } from '../../../../core/ui/typography'; import { Box, Button, Theme, useMediaQuery } from '@mui/material';