Merge pull request #646 from harvard-lil/redesign

Merge redesign in to develop

.github/workflows/tests.yml

@@ -9,9 +9,9 @@ jobs:
     if: github.event_name == 'pull_request' || github.repository == 'harvard-lil/website-static'
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: bundle
           key: ${{ runner.os }}-gems-${{ hashFiles('app/Gemfile.lock') }}
@@ -30,20 +30,22 @@ jobs:
           sudo mkdir -m 777 build
           ls bundle || sudo mkdir -m 777 bundle
           sudo mkdir -m 777 app/.jekyll-cache
+          docker compose run jekyll npm install
 
       - name: Test
         run: |
           bash ./scripts/run-tests.sh
 
-      - name: Deploy
-        if: github.event_name == 'push' && github.ref == 'refs/heads/develop'
+      - name: Deploy to stage
+        if: github.event_name == 'push' && github.ref == 'refs/heads/redesign'
         env:
           DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}
-          DEPLOY_URL: ${{ secrets.DEPLOY_URL }}
+          DEPLOY_URL: ${{ secrets.STAGE_DEPLOY_URL }}
           DEPLOY_HEADER: ${{ secrets.DEPLOY_HEADER }}
+          LIVE_SITE: ${{ secrets.LIVE_SITE }}
         run: |
           set -x
-          CSS_BUST=$(find build/assets/css -type f -exec bash -c 'if [[ `diff {} <(curl -s "https://lil.law.harvard.edu/$(echo "{}" | cut -c 7-)")` ]]; then echo "bust ({})"; fi' \;)
+          CSS_BUST=$(find build/assets/css -type f -exec bash -c 'if [[ `diff {} <(curl -s "https://$LIVE_SITE/$(echo "{}" | cut -c 7-)")` ]]; then echo "bust ({})"; fi' \;)
           if [[ $CSS_BUST ]] ; then
               COUNTER=`grep cache-buster app/_layouts/default.html | sed -r 's/.*cache-buster=([0-9]+).*/\1/'`
               let NEWCOUNTER=$COUNTER+1
@@ -53,8 +55,20 @@ jobs:
               git config user.name "GitHub Actions"
               git add app/_layouts/default.html app/_includes/custom-css.html
               git commit -m 'Increment CSS cache-buster [skip ci]'
-              git push origin develop || exit 1
+              git push origin redesign || exit 1
           fi
           export DEPLOY_CONTENT='{"GITHUB_RUN_NUMBER":"'$GITHUB_RUN_NUMBER'","GITHUB_SHA":"'$GITHUB_SHA'","GITHUB_REF":"'$GITHUB_REF'","GITHUB_REPOSITORY":"'$GITHUB_REPOSITORY'","GITHUB_ACTOR":"'$GITHUB_ACTOR'"}' ;
           export DEPLOY_SIG="sha1=`echo -n "$DEPLOY_CONTENT" | openssl sha1 -hmac $DEPLOY_KEY | sed 's/^.* //'`" ;
           curl -X POST "$DEPLOY_URL" --data "$DEPLOY_CONTENT" -H "Content-Type: application/json" -H "$DEPLOY_HEADER: $DEPLOY_SIG" ;
+
+      - name: Deploy to prod
+        if: github.event_name == 'push' && github.ref == 'refs/heads/develop'
+        env:
+          DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}
+          DEPLOY_URL: ${{ secrets.DEPLOY_URL }}
+          DEPLOY_HEADER: ${{ secrets.DEPLOY_HEADER }}
+        run: |
+          set -x
+          export DEPLOY_CONTENT='{"GITHUB_RUN_NUMBER":"'$GITHUB_RUN_NUMBER'","GITHUB_SHA":"'$GITHUB_SHA'","GITHUB_REF":"'$GITHUB_REF'","GITHUB_REPOSITORY":"'$GITHUB_REPOSITORY'","GITHUB_ACTOR":"'$GITHUB_ACTOR'"}' ;
+          export DEPLOY_SIG="sha1=`echo -n "$DEPLOY_CONTENT" | openssl sha1 -hmac $DEPLOY_KEY | sed 's/^.* //'`" ;
+          curl -X POST "$DEPLOY_URL" --data "$DEPLOY_CONTENT" -H "Content-Type: application/json" -H "$DEPLOY_HEADER: $DEPLOY_SIG" ;

.gitignore

@@ -7,3 +7,5 @@ build/
 bundle
 apache/logs
 nginx/logs
+app/node_modules/
+

Dockerfile

@@ -0,0 +1,20 @@
+FROM node:18-alpine as nodebuilder
+
+WORKDIR /app
+
+COPY app/package.json app/package-lock.json ./
+
+
+RUN npm install
+
+FROM tiryoh/jekyll:4.2.1
+
+COPY --from=nodebuilder /app/node_modules /srv/jekyll/node_modules
+
+WORKDIR /srv/jekyll
+
+ENV PATH="/srv/jekyll/node_modules/.bin:${PATH}"
+
+EXPOSE 8080
+
+CMD ["jekyll", "build", "--watch"]

app/404.html

@@ -0,0 +1,20 @@
+---
+title: 404
+layout: default
+permalink: /404.html
+---
+
+<section class="container pb-150">
+  <div class="page-hero simple relative z-[1]">
+    <h1 class="page-hero__title">Oops!</h1>
+    <h2 class="page-hero__subtitle flex flex-col gap-24 !max-w-[1080px]">
+      We can’t seem to find the page you are looking for.
+    </h2>
+    <p>
+      To report a broken link, please <a class="interactive-link dark reverse" href="mailto:{{ site.email }}">contact us.</a>
+    </p>
+  </div>
+  <div class="w-full -translate-y-[150px] relative z-[0]">
+    {% include 404.html %}
+  </div>
+</section>

app/Gemfile

@@ -1,3 +1,4 @@
 source "https://rubygems.org"
 gem 'jekyll-sitemap'
 gem 'jekyll-paginate-v2'
+gem 'jekyll-postcss-v2'

app/Gemfile.lock

@@ -31,6 +31,7 @@ GEM
       terminal-table (~> 2.0)
     jekyll-paginate-v2 (3.0.0)
       jekyll (>= 3.0, < 5.0)
+    jekyll-postcss-v2 (1.0.2)
     jekyll-sass-converter (2.2.0)
       sassc (> 2.0.1, < 3.0)
     jekyll-sitemap (1.4.0)
@@ -66,6 +67,7 @@ PLATFORMS
 
 DEPENDENCIES
   jekyll-paginate-v2
+  jekyll-postcss-v2
   jekyll-sitemap
 
 BUNDLED WITH

app/_config.yml

@@ -5,12 +5,17 @@ markdown: kramdown
 plugins:
   - jekyll-paginate-v2
   - jekyll-sitemap
+  - jekyll-postcss-v2
 liquid:
   error_mode: strict
 sass:
   sass_dir: _scss
   style: nested
+postcss:
+  cache: false
 timezone: Etc/GMT
+future: true
+
 
 # Site settings
 title: The Library Innovation Lab at Harvard University
@@ -24,6 +29,8 @@ sharing-image: "thumbs/800x800r/lil-primary-black.png"
 email: [email protected]
 twitter_account_name: HarvardLIL
 twitter_url: https://twitter.com/harvardlil
+linkedin_account_name: libraryinnovationlab
+linkedin_url: https://www.linkedin.com/company/libraryinnovationlab/
 facebook_url: https://www.facebook.com/HarvardLibraryInnovationLab/
 github_account_name: harvard-lil
 github_url:  https://github.com/harvard-lil
@@ -38,41 +45,38 @@ blog_feed_title: The Harvard Library Innovation Lab
 
 # Collections
 collections:
-  projects_active:
+  our_work:
     output: true
-    permalink: /projects/:slug/
-  projects_retired:
+    permalink: /our-work/:slug/
+  our_work_pageless:
     output: false
-  sketches_active:
+  events:
     output: true
-    permalink: /sketches/:slug/
-  sketches_retired:
+    permalink: /events/:slug/
+  jobs:
     output: false
 
 # Plugins
 news_feed_for:
-  - projects_active
-  - projects_retired
-  - sketches_active
+  - our_work
 
 contributors_feed_for:
-  - projects_active
-  - projects_retired
+  - our_work
 
 # Defaults
 defaults:
   - scope:
       path: ""
-      type: projects_active
+      type: our_work
     values:
-      layout: project
-      type: project
+      layout: our_work
+      type: our_work
   - scope:
       path: ""
-      type: sketches_active
+      type: events
     values:
-      layout: project
-      type: sketch
+      layout: event
+      type: event
   - scope:
       path: ""
       type: posts
@@ -83,7 +87,6 @@ defaults:
   - scope:
       path: ""
     values:
-      custom-footer: false
       sharing-card-type: summary
 
 # Feature Flags
@@ -104,15 +107,15 @@ pagination:
   collection: 'posts'
 
   # How many objects per paginated page, used to be `paginate` (default: 0, means all)
-  per_page: 10
+  per_page: 12
 
   # The permalink structure for the paginated pages (this can be any level deep)
   permalink: '/page/:num/' # Pages are index.html inside this folder (default)
   #permalink: '/page/:num.html' # Pages are simple html files
   #permalink: '/page/:num' # Pages are html files, linked jekyll extensionless permalink style.
 
   # Optional the title format for the paginated pages (supports :title for original page title, :num for pagination page number, :max for total number of pages)
-  title: ':title - page :num'
+  title: 'Page :num of :max | :title'
 
   # Limit how many pagenated pages to create (default: 0, means all)
   limit: 0
@@ -155,12 +158,12 @@ autopages:
     layouts:
       - 'tag_or_category.html'
     # Optional, the title that each category paginate page should get (:cat is replaced by the Category name)
-    title: 'Posts in category :cat'
+    title: 'Posts in category ":cat" | Blog'
     # Optional, the permalink for the  pagination page (:cat is replaced),
     # the pagination permalink path is then appended to this permalink structure
     permalink: '/blog/category/:cat/'
     slugify:
-      mode: raw
+      mode: default
       cased: true
 
   collections:
@@ -170,8 +173,8 @@ autopages:
   tags:
     layouts:
       - 'tag_or_category.html'
-    title: 'Posts tagged with :tag' # :tag is replaced by the tag name
+    title: 'Posts tagged ":tag" | Blog' # :tag is replaced by the tag name
     permalink: '/blog/tag/:tag/'
     slugify:
-      mode: raw
+      mode: default
       cased: true

app/_data/additional_research.yaml

@@ -0,0 +1,12 @@
+
+- title: Banned Books
+  url: /blog/2023/09/25/ai-book-bans-freedom-to-read-case-study/
+  subcategory: AI Explorations
+  order:
+
+- title: WARC-GPT
+  url: /blog/2024/02/12/warc-gpt-an-open-source-tool-for-exploring-web-archives-with-ai/
+  subcategory: AI Explorations
+  order:
+
+

app/_data/featured_tags.yaml

@@ -1,4 +1,4 @@
 - AI Research
 - Tools
 - Library Principles
-- Fellows Research
+- Fellows’ Research

app/_data/fellows_summer_2016.yaml

@@ -41,7 +41,7 @@
     I plan to apply deep learning techniques to the CAP corpus and formalize the infrastructure architecture choices we're making into a template that can be easily cloned for future Lab projects.
 
   find_out_more:
-    - "[lil.law.harvard.edu/projects/caselaw-access-project](http://lil.law.harvard.edu/projects/caselaw-access-project/)"
+    - "[lil.law.harvard.edu/our-work/caselaw-access-project](http://lil.law.harvard.edu/our-work/caselaw-access-project/)"
 
 
 - fellow: sara-frug

app/_data/people.yaml

@@ -3,7 +3,7 @@
 # need to be created when adding a person and placed in the thumbs dir #
 
 # When adding a current team member, add three sizes - 216x216, 432x432, 648x648 #
-# see https://github.com/harvard-lil/website-static?tab=readme-ov-file#adding-current-affiliates #
+# see https://github.com/harvard-lil/website-static?tab=readme-ov-file#adding-current-Fellows #
 
 
 # Currently affiliated #
@@ -292,7 +292,7 @@ maxwell-neely-cohen:
   section: Affiliates
 
 
-# Former affiliates, and single-project collaborators
+# Former Fellows, and single-project collaborators
 # Entries should not have a "current:" key
 # Former LIL staff, fellows, RAs should have "affiliated: true"
 

app/_data/supporters.yaml

@@ -0,0 +1,42 @@
+institutions:
+  - name: Harvard Law School
+    logo: supporters/harvard-law-school-logo.png
+
+  - name: Berkman Klein Center for Internet & Society
+    logo: supporters/bkc-logo.svg
+
+foundations:
+  - name: Filecoin Foundation for the Decentralized Web
+    logo: supporters/ffdw-logo.png
+
+  - name: Institute of Museum and Library Services
+    logo: supporters/imls-logo.jpg
+
+  - name: Knight Foundation
+    logo: supporters/knight-logo.png
+
+nonprofits:
+  - name: Internet Archive
+    logo: supporters/ia-logo.svg
+
+  - name: Webrecorder
+    logo: supporters/webrecorder-logo.png
+
+  - name: Free Law Project
+    logo: supporters/flp-logo.svg
+
+companies:
+  - name: Cloudflare
+    logo: supporters/cloudflare-logo.png
+
+  - name: LexisNexis
+    logo: supporters/lexisnexis-logo.png
+
+  - name: Thomson Reuters
+    logo: supporters/tr-logo.png
+
+  - name: OpenAI
+    logo: supporters/openai-logo.png
+
+  - name: Fastcase
+    logo: supporters/fastcase-logo.png

app/_events/harvard-law-ai-summit.md

@@ -0,0 +1,14 @@
+---
+title: "Harvard Law AI Summit"
+date: 2023-09-19 19:05:36+00:00
+short_description: "A closed-door gathering of experts exploring AI as a new form of knowledge."
+description: "The Harvard Law AI Summit was an invitation-only gathering across the spectrum of law, government, AI research, civil society and social science. The summit explored how AI as a new form of knowledge is poised to challenge and reshape institutions."
+banner: ai-summit-sm.png
+banner_large: ai-summit-lg.png
+---
+
+The Harvard Law AI Summit was an invitation-only gathering across the spectrum of law, government, AI research, civil society and social science. The summit explored how AI as a new form of knowledge is poised to challenge and reshape institutions.
+
+Generative AI offers a defining moment where information archives gain the ability to answer questions about themselves; to act without human intervention; and even to infer and replicate the processes that created them. It will challenge and reshape every institution — for better and worse — and we cannot draw on just one field or expertise to respond to it.
+
+The one-day summit observed the Chatham House Rule and featured short, provocative talks from leaders in fields working on, or affected by, AI. This was combined with discussion among participants selected for their incisive, expert perspectives on what comes next.