Subscriptions billed monthly for premium membership

app/usecases/funcmap/funcmap.go

@@ -34,6 +34,8 @@ import (
 	"zxq.co/ripple/playstyle"
 )
 
+const PREMIUM_PRICE_PER_MONTH = 5.0
+
 // funcMap contains useful functions for the various templates.
 var FuncMap = template.FuncMap{
 	"print": fmt.Println,
@@ -436,13 +438,9 @@ var FuncMap = template.FuncMap{
 	"shift": func(n1, n2 int) int {
 		return n1 << uint(n2)
 	},
-	// calculateDonorPrice calculates the price of x donor months in euros.
-	"calculateDonorPrice": func(a float64) string {
-		return fmt.Sprintf("%.2f", math.Pow(a*30*0.2, 0.72)) //20 2nd arg for 66%
-	},
 	// calculatePremiumPrice calculates the price of x premium months in euros.
-	"calculatePremiumPrice": func(a float64) string {
-		return fmt.Sprintf("%.2f", math.Pow(a*68*0.15, 0.93)) //44 2nd arg for 66%
+	"calculatePremiumPrice": func(months float64) string {
+		return fmt.Sprintf("%.2f", months * PREMIUM_PRICE_PER_MONTH)
 	},
 	// csrfGenerate creates a csrf token input
 	"csrfGenerate": func(u int) template.HTML {

main.go

@@ -42,7 +42,6 @@ import (
 	settingsState "github.com/osuAkatsuki/hanayo/app/states/settings"
 	tu "github.com/osuAkatsuki/hanayo/app/usecases/templates"
 	"github.com/osuAkatsuki/hanayo/app/version"
-	"github.com/osuAkatsuki/hanayo/internal/btcconversions"
 	"github.com/osuAkatsuki/hanayo/internal/csrf/cieca"
 	"github.com/thehowl/qsql"
 	gintrace "gopkg.in/DataDog/dd-trace-go.v1/contrib/gin-gonic/gin"
@@ -240,8 +239,6 @@ func generateEngine() *gin.Engine {
 		profileEditHandlers.ProfileBackgroundSubmitHandler,
 	)
 
-	r.GET("/donate/rates", btcconversions.GetRates)
-
 	r.GET("/about", miscHandlers.AboutPageHandler)
 
 	tu.LoadSimplePages(r)

web/src/js/akatsuki_src.js

@@ -19,6 +19,9 @@
 
 // this object contains tiny snippets that were deemed too small to be worth
 // their own file.
+
+const PREMIUM_PRICE_PER_MONTH = 5.0;
+
 var singlePageSnippets = {
   "/clans": function () {
     page = 0 === page ? 1 : page;
@@ -517,48 +520,6 @@ var singlePageSnippets = {
     });
   },
 
-  "/support": function () {
-    var sl = $("#months-slider")[0];
-    noUiSlider.create(sl, {
-      start: [1],
-      step: 1,
-      connect: [true, false],
-      range: {
-        min: [1],
-        max: [36],
-      },
-    });
-    var rates = {};
-    var us = sl.noUiSlider;
-    $.getJSON("/donate/rates", function (data) {
-      rates = data;
-      us.on("update", function () {
-        var months = us.get();
-        var priceEUR = Math.pow(months * 30 * 0.2, 0.72); // 2nd arg: 20 for 66%
-        var priceBTC = priceEUR / rates.EUR;
-        var priceUSD = priceBTC * rates.USD;
-        $("#cost").html(
-          T("<b>{{ months }}</b> month costs <b>€ {{ eur }}</b>", {
-            count: Math.round(+months),
-            months: (+months).toFixed(0),
-            eur: priceEUR.toFixed(2),
-          }) +
-            "<br>" +
-            T("($ {{ usd }} / BTC {{ btc }})", {
-              usd: priceUSD.toFixed(2),
-              btc: priceBTC.toFixed(10),
-            })
-        );
-        $("input[name='os0']").attr(
-          "value",
-          (+months).toFixed(0) + " month" + (months == 1 ? "" : "s")
-        );
-        $("#bitcoin-amt").text(priceBTC.toFixed(6));
-        $("#paypal-amt").val(priceEUR.toFixed(2));
-      });
-    });
-  },
-
   "/premium": function () {
     var sl = $("#months-slider")[0];
     noUiSlider.create(sl, {
@@ -567,37 +528,25 @@ var singlePageSnippets = {
       connect: [true, false],
       range: {
         min: [1],
-        max: [36],
+        max: [50],
       },
     });
-    var rates = {};
     var us = sl.noUiSlider;
-    $.getJSON("/donate/rates", function (data) {
-      rates = data;
-      us.on("update", function () {
-        var months = us.get();
-        var priceEUR = Math.pow(months * 68 * 0.15, 0.93); // 2nd arg: 44 for 66%
-        var priceBTC = priceEUR / rates.EUR;
-        var priceUSD = priceBTC * rates.USD;
-        $("#cost").html(
-          T("<b>{{ months }}</b> month costs <b>€ {{ eur }}</b>", {
-            count: Math.round(+months),
-            months: (+months).toFixed(0),
-            eur: priceEUR.toFixed(2),
-          }) +
-            "<br>" +
-            T("($ {{ usd }} / BTC {{ btc }})", {
-              usd: priceUSD.toFixed(2),
-              btc: priceBTC.toFixed(10),
-            })
-        );
-        $("input[name='os0']").attr(
-          "value",
-          (+months).toFixed(0) + " month" + (months == 1 ? "" : "s")
-        );
-        $("#bitcoin-amt").text(priceBTC.toFixed(6));
-        $("#paypal-amt").val(priceEUR.toFixed(2));
-      });
+    us.on("update", function () {
+      var months = us.get();
+      var priceUSD = months * PREMIUM_PRICE_PER_MONTH;
+      $("#cost").html(
+        T("<b>{{ months }}</b> {{ monthSpelling }} costs <b>${{ amount }} USD</b>", {
+          monthSpelling: months == 1 ? T("month") : T("months"),
+          months: (+months).toFixed(0),
+          amount: priceUSD.toFixed(2),
+        })
+      );
+      $("input[name='os0']").attr(
+        "value",
+        (+months).toFixed(0) + " month" + (months == 1 ? "" : "s")
+      );
+      $("#paypal-amt").val(priceUSD.toFixed(2));
     });
   },
 

web/templates/base.html

@@ -76,7 +76,7 @@
 
         <div id="messages-container">
           <noscript>
-            Research has proven this website works 10000% better if you have
+            Research has proven this website works 727% better if you have
             JavaScript enabled.
           </noscript>
           {{ if and .Context.User.Username (not (has .Context.User.Privileges 1)) }}

web/templates/navbar.html

@@ -40,7 +40,7 @@
         {{ end }}
       {{ end }}
       <div class="firetrucking-right-menu">
-        {{ navbarItem .Path (printf "<span data-tooltip=\"Support us! (♥ω♥ ) ~♪\" data-position=\"bottom right\"><i class=\"red heart icon m-less\"></i></span>") "/donate" }}
+        {{ navbarItem .Path (printf "<span data-tooltip=\"Support us! (♥ω♥ ) ~♪\" data-position=\"bottom right\"><i class=\"red heart icon m-less\"></i></span>") "/premium" }}
 
 
         <div class="item">