add setup for two website links for projects on Research page; add ne…

…w members

.github/workflows/jekyll.yml

@@ -1,24 +1,86 @@
-name: Jekyll site CI Action # updates the deploy-server branch for changes made to master branch
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+# Sample workflow for building and deploying a Jekyll site to GitHub Pages
+name: Deploy Jekyll site to Pages
 
 on:
+  # Runs on pushes targeting the default branch
   push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+    branches: ["master"]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: write
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
 
 jobs:
+  # Build job
   build:
-
     runs-on: ubuntu-latest
-
     steps:
-    - uses: actions/checkout@v2
-    - name: Jekyll Actions
-      # You may pin to the exact commit or the version.
-      # uses: helaili/jekyll-action@d305e465c911226c731afb6db07c8bde20e03ced
-      uses: helaili/[email protected]
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        target_branch: deploy-server # optional
-        keep_history: true
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@8575951200e472d5f2d95c625da0c7bec8217c42 # v1.161.0
+        with:
+          ruby-version: '3.1' # Not needed with a .ruby-version file
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+          cache-version: 0 # Increment this number if you need to re-download cached gems
+      - name: Setup Pages
+        id: pages
+        uses: actions/configure-pages@v5
+      - name: Build with Jekyll
+        # Outputs to the './_site' directory by default
+        run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
+        env:
+          JEKYLL_ENV: production
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: site
+          path: _site
 
+  # Deployment job
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      # - name: Deploy to GitHub Pages
+      #   id: deployment
+      #   uses: actions/deploy-pages@v4
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Download artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: site
+          path: _site
+      - name: Deploy to deploy-server branch
+        env:          
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          git config --global user.name 'github-actions[bot]'
+          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+          git pull
+          git checkout deploy-server
+          cp -r ./_site/* .
+          rm -rf ./_site/
+          git add .
+          git commit -m "Deploy Jekyll site"
+          git push origin deploy-server

_data/research.yml

@@ -1,6 +1,9 @@
 - title: "Robot-assisted Feeding"
   link: "https://emprise.cs.cornell.edu/bitetransfer/"
-  ytid: "CJ66x7JfqG0"
+  link_text: "Bite Transfer"
+  link_2: "https://flair-robot.github.io/"
+  link_2_text: "Bite Acquisition"
+  ytid: "ad06vJWldYo"
   description: "Eating is an activity of daily living (ADL) and losing the
   ability to self-feed can be devastating. Robots have the potential to help
   with these tasks. Successful robotic assistive feeding depends on reliable

_data/team_members.yml

@@ -214,6 +214,20 @@
   bio: "Amber is a sophomore majoring in Electrical and Computer Engineering and minoring in Computer Science. She is interested in assistive robotics and brining about positive change. Outside of academics, she enjoys spending time with friends, eating good food, and playing video games. She also loves playing sports, but doesn't have much time to nowadays. She is open to playing tennis, ping pong, and other fun activities."
   type: 4-6
 
+- name: Qi Chen
+  photo: Qi_Chen.jpg
+  info: Undergraduate Student
+  email: qc74 AT cornell dot edu
+  bio: "Qi is a junior majoring in Computer Science and Electrical Engineering. He enjoys Robotics and wants to make robots that serve people better; he would like to contribute to Robotics with interdisciplinary knowledge and develop robots through both software and hardware fields. When he's not working on school work, you may find him taking photos of landscape around the campus."
+  type: 4-6
+
+- name: Alexis Hao
+  photo: Alexis_Hao.jpg
+  info: Undergraduate Student
+  email: yh826 AT cornell dot edu
+  bio: "Alexis just graduated from Cornell in May 2024 with a Bachelor's degree in Computer Science and Psychology. Her research interests include learning for robot manipulation and human-robot interaction. Outside of research, you can find her reading about neuroscience and psychology or trying to ski without falling."
+  type: 4-7
+
 - name: Shuaixing Chen
   photo: Shuaixing_Chen.jpg
   info: Undergraduate Intern

_pages/research.html

@@ -16,7 +16,12 @@ <h2 class="project-title {% unless project.link %}no-link-space{% endunless %}">
       </h2>
 
       {% if project.link %}
-      <a href="{{ project.link }}" class="project-website-link" target="_blank" rel="noopener noreferrer">Project Website</a>
+      {% assign link_text = project.link_text | default: "Project Website" %}
+      <a href="{{ project.link }}" class="project-website-link" target="_blank" rel="noopener noreferrer">{{ link_text }}</a>
+      {% endif %}
+      {% if project.link_2 %}
+      {% assign link_2_text = project.link_2_text | default: "Project Website" %}
+      | <a href="{{ project.link_2 }}" class="project-website-link" target="_blank" rel="noopener noreferrer">{{ link_2_text }}</a>
       {% endif %}
 
       <div class="embed-responsive embed-responsive-16by9">

assets/css/people.css

@@ -30,7 +30,7 @@
 
 .grid-container {
   display: grid;
-  grid-template-rows: 50px 1fr 50px 1fr 1fr 50px 1fr 1fr 50px 1fr 1fr 1fr 1fr 1fr 1fr 50px 1fr 50px 1fr 50px 1fr;
+  grid-template-rows: 50px 1fr 50px 1fr 1fr 50px 1fr 1fr 50px 1fr 1fr 1fr 1fr 1fr 1fr 1fr 50px 1fr 50px 1fr 50px 1fr;
   grid-template-columns: repeat(3, 1fr);
   /* Each person gets his/her column */
 }
@@ -130,44 +130,48 @@
   grid-row: 15 / span 1;
 }
 
+.type-4-7 {
+  grid-row: 16 / span 1;
+}
+
 /* Visiting interns */
 #row-label-5 {
-  grid-row: 16 / span 1;
+  grid-row: 17 / span 1;
   grid-column: 1 / span 3;
   font-weight: 700;
   padding-left: 50px;
 }
 
 .type-5-1 {
-  grid-row: 17 / span 1;
+  grid-row: 18 / span 1;
 }
 
 /* Honorary lab members */
 #row-label-6 {
-  grid-row: 18 / span 1;
+  grid-row: 19 / span 1;
   grid-column: 1 / span 3;
   font-weight: 700;
   padding-left: 50px;
 }
 
 .type-6 {
-  grid-row: 19 / span 1;
+  grid-row: 20 / span 1;
 }
 
 /* Robots */
 #row-label-7 {
-  grid-row: 20 / span 1;
+  grid-row: 21 / span 1;
   grid-column: 1 / span 3;
   font-weight: 700;
   padding-left: 50px;
 }
 
 .type-7-1 {
-  grid-row: 21 / span 1;
+  grid-row: 22 / span 1;
 }
 
 .type-7-2 {
-  grid-row: 22 / span 1;
+  grid-row: 23 / span 1;
 }
 
 /* Lab alumni */