Skip to content

Commit ef4df72

Browse files
Community and Competition Icon Redesign (#147)
* revamp home page * change wiki link and button names * make main sections responsive and temp remove graphics * homepage css styling for responsiveness * replace mainpage with newhome * diamonds and wave responsive * make floating diamonds smaller * home page community section * community section * refactored competition page * moved image to left so diamond doesn't overlap w same color text * address pr comments * home and comp page redesign * minor home page style edits * changed reset password page styling (#152) * changed reset password page styling * fix: change reset button text * chore: update react deps (#153) * Visual and Style Fixes (#136) * styling fixes * events page footer adjustment * fix: compile errors and merge conflict * fix: add events custom text and css fixes * fix: cleaning up diffs --------- Co-authored-by: Samantha Prestrelski <[email protected]> * Make the hero bigger and higher up (#145) * npm audit fix * Hero enlargement * Actually make the css look the same as the image * revert impactful.less changes --------- Co-authored-by: Nick <[email protected]> * fix about info loading (#154) * fix: useEffect on that thang * fix: spacing for mainpage * Your footer is BIG (#155) * Hack acm ai site * unhack ai site * fix: merge conflicts and remove comm section * revamp home page * change wiki link and button names * make main sections responsive and temp remove graphics * homepage css styling for responsiveness * replace mainpage with newhome * diamonds and wave responsive * home page community section * community section * refactored competition page * moved image to left so diamond doesn't overlap w same color text * address pr comments * home and comp page redesign * minor home page style edits * fix: merge conflicts and remove comm section * fix: past leaderboards for comps --------- Co-authored-by: [email protected] <[email protected]>
1 parent 795ca4c commit ef4df72

File tree

17 files changed

+430
-427
lines changed

17 files changed

+430
-427
lines changed

package-lock.json

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/elementai.png

6.46 KB
Loading

public/energium.png

1.35 KB
Loading

public/hns.png

6.72 KB
Loading

public/home_icon_mobile.png

174 KB
Loading

public/nnm.png

4.14 KB
Loading

public/temp_comp.png

204 KB
Loading

public/trophy_bg.png

64.7 KB
Loading

src/App.tsx

Lines changed: 26 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,25 @@ import {
2828
defaultTournament,
2929
} from './configs';
3030
import { message } from 'antd';
31-
import HideAndSeek2020 from './components/HistoricalCompetitionDescriptions/HideAndSeek2020';
3231
import CompetitionsPage from './pages/CompetitionsPage';
33-
import HideAndSeek2020Page from './pages/Competitions/HideAndSeek2020Page';
3432
import AboutPage from './pages/AboutPage';
3533
import AlumniPage from './pages/AlumniPage';
3634
import EventsPage from './pages/EventsPage';
3735
import EventHasNotStartedPage from './pages/EventHasNotStarted';
38-
import { EnergiumRoutes } from './components/CompetitionRoutes/Energium';
3936
import ForgotPasswordPage from './pages/Auth/ForgotPassword';
40-
import nnRanksPage from './pages/Competitions/NNRankPage';
4137
import requestreset from './pages/Auth/RequestReset';
38+
39+
import HideAndSeek2020 from './components/HistoricalCompetitionDescriptions/HideAndSeek2020';
40+
import HideAndSeek2020Page from './pages/Competitions/HideAndSeek2020Page';
41+
import { EnergiumRoutes } from './components/CompetitionRoutes/Energium';
42+
import NNRanksPage from './pages/Competitions/NNRankPage';
43+
4244
import CompetitionLandingPage from './pages/Competitions/CompetitionLandingPage';
4345
import CompetitionUploadPage from './pages/Competitions/CompetitionUploadPage';
4446
import CompetitionSpecificTeamPage from './pages/Competitions/CompetitionTeamPages/SpecificTeamPage';
4547
import CompetitionAllTeamsPage from './pages/Competitions/CompetitionTeamPages/AllTeamsPage';
4648
import CompetitionLeaderboardPage from './pages/Competitions/CompetitionLeaderboardPage';
4749
import CompetitionSubmissionDetailsPage from './pages/Competitions/CompetitionTeamPages/SubmissionDetailsPage';
48-
4950
import NotFoundPage from './pages/404Page';
5051

5152
import ProjectPage from './pages/ProjectsPage/index';
@@ -112,23 +113,10 @@ function App() {
112113
<Route path="/competitions" exact component={CompetitionsPage} />
113114
<Route path="/alumni" exact component={AlumniPage} />
114115
<Route path="/projects" exact component={ProjectPage} />
115-
<Route
116-
path="/old-competitions/hide-and-seek2020"
117-
exact
118-
component={HideAndSeek2020Page}
119-
/>
120116
<Route path="/events" exact component={EventsPage} />
121-
<Route
122-
path="/eventhasnotstarted"
123-
exact
124-
component={EventHasNotStartedPage}
125-
/>
126-
<Route path="/login" exact component={LoginPage} />
127-
<Route
128-
path="/old-competitions/nn"
129-
exact
130-
component={nnRanksPage}
131-
/>
117+
<Route path="/eventhasnotstarted" exact component={EventHasNotStartedPage}/>
118+
119+
{/* new competition format */}
132120
<Route
133121
path="/competitions/:id"
134122
exact
@@ -164,11 +152,19 @@ function App() {
164152
exact
165153
component={JoinTeamsPage}
166154
/>
167-
{/* <Route path="/competitions/nn/upload" exact component={nnUpload} /> */}
155+
156+
{/* accounts */}
157+
<Route path="/login" exact component={LoginPage} />
158+
<Route path="/register" exact component={RegisterPage} />
159+
<Route path="/requestreset" component={requestreset} />
160+
<Route path="/resetpassword" component={ForgotPasswordPage} />
161+
<Route path="/admin/register" exact component={RegisterPage} />
162+
163+
{/* old competitions */}
164+
<Route path="/old-competitions/hideandseek" exact component={HideAndSeek2020Page} />
168165
<Route
169-
exact
170-
path="/history/hide-and-seek2020"
171-
component={() => {
166+
path="/old-competitions/hideandseek/ranks"
167+
exact component={() => {
172168
return (
173169
<TournamentRankingsPageHistorical
174170
dataDir="2020summer"
@@ -177,17 +173,13 @@ function App() {
177173
);
178174
}}
179175
/>
180-
<Route path="/resetpassword" component={ForgotPasswordPage} />
181-
<Route path="/requestreset" component={requestreset} />
182-
<Route path="/register" exact component={RegisterPage} />
183-
<Route path="/admin/register" exact component={RegisterPage} />
176+
<Route path="/old-competitions/nn" exact component={NNRanksPage} />
177+
{/* <Route path="/competitions/nn/upload" exact component={nnUpload} /> */}
178+
<EnergiumRoutes />
179+
184180
<Route path="*" component={NotFoundPage} />
185181
</Switch>
186-
<TournamentProvider
187-
value={{ tournament: tournament, setTournament: setTournament }}
188-
>
189-
<EnergiumRoutes />
190-
</TournamentProvider>
182+
191183
</UserProvider>
192184
) : (
193185
<div

src/components/Statistic/index.less

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,16 @@
1313
font-size: @font4;
1414
line-height: @font4;
1515
font-weight: @semi-bold;
16+
@media only screen and (max-width: @xs) {
17+
font-size: @font5;
18+
}
1619
}
1720

1821
.description {
1922
display: block;
2023
font-size: @font2;
2124
@media only screen and (max-width: @xs) {
22-
font-size: 14px;
25+
font-size: @font4;
2326
}
2427
font-weight: @regular;
2528
line-height: 32.25px;

0 commit comments

Comments
 (0)