Simplify mod 1 prework instructions

Gemfile.lock

@@ -1,29 +1,29 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.2)
+    activesupport (5.2.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.6)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
-    ffi (1.10.0)
+    ffi (1.13.1)
     forwardable-extended (2.6.0)
-    gemoji (3.0.0)
-    html-pipeline (2.10.0)
+    gemoji (3.0.1)
+    html-pipeline (2.13.0)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.5)
+    jekyll (3.8.7)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -36,32 +36,31 @@ GEM
       pathutil (~> 0.9)
       rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
-    jekyll-feed (0.11.0)
-      jekyll (~> 3.3)
+    jekyll-feed (0.14.0)
+      jekyll (>= 3.7, < 5.0)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
-    jekyll-seo-tag (2.5.0)
-      jekyll (~> 3.3)
-    jekyll-watch (2.1.2)
+    jekyll-seo-tag (2.6.1)
+      jekyll (>= 3.3, < 5.0)
+    jekyll-watch (2.2.1)
       listen (~> 3.0)
-    jemoji (0.10.2)
+    jemoji (0.12.0)
       gemoji (~> 3.0)
       html-pipeline (~> 2.2)
-      jekyll (~> 3.0)
+      jekyll (>= 3.0, < 5.0)
     kramdown (1.17.0)
-    liquid (4.0.1)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
+    liquid (4.0.3)
+    listen (3.2.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
     mini_portile2 (2.4.0)
-    minima (2.5.0)
-      jekyll (~> 3.5)
+    minima (2.5.1)
+      jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.11.3)
-    nokogiri (1.10.1)
+    minitest (5.14.1)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     octopress (3.0.11)
       jekyll (>= 2.0)
@@ -79,22 +78,21 @@ GEM
       jekyll (>= 2.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (3.0.3)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
+    public_suffix (4.0.5)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
       ffi (~> 1.0)
-    redcarpet (3.4.0)
-    rouge (3.3.0)
-    ruby_dep (1.5.0)
-    safe_yaml (1.0.4)
-    sass (3.7.3)
+    redcarpet (3.5.0)
+    rouge (3.20.0)
+    safe_yaml (1.0.5)
+    sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
     thread_safe (0.3.6)
     titlecase (0.1.1)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
 
 PLATFORMS
@@ -111,4 +109,4 @@ DEPENDENCIES
   tzinfo-data
 
 BUNDLED WITH
-   1.17.3
+   2.0.2

_includes/navigation.html

@@ -13,8 +13,7 @@ <h1>Module 0</h1>
         <li><a href="{{ site.baseurl }}{% link setup-instructions.md %}">Computer Setup</a></li>
         <li><a href="{{ site.url }}/sessions">Sessions</a></li>
         <li><a href="{{ site.url }}/homework">Homework</a></li>
-        <li><a href="{{ site.url }}/prework/fe_engineering">Front-End Mod 1 Pre-work</a></li>
-        <li><a href="{{ site.url }}/prework/be_engineering">Back-End Mod 1 Pre-work</a></li>
+        <li><a href="{{ site.url }}/prework">Mod 1 Pre-work</a></li>
       </ul>
     </section>
   </div>

homework/index.md

@@ -16,4 +16,4 @@ This project board allows for a methodology called kanban (I would google the te
 
 When you've finished your homework for a given session, and you're looking for something to do, you can always rely on the mod 1 pre-work as that outlet! Just find the link in the sidebar for your program.
 
-Click [here](https://www.youtube.com/playlist?list=PL1Y67f0xPzdMFq2S1bK7E7veT_BbK-zjt) for some review videos to help with some of the concepts we go over in mod 0.
+Click [here](https://www.youtube.com/playlist?list=PL1Y67f0xPzdMFq2S1bK7E7veT_BbK-zjt) for some review videos to help with some of the concepts we go over in mod 0 and the mod 1 pre-work

index.md

@@ -13,10 +13,10 @@ The goals of mod 0 are to:
 * Begin to break down social walls and build community in your future cohort
 
 In order to pass mod 0 and be mod 1 ready, you will need to:
-* Attend all 5 sessions and complete the required homework
+1. Attend all 5 sessions and complete the required homework
   * homeworks are due by the next session. ie. session 1 hw is due by session 2
-* Pass the mod 0 assessment (Info can be found in session 4)
-* Pass the mod 1 pre-work (See side bar link for your program)
+2. Pass the mod 0 assessment (Info can be found in session 4)
+3. Pass the mod 1 pre-work (See side bar link)
   * All of the due dates above are on the [calendar]({{ site.baseurl }}/calendar)
 
 ## What will we cover in Mod 0?
@@ -30,4 +30,4 @@ The key tools and concepts we go over in mod 0 are:
 
 ## Next steps
 
-When you're ready to get started, click over to [environment setup instructions]({{ site.baseurl }}{% link setup-instructions.md %}) and start installing!
+When you're ready to get started, click over to [computer setup instructions]({{ site.baseurl }}{% link setup-instructions.md %}) and start installing!

prework/index.md

@@ -0,0 +1,81 @@
+---
+layout: page
+title: Module 1 Pre-work
+---
+
+In order to make you as successful as possible during your time here, we have collected readings and exercises for you to complete prior to beginning Mod 1. This pre-work helps provide important context, vocabulary, and baseline of skills to help you hit the ground running on the first day of class. We've found that students who come into the program having invested time in familiarizing themselves with key concepts are able to maximize their time at Turing.
+
+## Mod 1 Pre-work Overview
+
+The Mod 1 Pre-work is divided into three sections: Professional Development, Gear Up, and Technical. It is recommended that you start as soon as possible on your mod 1 pre-work, as it typically takes about 30 - 40 hours to complete. If you finish your mod 1 pre-work early, make sure you continue to code every day after you have completed the assignments, so that your skills don't atrophy. You SHOULD NOT complete the mod 1 pre-work early and take an extended break from coding before your first day of class. This is very important to make sure you are in a routine that will keep your skills sharp and prepare you to hit the ground running on day 1.
+
+### Pre-work Assignments
+
+The following assignments are due based on your mod 0 section and can be found on the [mod 0 calendar]({{ site.baseurl }}/calendar)
+
+The capstone is made up of 3 parts:
+* [Professional Development]({{ site.baseurl }}#professional-dev)
+* [Gear Up]({{ site.baseurl }}#gear-up)
+* [Technical]({{ site.baseurl }}#technical)
+
+<a name="professional-dev"></a>
+## Professional Development
+
+**Turing is not just a school where you learn to code.** Turing's curriculum focuses on both technical and professional development.
+
+In order to achieve our mission and vision, we also have group sessions each week called Gear Up in order to bring community awareness to certain issues in the tech industry.
+
+The assignments below will be submitted in gists that you will create on your GitHub account. A gist is a text document that can be stored on GitHub. To create a gist, follow the steps below:
+
+* Log in to your GitHub account
+* In the upper right corner, click on the '+' icon
+* Select 'New Gist'
+* Enter a filename, with the extension .md
+* Enter the text of your gist in the large text area
+* click Create Public Gist
+* You can also visit [gist.github.com](https://gist.github.com/)
+
+We take these exercises seriously, and we ask that you do too. We expect at minimum 4-6 sentences in response to **each** question, but feel free to expand and elaborate as you deem necessary. Use Markdown (this is a programming language used for writing) to format your gists.
+
+Use these exercises to start telling your unique story with your distinct experiences. This is something we will continue to practice during your time at Turing.
+
+You can find the professional development assignments [here](https://github.com/turingschool/career-development-curriculum-site/blob/master/module-1-prework/career_development_mod1_prework.md)
+
+Submission instructions for the PD assignment will be listed in the link above.
+
+<a name="gear-up"></a>
+## Gear Up
+
+Gear up is a part of our curriculum where we talk about topics such as privilege and power, and ethical issues in the tech industry. Here is the [Gear Up Assignment](https://github.com/turingschool/gear-up/blob/master/pre-work/intro_with_empathy.markdown).
+
+The gear up assignment will be submitted with the technical pre-work. Instructions can be found on day 7 of the technical pre-work.
+
+<a name="technical"></a>
+## Technical Pre-work (Program Specific)
+
+The technical mod 1 pre-work is split up into 8 days. These days aren't meant to line up with anything, they're only meant to give you an idea of how long each section will take. I'd plan on each one of those days taking about 6 hours on average. Also, keep in mind that the days do get progressively harder and that they build on one another.
+
+At Turing, you will have to code every single day to stay on top of the workload and build muscle memory for everything you've learned. This pre-work is designed to get you into that essential routine before day one of class.
+
+After completing the technical pre-work, you should be able to do the following:
+
+* Be comfortable navigating your development environment and using your tools (Atom, Chrome, the console, and the command line)
+* Develop a basic knowledge of Ruby (for back-enders) or JavaScript (for front-enders)
+
+If you have more than 8 days to work on the pre-work, you should break up the work and complete the Next Steps section below so that you are coding every day!
+
+The link below will take you to the Github page that contains all the Technical work. Scroll through the page to find the instructions for getting your computer setup and getting started.
+
+* [Click here to get started with Back-End Technical Mod 1 Pre-work](https://github.com/turingschool-examples/backend_mod_1_prework) (This is your technical mod 1 pre-work if you are in the backend program)
+* [Click here to get started with Front-End Technical Mod 1 Pre-work](https://github.com/turingschool-examples/frontend-mod-1-prework) (This is your technical mod 1 pre-work if you are in the frontend program)
+
+The technical pre-work and gear up pre-work will be submitted in a google survey that is linked on day 7 of the technical pre-work repo for your respective program.
+
+### Next Steps
+
+Before moving any further, complete all of the projects listed in Day 7 of technical pre-work repository.
+
+If you have more time, review the curriculum site for the program that you're joining:
+
+* [Back-End Curriculum Site](http://backend.turing.io/)
+* [Front-End Curriculum Site](http://frontend.turing.io/)