From 7cd4eb24e06511e51889b1e2f2cbb4266dbb31b9 Mon Sep 17 00:00:00 2001 From: Kevin Mach Date: Fri, 1 May 2015 10:33:38 -0700 Subject: [PATCH] update 1 --- config.js | 2 +- controller.js | 23 +- home.html | 7 +- styles/bootstrap-3.3.4-dist/bootstrap.css | 6854 +++++++++++++++++++++++++++++ 4 files changed, 6860 insertions(+), 26 deletions(-) create mode 100644 styles/bootstrap-3.3.4-dist/bootstrap.css diff --git a/config.js b/config.js index 40ce054..794f935 100644 --- a/config.js +++ b/config.js @@ -1,4 +1,4 @@ -angular.module('flashy', ['ui.router']) +angular.module('flashy', ['flashy.controller']) .config(['$stateProvider', '$urlRouterProvider', function ($stateProvider, $urlRouterProvider) { diff --git a/controller.js b/controller.js index 6a91d5a..15d9e35 100644 --- a/controller.js +++ b/controller.js @@ -1,16 +1,8 @@ -<<<<<<< HEAD -angular.module('flashy.controller', ['ui.router']) - - -.controller('HomeController', ['$scope', '$state', function($scope, $state) { - -======= -var app = angular.module('flashy', ['ui.router']); +var app = angular.module('flashy.controller', ['ui.router']); app.controller('HomeController', ['$scope', '$state', function ($scope, $state) { ->>>>>>> d35e758914c5616a748cf33fc8e1f03f9a517ad9 // SIGN UP $scope.signUp = function (email, username, password) { @@ -37,26 +29,17 @@ app.controller('HomeController', ['$scope', '$state', function ($scope, $state) }; -<<<<<<< HEAD }]) -.controller("DashboardController", function () { +app.controller("DashboardController", function () { alert("HEYYYYYY"); -======= ->>>>>>> d35e758914c5616a748cf33fc8e1f03f9a517ad9 -}]). -<<<<<<< HEAD }) -======= -controller('DashboardController', function () { - alert('HEYYYYYY'); -}); ->>>>>>> d35e758914c5616a748cf33fc8e1f03f9a517ad9 + diff --git a/home.html b/home.html index 199a22d..dedf8e1 100644 --- a/home.html +++ b/home.html @@ -1,14 +1,11 @@ - - + - -