Skip to content

Commit 0f6847d

Browse files
kevinmonisitMugPandAndrew HeoAndrew Heo
authored
Spring 2023 Landing Page Theme (#521)
* Working on integrating new landing page. Still some errors * Compiles succesfully. Still many errors * Tailwindcss now shows in components * Integrated tailwindCSS * Login/Register/Dashboard/Logout buttons on Landing Page * Added particle background. Fixed a tag miscoloring * Added randomization of animation duration * Added a global blue gradient background and changed npm script * Isolated TailwindCSS config to new landing page * Conditionally render the navbar when going into old dashboard * Particle Background for all routes * logo change & schedule CSS updates * Adjusted padding in the hero title * finished redesign. tbd about navbar dash * changed dash-navbar color to blue * update theme colors * void schedule * Adjust padding in hero to look better in mobile * Adjusted hero padding for desktops * Hero page works down to 300px width * Added scroll functionallity to arrow in hero * Fixed eslint errorsand removed Sponsors section * Changed index-23.css filename * changed button color * unsure about select-background color * Added re-render on URL changes * Updated schedule component with old times * Voided the schedule * additional color changes * change dev server back to dev * New package-lock.json * Handling out of memory Github action error Co-authored-by: MugPand <[email protected]> Co-authored-by: Andrew Heo <[email protected]> Co-authored-by: Andrew Heo <[email protected]> Co-authored-by: Mugdhesh Pandkar <[email protected]>
1 parent bb0b526 commit 0f6847d

Some content is hidden

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

73 files changed

+28497
-307
lines changed

.eslintignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
*.json
22
*.css
3+
*.png
4+
*.svg
5+
*.jpeg

.github/workflows/code-build-assurance.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v2
2020
- name: Test using Node ${{ matrix.node-version }}
21+
env:
22+
NODE_OPTIONS: "--max_old_space_size=4096"
2123
uses: actions/setup-node@v1
2224
with:
2325
node-version: ${{ matrix.node-version }}

package-lock.json

Lines changed: 7565 additions & 197 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,24 @@
66
"@devexpress/dx-react-core": "^2.7.2",
77
"@devexpress/dx-react-scheduler": "^2.7.2",
88
"@devexpress/dx-react-scheduler-material-ui": "^2.7.2",
9+
"@emotion/react": "^11.10.5",
10+
"@emotion/styled": "^11.10.5",
11+
"@headlessui/react": "^1.7.7",
912
"@material-ui/core": "^4.11.0",
1013
"@material-ui/icons": "^4.9.1",
1114
"@material-ui/lab": "^4.0.0-alpha.56",
1215
"@material-ui/utils": "^4.10.2",
16+
"@mui/material": "^5.11.5",
1317
"animejs": "^3.0.0",
18+
"autoprefixer": "^10.4.13",
1419
"availity-reactstrap-validation": "^2.5.0",
1520
"axios": "^0.21.1",
1621
"bootstrap": "^4.1.3",
1722
"chart.js": "^2.9.4",
1823
"font-awesome": "^4.7.0",
1924
"material-ui-chip-input": "^1.1.0",
2025
"parallax-js": "^3.1.0",
26+
"postcss": "^8.4.21",
2127
"qrcode.react": "^0.9.3",
2228
"react": "^16.6.3",
2329
"react-anime": "^3.0.3",
@@ -28,7 +34,9 @@
2834
"react-dom": "^16.6.3",
2935
"react-fa": "^5.0.0",
3036
"react-google-autocomplete": "^1.0.18",
37+
"react-icons": "^4.7.1",
3138
"react-motion": "^0.5.2",
39+
"react-particles": "^2.8.0",
3240
"react-router-dom": "^4.3.1",
3341
"react-scripts": "^3.4.3",
3442
"react-scroll-parallax": "^1.3.5",
@@ -38,10 +46,14 @@
3846
"react-toggle": "^4.1.1",
3947
"react-window": "^1.8.5",
4048
"reactstrap": "^6.5.0",
41-
"request": "^2.88.0"
49+
"request": "^2.88.0",
50+
"tailwindcss": "^3.2.4",
51+
"tsparticles": "^2.8.0",
52+
"typescript": "^4.9.0"
4253
},
4354
"scripts": {
44-
"start": "env-cmd development react-scripts start",
55+
"tailwind-watch": "npx tailwindcss -i ./src/index.css -o ./public/tailwind-output.css --watch",
56+
"start": "npm run tailwind-watch & env-cmd development react-scripts start",
4557
"build-dev": "env-cmd build-dev react-scripts build",
4658
"build-prod": "env-cmd build-prod react-scripts build",
4759
"test": "react-scripts test",
@@ -63,6 +75,7 @@
6375
"@testing-library/react": "^12.0.0",
6476
"@testing-library/react-hooks": "^7.0.2",
6577
"@testing-library/user-event": "^13.2.1",
78+
"@types/react-router-dom": "^5.3.3",
6679
"babel-core": "^6.26.3",
6780
"babel-eslint": "^10.0.0",
6881
"env-cmd": "^8.0.2",

public/index-s20.css renamed to public/index-s23.css

Lines changed: 56 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
@import url('https://fonts.googleapis.com/css?family=Titillium+Web&display=swap');
22
@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i,700,700i,800,800i");
33

4-
/* Variables */
54
:root {
65
/* Theme Colors */
76
--primary-color: #FFF5e8; /* Logo, link colors, text */
87
--primary-color-alt: #4fab5f; /* Form body bg, form headers text */
98
--secondary-color: #000000; /* Barely used accent color...combine this and primary-color-alt...? */
10-
--secondary-color-alt: #C85151; /* Background color */
11-
--accent-color: #F1BA43; /* Logout, Live button color */
9+
--secondary-color-alt:#1f6aa0; /* Background color */
10+
--accent-color: #4bbede; /* Logout, Live button color */
11+
/* split card colors */
12+
--splitCard-color:#000000;
1213
--accent-color-alt: #F1BA43; /* Dashboard button color NOTE: Dashboard colors are different across navbar on different pages */
1314
--disabled-color: #00000055; /* Unsure.... */
1415
--hover-color: #F1BA43;
15-
--hover-background-color: #df897f;
16+
--hover-background-color: #4bbede;
1617
--active-color: rgba(255, 255, 255, 0.5);
1718
--active-background-color: #5A7A96A0;
1819
/* Fonts */
@@ -21,12 +22,12 @@
2122

2223
/*'Open Sans', sans-serif; */
2324
/* Form Inputs */
24-
--input-background: #C8515111;
25+
--input-background: #516b7311;
2526
--input-placeholder: rgba(0, 0, 0, 0.3);
2627
--input-border: none;
2728
--input-color: rgba(0, 0, 0, 1);
2829
--input-border-radius: 0px;
29-
--select-background: #C85151;
30+
--select-background: #4bbede;
3031
--select-color: rgba(0, 0, 0, 1);
3132
/* Hero Image */
3233
--hero-width: 1000px;
@@ -41,12 +42,17 @@
4142
--sponsors-bronze-color: #C96F0D;
4243
}
4344

45+
a {
46+
color: unset !important;
47+
}
48+
4449
/* Global look and feel */
45-
body::-webkit-scrollbar {
46-
display: none;
50+
body::-webkit-scrollbar {
51+
display: none;
4752
}
4853
html, body {
4954
overflow-x: hidden;
55+
min-width: 380px;
5056
}
5157
body {
5258
font-family: var(--text-font) !important;
@@ -57,7 +63,7 @@ body {
5763
::placeholder {
5864
color: var(--input-placeholder) !important;
5965
}
60-
a:link {
66+
/* a:link {
6167
color: var(--accent-color);
6268
transition: color 0.5s ease;
6369
}
@@ -71,7 +77,8 @@ a:visited {
7177
a:visited:hover {
7278
color: var(--hover-color);
7379
text-decoration: none;
74-
}
80+
} */
81+
7582
.primary-link {
7683
color: var(--primary-color) !important;
7784
transition: color 0.5s ease;
@@ -123,7 +130,7 @@ hr {
123130
height: 35px;
124131
bottom: -5%;
125132
left: -25%;
126-
background: linear-gradient(to left, #FFF5E855, #FFF5E855, #FFF5E855);
133+
background: linear-gradient(to left, #FFF5E855, #FFF5E855, #FFF5E855);
127134
visibility: hidden;
128135
-webkit-transform: scaleX(0);
129136
transform: scaleX(0);
@@ -147,13 +154,13 @@ hr {
147154
/* Background Control */
148155
.bg-gradient-right {
149156
background: var(--secondary-color-alt);
150-
width: 100vw;
157+
width: 100vw;
151158
z-index: 10;
152159
color: var(--secondary-color);
153160
}
154161
.bg-gradient-left {
155162
background: var(--primary-color);
156-
width: 100vw;
163+
width: 100vw;
157164
z-index: 10;
158165
color: var(--secondary-color);
159166
}
@@ -169,7 +176,7 @@ hr {
169176
padding-top: 100px;
170177
padding-bottom: 100px;
171178
}
172-
.skew-right {
179+
.skew-right {
173180
transform: skew(0deg, -4deg);
174181
}
175182
.skew-left {
@@ -183,26 +190,26 @@ hr {
183190
}
184191
.footer .text-vcenter {
185192
margin: 0;
186-
line-height: 10vh;
193+
line-height: 10vh;
187194
}
188195
.footer .social-links {
189196
color: #ffffff;
190-
font-size: 100%;
197+
font-size: 100%;
191198
}
192199
.footer .social-links:hover{
193200
color: var(--hover-color);
194201
}
195202
.footer a {
196203
color: var(--primary-color);
197204
line-height: 10vh;
198-
padding: 15px 10px;
205+
padding: 15px 10px;
199206
}
200207
.footer a:hover {
201208
color: var(--hover-color);
202209
}
203210
.footer .footer-logo {
204211
display: inline-block;
205-
height: calc(10vh*0.45);
212+
height: calc(10vh*0.45);
206213
}
207214
#navigation-link {
208215
font-family: var(--text-font);
@@ -345,7 +352,7 @@ form .btn, form btn-secondary {
345352
.live-messages {
346353
color: var(--primary-color) !important;
347354
background-color: transparent !important;
348-
border: none !important;
355+
border: none !important;
349356
}
350357
.live-messages-text {
351358
color: var(--primary-color) !important;
@@ -373,25 +380,25 @@ form .btn, form btn-secondary {
373380
padding-top: 5px;
374381
}
375382

376-
/* Sponsorship Page */
383+
/* Sponsorship Page */
377384

378385
/* Sponsorship Landing Sepcifics */
379386
.bronze {
380-
color: #FFA038 !important;
387+
color: #FFA038 !important;
381388
}
382-
389+
383390
.silver {
384391
color: #B7B7B7 !important;
385392
}
386-
393+
387394
.gold {
388395
color: #FFDF00 !important;
389396
}
390-
397+
391398
.plat {
392-
color: #D8D8D8 !important;
399+
color: #D8D8D8 !important;
393400
}
394-
401+
395402
.titlepack {
396403
color: var(--primary-color) !important;
397404
}
@@ -404,7 +411,7 @@ form .btn, form btn-secondary {
404411
}
405412

406413
.table td {
407-
border-top: none !important;
414+
border-top: none !important;
408415
}
409416

410417
.pd {padding-top: 25px;}
@@ -651,7 +658,7 @@ form .btn, form btn-secondary {
651658
scrollbar-color: transparent transparent;
652659

653660
}
654-
.no-scrollbars::-webkit-scrollbar {
661+
.no-scrollbars::-webkit-scrollbar {
655662
display: none; /* Safari and Chrome */
656663
}
657664
.no-style-type {
@@ -660,8 +667,28 @@ display: none; /* Safari and Chrome */
660667

661668
/* Material UI Specifc */
662669

663-
.MuiAlert-filledSuccess{
670+
/* .MuiAlert-filledSuccess{
664671
background-color: var(--primary-color-alt);
665672
color: var(--primary-color-alt);
666673
674+
} */
675+
676+
.makeStyles-background-14 {
677+
background: transparent !important;
678+
}
679+
680+
.makeStyles-stickyElement-3 {
681+
background: transparent !important;
682+
}
683+
684+
.Cell-dayOfWeek-20 {
685+
color: #d1e9ef !important;
686+
}
687+
688+
.Cell-dayOfMonth-21 {
689+
color: #d1e9ef !important;
690+
}
691+
692+
.Label-text-32 {
693+
color: #d1e9ef !important;
667694
}

public/index.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@
2121
<meta property="og:image" content="./assets/fb-banner-upper.png" />
2222
<meta name="viewport" content="width=device-width, initial-scale=1.0">
2323
<meta name="description" content="Find out more about HackRU Spring 2023.">
24-
<link rel="icon" href="%PUBLIC_URL%/assets/icons/red_hackru.png">
25-
<link rel="shortcut icon" href="%PUBLIC_URL%/assets/icons/red)hackru.png">
24+
<link rel="icon" href="%PUBLIC_URL%/assets/icons/blue_hackru.png">
25+
<link rel="shortcut icon" href="%PUBLIC_URL%/assets/icons/blue_hackru.png">
2626
<link rel="manifest" href="%PUBLIC_URL%/manifest.json">
27-
<link rel="stylesheet" href="%PUBLIC_URL%/index-s20.css">
27+
<link rel="stylesheet" href="%PUBLIC_URL%/index-s23.css">
28+
<link rel="stylesheet" href="%PUBLIC_URL%/tailwind-output.css">
2829
<title id="title">HackRU</title>
2930
</head>
3031

0 commit comments

Comments
 (0)