Summer update

The streams file was updated on August 14th

.gitignore

@@ -0,0 +1,5 @@
+.idea/
+Gemfile.lock
+_site/
+.jekyll-cache
+

.travis.yml

@@ -33,5 +33,5 @@ deploy:
   github_token: $GITHUB_TOKEN  # Set in the settings page of your repository, as a secure variable
   keep_history: true
   on:
-    branch: gh-pages
+    branch: master
   local_dir: _site

_config.yml

@@ -17,7 +17,7 @@ baseurl: /HiddenSounds
 page_gen:
   - data: songs
     template: song
-    name: sname
+    name: sid
   - data: artists
     template: artist
     name: sname

_data/navigation.yml

@@ -5,4 +5,6 @@
 - name: FAQ
   link: faq.html
 - name: Streams
-  link: streams.html
+  link: streams.html
+- name: Songs
+  link: songs.html

_data/songextra.yml

@@ -0,0 +1,443 @@
+- sid: '010vYuTvUjhcUAx6ICC3p0'
+  lyrics: |
+    I'm playing magician's assistant
+    I know all your tricks but I'll listen
+    I help you escape with this part I play
+
+    But now I guess you gotta go
+    Now you see me, now you don't
+    and I thought I would try for you
+    But you turned all the tears I cried for you to gold and I'm blinded
+
+    Blinded.
+    Blinded.
+    Blinded.
+    Blinded.
+    Blinded.
+    Blinded.
+    Blinded.
+    Blinded.
+
+    That i'm blinded.
+
+    Blinded.
+    Blinded.
+
+    But you turned all the tears I cried for you to gold and I'm blinded.
+
+    But you turned all the tears I cried for you to gold and I'm blinded.
+
+    I'm caught in the smoke in the
+
+    mirrors.
+    I'm getting so close now it's clearer.
+    You fold me again
+    with what could have been.
+
+    But now I guess you gotta go
+    Now you see me, now you don't
+    and I thought I would try for you
+    But you turned all the tears I cried for you to gold and I'm blinded
+
+    Blinded.
+    Blinded.
+    Blinded.
+    Blinded.
+    Blinded.
+    Blinded.
+    Blinded.
+    Blinded.
+
+    That I'm blinded.
+
+    Blinded.
+    Blinded.
+
+    But you turned all the tears I cried for you to gold and I'm blinded.
+
+    But you turned all the tears I cried for you to gold and I'm blinded.
+
+    But you turned all the tears I cried for you to gold and I'm blinded.
+- sid: '01Aum8bxlAx0bw0b0djXVc'
+  lyrics: |
+    Bad habits in my brain
+    Bad habits in my veins
+    And I'm begging them to change
+    But they are just not listening today
+
+    All of the madness, all of the rage
+    Only gets better when I feel pain
+
+    Am I causing you pain, love
+    I don't mean to
+    As I run through your veins I'm
+    Trying not to
+
+    But I need them to see
+    What they did to me
+    Am I causing you pain, love
+    I don't mean to
+
+    Bad habits in my head
+    Bad habits in my bed
+    And I'm trying just to hold on
+    To everything that I have known instead
+
+    All of the madness, all of the rage
+    Only gets better when I feel pain
+
+    Am I causing you pain, love
+    I don't mean to
+    As I run through your veins I'm
+    Trying not to
+
+    But I need them to see
+    What they did to me
+    Am I causing you pain, love
+    I don't mean to
+
+    Am I causing you pain, love
+    I don't mean to
+    As I run through your veins I'm
+    Trying not to
+
+    But I need them to see
+    What they did to me
+    Am I causing you pain, love
+    I don't mean to
+- sid: '01EpUJB8qCmYOy2oT0Ok9W'
+  lyrics: |
+    Full circle, deep purple
+    Undertones in the undertone
+    Not artificial, these words fizzle
+    Up and out of my mouth
+
+    I can phase through walls like a particle
+    Part of me holds while rest of me holds on
+    I can change the arrangement of all of us
+    When not but a follower, like it's nothing
+
+    I am satellite, I am so alive
+    I am hovering in place like a dragonfly
+    I am hydrochloric, I am alkaline
+    I am everything you feel and you fantasize
+
+    And the heart is on, like it's nothing
+    And the heart is on, like it's nothing
+    And the heart is on, like it's nothing
+    And the heart is on, like it's nothing
+
+    Dragonfly
+
+    Dragonfly
+
+    I can walk on the water like it's concrete
+    Part of me falls while the rest of me runs free
+    I can play with the shape of the entropy
+    Nobody can intervene, like it's nothing
+
+    I am satellite, I am so alive
+    I am hovering in place like a dragonfly
+    I am hydrochloric, I am alkaline
+    I am everything you feel and you fantasize
+
+    And the heart is on, like it's nothing
+    And the heart is on, like it's nothing
+    And the heart is on, like it's nothing
+    And the heart is on, like it's nothing
+
+    Full circle, no reversal
+    Under oath in the summer glow
+    Not artificial, these words fizzle
+    Humming low from my broke
+
+    You can walk, you can run
+    I can fly, dragonfly
+    You can walk, oh you can run
+    But I can fly, dragonfly
+
+    Dragonfly
+
+    Dragonfly
+
+    Full circle
+    I take it full circle
+    Full circle
+    Full circle
+- sid: '2UpWp7B9rBLYfPwDFBAOIi'
+  lyrics: |
+    Ooh, yeah
+    Ooh, yeah, yeah, yeah!
+    Oh!
+
+    Oh!
+
+    Ooh, yeah
+    Ooh, yeah, yeah, yeah!
+
+    I,
+    I heard
+    I heard you like to dance
+    (Woah woah-ooh woah-ooh woah)
+
+    I,
+    I heard
+    I heard you like to shake that ass
+    (Woah woah-ooh woah-ooh woah)
+
+    You said
+
+    "Show me where the funk is"
+    And I heard you like to get low
+    "Show me where the funk is"
+    And I heard you like to get down, down, down, yeah
+
+    Bae you know the word is out
+    I heard that you've been gettin' down
+    Your momma knows you're slippin' out
+    Where the funk is, the funk is, yeah!
+
+    (Where the funk is)
+
+    (Woah woah-ooh woah-ooh woah)
+
+    I,
+    I heard
+    I heard you like to sing
+
+    I,
+    I heard
+    I know you like to scream
+    (Where the funk is)
+
+    Ooh, bae you know the word is out
+    Yeah, I heard that you've been gettin' down
+    Oh, your momma knows you're slippin' out
+    Where the funk is, the funk is
+
+    I,
+    I heard
+    I heard you like to get nasty
+    (Woah woah-ooh woah-ooh woah)
+
+    I,
+    I know
+    I know you know that you a badass motherfucker!
+
+    "Show me where the funk is"
+    And I heard you like to get low
+    "Show me where the funk is"
+    One more time, do it some more, yeah!
+
+    "Show me where the funk is"
+    And I heard you like to get low
+    "Show me where the funk is"
+    And I heard you like to get down!
+- sid: '01V3FamQ70LSYhkDXz47Wt'
+  lyrics: |
+    No matter how good that I get you
+    At targeting your mind on one thing at a time
+    Got a lot that you've got to do
+    Caught you on your way out
+    Hey, did you know that you breathe too
+    And if our air ran out to minimal amounts
+    How about that as a currency?
+    Wouldn't that even things out?
+
+    Tell me how's that PSI
+    Hitting your skull when you
+    Lie about your life
+    So very tall in your mind
+    Think no one sees how you hide
+    I do, I do
+
+    Wake up, you're collecting dust
+    Your shine will start to rust
+    You're in love with the ease of what
+    All those Bens have had to say
+
+    No matter how good that I get you
+    At targeting your mind on one thing at a time
+    Got a lot that you've got to do
+    Caught you on your way out
+    Hey, did you know that you breathe too
+    And if our air ran out to minimal amounts
+    How about that as a currency?
+    Wouldn't that even things out?
+
+    Tell me how's that PSI
+    Hitting your skull when you
+    Lie about your life
+    So very tall in your mind
+    Think no one sees how you hide
+    I do, I do
+- sid: '02hs1TRvEe6kzmfKLylHba'
+  lyrics: |
+    I like to party, drink all the lemonade
+    I like to party, come ride the Waffle Wave
+
+    Float on the gum drops in a pool of marmalade
+    I like to party, come ride the Waffle Wave
+
+    (I just wanna party)
+    (I just wanna party)
+    (I just wanna party)
+    (I just wanna, I just wanna, I just wanna)
+    Here we go
+    Eechi me sanchi, I know I just want to eat (waffle)
+    Eechi me sanchi, I just want a waffle wave
+    Eechi me sanchi, I know I just want to eat
+    Eechi me sanchi, I just want a waffle-
+
+    Shunai ma kataimo, in the club you're a myto
+    (I just, I just)
+    Shunai ma kataimo, in the club you're myto, so
+
+    (I just wanna party)
+    Waffle
+    Wave
+    I just wanna party
+    Waffle
+
+    Here we go (wave)
+    Here we go
+    Here we go
+
+    I like to party, drink all the lemonade
+    I like to party, come ride the Waffle Wave
+
+    Float on the gum drops in a pool of marmalade
+    I like to party, come ride the Waffle Wave
+
+    All night long
+    I'm falling for you
+    Fizzy Fantasies
+    I'm taking on
+    The chances of dreams
+    Chasing you and me
+
+    All night long
+    I'm falling for you
+    Fizzy Fantasies
+    I'm taking on
+    The chances of dreams
+    Chasing you and me, and me...
+
+    Here we go
+    Waffle
+    Wave
+    Waffle, waffle, waffle
+    Waffle
+    Wave
+    Waffle
+    Here we go, again
+    I just wanna party
+- sid: '059JaoH7UxFdvAk2xCvcF6'
+  lyrics: |
+
+    Do you know what's happening
+    We've got a situation on the rise
+    Did you see what was going on
+    Or got a good look at her eyes
+
+    Why must they look so fearful
+    I'm only trying save your life
+    Feels like 700 years I have been alive
+    Stick it up, roaming the streets and set out to terrorize
+    And born digital angel
+    Unknowing, living a lie
+
+    And I remember.
+    Somewhere in my mind shows
+    Itself time to time whole
+    Visions from my past - the
+    Last time I was
+    Free
+    From burdens and duties
+    Last time I felt complete
+    Ignorance is beauty
+- sid: '08pYxU4axAJX2ATZlURPWH'
+  lyrics: |
+    She sells them cheap thrills,
+    She know that she kills.
+
+    High stakes, fun games,
+    float away.
+    "Can escape the night away",
+    She said.
+
+    Take a pill for it, here you go,
+    Take a hit for it here you go,
+    You don't need love,
+    You don't need my love.
+
+    But I'm addicted, to your love.
+    Yes I'm addicted to your love.
+
+    She was young, not so long ago,
+    She sold smiles, like here you go,
+    You don't need love,
+    I don't need your love.
+
+    But I'm addicted, to your love.
+    Yes I'm addicted to your love.
+
+
+    And if your mind still speaks take another
+    Humankind’s still bleak undercover
+    Yeah “I’m done” you swore to you mother
+    But the truth is you rather mislead than recover
+    And the mandate reads you wake, bake
+    Cause you can’t take all the heartache
+    And a mistake’s not a mistake if you don’t break
+    Partake in a risk take with no handbrake uh
+    A B C to X T C and I don’t trust you a moment alone so stay with me
+    You sing all your LSDs, and will I pull you back on earth or will you sink with me?
+
+    And I can see you’ve quit, say the drugs won
+    Yeah there’s no point speak, cause you hear none
+    I really thought I could get you out of this one,
+    Help you when you freeze, run
+    Break this whole addiction
+    But I don’t know anymore
+    Think I gotta let go
+- sid: 7B2pRsFVYT0ntK7xKbQwsn
+  lyrics: |
+    Riding down the Parkway in the Twilight
+    Wind in our hair getting high without a care
+    Ooh yeah
+    Pull up to the Bonfire Crack another cold one
+    Turn the Speakers up
+    Cos we dont’ give a fuck
+    We gonna party till the sun comes up
+    Dancing Queens
+    Living in a Rainbow Dream
+    Seventeen Living in a Rainbow Dream
+    A Rainbow Dream
+    All the Colors in the Air
+    Feel the Magic Everywhere
+    In a Rainbow Dream
+    In a Rainbow Dream
+    (All the Colors in the Air, Feel the Magic Everywhere)
+    In a Rainbow Dream
+    Living in a Rainbow Dream
+    We’re all just living for that moment
+    TIme slows down and you take a look around
+    Just like in the movies
+    when everybody’s laughing hey hey
+    Clinking drinks and relaxing
+    So turn the Speakers up
+    Cos we don’t give a fuck
+    We gonna party till the sun comes up
+    Dancing Queens
+    Living in a Rainbow Dream
+    Seventeen
+    Living in a Rainbow Dream
+    A Rainbow Dream
+    All the Colors in the Air
+    Feel the Magic Everywhere
+    In a Rainbow Dream
+    In a Rainbow Dream (All the Colors in the Air)
+    Colors in the Air (Feel the Magic Everywhere)
+    In a Rainbow Dream
+    Living in a Rainbow Dream

_data/streams.yml

@@ -1,23 +1,174 @@
+- date: '2018-06-28'
+  host: 'Anna Yvette'
+- date: '2018-07-05'
+  host: 'Approaching Nirvana'
+  streamer: 'Approaching Nirvana'
+- date: '2018-07-12'
+  host: 'Electro-Light'
+- date: '2018-07-19'
+  host: 'Varien'
+- date: '2018-07-26'
+  host: 'Tim Schaufert'
+- date: '2018-08-02'
+  host: '?Roundup'
+- date: '2018-08-09'
+  host: 'Laura Brehm, Rival, Arc North'
+- date: '2018-08-16'
+  host: 'AK'
+- date: '2018-08-23'
+  host: 'Jim Yosef'
+- date: '2018-08-30'
+  host: 'Rob Gasser'
+- date: '2018-09-06'
+  host: '?Roundup'
+  streamer: 'Approaching Nirvana'
+- date: '2018-09-13'
+  host: 'Sublab'
+- date: '2018-09-20'
+  host: 'Veela'
+- date: '2018-09-27'
+  host: 'floatinurboat'
+- date: '2018-10-04'
+  host: 'Anna Yvette'
+- date: '2018-10-11'
+  host: 'Hudson Lee'
+- date: '2018-10-18'
+  host: '!AMA'
+  amaHost: 'Anna Yvette, Laura Brehm, Approaching Nirvana'
+  live: true
+- date: '2018-10-25'
+  host: 'Anna Yvette'
+- date: '2018-11-01'
+  host: 'Approaching Nirvana'
+- date: '2018-11-08'
+  host: 'Arc North'
+- date: '2018-11-15'
+  host: 'CASHFORGOLD'
+- date: '2018-11-22'
+  host: 'Anna Yvette'
+  streamer: 'Anna Yvette'
+- date: '2018-11-29'
+  host: '?Roundup'
+  streamer: 'Cara Leigh'
+- date: '2018-12-06'
+  host: 'Cara Leigh'
+  streamer: 'Cara Leigh'
+- date: '2018-12-13'
+  host: 'Atlas in Motion'
+  streamer: 'Cara Leigh'
+- date: '2018-12-20'
+  host: 'Arc North, Rival'
+- date: '2018-12-27'
+  host: 'Approaching Nirvana'
+  streamer: 'Approaching Nirvana'
+- date: '2019-01-03'
+  host: '!Yearmix'
+  year: 2018
+  streamer: 'Anna Yvette'
+- date: '2019-01-04'
+  host: '!Yearmix'
+  year: 2018
+  streamer: 'Anna Yvette'
+- date: '2019-01-10'
+  host: 'Alden Groves'
+  streamer: 'Anna Yvette'
+- date: '2019-01-17'
+  host: 'Hyper Potions'
+  streamer: 'Anna Yvette'
 - date: '2019-01-24'
   host: 'Voicians'
-  streamer: 'Anna Yvette'
+  streamer: 'Voicians'
   live: true
+  tracklist:
+    - artist: 'Voicians'
+      title: 'Potion'
+      link: 'https://open.spotify.com/track/14hAZvFFnYG7sszxRByd30?si=U0aj8P5HS1e9rHdsEOxxqA'
+    - artist: 'Voicians'
+      title: 'Loop'
+      link: 'https://open.spotify.com/track/2g85NHqwJ2qEg8MZwa3SWb?si=qV2JKwEaS3ib2JAHJJnEEw'
+    - artist: 'Anna Yvette'
+      title: 'The End'
+      link: 'https://open.spotify.com/track/5YwUIxuEcE6cd4DK2GAQ9q?si=5YXSOOF3QkuDyQp1-C7BEw'
+    - artist: 'Varien'
+      title: 'Blood Hunter'
+    - artists: [ 'Rameses B', 'Zoe Moon' ]
+      title: 'Eclipse'
+      link: 'https://open.spotify.com/track/1JDzWvYkEbQ3stuReNJsfk?si=j0J-hE9nTtGRFrx4_Ivb0A'
+    - artist: 'Voicians'
+      title: 'Endure'
+      link: 'https://open.spotify.com/track/6JZmx8ipiHx0JiKLSwOg2z?si=nKrm4hWlQwWS1SJ_zTssVQ'
+    - artist: 'Voicians'
+      title: '?'
+    - artists: [ 'Arc North', 'Agiya' ]
+      title: 'Dark Side (feat. Agiya)'
+    - artist: 'Voicians'
+      title: 'Survival League'
+      link: 'https://open.spotify.com/track/59IvIDPRshOj9Ty2he8KOI?si=C0gGQg0hQbG2H63tS85G9A'
+    - artists: [ 'Sublab', 'Azaleh' ]
+      title: 'Continuum'
+    - artist: 'Voicians'
+      title: 'Telepathetic'
+      link: 'https://open.spotify.com/track/4SbNROn7kq8sw2oFfrlT0g?si=ZTenGzebSrexcJuXyFMhSg'
+    - artists: [ 'Mr. Bill', 'Of The Trees' ]
+      title: 'Pish Posh'
+      link: 'https://open.spotify.com/track/7sNw9S1Jird6Mh4p8BXIAF?si=YimTZ-q6RD20vMLL4Wxy9A'
+    - artist: 'Voicians'
+      title: 'Wolves'
+    - artist: 'Voicians'
+      title: 'Forsaken'
+      link: 'https://open.spotify.com/track/4cIlELdvlCXZKrJj06e3EI?si=rtVzXo_-RdOfqvJxoS85qQ'
+    - artist: 'Haywyre'
+      title: 'Storyteller'
+    - artist: 'Voicians'
+      title: 'Riddle'
+      link: 'https://open.spotify.com/track/5qJU2zfQ0XsTfZbihQWEyT?si=1LETzMMJQUmnXRwj78fh-Q'
+    - aritsts: [ 'Elliot Berger', 'Laura Brehm' ]
+      title: 'Believe'
+    - artists: [ 'Approaching Nirvana', 'Cara Leigh' ]
+      title: 'Lost the Signal'
+    - artist: 'Approaching Nirvana'
+      title: 'Leap'
+    - artist: 'Voicians'
+      title: 'Angels'
+    # ?
+    - artist: 'Approaching Nirvana'
+      title: 'Not This Time'
+    - artist: 'Rameses B'
+      title: 'Space Race'
+    - artist: 'Voicians'
+      title: 'Touch Me Hurt Me'
+      link: 'https://open.spotify.com/track/29K8kP8UZ2JPil2gXEjeSv?si=tg2jNJT5R72UXu9cqhAxUg'
+    - artist: 'Electro-Light'
+      title: 'Discovery'
+    - artist: 'Varien'
+      title: 'Claws'
+    #?
+    - artist: 'Voicians'
+      title: 'Tweeday Theme'
+      link: 'https://open.spotify.com/track/2JgeYPiw2WKBVsnNromiBh?si=4NSRFFTIS2Kfdrp-jGtpnQ'
+    - artist: 'Anna Yvette'
+      title: 'Rainbow Dream'
+    - artists: [ 'Rezonate', 'Christopher Pop' ]
+      title: 'Toadstools (Christopher Pop Remix)'
+    - artist: 'MYLK'
+      title: 'Mashmallow Disco'
+      link: 'https://open.spotify.com/track/63d4BntRS4qWSoq5Uciq46?si=6pkBGCc9TKqzzrskLKecWQ'
 - date: '2019-01-31'
-  host: '!Roundup'
+  host: '?Roundup'
   streamer: 'Anna Yvette'
 - date: '2019-02-07'
-  host: '!Throwback'
+  host: '?Throwback'
   streamer: 'Anna Yvette'
   throwbackHost: 'Sublab'
 - date: '2019-02-14'
   host: 'Rameses B'
   streamer: 'Anna Yvette'
 - date: '2019-02-21'
-  host: '!Throwback'
+  host: '?Throwback'
   streamer: 'Approaching Nirvana'
   throwbackHost: 'Laura Brehm, Arc North, Rival'
 - date: '2019-02-28'
-  host: '!Roundup'
+  host: '?Roundup'
   streamer: 'Approaching Nirvana'
 - date: '2019-03-05'
   host: '!Chill'
@@ -29,14 +180,14 @@
   host: '!Chill'
   streamer: 'Anna Yvette'
 - date: '2019-03-14'
-  host: '!Throwback'
+  host: '?Throwback'
   streamer: 'Anna Yvette'
   throwbackHost: 'floatinurboat'
 - date: '2019-03-19'
   host: '!Chill'
   streamer: 'Anna Yvette'
 - date: '2019-03-21'
-  host: '!Throwback'
+  host: '?Throwback'
   streamer: 'Anna Yvette'
   throwbackHost: 'CASHFORGOLD'
 - date: '2019-03-26'
@@ -67,7 +218,7 @@
   host: '!Chill'
   streamer: 'Anna Yvette'
 - date: '2019-04-25'
-  host: '!Throwback'
+  host: '?Throwback'
   streamer: 'Approaching Nirvana'
   throwbackHost: 'Arc North'
 - date: '2019-04-30'
@@ -76,11 +227,12 @@
 - date: '2019-05-02'
   host: 'Lucy Daydream'
   streamer: 'Lucy Daydream'
+  live: true
 - date: '2019-05-07'
   host: '!Chill'
   streamer: 'Anna Yvette'
 - date: '2019-05-09'
-  host: '!Roundup'
+  host: '?Roundup'
   streamer: 'Cara Leigh'
 - date: '2019-05-14'
   host: '!Chill'
@@ -91,27 +243,158 @@
 - date: '2019-05-21'
   host: '!Chill'
   streamer: 'Anna Yvette'
+  video: 'https://www.youtube.com/watch?v=SyKKsmdI7ZM'
 - date: '2019-05-23'
   host: 'Laura Brehm'
   streamer: 'Anna Yvette'
+  video: 'https://www.youtube.com/watch?v=oKYqpqw6z-A'
 - date: '2019-05-28'
   host: '!Chill'
   streamer: 'Anna Yvette'
+  video: 'https://www.youtube.com/watch?v=l2E6aCSH6uc'
 - date: '2019-05-30'
   host: 'Zoe Moon'
   streamer: 'Anna Yvette'
+  video: 'https://www.youtube.com/watch?v=12Dw26xKUAU'
 - date: '2019-06-04'
   host: '!Chill'
   streamer: 'Anna Yvette'
+  video: 'https://www.youtube.com/watch?v=IzMb3SWD9m0'
 - date: '2019-06-06'
-  host: '!Roundup'
+  host: '?Roundup'
   streamer: 'Anna Yvette'
 - date: '2019-06-11'
   host: '!Chill'
   streamer: 'Cara Leigh'
 - date: '2019-06-13'
   host: 'Au5'
+  streamer: 'Approaching Nirvana'
+  video: 'https://www.youtube.com/watch?v=LL4N99aA_KI'
+- date: '2019-06-18'
+  host: '!Chill'
+  streamer: 'Approaching Nirvana'
 - date: '2019-06-20'
   host: 'Sublab'
-- date: '2019.06.27'
-  host: 'Miyoki'
+  streamer: 'Approaching Nirvana'
+- date: '2019-06-25'
+  host: '!Chill'
+  streamer: 'Cara Leigh'
+- date: '2019-06-27'
+  host: 'Miyoki'
+  streamer: 'Approaching Nirvana'
+- date: '2019-07-02'
+  host: '?Roundup'
+  streamer: 'Cara Leigh'
+- date: '2019-07-09'
+  host: '!Chill'
+  streamer: 'Anna Yvette'
+- date: '2019-07-11'
+  host: 'Approaching Nirvana'
+  streamer: 'Approaching Nirvana'
+- date: '2019-07-16'
+  host: '!Chill'
+  streamer: 'Anna Yvette'
+- date: '2019-07-23'
+  host: '!Chill'
+  streamer: 'Anna Yvette'
+- date: '2019-07-25'
+  host: 'floatinurboat'
+  streamer: 'floatinurboat'
+- date: '2019-07-30'
+  host: '!Chill'
+  streamer: 'Anna Yvette'
+- date: '2019-08-01'
+  host: '?Roundup'
+  streamer: 'Approaching Nirvana'
+- date: '2019-08-06'
+  host: '!Chill'
+  streamer: 'Anna Yvette'
+- date: '2019-08-08'
+  host: '?Throwback'
+  throwbackHost: 'Varien'
+  streamer: 'Approaching Nirvana'
+- date: '2019-08-15'
+  host: 'Electro-Light'
+  streamer: 'Approaching Nirvana'
+- date: '2019-08-22'
+  host: 'Zoe Moon'
+  streamer: 'Approaching Nirvana'
+- date: '2019-08-29'
+  host: '?Roundup'
+  streamer: 'Approaching Nirvana'
+  tracklist:
+    - artist: 'Faodail'
+      title: 'Nostos (Returning)'
+    - artists: ['Kooma', 'Miyoki', 'Veela']
+      title: 'Answers'
+    - artist: 'Miyoki'
+      title: 'Boats & Birds'
+    - artists: ['Electro-Light', 'AWR']
+      title: 'Love Will Find You'
+    - artist: 'Tim Schaufert'
+      title: 'Journey'
+    - artists: ['Laura Brehm', 'Mr. Bill']
+      title: 'i2i'
+    #AK?
+    - artist: 'Cara Leigh'
+      title: 'Part of Me'
+    - artists: ['Tim Schaufert', 'Acacia']
+      title: 'It''s Going to Be Alright'
+    - artists: ['Electro Light', 'AWR']
+      title: 'Under A Minute'
+    - artists: ['Approaching Nirvana', 'TryHardNinja']
+      title: 'Revenge Remix'
+    - artists: ['Electro-Light', 'AWR']
+      title: 'Don''t Allow'
+    - artist: 'Sekai'
+      title: 'Cherry'
+    - artist: 'Faodail'
+      title: 'Gael'
+      #
+    - artist: 'Faodail'
+      title: 'Untethered'
+- date: '2020-04-30'
+  host: '!AMA'
+  amaHost: 'Anna Yvette, Electro-Light, floatinurboat, Laura Brehm'
+  streamer: 'floatinurboat'
+  live: true
+- date: '2021-01-26'
+  host: '!Chill'
+  streamer: 'Anna Yvette'
+- date: '2021-01-28'
+  host: '!Chill'
+  streamer: 'Anna Yvette'
+- date: '2021-02-02'
+  host: '!Chill'
+  streamer: 'Anna Yvette'
+- date: '2021-02-04'
+  host: '!Chill'
+  streamer: 'Anna Yvette'
+- date: '2021-02-09'
+  host: '!Chill'
+  streamer: 'Anna Yvette'
+- date: '2021-02-11'
+  host: '!Chill'
+  streamer: 'Anna Yvette'
+- date: '2021-02-16'
+  host: '!Chill'
+  streamer: 'Anna Yvette'
+- date: '2021-02-18'
+  host: '!Chill'
+  streamer: 'Anna Yvette'
+- date: '2021-02-25'
+  host: '!Chill'
+  streamer: 'Anna Yvette'
+- date: '2021-03-02'
+  host: '!Chill'
+  streamer: 'Anna Yvette'
+- date: '2021-03-04'
+  host: '!Chill'
+  streamer: 'Anna Yvette'
+- date: '2021-03-23'
+  host: '!Chill'
+  streamer: 'Anna Yvette'
+- date: '2021-03-25'
+  host: '!Chill'
+  streamer: 'Anna Yvette'
+

_includes/songlist.html

@@ -14,6 +14,6 @@
                 {{ artistName }}
             {%- endif -%}
         {%- endfor -%}
-        {% comment %} Space needed {% endcomment %} - <a href="{{ site.baseurl }}/{{ song.sname | datapage_url: 'songs' }}">{{ song.sname }}</a>
+        {% comment %} Space needed {% endcomment %} - <a href="{{ site.baseurl }}/{{ song.sid | datapage_url: 'songs' }}">{{ song.sname }}</a>
     </p>
 </div>

_includes/streamlist.html

@@ -0,0 +1,20 @@
+<li>
+    <h3>
+        {%- if stream.host == '!Chill' -%}          Tuesday Chill Stream
+        {%- elsif stream.host == '?Throwback' -%}   Throwback: {{ stream.throwbackHost }}
+        {%- elsif stream.host == '?Roundup' -%}     Monthly Roundup
+        {%- elsif stream.host == '!Yearmix' -%}     {{ stream.year }} yearmix
+        {%- elsif stream.host == '!AMA' -%}         Q & A: {{ stream.amaHost }}
+        {%- else -%}                              {{- stream.host -}}
+        {%- endif -%}
+        {% if stream.live %} - LIVE {%- endif -%}
+    </h3>
+</li>
+<li>
+    {{ stream.date | date: "%a, %b %d, %Y" }}
+</li>
+{%- if stream.streamer -%} {% comment %} No streamer for future streams {% endcomment %}
+<li>
+    Streamer: {{ stream.streamer }}
+</li>
+{%- endif -%}

_layouts/artist.html

@@ -1,6 +1,6 @@
 ---
 layout: default
-title: page.name
+title: '{{ page.sname }}'
 ptitle: '{{ page.sname }}'
 ---
 <h2>{{ page.position }}</h2>
@@ -16,6 +16,6 @@ ptitle: '{{ page.sname }}'
             {% endif %}
         {% endfor %}
         {% if found == false %} {% continue %} {% endif %}
-    <li><a href="{{ site.baseurl }}/songs{{ song.sname | datapage_url: songs }}">{{ song.artists | join: ", " }} - {{ song.sname }}</a></li>
+    <li><a href="{{ site.baseurl }}/songs{{ song.sid | datapage_url: songs }}">{{ song.artists | join: ", " }} - {{ song.sname }}</a></li>
     {% endfor %}
 </ul>

_layouts/default.html

@@ -3,7 +3,7 @@
 
 <head>
     <meta charset="utf-8">
-    <title>{{ page.title }} - HS Fanpage</title>
+    <title>{{ page.title | flatify }} - HS Fanpage</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
 

_layouts/song.html

@@ -1,5 +1,12 @@
 ---
 layout: default
-title: asd
+title: '{{ page.sname }}'
 ptitle: '{{ page.artists | join: ", " }} - {{ page.sname }}'
 ---
+<div class="pageContent">
+    <h2>Lyrics</h2>
+    <pre id="lyrics">
+        {%- assign song = site.data.songextra | where: 'sid', page.sid | first -%}
+        {{ song.lyrics }}
+    </pre>
+</div>

_plugins/data_page_generator.rb

@@ -49,7 +49,7 @@ module Jekyll
 
         self.process(@name)
         self.read_yaml(File.join(base, '_layouts'), template + ".html")
-        self.data['title'] = data[name]
+        # self.data['title'] = data[name] - EDITED
         # add all the information defined in _data for the current record to the
         # current page (so that we can access it with liquid tags)
         self.data.merge!(data)
@@ -125,7 +125,10 @@ module Jekyll
     # Thus, if you use the `extension` feature of this plugin, you
     # need to generate the links by hand
     def datapage_url(input, dir)
-      extension = Jekyll.configuration({})['page_gen-dirs'] ? '/' : '.html'
+      if $config == nil
+        $config = Jekyll.configuration({}) # Prevent spamming "Configuration file: ..." - NorbiPeti
+      end
+      extension = $config['page_gen-dirs'] ? '/' : '.html'
       "#{dir}/#{sanitize_filename(input)}#{extension}"
     end
   end

css/main.css

@@ -74,3 +74,27 @@ nav li a {
 nav li a:hover {
     color: aqua;
 }
+
+.stream-column {
+    float: left;
+    width: 33.33%;
+}
+
+.stream-column h2 {
+    text-align: center;
+}
+
+/* Clear floats after the columns */
+.stream-row:after {
+    content: "";
+    display: table;
+    clear: both;
+}
+
+#lyrics {
+    font-family: sans-serif;
+}
+
+.pageContent {
+    margin: 20px;
+}

songs.html

@@ -0,0 +1,13 @@
+---
+layout: default
+title: All Songs
+ptitle: All Songs
+---
+<div id="songs" class="content">
+    <div id="container">
+        {% assign songs = site.data.songs | sort: 'popularity' %}
+        {% for song in songs %}
+            {% include songlist.html %}
+        {% endfor %}
+    </div>
+</div>

streams.html

@@ -2,27 +2,45 @@
 title: Streams
 ptitle: Streams
 ---
-
-<ul>
-{% assign streams = site.data.streams | reverse %}
-{% for stream in streams %}
-    <li>
-        <h2>
-            {%- if stream.host == '!Chill' -%}        Tuesday Chill Stream
-            {%- elsif stream.host == '!Throwback' -%}  Throwback: {{ stream.throwbackHost }}
-            {%- elsif stream.host == '!Roundup' -%}    Monthly Roundup
-            {%- else -%}                              {{- stream.host -}}
-            {%- endif -%}
-            {% if stream.live %} - LIVE {%- endif -%}
-        </h2>
-    </li>
-    <li>
-        {{ stream.date | date: "%a, %b %d, %Y" }}
-    </li>
-    {%- if stream.streamer -%} {% comment %} No streamer for future streams {% endcomment %}
-    <li>
-        Streamer: {{ stream.streamer }}
-    </li>
-    {%- endif -%}
-{% endfor %}
-</ul>
+{% assign streamx = site.data.streams | reverse %}
+<div class="stream-row">
+    <div class="stream-column">
+        <h2>Tuesday Chill</h2>
+        <ul>
+            {% assign streamm = streamx | where: "host", "!Chill" | where: "live", nil %}
+            {% for stream in streamm %}
+                {% include streamlist.html stream=stream %}
+            {% endfor %}
+        </ul>
+    </div>
+    <div class="stream-column">
+        <h2>Hosted Thursday</h2>
+        <ul>
+            {% assign streamm = streamx | where: "live", nil %}
+            {% for stream in streamm %}
+                {% comment %}
+                    {% assign day = stream.date | date: "%w" %}
+                    {% if day == "4" %}
+                        {% include streamlist.html stream=stream %}
+                    {% endif %}
+                {% endcomment %}
+                {% assign x = stream.host | slice: 0 %}
+                {% if stream.live == nil and x != '!' %}
+                    {% include streamlist.html stream=stream %}
+                {% endif %}
+            {% endfor %}
+        </ul>
+    </div>
+    <div class="stream-column">
+        <h2>Special</h2>
+        <ul>
+            {% assign streamm = streamx %}
+            {% for stream in streamm %}
+                {% assign x = stream.host | slice: 0 %}
+                {% if stream.live or x == '!' and stream.host != "!Chill" %}
+                    {% include streamlist.html stream=stream %}
+                {% endif %}
+            {% endfor %}
+        </ul>
+    </div>
+</div>