lessons are now buttons

joeshub · Mar 12, 2017 · f5dab7d · f5dab7d
1 parent 268c564
commit f5dab7d
Show file tree

Hide file tree

Showing 54 changed files with 112 additions and 103 deletions.
diff --git a/01-react-css3/lessons/App.js → 01-react-css3/button/App.js b/01-react-css3/lessons/App.js → 01-react-css3/button/App.js
diff --git a/01-react-css3/lessons/Button/Button.js → 01-react-css3/button/Button/Button.js b/01-react-css3/lessons/Button/Button.js → 01-react-css3/button/Button/Button.js
diff --git a/01-react-css3/lessons/Button/button.css → 01-react-css3/button/Button/button.css b/01-react-css3/lessons/Button/button.css → 01-react-css3/button/Button/button.css
diff --git a/03-radium/lessons/entry.js → 01-react-css3/button/entry.js b/03-radium/lessons/entry.js → 01-react-css3/button/entry.js
diff --git a/01-react-css3/lessons/package.json → 01-react-css3/button/package.json b/01-react-css3/lessons/package.json → 01-react-css3/button/package.json
@@ -6,7 +6,7 @@
   "license": "ISC",
   "main": "build/app.js",
   "scripts": {
-    "start": "../../node_modules/.bin/cross-env NODE_ENV=development node ../../scripts/server-lessons.js",
+    "start": "../../node_modules/.bin/cross-env NODE_ENV=development node ../../scripts/server-button.js",
     "build": "../../node_modules/.bin/cross-env NODE_ENV=production ../../node_modules/.bin/webpack --config webpack.build.js --progress --colors"
   },
   "devDependencies": {

diff --git a/01-react-css3/lessons/webpack.build.js → 01-react-css3/button/webpack.build.js b/01-react-css3/lessons/webpack.build.js → 01-react-css3/button/webpack.build.js
@@ -4,15 +4,15 @@ var ExtractTextPlugin = require('extract-text-webpack-plugin')
 var HtmlWebpackPlugin = require('html-webpack-plugin')
 
 module.exports = {
-  entry: ['babel-polyfill','./entry.js'],
+  entry: [ 'babel-polyfill','./entry.js' ],
   output: {
     path: path.join(__dirname + '/build'),
     filename: 'app.js',
     publicPath: ''
   },
   plugins: [
-    new HtmlWebpackPlugin({ inject: true, template: '../../templates/app.ejs' }),
-    new ExtractTextPlugin({ filename: 'lessons.css', disable: false, allChunks: true }),
+    new HtmlWebpackPlugin({ inject: true, template: '../../templates/plain.ejs' }),
+    new ExtractTextPlugin({ filename: 'button.css', disable: false, allChunks: true }),
     new webpack.optimize.OccurrenceOrderPlugin(),
     new webpack.DefinePlugin({
       'process.env': {

diff --git a/03-radium/lessons/webpack.config.js → 01-react-css3/button/webpack.config.js b/03-radium/lessons/webpack.config.js → 01-react-css3/button/webpack.config.js
@@ -4,6 +4,8 @@ var HtmlWebpackPlugin = require('html-webpack-plugin')
 var settings = require('../../scripts/settings.js')
 var devServer = settings.devServer
 
+console.log(path.join(__dirname))
+
 module.exports = {
   devServer: devServer,
   devtool: 'source-map',
@@ -16,10 +18,10 @@ module.exports = {
   output: {
     path: path.join(__dirname),
     filename: 'bundle.js',
-    publicPath: 'http://' + devServer.host  + ':' + devServer.port + '/',
+    publicPath: '/'
   },
   plugins: [
-    new HtmlWebpackPlugin({ inject: true, template: '../../templates/app.ejs' }),
+    new HtmlWebpackPlugin({ inject: true, template: '../../templates/server.ejs' }),
     new webpack.HotModuleReplacementPlugin(),
     new webpack.NoEmitOnErrorsPlugin()
   ],

diff --git a/02-react-inline-styles/lessons/App.js → 02-react-inline-styles/button/App.js b/02-react-inline-styles/lessons/App.js → 02-react-inline-styles/button/App.js
diff --git a/...ct-inline-styles/lessons/Button/Button.js → ...act-inline-styles/button/button/Button.js b/...ct-inline-styles/lessons/Button/Button.js → ...act-inline-styles/button/button/Button.js
diff --git a/04-aphrodite/lessons/entry.js → 02-react-inline-styles/button/entry.js b/04-aphrodite/lessons/entry.js → 02-react-inline-styles/button/entry.js
diff --git a/02-react-inline-styles/lessons/package.json → 02-react-inline-styles/button/package.json b/02-react-inline-styles/lessons/package.json → 02-react-inline-styles/button/package.json
@@ -6,7 +6,7 @@
   "license": "ISC",
   "main": "build/app.js",
   "scripts": {
-    "start": "../../node_modules/.bin/cross-env NODE_ENV=development node ../../scripts/server-lessons.js",
+    "start": "../../node_modules/.bin/cross-env NODE_ENV=development node ../../scripts/server-button.js",
     "build": "../../node_modules/.bin/cross-env NODE_ENV=production ../../node_modules/.bin/webpack --config webpack.build.js --progress --colors"
   },
   "devDependencies": {

diff --git a/...ct-inline-styles/lessons/webpack.build.js → ...act-inline-styles/button/webpack.build.js b/...ct-inline-styles/lessons/webpack.build.js → ...act-inline-styles/button/webpack.build.js
@@ -11,8 +11,8 @@ module.exports = {
     publicPath: ''
   },
   plugins: [
-    new HtmlWebpackPlugin({ inject: true, template: '../../templates/app.ejs' }),
-    new ExtractTextPlugin({ filename: 'lessons.css', disable: false, allChunks: true }),
+    new HtmlWebpackPlugin({ inject: true, template: '../../templates/plain.ejs' }),
+    new ExtractTextPlugin({ filename: 'button.css', disable: false, allChunks: true }),
     new webpack.optimize.OccurrenceOrderPlugin(),
     new webpack.DefinePlugin({
       'process.env': {

diff --git a/...t-inline-styles/lessons/webpack.config.js → ...ct-inline-styles/button/webpack.config.js b/...t-inline-styles/lessons/webpack.config.js → ...ct-inline-styles/button/webpack.config.js
@@ -16,10 +16,10 @@ module.exports = {
   output: {
     path: path.join(__dirname),
     filename: 'bundle.js',
-    publicPath: 'http://' + devServer.host  + ':' + devServer.port + '/',
+    publicPath: '/'
   },
   plugins: [
-    new HtmlWebpackPlugin({ inject: true, template: '../../templates/app.ejs' }),
+    new HtmlWebpackPlugin({ inject: true, template: '../../templates/server.ejs' }),
     new webpack.HotModuleReplacementPlugin(),
     new webpack.NoEmitOnErrorsPlugin()
   ],

diff --git a/03-radium/lessons/App.js → 03-radium/button/App.js b/03-radium/lessons/App.js → 03-radium/button/App.js
@@ -1,7 +1,6 @@
 import React, { Component } from 'react'
 import pkg from './package.json'
 import { Button } from './Button/Button'
-import '../../public/css/lessons.css'
 
 export default class App extends Component {
   render () {

diff --git a/03-radium/lessons/Button/Button.js → 03-radium/button/Button/Button.js b/03-radium/lessons/Button/Button.js → 03-radium/button/Button/Button.js
diff --git a/06-styletron/lessons/entry.js → 03-radium/button/entry.js b/06-styletron/lessons/entry.js → 03-radium/button/entry.js
diff --git a/03-radium/lessons/package.json → 03-radium/button/package.json b/03-radium/lessons/package.json → 03-radium/button/package.json
@@ -6,7 +6,7 @@
   "license": "ISC",
   "main": "build/app.js",
   "scripts": {
-    "start": "../../node_modules/.bin/cross-env NODE_ENV=development node ../../scripts/server-lessons.js",
+    "start": "../../node_modules/.bin/cross-env NODE_ENV=development node ../../scripts/server-button.js",
     "build": "../../node_modules/.bin/cross-env NODE_ENV=production ../../node_modules/.bin/webpack --config webpack.build.js --progress --colors"
   },
   "devDependencies": {

diff --git a/03-radium/lessons/webpack.build.js → 03-radium/button/webpack.build.js b/03-radium/lessons/webpack.build.js → 03-radium/button/webpack.build.js
@@ -11,8 +11,8 @@ module.exports = {
     publicPath: ''
   },
   plugins: [
-    new HtmlWebpackPlugin({ inject: true, template: '../../templates/app.ejs' }),
-    new ExtractTextPlugin({ filename: 'lessons.css', disable: false, allChunks: true }),
+    new HtmlWebpackPlugin({ inject: true, template: '../../templates/plain.ejs' }),
+    new ExtractTextPlugin({ filename: 'button.css', disable: false, allChunks: true }),
     new webpack.optimize.OccurrenceOrderPlugin(),
     new webpack.DefinePlugin({
       'process.env': {

diff --git a/04-aphrodite/lessons/webpack.config.js → 03-radium/button/webpack.config.js b/04-aphrodite/lessons/webpack.config.js → 03-radium/button/webpack.config.js
@@ -16,10 +16,10 @@ module.exports = {
   output: {
     path: path.join(__dirname),
     filename: 'bundle.js',
-    publicPath: 'http://' + devServer.host  + ':' + devServer.port + '/',
+    publicPath: '/'
   },
   plugins: [
-    new HtmlWebpackPlugin({ inject: true, template: '../../templates/app.ejs' }),
+    new HtmlWebpackPlugin({ inject: true, template: '../../templates/server.ejs' }),
     new webpack.HotModuleReplacementPlugin(),
     new webpack.NoEmitOnErrorsPlugin()
   ],

diff --git a/04-aphrodite/lessons/App.js → 04-aphrodite/button/App.js b/04-aphrodite/lessons/App.js → 04-aphrodite/button/App.js
@@ -1,7 +1,6 @@
 import React, { Component } from 'react'
 import pkg from './package.json'
 import { Button } from './Button/Button'
-import '../../public/css/lessons.css'
 
 export default class App extends Component {
   render () {

diff --git a/04-aphrodite/lessons/Button/Button.js → 04-aphrodite/button/Button/Button.js b/04-aphrodite/lessons/Button/Button.js → 04-aphrodite/button/Button/Button.js
diff --git a/01-react-css3/lessons/entry.js → 04-aphrodite/button/entry.js b/01-react-css3/lessons/entry.js → 04-aphrodite/button/entry.js
@@ -2,7 +2,6 @@ import React from 'react'
 import { render } from 'react-dom'
 import { AppContainer } from 'react-hot-loader'
 import App from './App'
-import '../../public/css/lessons.css'
 
 render (
   <AppContainer>

diff --git a/04-aphrodite/lessons/package.json → 04-aphrodite/button/package.json b/04-aphrodite/lessons/package.json → 04-aphrodite/button/package.json
@@ -6,7 +6,7 @@
   "license": "ISC",
   "main": "build/app.js",
   "scripts": {
-    "start": "../../node_modules/.bin/cross-env NODE_ENV=development node ../../scripts/server-lessons.js",
+    "start": "../../node_modules/.bin/cross-env NODE_ENV=development node ../../scripts/server-button.js",
     "build": "../../node_modules/.bin/cross-env NODE_ENV=production ../../node_modules/.bin/webpack --config webpack.build.js --progress --colors"
   },
   "devDependencies": {

diff --git a/06-styletron/lessons/webpack.build.js → 04-aphrodite/button/webpack.build.js b/06-styletron/lessons/webpack.build.js → 04-aphrodite/button/webpack.build.js
@@ -11,8 +11,8 @@ module.exports = {
     publicPath: ''
   },
   plugins: [
-    new HtmlWebpackPlugin({ inject: true, template: '../../templates/app.ejs' }),
-    new ExtractTextPlugin({ filename: 'lessons.css', disable: false, allChunks: true }),
+    new HtmlWebpackPlugin({ inject: true, template: '../../templates/plain.ejs' }),
+    new ExtractTextPlugin({ filename: 'button.css', disable: false, allChunks: true }),
     new webpack.optimize.OccurrenceOrderPlugin(),
     new webpack.DefinePlugin({
       'process.env': {

diff --git a/01-react-css3/lessons/webpack.config.js → 04-aphrodite/button/webpack.config.js b/01-react-css3/lessons/webpack.config.js → 04-aphrodite/button/webpack.config.js
@@ -16,10 +16,10 @@ module.exports = {
   output: {
     path: path.join(__dirname),
     filename: 'bundle.js',
-    publicPath: 'http://' + devServer.host  + ':' + devServer.port + '/',
+    publicPath: '/'
   },
   plugins: [
-    new HtmlWebpackPlugin({ inject: true, template: '../../templates/app.ejs' }),
+    new HtmlWebpackPlugin({ inject: true, template: '../../templates/server.ejs' }),
     new webpack.HotModuleReplacementPlugin(),
     new webpack.NoEmitOnErrorsPlugin()
   ],

diff --git a/05-react-css-modules/lessons/App.js → 05-react-css-modules/button/App.js b/05-react-css-modules/lessons/App.js → 05-react-css-modules/button/App.js
diff --git a/...eact-css-modules/lessons/Button/Button.js → 05-react-css-modules/button/Button/Button.js b/...eact-css-modules/lessons/Button/Button.js → 05-react-css-modules/button/Button/Button.js
diff --git a/...act-css-modules/lessons/Button/button.css → ...eact-css-modules/button/Button/button.css b/...act-css-modules/lessons/Button/button.css → ...eact-css-modules/button/Button/button.css
diff --git a/02-react-inline-styles/lessons/entry.js → 05-react-css-modules/button/entry.js b/02-react-inline-styles/lessons/entry.js → 05-react-css-modules/button/entry.js
@@ -2,7 +2,6 @@ import React from 'react'
 import { render } from 'react-dom'
 import { AppContainer } from 'react-hot-loader'
 import App from './App'
-import '../../public/css/lessons.css'
 
 render (
   <AppContainer>

diff --git a/05-react-css-modules/lessons/package.json → 05-react-css-modules/button/package.json b/05-react-css-modules/lessons/package.json → 05-react-css-modules/button/package.json
@@ -6,7 +6,7 @@
   "license": "ISC",
   "main": "build/app.js",
   "scripts": {
-    "start": "../../node_modules/.bin/cross-env NODE_ENV=development node ../../scripts/server-lessons.js",
+    "start": "../../node_modules/.bin/cross-env NODE_ENV=development node ../../scripts/server-button.js",
     "build": "../../node_modules/.bin/cross-env NODE_ENV=production ../../node_modules/.bin/webpack --config webpack.build.js --progress --colors"
   },
   "devDependencies": {

diff --git a/...eact-css-modules/lessons/webpack.build.js → 05-react-css-modules/button/webpack.build.js b/...eact-css-modules/lessons/webpack.build.js → 05-react-css-modules/button/webpack.build.js
@@ -11,8 +11,8 @@ module.exports = {
     publicPath: ''
   },
   plugins: [
-    new HtmlWebpackPlugin({ inject: true, template: '../../templates/app.ejs' }),
-    new ExtractTextPlugin({ filename: 'lessons.css', disable: false, allChunks: true }),
+    new HtmlWebpackPlugin({ inject: true, template: '../../templates/plain.ejs' }),
+    new ExtractTextPlugin({ filename: 'button.css', disable: false, allChunks: true }),
     new webpack.optimize.OccurrenceOrderPlugin(),
     new webpack.DefinePlugin({
       'process.env': {

diff --git a/...act-css-modules/lessons/webpack.config.js → ...eact-css-modules/button/webpack.config.js b/...act-css-modules/lessons/webpack.config.js → ...eact-css-modules/button/webpack.config.js
@@ -16,10 +16,10 @@ module.exports = {
   output: {
     path: path.join(__dirname),
     filename: 'bundle.js',
-    publicPath: 'http://' + devServer.host  + ':' + devServer.port + '/',
+    publicPath: '/'
   },
   plugins: [
-    new HtmlWebpackPlugin({ inject: true, template: '../../templates/app.ejs' }),
+    new HtmlWebpackPlugin({ inject: true, template: '../../templates/server.ejs' }),
     new webpack.HotModuleReplacementPlugin(),
     new webpack.NoEmitOnErrorsPlugin()
   ],

diff --git a/06-styletron/lessons/App.js → 06-styletron/button/App.js b/06-styletron/lessons/App.js → 06-styletron/button/App.js
@@ -3,7 +3,6 @@ import Styletron from 'styletron-client'
 import { StyletronProvider } from 'styletron-react'
 import pkg from './package.json'
 import { Button } from './Button/Button'
-import '../../public/css/lessons.css'
 
 const styleSheet = document.createElement('style')
 document.head.appendChild(styleSheet)

diff --git a/06-styletron/lessons/Button/Button.js → 06-styletron/button/Button/Button.js b/06-styletron/lessons/Button/Button.js → 06-styletron/button/Button/Button.js
diff --git a/05-react-css-modules/lessons/entry.js → 06-styletron/button/entry.js b/05-react-css-modules/lessons/entry.js → 06-styletron/button/entry.js
@@ -2,7 +2,6 @@ import React from 'react'
 import { render } from 'react-dom'
 import { AppContainer } from 'react-hot-loader'
 import App from './App'
-import '../../public/css/lessons.css'
 
 render (
   <AppContainer>

diff --git a/06-styletron/lessons/package.json → 06-styletron/button/package.json b/06-styletron/lessons/package.json → 06-styletron/button/package.json
@@ -6,7 +6,7 @@
   "license": "ISC",
   "main": "build/app.js",
   "scripts": {
-    "start": "../../node_modules/.bin/cross-env NODE_ENV=development node ../../scripts/server-lessons.js",
+    "start": "../../node_modules/.bin/cross-env NODE_ENV=development node ../../scripts/server-button.js",
     "build": "../../node_modules/.bin/cross-env NODE_ENV=production ../../node_modules/.bin/webpack --config webpack.build.js --progress --colors"
   },
   "devDependencies": {

diff --git a/04-aphrodite/lessons/webpack.build.js → 06-styletron/button/webpack.build.js b/04-aphrodite/lessons/webpack.build.js → 06-styletron/button/webpack.build.js
@@ -11,8 +11,8 @@ module.exports = {
     publicPath: ''
   },
   plugins: [
-    new HtmlWebpackPlugin({ inject: true, template: '../../templates/app.ejs' }),
-    new ExtractTextPlugin({ filename: 'lessons.css', disable: false, allChunks: true }),
+    new HtmlWebpackPlugin({ inject: true, template: '../../templates/plain.ejs' }),
+    new ExtractTextPlugin({ filename: 'button.css', disable: false, allChunks: true }),
     new webpack.optimize.OccurrenceOrderPlugin(),
     new webpack.DefinePlugin({
       'process.env': {

diff --git a/06-styletron/button/webpack.config.js b/06-styletron/button/webpack.config.js
@@ -0,0 +1,43 @@
+var path = require('path')
+var webpack = require('webpack')
+var HtmlWebpackPlugin = require('html-webpack-plugin')
+var settings = require('../../scripts/settings.js')
+var devServer = settings.devServer
+
+module.exports = {
+  devServer: devServer,
+  devtool: 'source-map',
+  entry: [
+    'react-hot-loader/patch',
+    'webpack-hot-middleware/client?reload=1',
+    'babel-polyfill',
+    './entry'
+  ],
+  output: {
+    path: path.join(__dirname),
+    filename: 'bundle.js',
+    publicPath: '/'
+  },
+  plugins: [
+    new HtmlWebpackPlugin({ inject: true, template: '../../templates/server.ejs' }),
+    new webpack.HotModuleReplacementPlugin(),
+    new webpack.NoEmitOnErrorsPlugin()
+  ],
+  module: {
+    rules: [
+      {
+        test: /\.js$/,
+        exclude: /node_modules/,
+        use: 'babel-loader'
+      },
+      {
+        test: /\.css$/,
+        use: [ 'style-loader','css-loader' ]
+      },
+      {
+        test: /\.json$/,
+        use: 'json-loader'
+      }
+    ]
+  }
+}
diff --git a/06-styletron/lessons/webpack.config.js b/06-styletron/lessons/webpack.config.js
diff --git a/07-styled-components/lessons/App.js → 07-styled-components/button/App.js b/07-styled-components/lessons/App.js → 07-styled-components/button/App.js
diff --git a/...tyled-components/lessons/Button/Button.js → 07-styled-components/button/Button/Button.js b/...tyled-components/lessons/Button/Button.js → 07-styled-components/button/Button/Button.js
diff --git a/07-styled-components/lessons/entry.js → 07-styled-components/button/entry.js b/07-styled-components/lessons/entry.js → 07-styled-components/button/entry.js
@@ -2,7 +2,6 @@ import React from 'react'
 import { render } from 'react-dom'
 import { AppContainer } from 'react-hot-loader'
 import App from './App'
-import '../../public/css/lessons.css'
 
 render (
   <AppContainer>

diff --git a/07-styled-components/lessons/package.json → 07-styled-components/button/package.json b/07-styled-components/lessons/package.json → 07-styled-components/button/package.json
@@ -6,7 +6,7 @@
   "license": "ISC",
   "main": "build/app.js",
   "scripts": {
-    "start": "../../node_modules/.bin/cross-env NODE_ENV=development node ../../scripts/server-lessons.js",
+    "start": "../../node_modules/.bin/cross-env NODE_ENV=development node ../../scripts/server-button.js",
     "build": "../../node_modules/.bin/cross-env NODE_ENV=production ../../node_modules/.bin/webpack --config webpack.build.js --progress --colors"
   },
   "devDependencies": {

diff --git a/...tyled-components/lessons/webpack.build.js → 07-styled-components/button/webpack.build.js b/...tyled-components/lessons/webpack.build.js → 07-styled-components/button/webpack.build.js
@@ -10,7 +10,7 @@ module.exports = {
     publicPath: ''
   },
   plugins: [
-    new HtmlWebpackPlugin({ inject: true, template: '../../templates/app.ejs' }),
+    new HtmlWebpackPlugin({ inject: true, template: '../../templates/plain.ejs' }),
     new webpack.optimize.OccurrenceOrderPlugin(),
     new webpack.DefinePlugin({
       'process.env': {

diff --git a/...yled-components/lessons/webpack.config.js → ...tyled-components/button/webpack.config.js b/...yled-components/lessons/webpack.config.js → ...tyled-components/button/webpack.config.js
@@ -16,10 +16,10 @@ module.exports = {
   output: {
     path: path.join(__dirname),
     filename: 'bundle.js',
-    publicPath: 'http://' + devServer.host  + ':' + devServer.port + '/',
+    publicPath: '/'
   },
   plugins: [
-    new HtmlWebpackPlugin({ inject: true, template: '../../templates/app.ejs' }),
+    new HtmlWebpackPlugin({ inject: true, template: '../../templates/server.ejs' }),
     new webpack.HotModuleReplacementPlugin(),
     new webpack.NoEmitOnErrorsPlugin()
   ],

diff --git a/package.json b/package.json
@@ -6,8 +6,8 @@
   "license": "ISC",
   "scripts": {
     "clean": "find 0* -type d -name build | xargs rm -rf",
-    "start": "node scripts/make-index.js && ./node_modules/.bin/cross-env NODE_ENV=development node scripts/server-all.js",
-    "build": "node scripts/make-index.js && ./node_modules/.bin/cross-env NODE_ENV=production node scripts/server-all.js"
+    "start": "node scripts/make-index.js && ./node_modules/.bin/cross-env NODE_ENV=development node scripts/server.js",
+    "build": "node scripts/make-index.js && ./node_modules/.bin/cross-env NODE_ENV=production node scripts/server.js"
   },
   "devDependencies": {
     "aphrodite": "^1.1.0",

diff --git a/public/css/lessons.css → public/css/server.css b/public/css/lessons.css → public/css/server.css