From a90c9569e2b33a1c80a6c94f3b7fc9ca503bd103 Mon Sep 17 00:00:00 2001
From: Teemu Patja <tp@iki.fi>
Date: Fri, 2 Jun 2017 10:59:38 +0300
Subject: [PATCH] Revert "Use /test URL prefix from CLJS when on testnet"

This reverts commit 3bb8219f49f7e89354b8890346937128f12fff04.
---
 resources/templates/home.html     | 2 +-
 src/clj/commiteth/routes/home.clj | 3 +--
 src/cljs/commiteth/handlers.cljs  | 5 +----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/resources/templates/home.html b/resources/templates/home.html
index 6dbe0e6..d70cd40 100644
--- a/resources/templates/home.html
+++ b/resources/templates/home.html
@@ -39,7 +39,7 @@
 
 {% style "https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.1.8/semantic.min.css" %}
 <link href="/css/style.css?v={{commiteth-version}}" rel="stylesheet" type="text/css" />
-<script type="text/javascript" src="{{root-path}}/js/app.js?v={{commiteth-version}}"></script>
+<script type="text/javascript" src="/js/app.js?v={{commiteth-version}}"></script>
 <script>
   (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
   (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
diff --git a/src/clj/commiteth/routes/home.clj b/src/clj/commiteth/routes/home.clj
index cc792a3..203e16a 100644
--- a/src/clj/commiteth/routes/home.clj
+++ b/src/clj/commiteth/routes/home.clj
@@ -21,8 +21,7 @@
                               :authorize-url (github/signup-authorize-url)
                               :authorize-url-admin (github/admin-authorize-url)
                               :commiteth-version version
-                              :on-testnet? (env :on-testnet)
-                              :root-path (if (env :on-testnet) "/test" "")}))
+                              :on-testnet? (env :on-testnet)}))
 
 (defroutes home-routes
   (GET "/" {{user :identity} :session}
diff --git a/src/cljs/commiteth/handlers.cljs b/src/cljs/commiteth/handlers.cljs
index cd5e423..7409fae 100644
--- a/src/cljs/commiteth/handlers.cljs
+++ b/src/cljs/commiteth/handlers.cljs
@@ -18,10 +18,7 @@
 
 (reg-fx
  :http
- (fn [{:keys [method url_ on-success on-error finally params]}]
-   (let [url (if (config/on-testnet?)
-               (str "/test" url_)
-               url_)])
+ (fn [{:keys [method url on-success on-error finally params]}]
    (method url
            {:headers {"Accept" "application/transit+json"}
             :handler on-success