update2 26-09-2018

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Skeleton",
-  "homepage": "https://InnoD-WebTier.github.io/cal-pre-vet-club",
+  "homepage": "https://calprevet.berkeley.edu/",
   "version": "0.1.0",
   "private": true,
   "dependencies": {

src/App.js

@@ -3,13 +3,12 @@ import './App.css';
 import Navbar from './pages/Navbar.js';
 import Home from './pages/Home.js';
 import Gallery from './pages/Gallery.js';
+import Album2018 from './pages/albums/Album2018.js';
 import Album2017 from './pages/albums/Album2017.js';
 import Album2016 from './pages/albums/Album2016.js';
 import Album2015 from './pages/albums/Album2015.js';
 import Album2014 from './pages/albums/Album2014.js';
-import Album2013 from './pages/albums/Album2013.js';
-import Album2012 from './pages/albums/Album2012.js';
-import Album2011 from './pages/albums/Album2011.js';
+import Merchandise from './pages/albums/Merchandise.js';
 import Members from './pages/Members.js';
 import Officers from './pages/Officers.js';
 import Contact from './pages/Contact.js';
@@ -23,13 +22,12 @@ const Main = () => (
       <Route exact path='/members' component={Members}/>
       <Route exact path='/officers' component={Officers}/>
       <Route exact path='/contact' component={Contact}/>
+      <Route exact path='/photos/2018-2019' component={Album2018}/>
       <Route exact path='/photos/2017-2018' component={Album2017}/>
       <Route exact path='/photos/2016-2017' component={Album2016}/>
       <Route exact path='/photos/2015-2016' component={Album2015}/>
       <Route exact path='/photos/2014-2015' component={Album2014}/>
-      <Route exact path='/photos/2013-2014' component={Album2013}/>
-      <Route exact path='/photos/2012-2013' component={Album2012}/>
-      <Route exact path='/photos/2011-2012' component={Album2011}/>
+      <Route exact path='/photos/Merchandise' component={Merchandise}/>
     </Switch>
   </main>
 );

src/content/ContactContent.js

@@ -1,32 +1,37 @@
 const contactContent = [
   {
     role: "President",
-    name: "Brandon Weiss",
+    name: "Jennifer Good",
     email: "[email protected]"
   },
   {
     role: "Vice President of Internal Affairs",
-    name: "Divya Ravichandran",
+    name: "Heidi Kim",
     email: "[email protected]"
   },
   {
     role: "Vice President of External Affairs",
-    name: "Jennifer Good",
+    name: "Kristin Conner",
     email: "[email protected]"
   },
   {
     role: "Treasurer",
-    name: "Evan Chang",
+    name: "Edwin Tang",
     email: "[email protected]"
   },
   {
-    role: "Secretary & Webmaster",
-    name: "Annie Chen",
-    email: "[email protected] & [email protected]"
+    role: "Secretary",
+    name: "Sarah Borenstein",
+    email: "[email protected]"
+  },
+  {
+    role: "Webmaster",
+    name: "Casey Kwok",
+    email: "[email protected]"
   },
   {
     role: "Community and Public Relations Officer",
-    name: "Maura Meijer (Fall 2017) & Jillian Shaw (Spring 2018)",
+    name: "Alex Ripperton",
     email: "[email protected]"
   }
 ];

src/content/HomeContent.js

@@ -8,7 +8,7 @@ const homeContent = {
     "informational meetings that address students' questions about academics and obtaining animal experience."
   ],
   whyPVC: "Cal PVC prides itself in being UC Berkeley's premier resource for pre-veterinary students.  Cal PVC aims to serve its members in all academic and extracurricular endeavors, and these services are unique to Cal PVC alone.  Through the club, Cal PVC members forge long-lasting relationships with local veterinarians, enjoy priority for behind-the-scenes tours of major organizations, and receive significant aid in preparing their applications for veterinary school.  Cal PVC hosts a wealth of knowledge and experiences, and we are proud to serve the UC Berkeley veterinary community.",
-  interested: "PAY $10/SEMESTER TO GAIN...",
+  interested: "PAY $15/SEMESTER or $25 for 2 SEMESTER TO GAIN...",
   interestedList: [
     "Shadowing/volunteering opportunities with veterinarians",
     "Subsidized field trips to behind-the-scenes tours of veterinary facilities",
@@ -25,13 +25,11 @@ const homeContent = {
   requirementsList: [
     "Minimum required for active membership = 6 pts",
     "All events/activities = 1 pt** ",
-    "Members will be grouped into point tiers and awarded accordingly at the end of the year",
-    "If for some reason you aren't able to attend a social/fundraiser/meeting, you are able to satisfy 1 of the 3 categories by joining a committee!"
   ],
   subRequirementsList: [
     "General meetings/workshops = 3 pts",
     "Social = 1 pt",
-    "Fundraiser = 2 pts"
+    "Fundraiser/tabling = 2 pts"
   ]
 }
 

src/content/OfficersContent.js

@@ -2,91 +2,90 @@ import React from 'react';
 
 const officersContent = [
   {
-    name: "Brandon Weiss",
-    year: "Senior",
-    major: "Molecular & Cell Biology",
+    name: "Jennifer Good",
+    year: "Junior",
+    major: "Molecular Environmental Biology",
     position: "President",
     email: "[email protected]",
-    url: require("../images/officers/BrandonWeiss.jpg"),
+    url: require("../images/officers/JenniferGood.jpg"),
     bio: (
       <div>
-        <p>Hi Pre-vets! My name's Brandon and I am ecstatic to be serving as your President this year. I've wanted to be a veterinarian for as long as I can remember and I've been fortunate enough to work with all sorts of animals in wildlife, exotic, emergency, and small animal medicine. As of now, I'm looking into specializing in some form of small animal medicine with some wildlife and exotics thrown into the mix. Outside of academics, I love to sing, explore new places to eat around the area, shop (you can never have too many clothes), and hike! I'm always down to hang out or chat so please feel free to reach out if you have any questions or just want to talk, whether it’s related to veterinary medicine or not! Welcome to the PVC Family!
-        </p>
+        <p>Hi PVC! My name is Jennifer and I am so excited that I was chosen to be your President for this school year. I am currently a third year Molecular Environmental Biology major minoring in Spanish. Throughout high school I volunteered at a shelter as an animal socializer and at Happy Hollow Zoo in San Jose as a wildlife education ambassador. Joining PVC has opened me up to so many more opportunities to learn, such as volunteering with low cost vaccine clinics, private practices, and the veterinarian at Oakland Animal Services. I also have worked at University Veterinary Hospital for the past year as an exam room nurse! In the future, I hope to work with low income pet owners both in the US and internationally or in an emergency hospital environment.</p>
+        <p>Aside from my dreams of being a veterinarian, I enjoy spending my time playing with my cat Whiskers, watching movies, listening to music, traveling with friends, making pottery, and reading. Some other interesting facts are that I grew up in the South Bay and that I have been vegan since 2015 — if anyone else is vegan or interested in veganism, I love exploring vegan restaurants in and around Berkeley! I look forward to getting to know all of you, and I am always open to answer questions or just hang out :)</p>
       </div>
     )
   },{
-    name: "Divya Ravichandran",
-    year: "Senior",
-    major: "Molecular & Cell Biology",
+    name: "Heidi Kim",
+    year: "Junior",
+    major: "Molecular Environmental Biology",
     position: "Vice President of Internal Affairs",
     email: "[email protected]",
-    url: require("../images/officers/DivyaRavichandran.jpg"),
+    url: require("../images/officers/HeidiKim.jpg"),
     bio: (
       <div>
-        <p>Hi my name is Divya! I'm currently a senior MCB/IB major and am very excited to be your VP of Internal Affairs :) I am super passionate about veterinary medicine as I've wanted to become one since I was in elementary school. My parents were not so appreciative of my career choice and so I have spent practically my whole life trying to convince them that this is the job for me! I am not too sure about whether I want to specialize or not but I'm quite sure I want to go into small animal medicine. Besides studying, I like to spend my time baking and going out to eat thai food! Thai is by far my favorite cuisine in Berkeley, but in general if its vegetarian I'm willing to try it ;) If you ever need a buddy to get some food with, I am your gal! Can't wait to meet you all and get to know you all this year!</p>
+        <p>Hi! My name is Heidi and I’m your Internal VP for the year. I’m a 3rd year MEB major (with an animal health and behavior focus!) and I love all animals, big and small, furry or scale-y! Becoming a vet was a childhood dream I always doubted would be the real career path I chose, but after joining PVC my freshman year, I realized that I couldn’t imagine myself not walking this path. I’m so excited to pass on the legacy and help you all realize your passions and dreams, too! In terms of interests, I’m looking into lab vet medicine, wildlife/exotics, shelter, emergency, or animal behavior research, but who knows where I’ll end up in the years to come? :)</p> 
+        <p>When I’m not busy with PVC, I’m catching it up with my friends on foodventures all around Berkeley and LA, where I grew up. (Koreatown, born and raised!) I really love trying new places to eat, so hit me up with all your best recommendations! ;) Some other things I love are traveling, photography, interior designing, anything DIY, graphic design, binge-watching kdrama, and crying over cute animal videos. Feel free to hit me up anytime and show me cute pictures of your pets! I will seriously love both your pet and you with all my heart ❤️”</p>
       </div>
     )
   },{
-    name: "Jennifer Good",
-    year: "Sophomore",
-    major: "Molecular Environmental Biology",
+    name: "Kristin Conner",
+    year: "Senior",
+    major: "MCB Neurobiology",
     position: "Vice President of External Affairs",
     email: "[email protected]",
-    url: require("../images/officers/JenniferGood.jpg"),
+    url: require("../images/officers/KristinConner.jpg"),
     bio: (
       <div>
-        <p>Hi PVC! My name is Jennifer and I am so excited that I was chosen to be your Vice President of External Affairs for this school year. I am currently a second year Molecular Environmental Biology major minoring in Spanish. Throughout high school I volunteered at a shelter as an animal socializer and at Happy Hollow Zoo in San Jose as a wildlife education ambassador. Joining PVC has opened me up to so many more opportunities to learn, such as volunteering with low cost vaccine clinics, private practices, and the veterinarian at Oakland Animal Services. My goal as EVP is to help all of you find a variety of ways to gain experience within the veterinary field! In the future, I hope to work with low income pet owners both in the US and internationally or in an emergency hospital environment.</p>
-        <p>Aside from my dreams of being a veterinarian, I enjoy spending my time playing with my cat Whiskers, watching movies, listening to music, traveling with friends, making pottery, and reading. Some other interesting facts are that I grew up in the South Bay and that I have been vegan since 2015 — if anyone else is vegan or interested in veganism, I love exploring vegan restaurants in and around Berkeley! I look forward to getting to know all of you, and I am always open to answer questions or just hang out :)</p>
-      </div>
+        <p>Hi, I’m Kristin. I’m a fourth year MCB Neurobiology major, and being in MCB, I found most of my peers were pre-med, so I thought  I was too. But as the semesters passed, I realized I wasn’t necessarily interested in going to medical school, and I felt lost. It wasn’t until I started looking at the things I liked, like volunteering as a dog walker at BACS, and cuddling my pupper, that I began to pursue this path in veterninary medicine. I have had so many opportunities, from interning at a wildlife center to now working at PETS Referral Center in Berkeley as an Assistant Vet Tech. I hope to give you all the same opportunities that helped me realize this was the path I wanted to take. Please feel free to email me with suggestions of field trips or workshops that could help enrich your experience here at Cal as a Pre-Vet. When not thinking about animals all day, I love hiking,  working out, painting, and listening to music. I also am a part of Improv4Charity, and love improv and theatre!</p>
+        </div>
     )
   },{
-    name: "Evan Chang",
-    year: "Junior",
-    major: "Integrative Biology",
+    name: "Edwin Tang",
+    year: "Senior",
+    major: "Bioengineering",
     position: "Treasurer",
     email: "[email protected]",
-    url: require("../images/officers/EvanChang.jpg"),
+    url: require("../images/officers/EdwinTang.jpg"),
     bio: (
       <div>
-        <p>Hello! I'm Evan, and I'll be your treasurer for this year! I've always wanted to be a veterinarian ever since I was young. When I was a kid, my family enjoyed taking trips to the San Francisco Zoo because at the time it was relatively cheap and I would be able to entertain myself by learning about all the animals. As a result, I am now interested in exotic animal medicine and would like to eventually work in a zoo. I was born and raised in the Bay Area and have a bunny named Tubby back in my home in Millbrae. In my free time, I like to play Pokémon or chill with my a cappella group. Sidenote: I'm carrying a bunch of bread cuz it's like I'm holding a bunch of corgi butts :P</p>
-
-        <p>Can't wait to meet all of you and I'm excited to get to know you guys :D</p>
+        <p>Hello. I’m Edwin, your treasurer for the year. I’m a 4th year Bioengineering student. I have loved animals, both large and small, for all my life, but I actually only decided to become pre-vet at the end of my 2nd year at Cal. I was able to find PVC after a quick google search about veterinary medicine at Berkeley, and it has been a great help in providing opportunities and advice on how I could jump into the field. Since PVC has given so much to me, I wanted to give back and help other students experience the opportunities that I have. In my free time, I enjoy eating, napping, listening to music, reading, and watching movies (usually horror). If you have any fundraising ideas or just want to hang out, feel free to hit me up on facebook or through email.</p>
      </div>
     )
   },{
-    name: "Maura Meijer",
-    year: "Junior",
-    major: "Molecular Environmental Biology",
-    position: "Community & Public Relations Officer (Fall 2017)",
-    email: "calprevet.pr@gmail.com",
-    url: require("../images/officers/MauraMeijer.jpg"),
+    name: "Daisy Han",
+    year: "Senior",
+    major: "Integrative Biology",
+    position: "Academic Advisor and Historian",
+    email: "calprevet.historian@gmail.com",
+    url: require("../images/officers/DaisyHan.jpg"),
     bio: (
       <div>
-        <p>Hi Cal PVC! I’m Maura, a third year MEB major, and I’m so excited be your Community and Public Relations Officer this year; I have so many ideas for fun things to do! I have been determined to become a veterinarian since fifth grade, when my bestie and I made a pact to both become vets and run a practice together. These days, I’m not quite sure what area of veterinary practice I want to go into, but I’m currently interested in looking into shelter medicine or exotics like reptiles. I was born and raised in the Bay Area, and have an adorable chocolate lab back home. If you have any questions, or just want to see pictures of my goofy pup, don’t be afraid to ask- I won’t bite. ;P</p>
+        <p>Hi! I’m Daisy, and I am a 4th year majoring in IB. I’m going to be the academic advisor/historian for the year, so If you have any questions regarding requirements classes, scheduling, or anything about schools in general, message or email me!</p>
      </div>
     )
   },{
-    name: "Jillian Shaw",
-    year: "Sophomore",
+    name: "Sarah Borenstein",
+    year: "Junior",
     major: "Molecular Environmental Biology",
-    position: "Community & Public Relations Officer (Spring 2018)",
-    email: "calprevet.pr@gmail.com",
-    url: require("../images/officers/JillianShaw.jpg"),
+    position: "Secretary and Public Relations",
+    email: "calprevet.secretary@gmail.com",
+    url: require("../images/officers/SarahBorenstein.jpg"),
     bio: (
       <div>
-        <p>Hello Cal PVC! My name is Jillian and I'm a second year MEB major and I am stoked to be one of your Public Relations officers along with Maura. I grew up riding horses and always thought about becoming a vet (though I am still deciding if it is really the right career path for me)! In addition to PVC, at Cal I have joined greek life, participated in the Berkeley Project, played Club Lacrosse and I plan to work in Dr. Wildsoet's optometry lab with guinea pigs this fall! I love hiking, animals, exploring new places, and boba! So if you're ever down for a spontaneous adventure, hit me up! I love meeting new people! :)</p>
+        <p>Hi! I’m Sarah. I’m the PVC secretary and public relations officer this year. I’m a junior majoring in MEB. I’ve always always loved animals, so my career goals have always revolved around working with animals in some way. Becoming a veterinarian would be a dream come true. I’m especially interested in zoo, exotic, and marine medicine, but I enjoy learning more about all areas of veterinary medicine. In my spare time, I enjoy watching TV shows and movies (especially horror and mystery, but also Disney stuff) and I will never say no to free food. If you ever want to talk about club activities or if you have any ideas for socials you’d like to see us do, come talk to me! </p>
      </div>
     )
   },{
-    name: "Annie Chen",
-    year: "Junior",
-    major: "Integrative Biology Major",
-    position: "Secretary & Webmaster",
+    name: "Casey Kwok",
+    year: "Sophomore",
+    major: "Molecular Environmental Biology, Data Science",
+    position: "Webmaster",
     email: "[email protected]",
-    url: require("../images/officers/AnnieChen.jpg"),
+    url: require("../images/officers/CaseyKwok.jpg"),
     bio: (
       <div>
-        <p>Hello! I'm Annie and I'm excited to be your secretary and webmaster this year! For as long as I can remember, I have wanted to be a veterinarian and I had apparently learned to walk as a baby because I wanted to chase after my pug! I am not quite sure what kind of veterinarian I am interested in becoming however; since it has been switching between small animal, exotic, equine, etc. Besides Cal PVC, I am also involved in Circle K International and I currently work in the Animal Discovery Room at the Lawrence Hall of Science (come visit me sometime!) I am originally from Irvine in SoCal and I love bowling, ice skating, listening to music, visiting the animal shelter, and watching baseball/kdrama. I can't wait to meet you all and welcome to Cal PVC!</p>
+        <p>Hello! I'm Casey and I'm excited to be your webmaster this year! I am currenly doubling in Molecular Environmental Biology and Data Science. I've always loved animals and have been interested in veterinrian medicine. And PVC have given me the opportunities to explore my passion. I am particularly interested in the exotic veterinarian medicine and wildlife conservation, though I've grown to really appreciate Shelter medicine too. </p>
+        <p>Apart from playing with animals, I also like to play the saxaphone and am currently trying to learn some Wushu. I also really enjoy cooking and watching all kinds of TV shows. So if you'd like, I'm always down to cook and binge watch together :) I'm really excited to meet you all and welcome to Cal PVC!</p>
      </div>
     )
   }