fix typos, move landing page apply, new team pics

tiffperumpail · Jan 7, 2017 · 94d58e7 · 94d58e7
1 parent 9bddb65
commit 94d58e7
Show file tree

Hide file tree

Showing 9 changed files with 117 additions and 14 deletions.
diff --git a/css/style.css b/css/style.css
diff --git a/img/people/kevin.jpg b/img/people/kevin.jpg
diff --git a/img/people/placeholder.jpg b/img/people/placeholder.jpg
diff --git a/js/controllers/mentors-controller.js b/js/controllers/mentors-controller.js
@@ -8,7 +8,7 @@
       { 'date': '1/17 - 1/20', 'title': 'Interviews' },
       { 'date': '1/22', 'title': 'Interview results' },
       { 'date': '1/29', 'title': 'Orientation' },
-      { 'date': '2/5', 'title': 'Mentoring beings' }
+      { 'date': '2/5', 'title': 'Mentoring begins' }
     ];
   });
 })();
diff --git a/js/controllers/team-controller.js b/js/controllers/team-controller.js
@@ -1,7 +1,79 @@
 (function() {
   angular.module('CSM')
   .controller('TeamController', function($scope) {
-    $scope.officers = [
+    const allOfficers = [[
+      {
+        "name": "Fahad Kamran",
+        "img": "fahad.jpg",
+        "position": "President"
+      },
+
+      {
+        "name": "Joseph Jiang",
+        "img": "joseph.jpg",
+        "position": "Interal Vice President"
+      },
+
+      {
+        "name": "Anwar Baroudi",
+        "img": "anwar.jpg",
+        "position": "External Vice President"
+      },
+
+      {
+        "name": "Kenneth Zhou",
+        "img": "kenneth.jpg",
+        "position": "Socials"
+      },
+
+      {
+        "name": "Jiana Huang",
+        "img": "jiana.jpg",
+        "position": "Communications"
+      },
+
+      {
+        "name": "Colby Guan",
+        "img": "colby.jpg",
+        "position": "Technology"
+      },
+
+      {
+        "name": "Paul Bitutsky",
+        "img": "placeholder.jpg",
+        "position": "CS 61A Coordinator"
+      },
+
+      {
+        "name": "Katya Stukalova",
+        "img": "katya.jpg",
+        "position": "CS 61A Coordinator"
+      },
+
+      {
+        "name": "Byung Choi",
+        "img": "byung.jpg",
+        "position": "CS 61B Coordinator"
+      },
+
+      {
+        "name": "Kevin Lin",
+        "img": "kevin.jpg",
+        "position": "CS 61B Coordinator"
+      },
+
+      {
+        "name": "Jerry Huang",
+        "img": "placeholder.jpg",
+        "position": "CS 70 Coordinator"
+      },
+
+      {
+        "name": "Peijie Li",
+        "img": "placeholder.jpg",
+        "position": "CS 70 Coordinator"
+      },
+    ], [
       {
         "name": "Fahad Kamran",
         "img": "fahad.jpg",
@@ -21,7 +93,7 @@
       },
 
       {
-        "name": "Joseph jiang",
+        "name": "Joseph Jiang",
         "img": "joseph.jpg",
         "position": "Socials"
       },
@@ -73,6 +145,14 @@
         "img": "albert.jpg",
         "position": "CS 70 Coordinator"
       },
-    ];
+    ]];
+
+    $scope.activeTeam = 0;
+    $scope.officers = allOfficers[0];
+
+    $scope.toggleTeam = function() {
+      $scope.activeTeam = 1 - $scope.activeTeam;
+      $scope.officers = allOfficers[$scope.activeTeam];
+    }
   });
 })();
diff --git a/sass/cover.scss b/sass/cover.scss
@@ -20,11 +20,6 @@
       font-family: $open-sans;
       font-weight: 300;
     }
-
-    h6 {
-      font-family: $open-sans;
-      font-weight: 800;
-    }
   }
 }
 
@@ -35,3 +30,21 @@
   top: calc(-500px - 2em);
   height: 100%;
 }
+
+.apply-banner {
+  position: absolute;
+  cursor: pointer;
+  width: 100%;
+  text-align: center;
+  top: 350px;
+}
+.apply-text {
+  text-transform: uppercase;
+  font-size: 1.0rem;
+  display: inline-block;
+  padding: 12px 24px;
+  border-radius: 4px;
+  background-color: #66bb6a;
+  color: #fff;
+  font-weight: 300;
+}
diff --git a/sass/team.scss b/sass/team.scss
@@ -23,4 +23,11 @@
       color: #777;
     }
   }
+
+  .team-title-inactive {
+    font-size: 0.8em;
+    color: #757575;
+    text-decoration: underline;
+    cursor: pointer;
+  }
 }
diff --git a/templates/pages/home/index.html b/templates/pages/home/index.html
@@ -4,15 +4,15 @@
       <div class="text-container valign center">
         <h3 class="white-text">Computer Science Mentors</h3>
         <h5 class="white-text subtitle">Assisting, teaching, and mentoring services for introductory computer science courses.</h5>
-        <br>
-        <h6 class="white-text subtitle">Mentor applications for Spring 2017 are now open!</h6>
       </div>
     </div>
     <div class="cover-darken"></div>
     <img class="cover-img" src="img/soda_hall.jpg">
   </div>
+  <div class="apply-banner"><a href="#/mentors" class="apply-text">Apply to mentor for Spring 2017 !</a></div>
 </div>
 
+
 <section class="three-column">
   <div class="container">
     <div class="row center">

diff --git a/templates/pages/team/index.html b/templates/pages/team/index.html
@@ -1,5 +1,8 @@
 <section class="row center team" ng-controller="TeamController as teamCtrl">
-  <h5 class="subtitle">Fall 2016 Team</h5>
+  <h5 class="subtitle">
+    <span class="team-title" ng-class="{'team-title-inactive': activeTeam === 1}" ng-click="toggleTeam()">Spring 2017 Team</span> |
+    <span class="team-title" ng-class="{'team-title-inactive': activeTeam === 0}" ng-click="toggleTeam()">Fall 2016 Team</span> 
+  </h5>
   <div class="col s10 offset-s1 team-display">
     <div class="member col l3 m4 s12" ng-repeat="officer in officers">
       <img class="responsive-img" width="200px" ng-src="img/people/{{ officer.img }}">