diff --git a/music/templates/base.html b/music/templates/base.html index 7163c18..ef54db1 100644 --- a/music/templates/base.html +++ b/music/templates/base.html @@ -23,13 +23,10 @@

{% block content %}{% endblock %} - diff --git a/music/templates/index.html b/music/templates/index.html index 339da55..da1df4f 100644 --- a/music/templates/index.html +++ b/music/templates/index.html @@ -16,12 +16,20 @@
-

music tools

+

Music Tools

-

create "super-playlists" of smaller modular playlists

+

A set of tools using Spotify and Last.fm to create smart playlists and calculate listening statistics

+

Playlists are updated multiple times a day to keep tracks up to date

+ +

Written in Python and Javascript, based on the spotframework and fmframework libraries

+ +
+ View Source + iOS Client Source +
{% if logged_in %} - launch + Launch {% endif %}
@@ -31,4 +39,48 @@ {% endif %}
+
+

Smart Playlists

+
+
+
+

Sources

+

Create smart Spotify playlists pulling tracks from

+ +
+
+

Currents

+

Currents are mix playlists acting as the a snapshot of what you've been listening to recently

+

Include date filtering on playlist sources for recently added tracks

+

Optionally search for and include "monthly" playlists for the last two months when named e.g february 20

+
+
+
+
+

Last.fm Charts

+

Create playlists including Last.fm track charts of varying length and time range

+
+
+

Recommendations

+

Include Spotify recommendations based on the other tracks

+
+ +
+
+

Tags

+
+
+
+

Last.fm Integration

+

Create groups of entries for scrobble summing and listening stats

+
+
+

Visualise Data

+

Present listening trends with pie charts

+
+
{% endblock %} diff --git a/music/templates/login.html b/music/templates/login.html index 214411e..528d8bd 100644 --- a/music/templates/login.html +++ b/music/templates/login.html @@ -3,16 +3,14 @@ {% block form %}
-

login

-
-

username

-

password

+

Username

+

Password

- +

- register + Register
diff --git a/music/templates/register.html b/music/templates/register.html index 2f4feb9..2a593e9 100644 --- a/music/templates/register.html +++ b/music/templates/register.html @@ -3,15 +3,13 @@ {% block form %}
-

register

-
-

username

-

password

-

password again

+

Username

+

Password

+

Password again

- +
diff --git a/src/js/MusicTools.js b/src/js/MusicTools.js index d667ad5..9ffd226 100644 --- a/src/js/MusicTools.js +++ b/src/js/MusicTools.js @@ -137,7 +137,7 @@ class MusicTools extends Component { } - + { window.location.href = '/auth/logout' }}> diff --git a/src/js/Playlist/New.js b/src/js/Playlist/New.js index 34cf4a4..b87f754 100644 --- a/src/js/Playlist/New.js +++ b/src/js/Playlist/New.js @@ -26,12 +26,17 @@ class NewPlaylist extends Component { switch(value){ case 'default': this.setState({ - description: 'Merge playlists as-is with deduplication by spotify id' + description: 'Merge playlists as-is with deduplication by Spotify id' }) break; case 'recents': this.setState({ - description: "Select songs from playlists which have been added since a variable number of days" + description: "Filter added playlists for recently added tracks, optionally add monthly playlists" + }) + break; + case 'fmchart': + this.setState({ + description: "Include Last.fm track chart data with varying time ranges" }) break; } @@ -104,7 +109,7 @@ class NewPlaylist extends Component { className="full-width" > - + diff --git a/src/js/Playlist/View/Edit.js b/src/js/Playlist/View/Edit.js index 40e5fcc..1a42cda 100644 --- a/src/js/Playlist/View/Edit.js +++ b/src/js/Playlist/View/Edit.js @@ -560,7 +560,7 @@ export class Edit extends Component{ }} > Default - Recents + Currents Last.fm Chart diff --git a/src/scss/style.scss b/src/scss/style.scss index 955b81e..6801326 100644 --- a/src/scss/style.scss +++ b/src/scss/style.scss @@ -14,6 +14,7 @@ $pad-px: 20px; html { font-family: $font-stack; + color: $text-colour; } body {