Skip to content
This repository has been archived by the owner on Oct 2, 2020. It is now read-only.

Commit

Permalink
Move ESLint show (#13) to the 17th, add ForwardJS show (#32), add React
Browse files Browse the repository at this point in the history
Conf to the schedule (#33).
  • Loading branch information
Kent C. Dodds committed Jan 5, 2016
1 parent 77a7b13 commit 3e2476b
Show file tree
Hide file tree
Showing 17 changed files with 154 additions and 35 deletions.
Binary file removed episodes/2016-01-13/.index.js.swp
Binary file not shown.
4 changes: 4 additions & 0 deletions episodes/2016-02-03/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ export default {
name: 'Todd Gardner',
twitter: 'toddhgardner',
},
{
name: 'Yunong Xiao',
twitter: 'yunongx',
},
],
description: `
JavaScript has a pretty interesting debugging story.
Expand Down
Binary file added episodes/2016-02-03/yunongx.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added episodes/2016-02-10/forwardJS.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
86 changes: 64 additions & 22 deletions episodes/2016-02-10/index.js
Original file line number Diff line number Diff line change
@@ -1,59 +1,101 @@
/* eslint max-len:0 */

export default {
title: `ESLint`,
title: `Forward 4 Web Technology Summit`,
time: '12:00 PM **PST**',
guests: [
{
name: 'Gyandeep Singh',
twitter: 'gyandeeps',
},
{
name: 'Ilya Volodin',
twitter: 'i_volodin',
},
{
name: 'Feross Aboukhadijeh',
twitter: 'feross',
},
{
name: 'Jamund Ferguson',
twitter: 'xjamundx',
name: 'ForwardJS',
twitter: 'forwardJS',
squareImage: true,
},
],
description: `
Let's talk about what [ESLint](http://eslint.org/) is, how it works,
and how it can be super useful for your project.
We'll be joined by ESLint committers and the author
of [the Standard library](http://npm.im/standard).
Join us for this show live at [ForwardJS](http://forwardjs.com) where we'll talk with speakers and workshop instructors about the awesome stuff going on the conference.
`,
hangoutId: 'cms6et0sffpkf92nucv1nf70c74',
youTubeId: 'sEXow0FPE3Q',
hangoutId: 'cs8p8a6fgmlrl490siif59emci0',
youTubeId: '7wb0gwjk1aY',
podbeanId: '',
host: {},
host: {
links: [
],
tips: [
],
picks: [
],
},
panelists: [
{
twitter: 'dan_abramov',
links: [
],
tips: [
],
picks: [
],
},
{
twitter: 'drboolean',
links: [
],
tips: [
],
picks: [
],
},
{
twitter: 'getify',
links: [
],
tips: [
],
picks: [
],
},
{
twitter: 'kwuchu',
links: [
],
tips: [
],
picks: [
],
},
{
twitter: 'linclark',
links: [
],
tips: [
],
picks: [
],
},
{
twitter: 'mzabriskie',
links: [
],
tips: [
],
picks: [
],
},
{
twitter: 'pamasaur',
links: [
],
tips: [
],
picks: [
],
},
{
twitter: 'tylermcginnis33',
links: [
],
tips: [
],
picks: [
],
},
],
}
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
61 changes: 61 additions & 0 deletions episodes/2016-02-17/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
/* eslint max-len:0 */

export default {
title: `ESLint`,
guests: [
{
name: 'Gyandeep Singh',
twitter: 'gyandeeps',
},
{
name: 'Ilya Volodin',
twitter: 'i_volodin',
},
{
name: 'Feross Aboukhadijeh',
twitter: 'feross',
},
{
name: 'Jamund Ferguson',
twitter: 'xjamundx',
},
],
description: `
Let's talk about what [ESLint](http://eslint.org/) is, how it works,
and how it can be super useful for your project.
We'll be joined by ESLint committers and the author
of [the Standard library](http://npm.im/standard).
`,
hangoutId: 'cms6et0sffpkf92nucv1nf70c74',
youTubeId: 'sEXow0FPE3Q',
podbeanId: '',
host: {},
panelists: [
{
twitter: 'dan_abramov',
},
{
twitter: 'drboolean',
},
{
twitter: 'getify',
},
{
twitter: 'kwuchu',
},
{
twitter: 'linclark',
},
{
twitter: 'mzabriskie',
},
{
twitter: 'pamasaur',
},
{
twitter: 'tylermcginnis33',
},
],
}


File renamed without changes
5 changes: 4 additions & 1 deletion other/plop/episode/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,11 @@ export default ({addFile}) => {
]
}

function episodeActions() {
function episodeActions(data) {
const actions = []
Object.keys(data).forEach((d, k) => {
data[k] = d.replace(/'/g, `'`)
})

actions.push(addFile({
path: 'episodes/{{date}}/index.js',
Expand Down
4 changes: 2 additions & 2 deletions other/schedule.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
| 2016-01-20 | [Introducing the Panel](/../../issues/4) |
| 2016-01-27 | [Chackra, Microsoft's Open Source JS Engine](/../../issues/12) |
| 2016-02-03 | [JavaScript Debugging](/../../issues/17) |
| 2016-02-10 | [ESLint](/../../issues/13) or possibly [Forward Web Summit](/../../issues/32) |
| 2016-02-17 | Maybe [ESLint](/../../issues/13) |
| 2016-02-10 | [Forward Web Summit](/../../issues/32) |
| 2016-02-17 | [ESLint](/../../issues/13) |
| 2016-02-24 | [](/../../issues/) |
| 2016-03-02 | [](/../../issues/) |
| 2016-03-09 | [](/../../issues/) |
Expand Down
9 changes: 7 additions & 2 deletions shared/get-episode-data.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ function getEpisodeData(episodePath) {
title: 'TBA',
description,
descriptionHTML: markdownToHTML(description),
timeHTML: markdownToHTML(time, true),
hangoutUrl: `https://plus.google.com/events/${episode.hangoutId}`,
number,
numberDisplay,
Expand All @@ -87,8 +88,12 @@ function getEpisodeData(episodePath) {
}
}

function markdownToHTML(string) {
return {__html: markdown.toHTML(deindent(string))}
function markdownToHTML(string, stripP) {
let html = markdown.toHTML(deindent(string))
if (stripP) {
html = html.slice(3, -4)
}
return {__html: html}
}


Expand Down
8 changes: 6 additions & 2 deletions src/components/person.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@ import React from 'react'

export default Person

function Person({twitter, link, name, imgSrc}) {
function Person({twitter, link, name, imgSrc, squareImage}) {
return (
<div className="person">
<a href={link}>
<img src={imgSrc} alt={`${name} Profile Picture`} />
<img
src={imgSrc}
alt={`${name} Profile Picture`}
className={squareImage ? 'square' : ''}
/>
<p>
{name}<br />
{twitter ? `@${twitter}` : ''}
Expand Down
4 changes: 2 additions & 2 deletions src/pages/episode/sections/header/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default Header
function Header({episode}) {
const {
title,
time,
timeHTML,
dateDisplay,
date,
guests = [],
Expand All @@ -29,7 +29,7 @@ function Header({episode}) {
<br />
<small>
{past ? '' : <RSVPIcon hangoutUrl={hangoutUrl} />}
{' ' + dateDisplay} at {time}
{' ' + dateDisplay} at <span dangerouslySetInnerHTML={timeHTML} />
</small>
</h2>
<PersonGroup people={sortedGuests} />
Expand Down
6 changes: 3 additions & 3 deletions src/pages/home/sections/episodes/episode.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function Episode({episodeData}) {
const {
date,
title,
time,
timeHTML,
dateDisplay,
guests = [],
descriptionHTML,
Expand All @@ -25,12 +25,12 @@ function Episode({episodeData}) {
<br />
<small>
<RSVPIcon hangoutUrl={hangoutUrl} />
{' ' + dateDisplay} at {time}
{' ' + dateDisplay} at <span dangerouslySetInnerHTML={timeHTML} />
</small>
</h3>
<PersonGroup people={sortedGuests} />
<div className="description">
<p dangerouslySetInnerHTML={descriptionHTML}></p>
<p dangerouslySetInnerHTML={descriptionHTML} />
</div>
</div>
)
Expand Down
2 changes: 1 addition & 1 deletion styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ h3 small {
text-align: center;
}

.person img {
.person img:not(.square) {
border-radius: 50%;
}

Expand Down

0 comments on commit 3e2476b

Please sign in to comment.