moar progress

alexdmejias · Sep 9, 2015 · 76bce9b · 76bce9b
1 parent e0f9ef2
commit 76bce9b
Show file tree

Hide file tree

Showing 11 changed files with 67 additions and 36 deletions.
diff --git a/.meteor/packages b/.meteor/packages
@@ -20,3 +20,5 @@ grigio:babel
 fourseven:scss
 lookback:body-class
 babrahams:constellation
+gabrielengel:konecty-magnific-popup
+nicolaslopezj:orion-admin-only-bootstrap
diff --git a/.meteor/versions b/.meteor/versions
@@ -34,6 +34,7 @@ email@1.0.6
 fastclick@1.0.3
 fortawesome:fontawesome@4.4.0
 fourseven:scss@3.2.0
+gabrielengel:konecty-magnific-popup@0.9.9
 geojson-utils@1.0.3
 grigio:babel@0.1.7
 gwendall:body-events@0.1.6
@@ -71,6 +72,7 @@ momentjs:moment@2.10.6
 mongo@1.1.0
 mousetrap:mousetrap@1.4.6_1
 nicolaslopezj:options@1.0.1
+nicolaslopezj:orion-admin-only-bootstrap@1.0.0
 nicolaslopezj:reactive-templates@1.2.1
 nicolaslopezj:roles@1.2.0
 nicolaslopezj:router-layer@0.0.10

diff --git a/client/assets/scss/styles.scss b/client/assets/scss/styles.scss
@@ -17,4 +17,5 @@
 
 
 // @import "debugger";
-@import "old-scss/styles.scss";
+// @import "old-scss/styles.scss";
+// @import "old-asssets/scss/styles.scss";
diff --git a/client/views/common/head.html b/client/views/common/head.html
@@ -0,0 +1,3 @@
+<head>
+  <link href="http://fonts.googleapis.com/css?family=Oswald:400,300" rel="stylesheet" type="text/css">
+</head>
diff --git a/client/views/common/header/header.html b/client/views/common/header/header.html
@@ -0,0 +1,9 @@
+<template name="header">
+<header role="banner">
+  <h1><a href="/">{{dict 'public.title'}}</a></h1>
+  <nav role="navigation">
+    <a href="/blog">Blog</a>
+    <a href="/projects">Projects</a>
+  </nav>
+</header>
+</template>
diff --git a/client/views/common/navbar.html b/client/views/common/navbar.html
diff --git a/client/views/layouts/main.html b/client/views/layouts/main.html
@@ -1,5 +1,5 @@
 <template name="main">
-	{{> navbar}}
+  {{> header}}
 	<div class="container">
 		{{> yield}}
 	</div>

diff --git a/client/views/projects/list/list.html b/client/views/projects/list/list.html
@@ -1,7 +1,20 @@
 <template name="projectList">
-  <div class="list-group">
-    {{#each projects}}
-       <a href="/projects/{{slug}}" class="list-group-item">{{title}}</a>
-    {{/each}}
-  </div>
-</template>
+<section class="content wrap">
+  <h2 class="title">Projects </h2>
+  <article>
+    <h3>SIDE PROJECTS</h3>
+    <p>Some of my finished and current side projects.</p>
+    <div class="projects clearfix">
+      {{#each projects}}
+        <div class="project" style="background-image:url(/assets/images/thumbnails/cdnatives.jpg)">
+          <a href="/projects/{{slug}}">
+            <h5>{{title}}</h5>
+            <p>{{description}}</p>
+          </a>
+        </div>
+      {{/each}}
+      <hr>
+    </div>
+  </article>
+</section>
+</template>
diff --git a/client/views/projects/list/list.js b/client/views/projects/list/list.js
@@ -0,0 +1,3 @@
+Template.projectList.onRendered(function() {
+  BodyClass.add('projects-body');
+});
diff --git a/client/views/projects/single/single.html b/client/views/projects/single/single.html
@@ -1,9 +1,28 @@
 <template name="projectSingle">
   {{#with project}}
-    <div class="page-header">
-      <h1>{{title}}</h1>
-    </div>
-    {{{content}}}
+    <section class="content wrap-narrow clearfix">
+      <h2 class="title">
+        {{title}}
+        <span>
+          <a class="button fz-half" target="_blank" href="http://labs.alexdmejias.com/cdnatives/">Visit Project</a>
+        </span>
+        <span>
+          <a class="button fz-half" target="_blank" href="https://github.com/amejias101/cdnatives">Github</a>
+        </span>
+      </h2>
+
+      <article>
+        <p></p><figure><span data-picture="" data-alt=""><span data-src="/assets/images/content/sized/cdnatives/overview-small.jpg"></span><span data-src="/assets/images/content/sized/cdnatives/overview-medium.jpg" data-media="(min-width: 400px)"></span><span data-src="/assets/images/content/sized/cdnatives/overview-large.jpg" data-media="(min-width: 800px)"></span><span data-src="/assets/images/content/sized/cdnatives/overview-xlarge.jpg" data-media="(min-width: 1200px)"><img alt="" src="/assets/images/content/sized/cdnatives/overview-xlarge.jpg"></span></span></figure><p></p>
+        <p>Born as an alternative to having to google "jquery google CDN" every time I wanted to start a prototype, a desire to start an angular side project and not knowing about <a href="http://cdnjs.com/">cdnjs.com</a>, I created CDNatives.</p>
+        <p>The project allows people to quickly get the url to a CDN hosted version of the library they need. Through a very simple set of controls, the user can toggle between development and production ready versions, and whether they would like to include 'script' tags. After clicking the corresponding button, all the user has to do is press cmd + c (ctrl + c in windows) to add the CDNs url to their clipboard.</p>
+        <p>The application uses a simple JSON file to get all of its data if a user ever wants to add another url or library all they have to do is submit a pull request.</p>
+      </article>
+
+      <nav>
+        <a class="button italic" href="http://192.168.33.10/projects/side-projects/pocket-stats">Next: Pocket Stats »</a>
+      </nav>
+
+    </section>
   {{/with}}
 
   <div class="container">

diff --git a/orion/collections/projects.js b/orion/collections/projects.js
@@ -12,6 +12,9 @@ Projects.attachSchema(new SimpleSchema({
   link: {
     type: String
   },
+  description: {
+    type: String
+  },
   content: orion.attribute('summernote', {
       label: 'Body'
     }