Fixes sub info page

Author: the2pizza

src/bin/api/core/http/handlers/sub.rs

@@ -194,6 +194,7 @@ pub async fn subscription_info_handler<N, C, S>(
     sub_param: SubQueryParam,
     memory: MemSync<N, C, S>,
     host: String,
+    web_host: String,
 ) -> Result<Box<dyn warp::Reply + Send>, warp::Rejection>
 where
     N: NodeStorageOp + Sync + Send + Clone + 'static,
@@ -334,6 +335,11 @@ button {{
 button:hover {{
     background: #334155;
 }}
+button-id:hover {{
+    background: #334155;
+    font-size: 10px;
+
+}}
 .qr {{
     margin-top: 16px;
     text-align: center;
@@ -342,6 +348,24 @@ button:hover {{
     font-size: 13px;
     color: #94a3b8;
 }}
+.small-id {{
+    font-size: 11px;
+    color: #94a3b8;
+    text-align: right;
+    margin-top: 0px;
+}}
+.small-viva {{
+    font-size: 13px;
+    color: #94a3b8;
+    text-align: right;
+    margin-top: 0px;
+}}
+.footer-line {{
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;            
+    margin-top: 8px;
+}}
 ul {{
     padding-left: 20px;
 }}
@@ -352,14 +376,16 @@ ul {{
 <div class="card">
 <h1>Подписка</h1>
 
+
 <div class="stat">Статус: <span class="{status_class}">{status_text}</span></div>
 <div class="stat">Дата окончания: {expires}</div>
 <div class="stat">Осталось дней: {days}</div>
+<div class="small-id">Id: <b>{subscription_id}</b></div>
+
 
 <hr>
 
 <div class="stat">Трафик: ↓ {down_str} &nbsp;&nbsp; ↑ {up_str}</div>
-
 <hr>
 
 <h3>Ссылки для подключения</h3>
@@ -402,10 +428,18 @@ ul {{
 
 <div class="small">Вы пригласили: {invited}</div>
 
+<div class="small"><a href="{web_host}/ref.html"> Информация о реферальной программе</a></div>
+
 </div>
 
 <br><hr>
-<div class=small>  <a href=https://t.me/frkn_support>Поддержка</a></div>
+
+<div class=footer-line>
+<div class=small-viva> 
+ <a href=https://t.me/frkn_support>Поддержка &nbsp·</a></div>
+
+<div class=small-viva > &nbsp Vive la résistance! </div>
+</div>
 
 <script src="https://cdn.jsdelivr.net/npm/qrcode/build/qrcode.min.js"></script>
 
@@ -434,7 +468,8 @@ window.onload = () => {{
         up_str = up_str,
         base_link = base_link,
         ref = sub.referral_code(),
-        invited = invited
+        invited = invited,
+        subscription_id = id
     );
 
     Ok(Box::new(warp::reply::with_status(

src/bin/api/core/http/routes.rs

@@ -2,6 +2,7 @@ use async_trait::async_trait;
 use std::sync::Arc;
 use warp::Filter;
 
+use pony::config::settings::ApiServiceConfig;
 use pony::http::filters::auth;
 use pony::http::requests::*;
 use pony::Connection;
@@ -22,7 +23,7 @@ use crate::core::http::handlers::healthcheck_handler;
 
 #[async_trait]
 pub trait Http {
-    async fn run(&self, host: String) -> Result<()>;
+    async fn run(&self, params: ApiServiceConfig) -> Result<()>;
 }
 
 #[async_trait]
@@ -49,7 +50,7 @@ where
         + std::cmp::PartialEq
         + std::convert::From<pony::Subscription>,
 {
-    async fn run(&self, host: String) -> Result<()> {
+    async fn run(&self, params: ApiServiceConfig) -> Result<()> {
         let auth = auth(Arc::new(self.settings.api.token.clone()));
 
         let get_healthcheck_route = warp::get()
@@ -128,7 +129,8 @@ where
             .and(warp::path::end())
             .and(warp::query::<SubQueryParam>())
             .and(with_state(self.sync.clone()))
-            .and(with_param_string(host))
+            .and(with_param_string(params.hostname))
+            .and(with_param_string(params.web_host))
             .and_then(subscription_info_handler);
 
         let post_subscription_route = warp::post()

src/bin/api/main.rs

@@ -117,8 +117,9 @@ async fn main() -> Result<()> {
         });
     }
 
+    let token = settings.api.token.clone();
     if debug {
-        let token = Arc::new(settings.api.token);
+        let token = Arc::new(token);
         tokio::spawn(debug::start_ws_server(
             mem.clone(),
             settings
@@ -197,8 +198,9 @@ async fn main() -> Result<()> {
     });
 
     let api = api.clone();
+    let api_settings = settings.api.clone();
     let api_handle = tokio::spawn(async move {
-        if let Err(e) = api.run(settings.api.hostname).await {
+        if let Err(e) = api.run(api_settings).await {
             eprintln!("API server exited with error: {}", e);
         }
     });

src/config/settings.rs

@@ -131,6 +131,10 @@ fn default_hostname() -> String {
     "http://localhost:5005".to_string()
 }
 
+fn default_web_host() -> String {
+    "https://frkn.org".to_string()
+}
+
 #[derive(Clone, Debug, Deserialize, Default)]
 pub struct ApiServiceConfig {
     #[serde(default = "default_api_web_listen")]
@@ -153,6 +157,8 @@ pub struct ApiServiceConfig {
     pub db_sync_interval_sec: u64,
     #[serde(default = "default_hostname")]
     pub hostname: String,
+    #[serde(default = "default_web_host")]
+    pub web_host: String,
     #[serde(default = "default_subscription_restore_interval_sec")]
     pub subscription_restore_interval: u64,
     #[serde(default = "default_subscription_expire_interval_sec")]