Skip to content

Commit 763f508

Browse files
committed
Added deliveroo and made table header more clear
1 parent aff4f6e commit 763f508

4 files changed

Lines changed: 23 additions & 19 deletions

File tree

src/components/HomePage.jsx

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import question from 'Images/icons/lightbulb.svg';
1515
import aisoc from 'Images/sponsors/aisoc.png'
1616
import techsoc from 'Images/sponsors/techsoc.png'
1717
import simplepoll from 'Images/sponsors/simplepoll.png'
18+
import deliveroo from 'Images/sponsors/deliveroo.png'
1819

1920
// Components
2021
import {
@@ -43,6 +44,11 @@ let partners = [
4344
name: `Simple Poll`,
4445
link: `https://simplepoll.rocks/`,
4546
},
47+
{
48+
image: deliveroo,
49+
name: `Deliveroo`,
50+
link: `https://deliveroo.co.uk/`,
51+
},
4652
]
4753
let categories = [
4854
{
@@ -91,7 +97,7 @@ export default class HomePage extends React.Component {
9197
this.DEBUGGING = true;
9298

9399
this.state = {
94-
showMore: false,
100+
showMore: true,
95101
ideaIndex: randIndex(ideas),
96102
animations: {
97103
"landingpage": false,
@@ -262,7 +268,7 @@ export default class HomePage extends React.Component {
262268
</tr>
263269
))
264270
}
265-
{ !showMore && (
271+
/**{ !showMore && (
266272
<tr>
267273
<td colSpan={3}>
268274
<ButtonView text={'Show more'} type="alternate"
@@ -271,7 +277,7 @@ export default class HomePage extends React.Component {
271277
}} />
272278
</td>
273279
</tr>
274-
)}
280+
)}**/
275281
</tbody>
276282
</table>
277283

@@ -336,13 +342,11 @@ export default class HomePage extends React.Component {
336342
<Column width='2-3' style={{ "display": "inline-block", "float": "left" }}>
337343
<MapFragment locations={locations}/>
338344
</Column>
339-
<Column width='1-3' style={{ "display": "inline-block", "float": "left" }}>
345+
<Column width='1-3' horizontalAlignment="center" style={{ paddingTop : "20px"}}>
340346
<Row height="500px" noPadding styling="transparent">
341-
<Column width='1-1' horizontalAlignment='center' verticalAlignment='center'>
342-
<CardView width={"1-1"} height="fit-content" style={ { padding: `20px 0` }}>
343-
<TextView text="Location:" heading={1} align={'center'} />
344-
<TextView text="South Cloisters" heading={1} align={'center'} />
345-
</CardView>
347+
<Column width='1-1' horizontalAlignment='center'>
348+
<TextView text="Location" color="#49B287" heading={1} align={'center'} style={{ textShadow: `0 0 15px #ccc` }} />
349+
<TextView text="South Cloisters" color="#49B287" heading={1} align={'center'} style={{ textShadow: `0 0 15px #ccc` }} />
346350
</Column>
347351
</Row>
348352
</Column>
@@ -362,16 +366,16 @@ export default class HomePage extends React.Component {
362366

363367
<table className="hackathon-table" style={{width : `100%`}}>
364368
<tbody>
365-
{dayoneschedule.map( ({time, activity, location}) => (
369+
{dayoneschedule.map( ({time, activity, location}, index) => (
366370
<tr>
367371
<td style={{width : `25%`}}>
368-
<p>{time}</p>
372+
{index!=0 ? (<p>{time}</p>) : (<h2 style={{marginBottom: 0}}>{time}</h2>)}
369373
</td>
370374
<td style={{width : `50%`}}>
371-
<p>{activity}</p>
375+
{index!=0 ? (<p>{activity}</p>) : (<h2 style={{marginBottom: 0}}>{activity}</h2>)}
372376
</td>
373377
<td style={{width : `25%`}}>
374-
<p>{location}</p>
378+
{index!=0 ? (<p>{location}</p>) : (<h2 style={{marginBottom: 0}}>{location}</h2>)}
375379
</td>
376380
</tr>
377381
))}
@@ -382,16 +386,16 @@ export default class HomePage extends React.Component {
382386

383387
<table className="hackathon-table" style={{width : `100%`}}>
384388
<tbody>
385-
{daytwoschedule.map( ({time, activity, location}) => (
389+
{daytwoschedule.map( ({time, activity, location}, index) => (
386390
<tr>
387391
<td style={{width : `25%`}}>
388-
<p>{time}</p>
392+
{index!=0 ? (<p>{time}</p>) : (<h2 style={{marginBottom: 0}}>{time}</h2>)}
389393
</td>
390394
<td style={{width : `50%`}}>
391-
<p>{activity}</p>
395+
{index!=0 ? (<p>{activity}</p>) : (<h2 style={{marginBottom: 0}}>{activity}</h2>)}
392396
</td>
393397
<td style={{width : `25%`}}>
394-
<p>{location}</p>
398+
{index!=0 ? (<p>{location}</p>) : (<h2 style={{marginBottom: 0}}>{location}</h2>)}
395399
</td>
396400
</tr>
397401
))}

src/components/layout/data/Examples.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export const builtApps = [
22
{
33
title: 'Roomie McRoomFace',
4-
description: 'A room booking system for the UCL Engineering Hub. If you\'re an undergraduate student part of the engineering faculty, you can log in and start booking rooms. Fun fact: this was actually built before the API existed!',
4+
description: 'A room booking system for the UCL Engineering Hub.',
55
status: 'LIVE',
66
links: [
77
{

src/components/layout/views/MapFragment.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class MapFragment extends React.Component {
2525
style={mapStyle}
2626
zoom={18}
2727
// Center around the hackathon location
28-
initialCenter={ {lng: -0.1344412, lat: 51.5249917} }
28+
initialCenter={ { lng: -0.1332506, lat: 51.5244771} }
2929
centerAroundCurrentLocation={false}
3030
>
3131
<Polygon

0 commit comments

Comments
 (0)