Feature: Added changelog and support info

config/default.toml

@@ -16,6 +16,7 @@ max_login_attempts = 6
 login_lock_duration = 1800
 #How long does it take until tokens expire?
 reset_password_token_valid_duration = 3600
+user_support_email = "support@einsatz.online"
 
 [mail]
 from = "No Reply <noreply@localhost>"

resources/templates/module_dashboard.hbs

@@ -9,7 +9,34 @@
                 {{#if alert}}
                     {{> alert}}
                 {{/if}}
-            <h1>Willkommen beim ERMS!</h1>
+                <h1>Willkommen bei einsatz.online!</h1><br>
+                <div class="col">
+                    <div class="row">
+                        <div class="col-6">
+                        <div class="card bg-light">
+                            <div class="card-header">Changelog</div>
+                            <div class="card-body" style="font-size: 14px;">
+                                <b>02.01.2020</b>
+                                <p>BUGFIX: Suchfilter bleiben nun beim Blättern in der Mitgliederliste erhalten</p>
+                                <p>BUGFIX: Die Gesamtseitenanzahl in der Mitgliederliste wird nun korrekt angezeigt</p>
+                                <p>BUGFIX: Korrekte Anmeldungen werden nicht als fehlgeschlagene Anmeldeversuche gezählt</p>
+                                <p>FEATURE: Es wird nun eine Versionsnummer angezeigt</p>
+                                <p>FEATURE: Changelog hinzugefügt</p>
+                                <hr>
+                            </div>
+                        </div>
+                        </div>
+                        <div class="col-6">
+                        <div class="card bg-light">
+                            <div class="card-header">Support</div>
+                            <div class="card-body">
+                                <h4>Sie haben einen Fehler entdeckt, wollen eine Verbesserung vorschlagen, oder benötigen Hilfe?</h4>
+                                <p>Bitte kontaktieren Sie den Support per Email: <a href="mailto:{{user_support_email}}">{{user_support_email}}</a></p>
+                            </div>
+                        </div>
+                        </div>
+                    </div>
+                </div>
        </div>
     </div>
 {{> footer }}

resources/templates/sidebar.hbs

@@ -1,7 +1,7 @@
 <!-- Sidebar -->
 <nav id="sidebar">
     <div class="sidebar-header">
-        <h3>ERMS</h3>
+        <h3>einsatz.online</h3>
         <hr>
         <div class="user-info">
             <p><a href="/portal/personal_profile?action=view"><button class="btn text-left btn-sm" ><svg width="1.5em" height="1.5em" fill="currentColor">

src/helper/settings.rs

@@ -18,6 +18,7 @@ pub struct Application {
     pub login_lock_duration: i32,
     pub name: String,
     pub reset_password_token_valid_duration: i64,
+    pub user_support_email: String,
 }
 
 #[derive(Debug, Deserialize, Default)]

src/modules/dashboard/controller/render.rs

@@ -3,8 +3,10 @@ use crate::helper::sitebuilder::model::general::{Footer, Header, Stylesheet};
 use crate::helper::sitebuilder::model::sidebar::Sidebar;
 use crate::modules::dashboard::model::dashboard_module::DashboardModule;
 use crate::modules::member_management::model::member::Member;
+use rocket::State;
+use crate::helper::settings::Settings;
 
-pub fn get_context(member: Member, alert: Option<Alert>) -> DashboardModule {
+pub fn get_context(settings: &State<Settings>, member: Member, alert: Option<Alert>) -> DashboardModule {
     let header = Header {
         html_language: "en".to_string(),
         site_title: "Dashboard Test".to_string(),
@@ -22,6 +24,6 @@ pub fn get_context(member: Member, alert: Option<Alert>) -> DashboardModule {
         footer,
         sidebar,
         alert,
-        test: "Testtext".to_string(),
+        user_support_email: settings.application.user_support_email.clone()
     }
 }

src/modules/dashboard/model/dashboard_module.rs

@@ -8,5 +8,5 @@ pub struct DashboardModule {
     pub footer: Footer,
     pub sidebar: Sidebar,
     pub alert: Option<Alert>,
-    pub test: String,
+    pub user_support_email: String,
 }

src/modules/dashboard/view/mod.rs

@@ -3,9 +3,11 @@ use crate::helper::session_cookies::model::SessionCookie;
 use crate::helper::sitebuilder::model::alerts::{Alert, AlertClass};
 use rocket::http::Status;
 use rocket_contrib::templates::Template;
+use rocket::State;
+use crate::helper::settings::Settings;
 
 #[get("/portal?<error>")]
-pub fn dashboard(cookie: SessionCookie, error: Option<String>) -> Result<Template, Status> {
+pub fn dashboard(settings: State<Settings>, cookie: SessionCookie, error: Option<String>) -> Result<Template, Status> {
     let member = match cookie.member {
         //Unwraps member from cookie or send user to login if no member specified (user skipped member selection)
         Some(member) => member,
@@ -37,6 +39,6 @@ pub fn dashboard(cookie: SessionCookie, error: Option<String>) -> Result<Templat
 
     Ok(Template::render(
         "module_dashboard",
-        &get_context(member, alert),
+        &get_context(&settings, member, alert),
     ))
 }