From 33ccb2d835d6c8eeec939c05cf907ec667982a18 Mon Sep 17 00:00:00 2001
From: Noah Wimmer <nwimmer123@yahoo.com>
Date: Tue, 8 Dec 2015 13:25:02 -0800
Subject: [PATCH 1/6] installed moongose, nodemon and commented out album from
 html

---
 package.json     | 6 +++++-
 views/index.html | 8 ++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 0d3e4f8..d80d9ef 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,8 @@
   "description": "An app for tracking your music collection",
   "main": "server.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "start": "node server.js"
   },
   "repository": {
     "type": "git",
@@ -18,5 +19,8 @@
   "homepage": "https://github.com/tgaff/tunely#readme",
   "dependencies": {
     "express": "^4.13.3"
+  },
+  "directories": {
+    "doc": "docs"
   }
 }
diff --git a/views/index.html b/views/index.html
index 5cb6501..1a308bc 100644
--- a/views/index.html
+++ b/views/index.html
@@ -38,7 +38,7 @@ <h2>Albums</h2>
 
 
           <!-- one album -->
-          <div class="row album">
+<!--          <div class="row album">
 
             <div class="col-md-10 col-md-offset-1">
               <div class="panel panel-default">
@@ -46,7 +46,7 @@ <h2>Albums</h2>
 
 
                 <!-- begin album internal row -->
-                  <div class='row'>
+<!--                 <div class='row'>
                     <div class="col-md-3 col-xs-12 thumbnail album-art">
                       <img src="http://placehold.it/800x800" alt="album image">
                     </div>
@@ -70,10 +70,10 @@ <h4 class='inline-header'>Released date:</h4>
                       </ul>
                     </div>
 
-                  </div>
+                  </div>       
                   <!-- end of album internal row -->
 
-                  <div class='panel-footer'>
+<!--                  <div class='panel-footer'>
                   </div>
 
                 </div>

From ba967d114904674982eb70f9890617477f6b1222 Mon Sep 17 00:00:00 2001
From: Noah Wimmer <nwimmer123@yahoo.com>
Date: Tue, 8 Dec 2015 15:06:22 -0800
Subject: [PATCH 2/6] finished Step1

---
 public/js/app.js | 13 +++++--------
 views/index.html | 45 ---------------------------------------------
 2 files changed, 5 insertions(+), 53 deletions(-)

diff --git a/public/js/app.js b/public/js/app.js
index 164eb55..a6d6cce 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -5,7 +5,6 @@
  *
  */
 
-
 /* hard-coded data! */
 var sampleAlbums = [];
 sampleAlbums.push({
@@ -34,20 +33,15 @@ sampleAlbums.push({
            });
 /* end of hard-coded data */
 
-
-
-
 $(document).ready(function() {
   console.log('app.js loaded!');
+  renderAlbum(sampleAlbums[0]);
 });
 
-
-
-
-
 // this function takes a single album and renders it to the page
 function renderAlbum(album) {
   console.log('rendering album:', album);
+  
 
   var albumHtml =
   "        <!-- one album -->" +
@@ -89,4 +83,7 @@ function renderAlbum(album) {
   "          <!-- end one album -->";
 
   // render to the page with jQuery
+  sampleAlbums.forEach(function (element) {
+   $('#albums').append(albumHtml);
+  });
 }
diff --git a/views/index.html b/views/index.html
index 1a308bc..85b13d8 100644
--- a/views/index.html
+++ b/views/index.html
@@ -37,51 +37,6 @@ <h2>Albums</h2>
 
 
 
-          <!-- one album -->
-<!--          <div class="row album">
-
-            <div class="col-md-10 col-md-offset-1">
-              <div class="panel panel-default">
-                <div class="panel-body">
-
-
-                <!-- begin album internal row -->
-<!--                 <div class='row'>
-                    <div class="col-md-3 col-xs-12 thumbnail album-art">
-                      <img src="http://placehold.it/800x800" alt="album image">
-                    </div>
-
-                    <div class="col-md-9 col-xs-12">
-                      <ul class="list-group">
-                        <li class="list-group-item">
-                          <h4 class='inline-header'>Album Name:</h4>
-                          <span class='album-name'>Ladyhawke</span>
-                        </li>
-
-                        <li class="list-group-item">
-                          <h4 class='inline-header'>Artist Name:</h4>
-                          <span class='artist-name'>Ladyhawke</span>
-                        </li>
-
-                        <li class="list-group-item">
-                          <h4 class='inline-header'>Released date:</h4>
-                          <span class='album-releaseDate'>2008, November 18</span>
-                        </li>
-                      </ul>
-                    </div>
-
-                  </div>       
-                  <!-- end of album internal row -->
-
-<!--                  <div class='panel-footer'>
-                  </div>
-
-                </div>
-              </div>
-            </div>
-          </div>
-          <!-- end one album -->
-
 
 
 

From d18f04ae19be298c17ab7176b8397618fdf9c026 Mon Sep 17 00:00:00 2001
From: Noah Wimmer <nwimmer123@yahoo.com>
Date: Tue, 8 Dec 2015 15:37:44 -0800
Subject: [PATCH 3/6] finished Step2

---
 public/js/app.js | 15 +++++++++++++++
 server.js        |  4 ++++
 2 files changed, 19 insertions(+)

diff --git a/public/js/app.js b/public/js/app.js
index a6d6cce..b3ca440 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -87,3 +87,18 @@ function renderAlbum(album) {
    $('#albums').append(albumHtml);
   });
 }
+
+//Step 2
+
+$.ajax({
+  method: 'GET',
+  url: '/api/albums',
+  success: function show_albums (data) {
+    sampleAlbums.forEach(function (element){
+      $("#albums").append("<p>" + "Artist Name: " + element.artistName + "</p>" );
+      $("#albums").append("<p>" + "Name: " + element.name + "</p>");
+      $("#albums").append("<p>" + "Release Date: " + element.releaseDate + "</p>");
+      $("#albums").append("<p>" + "Genres: " + element.genres + "</p><br>");
+    });
+  }
+});
diff --git a/server.js b/server.js
index 5da137b..6d829ea 100644
--- a/server.js
+++ b/server.js
@@ -57,6 +57,10 @@ app.get('/', function homepage (req, res) {
   res.sendFile(__dirname + '/views/index.html');
 });
 
+app.get('/api/albums', function albums_api (req, res){
+  res.json({albums: albums});
+});
+
 
 /*
  * JSON API Endpoints

From ab2f636f7565e8e47dc1e9e4c6d89ff3cf1c98dd Mon Sep 17 00:00:00 2001
From: Noah Wimmer <nwimmer123@yahoo.com>
Date: Tue, 8 Dec 2015 15:56:22 -0800
Subject: [PATCH 4/6] finished step3

---
 models/album.js | 9 +++++++++
 models/index.js | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/models/album.js b/models/album.js
index 0411a57..2185010 100644
--- a/models/album.js
+++ b/models/album.js
@@ -1,2 +1,11 @@
 var mongoose = require("mongoose");
 var Schema = mongoose.Schema;
+
+var AlbumSchema = new mongoose.Schema({
+	artistName: String,
+	name: String,
+	releaseDate: String,
+	genre: [ String ]
+});
+
+var Album = moongose.model('Album', AlbumSchema);
\ No newline at end of file
diff --git a/models/index.js b/models/index.js
index 6c10401..d445c3c 100644
--- a/models/index.js
+++ b/models/index.js
@@ -1,2 +1,4 @@
 var mongoose = require("mongoose");
 mongoose.connect("mongodb://localhost/tunely");
+
+module.exports.album = require("./album.js");
\ No newline at end of file

From 0b5da0a8468085888f139854831de40c6d391003 Mon Sep 17 00:00:00 2001
From: Noah Wimmer <nwimmer123@yahoo.com>
Date: Tue, 8 Dec 2015 22:45:34 -0800
Subject: [PATCH 5/6] as far as I'm gonna get

---
 models/album.js  |  3 ++-
 public/js/app.js |  2 ++
 seed.js          | 27 ++++++++++++++++++++++++++-
 server.js        |  2 ++
 views/index.html |  6 ------
 5 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/models/album.js b/models/album.js
index 2185010..6a1156f 100644
--- a/models/album.js
+++ b/models/album.js
@@ -8,4 +8,5 @@ var AlbumSchema = new mongoose.Schema({
 	genre: [ String ]
 });
 
-var Album = moongose.model('Album', AlbumSchema);
\ No newline at end of file
+var Album = mongoose.model('Album', AlbumSchema);
+module.exports = Album;
\ No newline at end of file
diff --git a/public/js/app.js b/public/js/app.js
index b3ca440..442cec2 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -5,6 +5,8 @@
  *
  */
 
+module.exports.album = require("./album.js");
+
 /* hard-coded data! */
 var sampleAlbums = [];
 sampleAlbums.push({
diff --git a/seed.js b/seed.js
index 1943f8f..e963387 100644
--- a/seed.js
+++ b/seed.js
@@ -3,8 +3,33 @@
 
 var db = require("./models");
 
+var Album = require("./models/album.js");
+
 var albumsList =[
-  // put data here!
+	{
+	artistName: 'Nine Inch Nails',
+    name: 'The Downward Spiral',
+    releaseDate: '1994, March 8',
+    genres: [ 'industrial', 'industrial metal' ]
+    },
+	{
+	artistName: 'Metallica',
+	name: 'Metallica',
+	releaseDate: '1991, August 12',
+	genres: [ 'heavy metal' ]
+    },
+	{
+    artistName: 'The Prodigy',
+    name: 'Music for the Jilted Generation',
+    releaseDate: '1994, July 4',
+    genres: [ 'electronica', 'breakbeat hardcore', 'rave', 'jungle' ]
+    },
+	{
+    artistName: 'Johnny Cash',
+    name: 'Unchained',
+    releaseDate: '1996, November 5',
+    genres: [ 'country', 'rock' ]
+    }
 ];
 
 db.Album.remove({}, function(err, albums){
diff --git a/server.js b/server.js
index 6d829ea..00f9e4c 100644
--- a/server.js
+++ b/server.js
@@ -8,6 +8,8 @@ var app = express();
 // serve static files from public folder
 app.use(express.static(__dirname + '/public'));
 
+module.exports.album = require("./album.js");
+
 /************
  * DATABASE *
  ************/
diff --git a/views/index.html b/views/index.html
index 85b13d8..4a831db 100644
--- a/views/index.html
+++ b/views/index.html
@@ -34,12 +34,6 @@ <h2>Albums</h2>
       <!-- albums! -->
       <div id='albums'>
 
-
-
-
-
-
-
       </div>
     </section>
 

From 2a986e60863070b8f385a470606c9ed975936834 Mon Sep 17 00:00:00 2001
From: Noah Wimmer <nwimmer123@yahoo.com>
Date: Wed, 9 Dec 2015 10:39:48 -0800
Subject: [PATCH 6/6] skipping to sprint 3

---
 public/js/app.js | 2 --
 server.js        | 2 --
 2 files changed, 4 deletions(-)

diff --git a/public/js/app.js b/public/js/app.js
index 442cec2..b3ca440 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -5,8 +5,6 @@
  *
  */
 
-module.exports.album = require("./album.js");
-
 /* hard-coded data! */
 var sampleAlbums = [];
 sampleAlbums.push({
diff --git a/server.js b/server.js
index 00f9e4c..6d829ea 100644
--- a/server.js
+++ b/server.js
@@ -8,8 +8,6 @@ var app = express();
 // serve static files from public folder
 app.use(express.static(__dirname + '/public'));
 
-module.exports.album = require("./album.js");
-
 /************
  * DATABASE *
  ************/