Merge branch 'master' into myMemberFile

gatsby-config.js

@@ -8,6 +8,7 @@ module.exports = {
   plugins: [
     `gatsby-plugin-react-helmet`,
     `gatsby-transformer-sharp`,
+    `gatsby-plugin-meta-redirect`,
     {
       resolve: `gatsby-source-filesystem`,
       options: {

gatsby-node.js

@@ -100,7 +100,7 @@ exports.createSchemaCustomization = ({ actions }) => {
 }
 
 exports.createPages = async ({ graphql, actions, reporter }) => {
-  const { createPage } = actions
+  const { createPage, createRedirect } = actions
 
   /**
    * Create pages for members
@@ -236,4 +236,20 @@ exports.createPages = async ({ graphql, actions, reporter }) => {
       }
     },
   })
+
+  // Create redirect for mobile feedback
+
+  // HACK: This is hardcoded for now, in the future we probably want a more
+  // scalable way to handle link shortening
+  const feedbackForms = [
+    { slug: 'android', url: 'https://airtable.com/appFRa4NQvNMEbWsA/shrn4VbSQa8QDj8OG' },
+    { slug: 'ios', url: 'https://airtable.com/appFRa4NQvNMEbWsA/shrVrNXT4PpI7nqvD' },
+  ]
+
+  feedbackForms.forEach(({ slug, url }) => {
+    createRedirect({
+      fromPath: `/feedback/${slug}`,
+      toPath: url,
+    })
+  })
 }

package.json

@@ -19,6 +19,7 @@
     "gatsby-plugin-feed": "^2.13.0",
     "gatsby-plugin-google-analytics": "^2.11.0",
     "gatsby-plugin-manifest": "^2.12.0",
+    "gatsby-plugin-meta-redirect": "^1.1.1",
     "gatsby-plugin-offline": "^3.10.0",
     "gatsby-plugin-react-helmet": "^3.10.0",
     "gatsby-plugin-remote-images": "^2.1.0",

src/components/Apply/ApplicationProcess.tsx

@@ -17,7 +17,7 @@ export const ApplicationProcess = () => (
         Penn Labs is really like.
       </li>
       <li>
-        <b>Technical challenge</b> where you can show off your skills. You'll be
+        <b>Technical challenge</b> where you can show off your skills. You’ll be
         given a few days to complete a take-home challenge. We hold an office
         hours event and are always available via email for questions.
       </li>

src/components/Apply/OpenRoles.tsx

@@ -33,8 +33,8 @@ export const OpenRoles = () => (
             to know you by:
           </P>
           <ul>
-            <li>Backend web</li>
-            <li>Frontend web</li>
+            <li>Backend Web</li>
+            <li>Frontend Web</li>
             <li>DevOps</li>
             <li>Android</li>
             <li>iOS</li>

src/components/Products/Hero.tsx

@@ -8,7 +8,7 @@ export const ProductsHero = () => {
     <Hero
       Image={<Img src={productsPath} fullWidth mb0 />}
       title="Products"
-      subtitle="From academics to campus life, to everything in between"
+      subtitle="From academics to campus life, and everything in between"
       body={`
         Our products are intended to solve everyday problems for you, so that
         you can focus on the more important parts of life at Penn.

src/components/Resources/Hero.tsx

@@ -8,10 +8,10 @@ export const ResourcesHero = () => (
     title="Resources"
     subtitle="Tutorials and data for building your own products"
     body={`
-      We're dedicated to giving back to the community—here are some guides
-      and tutorials we've written to help everybody build products like
+      We’re dedicated to giving back to the community—here are some guides
+      and tutorials we’ve written to help everybody build products like
       ours. We also maintain free APIs and SDKs with support for
-      Javascript, Python, Ruby and OAuth.
+      Javascript, Python, Ruby, and OAuth.
     `}
     Image={<Img src={deskPath} fullWidth mb0 />}
   />

src/components/Team/Teams.tsx

@@ -11,15 +11,17 @@ interface ITeams {
 const TEAM_LEAD = 'Team Lead'
 
 const leadsFirst = (members: IMember[]): IMember[] => {
+  if (!members) return []
+
   return members.sort((m1, m2): number => {
     const isLead1 = m1.roles.indexOf(TEAM_LEAD) !== -1
     const isLead2 = m2.roles.indexOf(TEAM_LEAD) !== -1
-    if (isLead1) {
+    if (isLead1 === isLead2) {
+      return m1.name.localeCompare(m2.name)
+    } else if (isLead1) {
       return -1
-    } else if (isLead2) {
-      return 1
     } else {
-      return m1.name.localeCompare(m2.name)
+      return 1
     }
   })
 }

src/json/members/aanten.json → src/json/alumni/aanten.json

@@ -14,7 +14,7 @@
   "website": "",
   "github": "",
   "semester_joined": "2021C",
-  "alumnus": false,
+  "alumnus": true,
   "graduation_year": 2024,
   "job": null
-}
+}

src/json/alumni/anagwekar.json

@@ -0,0 +1,19 @@
+{
+  "name": "Ansh Nagwekar",
+  "pennkey": "nagwekar",
+  "major": "NETS",
+  "school": "Engineering",
+  "bio": "Hey! My name is Ansh Nagwekar, and I am a freshman studying NETS at Penn. Outside the lab, you can probably find me hiking up a mountain, playing spikeball, eating Airheads, or overanalyzing song lyrics!",
+  "hometown": "San Jose, California",
+  "team": "Penn Courses",
+  "roles": ["Backend Engineer"],
+  "photo": "https://i.imgur.com/LITbDoC.jpg?1",
+  "linkedin": "https://www.linkedin.com/in/ansh-nagwekar/",
+  "website": "",
+  "github": "https://github.com/anshnagwekar",
+  "semester_joined": "2022A",
+  "alumnus": true,
+  "graduation_year": 2025,
+  "job": null
+}
+

src/json/alumni/bqle.json

@@ -0,0 +1,19 @@
+{
+  "name": "Benjamin Le",
+  "pennkey": "bqle",
+  "major": "Computer Science",
+  "school": "Engineering",
+  "bio": "Hi! I'm a freshman from Vietnam and I'm a backend engineer for OHQ. In my freetime, I like to watch movie summaries and take long walks",
+  "hometown": "Ho Chi Minh City, Vietnam",
+  "team": "Office Hours Queue",
+  "roles": ["Backend Engineer"],
+  "photo": "https://i.imgur.com/RfPYyuL.jpg",
+  "linkedin": "https://www.linkedin.com/in/bqle/",
+  "website": "",
+  "github": "https://github.com/bqle",
+  "semester_joined": "2021C",
+  "alumnus": true,
+  "graduation_year": 2025,
+  "job": null
+}
+

src/json/members/brandw.json → src/json/alumni/brandw.json

@@ -12,7 +12,7 @@
   "website": "https://www.brandonwang.com/",
   "github": "https://github.com/brandonwang1/",
   "semester_joined": "2020C",
-  "alumnus": false,
+  "alumnus": true,
   "graduation_year": 2024,
   "job": null
 }

src/json/alumni/dfeng678.json

@@ -0,0 +1,19 @@
+{
+  "name": "David Feng",
+  "pennkey": "dfeng678",
+  "major": "Computer Science",
+  "school": "Engineering",
+  "bio": "",
+  "hometown": "Albuquerque, New Mexico",
+  "team": "Penn Clubs",
+  "roles": ["Backend Engineer"],
+  "photo": "https://i.imgur.com/PHuZxIT.jpg",
+  "linkedin": "https://www.linkedin.com/in/david-feng-8b601921b/",
+  "website": "",
+  "github": "https://github.com/Dfeng6789",
+  "semester_joined": "2021C",
+  "alumnus": true,
+  "graduation_year": 2024,
+  "job": null
+}
+

src/json/members/huangl24.json → src/json/alumni/huangl24.json

@@ -12,7 +12,7 @@
   "website": "",
   "github": "https://github.com/lhuang19",
   "semester_joined": "2021A",
-  "alumnus": false,
+  "alumnus": true,
   "graduation_year": 2024,
   "job": null
 }

src/json/members/huhelen.json → src/json/alumni/huhelen.json

@@ -11,6 +11,6 @@
   "website": "",
   "github": "",
   "semester_joined": "2023A",
-  "alumnus": false,
+  "alumnus": true,
   "graduation_year": 2025
 }

src/json/members/jayvish.json → src/json/alumni/jayvish.json

@@ -12,7 +12,7 @@
   "website": "",
   "github": "https://github.com/JayVish",
   "semester_joined": "2020C",
-  "alumnus": false,
+  "alumnus": true,
   "graduation_year": 2024,
   "job": null
 }

src/json/members/jkao97.json → src/json/alumni/jkao97.json

@@ -14,7 +14,7 @@
   "website": "https://jonathankao97.com/",
   "github": "https://github.com/jonathankao97",
   "semester_joined": "2021C",
-  "alumnus": false,
+  "alumnus": true,
   "graduation_year": 2024,
   "job": null
-}
+}

src/json/members/jxiao23.json → src/json/alumni/jxiao23.json

@@ -12,7 +12,7 @@
   "website": "http://jeffreyxiao.com/",
   "github": "https://github.com/jxiao",
   "semester_joined": "2020C",
-  "alumnus": false,
+  "alumnus": true,
   "graduation_year": 2023,
   "job": null
 }

src/json/members/ksai.json → src/json/alumni/ksai.json

@@ -12,7 +12,7 @@
   "website": null,
   "github": "https://github.com/kspadman",
   "semester_joined": "2022A",
-  "alumnus": false,
+  "alumnus": true,
   "graduation_year": 2025,
   "job": null
-}
+}

src/json/alumni/mattrh.json

@@ -0,0 +1,18 @@
+{
+  "name": "Matthew Rosca-Halmagean",
+  "pennkey": "mattrh",
+  "major": "Computer Science + Finance",
+  "school": "Engineering & Wharton",
+  "bio": "Hey! I'm a team lead and full stack engineer working on Penn Mobile Portal. My passions include understanding obscure blockchain applications and building products that people love. In my free time, you can usually find me listening to music, learning something new, or trying a new restaurant in Philly!",
+  "hometown": "Houston, TX",
+  "team": "Penn Mobile",
+  "roles": ["Team Lead", "Full Stack Engineer"],
+  "photo": "https://i.imgur.com/JciQvbb.jpg",
+  "linkedin": "https://www.linkedin.com/in/matthew-rosca-halmagean/",
+  "website": "",
+  "github": "https://github.com/matthewrh",
+  "semester_joined": "2019C",
+  "alumnus": true,
+  "graduation_year": 2023,
+  "job": null
+}

src/json/members/raunaqs.json → src/json/alumni/raunaqs.json

@@ -12,7 +12,7 @@
   "website": "",
   "github": "https://github.com/raunaqsingh2020/",
   "semester_joined": "2020C",
-  "alumnus": false,
+  "alumnus": true,
   "graduation_year": 2024,
   "job": null
 }

src/json/alumni/singhvik.json

@@ -0,0 +1,18 @@
+{
+  "name": "Vikram Singh",
+  "pennkey": "singhvik",
+  "major": "Computer Science",
+  "school": "Engineering",
+  "bio": "coffee addict, mediocre tennis player, insecure coder.",
+  "hometown": "Hong Kong",
+  "team": "Platform",
+  "roles": ["Backend Engineer"],
+  "photo": "https://i.imgur.com/e9i9TRn.jpg",
+  "linkedin": "https://www.linkedin.com/in/vikram-singh-2002/",
+  "github": "https://github.com/vsingh18567",
+  "website": "",
+  "semester_joined": "2021A",
+  "alumnus": true,
+  "graduation_year": 2024,
+  "job": null
+}

src/json/alumni/szhang25.json

@@ -0,0 +1,19 @@
+{
+  "name": "Lingzi(Susan) Zhang",
+  "pennkey": "szhang25",
+  "major": "Computer Science",
+  "school": "Engineering",
+  "bio": "Hi, I'm Susan! I'm studying CS in engineering and outside of coding, I enjoy trying different boba stores, watching animes, and taking walks.",
+  "hometown": "Dallas, Texas/Shenzhen, China",
+  "team": "Penn Courses",
+  "roles": ["Frontend Engineer"],
+  "photo": "https://i.imgur.com/yARr9Dv.png",
+  "linkedin": "https://www.linkedin.com/in/lingzi-susan-zhang/",
+  "website": "https://lingzi-susan-zhang.web.app/",
+  "github": "https://github.com/susanzzz123",
+  "semester_joined": "2022C",
+  "alumnus": true,
+  "graduation_year": 2025,
+  "job": null
+}
+

src/json/members/tlshaw.json → src/json/alumni/tlshaw.json

@@ -12,7 +12,7 @@
   "website": null,
   "github": "https://github.com/printer83mph",
   "semester_joined": "2021A",
-  "alumnus": false,
+  "alumnus": true,
   "graduation_year": 2025,
   "job": null
 }

src/json/alumni/vincetiu.json

@@ -0,0 +1,19 @@
+{
+  "name": "Vincent Tiu",
+  "pennkey": "vincetiu",
+  "major": "Computer Science",
+  "school": "Engineering",
+  "bio": "Hey, my name's Vince and I'm a DevOps engineer studying Computer Science! Outside of coding, I love playing basketball, eating ice cream and watching anime. I also love meeting new people and going to hackathons, so feel free to reach out!",
+  "hometown": "Manila, Philippines",
+  "team": "Platform",
+  "roles": [
+      "DevOps"
+  ],
+  "photo": "https://i.imgur.com/1Ct4Yu7.jpg",
+  "linkedin": "https://www.linkedin.com/in/vincetiu8/",
+  "github": "https://github.com/vincetiu8/",
+  "semester_joined": "2022C",
+  "alumnus": true,
+  "graduation_year": 2026,
+  "job": null
+}

src/json/members/wjhliang.json → src/json/alumni/wjhliang.json

@@ -12,7 +12,7 @@
   "website": "https://www.seas.upenn.edu/~wjhliang/",
   "github": "https://github.com/willjhliang/",
   "semester_joined": "2022C",
-  "alumnus": false,
+  "alumnus": true,
   "graduation_year": 2025,
   "job": null
 }

src/json/members/advitr.json

@@ -0,0 +1,19 @@
+{
+    "name": "Advit Ranawade",
+    "pennkey": "advitr",
+    "major": "Computer Science, Physics", 
+    "school": "SEAS, College",
+    "bio": "Hey, I'm Advit, a freshman in VIPER studying Computer Science and Physics.",
+    "hometown": "Mumbai, India",
+    "team": "Penn Courses",
+    "roles": [
+        "Backend Engineer" 
+    ],
+    "photo": "https://i.imgur.com/Fts4rJe.jpeg",
+    "linkedin": "https://www.linkedin.com/in/advit-ranawade-79153b243/",
+    "github": "https://github.com/AdvitRanawadePenn",
+    "semester_joined": "2024A",
+    "alumnus": false,
+    "graduation_year": 2027,
+    "job": null
+}

src/json/members/alexb.json

@@ -7,7 +7,8 @@
     "hometown": "Melbourne, FL",
     "team": "Penn Courses",
     "roles": [
-        "Backend"
+        "Backend Engineer",
+        "Team Lead"
     ],
     "photo": "https://i.imgur.com/j1qoSMK.jpg",
     "linkedin": "https://www.linkedin.com/in/alexander-budko-41baa7252/",
@@ -16,4 +17,4 @@
     "alumnus": false,
     "graduation_year": 2026,
     "job": null
-}
+}