v0.5 revision 2

- fixed issue with collections not working without tags (fixes #75)
- centered card title (fixes #74)
- added buttons to /unauthorized to guide user to /login or back

dashmachine/settings_system/routes.py

@@ -17,7 +17,7 @@ from dashmachine.paths import (
     user_data_folder,
     template_apps_folder,
 )
-from dashmachine.version import version
+from dashmachine.version import version, revision_number
 
 settings_system = Blueprint("settings_system", __name__)
 
@@ -52,6 +52,7 @@ def settings():
         user_form=user_form,
         template_apps=",".join(template_apps),
         version=version,
+        revision_number=revision_number,
         users=users,
         config_readme=config_readme,
     )

dashmachine/templates/error_pages/unauthorized.html

@@ -1,4 +1,5 @@
 {% extends "main/base.html" %}
+{% from 'global_macros.html' import button %}
 
 
 {% block content %}
@@ -6,6 +7,20 @@
         <div class="col s12">
             <i class="material-icons-outlined theme-failure-text" style="font-size: 8rem">warning</i>
             <h4>Unauthorized</h4>
+
+            <p>This user account is not in the access group allowed to view this page.</p> 
+
+            {{ button(
+            float="center",
+            href=url_for('user_system.login'),
+            text="Go to login"
+            ) }}
+
+            {{ button(
+            float="center",
+            href="javascript:history.back()",
+            text="Go back"
+            ) }}
         </div>
     </div>
 {% endblock content %}

dashmachine/templates/main/home.html

@@ -78,7 +78,13 @@
                     {% else %}
                         {# otherwise, render the apps like this #}
                         {% for app in apps %}
+                            {% if app.type == "app" %}
                                 {{ App(app) }}
+                            {% elif app.type == "collection" %}
+                                {{ Collection(app) }}
+                            {% elif app.type == "custom" %}
+                                {{ Custom(app) }}
+                            {% endif %}
                         {% endfor %}
                     {% endif %}
                 {% else %}

dashmachine/templates/main/macros.html

@@ -40,7 +40,7 @@
             </a>
             <div class="card-action center-align scrollbar pr-0" style="max-height: 60px; min-height: 60px; scrollbar-width: none;">
                 <span class="app-name-{{ app.id }} font-weight-900 card-title theme-primary-text searchable" style="font-size: 1.2rem">{{ app.name }}
-                    <i class="material-icons activator right theme-secondary-text">more_vert</i>
+                    <i class="material-icons activator right theme-secondary-text" style="margin-left: 0px;">more_vert</i>
                     {% if app.data_sources.count() > 0 %}
                         <i class="material-icons pointer right theme-secondary-text refresh-data-source-btn">refresh</i>
                     {% endif %}

dashmachine/templates/settings_system/settings.html

@@ -130,7 +130,7 @@
                                                 <h5>DashMachine</h5>
                                                 <div class="divider"></div>
                                                 <p class="font-weight-900 mb-2">Version:</p>
-                                                <p class="mb-2">{{ version }}</p>
+                                                <p class="mb-2">{{ version }}-{{ revision_number }}</p>
 
                                                 <div class="divider"></div>
                                                 <p class="font-weight-900 mb-2">Author:</p>

dashmachine/version.py

@@ -1 +1,2 @@
 version = "v0.5"
+revision_number = "2"

readme_cards.md

@@ -33,7 +33,7 @@ These entries provide a card on the dashboard containing a list of links.
 [Collection Name]
 type = collection
 icon = collections_bookmark
-urls = {"url": "google.com", "icon": "static/images/apps/default.png", "name": "Google", "open_in": "new_tab"},{"url": "duckduckgo.com", "icon": "static/images/apps/default.png", "name": "DuckDuckGo", "open_in": "iframe"}
+urls = {"url": "google.com", "icon": "static/images/apps/default.png", "name": "Google", "open_in": "new_tab"},{"url": "duckduckgo.com", "icon": "static/images/apps/default.png", "name": "DuckDuckGo", "open_in": "this_tab"}
 ```
 
 | Variable          | Required | Description                                                                                  | Options                             |
@@ -57,5 +57,6 @@ data_sources = my_data_source
 |-------------------|----------|----------------------------------------------------------------------------------------------|-------------------------------------|
 | [Collection Name] | Yes      | Name for the collection                                                                      | [Collection Name]                   |
 | type              | Yes      | This tells DashMachine what type of card this is.                                            | custom                              |
+| data_sources      | Yes      | What data sources to display on the card.                                                    | comma separated string              |
 | tags              | No       | Optionally specify tags for organization on /home                                            | comma separated string              |
 | groups            | No       | Optionally specify the access groups that can see this app.                                  | comma separated string              |