Merge branch 'main' into patch-1

Gemfile

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # core deps for Jekyll / just-the-docs
 gem 'jekyll', '~>4.3'
 
-gem "just-the-docs", "0.4.0.rc3"
+gem "just-the-docs", "0.5.0"

Gemfile.lock

@@ -36,7 +36,7 @@ GEM
       jekyll (>= 3.8, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    just-the-docs (0.4.0.rc3)
+    just-the-docs (0.5.0)
       jekyll (>= 3.8.5)
       jekyll-seo-tag (>= 2.0)
       rake (>= 12.3.1)
@@ -73,7 +73,7 @@ PLATFORMS
 
 DEPENDENCIES
   jekyll (~> 4.3)
-  just-the-docs (= 0.4.0.rc3)
+  just-the-docs (= 0.5.0)
 
 BUNDLED WITH
    2.3.7

README.md

@@ -1,10 +1,11 @@
-# CS 131 Course Website - Fall 2022
+# CS 131 Course Website - Spring 2023
 
-[![Netlify Status](https://api.netlify.com/api/v1/badges/ba104626-f1a7-437c-b329-0ce1bc3be452/deploy-status)](https://app.netlify.com/sites/ucla-cs-131-f22/deploys)
+[![CI](https://github.com/UCLA-CS-131/spring-23/actions/workflows/ci.yml/badge.svg)](https://github.com/UCLA-CS-131/spring-23/actions/workflows/ci.yml)
+[![Deploy Jekyll site to Pages](https://github.com/UCLA-CS-131/spring-23/actions/workflows/pages.yml/badge.svg)](https://github.com/UCLA-CS-131/spring-23/actions/workflows/pages.yml)
+[![Netlify Status](https://api.netlify.com/api/v1/badges/b7c71704-791f-4903-9ec4-30f011abae88/deploy-status)](https://app.netlify.com/sites/peaceful-horse-62944d/deploys)
 
-Note: this site is no longer updated with Fall 2022 ending.**
 
-**Hey there! This is the source code for the Fall 2022 CS 131 course website. It is built with:
+Hey there! This is the source code for the Spring 2023 CS 131 course website. It is built with:
 
 - [Jekyll](https://jekyllrb.com/), a [Ruby](https://www.ruby-lang.org/en/)-based static site generator
 - [just-the-docs](https://just-the-docs.github.io/just-the-docs/), a Jekyll theme providing the base styling and structure
@@ -17,30 +18,30 @@ This project follows general Ruby conventions. We highly suggest you use [rbenv]
 First, clone the repository.
 
 ```sh
-git clone https://github.com/UCLA-CS-131/fall-22.git
+git clone https://github.com/UCLA-CS-131/spring-23.git
 # or, with SSH
-git clone git@github.com:UCLA-CS-131/fall-22.git
+git clone git@github.com:UCLA-CS-131/spring-23.git
 ```
 
 Then, go into the folder, and install the relevant dependencies with bundler:
 
 ```sh
-$ cd fall-22
+$ cd spring-23
 $ bundle
 ```
 
 Finally, serve the site:
 
 ```sh
 $ bundle exec jekyll serve
-Configuration file: /Users/matt/code/fall-22/_config.yml
-            Source: /Users/matt/code/fall-22
-       Destination: /Users/matt/code/fall-22/_site
+Configuration file: /Users/ruiningd/Desktop/131/spring-23/_config.yml
+            Source: /Users/ruiningd/Desktop/131/spring-23
+       Destination: /Users/ruiningd/Desktop/131/spring-23/_site
  Incremental build: disabled. Enable with --incremental
-      Generating...
-                    done in 0.664 seconds.
- Auto-regeneration: enabled for '/Users/matt/code/fall-22'
-    Server address: http://127.0.0.1:4000/fall-22/
+      Generating... 
+                    done in 1.919 seconds.
+ Auto-regeneration: enabled for '/Users/ruiningd/Desktop/131/spring-23'
+    Server address: http://127.0.0.1:4000/spring-23/
   Server running... press ctrl-c to stop.
 ```
 

_config.yml

@@ -13,11 +13,11 @@
 # you will see them accessed via {{ site.title }}, {{ site.github_repo }}, and so on.
 # You can create any custom variable you would like, and they will be accessible
 # in the templates via {{ site.myvariable }}.
-title: CS 131 Fall 2022
-tagline: Course website for Fall 2022 CS 131 | Programming Languages at UCLA
-description: Course website for Fall 2022 CS 131 | Programming Languages at UCLA
-author: Matthew Wang
-baseurl: '/fall-22' # the subpath of your site, e.g. /blog
+title: CS 131 Spring 2023
+tagline: Course website for Spring 2023 CS 131 | Programming Languages at UCLA
+description: Course website for Spring 2023 CS 131 | Programming Languages at UCLA
+author: Matthew Wang, Ruining Ding
+baseurl: '/spring-23' # the subpath of your site, e.g. /blog
 url: 'https://ucla-cs-131.github.io/' # the base hostname & protocol for your site, e.g. http://example.com
 exclude: ["Gemfile", "Gemfile.lock", "LICENSE", "vendor", "README.md"]
 
@@ -29,17 +29,22 @@ heading_anchors: true
 permalink: pretty
 aux_links:
   Website on GitHub:
-    - 'https://github.com/UCLA-CS-131/fall-22'
+    - 'https://github.com/UCLA-CS-131/spring-23'
 
 nav_external_links:
+
   - title: Campuswire
-    url: https://campuswire.com/c/G66F8C62D/
+    url: https://campuswire.com/p/GCF9D6027
   - title: Gradescope
-    url: https://www.gradescope.com/courses/444425
+    url: https://www.gradescope.com/courses/529662
   - title: Lecture Slides
-    url: https://drive.google.com/drive/folders/1YB6pMh0aaaSPG0iO6zjPfRBNv-K4N-5q
+    url: https://drive.google.com/drive/folders/1HxklX-MfUSJ1TW_y0FshS-XvFuMiEYx1?usp=share_link
   - title: Discussion Resources
     url: https://drive.google.com/drive/folders/1TBOqhuq2-JFEcW0KNkbnC6UXtpGUsATe
+  - title: Barista
+    url: https://barista.fly.dev
+  - title: Past Website
+    url: https://ucla-cs-131.github.io/fall-22/
 
 # Collections for website data
 collections:
@@ -87,10 +92,6 @@ compress_html:
   blanklines: false
   profile: false
 
-plugins:
-  - jekyll-seo-tag
-
-
 # Back to top link
 back_to_top: true
 back_to_top_text: "Back to top"
@@ -99,7 +100,7 @@ back_to_top_text: "Back to top"
 # Footer "Edit this page on GitHub" link text
 gh_edit_link: true # show or hide edit this page link
 gh_edit_link_text: "Edit this page on GitHub"
-gh_edit_repository: "https://github.com/UCLA-CS-131/fall-22" # the github URL for your repo
+gh_edit_repository: "https://github.com/UCLA-CS-131/spring-23" # the github URL for your repo
 gh_edit_branch: "main" # the branch that your docs is served from
 gh_edit_view_mode: "tree"
 

_layouts/lecture.html

@@ -3,6 +3,7 @@
 ---
 
 <h1>{{page.title}}</h1>
-<p>{{page.lecture_date}} | Week {{page.week}} | by {{page.author}}</p>
+<p>{{page.lecture_date}} | Week {{page.week}} | edited by {{page.author}}</p>
+<p>(originally written {{page.originally_written}} by {{page.original_author}})</p>
 
 {{content}}

_layouts/schedule.html

@@ -1,7 +1,7 @@
 {% assign start_time = page.timeline | first %}
 {% capture offset %}{% include minutes.liquid time=start_time %}{% endcapture %}
 <div class="schedule">
-  <ul class="schedule-timeline" style="min-width: {{ page.schedule | size | times: 130 }}px">
+  <ul class="schedule-timeline" style="min-width: {{ page.schedule | size | times: 120 }}px">
     {% for time in page.timeline %}
     <li class="schedule-time">{{ time }} </li>
     {% endfor %}
@@ -20,7 +20,7 @@ <h2 class="schedule-header">{{ day.name }}</h2>
         <li class="schedule-event {% if event.class %}{{ event.class }}{% else %}{{ event.name | slugify }}{% endif %}"
             style="top: {{ top }}px; height: {{ height }}px;">
           <div class="name">{{ event.name }}</div>
-          <div class="time">{{ event.start }}–{{ event.end }}</div>
+          <div class="time">{{ event.start }} - {{ event.end }}</div>
           {% if event.location %}
           <div class="location">{{ event.location }}</div>
           {% endif %}

_layouts/staffer.html

@@ -3,7 +3,7 @@
   <img class="staffer-image" src="{{ site.baseurl }}{{ page.subpath }}{{ page.photo }}" alt="">
   {% endif %}
   <div>
-    <h3 class="staffer-name">
+    <h3 class="staffer-name" id="{{ page.name | slugify }}">
       {% if page.website %}
       <a href="{{ page.website }}">{{ page.name }}</a>
       {% else %}

_modules/01-introduction.md

@@ -2,6 +2,6 @@
 title: Course Introduction
 ---
 
-M Sep 26
+M Apr 3
 : **Lecture**{: .label .label-blue }Course Introduction
-  : [Lecture Notes]({{site.baseurl}}/lectures/01), [Slides](https://docs.google.com/presentation/d/1RG2eC0hrYz8_ExI0D-ocvvmDzxgNND8N/)
+  : [Lecture Notes]({{site.baseurl}}/lectures/01/), [Slides](https://docs.google.com/presentation/d/1_Qp3e4SwWRm46bqz7-QZBEvF8JrxcfaA/edit?usp=share_link&ouid=101757866260235503028&rtpof=true&sd=true)

_modules/02-functional-programming.md

@@ -2,32 +2,30 @@
 title: Functional Programming
 ---
 
-W Sep 28
+W Apr 5
 : **Lecture**{: .label .label-blue }Intro to FP and Haskell
-  : [Lecture Notes]({{site.baseurl}}/lectures/02), [Slides](https://docs.google.com/presentation/d/1ELP8jglDH5cUbcsDTDCOUm0m20ZHLCgT/)
+  : [Lecture Notes]({{site.baseurl}}/lectures/02/), [Slides](https://docs.google.com/presentation/d/1irnNsw7n355MdHlIA7bYqjMirG-oOj9H/edit?usp=share_link&ouid=101757866260235503028&rtpof=true&sd=true)
 
-R Sep 29
+W Apr 5
 : **Posted**{: .label .label-green }HW 1
-  : [Gradescope](https://www.gradescope.com/courses/444425/assignments/2265568/)
+  : [Gradescope](https://www.gradescope.com/courses/529662/assignments/2801558)
 
-F Sep 30
-: **Section**{: .label .label-purple }Discussion (Haskell Review)
+F Apr 7
+: **Section**{: .label .label-purple }Discussion (Haskell, FP Review)
   : [Discussion Resources](https://drive.google.com/drive/folders/1TBOqhuq2-JFEcW0KNkbnC6UXtpGUsATe)
 
-M Oct 03
-: **Lecture**{: .label .label-blue }Functions and Pattern Matching
-  : [Lecture Notes]({{site.baseurl}}/lectures/03), [Slides](https://docs.google.com/presentation/d/1ELP8jglDH5cUbcsDTDCOUm0m20ZHLCgT/)
+M Apr 10
+: **Lecture**{: .label .label-blue }FP: Functions, Binding, Control Flow
+  : [Lecture Notes]({{site.baseurl}}/lectures/03/), [Slides](https://docs.google.com/presentation/d/1irnNsw7n355MdHlIA7bYqjMirG-oOj9H/edit?usp=share_link&ouid=101757866260235503028&rtpof=true&sd=true)
 
-W Oct 05
-: **Lecture**{: .label .label-blue }Functional Programming Paradigms
-  : [Lecture Notes]({{site.baseurl}}/lectures/04), [Slides](https://docs.google.com/presentation/d/1ELP8jglDH5cUbcsDTDCOUm0m20ZHLCgT/)
-
-R Oct 06
+W Apr 12
+: **Lecture**{: .label .label-blue }FP: Advanced Functions (first-class, higher-order, lambdas, closures, currying)
+  : [Lecture Notes]({{site.baseurl}}/lectures/04/), [Slides](https://docs.google.com/presentation/d/1irnNsw7n355MdHlIA7bYqjMirG-oOj9H/edit?usp=share_link&ouid=101757866260235503028&rtpof=true&sd=true)
 : **Due**{: .label .label-red }HW 1
-  : [Solutions](https://drive.google.com/file/d/1jhk8Fv8mh4h0eDOf779mko1d5frkI_a7/view?usp=sharing), [Gradescope](https://www.gradescope.com/courses/444425/assignments/2265568/)
+  : [Solutions](https://drive.google.com/file/d/1UX8CIZpQxB-bTdzQZ1z9pZ9vJ6k5DvR8/view?usp=sharing)
 : **Posted**{: .label .label-green }HW 2
-  : [Gradescope](https://www.gradescope.com/courses/444425/assignments/2327903/)
+  : [Gradescope](https://www.gradescope.com/courses/529662/assignments/2818872)
 
-F Oct 07
-: **Section**{: .label .label-purple }Discussion (ADTs + Review)
+F Apr 14
+: **Section**{: .label .label-purple }Discussion (ADTs, Immutable Data Structures)
   : [Discussion Resources](https://drive.google.com/drive/folders/1TBOqhuq2-JFEcW0KNkbnC6UXtpGUsATe)