Merge branch 'master' of https://github.com/stanfordpython/stanfordpython.github.io

Author: cooper-mj

index.html

@@ -177,13 +177,15 @@ <h4 class="text-primary">Schedule</h4>
                 <div class="panel-body">
                   <p class="blurb">Labs in CS41 provide a hands-on opportunity to experiment with the Python concepts presented in lectures. Although students work on these labs during an 80-minute class period, it would take much longer to fully complete a lab. Each lab comes with a number of challenge problems that will take even the experiences programmer nontrivial time. Labs are collaborative and open-ended, frequently asking you to think about how or why Python makes the decisions it does.</p>
                   <p class="blurb">Each problem is chosen to reinforce a particular concept, but you are free to skip around at will. You are not expected to submit your solutions to labs, although our reference solutions will be posted afterwards. Think of labs as a chance to solidify your working knowledge of Python - after all, what better way to learn Python than to practice it?</p>
+                  <b class="blurb">See <a href="lab_assignments.html">Lab Assignments</a> for your lab assignment!</b>
                 </div>
                 <table class="table table-striped table-hover table-bordered">
                   <thead>
                     <tr>
                       <th>Week</th>
                       <th>Topic</th>
-                      <th>Handout</th>
+                      <th>Part 1 Link</th>
+                      <th>Part 2 Link</th>
                       <th>Solutions</th>
                     </tr>
                   </thead>
@@ -289,6 +291,9 @@ <h4 class="text-primary">Schedule</h4>
                 <h4>Essential Links</h4>
                 <p class="lead">
                   <!-- TODO: Fix this janky spacing hack -->
+                  <strong class="small"><a href="lab_assignments.html" target="_blank">Lab Assignments</a></strong>
+
+                  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                   <strong class="small"><a href="https://docs.google.com/document/d/15Z1g1oXv32njCOiFvGBTlJde4rfOBtshBvKIQH17hys/edit?usp=sharing" onclick="gtag_trackOutboundLink('course_information'); return true;" target="_blank">Course Info</a></strong>
 
                   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -303,9 +308,6 @@ <h4>Essential Links</h4>
                 <h4>Basic Info</h4>
 
                 <dl class="dl-horizontal lead">
-                  <dt>Application</dt>
-                  <dd><a href="http://apply.stanfordpython.com/" onclick="gtag_trackApplication('info'); return true;" target="_blank">Apply Here</a> (due Jan 4, 2020 at 11:59pm)</dd>
-
                   <dt>Date / Time</dt>
                   <dd>Monday + Wednesday 3:00pm to 4:20pm</dd>
 

js/lab_assignments.js

@@ -21,12 +21,12 @@ $(document).ready(function() {
     'avidesh': 'Antonio',
     'elizfitz': 'Antonio',
     'erickha': 'Antonio',
-    'gsheen': 'Antonio',
+    'gsheen': 'Sam',
     'mateoae': 'Antonio',
     'rubensan': 'Antonio',
     'cperez8': 'Antonio',
     'emarx1': 'Sam',
-    'k99397': 'Sam',
+    'k99397': 'Antonio',
     'emily2h': 'Sam',
     'jinal': 'Sam',
     'josencf': 'Sam',

js/resources.js

@@ -47,7 +47,8 @@ function create_lab_tr(lab) {
   /*
   <tr>
     <th scope="row">1</th>
-    <td><a href=...>Handout</a></td>
+    <td><a href=...>Part 1</a></td>
+    <td><a href=...>Part 2</a></td>
     <td><a href=...>Solutions</a></td>
   </tr>
   */
@@ -59,7 +60,11 @@ function create_lab_tr(lab) {
     $('<td>').append(lab.topic)
   ).append(
     $('<td>').append(
-      create_anchor(lab.href, "Handout", "None", gtag_trackLabHandout)
+      create_anchor(lab.part1, "Part 1", "None", gtag_trackLabHandout)
+    )
+  ).append(
+    $('<td>').append(
+      create_anchor(lab.part2, "Part 2", "None", gtag_trackLabHandout)
     )
   ).append(
     $('<td>').append(

lab-assignments.html

@@ -65,4 +65,4 @@ <h2>CS 41 Section Assignments!</h2>
     <script type="text/javascript" src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
     <script type="text/javascript" src="js/lab_assignments.js"></script>
   </body>
-</html>
+</html>

res/labs.json

@@ -1,2 +1,11 @@
 [
+    {
+        "week": 2,
+        "topic": "Data Structures",
+        "part1": "https://github.com/stanfordpython/python-labs/blob/master/notebooks/lab-2/data-structures-part-1.ipynb",
+        "part2": "https://github.com/stanfordpython/python-labs/blob/master/notebooks/lab-2/data-structures-part-2.ipynb",
+        "solutions": "#",
+        "visible": true,
+        "active": true
+    }
 ]