Updated introduction

siemieniec · Nov 17, 2017 · d4efef6 · d4efef6
1 parent 07850d2
commit d4efef6
Show file tree

Hide file tree

Showing 18 changed files with 203 additions and 44 deletions.
diff --git a/images/chat-on-slack.svg b/images/chat-on-slack.svg
diff --git a/images/citi-group-logo.png b/images/citi-group-logo.png
diff --git a/images/combination-locks.jpg b/images/combination-locks.jpg
diff --git a/images/congratulations-minions.gif b/images/congratulations-minions.gif
diff --git a/images/discworld-clacks-alphabet.jpg b/images/discworld-clacks-alphabet.jpg
diff --git a/images/function-definition.png b/images/function-definition.png
diff --git a/images/function-definition.svg b/images/function-definition.svg
diff --git a/images/health-unlocked-logo.png b/images/health-unlocked-logo.png
diff --git a/images/klipse-clojure-snippet.gif b/images/klipse-clojure-snippet.gif
diff --git a/images/metail-logo.png b/images/metail-logo.png
diff --git a/images/signal-media-logo.png b/images/signal-media-logo.png
diff --git a/images/uswitch-logo.png b/images/uswitch-logo.png
diff --git a/introducing-clojure/clojure-games.md b/introducing-clojure/clojure-games.md
@@ -1,13 +1,13 @@
 ## Games
 
-Make 2D games with [Play.cljs](https://github.com/oakes/play-cljs), a ClojureScript library. Play.cljs uses the p5.js Javascript library underneath which allows you to make use of the whole browser page.
+* [Flappy Bird game in ClojureScript](https://www.youtube.com/watch?v=KZjFVdU8VLI)
+
 
-## [Play.cljs](https://github.com/oakes/play-cljs) 
+## [Play.cljs](https://github.com/oakes/play-cljs)
 
-[Play.cljs](https://github.com/oakes/play-cljs) is a ClojureScript library for making games. It uses [p5.js](http://p5js.org/) underneath. There are several ways to create a project:
+Make 2D games with [Play.cljs](https://github.com/oakes/play-cljs), a ClojureScript library. Play.cljs uses the p5.js Javascript library underneath which allows you to make use of the whole browser page.
 
 * [Boot](http://boot-clj.com/): `boot -d boot/new new -t play-cljs -n hello-world`
-* [Nightcode](https://sekao.net/nightcode/): Choose "Game Project" from its start menu
 * [Nightcoders.net](http://nightcoders.net/): Choose "Game" when creating a new project
 
 ## Documentation

diff --git a/introducing-clojure/clojure-svg-graphics.md b/introducing-clojure/clojure-svg-graphics.md
@@ -12,7 +12,7 @@ Clojure can be used to generate and manipulate [Scalable Vector Graphics (SVG)](
 
 SVG images are _drawn_ from a collection of points and paths and images do not loose any quality when making them larger or smaller.  Using SVG images for the web and responsive design is highly recommended.
 
-### An SVG image (using reagent)
+## An SVG image (using reagent)
 
 This example of an SVG images is made from:
 

diff --git a/introducing-clojure/klipse-web-based-repl.md b/introducing-clojure/klipse-web-based-repl.md
@@ -2,8 +2,7 @@
 
 This workshop uses a project called [Klipse](https://www.klipse.tech) that allows us to include the a REPL in each page of the workshop.
 
-> #### Todo::Include animated gif of Klipse in action
-
+![Klipse in action with Clojure](/images/klipse-clojure-snippet.gif)
 
 The Clojure code is entered in the top input box of Klipse and the result is instantly shown in the box underneath.
 
@@ -14,4 +13,3 @@ The Clojure code is entered in the top input box of Klipse and the result is ins
 ```eval-clojure
 (+ 1 2 3)
 ```
-
diff --git a/introduction.md b/introduction.md
@@ -1,6 +1,6 @@
 ![ClojureBridge - London Clojurians](/images/clojurebridge-london-clojurians-banner-abby-remix.png)
 
-Welcome to ClojureBride London, a community driven event that provides a safe space for learning, supporting people under represented in the software industry.
+Welcome to ClojureBridge London, a community driven event that provides a safe space for learning, supporting people under represented in the software industry.
 
 Following this workshop will give you your first taste of Functional Programming with the Clojure programming language.  We hope you continue your experiences with other [London Clojurians](http://londonclojurians.org) community events.
 

diff --git a/prepare-for-the-workshop.md b/prepare-for-the-workshop.md
@@ -1,27 +1,36 @@
 # Prepare For The Workshop
 
-If you wish to keep your own code examples from this workshop, you should create a clojure project.
-
 > #### Danger::Workshop does not save your code
 > This workshop has a built-in Clojure REPL that lets you write and evaluate code directly in the web pages.  Any code written in a page is not kept once you leave a page, or if you refresh the page.
+>
+> If you wish to keep your own code examples from this workshop, you should create a clojure project.
 
-<hr />
+## Development setup guide
 
-> #### Note::Create a project & open the core.clj file
-> Use the Clojure build tool called Leiningen to create a new project
-```bash
-lein new playground
-```
-> In your Clojure editor, open the file: `src/playground/core.clj`
+By setting up a [Clojure development environment](https://github.com/ClojureBridgeLondon/curriculum/blob/gh-pages/outline/setup.md) you can save your Clojure code in files or projects for review after the workshop.  You can also create your own projects and take your Clojure practice further.
 
-<hr />
+You will need
 
-> #### Hint::Links to Editor setup guides
-> By setting up a Clojure editor, you can save your Clojure code in files or projects for review after the workshop.
->
-> There are several editors you can choose from:
->
-> * [LightTable](https://github.com/ClojureBridgeLondon/curriculum/blob/gh-pages/outline/setup.md) - great for those new to Clojure (default choice)
-> * [Spacemacs](https://practicalli.github.io/spacemacs/install-spacemacs/) or [Emacs & Cider](https://cider.readthedocs.io/en/latest/installation/) - for developers that love Emacs & Vim
-> * [Atom & Protorepl](https://atom.io/packages/proto-repl#installation) - typically used by web & Javascript developers
-> * [IntelliJ & Cursive](https://cursive-ide.com/userguide/) - typically used by Java developers
+* **Java standard edition (SE)** - Clojure runs on top of Java.  The Java Runtime Enviromment (JRE) is needed to run Clojure .
+* **Leiningen** - a tool for running Clojure programs, also creating & managing Clojure projects
+* **Git** - versioning your Clojure code (so you can go back to earlier versions if you make a mistake)
+* **A Clojure aware Editor** - one of several editor choices that support the Clojure programming language
+
+> #### Hint::
+> If you just wish to save your code, you can use any editor you prefer or paste it into [Github gists](https://gist.github.com/)
+
+
+### Clojure aware editors
+
+There are several editors that support Clojure development:
+
+> #### Hint::
+> If you are new to development of any kind, then we suggest [LightTable](https://github.com/ClojureBridgeLondon/curriculum/blob/gh-pages/outline/setup.md)
+
+
+* [LightTable](https://github.com/ClojureBridgeLondon/curriculum/blob/gh-pages/outline/setup.md) - great for those new to Clojure (default choice)
+* [Atom & Protorepl](https://atom.io/packages/proto-repl#installation) - typically used by web & Javascript developers
+* [Emacs](https://cider.readthedocs.io/) - for developers that love Emacs
+* [Spacemacs](http://spacemacs.org/) - for developers that love Emacs & Vim ([Spacemacs & Clojure book](https://practicalli.github.io/spacemacs/install-spacemacs/) - work in progress)
+* [IntelliJ & Cursive](https://cursive-ide.com/userguide/) - typically used by Java developers
+* [Microsoft Code](https://code.visualstudio.com/) with [clojureVScode](https://marketplace.visualstudio.com/items?itemName=avli.clojure) or [Clojure Code](https://marketplace.visualstudio.com/items?itemName=jamesnorton.continuum) plugins
diff --git a/test-your-development-environment.md b/test-your-development-environment.md
@@ -1,4 +1,18 @@
-# Test your development environment
+# Setup & Test your development environment
+
+We recommend [setting up LightTable on your computer](https://github.com/ClojureBridgeLondon/curriculum/blob/gh-pages/outline/setup.md)
+
+------------------------------------------
+
+> #### Note::Run the WelcomeToClojureBridge project
+> Once your Clojure environment is setup, open the `welcometoclojurebridge` project, as in the [setup guide](https://github.com/ClojureBridgeLondon/curriculum/blob/gh-pages/outline/setup.md)
+```bash
+git clone https://github.com/ClojureBridge/welcometoclojurebridge
+cd welcometoclojurebridge
+lein repl
+```
+
+------------------------------------------
 
 > #### Note::Create a project & open the code
 > Use the Clojure build tool called Leiningen to create a new project
@@ -7,19 +21,7 @@ lein new playground
 ```
 > In your Clojure editor, open the file: `src/playground/core.clj`
 
+------------------------------------------
 
-## Run the REPL
-
-> ####Hint::What is the REPL?
-> The REPL is a tool that runs your code and returns results.  More details later, in the section: [what is a repl?](introducing-clojure/what-is-a-repl.html)
-
-To run your code we use a tool called the REPL (Read, Evaluate, Print, Loop).  Check you can run your code using the repl with one of these methods
-
-* On the command line with [lein repl]
-* LightTable
-* Atom / Protorepl
-* Spacemacs
-* IntelliJ / Cursive
-* Microsoft Code
-
-> ####TODO:: Links to starting REPL instructions for each option
+> #### Hint::You are ready for Saturday
+> Once the above tasks are complete, you are ready for Saturday