GDGAC

gdgac · Dec 31, 2013 · 67c3717 · 67c3717
1 parent 587b8a2
commit 67c3717
Show file tree

Hide file tree

Showing 10 changed files with 104 additions and 8 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -179,7 +179,7 @@ module.exports = function (grunt) {
              '<%= yeoman.views %>/{,*/}*.jade'],
       css: ['<%= yeoman.dist %>/styles/{,*/}*.css'],
       options: {
-        assetsDirs: ['<%= yeoman.dist %>']
+        assetsDirs: ['<%= yeoman.dist %>', '<%= yeoman.dist%>/images']
       }
     },
 
@@ -219,7 +219,7 @@ module.exports = function (grunt) {
         files: [{
           expand: true,
           cwd: '<%= yeoman.app %>/<%= yeoman.views %>',
-          src: ['*.html', 'partials/*.html'],
+          src: ['*.html', 'partials/*.html', 'directives/*.html'],
           dest: '<%= yeoman.views %>'
         }]
       }

diff --git a/app/scripts/directives/plus.js b/app/scripts/directives/plus.js
@@ -51,7 +51,7 @@ angular.module('gdgPlus', [])
     .directive('plusActivities', ['$timeout', '$window', function() {
         return {
             restrict: 'AEC',
-            templateUrl: 'views/directives/plus_activities',
+            templateUrl: 'directives/plus_activities',
             scope: {
                 href: "@href"
             },

diff --git a/app/styles/main.css b/app/styles/main.css
@@ -81,7 +81,7 @@ body {
 /* Customize container */
 @media (min-width: 768px) {
   .container {
-    max-width: 730px;
+    max-width: 800px;
   }
 }
 @media only screen and (min-width: 1200px) {

diff --git a/app/views/index.html b/app/views/index.html
@@ -19,6 +19,7 @@
 
         <!-- build:css({.tmp,app}) styles/main.css -->
         <link rel="stylesheet" href="styles/bootstrap.css">
+        <link rel="stylesheet" href="bower_components/font-awesome/css/font-awesome.min.css">
         <link rel="stylesheet" href="styles/main.css">
         <!-- endbuild -->
 </head>

diff --git a/bower.json b/bower.json
@@ -12,6 +12,7 @@
     "angular-route": "~1.2.0",
     "angular-ui-router": "~0.2.0",
     "angular-moment": "~0.5.2",
+    "font-awesome": "~4.0.3",
     "sass-bootstrap": "~3.0.2"
   },
   "devDependencies": {

diff --git a/heroku b/heroku
diff --git a/lib/controllers/index.js b/lib/controllers/index.js
@@ -7,6 +7,7 @@ exports.partials = function(req, res) {
   var requestedView = path.join('./', stripped);
   res.render(requestedView, function(err, html) {
     if(err) {
+      console.log("not found: "+ requestedView);
       res.render('404');
     } else {
       res.send(html);

diff --git a/server.js b/server.js
@@ -42,7 +42,6 @@ app.configure(function(){
 	app.use(express.logger('dev'));
 	app.use(express.bodyParser());
 	app.use(express.methodOverride());
-
   // Router needs to be last
 	app.use(app.router);
 });
@@ -56,6 +55,7 @@ app.get('/api/awesomeThings', api.awesomeThings);
 
 // Angular Routes
 app.get('/partials/*', controllers.partials);
+app.get('/directives/*', controllers.partials);
 app.get('/*', controllers.index);
 
 // Start server

diff --git a/views/directives/plus_activities.html b/views/directives/plus_activities.html
@@ -0,0 +1,93 @@
+<div class="row">
+    <div class="col-md-6">
+
+        <div ng-repeat="item in stream.items">
+            <div class="card">
+                <div class="card-heading image">
+                    <img ng-src="{{item.actor.image.url}}" alt="46x46" style="width: 46px; height: 46px">
+                    <div class="card-heading-header">
+                        <h3>{{item.actor.displayName}}</h3>
+                        <span><span am-time-ago="item.published"></span> - <a ng-href="{{item.url}}"><span>{{item.published | amDateFormat:'MMM DD, YYYY'}}</span></a></span>
+                    </div>
+                </div>
+                <div class="card-body">
+                    <div ng-switch="item.verb">
+                        <div ng-switch-when="post">
+                            <p><div ng-bind-html="item.object.content" style="overflow-wrap: break-word"></div></p>
+                        </div>
+                        <div ng-switch-when="share">
+                            <p><div ng-bind-html="item.annotation" style="overflow-wrap: break-word"></div></p>
+                            <hr>
+                            <p><a ng-href="{{item.object.actor.url}}">{{item.object.actor.displayName}}</a> <a ng-href="{{item.object.url}}">originally shared:</a></p>
+                            <p><div ng-bind-html="item.object.content"></div></p>
+                        </div>
+                    </div>
+                </div>
+                <div ng-repeat="attachment in item.object.attachments">
+                    <div class="card-media">
+                        <div ng-switch="attachment.objectType">
+                            <div ng-switch-when="album">album</div>
+                            <div ng-switch-when="photo">
+                                <a class="card-media-container" ng-href="{{attachment.url}}">
+                                    <img ng-src="{{attachment.image.url}}">
+                                </a>
+                            </div>
+                            <div ng-switch-when="article">article</div>
+                            <div ng-switch-when="event">event</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="card-comments clearfix">
+                    <div class="pull-left" plus-share="" href="{{item.url}}"></div>
+                    <div class="pull-right" plus-one="" href="{{item.url}}"></div>
+                </div>
+            </div>
+        </div>
+
+    </div>
+    <div class="col-md-6">
+        <div ng-repeat="item in muh.items">
+            <div class="card">
+                <div class="card-heading image">
+                    <img ng-src="{{item.actor.image.url}}" alt="46x46" style="width: 46px; height: 46px">
+                    <div class="card-heading-header">
+                        <h3>{{item.actor.displayName}}</h3>
+                        <span><span am-time-ago="item.published"></span> - <a ng-href="{{item.url}}"><span>{{item.published | amDateFormat:'MMM DD, YYYY'}}</span></a></span>
+                    </div>
+                </div>
+                <div class="card-body">
+                    <div ng-switch="item.verb">
+                        <div ng-switch-when="post">
+                            <p><div ng-bind-html="item.object.content" style="overflow-wrap: break-word"></div></p>
+                        </div>
+                        <div ng-switch-when="share">
+                            <p><div ng-bind-html="item.annotation" style="overflow-wrap: break-word"></div></p>
+                            <hr>
+                            <p><a ng-href="{{item.object.actor.url}}">{{item.object.actor.displayName}}</a> <a ng-href="{{item.object.url}}">originally shared:</a></p>
+                            <p><div ng-bind-html="item.object.content"></div></p>
+                        </div>
+                    </div>
+                </div>
+                <div ng-repeat="attachment in item.object.attachments">
+                    <div class="card-media">
+                        <div ng-switch="attachment.objectType">
+                            <div ng-switch-when="album">album</div>
+                            <div ng-switch-when="photo">
+                                <a class="card-media-container" ng-href="{{attachment.url}}">
+                                    <img ng-src="{{attachment.image.url}}">
+                                </a>
+                            </div>
+                            <div ng-switch-when="article">article</div>
+                            <div ng-switch-when="event">event</div>
+                        </div>
+                    </div>
+                </div>
+                <div class="card-comments clearfix">
+                    <div class="pull-left" plus-share="" href="{{item.url}}"></div>
+                    <div class="pull-right" plus-one="" href="{{item.url}}"></div>
+                </div>
+            </div>
+        </div>
+
+    </div>
+</div>
diff --git a/views/index.html b/views/index.html
@@ -17,7 +17,7 @@
     <meta property="og:description" content="Google Developer Group Aachen is a German/English speaking group meeting in Aachen to discuss Google Technologies.">
     <!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
 
-        <link rel="stylesheet" href="styles/81a87d3a.main.css"/>
+        <link rel="stylesheet" href="styles/119fc331.main.css"/>
 </head>
   <body ng-app="gdgacApp">
     <!--[if lt IE 7]>
@@ -113,6 +113,6 @@
 
         <script src="scripts/c3bac34f.modules.js"></script>
 
-        <script src="scripts/bc4dcb50.scripts.js"></script>
+        <script src="scripts/26c85593.scripts.js"></script>
 </body>
 </html>