Add support for showing BTC and USD (or local) currency prices.

Stratis.Guru/Controllers/ApiController.cs

@@ -39,29 +39,26 @@ public ApiController(
 
         [HttpGet]
         [Route("price")]
-        public ActionResult<object> Price(bool notApi = false, double amount = 1)
+        public ActionResult<object> Price(bool notApi = false, decimal amount = 1)
         {
             try
             {
-                var ticker = _tickerService.GetCachedTicker();
+                var rqf = Request.HttpContext.Features.Get<IRequestCultureFeature>();
+                var regionInfo = _currencyService.GetRegionaInfo(rqf);
+                var ticker = _tickerService.GetTicker(regionInfo.ISOCurrencySymbol);
 
                 if (notApi)
                 {
-                    var rqf = Request.HttpContext.Features.Get<IRequestCultureFeature>();
-                    var regionInfo = _currencyService.GetRegionaInfo(rqf);
-                    var displayPrice = _currencyService.GetExchangePrice(ticker.DisplayPrice, regionInfo.ISOCurrencySymbol);
-
                     return new TickerApi
                     {
-                        UsdPrice = (displayPrice * amount).ToString("C"),
+                        Symbol = ticker.Symbol,
+                        PriceBtc = ticker.PriceBtc.ToString(),
+                        Price = ticker.Price.ToString("C2"),
                         Last24Change = (ticker.Last24Change).ToString("P2")
                     };
                 }
-                return new Ticker
-                {
-                    DisplayPrice = ticker.DisplayPrice * amount,
-                    Last24Change = ticker.Last24Change
-                };
+
+                return ticker;
             }
             catch
             {

Stratis.Guru/Controllers/HomeController.cs

@@ -78,15 +78,10 @@ public IActionResult Index()
             if (_featuresSettings.Ticker)
             {
                 var rqf = Request.HttpContext.Features.Get<IRequestCultureFeature>();
-                var ticker = _tickerService.GetCachedTicker();
                 var regionInfo = _currencyService.GetRegionaInfo(rqf);
-                var displayPrice = _currencyService.GetExchangePrice(ticker.DisplayPrice, regionInfo.ISOCurrencySymbol);
+                var ticker = _tickerService.GetTicker(regionInfo.ISOCurrencySymbol);
 
-                return View(new Ticker
-                {
-                    DisplayPrice = displayPrice,
-                    Last24Change = ticker.Last24Change
-                });
+                return View(ticker);
             }
             else
             {
@@ -167,7 +162,7 @@ public IActionResult CheckPayment()
             if(stratisAdressRequest.unconfirmedBalance + stratisAdressRequest.balance > 0)
             {
                 HttpContext.Session.SetString("Deposited", depositAddress);
-                HttpContext.Session.SetString("DepositedAmount", ((double)(stratisAdressRequest.unconfirmedBalance + stratisAdressRequest.balance)).ToString());
+                HttpContext.Session.SetString("DepositedAmount", ((decimal)(stratisAdressRequest.unconfirmedBalance + stratisAdressRequest.balance)).ToString());
                 return Json(true);
             }
             return BadRequest();
@@ -189,7 +184,7 @@ public IActionResult NewParticipation()
         public IActionResult SaveParticipation(string nickname, string address)
         {
             _settings.IncrementIterator();
-            _participation.StoreParticipation(HttpContext.Session.GetString("Ticket"), nickname, address, double.Parse(HttpContext.Session.GetString("DepositedAmount")));
+            _participation.StoreParticipation(HttpContext.Session.GetString("Ticket"), nickname, address, decimal.Parse(HttpContext.Session.GetString("DepositedAmount")));
 
             return RedirectToAction("Participated");
         }

Stratis.Guru/Documentation/docs/index.md

@@ -1,9 +1,9 @@
-# Stratis.Guru Documentation
+# City Chain Explorer Documentation
 
-This documentation describes how to use the Stratis.Guru API.
+This documentation describes how to use the City Chain Explorer API.
 
 ## Create Stratis Key Pair
-This endpoint generate a new Stratis Address and returns a public and private key pair.    
+This endpoint generate a new City Chain Address and returns a public and private key pair.    
 ```
 GET https://stratis.guru/api/create-address
 ```

Stratis.Guru/Documentation/mkdocs.yml

@@ -1,6 +1,5 @@
-site_name: Stratis.Guru
-site_description: Strati.Guru API Documentation
+site_name: City.Chain.Explorer
+site_description: City Chain Explorer API Documentation
 site_author: Clint Mourlevat
-repo_url: https://github.com/clintnetwork/stratis-guru-v2.git
-google_analytics: ["UA-111742056-1", "stratis.guru"]
+repo_url: https://github.com/CityChainFoundation/city-explorer.git
 theme: readthedocs

Stratis.Guru/Documentation/site/404.html

@@ -0,0 +1,121 @@
+<!DOCTYPE html>
+<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
+<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+  <meta name="author" content="Clint Mourlevat">
+  <link rel="shortcut icon" href="/img/favicon.ico">
+  <title>City.Chain.Explorer</title>
+  <link href='https://fonts.googleapis.com/css?family=Lato:400,700|Roboto+Slab:400,700|Inconsolata:400,700' rel='stylesheet' type='text/css'>
+
+  <link rel="stylesheet" href="/css/theme.css" type="text/css" />
+  <link rel="stylesheet" href="/css/theme_extra.css" type="text/css" />
+  <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/github.min.css">
+
+  <script src="/js/jquery-2.1.1.min.js" defer></script>
+  <script src="/js/modernizr-2.8.3.min.js" defer></script>
+  <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
+  <script>hljs.initHighlightingOnLoad();</script> 
+
+</head>
+
+<body class="wy-body-for-nav" role="document">
+
+  <div class="wy-grid-for-nav">
+
+
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side stickynav">
+      <div class="wy-side-nav-search">
+        <a href="/." class="icon icon-home"> City.Chain.Explorer</a>
+        <div role="search">
+  <form id ="rtd-search-form" class="wy-form" action="//search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" title="Type search term here" />
+  </form>
+</div>
+      </div>
+
+      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+	<ul class="current">
+
+
+            <li class="toctree-l1">
+
+    <a class="" href="/.">City Chain Explorer Documentation</a>
+	    </li>
+
+        </ul>
+      </div>
+      &nbsp;
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
+
+
+      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
+        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+        <a href="/.">City.Chain.Explorer</a>
+      </nav>
+
+
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="breadcrumbs navigation">
+  <ul class="wy-breadcrumbs">
+    <li><a href="/.">Docs</a> &raquo;</li>
+
+
+    <li class="wy-breadcrumbs-aside">
+
+    </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main">
+            <div class="section">
+
+
+  <h1 id="404-page-not-found">404</h1>
+
+  <p><strong>Page not found</strong></p>
+
+
+            </div>
+          </div>
+          <footer>
+
+
+  <hr/>
+
+  <div role="contentinfo">
+    <!-- Copyright etc -->
+
+  </div>
+
+  Built with <a href="http://www.mkdocs.org">MkDocs</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
+</footer>
+
+        </div>
+      </div>
+
+    </section>
+
+  </div>
+
+  <div class="rst-versions" role="note" style="cursor: pointer">
+    <span class="rst-current-version" data-toggle="rst-current-version">
+
+          <a href="https://github.com/CityChainFoundation/city-explorer.git/" class="fa fa-github" style="float: left; color: #fcfcfc"> GitHub</a>
+
+
+
+    </span>
+</div>
+    <script>var base_url = '/';</script>
+    <script src="/js/theme.js" defer></script>
+      <script src="/search/main.js" defer></script>
+
+</body>
+</html>