Merge pull request #7 from Basspistol/publishing

Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'jekyll', '3.8.5'
-gem 'thin'
+# gem 'thin'
   
 group :jekyll_plugins do
   gem "jekyll-paginate-v2", "~> 1.7"

Gemfile.lock

@@ -4,8 +4,7 @@ GEM
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.5)
-    daemons (1.3.1)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
@@ -35,7 +34,7 @@ GEM
     jekyll-watch (2.1.2)
       listen (~> 3.0)
     kramdown (1.17.0)
-    liquid (4.0.1)
+    liquid (4.0.3)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -44,7 +43,6 @@ GEM
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (3.0.3)
-    rack (2.0.6)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
@@ -56,10 +54,6 @@ GEM
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    thin (1.7.2)
-      daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0, >= 1.0.4)
-      rack (>= 1, < 3)
 
 PLATFORMS
   ruby
@@ -67,7 +61,6 @@ PLATFORMS
 DEPENDENCIES
   jekyll (= 3.8.5)
   jekyll-paginate-v2 (~> 1.7)
-  thin
 
 BUNDLED WITH
    2.0.1

_data/artists.yml

@@ -1,6 +1,6 @@
 # - id: franky
 #   mb: 'de2a996e-513c-4474-b03c-63b9566f1475'
-#   avatar: /assets/img/thumb/frankyfresco.jpg
+#   image: /assets/img/thumb/frankyfresco.jpg
 #   photo:
 #   display_name: 'Franky Fresco'
 #   web: https://frankyfresco.com
@@ -8,7 +8,7 @@
 #   email: frankyfresco@basspistol.com
 - id: holyhertz
   mb: '89d471b5-88a6-4330-a76c-6c3d7ca98e33'
-  avatar: /assets/img/thumb/holyhertz2019.jpg
+  image: /assets/img/thumb/holyhertz2019.jpg
   photo:
   display_name: 'Holyhertz'
   web: https://soundcloud.com/holyhertz
@@ -16,7 +16,7 @@
   email: holyhertz@basspistol.com
 # - id: jokko
 #   mb:
-#   avatar: /assets/img/thumb/jokko.jpg
+#   image: /assets/img/thumb/jokko.jpg
 #   photo:
 #   display_name: 'Jokko'
 #   web: https://soundcloud.com/jokkomusic
@@ -24,7 +24,7 @@
 #   email: jokko@basspistol.com
 # - id: max
 #   mb: 'd12105e6-ec94-48bd-bbd9-39786208f231'
-#   avatar: /assets/img/thumb/max.jpg
+#   image: /assets/img/thumb/max.jpg
 #   photo:
 #   display_name: 'Max Park'
 #   web: 
@@ -32,7 +32,7 @@
 #   email: max@basspistol.com
 # - id: publicservice
 #   mb:
-#   avatar: /assets/img/thumb/publicservice.jpg
+#   image: /assets/img/thumb/publicservice.jpg
 #   photo:
 #   display_name: 'Public Service'
 #   web: 
@@ -40,7 +40,7 @@
 #   email: publicservice@basspistol.com
 - id: sakrecoer
   mb: 'a2899399-d1d5-462f-9d56-ec1ea78cc4b6'
-  avatar: /assets/img/thumb/sakrecoer.jpg
+  image: /assets/img/thumb/sakrecoer.jpg
   photo:
   display_name: 'Sakrecoer Fam'
   web: https://sakrecoer.com
@@ -48,7 +48,7 @@
   email: sakrecoer@basspistol.com
 - id: synapset
   mb: 'a0dd2f36-1681-4bc0-970e-06a0450e16ec'
-  avatar: /assets/img/thumb/synapset.jpg
+  image: /assets/img/thumb/synapset.jpg
   photo:
   display_name: 'Synapsset'
   web: https://basspistol.com/albums/musical-tourism
@@ -56,7 +56,7 @@
   email: synapset@basspistol.com
 # - id: sweatsky
 #   mb:
-#   avatar: /assets/img/thumb/sweatsky.jpg
+#   image: /assets/img/thumb/sweatsky.jpg
 #   photo:
 #   display_name: 'Sweatsky'
 #   web: https://soundcloud.com/sweatsky
@@ -64,7 +64,7 @@
 #   email: sweatsky@basspistol.com
 - id: tikov
   mb: '1313ee01-590c-4fcf-a149-7f4d2a16d550'
-  avatar: /assets/img/thumb/tikov.jpg
+  image: /assets/img/thumb/tikov.jpg
   photo:
   display_name: 'Dr. Tikov'
   web: http://tikov.com
@@ -72,7 +72,7 @@
   email: tikov@basspistol.com
 - id: tfb
   mb: '3e250a22-ed45-41f7-ab07-ac8f7b4cf1c7'
-  avatar: /assets/img/thumb/tfb.jpg
+  image: /assets/img/thumb/tfb.jpg
   photo:
   display_name: 'The FragleBay'
   web: https://fraglebay.tumblr.com
@@ -80,7 +80,7 @@
   email: tfb@basspistol.com
 - id: setto
   mb: '31e8e456-0589-47eb-9334-20872851cd3e'
-  avatar: /assets/img/thumb/setto.jpg
+  image: /assets/img/thumb/setto.jpg
   photo:
   display_name: '徒 Setto セット'
   web: https://setto.basspistol.com

_posts/_defaults.md

@@ -11,12 +11,5 @@ uid: ''
 cover: ''
 download: ''
 link: ''
-image_id: [1, 2]
 image:
-  1:
-    url: ''
-    title: ''
-  2:
-    url: ''
-    title: ''
 ---

_staff_members/_defaults.md

@@ -0,0 +1,9 @@
+---
+name: 
+position: 
+image_path:
+url_staff: 
+email: 
+gpg: 
+blurb:
+---

artists/index.html

@@ -24,7 +24,7 @@ thumb: artists.jpg
 {% assign sorted = site.data.artists | sort: 'id' %}      
 {% for artist in sorted %}
       <div class="articles">
-        <div class="artistimg" style="background-image:url(..{{ artist.avatar }})"></div>
+        <div class="artistimg" style="background-image:url(..{{ artist.image }})"></div>
         <h2><a href="{{ artist.web }}" target="_blank" rel="noopener noreferrer" style="text-decoration:none;">{{ artist.display_name }}</a></h2>
     </div>
 {% endfor %}