Merge pull request #12 from DavisCSClub/develop

Sort members & style fix
DavisCSClub · Sep 4, 2018 · 1ab97a6 · 1ab97a6
2 parents 89019ef + 8bea34c
commit 1ab97a6
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 65 deletions.
diff --git a/components/profile/ProfileCard/index.js b/components/profile/ProfileCard/index.js
@@ -31,13 +31,13 @@ function ProfileCard({ name, bio, linkedInUrl, gitHubUrl, websiteUrl }) {
 
       <ul className="profile-social-links">
         <li>
-          {linkedInUrl && <a href={linkedInUrl}><FontAwesomeIcon icon={faLinkedIn} /></a>}
+          <a className={linkedInUrl === '#' ? 'nolink' : ''} href={linkedInUrl}><FontAwesomeIcon icon={faLinkedIn} /></a>
         </li>
         <li>
-          {gitHubUrl && <a href={gitHubUrl}><FontAwesomeIcon icon={faGithub} /></a>}
+          <a className={gitHubUrl === '#' ? 'nolink' : ''} href={gitHubUrl}><FontAwesomeIcon icon={faGithub} /></a>
         </li>
         <li>
-          {websiteUrl && <a href={websiteUrl}><FontAwesomeIcon icon={faGlobe} /></a>}
+          <a className={websiteUrl === '#' ? 'nolink' : ''} href={websiteUrl}><FontAwesomeIcon icon={faGlobe} /></a>
         </li>
       </ul>
     </div>

diff --git a/components/profile/ProfileCard/style.css b/components/profile/ProfileCard/style.css
@@ -14,14 +14,14 @@
 }
 .profile-card {
     min-height: 150px; /* temp */
-  	background: #FFFFFF;
+    background: #FFFFFF;
     width: 200px;
     z-index: 2;
-  	overflow: hidden;
+    overflow: hidden;
     opacity: 1;
     margin: 15px 15px;
-  	-webkit-box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16), 0px 3px 6px rgba(0, 0, 0, 0.23);
-  	box-shadow: 0px 3px 6px rgba(0 ,0, 0, 0.16), 0px 3px 6px rgba(0, 0, 0, 0.23);
+    -webkit-box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16), 0px 3px 6px rgba(0, 0, 0, 0.23);
+    box-shadow: 0px 3px 6px rgba(0 ,0, 0, 0.16), 0px 3px 6px rgba(0, 0, 0, 0.23);
 }
 .profile-card .card-header {
     width: auto;
@@ -68,7 +68,7 @@
     display: block;
     float: none;
     padding: 15px 0px 30px 0px;
-	  background: #FFFFFF;
+    background: #FFFFFF;
     color: #333333;
     margin-top: -20px;
     text-align: center;
@@ -80,7 +80,7 @@
     float: none;
     margin: 0px;
     padding: 15px 20px;
-	  background: #FFFFFF;
+    background: #FFFFFF;
     margin-top: -20px;
     text-align: center;
     opacity: 1;
@@ -133,6 +133,10 @@
     width: 24px !important;
 }
 
+.profile-social-links li a.nolink {
+    color: #95a5a6;
+}
+
 @-webkit-keyframes ripple {
     0% {
         transform: scale3d(0, 0, 0);

diff --git a/members.json b/members.json
@@ -27,48 +27,20 @@
     "gitHubUrl": "#",
     "websiteUrl": "#"
   },
-  {
-    "name": "Dustin Cai",
-    "bio": "Student",
-    "linkedInUrl": "#",
-    "gitHubUrl": "#",
-    "websiteUrl": "#"
-  },
   {
     "name": "Brandon Lau",
     "bio": "Student",
     "linkedInUrl": "#",
     "gitHubUrl": "#",
     "websiteUrl": "#"
   },
-  {
-    "name": "Alicia Siu",
-    "bio": "Student",
-    "linkedInUrl": "#",
-    "gitHubUrl": "#",
-    "websiteUrl": "#"
-  },
   {
     "name": "Elias Heffan",
     "bio": "Student",
     "linkedInUrl": "#",
     "gitHubUrl": "#",
     "websiteUrl": "#"
   },
-  {
-    "name": "Vivienne Zing",
-    "bio": "Student",
-    "linkedInUrl": "#",
-    "gitHubUrl": "#",
-    "websiteUrl": "#"
-  },
-  {
-    "name": "Katie Kwak",
-    "bio": "Student",
-    "linkedInUrl": "#",
-    "gitHubUrl": "#",
-    "websiteUrl": "#"
-  },
   {
     "name": "Raja Vyshnavi Sriramoju",
     "bio": "Student",
@@ -209,27 +181,13 @@
     "gitHubUrl": "#",
     "websiteUrl": "#"
   },
-  {
-    "name": "Maxim Chiao",
-    "bio": "Student",
-    "linkedInUrl": "#",
-    "gitHubUrl": "#",
-    "websiteUrl": "#"
-  },
   {
     "name": "Jessica Ma",
     "bio": "Student",
     "linkedInUrl": "#",
     "gitHubUrl": "#",
     "websiteUrl": "#"
   },
-  {
-    "name": "Kevin Lee",
-    "bio": "Student",
-    "linkedInUrl": "#",
-    "gitHubUrl": "#",
-    "websiteUrl": "#"
-  },
   {
     "name": "Travis Garcia",
     "bio": "Student",
@@ -258,13 +216,6 @@
     "gitHubUrl": "#",
     "websiteUrl": "#"
   },
-  {
-    "name": "Brandon Lau",
-    "bio": "Student",
-    "linkedInUrl": "#",
-    "gitHubUrl": "#",
-    "websiteUrl": "#"
-  },
   {
     "name": "Songwen Su",
     "bio": "Student",
@@ -363,18 +314,18 @@
     "gitHubUrl": "#",
     "websiteUrl": "#"
   },
-  {
-    "name": "Kimberly Lee",
-    "bio": "Student",
-    "linkedInUrl": "#",
-    "gitHubUrl": "#",
-    "websiteUrl": "#"
-  },
   {
     "name": "Nikhita Battula",
     "bio": "Student",
     "linkedInUrl": "#",
     "gitHubUrl": "#",
     "websiteUrl": "#"
+  },
+  { 
+    "name": "Corey Mason",
+    "bio": "Former Officer & Webmaster",
+    "linkedInUrl": "https://linkedin.com/in/corey-mason",
+    "gitHubUrl": "https://github.com/coreymason",
+    "websiteUrl": "https://coreysmason.com"
   }
 ]
diff --git a/pages/index.js b/pages/index.js
@@ -18,6 +18,7 @@ export default class HomePage extends React.Component {
   static async getInitialProps() {
     // This data may be moved online at a future date
     const membersData = require('../members.json') || false; // eslint-disable-line global-require
+    membersData.sort((a, b) => a.name < b.name ? -1 : 1);
     return { membersData };
   }