diff --git a/README.md b/README.md index a4955ec2a..5cb3c0567 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,17 @@ -# Webbpack Express Example App +# Webpack Express Example App The goal of this repo is be an example of a basic but functional app built on Express and Webpack. -If you want to follow along, start from master and look at the numbered branches of this project. Each one is a step along the path to creating a fully functional webpack setup. In each branch, there will be a documentation file that lists out the steps taken in that branch (each step is also a git commit if you look at the history) which you can use as a checklist when setting up your own projects. +If you want to follow along with the course, you will start from the master and switch to the appropriate numbered branches of this repo as needed. The branches are: +- [0-initial-setup](https://github.com/udacity/fend-webpack-content/tree/0-initial-setup) +- [1-install-webpack](https://github.com/udacity/fend-webpack-content/tree/1-install-webpack) +- [2-add-webpack-entry](https://github.com/udacity/fend-webpack-content/tree/2-add-webpack-entry) +- [3-webpack-output-and-loaders](https://github.com/udacity/fend-webpack-content/tree/3-webpack-output-and-loaders) +- [4-webpack-plugins](https://github.com/udacity/fend-webpack-content/tree/4-webpack-plugins) +- [5-webpack-mode](https://github.com/udacity/fend-webpack-content/tree/5-webpack-mode) +- [6-webpack-for-convenience](https://github.com/udacity/fend-webpack-content/tree/6-webpack-for-convenience) + +Each one is a step along the path to creating a fully functional webpack setup. In each branch, there will be a documentation file that lists out the steps taken in that branch (each step should also match to a git commit if you look at the history) which you can use as a checklist when setting up your own projects. ## Get Up and Running @@ -15,4 +24,4 @@ git clone -- git@github.com:[your-user-name]/webpack-express.git -- `cd` into your new folder and run: - ```npm install``` - ```npm start``` to start the app -- this app runs on localhost:3000, but you can of course edit that in server.js +- this app runs on localhost:8080, but you can of course edit that in index.js diff --git a/src/client/views/index.html b/src/client/views/index.html index b8a262cc1..4cc2c7f5d 100644 --- a/src/client/views/index.html +++ b/src/client/views/index.html @@ -29,7 +29,7 @@ -
+
Form Results: diff --git a/src/server/index.js b/src/server/index.js index 45e61a686..3f70f1d7c 100644 --- a/src/server/index.js +++ b/src/server/index.js @@ -14,7 +14,7 @@ app.get('/', function (req, res) { // designates what port the app will listen to for incoming requests app.listen(8080, function () { - console.log('Example app listening on port 3000!') + console.log('Example app listening on port 8080!') }) app.get('/test', function (req, res) {