diff --git a/Makefile b/Makefile index 8b6d8b8..2c7c39d 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,9 @@ help: .PHONY: start start: docker-compose-up watch-frontend ## Start containers and watch frontend +.PHONY: logs +logs: ## Tail the app and worker logs + docker-compose logs -f app worker .PHONY: migrate migrate: ## Migrate database schema diff --git a/Procfile b/Procfile new file mode 100644 index 0000000..eb4c687 --- /dev/null +++ b/Procfile @@ -0,0 +1,2 @@ +web: yarn start +worker: yarn run worker diff --git a/lib/services/itunes/index.js b/lib/services/itunes/index.js index 6f45df8..d2ab3e4 100644 --- a/lib/services/itunes/index.js +++ b/lib/services/itunes/index.js @@ -113,7 +113,7 @@ export function* search(data) { type, id: `us${result.collectionId}`, name: result.trackName ? result.trackName : result.collectionName, - streamUrl: null, + streamUrl: result.collectionViewUrl, purchaseUrl: result.collectionViewUrl, artwork: { small: `${result.artworkUrl100.replace('100x100', '200x200').replace('.mzstatic.com', '-ssl.mzstatic.com').replace('http://', 'https://')}`, diff --git a/package.json b/package.json index 163ec5d..5720052 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "node": "^8.6.0" }, "dependencies": { + "apple-music-jwt": "^0.1.2", "babel": "^6.1.18", "babel-cli": "^6.26.0", "babel-core": "^6.26.0", @@ -50,7 +51,7 @@ "babel-preset-latest-minimal": "^1.1.2", "babel-register": "^6.26.0", "bluebird": "^3.4.1", - "bulma": "^0.4.1", + "bulma": "^0.6.0", "co": "~4.6.0", "css-loader": "^0.28.1", "debug": "^2.6.6", diff --git a/public/assets/images/google.png b/public/assets/images/google.png index c9f278e..a16207a 100644 Binary files a/public/assets/images/google.png and b/public/assets/images/google.png differ diff --git a/public/assets/images/itunes.png b/public/assets/images/itunes.png index 7bb4ce9..2eaed76 100644 Binary files a/public/assets/images/itunes.png and b/public/assets/images/itunes.png differ diff --git a/public/src/app.vue b/public/src/app.vue index 75af952..b6f4367 100644 --- a/public/src/app.vue +++ b/public/src/app.vue @@ -2,16 +2,18 @@
-

+

combine.fm

-
+
+