Skip to content

Commit a452f45

Browse files
vaibhavdarenvaibhavdaren
authored
Merge pull request #30 from codeuino/maintenanceMode
Tag search page + Maintenance mode
2 parents 8d6f3e4 + 86e7109 commit a452f45

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+4569
-766
lines changed

‎src/App.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ import React from "react";
22
import Router from "./router";
33
import { useDispatch } from "react-redux";
44
import { getCurrentUser } from "./reducers/authSlice";
5+
import { getOrg } from "./reducers/orgSlice";
56

67
function App() {
78
const dispatch = useDispatch();
89
dispatch(getCurrentUser());
10+
dispatch(getOrg());
911
return (
1012
<React.Fragment>
1113
<Router />

‎src/assets/images/maintenance.svg‎

Lines changed: 114 additions & 0 deletions
Loading

‎src/assets/stylesheets/App.scss‎

Lines changed: 256 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,100 @@
11
//layouts
2+
html {
3+
font-size: 18px;
4+
}
5+
26
body {
37
-webkit-font-smoothing: antialiased;
48
-moz-osx-font-smoothing: grayscale;
59
font-family: 'Inter', sans-serif;
610
margin: 0;
711
}
812

13+
.primary-container {
14+
padding-top: 7rem;
15+
}
16+
17+
.container-mid {
18+
max-width: 98%;
19+
padding: 0;
20+
}
21+
922
.center-row {
1023
margin-left: auto;
1124
margin-right: auto;
1225
max-width: 100%;
1326
text-align: center;
1427
}
1528

29+
@media (max-width: 1199px) and (min-width: 992px) {
30+
html {
31+
font-size: 17px;
32+
}
33+
34+
.container-mid {
35+
max-width: 90%;;
36+
}
37+
}
38+
39+
@media (max-width: 991px) and (min-width: 768px) {
40+
html {
41+
font-size: 17px;
42+
}
43+
44+
.container-mid {
45+
max-width: 100%;;
46+
}
47+
}
48+
49+
@media (max-width: 767px) and (min-width: 575px) {
50+
html {
51+
font-size: 16px;
52+
}
53+
54+
.container-mid {
55+
max-width: 100%;;
56+
}
57+
}
58+
59+
@media (max-width: 576px) {
60+
html {
61+
font-size: 14px;
62+
}
63+
64+
.container-mid {
65+
max-width: 100%;;
66+
}
67+
68+
.primary-container {
69+
padding-top: 6rem;
70+
}
71+
}
72+
1673
//headings
1774
.main-heading {
18-
font-family: 'Playfair Display', serif;
19-
font-weight: 800;
20-
padding-bottom: 1.5rem;
75+
font-family: 'Inter', sans-serif;
76+
font-size: 2.4rem;
77+
font-weight: 600;
78+
padding-bottom: 1rem;
79+
}
80+
81+
//text
82+
.medium-text {
83+
font-weight: 600;
2184
}
2285

2386
//buttons
2487
.primary-button {
2588
background-color: $primary-button;
2689
border: 0;
90+
border-radius: 0.35rem;
2791
color: $white;
92+
font-size: 1rem;
2893
font-weight: 500;
2994
margin-bottom: 2rem;
3095
margin-top: 1rem;
31-
padding: 0.5rem 1.5rem;
96+
padding: 0.4rem 1.5rem;
97+
transition: all .3s ease-in;
3298

3399
&:disabled,
34100
&:hover,
@@ -38,13 +104,55 @@ body {
38104
color: $white;
39105
}
40106

107+
&:hover {
108+
box-shadow: 0 10px 10px $shadow-black;
109+
transform: translateY(-5px);
110+
}
111+
41112
&:focus {
42113
background-color: $primary-button;
43114
border-color: $primary-button;
44115
box-shadow: 0 0 0 0.2rem $input-shadow;
45116
}
46117
}
47118

119+
.primary-delete-button {
120+
background-color: $error-hover-red;
121+
border: 0;
122+
border-radius: 0.35rem;
123+
color: $white;
124+
font-weight: 500;
125+
font-size: 1rem;
126+
margin-bottom: 2rem;
127+
margin-top: 1rem;
128+
padding: 0.5rem 2.5rem;
129+
transition: all .3s ease-in;
130+
131+
&:disabled,
132+
&:hover,
133+
&.active {
134+
background-color: $error-hover-red;
135+
border: 0;
136+
color: $white;
137+
}
138+
139+
&:hover {
140+
box-shadow: 0 10px 10px $shadow-black;
141+
transform: translateY(-5px);
142+
}
143+
144+
&:focus {
145+
background-color: $error-hover-red;
146+
border-color: $error-hover-red;
147+
box-shadow: 0 0 0 0.2rem $input-shadow;
148+
}
149+
150+
svg {
151+
margin-right: 0.1rem;
152+
padding-bottom: 0.2rem;
153+
}
154+
}
155+
48156
//alerts
49157
.alert {
50158
color: $error-red;
@@ -88,59 +196,171 @@ body {
88196
}
89197
}
90198

199+
.anchor-container {
200+
display: flex;
201+
float: right;
202+
}
203+
204+
.anchor-danger-text {
205+
color: $error-red;
206+
font-size: 1.2rem;
207+
font-weight: 600;
208+
padding-top: 1.6rem;
209+
text-decoration: underline;
210+
211+
&:hover {
212+
color: $error-hover-red;
213+
text-decoration: none;
214+
}
215+
}
216+
217+
.anchor-update-text {
218+
color: $form-label;
219+
220+
&:hover {
221+
color: $primary-button;
222+
}
223+
}
224+
91225
//modals
226+
.modal-content {
227+
border-radius: 0.5rem;
228+
}
229+
92230
.modal-heading {
93-
font-family: 'Playfair Display', serif;
94-
font-weight: 700;
95-
padding-bottom: 1rem;
96-
padding-top: 0.6rem;
231+
font-family: 'Inter', sans-serif;
232+
font-size: 2rem;
233+
font-weight: 600;
234+
padding-bottom: 0;
235+
margin-top: -2rem;
236+
padding-left: 1.9rem;
237+
padding-top: 1.3rem;
238+
239+
svg {
240+
font-size: 2rem;
241+
margin-right: 0.2rem;
242+
padding-bottom: 0.2rem;
243+
}
244+
}
245+
246+
.modal-header {
247+
border-bottom: 0;
248+
padding: 0;
249+
padding-right: 4rem;
250+
padding-top: 2.8rem;
251+
252+
.close {
253+
background-color: $navbar-light;
254+
border-radius: 50%;
255+
box-shadow: 0 2px 2px $shadow-black;
256+
padding: 0.4rem 0.6rem;
257+
}
258+
}
259+
260+
.modal-body {
261+
padding-top: 0;
97262
}
98263

99264
.modal-form {
100265
padding: 1rem;
101266
}
102267

103-
//to be done//
104-
code {
105-
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
106-
monospace;
268+
.modal-delete-container {
269+
margin-left: auto;
270+
margin-right: auto;
271+
padding: 1rem;
272+
text-align: center;
107273
}
108274

109-
.App {
110-
text-align: center;
275+
.modal-delete-text {
276+
text-align: left;
111277
}
112278

113-
.App-logo {
114-
height: 40vmin;
115-
pointer-events: none;
279+
@media (min-width: 768px) {
280+
.modal-wide .modal-dialog {
281+
max-width: 700px;
282+
margin: 1.75rem auto;
283+
}
116284
}
117285

118-
@media (prefers-reduced-motion: no-preference) {
119-
.App-logo {
120-
animation: App-logo-spin infinite 20s linear;
286+
//tags
287+
.primary-tag {
288+
font-size: 0.8rem;
289+
font-weight: 600;
290+
margin: 0.4rem 0.2rem;
291+
padding: 0.4rem 0.8rem;
292+
transition: all .3s ease-in;
293+
a {
294+
color: $white;
295+
text-shadow: 1px 1px $subheading-black;
296+
text-decoration: none;
297+
298+
&:hover {
299+
color: $white;
300+
text-decoration: none;
301+
}
302+
}
303+
304+
&:hover {
305+
transform: translateY(-3px);
121306
}
122307
}
123308

124-
.App-header {
125-
background-color: #282c34;
126-
min-height: 100vh;
127-
display: flex;
128-
flex-direction: column;
129-
align-items: center;
130-
justify-content: center;
131-
font-size: calc(10px + 2vmin);
132-
color: white;
309+
.primary-big-tag {
310+
color: $white;
311+
font-size: 1.8rem;
312+
font-weight: 600;
313+
margin: 0 0.2rem;
314+
padding: 0.4rem 0.8rem;
133315
}
134316

135-
.App-link {
136-
color: #61dafb;
317+
//checkboxes
318+
.primary-checkpoint {
319+
background-color: $shadow-black;
320+
bottom: 0;
321+
display: inline-block;
322+
height: 1.5rem;
323+
position: absolute;
324+
width: 1.5rem;
325+
326+
&::after {
327+
content: '';
328+
display: none;
329+
position: absolute;
330+
}
137331
}
138332

139-
@keyframes App-logo-spin {
140-
from {
141-
transform: rotate(0deg);
333+
.primary-checkpoint-container {
334+
cursor: pointer;
335+
display: block;
336+
font-size: 1rem;
337+
position: relative;
338+
339+
input {
340+
height: 0;
341+
opacity: 0;
342+
position: absolute;
343+
width: 0;
344+
}
345+
346+
h6 {
347+
display: inline-block;
348+
margin-bottom: 0;
349+
margin-right: 0.5rem;
142350
}
143-
to {
144-
transform: rotate(360deg);
351+
352+
input:checked ~ .primary-checkpoint {
353+
background-color: $primary-button;
354+
355+
&::after {
356+
border: solid $white;
357+
border-width: 0 3px 3px 0;
358+
display: block;
359+
height: 1rem;
360+
left: 0.5rem;
361+
top: 0.15rem;
362+
transform: rotate(45deg);
363+
width: 0.5rem;
364+
}
145365
}
146366
}

‎src/assets/stylesheets/index.scss‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@
22
@import "~bootstrap/scss/bootstrap";
33
@import url('https://fonts.googleapis.com/css2?family=Bebas+Neue&display=swap');
44
@import url('https://fonts.googleapis.com/css2?family=Inter:wght@100;200;300;400;500;600;700;800;900&display=swap');
5-
@import url('https://fonts.googleapis.com/css2?family=Playfair+Display:ital,wght@0,400;0,500;0,600;0,700;0,800;0,900;1,400;1,500;1,600;1,700;1,800;1,900&display=swap');
65
@import "./App.scss";
7-
@import "../../components/navbar/navbar.scss";
8-
@import "../../components/user/auth/auth.scss";
9-
@import "../../pages/createOrganization/createOrganization.scss";
6+
@import "../../pages/common/common.scss";
7+
@import "../../pages/organization/organization.scss";
108
@import "../../pages/dashboard/dashboard.scss";
9+
@import "../../pages/user/user.scss";
10+
@import "../../pages/tag/tag.scss";
11+
@import "../../pages/admin/admin.scss";
12+
@import "../../components/common/common.scss";
13+
@import "../../components/navbar/navbar.scss";
14+
@import "../../components/topic/topic.scss";
15+
@import "../../components/user/user.scss";

0 commit comments

Comments
 (0)