From 3cdbf1244422880a93211b8921db6daa959476d1 Mon Sep 17 00:00:00 2001 From: Paul V Moreau Date: Tue, 9 Feb 2016 11:38:31 -0600 Subject: [PATCH] more functionality added --- index.html | 4 +-- .../{addEntry.js => AddEntryController.js} | 26 ++++++++++++------- .../{indexView.js => IndexController.js} | 16 ++++++++++-- js/module.js | 8 +++--- js/services/cauldronAPI.js | 14 ++++++++++ views/{addEntry.html => AddEntryView.html} | 10 +++---- views/directives/brewEntry.html | 2 +- views/indexView.html | 5 +++- 8 files changed, 61 insertions(+), 24 deletions(-) rename js/controllers/{addEntry.js => AddEntryController.js} (53%) rename js/controllers/{indexView.js => IndexController.js} (60%) rename views/{addEntry.html => AddEntryView.html} (72%) diff --git a/index.html b/index.html index 75cb968..3c3ee5a 100644 --- a/index.html +++ b/index.html @@ -40,7 +40,7 @@ - - + + diff --git a/js/controllers/addEntry.js b/js/controllers/AddEntryController.js similarity index 53% rename from js/controllers/addEntry.js rename to js/controllers/AddEntryController.js index 5de9112..d70db90 100644 --- a/js/controllers/addEntry.js +++ b/js/controllers/AddEntryController.js @@ -1,23 +1,31 @@ angular.module('cauldron') -.controller('addEntry', ['cauldronAPI','$scope','$q', function(cauldronAPI, $scope, $q){ - var tagsList = cauldronAPI.getTags(); - - var submitEntry = function(){ - var newEntry = $scope.entryData; - newEntry.author = { +.controller('AddEntryController', ['cauldronAPI','$scope','$q','$location', function(cauldronAPI, $scope, $q, $location){ + $scope.entryData ={ + author: { username: 'Megaman '+ Math.random(), display_name: 'The_dude' + Math.random(), - email:'Mega' + Math.random() + '@fakemeail.com' - }; + email:'Mega' + Math.random() + '@fakemeail.com', + }, + title: 'this is the title for the entry page ' + Math.random(), + imageURL:'http://www.clipartbest.com/cliparts/9ip/eMR/9ipeMRo7T.png', + description:'DIS is da Monster!', + } + + var tagsList = cauldronAPI.getTags(); + + $scope.submitEntry = function(){ + var newEntry = $scope.entryData; newEntry.version = '1.0'; newEntry.links = ['megaLinks.com', 'UltimateLink.org']; var promise = cauldronAPI.addEntry(newEntry); promise.then(function(response){ console.log('Entry Added, redirecting back to index'); + $location.path( "/" ); }, function(response) { console.log('something went wrong', response); }); - } + }; + }]); diff --git a/js/controllers/indexView.js b/js/controllers/IndexController.js similarity index 60% rename from js/controllers/indexView.js rename to js/controllers/IndexController.js index 8361ecb..2c875bb 100644 --- a/js/controllers/indexView.js +++ b/js/controllers/IndexController.js @@ -1,5 +1,5 @@ angular.module('cauldron') -.controller('indexView', ['cauldronAPI','$scope','$q', function(cauldronAPI, $scope, $q){ +.controller('IndexController', ['cauldronAPI','$scope','$q', function(cauldronAPI, $scope, $q){ console.log('indexView controller checking in'); var setIndexEntries = function(){ @@ -22,5 +22,17 @@ angular.module('cauldron') function(response) { console.log('something went wrong', response); }); - } + }; + + $scope.deleteEntry = function(id){ + var promise = cauldronAPI.removeEntry(id); + promise.then(function(response){ + console.log('Entry Deleted'); + setIndexEntries(); + }, + function(response) { + console.log('deletion went wrong', response); + }); + }; + }]); diff --git a/js/module.js b/js/module.js index d2fd152..16b8e69 100644 --- a/js/module.js +++ b/js/module.js @@ -2,12 +2,12 @@ angular.module("cauldron", ['ngRoute']) .config(['$routeProvider', function($routeProvider){ $routeProvider.when('/',{ - templateUrl:'/views/indexView.html', - controller:'indexView' + templateUrl:'/views/IndexView.html', + controller:'IndexController' }) .when('/addEntry',{ - templateUrl:'/views/addEntry.html', - controller:'addEntry' + templateUrl:'/views/AddEntryView.html', + controller:'AddEntryController' }) .otherwise({ redirectTo: '/', diff --git a/js/services/cauldronAPI.js b/js/services/cauldronAPI.js index ec4f200..59ac104 100644 --- a/js/services/cauldronAPI.js +++ b/js/services/cauldronAPI.js @@ -55,9 +55,23 @@ angular.module('cauldron') }); }; + var getTags = function(){ + console.log('get the tags here'); + } + + var removeEntry = function(entryId){ + return $http({ + method: 'DELETE', + url: backendURL+'/brew/'+entryId, + }).then(function(response){ + return response.data; + }); + } return { connect: connect, addEntry:addEntry, getEntries:getEntries, + getTags:getTags, + removeEntry:removeEntry, } }]); diff --git a/views/addEntry.html b/views/AddEntryView.html similarity index 72% rename from views/addEntry.html rename to views/AddEntryView.html index 30ca8cf..81767cc 100644 --- a/views/addEntry.html +++ b/views/AddEntryView.html @@ -1,23 +1,23 @@
- +
- +
- +
We ain't goin' to host your shit
- +
- +
diff --git a/views/directives/brewEntry.html b/views/directives/brewEntry.html index bf237e3..a3ce0cf 100644 --- a/views/directives/brewEntry.html +++ b/views/directives/brewEntry.html @@ -1,6 +1,6 @@
- +
This Is the System
diff --git a/views/indexView.html b/views/indexView.html index 4889adf..c68fe46 100644 --- a/views/indexView.html +++ b/views/indexView.html @@ -1,4 +1,7 @@
- +
+ +
+