Skip to content

Commit

Permalink
Merge pull request #10 from zembrodt/develop
Browse files Browse the repository at this point in the history
Merge develop into main
  • Loading branch information
zembrodt authored Dec 9, 2021
2 parents f7e1d83 + b72fe96 commit 57d4269
Show file tree
Hide file tree
Showing 8 changed files with 17,610 additions and 58 deletions.
17,632 changes: 17,585 additions & 47 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "portfolio",
"version": "0.1.2",
"version": "0.1.3",
"scripts": {
"ng": "ng",
"start": "ng serve",
Expand Down
27 changes: 18 additions & 9 deletions src/assets/data/projects.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
[
{
"title": "ShowTunes",
"id": "showtunes",
"projectUrl": "https://showtunes.app",
"githubUrl": "https://github.com/zembrodt/showtunes",
"docsUrl": null,
"screenshotUrl": "assets/images/showtunes_screenshot.png",
"technologies": ["Angular", "TypeScript", "Go", "Heroku", "Netlify"]
},
{
"title": "PyMDb",
"id": "pymdb",
Expand All @@ -8,15 +17,6 @@
"screenshotUrl": "assets/images/pymdb_screenshot.png",
"technologies": ["Python"]
},
{
"title": "Music Display App",
"id": "music-display",
"projectUrl": "https://music.zembrodt.com",
"githubUrl": "https://github.com/zembrodt/music-display",
"docsUrl": null,
"screenshotUrl": "assets/images/music_display_screenshot.png",
"technologies": ["Angular", "TypeScript", "Go", "Heroku", "Netlify"]
},
{
"title": "Portfolio",
"id": "portfolio",
Expand All @@ -26,6 +26,15 @@
"screenshotUrl": "",
"technologies": ["Angular", "TypeScript", "Netlify"]
},
{
"title": "ShowTunes API",
"id": "showtunes-api",
"projectUrl": null,
"githubUrl": "https://github.com/zembrodt/showtunes-api",
"docsUrl": null,
"screenshotUrl": null,
"technologies": ["Go", "Heroku"]
},
{
"title": "Neat App",
"id": "neat-app",
Expand Down
1 change: 0 additions & 1 deletion src/assets/data/projects/music-display.md

This file was deleted.

5 changes: 5 additions & 0 deletions src/assets/data/projects/showtunes-api.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
A small REST API used by [ShowTunes](https://github.com/zembrodt/showtunes)
written in Golang and deployed on Heroku.

Provides the ability to retrieve and refresh Spotify OAuth tokens and retrieve the dominant
color of a Spotify album's cover art.
1 change: 1 addition & 0 deletions src/assets/data/projects/showtunes.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
A modifiable web app to display a user's currently playing track on Spotify. Try it out!
Binary file removed src/assets/images/music_display_screenshot.png
Binary file not shown.
Binary file added src/assets/images/showtunes_screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 57d4269

Please sign in to comment.