Add support for sub-directory URLs

KopiJS · Sep 28, 2016 · fbeff88 · fbeff88
1 parent 8ad6348
commit fbeff88
Show file tree

Hide file tree

Showing 5 changed files with 80 additions and 11 deletions.
diff --git a/Gemfile b/Gemfile
@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'jekyll', '3.1.6'
+
+group :jekyll_plugins do
+  gem 'jekyll-github-metadata'
+end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -0,0 +1,49 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.4.0)
+    colorator (0.1)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    ffi (1.9.14)
+    jekyll (3.1.6)
+      colorator (~> 0.1)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 1.1)
+      kramdown (~> 1.3)
+      liquid (~> 3.0)
+      mercenary (~> 0.3.3)
+      rouge (~> 1.7)
+      safe_yaml (~> 1.0)
+    jekyll-github-metadata (2.0.2)
+      jekyll (~> 3.1)
+      octokit (~> 4.0)
+    jekyll-sass-converter (1.4.0)
+      sass (~> 3.4)
+    jekyll-watch (1.5.0)
+      listen (~> 3.0, < 3.1)
+    kramdown (1.12.0)
+    liquid (3.0.6)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    mercenary (0.3.6)
+    multipart-post (2.0.0)
+    octokit (4.3.0)
+      sawyer (~> 0.7.0, >= 0.5.3)
+    rb-fsevent (0.9.7)
+    rb-inotify (0.9.7)
+      ffi (>= 0.5.0)
+    rouge (1.11.1)
+    safe_yaml (1.0.4)
+    sass (3.4.22)
+    sawyer (0.7.0)
+      addressable (>= 2.3.5, < 2.5)
+      faraday (~> 0.8, < 0.10)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jekyll (= 3.1.6)
+  jekyll-github-metadata
diff --git a/_layouts/base.html b/_layouts/base.html
@@ -3,18 +3,27 @@
 ---
 <!DOCTYPE html>
 <html lang="en">
+
+{% if jekyll.environment == 'development' %}
+  {% assign baseUrl = '' %}
+{% else %}
+  {% assign baseUrl = site.github.url | default: 'site.url' %}
+  {% assign baseUrl = baseUrl | replace: 'http://', '//' %}
+{% endif %}
+
 <head>
   {% include meta.html %}
 
-  <link rel="stylesheet" type="text/css" href="/css/main.css">
+  <link rel="stylesheet" type="text/css" href="{{ baseUrl }}/css/main.css">
 </head>
 <body>
   <div id="root"></div>
 
   {% capture currentProfile %}{% include getCurrentProfile %}{% endcapture %}
 
+  <script>window.BASE_URL = {{ baseUrl | jsonify }}</script>
   <script>window.PROFILES = {% include listAllProfiles %}</script>
   <script>window.TESTS = {% include listProfileTests profile=currentProfile %}</script>
-  <script src="/bundle.js"></script>
+  <script src="{{ baseUrl }}/bundle.js"></script>
 </body>
 </html>
diff --git a/app/App.js b/app/App.js
@@ -30,6 +30,8 @@ class App extends React.Component {
       results: null,
       tests: window.TESTS
     }
+
+    this.baseUrl = window.BASE_URL || ''
   }
 
   _fetchData(dateFrom, dateTo) {
@@ -44,10 +46,12 @@ class App extends React.Component {
       const year = test.toString().slice(0, 4)
       const month = test.toString().slice(4, 6)
 
-      const path = `/results/${this.state.profile.slug}/${year}/${month}.json`
+      const path = `${this.baseUrl}/results/${this.state.profile.slug}/${year}/${month}.json`
 
       return fetch(path).then(response => {
         return response.json()
+      }).catch(err => {
+        console.log('** ERR:', err)
       })
     })
 
@@ -90,7 +94,7 @@ class App extends React.Component {
 
     window.history.pushState(null, null, `/${newProfile}/?period=${this.state.period}`)
 
-    fetch('/profiles.json').then(response => {
+    fetch(`${this.baseUrl}/profiles.json`).then(response => {
       return response.json()
     }).then(profiles => {
       const profile = profiles.find(profile => profile.slug === newProfile)

diff --git a/bundle.js b/bundle.js