add material design; make controller bark

dnicole · Jan 6, 2016 · 249d013 · 249d013
1 parent 6b7878d
commit 249d013
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 15 deletions.
diff --git a/dist/all.js b/dist/all.js
@@ -1,2 +1,10 @@
-var app = angular.module('dnicole', []);
-
+var app = angular.module('dnicole', [
+        'ngAria',
+        'ngMaterial'
+    ])
+.controller('MainCtrl', [
+    '$scope',
+    function($scope){
+        $scope.test = 'Hello world!';
+        console.log($scope.test);
+}]);
diff --git a/dist/all.min.js b/dist/all.min.js
diff --git a/index.html b/index.html
@@ -11,20 +11,23 @@
 
         <link rel="stylesheet" type="text/css" href="/css/main.css" />
         <script src="/node_modules/angular/angular.js"></script>
+        <script src="/node_modules/angular-aria/angular-aria.js"></script>
+        <script src="/node_modules/angular-animate/angular-animate.js"></script>
+        <script src="/node_modules/angular-material/angular-material.js"></script>
         <script src="/js/app.js"></script>
     </head>
-    <body ng-app="dnicole">
+    <body ng-app="dnicole" ng-controller="MainCtrl">
         <!--[if lt IE 8]>
             <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
         <![endif]-->
 
-        <div class="center-align">
-            <div>
-                Hello World!
-            </div>
-            <a class="button" href="#">Button</a>
-            <a href="#">link link link</a>
-
+        <div layout="column" layout-xs="row">
+          <div flex>First item in column</div>
+          <div flex>Second item in column</div>
+        </div>
+        <div layout="row">
+          <div flex>First item in row</div>
+          <div flex>Second item in row</div>
         </div>
 
 

diff --git a/js/app.js b/js/app.js
@@ -1,2 +1,10 @@
-var app = angular.module('dnicole', []);
-
+var app = angular.module('dnicole', [
+        'ngAria',
+        'ngMaterial'
+    ])
+.controller('MainCtrl', [
+    '$scope',
+    function($scope){
+        $scope.test = 'Hello world!';
+        console.log($scope.test);
+}]);
diff --git a/package.json b/package.json
@@ -9,14 +9,17 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "angular": "^1.4.7",
+    "angular-animate": "^1.4.8",
+    "angular-aria": "^1.4.8",
+    "angular-material": "^1.0.1",
+    "express": "~4.9.x",
     "gulp": "^3.9.0",
     "gulp-concat": "^2.6.0",
     "gulp-connect": "^2.2.0",
     "gulp-jshint": "^1.11.2",
     "gulp-rename": "^1.2.2",
     "gulp-uglify": "^1.2.0",
-    "express": "~4.9.x",
-    "angular": "^1.4.7",
     "mongodb": "^2.0.46"
   },
   "engines": {