From d9a57eedc424e30c4542540e5be0349b3aab7bbd Mon Sep 17 00:00:00 2001
From: Michael Prentice <splaktar@gmail.com>
Date: Sat, 20 Jun 2015 16:25:53 -0400
Subject: [PATCH 1/2] Fix the Material Design for the event page
 (shorturl.event.html). The HTML is still a mess, but at least it looks
 better. Add a description and application-name to the index. Move .jshint
 from client to / so that it will work with the Gruntfile.js. Clean up
 dependencies a bit. Upgrade to Angular 1.4.0.

---
 client/.jshintrc => .jshintrc           |  0
 Gruntfile.js                            | 10 ++--
 bower.json                              | 24 +++++----
 client/app/shorturl/shorturl.event.html | 71 ++++++++++++++-----------
 client/index.html                       | 20 +++----
 5 files changed, 71 insertions(+), 54 deletions(-)
 rename client/.jshintrc => .jshintrc (100%)

diff --git a/client/.jshintrc b/.jshintrc
similarity index 100%
rename from client/.jshintrc
rename to .jshintrc
diff --git a/Gruntfile.js b/Gruntfile.js
index 9cbedb1..3bcea5e 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -572,10 +572,12 @@ module.exports = function (grunt) {
       ]);
     }
 
-    else grunt.task.run([
-      'test:server',
-      'test:client'
-    ]);
+    else {
+      grunt.task.run([
+        'test:server',
+        'test:client'
+      ]);
+    }
   });
 
   grunt.registerTask('build', [
diff --git a/bower.json b/bower.json
index 66b6064..e9f362a 100644
--- a/bower.json
+++ b/bower.json
@@ -2,22 +2,24 @@
   "name": "firefly",
   "version": "1.0.1",
   "dependencies": {
-    "angular": "1.3.15",
     "json3": "~3.3.1",
     "es5-shim": "~3.0.1",
     "jquery": "~2.1.3",
     "bootstrap": "~3.1.1",
-    "angular-resource": "1.3.15",
-    "angular-cookies": "1.3.15",
-    "angular-sanitize": "1.3.15",
-    "angular-route": "1.3.15",
+    "angular": "1.4.0",
+    "angular-animate": "1.4.0",
+    "angular-aria": "1.4.0",
+    "angular-resource": "1.4.0",
+    "angular-cookies": "1.4.0",
+    "angular-sanitize": "1.4.0",
+    "angular-route": "1.4.0",
+    "angular-material": "0.10.0",
     "angular-bootstrap": ">=0.11.0",
     "angular-google-chart": ">=0.0.11",
     "angular-google-maps": ">=2.0.1",
-    "angular-material": "0.9.0",
     "font-awesome": "~4.3.0",
-    "ngGeolocation": ">=0.0.2",
-    "lodash": "~2.4.1",
+    "ngGeolocation": "0.0.7",
+    "lodash": "3.9.3",
     "moment": "~2.10.2",
     "moment-timezone": "~0.3.1",
     "angular-linkify": ">=0.3.0",
@@ -25,7 +27,9 @@
     "angular-qr": "latest"
   },
   "devDependencies": {
-    "angular-mocks": "1.3.15",
-    "angular-scenario": "1.3.15"
+    "angular-mocks": "1.4.0"
+  },
+  "resolutions": {
+    "angular": "1.4.0"
   }
 }
diff --git a/client/app/shorturl/shorturl.event.html b/client/app/shorturl/shorturl.event.html
index 1878108..2b64109 100644
--- a/client/app/shorturl/shorturl.event.html
+++ b/client/app/shorturl/shorturl.event.html
@@ -2,7 +2,6 @@
 <meta view-head property="og:description" content="{{event.about}}">
 <meta view-head property="og:title" content="{{event.title}}">
 <div layout="column" layout-fill>
-  <div ng-include="'components/navbar/navbar.html'"></div>
   <div layout="row" id="card-box">
     <div hidde show-gt-md flex-gt-md="5"></div>
     <div flex flex-lg="90">
@@ -10,10 +9,10 @@
         <div flex-gt-md="75" flex-sm="100">
           <div flex>
             <md-card>
-              <h3 view-title>{{event.title}} <small><time-ago date="event.start"></time-ago></small></h3>
-              <p>
-              <div ng-bind-html="event.about | linkify"></div>
-              </p>
+              <md-card-content>
+                <h3 view-title>{{event.title}} <small><time-ago date="event.start"></time-ago></small></h3>
+                <div ng-bind-html="event.about | linkify"></div>
+              </md-card-content>
             </md-card>
           </div>
           <div flex>
@@ -32,50 +31,60 @@ <h3 view-title>{{event.title}} <small><time-ago date="event.start"></time-ago></
           <div layout-sm="column" layout-gt-md="row">
             <div flex class="eiw">
               <md-card>
-                <h3><i class="fa fa-clock-o"></i> Your Time</h3>
-                <p>
-                  <b>Begins:</b> <span><local-time date="event.start"></local-time></span><br/>
-                  <b>Ends:</b> <span><local-time date="event.end"></local-time></span>
-                </p>
+                <md-card-content>
+                  <h3><span class="fa fa-clock-o"></span> Your Time</h3>
+                  <p>
+                    <b>Begins:</b> <span><local-time date="event.start"></local-time></span><br/>
+                    <b>Ends:</b> <span><local-time date="event.end"></local-time></span><br/>
+                    <b>Timezone:</b> Local
+                  </p>
+                </md-card-content>
               </md-card>
             </div>
             <div flex class="eiw">
               <md-card>
-                <h3><i class="fa fa-clock-o"></i> Event Time</h3>
-                <p>
-                  <b>Begins:</b> <span><time-timezone date="event.start" timezone="event.timezone"></time-timezone></span><br/>
-                  <b>Ends:</b> <span><time-timezone date="event.end" timezone="event.timezone"></time-timezone></span><br/>
-                  <b>Timezone:</b> {{event.timezone}}
-                </p>
+                <md-card-content>
+                  <h3><span class="fa fa-clock-o"></span> Event Time</h3>
+                  <p>
+                    <b>Begins:</b> <span><time-timezone date="event.start" timezone="event.timezone"></time-timezone></span><br/>
+                    <b>Ends:</b> <span><time-timezone date="event.end" timezone="event.timezone"></time-timezone></span><br/>
+                    <b>Timezone:</b> {{event.timezone}}
+                  </p>
+                </md-card-content>
               </md-card>
             </div>
             <div flex class="eiw">
               <md-card>
-                <h3><i class="fa fa-map-marker"></i> Location</h3>
-                <p>
-                  {{event.location}}<br/><br/>
-                  <a ng-href="https://maps.google.com/maps?daddr={{event.location}}">Get directions</a>
-                </p>
+                <md-card-content>
+                  <h3><span class="fa fa-map-marker"></span> Location</h3>
+                  <p>
+                    {{event.location}}<br/><br/>
+                    <a ng-href="https://maps.google.com/maps?daddr={{event.location}}">Get directions</a>
+                  </p>
+                </md-card-content>
               </md-card>
             </div>
           </div>
         </div>
         <div flex-gt-md="25" flex-sm="100">
           <md-card>
-            <h3>Hosted by</h3>
-            <p>
+            <md-card-content>
               <img ng-show="chapter._id != undefined" class="pull-right" style="margin-top: 11px;" ng-src="{{image}}"/>
+              <h3>Hosted by</h3>
               <h3><a ng-href="http://developers.google.com/groups/chapter/{{chapter._id}}/">{{chapter.name}}</a></h3>
               <span>{{chapter.city}}, {{chapter.country.name}}</span>
-            </p>
+            </md-card-content>
           </md-card>
           <md-card>
-            <h3>Event site</h3>
-            <p>
-              Short URL to this Site:<br/>
-              <a ng-href="http://gdg.events/{{shorturl.hash}}">http://gdg.events/{{shorturl.hash}}
-                <qr input-mode="'8bit'" size="150" text="gdgeventsshorturl" image="true"></qr>
+            <md-card-content>
+              <a ng-href="http://gdg.events/{{shorturl.hash}}">
+                <qr input-mode="'8bit'" size="150" text="gdgeventsshorturl" image="true" class="pull-right"></qr>
               </a>
+              <h3>Event site</h3>
+              <p>
+                Short URL to this Site:<br/>
+                <a ng-href="http://gdg.events/{{shorturl.hash}}">http://gdg.events/{{shorturl.hash}}</a>
+              </p>
               <div ng-switch on="!!event.eventUrl">
                 <div ng-switch-when="true">
                   <a ng-href="{{event.eventUrl}}">Google+ event page</a>
@@ -83,11 +92,11 @@ <h3>Event site</h3>
                 <div ng-switch-default></div>
               </div>
               <a ng-href="http://developers.google.com/events/{{event._id}}/">Google Developers' event page</a>
-            </p>
+            </md-card-content>
           </md-card>
         </div>
       </div>
     </div>
-    <div hidde show-gt-md flex-gt-md="5"></div>
+    <div show-gt-md flex-gt-md="5"></div>
   </div>
 </div>
diff --git a/client/index.html b/client/index.html
index 894584f..be83b99 100644
--- a/client/index.html
+++ b/client/index.html
@@ -4,12 +4,14 @@
 <!--[if IE 8]>         <html class="no-js lt-ie9" ng-app="fireflyApp"> <![endif]-->
 <!--[if gt IE 8]><!--> <html class="no-js" ng-app="fireflyApp"> <!--<![endif]-->
   <head>
-    <meta charset="utf-8">
+    <title ng-bind="viewTitle ? viewTitle : 'GDG events'">GDG events</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="application-name" content="GDG Firefly">
+    <meta name="description" content="Global Google Developers Group (GDG) Event Directory covering Android, Angular, Polymer, Cloud, etc.">
     <base href="/">
-    <title ng-bind="viewTitle ? viewTitle : 'GDG events'">GDG events</title>
-    <meta name="description" content="">
-    <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no" />
+
     <!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
     <!-- build:css(client) app/vendor.css -->
       <!-- bower:css -->
@@ -60,18 +62,18 @@
       <!-- bower:js -->
       <script src="bower_components/jquery/dist/jquery.js"></script>
       <script src="bower_components/angular/angular.js"></script>
+      <script src="bower_components/angular-animate/angular-animate.js"></script>
+      <script src="bower_components/angular-aria/angular-aria.js"></script>
       <script src="bower_components/angular-resource/angular-resource.js"></script>
       <script src="bower_components/angular-cookies/angular-cookies.js"></script>
       <script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
       <script src="bower_components/angular-route/angular-route.js"></script>
+      <script src="bower_components/angular-material/angular-material.js"></script>
       <script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
       <script src="bower_components/angular-google-chart/ng-google-chart.js"></script>
-      <script src="bower_components/lodash/dist/lodash.compat.js"></script>
+      <script src="bower_components/lodash/lodash.js"></script>
       <script src="bower_components/angular-google-maps/dist/angular-google-maps.js"></script>
-      <script src="bower_components/angular-animate/angular-animate.js"></script>
-      <script src="bower_components/angular-aria/angular-aria.js"></script>
-      <script src="bower_components/angular-material/angular-material.js"></script>
-      <script src="bower_components/ngGeolocation/ngGeolocation.min.js"></script>
+      <script src="bower_components/ngGeolocation/ngGeolocation.js"></script>
       <script src="bower_components/moment/moment.js"></script>
       <script src="bower_components/moment-timezone/builds/moment-timezone-with-data-2010-2020.js"></script>
       <script src="bower_components/angular-linkify/angular-linkify.js"></script>

From 11b608500be967c8e5cb373f1745186a997fa9f6 Mon Sep 17 00:00:00 2001
From: Michael Prentice <splaktar@gmail.com>
Date: Sat, 20 Jun 2015 16:58:35 -0400
Subject: [PATCH 2/2] Update the dependency on angular-google-maps.

---
 bower.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bower.json b/bower.json
index e9f362a..11824da 100644
--- a/bower.json
+++ b/bower.json
@@ -16,7 +16,7 @@
     "angular-material": "0.10.0",
     "angular-bootstrap": ">=0.11.0",
     "angular-google-chart": ">=0.0.11",
-    "angular-google-maps": ">=2.0.1",
+    "angular-google-maps": "2.1.5",
     "font-awesome": "~4.3.0",
     "ngGeolocation": "0.0.7",
     "lodash": "3.9.3",