Zach - Submission - tunr_express

controllers/404-controller.js

@@ -0,0 +1,3 @@
+module.exports.get404Page = (req, res) => {
+    res.status(404).render('404');
+}

controllers/artists-controller.js

@@ -0,0 +1,65 @@
+const db = require('../util/database.js');
+
+module.exports.getArtistById = async (req, res) => {
+
+    const { id } = req.params;
+    const queryT = `SELECT * FROM artists WHERE id=${id}`
+    const { rows } = await db.query(queryT);
+
+    res.render('./artists/artist-single', { 'singleArtist': rows[0] });
+
+}
+
+module.exports.getAllArtists = async (req, res) => {
+
+    const { rows } = await db.query('SELECT * FROM artists');
+
+    res.render('./artists/artist-all', { 'allArtists': rows });
+
+}
+
+module.exports.getAddArtist = async (req, res) => {
+    res.render('./artists/add-artist');
+}
+
+module.exports.postAddArtist = async (req, res) => {
+
+    const queryT = `INSERT INTO artists(name, nationality, photo_url) VALUES($1, $2, $3) RETURNING *`;
+    const queryV = [req.body.name, req.body.nationality, req.body['image link']];
+    const { rows } = await db.query(queryT, queryV);
+
+    res.redirect(`./${rows[0].id}`);
+
+}
+
+module.exports.getEditArtistById = async (req, res) => {
+
+    const { id } = req.params;
+    const queryT = `SELECT * FROM artists WHERE id=${id}`
+    const { rows } = await db.query(queryT);
+
+    res.render('./artists/edit-artist', {
+        'singleArtist': rows[0]
+    });
+
+}
+
+module.exports.putArtistById = async (req, res) => {
+
+
+    const { id } = req.params;
+    const queryT = `UPDATE artists SET name = '${req.body.name}', nationality = '${req.body.nationality}', photo_url = '${req.body['image link']}' WHERE id=${id}`
+    const { rows } = await db.query(queryT);
+
+    res.redirect(`./${id}`);
+
+}
+
+module.exports.deleteArtistById = async (req, res) => {
+
+    const { id } = req.params;
+    const queryT = `DELETE from artists WHERE id=${id}`
+    const { rows } = await db.query(queryT);
+    res.render('./artists/artist-deleted');
+
+}

controllers/songs-controller.js

@@ -0,0 +1,35 @@
+const db = require('../util/database.js');
+
+module.exports.getArtistSongById = async (req, res) => {
+    // const { id } = req.params;
+    // const { rows } = await db.query('SELECT * FROM songs where id = $1', [id]);
+    console.log('Get Artist Song By Id');
+    res.send('Get Artist Song By Id');
+}
+
+module.exports.getAllSongsOfArtist = async (req, res) => {
+    // const { id } = req.params;
+    // const { rows } = await db.query('SELECT * FROM songs');
+    console.log('Get All Songs');
+    res.send('Get All Songs');
+}
+
+module.exports.postAddSongToArtist = async (req, res) => {
+    console.log('Add New Artist!');
+    res.send('Add New Artist!');
+}
+
+module.exports.getEditArtistSongById = async (req, res) => {
+    console.log('Get Edit Artist Form By Id!');
+    res.send('Get Edit Artist Form By Id!');
+}
+
+module.exports.putArtistSongById = async (req, res) => {
+    console.log('Artist Edited!');
+    res.send('Artist Edited!');
+}
+
+module.exports.deleteArtistSongById = async (req, res) => {
+    console.log('Delete Artist Form By Id!');
+    res.send('Delete Artist Form By Id!');
+}

artist_data.sql → db/artist_data.sql

@@ -1,5 +1,6 @@
-INSERT INTO artists(name, photo_url, nationality) VALUES('Yeah Yeah Yeahs', 'http://www.athousandguitars.com/wp-content/uploads/2013/04/yeah-yeah-yeahs.jpg', 'USA');
+----psql -U zachariah -d tunr_db -a -f ./db/artist_data.sql--
+INSERT INTO artists(name, photo_url, nationality) VALUES('Yeah Yeah Yeahs', 'https://www.allthingsgomusic.com/wp-content/uploads/2017/09/Yeah-Yeah-Yeahs-1.jpg', 'USA');
 INSERT INTO artists(name, photo_url, nationality) VALUES('Nosaj Thing', 'http://wertn.com/wp-content/uploads/2012/04/Nosaj-Thing_Mondrian_CL_High-3487.jpg', 'USA');
 INSERT INTO artists(name, photo_url, nationality) VALUES('Norah Jones', 'http://entertainmentrealm.files.wordpress.com/2012/05/norahjones1.jpg', 'USA');
 INSERT INTO artists(name, photo_url, nationality) VALUES('Lykke Li', 'http://www.chartattack.com/wp-content/uploads/2012/07/lykke-li-newmain1-photo-by-daniel-jackson.jpg', 'Sweeden');
-INSERT INTO artists(name, photo_url, nationality) VALUES('Kendrick Lamar', 'http://www.xxlmag.com/wp-content/uploads/2013/06/kendricklamar_001-1600.jpg', 'USA');
+INSERT INTO artists(name, photo_url, nationality) VALUES('Kendrick Lamar', 'http://www.xxlmag.com/wp-content/uploads/2013/06/kendricklamar_001-1600.jpg', 'USA');

songs.sql → db/songs.sql

@@ -1,3 +1,4 @@
+--psql -U zachariah -d tunr_db -a -f ./db/songs.sql--
  INSERT INTO songs(title, album, preview_link, artwork, artist_id) VALUES('Maps', 'Fever to Tell', 'http://a1748.phobos.apple.com/us/r1000/074/Music/d4/97/e7/mzm.bigdtgoz.aac.p.m4a', 'http://a3.mzstatic.com/us/r30/Features/d6/ba/99/dj.homcvzwl.60x60-50.jpg', '1');
  INSERT INTO songs(title, album, preview_link, artwork, artist_id) VALUES('Heads Will Roll', 'It''s Blitz! (Deluxe Edition)', 'http://a308.phobos.apple.com/us/r1000/064/Music/9c/a6/3a/mzm.zgjjoqyj.aac.p.m4a', 'http://a1.mzstatic.com/us/r30/Music/4c/30/8c/mzi.gcicgujl.60x60-50.jpg', '1');
  INSERT INTO songs(title, album, preview_link, artwork, artist_id) VALUES('Gold Lion', 'Show Your Bones', 'http://a850.phobos.apple.com/us/r1000/105/Music/d0/b6/fe/mzm.qoeoeazp.aac.p.m4a', 'http://a5.mzstatic.com/us/r30/Features/73/a1/1a/dj.mwlaurzf.60x60-50.jpg', '1');
@@ -247,4 +248,4 @@
  INSERT INTO songs(title, album, preview_link, artwork, artist_id) VALUES('Bitch, Don’t Kill My Vibe (feat. JAY Z)', 'good kid, m.A.A.d city', 'http://a796.phobos.apple.com/us/r1000/081/Music/v4/64/05/93/640593c0-7a02-3082-e539-a3928c1b3fcf/mzaf_5043431582450077336.aac.m4a', 'http://a4.mzstatic.com/us/r30/Music2/v4/fe/14/11/fe1411bd-77a8-0f69-824a-20145345d9a8/UMG_cvrart_00602537362783_01_RGB72_1500x1500_12UMGIM52988.60x60-50.jpg', '5');
  INSERT INTO songs(title, album, preview_link, artwork, artist_id) VALUES('Swimming Pools (Drank)', 'good kid, m.A.A.d city', 'http://a1265.phobos.apple.com/us/r1000/063/Music/v4/12/0f/13/120f13b3-ba47-2223-d97a-f9ddeae408b6/mzaf_1783459415414390232.aac.m4a', 'http://a1.mzstatic.com/us/r30/Music2/v4/53/ea/bb/53eabb9c-dfaf-b926-cc73-9a1ad6ee548f/UMG_cvrart_00602537362790_01_RGB72_1500x1500_12UMGIM52989.60x60-50.jpg', '5');
  INSERT INTO songs(title, album, preview_link, artwork, artist_id) VALUES('Michael Jordan (feat. Schoolboy Q)', 'Overly Dedicated', 'http://a372.phobos.apple.com/us/r30/Music/ff/b3/1a/mzm.ycpsoiyo.aac.p.m4a', 'http://a2.mzstatic.com/us/r30/Music/7f/4a/12/mzi.onkyvccv.60x60-50.jpg', '5');
- INSERT INTO songs(title, album, preview_link, artwork, artist_id) VALUES('Sing About Me, I''m Dying of Thirst', 'good kid, m.A.A.d city', 'http://a731.phobos.apple.com/us/r1000/081/Music/v4/b8/61/36/b861368e-1960-5b0a-63b7-8cdfc5e0c802/mzaf_9127169611152605592.aac.m4a', 'http://a1.mzstatic.com/us/r30/Music2/v4/53/ea/bb/53eabb9c-dfaf-b926-cc73-9a1ad6ee548f/UMG_cvrart_00602537362790_01_RGB72_1500x1500_12UMGIM52989.60x60-50.jpg', '5');
+ INSERT INTO songs(title, album, preview_link, artwork, artist_id) VALUES('Sing About Me, I''m Dying of Thirst', 'good kid, m.A.A.d city', 'http://a731.phobos.apple.com/us/r1000/081/Music/v4/b8/61/36/b861368e-1960-5b0a-63b7-8cdfc5e0c802/mzaf_9127169611152605592.aac.m4a', 'http://a1.mzstatic.com/us/r30/Music2/v4/53/ea/bb/53eabb9c-dfaf-b926-cc73-9a1ad6ee548f/UMG_cvrart_00602537362790_01_RGB72_1500x1500_12UMGIM52989.60x60-50.jpg', '5');

db/table-artist_data.sql

@@ -0,0 +1,8 @@
+--psql -U zachariah -d tunr_db -a -f ./db/table-artists_data.sql--
+
+CREATE TABLE artists (
+	id serial PRIMARY KEY,
+	name VARCHAR (255) UNIQUE NOT NULL,
+	photo_url VARCHAR (255),
+	nationality VARCHAR (255)
+);

db/table-songs.sql

@@ -0,0 +1,10 @@
+--psql -U zachariah -d tunr_db -a -f ./db/table-songs.sql--
+
+CREATE TABLE songs (
+	id serial PRIMARY KEY,
+	title VARCHAR (255) NOT NULL,
+	album VARCHAR (255),
+	preview_link VARCHAR (355),
+	artwork VARCHAR (355),
+	artist_id INTEGER REFERENCES artists(id)
+);

package.json

@@ -1,23 +1,28 @@
 {
-  "name": "tunr_express",
-  "version": "1.0.0",
-  "description": "We're going to be building Tunr, the worlds #1 music catalog / player (those Spotify haters can't keep up with us).",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://git.generalassemb.ly/ga-wdi-exercises/tunr_sinatra.git"
-  },
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "express": "^4.16.3",
-    "express-react-views": "^0.10.5",
-    "method-override": "^3.0.0",
-    "pg": "^7.4.3",
-    "react": "^16.5.2",
-    "react-dom": "^16.5.2"
-  }
-}
+		"name": "tunr_express",
+		"version": "1.0.0",
+		"description": "We're going to be building Tunr, the worlds #1 music catalog / player (those Spotify haters can't keep up with us).",
+		"main": "index.js",
+		"scripts": {
+				"test": "echo \"Error: no test specified\" && exit 1",
+				"start": "nodemon ./routes/app.js"
+		},
+		"repository": {
+				"type": "git",
+				"url": "https://git.generalassemb.ly/ga-wdi-exercises/tunr_sinatra.git"
+		},
+		"author": "",
+		"license": "ISC",
+		"dependencies": {
+				"express": "^4.16.3",
+				"express-promise-router": "^3.0.3",
+				"express-react-views": "^0.10.5",
+				"method-override": "^3.0.0",
+				"pg": "^7.4.3",
+				"react": "^16.5.2",
+				"react-dom": "^16.5.2"
+		},
+		"devDependencies": {
+				"nodemon": "^2.0.3"
+		}
+}

public/css/main.css

@@ -0,0 +1,4 @@
+* {
+		margin: 0;
+		padding: 0;
+}

public/scripts/add-form.js

@@ -0,0 +1,26 @@
+const submitBtn = document.querySelector('.edit-form__submit-btn');
+
+// let nameInput, nationalityInput, imageLinkInput;
+// [nameInput, nationalityInput, imageLinkInput] = document.querySelectorAll('.edit-form>input');
+
+submitBtn.addEventListener('click', (ev) => {
+
+    invalidMsg = [];
+
+    document.querySelectorAll('.add-form>input').forEach(input => {
+        if (!input.value) invalidMsg.push(input.name)
+    })
+
+    if (invalidMsg.length > 0) {
+
+        ev.preventDefault()
+
+        let messageEl = document.createElement('p');
+
+        messageEl.innerText = invalidMsg.reduce((msg, input) => {
+            return msg.concat(input, "\n");
+        }, 'The following fields are empty:\n')
+
+        document.querySelector('.add-form').append(messageEl);
+    }
+})

public/scripts/edit-form.js

@@ -0,0 +1,26 @@
+const submitBtn = document.querySelector('.edit-form__submit-btn');
+
+// let nameInput, nationalityInput, imageLinkInput;
+// [nameInput, nationalityInput, imageLinkInput] = document.querySelectorAll('.edit-form>input');
+
+submitBtn.addEventListener('click', (ev) => {
+
+    invalidMsg = [];
+
+    document.querySelectorAll('.edit-form>input').forEach(input => {
+        if (!input.value) invalidMsg.push(input.name)
+    })
+
+    if (invalidMsg.length > 0) {
+
+        ev.preventDefault()
+
+        let messageEl = document.createElement('p');
+
+        messageEl.innerText = invalidMsg.reduce((msg, input) => {
+            return msg.concat(input, "\n");
+        }, 'The following fields are empty:\n')
+
+        document.querySelector('.edit-form').append(messageEl);
+    }
+})