From 969c1a850ac2917a4ae5ff9d458d08366de1eaca Mon Sep 17 00:00:00 2001 From: gballan1 Date: Sun, 27 Nov 2016 21:49:34 -0500 Subject: [PATCH 01/69] Added routes and views for both music player designs --- app/routes/music.php | 26 +++++++-- app/views/{music.twig => music1.twig} | 2 +- app/views/music2.twig | 71 ++++++++++++++++++++++++ app/views/templates/partials/header.twig | 5 +- 4 files changed, 96 insertions(+), 8 deletions(-) rename app/views/{music.twig => music1.twig} (97%) create mode 100644 app/views/music2.twig diff --git a/app/routes/music.php b/app/routes/music.php index 2e1ea9e..628a2ba 100755 --- a/app/routes/music.php +++ b/app/routes/music.php @@ -1,13 +1,27 @@ get('/music', function() use($app) { +// music design #1 +$app->get('/music1', function() use($app) { - $albums = $app->album->all()->sortByDesc('release_date')->values()->all(); + $albums = $app->album->all()->sortByDesc('release_date')->values()->all(); $songs = $albums[0]->songs; - $app->render('music.twig', [ - 'albums' => $albums, + $app->render('music.twig', [ + 'albums' => $albums, 'songs' => $songs, - ]); + ]); -})->name('music'); +})->name('music1'); + +# music design #2 +$app->get('/music2', function() use($app) { + + $albums = $app->album->all()->sortByDesc('release_date')->values()->all(); + $songs = $albums[0]->songs; + + $app->render('music.twig', [ + 'albums' => $albums, + 'songs' => $songs, + ]); + +})->name('music2'); diff --git a/app/views/music.twig b/app/views/music1.twig similarity index 97% rename from app/views/music.twig rename to app/views/music1.twig index c5784b7..d9fea54 100644 --- a/app/views/music.twig +++ b/app/views/music1.twig @@ -5,7 +5,7 @@ {% endblock %} -{% block title %}Music{% endblock %} +{% block title %}Music Design #1{% endblock %} {% block content %} diff --git a/app/views/music2.twig b/app/views/music2.twig new file mode 100644 index 0000000..52b6eb2 --- /dev/null +++ b/app/views/music2.twig @@ -0,0 +1,71 @@ +{% extends 'templates/default.twig' %} + +{% block javascripts %} + + +{% endblock %} + +{% block title %}Music Design #2{% endblock %} + +{% block content %} + +
+

Music

+
+ + +
+ + + + +
+
+ {{ albums[0].title }} +
+

{{ albums[0].title }}

+ {% if albums[0].description %} +
+

{{ albums[0].description }}

+ {% endif %} +
+
+
+ + +
+
+ +
+ +
+
    + {% for song in songs %} +
  • + {{ song.track_order }}. {{ song.title }} +
    • + {% endfor %} +
+
+
+
+ + +
+ {% for album in albums %} + +
+
+ {{ album.title }} +
+
{{ album.title }}
+
+
+
+ {% endfor %} +
+ +{% endblock %} diff --git a/app/views/templates/partials/header.twig b/app/views/templates/partials/header.twig index 5a88d9e..ac2d2f6 100755 --- a/app/views/templates/partials/header.twig +++ b/app/views/templates/partials/header.twig @@ -29,7 +29,10 @@ Shows
  • - Music + Music #1 +
    • +
  • + Music #2
  • Contact From 89e51e2da758bc6f2a03af2445293cfee21a502e Mon Sep 17 00:00:00 2001 From: gballan1 Date: Sun, 27 Nov 2016 21:50:40 -0500 Subject: [PATCH 02/69] Fixed music routes --- app/routes/music.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/routes/music.php b/app/routes/music.php index 628a2ba..1a70c91 100755 --- a/app/routes/music.php +++ b/app/routes/music.php @@ -6,7 +6,7 @@ $app->get('/music1', function() use($app) { $albums = $app->album->all()->sortByDesc('release_date')->values()->all(); $songs = $albums[0]->songs; - $app->render('music.twig', [ + $app->render('music1.twig', [ 'albums' => $albums, 'songs' => $songs, ]); @@ -19,7 +19,7 @@ $app->get('/music2', function() use($app) { $albums = $app->album->all()->sortByDesc('release_date')->values()->all(); $songs = $albums[0]->songs; - $app->render('music.twig', [ + $app->render('music2.twig', [ 'albums' => $albums, 'songs' => $songs, ]); From 04b7376cbd269cb010ffd3f43c5dc060ddcaf3f2 Mon Sep 17 00:00:00 2001 From: gballan1 Date: Mon, 28 Nov 2016 11:17:28 -0500 Subject: [PATCH 03/69] Started working on the music player --- app/views/music1.twig | 1 - app/views/music2.twig | 1 - app/views/templates/default.twig | 34 +++++++++++++++++--------------- public/js/music.js | 31 +++++++++++++++++++++++------ 4 files changed, 43 insertions(+), 24 deletions(-) diff --git a/app/views/music1.twig b/app/views/music1.twig index d9fea54..ca826be 100644 --- a/app/views/music1.twig +++ b/app/views/music1.twig @@ -1,7 +1,6 @@ {% extends 'templates/default.twig' %} {% block javascripts %} - {% endblock %} diff --git a/app/views/music2.twig b/app/views/music2.twig index 52b6eb2..3630acd 100644 --- a/app/views/music2.twig +++ b/app/views/music2.twig @@ -1,7 +1,6 @@ {% extends 'templates/default.twig' %} {% block javascripts %} - {% endblock %} diff --git a/app/views/templates/default.twig b/app/views/templates/default.twig index 7f94ac9..7e774fc 100755 --- a/app/views/templates/default.twig +++ b/app/views/templates/default.twig @@ -1,28 +1,30 @@ - - - - {% block title %}{% endblock %} | Halftone - + + + + {% block title %}{% endblock %} | Halftone + + - {% block stylesheets %}{% endblock %} - + {% block stylesheets %}{% endblock %} + - - {% block javascripts %}{% endblock %} + + + {% block javascripts %}{% endblock %} -
    -
    - {% include 'templates/partials/header.twig' %} +
    +
    + {% include 'templates/partials/header.twig' %} - {% block content %}{% endblock %} -
    -
    + {% block content %}{% endblock %} +
    +
    - {% include 'templates/partials/footer.twig' %} + {% include 'templates/partials/footer.twig' %} diff --git a/public/js/music.js b/public/js/music.js index 2631b8d..c9d8809 100755 --- a/public/js/music.js +++ b/public/js/music.js @@ -1,7 +1,26 @@ $(document).ready(function() { - $('#music-player').musicPlayer({ - 'audio': '#music-player', - 'volume': .5, - 'startTime': 0 - }) -}); \ No newline at end of file + var player = new MediaElementPlayer('#music-player', { + // initial volume when the player starts + startVolume: 0.5, + // useful for