minimal-music-project 0.0.1 → 0.0.6

data/_includes/music-player.html

@@ -0,0 +1,124 @@
+<div class="audio-player" id="{{ include.audioData.src }}" >
+    <!-- Audio player inspired by https://codepen.io/EmNudge/pen/rRbLJQ -->
+    <div class="timeline">
+        <div class="progress"></div>
+    </div>
+    <div class="controls">
+        <div class="play-controller">
+            <i class="fas fa-play"></i>
+        </div>
+        <div class="time">
+            <div class="current">0:00</div>
+            <div class="divider">/</div>
+            <div class="length"></div>
+        </div>
+        <div class="name">Music Song</div>
+        <div class="volume-container">
+            <div class="volume-controller">
+                <i class="fas fa-volume-up"></i>
+            </div>
+
+            <div class="volume-slider">
+                <div class="volume-percentage"></div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script>
+    // Copyright (c) 2021 by EmNudge (https://codepen.io/EmNudge/pen/rRbLJQ)
+    // Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+    // The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+    // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+    const audioPlayer = document.getElementById("{{ include.audioData.src }}");
+    const audio = new Audio(
+        {% if include.audioData.is_relative_url %}
+        "{{ include.audioData.src | relative_url }}"
+        {% else %}
+        "{{ include.audioData.src }}"
+        {% endif %}
+    );
+
+    audio.addEventListener(
+        "loadeddata",
+        () => {
+            audioPlayer.querySelector(".time .length").textContent = getTimeCodeFromNum(
+                audio.duration
+            );
+            audioPlayer.querySelector(".name").textContent = "{{ include.audioData.name }}";
+            audio.volume = .75;
+        },
+        false
+    );
+
+
+    //click on timeline to skip around
+    const timeline = audioPlayer.querySelector(".timeline");
+    timeline.addEventListener("click", e => {
+        const timelineWidth = window.getComputedStyle(timeline).width;
+        const timeToSeek = e.offsetX / parseInt(timelineWidth) * audio.duration;
+        audio.currentTime = timeToSeek;
+    }, false);
+
+    //click volume slider to change volume
+    const volumeSlider = audioPlayer.querySelector(".controls .volume-slider");
+    volumeSlider.addEventListener('click', e => {
+        const sliderWidth = window.getComputedStyle(volumeSlider).width;
+        const newVolume = e.offsetX / parseInt(sliderWidth);
+        audio.volume = newVolume;
+        audioPlayer.querySelector(".controls .volume-percentage").style.width = newVolume * 100 + '%';
+    }, false)
+
+    const playBtn = audioPlayer.querySelector(".controls .play-controller i");
+    playBtn.addEventListener(
+        "click",
+        () => {
+            playBtn.classList = "fas";
+            if (audio.paused) {
+                playBtn.classList.add("fa-pause");
+                audio.play();
+            } else {
+                playBtn.classList.add("fa-play");
+                audio.pause();
+            }
+        },
+        false
+    );
+
+    const intervalId = setInterval(() => {
+        if(audio.paused) {
+            return;
+        }
+        const progressBar = audioPlayer.querySelector(".progress");
+        progressBar.style.width = audio.currentTime / audio.duration * 100 + "%";
+        audioPlayer.querySelector(".time .current").textContent = getTimeCodeFromNum(
+            audio.currentTime
+        );
+    }, 200);
+
+    audioPlayer.querySelector(".volume-controller").addEventListener("click", () => {
+        const volumeEl = audioPlayer.querySelector(".controls .volume-controller i");
+        audio.muted = !audio.muted;
+        volumeEl.classList = "fas";
+        if (audio.muted) {
+            volumeEl.classList.add("fa-volume-mute");
+        } else {
+            volumeEl.classList.add("fa-volume-up");
+        }
+    });
+
+    function getTimeCodeFromNum(num) {
+        let seconds = parseInt(num);
+        let minutes = parseInt(seconds / 60);
+        seconds -= minutes * 60;
+        const hours = parseInt(minutes / 60);
+        minutes -= hours * 60;
+
+        if (hours === 0) return `${minutes}:${String(seconds % 60).padStart(2, 0)}`;
+        return `${String(hours).padStart(2, 0)}:${minutes}:${String(
+            seconds % 60
+        ).padStart(2, 0)}`;
+    }
+
+</script>

data/_includes/pagination-buttons.html

@@ -0,0 +1,14 @@
+{% if paginator.total_pages > 1 %}
+<ul class="pager">
+    {% if paginator.previous_page %}
+    <li class="previous">
+        <a href="{{ paginator.previous_page_path | relative_url | replace: '//', '/' }}">&larr; Newer Posts</a>
+    </li>
+    {% endif %}
+    {% if paginator.next_page %}
+    <li class="next">
+        <a href="{{ paginator.next_page_path | relative_url | replace: '//', '/' }}">Older Posts &rarr;</a>
+    </li>
+    {% endif %}
+</ul>
+{% endif %}

data/_includes/read-more.html

@@ -0,0 +1,13 @@
+<span class="read-more">
+    {% if include.currPost.external_url %}
+    <a href="{{ include.currPost.external_url | relative_url }}" target="_blank">
+        {% else %}
+        <a href="{{ include.currPost.url | relative_url }}">
+            {% endif %} 
+            {% if include.currPost.external_name %}
+            Read more on {{ include.currPost.external_name }} &rarr;
+            {% else %}
+            More info &rarr;
+            {% endif %}
+        </a>
+</span>

data/_layouts/default.html

@@ -1,11 +1,6 @@
 <!doctype html>
 <html>
   <head>
-    {% if site.data.metaData.cookies.enabled %}
-      <script>
-        {% include cookies.js %}
-      </script>
-    {% endif %}
     {% include common-head.html %}
   </head>
   <body>
@@ -14,5 +9,14 @@
           {{ content }}
           {% include footer.html %}
       </main>
+      {% if site.data.metaData.cookies.enabled %}
+      <script>
+        {% include cookies.js %}
+      </script>
+    {% endif %}
+    <script>
+      {% include common.js %}
+    </script>
+    {% include customizationsScripts.html %}
   </body>
 </html>

data/_layouts/discography.html

@@ -1,6 +1,16 @@
 ---
 layout: default
 ---
-<div class="discography">
-    <h1>{{ page.title }}</h1>
-</div>
+<div class="content-container">
+    <div class="discography">
+        {{ content }}
+        {% for post in paginator.posts %}
+        {% if post.categories contains page.category %}
+        <hr>
+        {% include discography-entry.html currPost=post %}
+        {% endif %}
+        {% endfor %}
+
+        {% include pagination-buttons.html %}
+    </div>
+</div>

data/_layouts/post.html

@@ -13,13 +13,12 @@ layout: default
                     <img src="{{ page.image | relative_url }}" alt="{{ page.image_alt }}" class="post-cover_image" />
                 </figure>
             {% endif %}
-            <p class="post-metadata">
-                {{ page.date | date_to_string }}
-            </p>
-
         </header>
         <div class="post-content">
             {{ content }}
         </div>
+        <div class="post-metadata">
+            {% include discography-entry-metadata.html currPost=page %}
+        </div>
     </div>
 </div>

data/_layouts/posts_feed.html

@@ -4,40 +4,53 @@ category: home
 ---
 <div class="content-container">
     <div class="post-feed">
-        {% for post in site.posts %}
-            {% if post.category == page.category %}
-                <article>
-                    <hr>
-                    <header>
-                        <p class="article-date">{{ post.date | date: "%Y-%m-%d" }}</p>
-                        <h2>
-                            {% if post.external_url %}
-                            <a href="{{ post.external_url | relative_url }}" target="_blank">
-                            {% else %}
-                            <a href="{{ post.url | relative_url }}">
+        {{ content }}
+        {% for post in paginator.posts %}
+        {% if post.categories contains page.category %}
+        <hr>
+        <article>
+            <header>
+                <p class="article-date">{{ post.date | date: "%Y-%m-%d" }}</p>
+                <h2>
+                    {% if post.external_url %}
+                    <a href="{{ post.external_url | relative_url }}" target="_blank">
+                        {% else %}
+                        <a href="{{ post.url | relative_url }}">
                             {% endif %}
-                                {{ post.title }}
-                            </a>
-                        </h2>
-                    </header>
-                    <section>
-                        <figure>
-                            <img src="{{ post.image | relative_url }}" alt="{{ page.image_alt }}" class="post-feed_image" />
-                        </figure>
-                        <p>
-                            {{ post.summary }}
-                        </p>
-                    </section>
-                    <span class="article-read">
-                        {% if post.external_url %}
-                        <a href="{{ post.external_url | relative_url }}" target="_blank">
+                            {{ post.title }}
+                        </a>
+                </h2>
+            </header>
+            <section>
+                <figure>
+                    <img src="{{ post.image | relative_url }}" alt="{{ page.image_alt }}" class="post-feed_image" />
+                </figure>
+                <p>
+                    {{ post.description }}
+                </p>
+            </section>
+            {% include read-more.html currPost=post %}
+        </article>
+        {% else %}
+        <hr>
+        <article>
+            <header>
+                <p class="article-date">{{ post.date | date: "%Y-%m-%d" }}</p>
+                <h2>
+                    {% if post.external_url %}
+                    <a href="{{ post.external_url | relative_url }}" target="_blank">
                         {% else %}
                         <a href="{{ post.url | relative_url }}">
-                        {% endif %}
+                            {% endif %}
+                            New release: {{ post.title }}
                         </a>
-                    </span>
-                </article>
-            {% endif %}
+                </h2>
+            </header>
+            {% include discography-entry.html currPost=post %}
+        </article>
+
+        {% endif %}
         {% endfor %}
+        {% include pagination-buttons.html %}
     </div>
 </div>

data/_sass/styles/_cookies.scss

@@ -2,15 +2,15 @@
     position: fixed;
     padding: 20px 15px;
     z-index: $pop-ups-z-1;
-    background-image: radial-gradient(farthest-corner at 25% 0, $black, $black);
+    background-image: radial-gradient(farthest-corner at 25% 0, $white, $white);
     box-shadow: 0 0 6px 0 $black;
     text-align: center;
     opacity: 0.95;
     -webkit-transition: opacity 800ms, visibility 800ms;
     transition: opacity 800ms, visibility 800ms;
-    bottom: 30px;
-    left: 40px;
-    max-width: 300px;
+    bottom: 40px;
+    left: 50px;
+    max-width: 40vw;
     border-radius: 3px;
     border: 3px solid $black;
 
@@ -28,16 +28,16 @@
         font-weight: 700;
         display: inline-block;
         padding: 10px 20px;
-        background-color: $black;
+        background-color: $white;
         color: $p_text;
-        border: none;
+        border: 1px solid;
         border-radius: 3px;
         text-decoration: none;
         cursor: pointer;
         -webkit-transition: background-color 200ms;
         transition: background-color 200ms;
         &:hover {
-            background-color: $black;
+            background-color: rgb(168, 168, 168);
         }
     }
     @include mobile {

data/_sass/styles/_defaults.scss

@@ -9,8 +9,8 @@ h1 {
     padding: 0.5em;
 }
 
-h2, h2, h3 a {
-    font-weight: 600;
+h2, h3 a {
+    font-weight: 500;
     font-size: 1.4em;
     line-height: 1.4em;
     color: $black;
@@ -30,12 +30,12 @@ body {
 }
 main {
     .content-container {
-        margin: 0px auto;
+        margin: 3.5em auto 0 0;
         width: 90%;
         padding: 0px 18px 24px;
         flex-grow: 1;
         position: relative;
-        p {
+        p, li {
             @include hyperlink-convention();
         }
         .content-separator {
@@ -47,23 +47,56 @@ main {
             }
         }
     }
+
+    .pager {
+        margin-top: 40px;
+        height: 60px;
+        width: 100%;
+        li {
+            position: absolute;
+            display: inline;
+            padding: 8px;
+            margin: 10px;
+            &.previous {
+                left: 0;
+            }
+            &.next {
+                right: 0;
+            }
+            & > a {
+                color: $p_text;
+                @include underline-on-hover($black);
+            }
+        }
+    }
 }
+
 a {
     text-decoration-line: none;
     color: inherit;
     transition: all 0.4s ease-in-out 0s;
 }
-
 a, p, li {
     font-size: 1.1em;
 }
 
+li {
+    margin-left: 1em;
+}
+
+hr {
+    margin-top: 2em;
+    margin-bottom: 0.5em;
+    width: 100%;
+}
+
 img {
     max-width: 100%;
     height: auto;
     display: inline-block;
     margin: 0;
     vertical-align: top;
+    object-fit: cover;
 }
 
 @include mobile {
@@ -77,6 +110,25 @@ img {
         .content-container {
             width: 100%;
             padding: 0px 9px 12px;
+            margin-top: 0;
         }
     }
-}
+}
+
+audio {
+    max-width: 100%;
+}
+
+.read-more {
+    position: absolute;
+    right: 10px;
+    bottom: -2em;
+    line-height: 1em;
+    font-weight: 300;
+    padding-bottom: 0.5em;
+    color: #000000;
+    a {
+        font-size: 0.9em;
+        @include underline-on-hover($black);
+    }
+}