Merge pull request #156 from BattModels/awadell1-patch-1

Create jekyll.yml

Author: awadell1

.github/workflows/CI.yml

@@ -2,12 +2,12 @@ name: CI
 on: [push, pull_request]
 
 jobs:
-  test:
+  build:
     name: Test and Build Site
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 3
@@ -24,28 +24,20 @@ jobs:
       - run: python -m pip install -r requirements.txt
       - run: make -j build
       - run: make -j test
-      - run: make -j site-publish.zip
-      - uses: actions/upload-artifact@v2
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
         with:
-          name: site-publish
-          path: site-publish.zip
-  publish:
+          path: _site/
+
+  # Deployment job
+  deploy:
     if: ${{ github.ref == 'refs/heads/main' }}
-    name: "Upload Publishable Site"
-    needs: test
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
     runs-on: ubuntu-latest
-    concurrency:
-      group: publish
-      cancel-in-progress: true
+    needs: build
     steps:
-      - uses: actions/download-artifact@v2
-        with:
-          name: site-publish
-          path: site-publish.zip
-      - uses: "marvinpinto/action-automatic-releases@latest"
-        with:
-          title: "Website"
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: "latest"
-          prerelease: false
-          files: site-publish.zip
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.pre-commit-config.yaml

@@ -7,6 +7,7 @@ repos:
       - id: check-added-large-files
         args: ['--maxkb=100', '--enforce-all']
         types: ['image']
+        exclude: img/group-photo.jpg
       - id: check-yaml
       - id: check-xml
       - id: end-of-file-fixer

Dockerfile

@@ -0,0 +1,23 @@
+FROM ruby:3-slim
+run apt-get update && apt-get install -y --no-install-recommends \
+    python3 \
+    python3-pip \
+    binutils \
+    gcc \
+    git \
+    make \
+    g++
+
+# Setup environment
+RUN mkdir -p /opt/env
+ADD Gemfile /opt/env
+ADD Gemfile.lock /opt/env
+ADD requirements.txt /opt/env
+WORKDIR /opt/env
+RUN python3 -m pip install --break-system-packages -r requirements.txt
+ENV GEM_HOME="/usr/local/bundle"
+ENV PATH $GEM_HOME/bin:$GEM_HOME/gems/bin:$PATH
+RUN bundle install
+
+VOLUME ["/opt/site"]
+WORKDIR /opt/site

_config.yml

@@ -1,5 +1,5 @@
 name: Viswanathan Research Group @CMU
-url: https://www.cmu.edu/me/venkatgroup/
+url: eeg.engin.umich.edu
 
 exclude: [bibble, README.md, Makefile, screenshot.png]
 

_data/people.yml

@@ -2,44 +2,14 @@
 
 venkvis:
     display_name: "Venkat Viswanathan"
-    webpage: "https://www.andrew.cmu.edu/user/venkatv/index.html#"
+    webpage: "https://aero-dev-01.engin.umich.edu/people/viswanathan-venkat/"
     role: pi
     image: img/people/venkvis.png
     bio: Associate Professor of Mechanical Engineering
-    email: "venkvis [at] cmu [dot] edu"
+    email: venkvis [at] umich [dot] edu
 
 # Postdocs, ordered by seniority at present
 
-pinweng:
-    display_name: "Pinwen Guan"
-    role: postdoc
-    image: img/people/pinweng.jpeg
-    email: "pinweng [at] andrew [dot] cmu [dot] edu"
-    bio: Postdoctoral Research Associate, Mechanical Engineering
-
-sjtuzhanglei:
-    display_name: "Lei Zhang"
-    role: postdoc
-    image: img/people/sjtuzhanglei.jpg
-    webpage: "https://www.linkedin.com/in/lei-zhang-0b8aa126/"
-    email: "sjtuzhanglei [at] gmail [dot] com"
-    bio: Postdoctoral Research Associate, Mechanical Engineering
-
-eannevel:
-    display_name: "Emil Annevelink"
-    role: postdoc
-    image: img/people/eannevel.jpg
-    webpage: "https://scholar.google.com/citations?user=1PBVqewAAAAJ&hl=en"
-    email: "eannevel [at] andrew [dot] cmu [dot] edu"
-    bio: Postdoctoral Research Associate, Mechanical Engineering
-
-mguttenb:
-    display_name: "Matt Guttenberg"
-    role: alumni-phd
-    bio: founder, INCEPTS
-    email: mguttenb [at] alumni [dot] cmu [dot] edu
-    webpage: "https://www.linkedin.com/in/matthew-guttenberg/"
-
 robyg:
     display_name: "Roby Gauthier"
     role: postdoc
@@ -58,38 +28,15 @@ andreli:
 
 # masters
 
-yuanyih:
-    display_name: "Yuanyi (Yara) Huang"
-    role: masters
-    image: img/people/yuanyih.png
-    email: "yuanyih [at] andrew [dot] cmu [dot] com"
-    bio: Chemical Engineering
-
-nirmitd:
-    display_name: "Nirmit Deshpande"
-    role: masters
-    image: img/people/nirmitd.jpg
-    webpage: "https://www.nirmitdeshpande.com/"
-    email: "nirmitd [at] andrew [dot] cmu [dot] edu"
-    bio: EST&P
-
 
 # phd students, currently alphabetical
 
-abills:
-    display_name: "Alec Bills"
-    role: phd
-    image: img/people/abills.jpg
-    bio: Mechanical Engineering
-    email: abills [at] andrew [dot] cmu [dot] edu
-    webpage: https://www.linkedin.com/in/alecbills/
-
 awadell:
     display_name: "Alex Wadell"
     role: phd
     image: img/people/awadell.jpg
     bio: Mechanical Engineering
-    email: awadell [at] andrew [dot] cmu [dot] edu
+    email: awadell [at] umich [dot] edu
     webpage: https://www.linkedin.com/in/alexiuswadell/
 
 asebasti:
@@ -151,21 +98,6 @@ jiankunp:
     bio: Mechanical Engineering
     email: jiankunp [at] andrew [dot] cmu [dot] edu
 
-lkavalsk:
-    display_name: "Lance Kavalsky"
-    role: phd
-    image: img/people/lkavalsk.jpg
-    bio: Mechanical Engineering
-    webpage: "https://lancekavalsky.github.io/"
-    email: lkavalsk [at] andrew [dot] cmu [dot] edu
-
-ltsiveri:
-    display_name: "Lydia Tsiverioti"
-    role: phd
-    image: img/people/ltsiveri.jpeg
-    bio: Mechanical Engineering
-    email: ltsiveri [at] andrew [dot] cmu [dot] edu
-
 mphuthi:
     display_name: "Mgcini Keith Phuthi"
     role: phd
@@ -189,14 +121,6 @@ shangzhu:
   webpage: "https://www.linkedin.com/in/shang-zhu-0935a4153/"
   email: shangzhu [at] andrew [dot] cmu [dot] edu
 
-sgodse:
-    display_name: "Shravan Godse"
-    role: phd
-    image: img/people/sgodse.jpg
-    bio: Mechanical Engineering
-    webpage: "https://shravangodse16.github.io/"
-    email: sgodse [at] andrew [dot] cmu [dot] edu
-
 tz4:
     display_name: "Tianyi Zhang"
     role: phd
@@ -205,28 +129,13 @@ tz4:
     webpage: "https://www.linkedin.com/in/tianyi-zhang-89b2ba163/"
     email: tz4 [at] andrew [dot] cmu [dot] edu
 
-varunshankar:
-    display_name: "Varun Shankar"
-    role: phd
-    image: img/people/varunshankar.jpg
-    bio: Mechanical Engineering
-    email: varunshankar [at] cmu [dot] edu
-
 vazumah:
     display_name: "Victor Azumah"
     role: phd
     image: img/people/vazumah.png
     bio: Mechanical Engineering
     email: "vazumah [at] andrew [dot] cmu [dot] com"
 
-vedantpu:
-    display_name: "Vedant Puri"
-    role: phd
-    image: img/people/vedantpu.jpg
-    webpage: "https://www.linkedin.com/in/vpuri3/"
-    email: "vedantpu [at] andrew [dot] cmu [dot] com"
-    bio: Research Assistant
-
 cskelly:
     display_name: "Celia Kelly"
     role: phd
@@ -280,6 +189,36 @@ vsulzer:
     email: "valentin [at] ion-works [dot] com"
     webpage: "https://www.ion-works.com"
 
+pinweng:
+    display_name: "Pinwen Guan"
+    role: alumni-postdoc
+    image: img/people/pinweng.jpeg
+    email: "pinweng [at] andrew [dot] cmu [dot] edu"
+    bio: Postdoctoral Research Associate, Mechanical Engineering
+
+sjtuzhanglei:
+    display_name: "Lei Zhang"
+    role: alumni-postdoc
+    image: img/people/sjtuzhanglei.jpg
+    webpage: "https://www.linkedin.com/in/lei-zhang-0b8aa126/"
+    email: "sjtuzhanglei [at] gmail [dot] com"
+    bio: Postdoctoral Research Associate, Mechanical Engineering
+
+eannevel:
+    display_name: "Emil Annevelink"
+    role: alumni-postdoc
+    image: img/people/eannevel.jpg
+    webpage: "https://scholar.google.com/citations?user=1PBVqewAAAAJ&hl=en"
+    email: "eannevel [at] andrew [dot] cmu [dot] edu"
+    bio: Postdoctoral Research Associate, Mechanical Engineering
+
+mguttenb:
+    display_name: "Matt Guttenberg"
+    role: alumni-postdoc
+    bio: founder, INCEPTS
+    email: mguttenb [at] alumni [dot] cmu [dot] edu
+    webpage: "https://www.linkedin.com/in/matthew-guttenberg/"
+
 # then phd, I think these are chronological
 
 oleg:
@@ -365,6 +304,29 @@ ardave:
     email: ardave [at] cmu [dot] edu
     webpage: "https://scholar.google.com/citations?user=G4sH0egAAAAJ&hl=en"
 
+varunshankar:
+    display_name: "Varun Shankar"
+    role: phd
+    image: img/people/varunshankar.jpg
+    bio: Mechanical Engineering
+    email: varunshankar [at] cmu [dot] edu
+
+abills:
+    display_name: "Alec Bills"
+    role: alumni-phd
+    image: img/people/abills.jpg
+    bio: Mechanical Engineering
+    email: abills [at] andrew [dot] cmu [dot] edu
+    webpage: https://www.linkedin.com/in/alecbills/
+
+lkavalsk:
+    display_name: "Lance Kavalsky"
+    role: alumni-phd
+    image: img/people/lkavalsk.jpg
+    bio: Mechanical Engineering
+    webpage: "https://lancekavalsky.github.io/"
+    email: lkavalsk [at] andrew [dot] cmu [dot] edu
+
 # masters, these ones are alphabetical currently
 
 abhinav:
@@ -417,6 +379,22 @@ yoolhee:
     role: alumni-masters
     bio: Data Scientist at Citrine Informatics
 
+yuanyih:
+    display_name: "Yuanyi (Yara) Huang"
+    role: alumni-masters
+    image: img/people/yuanyih.png
+    email: "yuanyih [at] andrew [dot] cmu [dot] com"
+    bio: Chemical Engineering
+
+nirmitd:
+    display_name: "Nirmit Deshpande"
+    role: alumni-masters
+    image: img/people/nirmitd.jpg
+    webpage: "https://www.nirmitdeshpande.com/"
+    email: "nirmitd [at] andrew [dot] cmu [dot] edu"
+    bio: EST&P
+
+
 # undergrads
 
 andrewlee:
@@ -428,3 +406,11 @@ siying:
     display_name: "Siying Li"
     role: alumni-ugrad
     bio: PhD student at UC Berkeley
+
+# Non-grads
+ltsiveri:
+    display_name: "Lydia Tsiverioti"
+    role: alumni
+    image: img/people/ltsiveri.jpeg
+    bio: Mechanical Engineering
+    email: ltsiveri [at] andrew [dot] cmu [dot] edu

_layouts/default.html

@@ -22,8 +22,8 @@
                         flex-column
                         flex-md-row justify-content-md-between">
                 <a href="{{ site.baseurl }}/" class="">
-                    <img src="{{ site.baseurl }}/img/cmu-lettermark-r.svg"
-                         alt="CMU Lettermark" id="logo">
+                    <img src="{{ site.baseurl }}/img/logo.svg"
+                         alt="University of Michigan Logo" id="logo">
                 </a>
                 <ul class="nav nav-pills justify-content-center">
 
@@ -66,12 +66,9 @@ <h1>{{ page.title }}</h1>
             {{ content }}
 
             <div class="footer">
-                <p>
-          Our group is primarily based in the <a href="https://www.cmu.edu/">Carnegie Mellon University</a> <a href="https://www.meche.engineering.cmu.edu/">Mechanical Engineering Department</a>, with additional affiliations in <a href="https://www.cmu.edu/engineering/materials/">Materials Science and Engineering</a>, <a href="https://www.cmu.edu/physics/">Physics</a>, and <a href="https://www.cheme.engineering.cmu.edu">Chemical Engineering</a>.
-                </p>
-                <p>
-                    <a href="https://www.cmu.edu/legal/">Legal Info</a>
-                </p>
+                <a href="https://www.engin.umich.edu/privacy-policies/">Privacy Policy</a> |
+                <a href="https://oie.umich.edu/nondiscrimination-policy-notice/" target="blank" rel="noopener">Non-Discrimination Policy</a> |
+                <a href="https://safety.engin.umich.edu/" target="blank" rel="noopener">Safety and Security</a>
             </div>
 
         </div> <!-- /container -->