Skip to content

Commit b00badc

Browse files
ToniGrbicToniGrbic
authored
Merge pull request #267 from dump-hr/prod-fix
Revert "update UI"
2 parents 544f081 + dcb15b0 commit b00badc

File tree

3 files changed

+124
-166
lines changed

3 files changed

+124
-166
lines changed

‎apps/web/src/constants/paths.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
export enum Path {
2-
DUMP_Internship_Subscribe = 'https://dump.hr/internship?section=subscribe_form',
32
Home = '/',
43
ApplicationForm = '/application-form',
54
ScheduleInterview = '/schedule-interview/:internId',

‎apps/web/src/pages/ApplicationFormPage/ApplicationFormPage.tsx‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
Logo,
55
SortableDisciplinesContainer,
66
} from '@components/index';
7-
import { disciplineLabel, Path } from '@constants/index';
7+
import { disciplineLabel } from '@constants/index';
88
import {
99
Discipline,
1010
EducationOrEmploymentStatus,
@@ -115,25 +115,20 @@ export const ApplicationFormPage = () => {
115115
setValue('disciplines', updatedDisciplines, { shouldValidate: true });
116116
};
117117

118-
const handleClick = () => {
119-
window.location.replace(Path.DUMP_Internship_Subscribe);
120-
};
121-
122118
if (!isOpened) {
123119
return (
124120
<div className={classes.applicationFormPageWrapper}>
125121
<div className={classes.applicationFormIntroSection}>
126122
<Logo />
127-
<p className={classes.applicationDescription}>
128-
PRIJAVI SE NA NEWSLETTER I BUDI U TOKU
129-
</p>
130-
<h1 className={classes.applicationFormTitle}>
131-
Prijave za Internship su{' '}
132-
<span className={classes.redText}>zatvorene.</span>
133-
</h1>
134-
<button onClick={handleClick} className={classes.subscribeButton}>
135-
Primi obavijest o idućem Internshipu
136-
</button>
123+
<h1 className={classes.applicationFormTitle}>Postani dumpovac!</h1>
124+
<img
125+
className={classes.applicationFormWelcomeImage}
126+
src={formWelcomeImage}
127+
alt="form-welcome-image"
128+
/>
129+
</div>
130+
<div className={classes.applicationForm}>
131+
<h2 className={classes.applicationFormSubtitle}>Prijave zatvorene</h2>
137132
</div>
138133
</div>
139134
);

‎apps/web/src/pages/ApplicationFormPage/index.module.css‎

Lines changed: 114 additions & 150 deletions
Original file line numberDiff line numberDiff line change
@@ -1,219 +1,183 @@
11
* {
2-
box-sizing: border-box;
2+
box-sizing: border-box;
33
}
44

5-
.applicationFormPageWrapper {
6-
display: flex;
7-
margin-top: 80px;
8-
justify-content: flex-start;
9-
padding: 20px 250px;
10-
}
11-
12-
.applicationDescription {
13-
font-size: 16px;
14-
font-family: FuseV2Display-Regular;
15-
line-height: 100%;
16-
font-weight: 600;
17-
color: #282d30;
18-
margin-top: 55%;
19-
}
20-
21-
.redText {
22-
color: #c42635;
5+
body {
6+
margin: 0;
7+
background-color: white;
8+
font-family: 'FuseV2Display-Regular', sans-serif;
239
}
2410

25-
.subscribeButton {
26-
background-color: #c42635;
27-
color: white;
28-
padding: 14px 24px;
29-
border-radius: 8px;
30-
border: none;
31-
cursor: pointer;
32-
font-family: 'FuseV2Display-ExtraBold', sans-serif;
33-
font-style: normal;
34-
font-weight: 800;
35-
font-size: 16px;
36-
line-height: 16px;
11+
.applicationFormPageWrapper {
12+
display: flex;
13+
margin-top: 80px;
14+
justify-content: center;
3715
}
3816

3917
.applicationFormTitle {
40-
margin-top: 44px;
41-
font-family: FuseV2Display-ExtraBold;
42-
font-size: 96px;
43-
font-weight: 800;
44-
line-height: 100%;
45-
letter-spacing: 0%;
46-
color: #282d30;
47-
margin-bottom: 40px;
18+
margin-top: 44px;
19+
font-family: FuseV2Display-ExtraBold;
20+
font-size: 96px;
21+
font-style: normal;
22+
font-weight: 800;
23+
line-height: 100%;
24+
color: #282d30;
25+
margin-bottom: 40px;
4826
}
4927

5028
.formQuestionWrapper {
51-
padding: 20px;
52-
width: 100%;
53-
background-color: #fff;
54-
border-radius: 5px;
55-
margin-bottom: 20px;
29+
padding: 20px;
30+
width: 100%;
31+
background-color: #fff;
32+
border-radius: 5px;
33+
margin-bottom: 20px;
5634
}
5735

5836
.formQuestionSubtitleText {
59-
font-size: 14px;
60-
font-weight: 500;
61-
color: #000;
62-
margin-bottom: 10px;
63-
font-style: italic;
64-
margin-top: 5px;
37+
font-size: 14px;
38+
font-weight: 500;
39+
color: #000;
40+
margin-bottom: 10px;
41+
font-style: italic;
42+
margin-top: 5px;
6543
}
6644

6745
.marginBottom30px {
68-
margin-bottom: 30px;
46+
margin-bottom: 30px;
6947
}
7048

7149
.warningText {
72-
font-size: 12px;
73-
font-weight: 500;
74-
color: #ff0000;
75-
font-style: italic;
76-
margin-bottom: 0px;
50+
font-size: 12px;
51+
font-weight: 500;
52+
color: #ff0000;
53+
font-style: italic;
54+
margin-bottom: 0px;
7755
}
7856

7957
.warningTextPlaceholder {
80-
height: 26px;
58+
height: 26px;
8159
}
8260

8361
.disciplinesChoiceWrapper {
84-
position: relative;
62+
position: relative;
8563
}
8664

8765
label {
88-
display: block;
66+
display: block;
8967
}
9068

9169
input {
92-
display: block;
70+
display: block;
9371
}
9472

9573
.submitButton {
96-
font-family: FuseV2Display-Regular !important;
97-
width: 161px !important;
98-
height: 44px !important;
99-
border-radius: 8px !important;
100-
background: #5cc2a0 !important;
101-
box-shadow: none !important;
74+
width: 161px !important;
75+
height: 44px !important;
76+
border-radius: 8px !important;
77+
background: #5cc2a0 !important;
78+
box-shadow: none !important;
10279
}
10380

10481
.applicationFooterText {
105-
font-size: 14px;
106-
font-weight: 700;
107-
color: #444444;
108-
margin-bottom: 10px;
109-
font-style: italic;
110-
margin-top: 5px;
82+
font-size: 14px;
83+
font-weight: 700;
84+
color: #444444;
85+
margin-bottom: 10px;
86+
font-style: italic;
87+
margin-top: 5px;
11188
}
11289

11390
.cursorGrab {
114-
cursor: grab;
91+
cursor: grab;
11592
}
11693

11794
.formActionsWrapper {
118-
display: flex;
119-
justify-content: space-between;
120-
align-items: center;
95+
display: flex;
96+
justify-content: space-between;
97+
align-items: center;
12198
}
12299

123100
.applicationFormWelcomeImage {
124-
object-fit: contain;
125-
aspect-ratio: unset;
126-
width: unset;
101+
object-fit: contain;
102+
aspect-ratio: unset;
103+
width: unset;
127104
}
128105

129106
.applicationFormIntroSection {
130-
width: 592px;
131-
position: sticky;
132-
top: 80px;
133-
height: 100%;
107+
width: 592px;
108+
position: sticky;
109+
top: 80px;
110+
height: 100%;
134111
}
135112

136113
.applicationForm {
137-
width: 584px;
138-
display: inline-flex;
139-
padding: 64px;
140-
flex-direction: column;
141-
align-items: flex-start;
142-
gap: 16px;
143-
border-radius: 24px;
144-
box-shadow:
145-
0px 8px 40px 0px rgba(214, 224, 233, 0.31),
114+
width: 584px;
115+
display: inline-flex;
116+
padding: 64px;
117+
flex-direction: column;
118+
align-items: flex-start;
119+
gap: 16px;
120+
border-radius: 24px;
121+
box-shadow: 0px 8px 40px 0px rgba(214, 224, 233, 0.31),
146122
0px 4px 16px 0px rgba(214, 224, 233, 0.12),
147123
0px 2px 6px 0px rgba(214, 224, 233, 0.06);
148-
margin-bottom: 80px;
124+
margin-bottom: 80px;
149125
}
150126

151127
.applicationFormSubtitle {
152-
color: #242731;
153-
font-family: FuseV2Display-ExtraBold;
154-
font-size: 32px;
155-
font-style: normal;
156-
font-weight: 800;
157-
line-height: 36px;
128+
color: #242731;
129+
font-family: FuseV2Display-ExtraBold;
130+
font-size: 32px;
131+
font-style: normal;
132+
font-weight: 800;
133+
line-height: 36px;
158134
}
159135

160136
.applicationFormAdditional {
161-
color: #575f6e;
162-
font-size: 16px;
163-
font-style: normal;
164-
font-weight: 400;
165-
line-height: 22px;
137+
color: #575f6e;
138+
font-size: 16px;
139+
font-style: normal;
140+
font-weight: 400;
141+
line-height: 22px;
166142
}
167143

168144
@media screen and (max-width: 1054px) {
169-
.applicationFormPageWrapper {
170-
flex-direction: column;
171-
align-items: center;
172-
}
145+
.applicationFormPageWrapper {
146+
flex-direction: column;
147+
align-items: center;
148+
}
173149

174-
.applicationFormIntroSection {
175-
position: unset;
176-
margin-bottom: 44px;
177-
}
150+
.applicationFormIntroSection {
151+
position: unset;
152+
margin-bottom: 44px;
153+
}
178154
}
179155

180156
@media screen and (max-width: 630px) {
181-
.applicationFormTitle {
182-
font-size: 50px;
183-
width: 95%;
184-
}
185-
186-
.applicationDescription {
187-
font-size: 12px;
188-
margin-top: 70%;
189-
}
190-
191-
.subscribeButton {
192-
width: 90%;
193-
padding: 18px 20px;
194-
}
195-
196-
.applicationFormWelcomeImage {
197-
display: none;
198-
}
199-
200-
.applicationFormPageWrapper {
201-
margin-top: 8px;
202-
margin-left: 24px;
203-
margin-right: 24px;
204-
padding: 0;
205-
}
206-
207-
.applicationForm {
208-
box-shadow: unset;
209-
width: 100%;
210-
padding: 0;
211-
}
212-
213-
.applicationFormIntroSection {
214-
width: 100%;
215-
margin-left: 24px;
216-
margin-top: 20px;
217-
overflow-x: hidden;
218-
}
157+
.applicationFormTitle {
158+
display: none;
159+
}
160+
161+
.applicationFormWelcomeImage {
162+
display: none;
163+
}
164+
165+
.applicationFormPageWrapper {
166+
margin-top: 8px;
167+
margin-left: 24px;
168+
margin-right: 24px;
169+
}
170+
171+
.applicationForm {
172+
box-shadow: unset;
173+
width: 100%;
174+
padding: 0;
175+
}
176+
177+
.applicationFormIntroSection {
178+
width: 100%;
179+
margin-left: 24px;
180+
margin-top: 20px;
181+
overflow-x: hidden;
182+
}
219183
}

0 commit comments

Comments
 (0)