Flatten directory structure and stop using helpers

README.md

@@ -20,15 +20,15 @@ git clone https://github.com/rtfeldman/elm-workshop.git
 cd elm-workshop
 ```
 
-## Install dependencies
+## Install supporting tools
 
 Run this at the terminal:
 
 ```bash
-npm install
+npm install -g elm-live@2.0.4 elm-test@0.16.1-alpha3 elm-css@0.4.0
 ```
 
-This will probably take several minutes.
+This could take several minutes.
 
 ## Start with Stage 1
 

stages/1/Main.elm

@@ -1,4 +1,4 @@
-module ElmHub (..) where
+module Main (..) where
 
 import Html exposing (..)
 import Html.Attributes exposing (..)

stages/1/README.md

@@ -1,8 +1,17 @@
 Stage 1
 =======
 
-To engage Auto-Rebuilding:
+## Installation
 
 ```bash
-npm run watch
+$ elm package install
+```
+
+(Answer `y` at the prompt. In rare cases a known issue can cause the download
+to fail; in that case, just run `elm package install` again.)
+
+## Building
+
+```bash
+$ elm live Main.elm --open -- --output=elm.js
 ```

stages/1/elm-package.json

@@ -4,7 +4,7 @@
     "repository": "https://github.com/rtfeldman/elm-workshop.git",
     "license": "BSD-3-Clause",
     "source-directories": [
-        "src"
+        "."
     ],
     "exposed-modules": [],
     "dependencies": {

stages/1/index.html

@@ -16,7 +16,7 @@
 </body>
 
 <script type="text/javascript">
-  var app = Elm.fullscreen(Elm.ElmHub, {});
+  var app = Elm.fullscreen(Elm.Main, {});
 
   // Uncomment this line and comment out the above to enable elm-reactor support.
   // var app = Elm.fullscreenDebug("ElmHub", "ElmHub.elm");

stages/2/Main.elm

@@ -1,4 +1,4 @@
-module ElmHub (..) where
+module Main (..) where
 
 import Html exposing (..)
 import Html.Attributes exposing (..)

stages/2/README.md

@@ -1,8 +1,17 @@
 Stage 2
 =======
 
-To engage Auto-Rebuilding:
+## Installation
 
 ```bash
-npm run watch
+$ elm package install
+```
+
+(Answer `y` at the prompt. In rare cases a known issue can cause the download
+to fail; in that case, just run `elm package install` again.)
+
+## Building
+
+```bash
+$ elm live Main.elm --open -- --output=elm.js
 ```

stages/2/elm-package.json

@@ -4,7 +4,7 @@
     "repository": "https://github.com/rtfeldman/elm-workshop.git",
     "license": "BSD-3-Clause",
     "source-directories": [
-        "src"
+        "."
     ],
     "exposed-modules": [],
     "dependencies": {

stages/2/index.html

@@ -16,7 +16,7 @@
 </body>
 
 <script type="text/javascript">
-  var app = Elm.fullscreen(Elm.ElmHub, {});
+  var app = Elm.fullscreen(Elm.Main, {});
 
   // Uncomment this line and comment out the above to enable elm-reactor support.
   // var app = Elm.fullscreenDebug("ElmHub", "ElmHub.elm");

stages/3/Main.elm

@@ -1,4 +1,4 @@
-module ElmHub (..) where
+module Main (..) where
 
 import Html exposing (..)
 import Html.Attributes exposing (..)

stages/3/README.md

@@ -1,8 +1,17 @@
 Stage 3
 =======
 
-To engage Auto-Rebuilding:
+## Installation
 
 ```bash
-npm run watch
+$ elm package install
+```
+
+(Answer `y` at the prompt. In rare cases a known issue can cause the download
+to fail; in that case, just run `elm package install` again.)
+
+## Building
+
+```bash
+$ elm live Main.elm --open -- --output=elm.js
 ```

stages/3/elm-package.json

@@ -4,7 +4,7 @@
     "repository": "https://github.com/rtfeldman/elm-workshop.git",
     "license": "BSD-3-Clause",
     "source-directories": [
-        "src"
+        "."
     ],
     "exposed-modules": [],
     "dependencies": {

stages/3/index.html

@@ -16,7 +16,7 @@
 </body>
 
 <script type="text/javascript">
-  var app = Elm.fullscreen(Elm.ElmHub, {});
+  var app = Elm.fullscreen(Elm.Main, {});
 
   // Uncomment this line and comment out the above to enable elm-reactor support.
   // var app = Elm.fullscreenDebug("ElmHub", "ElmHub.elm");

stages/4/Main.elm

@@ -1,4 +1,4 @@
-module ElmHub (..) where
+module Main (..) where
 
 import Html exposing (..)
 import Html.Attributes exposing (..)

stages/4/README.md

@@ -1,8 +1,17 @@
 Stage 4
 =======
 
-To engage Auto-Rebuilding:
+## Installation
 
 ```bash
-npm run watch
+$ elm package install
+```
+
+(Answer `y` at the prompt. In rare cases a known issue can cause the download
+to fail; in that case, just run `elm package install` again.)
+
+## Building
+
+```bash
+$ elm live Main.elm --open -- --output=elm.js
 ```

stages/4/elm-package.json

@@ -4,7 +4,7 @@
     "repository": "https://github.com/rtfeldman/elm-workshop.git",
     "license": "BSD-3-Clause",
     "source-directories": [
-        "src"
+        "."
     ],
     "exposed-modules": [],
     "dependencies": {

stages/4/index.html

@@ -16,7 +16,7 @@
 </body>
 
 <script type="text/javascript">
-  var app = Elm.fullscreen(Elm.ElmHub, {});
+  var app = Elm.fullscreen(Elm.Main, {});
 
   // Uncomment this line and comment out the above to enable elm-reactor support.
   // var app = Elm.fullscreenDebug("ElmHub", "ElmHub.elm");

stages/5/README.md

@@ -1,14 +1,24 @@
 Stage 5
 =======
 
-To run tests:
+## Installation
 
 ```bash
-npm test
+$ elm package install
 ```
 
-To engage Auto-Rebuilding:
+(Answer `y` at the prompt. In rare cases a known issue can cause the download
+to fail; in that case, just run `elm package install` again.)
+
+## Building
 
 ```bash
-npm run watch
+$ elm live Main.elm --open -- --output=elm.js
+```
+
+## Running Tests
+
+```bash
+$ cd test
+$ elm test TestRunner.elm
 ```

stages/5/elm-package.json

@@ -4,7 +4,7 @@
     "repository": "https://github.com/rtfeldman/elm-workshop.git",
     "license": "BSD-3-Clause",
     "source-directories": [
-        "src"
+        "."
     ],
     "exposed-modules": [],
     "dependencies": {

stages/5/test/elm-package.json

@@ -5,7 +5,7 @@
     "license": "BSD-3-Clause",
     "source-directories": [
         ".",
-        "../src"
+        ".."
     ],
     "exposed-modules": [],
     "dependencies": {

stages/6/README.md

@@ -1,14 +1,24 @@
 Stage 5
 =======
 
-To run tests:
+## Installation
 
 ```bash
-npm test
+$ elm package install
 ```
 
-To engage Auto-Rebuilding:
+(Answer `y` at the prompt. In rare cases a known issue can cause the download
+to fail; in that case, just run `elm package install` again.)
+
+## Building
 
 ```bash
-npm run watch
+$ elm live Main.elm --open -- --output=elm.js
+```
+
+## Running Tests
+
+```bash
+$ cd test
+$ elm test TestRunner.elm
 ```

stages/6/elm-package.json

@@ -4,7 +4,7 @@
     "repository": "https://github.com/rtfeldman/elm-workshop.git",
     "license": "BSD-3-Clause",
     "source-directories": [
-        "src"
+        "."
     ],
     "exposed-modules": [],
     "dependencies": {

stages/6/test/elm-package.json

@@ -5,7 +5,7 @@
     "license": "BSD-3-Clause",
     "source-directories": [
         ".",
-        "../src"
+        ".."
     ],
     "exposed-modules": [],
     "dependencies": {

stages/7/README.md

@@ -1,14 +1,24 @@
 Stage 5
 =======
 
-To run tests:
+## Installation
 
 ```bash
-npm test
+$ elm package install
 ```
 
-To engage Auto-Rebuilding:
+(Answer `y` at the prompt. In rare cases a known issue can cause the download
+to fail; in that case, just run `elm package install` again.)
+
+## Building
 
 ```bash
-npm run watch
+$ elm live Main.elm --open -- --output=elm.js
+```
+
+## Running Tests
+
+```bash
+$ cd test
+$ elm test TestRunner.elm
 ```

stages/7/elm-package.json

@@ -4,7 +4,7 @@
     "repository": "https://github.com/rtfeldman/elm-workshop.git",
     "license": "BSD-3-Clause",
     "source-directories": [
-        "src"
+        "."
     ],
     "exposed-modules": [],
     "dependencies": {

stages/7/test/elm-package.json

@@ -5,7 +5,7 @@
     "license": "BSD-3-Clause",
     "source-directories": [
         ".",
-        "../src"
+        ".."
     ],
     "exposed-modules": [],
     "dependencies": {

stages/8/README.md

@@ -1,14 +1,24 @@
 Stage 5
 =======
 
-To run tests:
+## Installation
 
 ```bash
-npm test
+$ elm package install
 ```
 
-To engage Auto-Rebuilding:
+(Answer `y` at the prompt. In rare cases a known issue can cause the download
+to fail; in that case, just run `elm package install` again.)
+
+## Building
 
 ```bash
-npm run watch
+$ elm live Main.elm --open -- --output=elm.js
+```
+
+## Running Tests
+
+```bash
+$ cd test
+$ elm test TestRunner.elm
 ```

stages/8/elm-package.json

@@ -4,7 +4,7 @@
     "repository": "https://github.com/rtfeldman/elm-workshop.git",
     "license": "BSD-3-Clause",
     "source-directories": [
-        "src"
+        "."
     ],
     "exposed-modules": [],
     "dependencies": {

stages/8/test/elm-package.json

@@ -5,7 +5,7 @@
     "license": "BSD-3-Clause",
     "source-directories": [
         ".",
-        "../src"
+        ".."
     ],
     "exposed-modules": [],
     "dependencies": {

stages/9/ElmHub.elm

@@ -0,0 +1,8 @@
+module ElmHub (..) where
+
+import Css exposing (..)
+
+
+css =
+  stylesheet
+    [ (.) "foo" [] ]

stages/9/README.md

@@ -1,20 +1,23 @@
 Stage 5
 =======
 
-To run tests:
+## Installation
 
 ```bash
-npm test
+$ elm package install
 ```
 
-To compile CSS:
+(Answer `y` at the prompt. In rare cases a known issue can cause the download
+to fail; in that case, just run `elm package install` again.)
+
+## Building
 
 ```bash
-npm run css
+$ elm live Main.elm --open -- --output=elm.js
 ```
 
-To engage Auto-Rebuilding:
+## Compiling CSS
 
 ```bash
-npm run watch
+$ elm test css/Stylesheets.elm
 ```

stages/9/elm-package.json

@@ -4,8 +4,7 @@
     "repository": "https://github.com/rtfeldman/elm-workshop.git",
     "license": "BSD-3-Clause",
     "source-directories": [
-        "src",
+        "."
-        "css"
     ],
     "exposed-modules": [],
     "dependencies": {

stages/9/src/ElmHub.elm

@@ -1,8 +0,0 @@
-module ElmHub (..) where
-
-import Css exposing (..)
-
-
-css =
-  stylesheet
-    [ (.) "foo" [] ]

stages/9/test/elm-package.json

@@ -5,7 +5,7 @@
     "license": "BSD-3-Clause",
     "source-directories": [
         ".",
-        "../src"
+        ".."
     ],
     "exposed-modules": [],
     "dependencies": {