Skip to content

Commit 6abb23e

Browse files
authored
Merge pull request #160 from ModusCreateOrg/ADE-200-Adam-fixes
[ADE -200] UI fixes
2 parents 2a0de49 + 8aeecef commit 6abb23e

File tree

4 files changed

+70
-54
lines changed

4 files changed

+70
-54
lines changed

frontend/src/common/utils/i18n/resources/en/auth.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
"confirm-password": "Confirm Password",
2727
"verification-code": "Verification Code"
2828
},
29-
"signin": "Sign In",
30-
"signin.title": "Log in",
29+
"signin": "Log in",
30+
"signin.title": "Log In",
3131
"signin.subtitle": "Login to access MedReport AI",
3232
"signup": "Sign Up",
3333
"signup.button": "Create Account",

frontend/src/pages/Auth/SignIn/SignInPage.scss

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,41 +25,43 @@
2525
}
2626

2727
&__logo {
28-
width: 3.5rem;
28+
width: 2.25rem;
2929
height: auto;
3030
margin-right: 0.75rem;
3131
}
3232

3333
&__logo-text {
3434
color: white;
35-
font-size: 1.75rem;
35+
font-size: 1.25rem;
3636
font-weight: 600;
3737
}
3838

3939
&__card {
40-
width: 100%;
4140
max-width: 30rem;
4241
background-color: white;
4342
border-radius: 1.5rem;
4443
padding: 2.5rem 2rem;
4544
box-shadow: 0 0.5rem 1.5rem rgb(0 0 0 / 15%);
4645
z-index: 1;
46+
position: absolute;
47+
inset: 130px 20px 20px;
4748
}
4849

4950
&__header {
5051
margin-bottom: 2.5rem;
5152

5253
h1 {
53-
font-size: 2rem;
54-
font-weight: 600;
54+
font-size: 1.5rem;
55+
font-weight: 800;
5556
color: #333;
5657
margin-bottom: 0.5rem;
5758
margin-top: 0;
5859
}
5960

6061
p {
61-
font-size: 1.125rem;
62-
color: #666;
62+
font-family: Merriweather, serif;
63+
font-size: 0.9rem;
64+
color: #5c6d80;
6365
margin: 0;
6466
}
6567
}

frontend/src/pages/Auth/SignIn/components/SignInForm.scss

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
.ls-signin-form {
2+
&__fields {
3+
min-height: 400px;
4+
}
5+
26
&__field {
37
margin-bottom: 1.5rem;
48
}
59

610
&__label {
711
display: block;
8-
font-size: 1rem;
12+
font-size: 0.8rem;
913
color: #333;
1014
margin-bottom: 0.5rem;
1115
font-weight: 500;
@@ -15,11 +19,13 @@
1519
width: 100%;
1620
border: 1px solid #ccc;
1721
border-radius: 0.75rem;
22+
1823
--padding-start: 1rem;
1924
--padding-end: 1rem;
2025
--padding-top: 0.875rem;
2126
--padding-bottom: 0.875rem;
2227
--highlight-color: var(--ion-color-primary);
28+
2329
margin-bottom: 0;
2430
font-size: 1rem;
2531
height: 3.25rem;
@@ -77,13 +83,17 @@
7783

7884
&__button {
7985
margin-bottom: 2rem;
86+
8087
--border-radius: 0.75rem;
8188
--padding-top: 1rem;
8289
--padding-bottom: 1rem;
90+
8391
font-weight: 500;
92+
8493
--background: #4261eb;
8594
--background-activated: #3a56d4;
8695
--background-hover: #3a56d4;
96+
8797
font-size: 1rem;
8898
height: 3.25rem;
8999
}

frontend/src/pages/Auth/SignIn/components/SignInForm.tsx

Lines changed: 48 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -148,54 +148,58 @@ const SignInForm = ({ className, testid = 'form-signin' }: SignInFormProps): JSX
148148
>
149149
{({ dirty, isSubmitting }) => (
150150
<Form data-testid={`${testid}-form`}>
151-
<div className="ls-signin-form__field">
152-
<label className="ls-signin-form__label">{t('label.email', { ns: 'auth' })}</label>
153-
<Input
154-
name="email"
155-
maxlength={50}
156-
autocomplete="email"
157-
className="ls-signin-form__input"
158-
ref={focusInput}
159-
data-testid={`${testid}-field-email`}
160-
type="email"
161-
placeholder=""
162-
/>
163-
</div>
164-
165-
<div className="ls-signin-form__field">
166-
<label className="ls-signin-form__label">{t('label.password', { ns: 'auth' })}</label>
167-
<Input
168-
type="password"
169-
name="password"
170-
maxlength={30}
171-
autocomplete="current-password"
172-
className="ls-signin-form__input"
173-
data-testid={`${testid}-field-password`}
174-
placeholder=""
175-
>
176-
<IonInputPasswordToggle slot="end" />
177-
</Input>
178-
</div>
151+
<div className="ls-signin-form__fields">
152+
<div className="ls-signin-form__field">
153+
<label className="ls-signin-form__label">{t('label.email', { ns: 'auth' })}</label>
154+
<Input
155+
name="email"
156+
maxlength={50}
157+
autocomplete="email"
158+
className="ls-signin-form__input"
159+
ref={focusInput}
160+
data-testid={`${testid}-field-email`}
161+
type="email"
162+
placeholder=""
163+
/>
164+
</div>
179165

180-
<div className="ls-signin-form__remember-forgot">
181-
<div className="ls-signin-form__remember">
182-
<CheckboxInput
183-
name="rememberMe"
184-
className="ls-signin-form__input-checkbox"
185-
testid={`${testid}-field-rememberme`}
186-
labelPlacement="end"
166+
<div className="ls-signin-form__field">
167+
<label className="ls-signin-form__label">
168+
{t('label.password', { ns: 'auth' })}
169+
</label>
170+
<Input
171+
type="password"
172+
name="password"
173+
maxlength={30}
174+
autocomplete="current-password"
175+
className="ls-signin-form__input"
176+
data-testid={`${testid}-field-password`}
177+
placeholder=""
187178
>
188-
{t('label.remember-me', { ns: 'auth' })}
189-
</CheckboxInput>
179+
<IonInputPasswordToggle slot="end" />
180+
</Input>
190181
</div>
191182

192-
<a
193-
href="/auth/forgot-password"
194-
className="ls-signin-form__forgot-link"
195-
data-testid={`${testid}-link-forgot-password`}
196-
>
197-
{t('forgot-password', { ns: 'auth' })}
198-
</a>
183+
<div className="ls-signin-form__remember-forgot">
184+
<div className="ls-signin-form__remember">
185+
<CheckboxInput
186+
name="rememberMe"
187+
className="ls-signin-form__input-checkbox"
188+
testid={`${testid}-field-rememberme`}
189+
labelPlacement="end"
190+
>
191+
{t('label.remember-me', { ns: 'auth' })}
192+
</CheckboxInput>
193+
</div>
194+
195+
<a
196+
href="/auth/forgot-password"
197+
className="ls-signin-form__forgot-link"
198+
data-testid={`${testid}-link-forgot-password`}
199+
>
200+
{t('forgot-password', { ns: 'auth' })}
201+
</a>
202+
</div>
199203
</div>
200204

201205
<IonButton

0 commit comments

Comments
 (0)