diff --git a/apps/auth/src/pages/index.tsx b/apps/auth/src/pages/index.tsx index b2fe35ec34..01a9a82c56 100644 --- a/apps/auth/src/pages/index.tsx +++ b/apps/auth/src/pages/index.tsx @@ -77,7 +77,7 @@ function SignInOutButton() { return (
-

+

{t('auth.loginInfo')}

-
-
+
+
+
-
+

{t('auth.authentication')}

-
+
diff --git a/apps/frontend-control/src/components/Layout.tsx b/apps/frontend-control/src/components/Layout.tsx index 0e05272ed4..0fb4c161f6 100644 --- a/apps/frontend-control/src/components/Layout.tsx +++ b/apps/frontend-control/src/components/Layout.tsx @@ -30,7 +30,7 @@ function Layout({ title, children, sessionId, className }: LayoutProps) { } return ( -
+
KlickerUZH Controller {title} -
+
-
+
{children}
-
+
diff --git a/apps/frontend-control/src/components/common/ListButton.tsx b/apps/frontend-control/src/components/common/ListButton.tsx index 84338f2518..53486cd219 100644 --- a/apps/frontend-control/src/components/common/ListButton.tsx +++ b/apps/frontend-control/src/components/common/ListButton.tsx @@ -44,7 +44,7 @@ function ListButton({ onClick={onClick ? onClick : () => router.push(link)} className={{ root: twMerge( - 'p-2 border border-solid rounded-md bg-uzh-grey-40 border-uzh-grey-100 w-full', + 'bg-uzh-grey-40 border-uzh-grey-100 w-full rounded-md border border-solid p-2', className?.root ), }} diff --git a/apps/frontend-control/src/components/common/LoginForm.tsx b/apps/frontend-control/src/components/common/LoginForm.tsx index 27773a6b20..be1030b3ac 100644 --- a/apps/frontend-control/src/components/common/LoginForm.tsx +++ b/apps/frontend-control/src/components/common/LoginForm.tsx @@ -57,9 +57,9 @@ export function LoginForm({ } return ( -
-
-
+
+
+
-
+
diff --git a/apps/frontend-control/src/components/layout/Header.tsx b/apps/frontend-control/src/components/layout/Header.tsx index b4d476ed39..d3d56ab6e5 100644 --- a/apps/frontend-control/src/components/layout/Header.tsx +++ b/apps/frontend-control/src/components/layout/Header.tsx @@ -15,8 +15,8 @@ function Header({ title }: HeaderProps) { const [logoutUser] = useMutation(LogoutUserDocument) return ( -
-
{title}
+
+
{title}
-

+

{t('shared.generic.profile')}

@@ -150,7 +150,7 @@ function CreateAccountForm({ name="email" label={t('shared.generic.email')} className={{ - label: 'text-black mt-4', + label: 'mt-4 text-black', }} data={{ cy: 'email-field' }} /> @@ -180,7 +180,7 @@ function CreateAccountForm({ name="password" label={t('shared.generic.password')} className={{ - label: 'text-black mt-0', + label: 'mt-0 text-black', }} type="password" data={{ cy: 'password-field' }} @@ -190,7 +190,7 @@ function CreateAccountForm({ name="passwordRepetition" label={t('shared.generic.passwordRepetition')} className={{ - label: 'text-black mt-0', + label: 'mt-0 text-black', }} type="password" data={{ cy: 'password-repetition-field' }} @@ -200,7 +200,7 @@ function CreateAccountForm({
{t('pwa.profile.publicProfile')}
-
+
-
-

+
+

{t('pwa.createAccount.dataProcessingTitle')}

+
{t('pwa.login.existingParticipantAccount')} diff --git a/apps/frontend-pwa/src/components/forms/LoginForm.tsx b/apps/frontend-pwa/src/components/forms/LoginForm.tsx index a6338aad6f..457b15a807 100644 --- a/apps/frontend-pwa/src/components/forms/LoginForm.tsx +++ b/apps/frontend-pwa/src/components/forms/LoginForm.tsx @@ -182,7 +182,7 @@ export function LoginForm({ {setMagicLinkLogin && ( {data.groupActivityDetails.group.participants?.length === 1 && ( -
+
{t.rich('pwa.groupActivity.minTwoPersons', { br: () =>
, })} @@ -186,7 +186,7 @@ function GroupActivityDetails() { {instance?.results && (
{instance.results.passed ? ( -
+
{t('pwa.groupActivity.groupActivityPassed')}
) : ( -
+
{t('pwa.groupActivity.groupActivityFailed')}
)} -
{`${ +
{`${ instance.results.points }/${maxTotalPoints} ${t('shared.generic.points')}`}
diff --git a/apps/frontend-pwa/src/pages/index.tsx b/apps/frontend-pwa/src/pages/index.tsx index 531576fd8e..78ed19ff1c 100644 --- a/apps/frontend-pwa/src/pages/index.tsx +++ b/apps/frontend-pwa/src/pages/index.tsx @@ -223,7 +223,7 @@ const Index = function () { return (
{/* {hasSeenSurvey === 'false' && ( @@ -249,7 +249,7 @@ const Index = function () { {activeSessions.length !== 0 && (
-

+

{t('shared.generic.activeSessions')}

@@ -270,7 +270,7 @@ const Index = function () {
)}
-

+

{t('shared.generic.practice')}

@@ -299,7 +299,7 @@ const Index = function () {
{activeMicrolearning.length > 0 && (
-

+

{t('shared.generic.microlearning')}

@@ -330,7 +330,7 @@ const Index = function () {
)}
-

+

{t('pwa.general.myCourses')}

diff --git a/apps/frontend-pwa/src/pages/join.tsx b/apps/frontend-pwa/src/pages/join.tsx index 05b50e00a0..9968a290d6 100644 --- a/apps/frontend-pwa/src/pages/join.tsx +++ b/apps/frontend-pwa/src/pages/join.tsx @@ -29,9 +29,9 @@ function JoinPage() { return ( -
+

{t('pwa.general.joinCourse')}

-
{t('pwa.joinCourse.introLoggedInNoCourse')}
+
{t('pwa.joinCourse.introLoggedInNoCourse')}
-
+
{t.rich('pwa.general.activeSessionsBy', { i: (text) => {text}, diff --git a/apps/frontend-pwa/src/pages/login.tsx b/apps/frontend-pwa/src/pages/login.tsx index fb0950664a..48c4f1c025 100644 --- a/apps/frontend-pwa/src/pages/login.tsx +++ b/apps/frontend-pwa/src/pages/login.tsx @@ -111,7 +111,7 @@ function Login() { } return ( -
+
-

+

{t('pwa.general.processingLogin')}

diff --git a/apps/frontend-pwa/src/pages/microlearning/[id]/[ix].tsx b/apps/frontend-pwa/src/pages/microlearning/[id]/[ix].tsx index 88068958e1..6dab082e7e 100644 --- a/apps/frontend-pwa/src/pages/microlearning/[id]/[ix].tsx +++ b/apps/frontend-pwa/src/pages/microlearning/[id]/[ix].tsx @@ -48,7 +48,7 @@ function MicrolearningInstance() {
-
+

{t('shared.generic.congrats')}

@@ -70,7 +70,7 @@ function MicrolearningEvaluation() {
-
+

{t('shared.generic.evaluation')}

diff --git a/apps/frontend-pwa/src/pages/microlearning/[id]/index.tsx b/apps/frontend-pwa/src/pages/microlearning/[id]/index.tsx index 0fe5836856..860c5b963f 100644 --- a/apps/frontend-pwa/src/pages/microlearning/[id]/index.tsx +++ b/apps/frontend-pwa/src/pages/microlearning/[id]/index.tsx @@ -57,7 +57,7 @@ function MicrolearningIntroduction({ id }: { id: string }) { displayName={data.microLearning.displayName} course={data.microLearning.course ?? undefined} > -
+
{!selfData?.self && ( {t.rich('pwa.general.userNotLoggedIn', { @@ -65,7 +65,7 @@ function MicrolearningIntroduction({ id }: { id: string }) {
-
+
-
+

{t('shared.generic.repetition')}

diff --git a/apps/frontend-pwa/src/pages/session/[id].tsx b/apps/frontend-pwa/src/pages/session/[id].tsx index a3bfdc9c98..b2ff5c5108 100644 --- a/apps/frontend-pwa/src/pages/session/[id].tsx +++ b/apps/frontend-pwa/src/pages/session/[id].tsx @@ -177,10 +177,10 @@ function Index({ id }: Props) { > -
+
{!activeBlock ? ( isGamificationEnabled ? ( -
+
) : ( @@ -218,7 +218,7 @@ function Index({ id }: Props) { {selfData?.self && isGamificationEnabled && (