cleaned up in prep for details and shitlist

BenCopeland · May 27, 2016 · 80c0211 · 80c0211
1 parent 8822896
commit 80c0211
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 40 deletions.
diff --git a/app/app.js b/app/app.js
@@ -12,5 +12,9 @@ app.config(function($routeProvider){
 			templateUrl: "partials/contact-new.html",
 			controller: "ContactNewCtrl"
 		}).
+		// when("/contacts/new", {
+		// 	templateUrl: "partials/contact-new.html",
+		// 	controller: "ContactNewCtrl"
+		// }).
 		otherwise("/contacts/list");
 });
diff --git a/app/controllers/NavCtrl.js b/app/controllers/NavCtrl.js
@@ -1,5 +1,9 @@
 app.controller("NavCtrl", function($scope){
 	$scope.navItems = [
+	{
+		name: "Shit-List",
+		url: "#/contacts/list"
+	},
 	{
 		name: "All Contacts",
 		url: "#/contacts/list"

diff --git a/index.html b/index.html
@@ -7,32 +7,14 @@
 	<link rel="stylesheet" type="text/css" href="styles/main.css">
 </head>
 <body  ng-app="AddressApp">
-<nav class="navbar navbar-default" ng-controller="NavCtrl">
-  <div class="container-fluid">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-      <a class="navbar-brand" href="#">
-        <img alt="Brand" src="https://image.freepik.com/icones-gratuites/carnet-d&-39;adresses-avec-les-signets_318-40452.png">
-      </a>
-    </div>
 
-    <!-- Collect the nav links, forms, and other content for toggling -->
-    <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-      <ul class="nav navbar-nav navbar-right" ng-repeat="thingy in navItems">
-        <li><a ng-href="{{thingy.url}}">{{thingy.name}}</a></li>
-      </ul>
-    </div><!-- /.navbar-collapse -->
-  </div><!-- /.container-fluid -->
-</nav>
+  <!-- navbar oputput -->
+  <div ng-include="'partials/nav-bar.html'"></div>
+
+  <!-- main content oputput -->
   <div class="row">
     <div class="col-xs-10 col-xs-offset-1 main-container">
       <div class="col-xs-12" ng-view>
-
       </div>
     </div>
   </div>

diff --git a/partials/contact-list.html b/partials/contact-list.html
@@ -11,20 +11,30 @@ <h1>Contacts</h1>
     </div>
   </div>
 </div>
+
+<!-- buffer -->
+<div class="row">
+  <div class="bufferWrap">
+    <div class="col-xs-5"><h5>Name</h5></div>
+    <div class="col-xs-5"><h5>Phone Number</h5></div>
+  </div>
+</div>
+
 <div ng-repeat="thingy in contacts | filter: searchText">
   <div class="panel panel-default">
     <div class="panel-body">
       <!-- <div class="col-xs-1"><input type="checkbox" name=""/></div> -->
       <div class="row">
-	      <div class="col-xs-2">{{thingy.firstName}}</div>
+	      <div class="col-xs-5">{{thingy.firstName}} {{thingy.lastName}}</div>
 	      <div class="col-xs-5">{{thingy.phone}}</div>
-	      <div class="col-xs-5">{{thingy.company}}</div>
-      </div>
-      <div class="row">
-	      <div class="col-xs-2">{{thingy.lastName}}</div>
-	      <div class="col-xs-9">{{thingy.email}}</div>
 	      <div class="col-xs-1"><button class="btn btn-danger" ng-click="contactDelete(thingy.id)">X</button></div>
       </div>
     </div>
   </div>
-</div>
+</div>
+
+
+
+
+
+
diff --git a/partials/nav-bar.html b/partials/nav-bar.html
@@ -0,0 +1,22 @@
+<nav class="navbar navbar-default" ng-controller="NavCtrl">
+  <div class="container-fluid">
+    <!-- Brand and toggle get grouped for better mobile display -->
+    <div class="navbar-header">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a class="navbar-brand" href="#">
+        <img alt="Brand" src="https://image.freepik.com/icones-gratuites/carnet-d&-39;adresses-avec-les-signets_318-40452.png">
+      </a>
+    </div>
+
+    <!-- Collect the nav links, forms, and other content for toggling -->
+    <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+      <ul class="nav navbar-nav navbar-right" ng-repeat="thingy in navItems">
+        <li><a ng-href="{{thingy.url}}">{{thingy.name}}</a></li>
+      </ul>
+    </div><!-- /.navbar-collapse -->
+  </div><!-- /.container-fluid -->
+</nav>
diff --git a/sass/main.scss b/sass/main.scss
@@ -17,12 +17,4 @@ h1{
 img{
 	max-height: 22px;
 	max-width: 22px;
-}
-
-.notesContainer {
-	height: 60px;
-}
-
-.notes {
-	height: 100%;
 }
diff --git a/styles/main.css b/styles/main.css