Skip to content

Commit aff4f6e

Browse files
committed
Added schedule to hackathon
1 parent 17edcf3 commit aff4f6e

3 files changed

Lines changed: 135 additions & 10 deletions

File tree

src/components/HomePage.jsx

Lines changed: 54 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import {
2424

2525
// Data
2626
import { builtApps, ideas } from 'Layout/data/Examples.jsx'
27+
import { dayoneschedule, daytwoschedule } from 'Layout/data/Schedule.jsx'
2728

2829
// Constants
2930
let partners = [
@@ -147,6 +148,8 @@ export default class HomePage extends React.Component {
147148
{ lng: -0.1330347, lat: 51.5244087},
148149
{ lng: -0.1333324, lat: 51.5246765}, ]
149150

151+
console.log(dayoneschedule)
152+
150153
return (
151154
<React.Fragment>
152155

@@ -156,7 +159,7 @@ export default class HomePage extends React.Component {
156159
onEnter={(props) => { this.toggleAnimation("landingpage", true) }}
157160
/>
158161

159-
<Row height='800px' styling='splash-parallax' noPadding>
162+
<Row height='800px' styling='splash-parallax' style={{ maxHeight : `100%` }} noPadding>
160163
<Explosion particles={30} speed={800} maxsize={30}
161164
isOn={true} isOn={animations["landingpage"] ? true : false}/>
162165
<Column width='2-3' horizontalAlignment='center' verticalAlignment='center'>
@@ -206,8 +209,8 @@ export default class HomePage extends React.Component {
206209
{
207210
categories.map((category, i) =>
208211

209-
<CardView width={"1-" + categories.length} minWidth="300px" key={i} height="380px" style={{ padding: `20px 0`}} snapAlign>
210-
<Row height={`380px`} noPadding >
212+
<CardView width={"1-" + categories.length} minWidth="300px" key={i} height="420px" style={{ padding: `20px 0`}} snapAlign>
213+
<Row height={`420px`} noPadding >
211214
<Column width='2-3' horizontalAlignment='center' verticalAlignment='center'>
212215
<ImageView width={categoryImageSize} height={categoryImageSize} src={category.image} />
213216
<TextView text={category.title} heading={1} align='center' />
@@ -238,21 +241,18 @@ export default class HomePage extends React.Component {
238241

239242
<Row styling="primary" style={ {paddingBottom : `30px` } } noPadding>
240243
<Column width='8-10' horizontalAlignment='center'>
241-
<table className="built-apps-table">
244+
<table className="hackathon-table">
242245
<tbody>
243246
{
244247
(showMore ? builtApps : builtApps.slice(0, 1)).map(({ title, description, status, links }) => (
245248
<tr key={title}>
246249
<td style={ { width : `25%` } }>
247-
<h5>{title}</h5>
250+
<p>{title}</p>
248251
</td>
249252
<td style={ { width : `50%`, textAlign : `left`} }>
250253
<p>{description}</p>
251254
</td>
252255
<td style={ { width : `25%` } }>
253-
{
254-
// status && <div className="chip status">{status}</div>
255-
}
256256
{
257257
links.map(({ text, url }) => (
258258
<p key={url}><a href={url}>{text}</a></p>
@@ -304,7 +304,7 @@ export default class HomePage extends React.Component {
304304

305305
<Column width='1-1' horizontalAlignment='center' verticalAlignment='center'>
306306
<FocusIn pose={animations["2018image"] ? 'open' : 'closed'} style={{ 'transitionTimingFunction': 'cubic-bezier(0.175, 0.885, 0.32, 1.275)' }}>
307-
<TextView text="The 2018 Hackathon Class!" heading={1} align={'center'} />
307+
<TextView text="The 2019 Hackathon Class!" heading={1} align={'center'} />
308308
</FocusIn>
309309
</Column>
310310
</Row>
@@ -355,6 +355,51 @@ export default class HomePage extends React.Component {
355355
</div>
356356
</Row>
357357

358+
<Row styling="primary">
359+
<Column width='8-10' horizontalAlignment='center'>
360+
<TextView text="Schedule" heading={1} align={'center'} />
361+
<TextView text="Day one" heading={2} align={'center'} />
362+
363+
<table className="hackathon-table" style={{width : `100%`}}>
364+
<tbody>
365+
{dayoneschedule.map( ({time, activity, location}) => (
366+
<tr>
367+
<td style={{width : `25%`}}>
368+
<p>{time}</p>
369+
</td>
370+
<td style={{width : `50%`}}>
371+
<p>{activity}</p>
372+
</td>
373+
<td style={{width : `25%`}}>
374+
<p>{location}</p>
375+
</td>
376+
</tr>
377+
))}
378+
</tbody>
379+
</table>
380+
381+
<TextView text="Day two" heading={2} align={'center'} />
382+
383+
<table className="hackathon-table" style={{width : `100%`}}>
384+
<tbody>
385+
{daytwoschedule.map( ({time, activity, location}) => (
386+
<tr>
387+
<td style={{width : `25%`}}>
388+
<p>{time}</p>
389+
</td>
390+
<td style={{width : `50%`}}>
391+
<p>{activity}</p>
392+
</td>
393+
<td style={{width : `25%`}}>
394+
<p>{location}</p>
395+
</td>
396+
</tr>
397+
))}
398+
</tbody>
399+
</table>
400+
</Column>
401+
</Row>
402+
358403
<Row styling='splash-parallax'>
359404
<Column width='1-1' horizontalAlignment="center">
360405
<TextView text="Partners" heading="1" style={ { paddingBottom : `0`} }/>
Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
export const dayoneschedule = [
2+
{
3+
time: "Time",
4+
activity: "Activity",
5+
location: "Location",
6+
},
7+
{
8+
time: "10AM-10:30AM",
9+
activity: "Registration",
10+
location: "Gustave Tuck LT",
11+
},
12+
{
13+
time: "10:30AM-11:00AM",
14+
activity: "Introduction and Team Formation",
15+
location: "Gustave Tuck LT",
16+
},
17+
{
18+
time: "11:15AM-1PM",
19+
activity: "Using APIs by Deliveroo",
20+
location: "Gustave Tuck LT",
21+
},
22+
{
23+
time: "1PM-2PM",
24+
activity: "Lunch",
25+
location: "South Cloisters",
26+
},
27+
{
28+
time: "1:30PM-2:30PM",
29+
activity: "Using UCL API by Huey",
30+
location: "Gustave Tuck LT",
31+
},
32+
{
33+
time: "3:30PM-4:30PM",
34+
activity: "Building a Slack Integration by Wilhelm Klopp",
35+
location: "Gustave Tuck LT",
36+
},
37+
{
38+
time: "6:00PM-7:00PM",
39+
activity: "An Ode to ReactJS by Harry",
40+
location: "Gustave Tuck LT",
41+
},
42+
{
43+
time: "8PM-9PM",
44+
activity: "Dinner (provided)",
45+
location: "South Cloisters",
46+
},
47+
{
48+
time: "10PM Onwards",
49+
activity: "Slideshow karoake and fun 'n' games with the API team",
50+
location: "Gustave Tuck LT",
51+
},
52+
]
53+
54+
export const daytwoschedule = [
55+
{
56+
time: "Time",
57+
activity: "Activity",
58+
location: "Location",
59+
},
60+
{
61+
time: "8AM-10AM",
62+
activity: "Breakfast",
63+
location: "South Cloisters",
64+
},
65+
{
66+
time: "1PM",
67+
activity: "Lunch",
68+
location: "South Cloisters",
69+
},
70+
{
71+
time: "3PM-5pm",
72+
activity: "Hacking ends + Presentations",
73+
location: "Gustave Tuck LT",
74+
},
75+
]
76+
77+
export default {
78+
dayoneschedule,
79+
daytwoschedule,
80+
}

src/styles/uclapi-hackathon.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ pre {
576576

577577
/** Tables **/
578578

579-
.built-apps-table {
579+
.hackathon-table {
580580
border-collapse: collapse;
581581
margin: 30px 0;
582582

0 commit comments

Comments
 (0)