Commits: 13

Merge branch 'multiple-pages' into 'master'

Split the content into multiple pages

Closes #1

See merge request software-garden/software-garden.gitlab.io!3

Fix slashes in inlines by upgrading mdgriffith/elm-markup to 2.0.5

index 07ece92..b321d9d 100644
--- a/elm.json
+++ b/elm.json
@@ -22,7 +22,7 @@
=            "feathericons/elm-feather": "1.2.0",
=            "ianmackenzie/elm-geometry": "1.2.1",
=            "ianmackenzie/elm-geometry-svg": "1.0.2",
-            "mdgriffith/elm-markup": "2.0.2",
+            "mdgriffith/elm-markup": "2.0.5",
=            "mdgriffith/elm-ui": "1.1.0",
=            "turboMaCk/any-dict": "1.0.1"
=        },
@@ -40,4 +40,4 @@
=        "direct": {},
=        "indirect": {}
=    }
-}
\ No newline at end of file
+}

Fix "Elm" capitalization in day-1

index 78ccd3e..9767b34 100644
--- a/content/day-1.txt
+++ b/content/day-1.txt
@@ -11,7 +11,7 @@
=    | List
=        -> Scalable Vector Graphics
=        -> Cartesian Coordinates Systems
-        -> Layouts with ELM UI
+        -> Layouts with Elm UI
=
=
=| Header

Change directory name to "software-garden"

index 9767b34..228262e 100644
--- a/content/day-1.txt
+++ b/content/day-1.txt
@@ -20,16 +20,17 @@
=As mentioned before, programs are represented as text (called the /source code/). The source code is stored in files {Icon|name=file} and files are organized in directories {Icon|name=folder}.
=
=
-So the first step is to create a directory for our new program. Lets call it fpart.
+So the first step is to create a directory for our new program. Let's call it "software-garden".
+
=In the terminal type:
=
=| Monospace
-    mkdir fpart/
+    mkdir software-garden/
=
=and then:
=
=| Monospace
-    cd fpart/
+    cd software-garden/
=
=The first command will create our new directory and the second will make it the current directory. Again, don't worry about the details.
=

Elaborate on pressing Enter in terminal

index 228262e..b64da0d 100644
--- a/content/day-1.txt
+++ b/content/day-1.txt
@@ -27,14 +27,17 @@ In the terminal type:
=| Monospace
=    mkdir software-garden/
=
-and then:
+press enter key. Then type:
=
=| Monospace
=    cd software-garden/
=
-The first command will create our new directory and the second will make it the current directory. Again, don't worry about the details.
+| Note
+    Press enter again. Generally when we ask you to type something in a terminal, we imply that you press enter afterwards. That's how you signal that you are done typing and expect computer to process your command. Alternatively we call it entering a command.
+
+    In this case the first command will create our new directory and the second will make it the current directory. Again, don't worry about the details.
=
-We can easily create a new program by typing:
+We can easily create a new program by entering a following command:
=
=| Monospace
=    elm init

Explain that we need to change directory after opening a terminal

index b64da0d..9a5ba1a 100644
--- a/content/day-1.txt
+++ b/content/day-1.txt
@@ -35,7 +35,7 @@ press enter key. Then type:
=| Note
=    Press enter again. Generally when we ask you to type something in a terminal, we imply that you press enter afterwards. That's how you signal that you are done typing and expect computer to process your command. Alternatively we call it entering a command.
=
-    In this case the first command will create our new directory and the second will make it the current directory. Again, don't worry about the details.
+    In this case the first command will create our new directory and the second will make it the current directory, so that subsequent commands will be executed in it's context. Again, don't worry about the details, but if you close your terminal and then open it again, you will need to enter `cd software-garden/` to set this context again.
=
=We can easily create a new program by entering a following command:
=

Mention that you can use other editor than Atom

index 9a5ba1a..9c72fa3 100644
--- a/content/day-1.txt
+++ b/content/day-1.txt
@@ -47,7 +47,7 @@ Then to create the file which will contain our source code, type:
=| Monospace
=    atom src/Main.elm
=
-This command should open a new Atom window with an empty text file.
+This command should open a new Atom window with an empty text file. If you prefer to use different editor, feel free to do so.
=
=| Header
=    Main.elm

Fix link label in day-1

index 9c72fa3..713c2a3 100644
--- a/content/day-1.txt
+++ b/content/day-1.txt
@@ -77,7 +77,7 @@ This command will start the Elm reactor, which will allow you to run your progra
=Open following address in the web browser:
=
=| Emphasize
-    {Link|http://localhost:8000/src/Main.elm|url=http://localhost:8000/src/Main.elm}
+    {Link|http:////localhost:8000//src//Main.elm|url=http://localhost:8000/src/Main.elm}
=
=| Note
=    *TODO*: Make the link display // characters

Merge branch 'master' into day-2

Fix typo

index 3dd306a..b9410fd 100644
--- a/content/day-2.txt
+++ b/content/day-2.txt
@@ -426,4 +426,4 @@ In the browser it should look exactly as we planned:
=        scatter = False
=
=| Emphasize
-    Congtrarulations! You are ready for {Link|Day 3|url=/day-3.html}!
+    Congratulations! You are ready for {Link|Day 3|url=/day-3.html}!

Add links to Day 2 from index and Day 1

index 78ccd3e..9f2145e 100644
--- a/content/day-1.txt
+++ b/content/day-1.txt
@@ -548,3 +548,9 @@ Only one dot! We see the second one, but what happened to the first dot? It's un
=As an exercise, try adding an {Code|Svg.Attribute.cy} attribute to the circles to adjust their vertical position.
=
=For a more advanced exercise, try adding a new circle. Why not draw 5 circles on the screen? Give them each a unique color and position.
+
+| Emphasize
+    {Icon|name=award}
+
+| Emphasize
+    We really hope you enjoyed this first day of our workshop.  See you at {Link|Day 2|url=/day-2.html}!

index 58f6798..39d8332 100644
--- a/content/index.txt
+++ b/content/index.txt
@@ -10,4 +10,5 @@
=| List
=    # {Link|Before the course begins|url=/preparation.html}
=    # {Link|Day 1 - Let's Make a Dot|url=/day-1.html}
+    # {Link|Day 2 - Let's Place the Dots in a Circle|url=/day-2.html}
=    # {Link|The rest - Work in progress|url=/rest.html}

Remove Debug.log calls from Circle

index b38e6aa..35baf6c 100644
--- a/src/Examples/Circle.elm
+++ b/src/Examples/Circle.elm
@@ -66,7 +66,6 @@ ui config =
=            0
=                :: angles
=                |> pairs
-                |> Debug.log "pairs"
=                |> List.indexedMap arc
=                |> Svg.g []
=
@@ -123,7 +122,6 @@ ui config =
=
=        radi =
=            angles
-                |> Debug.log "angles"
=                |> List.map radius
=                |> Svg.g []
=

Express the Day 2 motto in "Let's ..." style

index b9410fd..c28bbed 100644
--- a/content/day-2.txt
+++ b/content/day-2.txt
@@ -2,7 +2,7 @@
=    Day 2
=
=| Emphasize
-    Place the dots in a circle
+    Let's Place the Dots in a Circle
=
=
=| Note