diff options
author | Nick Van Doorn <vandoorn.nick@gmail.com> | 2018-10-07 01:04:53 -0700 |
---|---|---|
committer | Nick Van Doorn <vandoorn.nick@gmail.com> | 2018-10-07 01:04:53 -0700 |
commit | 42c1d6cb7bdf03505bb79344b69be8d0194a8c1c (patch) | |
tree | 3b7a6bac190113bfda9fc38a747676452ce18afe | |
parent | 01b3ce0bb893525c6ecd32314616224e79e1ca44 (diff) |
Move presentation to sub folder
-rw-r--r-- | presentation/README.md (renamed from README.md) | 0 | ||||
-rw-r--r-- | presentation/package.json (renamed from package.json) | 0 | ||||
-rw-r--r-- | presentation/public/favicon.ico (renamed from public/favicon.ico) | bin | 3870 -> 3870 bytes | |||
-rw-r--r-- | presentation/public/index.html (renamed from public/index.html) | 0 | ||||
-rw-r--r-- | presentation/public/manifest.json (renamed from public/manifest.json) | 0 | ||||
-rw-r--r-- | presentation/src/demos/intro.js.example | 38 | ||||
-rw-r--r-- | presentation/src/index.js (renamed from src/index.js) | 0 | ||||
-rw-r--r-- | presentation/src/presentation.js (renamed from src/presentation.js) | 28 | ||||
-rw-r--r-- | presentation/src/registerServiceWorker.js (renamed from src/registerServiceWorker.js) | 0 | ||||
-rw-r--r-- | presentation/yarn.lock (renamed from yarn.lock) | 4 |
10 files changed, 54 insertions, 16 deletions
diff --git a/README.md b/presentation/README.md index b8c0b74..b8c0b74 100644 --- a/README.md +++ b/presentation/README.md diff --git a/package.json b/presentation/package.json index 798e685..798e685 100644 --- a/package.json +++ b/presentation/package.json diff --git a/public/favicon.ico b/presentation/public/favicon.ico Binary files differindex a11777c..a11777c 100644 --- a/public/favicon.ico +++ b/presentation/public/favicon.ico diff --git a/public/index.html b/presentation/public/index.html index d2bc989..d2bc989 100644 --- a/public/index.html +++ b/presentation/public/index.html diff --git a/public/manifest.json b/presentation/public/manifest.json index ef19ec2..ef19ec2 100644 --- a/public/manifest.json +++ b/presentation/public/manifest.json diff --git a/presentation/src/demos/intro.js.example b/presentation/src/demos/intro.js.example new file mode 100644 index 0000000..2374142 --- /dev/null +++ b/presentation/src/demos/intro.js.example @@ -0,0 +1,38 @@ +/** + * TODO Stop randomly mixing JavaScripts 6 (yes seriously, 6) + * different ways to declare a function + */ +const Aircraft = { + /** + * TODO implement the part where we avoid + * a crash (units in the field aren't doing + * well) + */ + dont: function() { + console.log('all safe') + }, + /** + * TODO improve crash detection + * (works about 50% of the time + * right now so it's not urgent) + */ + goingToCrash: () => { + return Math.random() >= 0.5 + }, + fly() { + setInterval(() => { + if (this.goingToCrash()) { + this.dont() + } + }, 1000) + } +} + +const Rocket = Object.assign({}, Aircraft, { + takeOff: function() { + // TODO rocket stuff + this.fly() + } +}) + +Rocket.takeOff() diff --git a/src/index.js b/presentation/src/index.js index 8518735..8518735 100644 --- a/src/index.js +++ b/presentation/src/index.js diff --git a/src/presentation.js b/presentation/src/presentation.js index ee38f6a..2af5a0d 100644 --- a/src/presentation.js +++ b/presentation/src/presentation.js @@ -1,5 +1,5 @@ // Import React -import React from 'react'; +import React from 'react' // Import Spectacle Core tags import { @@ -12,42 +12,42 @@ import { Quote, Slide, Text, -} from 'spectacle'; + CodePane +} from 'spectacle' // Import theme -import createTheme from 'spectacle/lib/themes/default'; +import createTheme from 'spectacle/lib/themes/default' // Require CSS -require('normalize.css'); +require('normalize.css') const theme = createTheme( { primary: 'white', secondary: '#1F2022', tertiary: '#03A9FC', - quartenary: '#CECECE', + quartenary: '#CECECE' }, { primary: 'Montserrat', - secondary: 'Helvetica', + secondary: 'Helvetica' } -); +) export default class Presentation extends React.Component { render() { + console.log(introCode) return ( <Deck transition={['zoom', 'slide']} transitionDuration={500} theme={theme} + progress="none" > - <Slide transition={['zoom']} bgColor="primary"> - <Heading size={1} fit caps lineHeight={1} textColor="secondary"> - Spectacle Boilerplate + <Slide transition={['zoom']} bgColor="tertiary"> + <Heading size={1} fit lineHeight={1} textColor="primary"> + JavaScript: You Can Do Anything </Heading> - <Text margin="10px 0 0" textColor="tertiary" size={1} fit bold> - open the presentation/index.js file to get started - </Text> </Slide> <Slide transition={['fade']} bgColor="tertiary"> <Heading size={6} textColor="primary" caps> @@ -90,6 +90,6 @@ export default class Presentation extends React.Component { </BlockQuote> </Slide> </Deck> - ); + ) } } diff --git a/src/registerServiceWorker.js b/presentation/src/registerServiceWorker.js index 12542ba..12542ba 100644 --- a/src/registerServiceWorker.js +++ b/presentation/src/registerServiceWorker.js diff --git a/yarn.lock b/presentation/yarn.lock index 70e9bd5..53b5a8d 100644 --- a/yarn.lock +++ b/presentation/yarn.lock @@ -5886,7 +5886,7 @@ react-dev-utils@^4.2.1: strip-ansi "3.0.1" text-table "0.2.0" -react-dom@16.5.2: +react-dom@^16.5.2: version "16.5.2" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.5.2.tgz#b69ee47aa20bab5327b2b9d7c1fe2a30f2cfa9d7" dependencies: @@ -5942,7 +5942,7 @@ react-typography@^0.16.5: version "0.16.13" resolved "https://registry.yarnpkg.com/react-typography/-/react-typography-0.16.13.tgz#94bdd2a9448823bc74d8ebf7465d86c7dbe20dcf" -react@16.5.2: +react@^16.5.2: version "16.5.2" resolved "https://registry.yarnpkg.com/react/-/react-16.5.2.tgz#19f6b444ed139baa45609eee6dc3d318b3895d42" dependencies: |