Skip to content

Commit ce856cc

Browse files
committed
Update talks
1 parent 018c93a commit ce856cc

File tree

8 files changed

+653
-560
lines changed

8 files changed

+653
-560
lines changed

docs/bundle.js

Lines changed: 614 additions & 547 deletions
Large diffs are not rendered by default.

docs/service-worker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ try {
2828
logError('Failed to import:', e)
2929
}
3030

31-
const VERSION = '0.6.3'
31+
const VERSION = '0.6.4'
3232
const PREFETCH_CACHE = `ng-hh-prefetch-cache-v${VERSION}`
3333
const RUNTIME_CACHE = `ng-hh-runtime-cache-v${VERSION}`
3434

docs/vendors/font-awesome/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"spec": ">=4.7.0 <5.0.0",
1111
"type": "range"
1212
},
13-
"C:\\Users\\mark.tiedemann\\Desktop\\angular.hamburg"
13+
"C:\\dev\\react.angular.hamburg"
1414
]
1515
],
1616
"_from": "font-awesome@>=4.7.0 <5.0.0",
@@ -44,7 +44,7 @@
4444
"_shasum": "8fa8cf0411a1a31afd07b06d2902bb9fc815a133",
4545
"_shrinkwrap": null,
4646
"_spec": "font-awesome@^4.7.0",
47-
"_where": "C:\\Users\\mark.tiedemann\\Desktop\\angular.hamburg",
47+
"_where": "C:\\dev\\react.angular.hamburg",
4848
"author": {
4949
"name": "Dave Gandy",
5050
"email": "[email protected]",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular.hamburg",
3-
"version": "0.6.3",
3+
"version": "0.6.4",
44
"description": "The angular.hamburg website for Hamburg's Angular Meetup, jokingly made with React.",
55
"main": "index.js",
66
"scripts": {

src/components/Talks/index.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
11

22
import React from 'react'
3+
import ReactMarkdown from 'react-markdown'
34
import Section from '../Section'
45
import Button from '../Button'
6+
import Link from '../Link'
57
import styles from './styles.css'
68
import { nextTalks } from '../config'
79

810
export default function Talks() {
911
const renderReservedSlot = (talk, key) => {
10-
const { title, speaker, banner, description } = talk
12+
const { title, speaker, speakerLink, banner, description } = talk
1113
return (
1214
<li className={styles.talk} key={key}>
1315
<h3 className={styles.title}>{title}</h3>
14-
<p>by {speaker}</p>
15-
<img className={styles.banner} src={banner} alt={title} />
16-
<p className={styles.description}>{description}</p>
16+
<Link className={styles.link} target="_blank" href={speakerLink} title={`${speaker} on Twitter`}>
17+
by {speaker}
18+
</Link>
19+
{banner && <img className={styles.banner} src={banner} alt={title} />}
20+
<ReactMarkdown className={styles.description} source={description} />
1721
</li>
1822
)
1923
}

src/components/Talks/styles.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,21 @@
6060
margin: 15px;
6161
}
6262

63+
.link {
64+
font-size: 16px;
65+
}
66+
6367
.description {
6468
margin-top: 10px;
6569
margin-bottom: 10px;
6670
font-size: 16px;
6771
line-height: 26px;
6872
}
6973

74+
.description code {
75+
font-family: 'Roboto', sans-serif;
76+
}
77+
7078
.description h5,
7179
.description h6 {
7280
margin: 0;

src/components/config.js

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,34 @@
11

22
export const nextMeetup = {
3-
date: 'February 08, 2017',
4-
link: 'https://www.meetup.com/Hamburg-AngularJS-Meetup/events/234414329/'
3+
date: 'March 08, 2017',
4+
link: 'https://www.meetup.com/de-DE/Hamburg-AngularJS-Meetup/events/234414332/'
55
}
66

77
export const nextTalks = [
88
{
9-
reserved: false
9+
reserved: true,
10+
title: 'Making your Angular apps fast',
11+
speaker: 'Pascal Precht',
12+
speakerLink: 'https://twitter.com/PascalPrecht',
13+
description: `
14+
In this talk we'll take a look at an unoptimized Angular application
15+
and analyse and discuss what can be done to make it faster. We will
16+
then apply different performance techniques to reach about 60 fps and
17+
explore their pros and cons.
18+
19+
Pascal is a Software Engineer and Trainer at thoughtram, a Google
20+
Developer Expert for the Angular team and the creator of the popular
21+
angular-translate module. He has also written more than 60 articles
22+
on the thoughtram blog as a technical author.
23+
`
1024
},
1125
{
1226
reserved: false
1327
}
1428
]
1529

1630
export const aboutUs = `
17-
The angular.hamburg meetup is a meetup around the
31+
The angular.hamburg meetup is a meetup around the
1832
Angular framework which takes place in Hamburg.
1933
We're open to anyone interested in the topic.
2034
Whether you're a beginner dying to poke questions at

src/service-worker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ try {
2828
logError('Failed to import:', e)
2929
}
3030

31-
const VERSION = '0.6.3'
31+
const VERSION = '0.6.4'
3232
const PREFETCH_CACHE = `ng-hh-prefetch-cache-v${VERSION}`
3333
const RUNTIME_CACHE = `ng-hh-runtime-cache-v${VERSION}`
3434

0 commit comments

Comments
 (0)