From d64d490a88e5b84d5551b5d6a07091a97970099f Mon Sep 17 00:00:00 2001 From: klawton1 Date: Fri, 24 Feb 2017 15:30:01 -0800 Subject: [PATCH 01/11] page loads. links dont work --- index.html | 9 +++++++++ public/scripts/app.js | 1 + templates/index.html | 14 ++++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 index.html create mode 100644 public/scripts/app.js create mode 100644 templates/index.html diff --git a/index.html b/index.html new file mode 100644 index 00000000..c4a7ec1d --- /dev/null +++ b/index.html @@ -0,0 +1,9 @@ + + + + + + +

help

+ + \ No newline at end of file diff --git a/public/scripts/app.js b/public/scripts/app.js new file mode 100644 index 00000000..f9cd8310 --- /dev/null +++ b/public/scripts/app.js @@ -0,0 +1 @@ +console.log("hellos") \ No newline at end of file diff --git a/templates/index.html b/templates/index.html new file mode 100644 index 00000000..b67fe21c --- /dev/null +++ b/templates/index.html @@ -0,0 +1,14 @@ + + + + books + + + + + + + +

help

+ + \ No newline at end of file From 158f32deef560268d1733005cc4e599b2216f616 Mon Sep 17 00:00:00 2001 From: klawton1 Date: Sat, 25 Feb 2017 12:50:28 -0800 Subject: [PATCH 02/11] got books to show and a single book by id --- .gitignore | 1 + .ipynb_checkpoints/Untitled-checkpoint.ipynb | 86 ++++++++++++++++ Untitled.ipynb | 97 +++++++++++++++++++ index.html | 15 ++- package.json | 25 +++++ public/scripts/app.js | 26 ++++- public/scripts/controllers/booksController.js | 20 ++++ .../scripts/controllers/oneBookController.js | 17 ++++ public/styles/styles.css | 4 + templates/books.html | 16 +++ templates/index.html | 14 --- templates/onebook.html | 12 +++ 12 files changed, 315 insertions(+), 18 deletions(-) create mode 100644 .gitignore create mode 100644 .ipynb_checkpoints/Untitled-checkpoint.ipynb create mode 100644 Untitled.ipynb create mode 100644 package.json create mode 100644 public/scripts/controllers/booksController.js create mode 100644 public/scripts/controllers/oneBookController.js create mode 100644 public/styles/styles.css create mode 100644 templates/books.html delete mode 100644 templates/index.html create mode 100644 templates/onebook.html diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..b512c09d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +node_modules \ No newline at end of file diff --git a/.ipynb_checkpoints/Untitled-checkpoint.ipynb b/.ipynb_checkpoints/Untitled-checkpoint.ipynb new file mode 100644 index 00000000..bd82a4da --- /dev/null +++ b/.ipynb_checkpoints/Untitled-checkpoint.ipynb @@ -0,0 +1,86 @@ +{ + "cells": [ + { + "cell_type": "code", + "execution_count": 1, + "metadata": { + "collapsed": true + }, + "outputs": [], + "source": [ + "string = \"kody isTesting\"" + ] + }, + { + "cell_type": "code", + "execution_count": 35, + "metadata": { + "collapsed": false + }, + "outputs": [], + "source": [ + "ans = \"\"\n", + "for char in string:\n", + " if char not in ans:\n", + " ans += char" + ] + }, + { + "cell_type": "code", + "execution_count": 33, + "metadata": { + "collapsed": false + }, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "kody isTetng\n" + ] + } + ], + "source": [ + "final = \"\"\n", + "for i in ans:\n", + " final += i\n", + "print(final)" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": { + "collapsed": true + }, + "outputs": [], + "source": [] + }, + { + "cell_type": "raw", + "metadata": {}, + "source": [] + } + ], + "metadata": { + "kernelspec": { + "display_name": "Python 3", + "language": "python", + "name": "python3" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.6.0" + } + }, + "nbformat": 4, + "nbformat_minor": 2 +} diff --git a/Untitled.ipynb b/Untitled.ipynb new file mode 100644 index 00000000..035f6602 --- /dev/null +++ b/Untitled.ipynb @@ -0,0 +1,97 @@ +{ + "cells": [ + { + "cell_type": "code", + "execution_count": 56, + "metadata": { + "collapsed": false + }, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "dIkyo i\n" + ] + } + ], + "source": [ + "string = \"kody iiii III\"\n", + "print (\"\".join(set(string)))" + ] + }, + { + "cell_type": "code", + "execution_count": 49, + "metadata": { + "collapsed": false + }, + "outputs": [], + "source": [ + "ans = \"\"\n", + "for char in string:\n", + " if char not in ans:\n", + " ans += char" + ] + }, + { + "cell_type": "code", + "execution_count": 47, + "metadata": { + "collapsed": false + }, + "outputs": [], + "source": [ + "ans = .join(sorted(ans))" + ] + }, + { + "cell_type": "code", + "execution_count": 48, + "metadata": { + "collapsed": false + }, + "outputs": [ + { + "data": { + "text/plain": [ + "' kody isTetngTkody isTetngdkody isTetngekody isTetnggkody isTetngikody isTetngkkody isTetngnkody isTetngokody isTetngskody isTetngtkody isTetngy'" + ] + }, + "execution_count": 48, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "ans" + ] + }, + { + "cell_type": "raw", + "metadata": {}, + "source": [] + } + ], + "metadata": { + "kernelspec": { + "display_name": "Python 3", + "language": "python", + "name": "python3" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 3 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", + "version": "3.6.0" + } + }, + "nbformat": 4, + "nbformat_minor": 2 +} diff --git a/index.html b/index.html index c4a7ec1d..932a3b1b 100644 --- a/index.html +++ b/index.html @@ -1,9 +1,18 @@ - + - + books + + + + + + + + -

help

+

Bunch O' Books

+
\ No newline at end of file diff --git a/package.json b/package.json new file mode 100644 index 00000000..ec6d7e72 --- /dev/null +++ b/package.json @@ -0,0 +1,25 @@ +{ + "name": "angular-books-crud-lab", + "version": "1.0.0", + "description": "", + "main": "index.js", + "dependencies": { + "angular-route": "^1.6.2", + "bower": "^1.8.0", + "mongoose": "^4.8.4" + }, + "devDependencies": {}, + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/klawton1/angular-books-crud-lab.git" + }, + "author": "", + "license": "ISC", + "bugs": { + "url": "https://github.com/klawton1/angular-books-crud-lab/issues" + }, + "homepage": "https://github.com/klawton1/angular-books-crud-lab#readme" +} diff --git a/public/scripts/app.js b/public/scripts/app.js index f9cd8310..67a96e4e 100644 --- a/public/scripts/app.js +++ b/public/scripts/app.js @@ -1 +1,25 @@ -console.log("hellos") \ No newline at end of file +console.log("hellos") + +angular + .module("booksApp", ['ngRoute']) + .config(config); + +config.$inject = ['$routeProvider', '$locationProvider']; +function config( $routeProvider, $locationProvider) { + $routeProvider + .when('/', { + templateUrl: '/templates/books.html', + controller: 'BooksController', + controllerAs: 'bc' + }) + .when('/books/:id',{ + templateUrl: '/templates/onebook.html', + controller: 'OneBookController', + controllerAs: 'obc' + }) + + $locationProvider.html5Mode({ + enabled: true, + requireBase: false + }); +} \ No newline at end of file diff --git a/public/scripts/controllers/booksController.js b/public/scripts/controllers/booksController.js new file mode 100644 index 00000000..f052cc02 --- /dev/null +++ b/public/scripts/controllers/booksController.js @@ -0,0 +1,20 @@ +angular + .module("booksApp") + .controller("BooksController", BooksController); + +BooksController.$inject = ['$http', '$routeParams']; +function BooksController( $http, $routeParams) { + var vm = this; + console.log("BOOK CONTROLS") + vm.books = []; + vm.submit = function(data){ + console.log("SUBMITING") + } + $http({ + method: "GET", + url: "https://super-crud.herokuapp.com/books", + }).then(function Success(json){ + vm.books = json.data.books; + console.log(vm.books) + }) +} \ No newline at end of file diff --git a/public/scripts/controllers/oneBookController.js b/public/scripts/controllers/oneBookController.js new file mode 100644 index 00000000..67ec62d2 --- /dev/null +++ b/public/scripts/controllers/oneBookController.js @@ -0,0 +1,17 @@ +angular + .module("booksApp") + .controller("OneBookController",OneBookController); + +OneBookController.$inject = ['$http', '$routeParams']; +function OneBookController( $http, $routeParams) { + var vm = this; + vm.book = {}; + console.log("found One Book!"); + $http({ + method: "GET", + url: "https://super-crud.herokuapp.com/books/" + $routeParams.id, + }).then(function Success(response){ + console.log(response.data) + vm.book = response.data; + }) +} \ No newline at end of file diff --git a/public/styles/styles.css b/public/styles/styles.css new file mode 100644 index 00000000..574118db --- /dev/null +++ b/public/styles/styles.css @@ -0,0 +1,4 @@ +.book-cover{ + height: 200px; + width: 200px; +} diff --git a/templates/books.html b/templates/books.html new file mode 100644 index 00000000..0f7daeac --- /dev/null +++ b/templates/books.html @@ -0,0 +1,16 @@ +
+
+
+ +
+
+

{{book.title}}

+
{{book.author}}
+
{{book.releaseDate}}
+
+ +
+
+
+
\ No newline at end of file diff --git a/templates/index.html b/templates/index.html deleted file mode 100644 index b67fe21c..00000000 --- a/templates/index.html +++ /dev/null @@ -1,14 +0,0 @@ - - - - books - - - - - - - -

help

- - \ No newline at end of file diff --git a/templates/onebook.html b/templates/onebook.html new file mode 100644 index 00000000..ebb74363 --- /dev/null +++ b/templates/onebook.html @@ -0,0 +1,12 @@ +
+
+ +
+
+

{{obc.book.title}}

+
{{obc.book.author}}
+
{{obc.book.releaseDate}}
+

IS THIS WORKING

+
+
+
\ No newline at end of file From 2e8d9c3f2a15952ec36c71d12fed58bb3663d341 Mon Sep 17 00:00:00 2001 From: klawton1 Date: Sat, 25 Feb 2017 12:51:35 -0800 Subject: [PATCH 03/11] deleted irrelevent --- Untitled.ipynb | 97 -------------------------------------------------- 1 file changed, 97 deletions(-) delete mode 100644 Untitled.ipynb diff --git a/Untitled.ipynb b/Untitled.ipynb deleted file mode 100644 index 035f6602..00000000 --- a/Untitled.ipynb +++ /dev/null @@ -1,97 +0,0 @@ -{ - "cells": [ - { - "cell_type": "code", - "execution_count": 56, - "metadata": { - "collapsed": false - }, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "dIkyo i\n" - ] - } - ], - "source": [ - "string = \"kody iiii III\"\n", - "print (\"\".join(set(string)))" - ] - }, - { - "cell_type": "code", - "execution_count": 49, - "metadata": { - "collapsed": false - }, - "outputs": [], - "source": [ - "ans = \"\"\n", - "for char in string:\n", - " if char not in ans:\n", - " ans += char" - ] - }, - { - "cell_type": "code", - "execution_count": 47, - "metadata": { - "collapsed": false - }, - "outputs": [], - "source": [ - "ans = .join(sorted(ans))" - ] - }, - { - "cell_type": "code", - "execution_count": 48, - "metadata": { - "collapsed": false - }, - "outputs": [ - { - "data": { - "text/plain": [ - "' kody isTetngTkody isTetngdkody isTetngekody isTetnggkody isTetngikody isTetngkkody isTetngnkody isTetngokody isTetngskody isTetngtkody isTetngy'" - ] - }, - "execution_count": 48, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "ans" - ] - }, - { - "cell_type": "raw", - "metadata": {}, - "source": [] - } - ], - "metadata": { - "kernelspec": { - "display_name": "Python 3", - "language": "python", - "name": "python3" - }, - "language_info": { - "codemirror_mode": { - "name": "ipython", - "version": 3 - }, - "file_extension": ".py", - "mimetype": "text/x-python", - "name": "python", - "nbconvert_exporter": "python", - "pygments_lexer": "ipython3", - "version": "3.6.0" - } - }, - "nbformat": 4, - "nbformat_minor": 2 -} From 5251bd430409d5145d614f9d3e9799a7d13eeeb7 Mon Sep 17 00:00:00 2001 From: klawton1 Date: Sat, 25 Feb 2017 12:52:18 -0800 Subject: [PATCH 04/11] deleted irrelevent --- .ipynb_checkpoints/Untitled-checkpoint.ipynb | 86 -------------------- 1 file changed, 86 deletions(-) delete mode 100644 .ipynb_checkpoints/Untitled-checkpoint.ipynb diff --git a/.ipynb_checkpoints/Untitled-checkpoint.ipynb b/.ipynb_checkpoints/Untitled-checkpoint.ipynb deleted file mode 100644 index bd82a4da..00000000 --- a/.ipynb_checkpoints/Untitled-checkpoint.ipynb +++ /dev/null @@ -1,86 +0,0 @@ -{ - "cells": [ - { - "cell_type": "code", - "execution_count": 1, - "metadata": { - "collapsed": true - }, - "outputs": [], - "source": [ - "string = \"kody isTesting\"" - ] - }, - { - "cell_type": "code", - "execution_count": 35, - "metadata": { - "collapsed": false - }, - "outputs": [], - "source": [ - "ans = \"\"\n", - "for char in string:\n", - " if char not in ans:\n", - " ans += char" - ] - }, - { - "cell_type": "code", - "execution_count": 33, - "metadata": { - "collapsed": false - }, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "kody isTetng\n" - ] - } - ], - "source": [ - "final = \"\"\n", - "for i in ans:\n", - " final += i\n", - "print(final)" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": { - "collapsed": true - }, - "outputs": [], - "source": [] - }, - { - "cell_type": "raw", - "metadata": {}, - "source": [] - } - ], - "metadata": { - "kernelspec": { - "display_name": "Python 3", - "language": "python", - "name": "python3" - }, - "language_info": { - "codemirror_mode": { - "name": "ipython", - "version": 3 - }, - "file_extension": ".py", - "mimetype": "text/x-python", - "name": "python", - "nbconvert_exporter": "python", - "pygments_lexer": "ipython3", - "version": "3.6.0" - } - }, - "nbformat": 4, - "nbformat_minor": 2 -} From 82f2e8774d8e3b312558b4ad630fc65496e5cebb Mon Sep 17 00:00:00 2001 From: klawton1 Date: Sat, 25 Feb 2017 15:31:46 -0800 Subject: [PATCH 05/11] added buttons for editing --- public/scripts/app.js | 2 -- public/scripts/controllers/booksController.js | 2 +- templates/books.html | 12 ++++++------ 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/public/scripts/app.js b/public/scripts/app.js index 67a96e4e..1ab107b5 100644 --- a/public/scripts/app.js +++ b/public/scripts/app.js @@ -1,5 +1,3 @@ -console.log("hellos") - angular .module("booksApp", ['ngRoute']) .config(config); diff --git a/public/scripts/controllers/booksController.js b/public/scripts/controllers/booksController.js index f052cc02..07db95e6 100644 --- a/public/scripts/controllers/booksController.js +++ b/public/scripts/controllers/booksController.js @@ -15,6 +15,6 @@ function BooksController( $http, $routeParams) { url: "https://super-crud.herokuapp.com/books", }).then(function Success(json){ vm.books = json.data.books; - console.log(vm.books) + console.log("loging") }) } \ No newline at end of file diff --git a/templates/books.html b/templates/books.html index 0f7daeac..c2fe4dbf 100644 --- a/templates/books.html +++ b/templates/books.html @@ -5,12 +5,12 @@

{{book.title}}

-
{{book.author}}
-
{{book.releaseDate}}
+
{{book.author}}
+
{{book.releaseDate}}
- + + +
- -
\ No newline at end of file + \ No newline at end of file From ab5c71b941715d54e9d6fe72738e2debf89dcfa9 Mon Sep 17 00:00:00 2001 From: klawton1 Date: Sat, 25 Feb 2017 16:41:38 -0800 Subject: [PATCH 06/11] stylesheet not working but made edit book for submit --- index.html | 1 + public/scripts/controllers/booksController.js | 7 ++++--- public/styles/styles.css | 11 ++++++++++- templates/books.html | 16 ++++++++-------- templates/onebook.html | 1 - 5 files changed, 23 insertions(+), 13 deletions(-) diff --git a/index.html b/index.html index 932a3b1b..4fa0ed8a 100644 --- a/index.html +++ b/index.html @@ -7,6 +7,7 @@ + diff --git a/public/scripts/controllers/booksController.js b/public/scripts/controllers/booksController.js index 07db95e6..ea1f11c8 100644 --- a/public/scripts/controllers/booksController.js +++ b/public/scripts/controllers/booksController.js @@ -5,10 +5,11 @@ angular BooksController.$inject = ['$http', '$routeParams']; function BooksController( $http, $routeParams) { var vm = this; - console.log("BOOK CONTROLS") + console.log("BOOK controller!") vm.books = []; - vm.submit = function(data){ - console.log("SUBMITING") + vm.editBook = {} + vm.submit = function(){ + console.log("book", vm.editBook) } $http({ method: "GET", diff --git a/public/styles/styles.css b/public/styles/styles.css index 574118db..3304b055 100644 --- a/public/styles/styles.css +++ b/public/styles/styles.css @@ -1,4 +1,13 @@ .book-cover{ - height: 200px; + height: 300px; width: 200px; } +.editing{ + display: inline; +} +.title{ + width: 500px; +} +body{ + background-color: red; +} diff --git a/templates/books.html b/templates/books.html index c2fe4dbf..533a296d 100644 --- a/templates/books.html +++ b/templates/books.html @@ -3,14 +3,14 @@
-
-

{{book.title}}

-
{{book.author}}
-
{{book.releaseDate}}
-
- - - +
+

{{book.title}}

+
{{book.author}}
+
{{book.releaseDate}}
+ +
+ +
\ No newline at end of file diff --git a/templates/onebook.html b/templates/onebook.html index ebb74363..165817f9 100644 --- a/templates/onebook.html +++ b/templates/onebook.html @@ -6,7 +6,6 @@

{{obc.book.title}}

{{obc.book.author}}
{{obc.book.releaseDate}}
-

IS THIS WORKING

\ No newline at end of file From c0777b75667f6b1b17ca031d14a9e22c6b5cfef5 Mon Sep 17 00:00:00 2001 From: klawton1 Date: Sat, 25 Feb 2017 17:25:06 -0800 Subject: [PATCH 07/11] edit working. but cancel still updates names locally --- public/scripts/controllers/booksController.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/public/scripts/controllers/booksController.js b/public/scripts/controllers/booksController.js index ea1f11c8..16676436 100644 --- a/public/scripts/controllers/booksController.js +++ b/public/scripts/controllers/booksController.js @@ -9,7 +9,15 @@ function BooksController( $http, $routeParams) { vm.books = []; vm.editBook = {} vm.submit = function(){ - console.log("book", vm.editBook) + console.log("book", vm.editBook); + $http({ + method: "PUT", + url: "https://super-crud.herokuapp.com/books/" + vm.editBook._id, + data: vm.editBook + }).then(function(res){ + console.log("success!"); + console.log(res.data); + }) } $http({ method: "GET", From 6e105bc66ebe0dfee5b99eb66ed61618e2130111 Mon Sep 17 00:00:00 2001 From: klawton1 Date: Sat, 25 Feb 2017 18:04:11 -0800 Subject: [PATCH 08/11] fixed edit bug --- public/scripts/controllers/booksController.js | 22 ++++++++++++++----- public/styles/styles.css | 5 +---- templates/books.html | 6 ++--- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/public/scripts/controllers/booksController.js b/public/scripts/controllers/booksController.js index 16676436..fa76ecd9 100644 --- a/public/scripts/controllers/booksController.js +++ b/public/scripts/controllers/booksController.js @@ -7,16 +7,27 @@ function BooksController( $http, $routeParams) { var vm = this; console.log("BOOK controller!") vm.books = []; - vm.editBook = {} - vm.submit = function(){ - console.log("book", vm.editBook); + vm.editBook = { + title: "", + image: "", + author: "", + releaseDate: "", + } + vm.makeEdit = function(book){ + for(key in vm.editBook){ + vm.editBook[key] = book[key] + } + } + vm.submit = function(book){ + var index = vm.books.indexOf(book); + console.log(index); $http({ method: "PUT", - url: "https://super-crud.herokuapp.com/books/" + vm.editBook._id, + url: "https://super-crud.herokuapp.com/books/" + book._id, data: vm.editBook }).then(function(res){ console.log("success!"); - console.log(res.data); + vm.books[index] = res.data; }) } $http({ @@ -24,6 +35,5 @@ function BooksController( $http, $routeParams) { url: "https://super-crud.herokuapp.com/books", }).then(function Success(json){ vm.books = json.data.books; - console.log("loging") }) } \ No newline at end of file diff --git a/public/styles/styles.css b/public/styles/styles.css index 3304b055..4322a6c1 100644 --- a/public/styles/styles.css +++ b/public/styles/styles.css @@ -6,8 +6,5 @@ display: inline; } .title{ - width: 500px; -} -body{ - background-color: red; + width: 550px; } diff --git a/templates/books.html b/templates/books.html index 533a296d..132a19ab 100644 --- a/templates/books.html +++ b/templates/books.html @@ -3,14 +3,14 @@
-
+

{{book.title}}

{{book.author}}
{{book.releaseDate}}
- - + +
\ No newline at end of file From 1a2242ba101d4650082b8dbe2b523ef43573880b Mon Sep 17 00:00:00 2001 From: klawton1 Date: Sat, 25 Feb 2017 18:39:11 -0800 Subject: [PATCH 09/11] moved edit form to specific album page --- public/scripts/controllers/booksController.js | 23 ------------------ .../scripts/controllers/oneBookController.js | 24 ++++++++++++++++++- templates/books.html | 13 ++++------ templates/onebook.html | 14 +++++++---- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/public/scripts/controllers/booksController.js b/public/scripts/controllers/booksController.js index fa76ecd9..d2555c90 100644 --- a/public/scripts/controllers/booksController.js +++ b/public/scripts/controllers/booksController.js @@ -7,29 +7,6 @@ function BooksController( $http, $routeParams) { var vm = this; console.log("BOOK controller!") vm.books = []; - vm.editBook = { - title: "", - image: "", - author: "", - releaseDate: "", - } - vm.makeEdit = function(book){ - for(key in vm.editBook){ - vm.editBook[key] = book[key] - } - } - vm.submit = function(book){ - var index = vm.books.indexOf(book); - console.log(index); - $http({ - method: "PUT", - url: "https://super-crud.herokuapp.com/books/" + book._id, - data: vm.editBook - }).then(function(res){ - console.log("success!"); - vm.books[index] = res.data; - }) - } $http({ method: "GET", url: "https://super-crud.herokuapp.com/books", diff --git a/public/scripts/controllers/oneBookController.js b/public/scripts/controllers/oneBookController.js index 67ec62d2..b646ad99 100644 --- a/public/scripts/controllers/oneBookController.js +++ b/public/scripts/controllers/oneBookController.js @@ -6,7 +6,29 @@ OneBookController.$inject = ['$http', '$routeParams']; function OneBookController( $http, $routeParams) { var vm = this; vm.book = {}; - console.log("found One Book!"); + vm.editBook = { + title: "", + image: "", + author: "", + releaseDate: "", + } + vm.makeCopy = function(book){ + for(key in vm.editBook){ + vm.editBook[key] = book[key] + } + console.log(vm.editBook); + } + vm.submit = function(book){ + $http({ + method: "PUT", + url: "https://super-crud.herokuapp.com/books/" + book._id, + data: vm.editBook + }).then(function(res){ + console.log("success!"); + vm.book = res.data; + }) + } + console.log("found A Book!"); $http({ method: "GET", url: "https://super-crud.herokuapp.com/books/" + $routeParams.id, diff --git a/templates/books.html b/templates/books.html index 132a19ab..729fca68 100644 --- a/templates/books.html +++ b/templates/books.html @@ -3,14 +3,11 @@
-
-

{{book.title}}

-
{{book.author}}
-
{{book.releaseDate}}
- -
- - +
+

{{book.title}}

+
{{book.author}}
+
{{book.releaseDate}}
+
\ No newline at end of file diff --git a/templates/onebook.html b/templates/onebook.html index 165817f9..2a5b865c 100644 --- a/templates/onebook.html +++ b/templates/onebook.html @@ -2,10 +2,14 @@
-
-

{{obc.book.title}}

-
{{obc.book.author}}
-
{{obc.book.releaseDate}}
-
+
+

{{obc.book.title}}

+
{{obc.book.author}}
+
{{obc.book.releaseDate}}
+ +
+ +
+ \ No newline at end of file From 375588c6b7c1b2db78011ffe2efa885b7715b187 Mon Sep 17 00:00:00 2001 From: klawton1 Date: Sun, 26 Feb 2017 15:50:58 -0800 Subject: [PATCH 10/11] added filter by select --- public/scripts/controllers/booksController.js | 1 + .../scripts/controllers/oneBookController.js | 25 +++++++++++++------ public/styles/styles.css | 2 +- templates/books.html | 6 ++++- templates/onebook.html | 8 +++--- 5 files changed, 28 insertions(+), 14 deletions(-) diff --git a/public/scripts/controllers/booksController.js b/public/scripts/controllers/booksController.js index d2555c90..bbdde934 100644 --- a/public/scripts/controllers/booksController.js +++ b/public/scripts/controllers/booksController.js @@ -7,6 +7,7 @@ function BooksController( $http, $routeParams) { var vm = this; console.log("BOOK controller!") vm.books = []; + vm.filter = "author"; $http({ method: "GET", url: "https://super-crud.herokuapp.com/books", diff --git a/public/scripts/controllers/oneBookController.js b/public/scripts/controllers/oneBookController.js index b646ad99..36ed5bf1 100644 --- a/public/scripts/controllers/oneBookController.js +++ b/public/scripts/controllers/oneBookController.js @@ -5,6 +5,7 @@ angular OneBookController.$inject = ['$http', '$routeParams']; function OneBookController( $http, $routeParams) { var vm = this; + console.log("found A Book!"); vm.book = {}; vm.editBook = { title: "", @@ -12,6 +13,13 @@ function OneBookController( $http, $routeParams) { author: "", releaseDate: "", } + $http({ + method: "GET", + url: "https://super-crud.herokuapp.com/books/" + $routeParams.id, + }).then(function Success(response){ + console.log(response.data) + vm.book = response.data; + }) vm.makeCopy = function(book){ for(key in vm.editBook){ vm.editBook[key] = book[key] @@ -28,12 +36,13 @@ function OneBookController( $http, $routeParams) { vm.book = res.data; }) } - console.log("found A Book!"); - $http({ - method: "GET", - url: "https://super-crud.herokuapp.com/books/" + $routeParams.id, - }).then(function Success(response){ - console.log(response.data) - vm.book = response.data; - }) + vm.delete = function(){ + console.log("del"); + $http({ + method: "DELETE", + url: "https://super-crud.herokuapp.com/books/" + vm.book._id + }).then(function(res){ + console.log("BOOK WAS DELETED!", res.data); + }) + } } \ No newline at end of file diff --git a/public/styles/styles.css b/public/styles/styles.css index 4322a6c1..e66fcfd3 100644 --- a/public/styles/styles.css +++ b/public/styles/styles.css @@ -1,5 +1,5 @@ .book-cover{ - height: 300px; + height: 275px; width: 200px; } .editing{ diff --git a/templates/books.html b/templates/books.html index 729fca68..6a9f4289 100644 --- a/templates/books.html +++ b/templates/books.html @@ -1,5 +1,9 @@
-
+ +
diff --git a/templates/onebook.html b/templates/onebook.html index 2a5b865c..90f5ba46 100644 --- a/templates/onebook.html +++ b/templates/onebook.html @@ -6,10 +6,10 @@

{{obc.book.title}}

{{obc.book.author}}
{{obc.book.releaseDate}}
- + - - + +
- +
\ No newline at end of file From ab701f190da5bea7f8d460247b9e5ad60096189b Mon Sep 17 00:00:00 2001 From: klawton1 Date: Sun, 26 Feb 2017 17:14:50 -0800 Subject: [PATCH 11/11] added and removed console logs --- public/scripts/controllers/booksController.js | 1 - public/scripts/controllers/oneBookController.js | 12 ++++-------- templates/onebook.html | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/public/scripts/controllers/booksController.js b/public/scripts/controllers/booksController.js index bbdde934..337d4ea9 100644 --- a/public/scripts/controllers/booksController.js +++ b/public/scripts/controllers/booksController.js @@ -5,7 +5,6 @@ angular BooksController.$inject = ['$http', '$routeParams']; function BooksController( $http, $routeParams) { var vm = this; - console.log("BOOK controller!") vm.books = []; vm.filter = "author"; $http({ diff --git a/public/scripts/controllers/oneBookController.js b/public/scripts/controllers/oneBookController.js index 36ed5bf1..62bbb4f9 100644 --- a/public/scripts/controllers/oneBookController.js +++ b/public/scripts/controllers/oneBookController.js @@ -2,10 +2,9 @@ angular .module("booksApp") .controller("OneBookController",OneBookController); -OneBookController.$inject = ['$http', '$routeParams']; -function OneBookController( $http, $routeParams) { +OneBookController.$inject = ['$http', '$routeParams', '$location']; +function OneBookController( $http, $routeParams, $location) { var vm = this; - console.log("found A Book!"); vm.book = {}; vm.editBook = { title: "", @@ -17,14 +16,12 @@ function OneBookController( $http, $routeParams) { method: "GET", url: "https://super-crud.herokuapp.com/books/" + $routeParams.id, }).then(function Success(response){ - console.log(response.data) vm.book = response.data; }) vm.makeCopy = function(book){ for(key in vm.editBook){ vm.editBook[key] = book[key] } - console.log(vm.editBook); } vm.submit = function(book){ $http({ @@ -32,17 +29,16 @@ function OneBookController( $http, $routeParams) { url: "https://super-crud.herokuapp.com/books/" + book._id, data: vm.editBook }).then(function(res){ - console.log("success!"); vm.book = res.data; + $location.path('/'); }) } vm.delete = function(){ - console.log("del"); $http({ method: "DELETE", url: "https://super-crud.herokuapp.com/books/" + vm.book._id }).then(function(res){ - console.log("BOOK WAS DELETED!", res.data); + $location.path('/'); }) } } \ No newline at end of file diff --git a/templates/onebook.html b/templates/onebook.html index 90f5ba46..328d93e4 100644 --- a/templates/onebook.html +++ b/templates/onebook.html @@ -11,5 +11,5 @@
{{obc.book.releaseDate}} Cancel
- +
\ No newline at end of file