Merge pull request #24 from zembrodt/develop

Merge develop into main

README.dev.md

@@ -1,11 +1,11 @@
-## SpotifyDisplay Dev Information
+## ShowTunes Dev Information
 
-### music-display-api
-An instance of music-display-api must be running.
+### ShowTunes API
+An instance of showtunes-api must be running.
 The url of this instance must be provided in `src/assets/config/config.dev.json`
 under `"auth" / "tokenUrl"`
 
-Example: `"tokenUrl": "https://music-display-api.herokuapp.com/api/auth/tokens"`
+Example: `"tokenUrl": "https://showtunes-api.herokuapp.com/api/auth/tokens"`
 
 ### Spotify Callbacks
 The Spotify API must have a callback URL for authentications. This CAN be done via localhost,

README.md

@@ -1,9 +1,9 @@
-# SpotifyDisplay
+# ShowTunes
 
-[![Netlify Status](https://api.netlify.com/api/v1/badges/cdba6611-162b-41e3-a14e-bef25c09dfce/deploy-status)](https://app.netlify.com/sites/music-display/deploys)
+[![Netlify Status](https://api.netlify.com/api/v1/badges/cdba6611-162b-41e3-a14e-bef25c09dfce/deploy-status)](https://app.netlify.com/sites/showtunes/deploys)
 
 Angular web application used to display your currently playing Spotify track with a web player.
 
-Can interface with an external API to hide Spotify client secret. See https://github.com/zembrodt/music-display-api for an implementation in Go.
+Can interface with an external API to hide Spotify client secret. See https://github.com/zembrodt/showtunes-api for an implementation in Go.
 
-Application deployed to https://music.zembrodt.com
+Application deployed to https://showtunes.app

angular.json

@@ -3,7 +3,7 @@
   "version": 1,
   "newProjectRoot": "projects",
   "projects": {
-    "music-display": {
+    "showtunes": {
       "projectType": "application",
       "schematics": {},
       "root": "",
@@ -13,7 +13,7 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "outputPath": "dist/music-display",
+            "outputPath": "dist/showtunes",
             "index": "src/index.html",
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
@@ -69,18 +69,18 @@
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "browserTarget": "music-display:build"
+            "browserTarget": "showtunes:build"
           },
           "configurations": {
             "production": {
-              "browserTarget": "music-display:build:production"
+              "browserTarget": "showtunes:build:production"
             }
           }
         },
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "browserTarget": "music-display:build"
+            "browserTarget": "showtunes:build"
           }
         },
         "test": {
@@ -105,16 +105,16 @@
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {
             "protractorConfig": "e2e/protractor.conf.js",
-            "devServerTarget": "music-display:serve"
+            "devServerTarget": "showtunes:serve"
           },
           "configurations": {
             "production": {
-              "devServerTarget": "music-display:serve:production"
+              "devServerTarget": "showtunes:serve:production"
             }
           }
         }
       }
     }
   },
-  "defaultProject": "music-display"
+  "defaultProject": "showtunes"
 }

gulpfile.js

@@ -52,7 +52,7 @@ gulp.task('generate-config', () => {
     }
 
     // Rewrite json config to dist
-    fs.writeFileSync(`./dist/music-display/assets/config/config.${env}.json`, JSON.stringify(configJson));
+    fs.writeFileSync(`./dist/showtunes/assets/config/config.${env}.json`, JSON.stringify(configJson));
     resolve();
   });
 });

karma.conf.js

@@ -16,7 +16,7 @@ module.exports = function (config) {
       clearContext: false // leave Jasmine Spec Runner output visible in browser
     },
     coverageIstanbulReporter: {
-      dir: require('path').join(__dirname, './coverage/music-display'),
+      dir: require('path').join(__dirname, './coverage/showtunes'),
       reports: ['html', 'lcovonly', 'text-summary'],
       fixWebpackSourcePaths: true
     },