Develop

.gitignore

@@ -14,7 +14,6 @@ dist/
 downloads/
 eggs/
 .eggs/
-lib/
 lib64/
 parts/
 sdist/
@@ -117,7 +116,9 @@ scheduler.db
 scheduler.db
 
 .idea/
+.vscode/
 
 dashmachine/user_data/
 dashmachine/static/images/icons
-dashmachine/static/images/backgrounds
+dashmachine/static/images/backgrounds
+dashmachine/platform/custom_*

README.md

@@ -1,16 +1,8 @@
 # DashMachine
-### Another web application bookmark dashboard, with fun features.
+##### Another web application bookmark dashboard, with fun features.
 
-## Before Installing
-Please read the latest update post: https://www.reddit.com/r/DashMachine/comments/fqk8gl/version_05/
-
-![screenshot](https://raw.githubusercontent.com/rmountjoy92/DashMachine/master/screenshot1.png)
-
-![screenshot](https://raw.githubusercontent.com/rmountjoy92/DashMachine/master/screenshot2.png)
-
-![screenshot](https://raw.githubusercontent.com/rmountjoy92/DashMachine/master/screenshot3.png)
-
-![screenshot](https://raw.githubusercontent.com/rmountjoy92/DashMachine/master/screenshot4.png)
+### Demo 
+* [Go to live demo](#)
 
 ### Features
 * creates a dashboard to view web pages
@@ -27,83 +19,27 @@ Please read the latest update post: https://www.reddit.com/r/DashMachine/comment
 * multiple users, access groups, access settings
 * tagging system
 
-## Installation
-### Docker
-```
-docker create \
-  --name=dashmachine \
-  -p 5000:5000 \
-  -v path/to/data:/dashmachine/dashmachine/user_data \
-  --restart unless-stopped \
-  rmountjoy/dashmachine:latest
-```
-To run in a subfolder, use a CONTEXT_PATH environment variable. For example, to run at localhost:5000/dash:
-```
-docker create \
-  --name=dashmachine \
-  -p 5000:5000 \
-  -e CONTEXT_PATH=/dash
-  -v path/to/data:/dashmachine/dashmachine/user_data \
-  --restart unless-stopped \
-  rmountjoy/dashmachine:latest
-```
-### Synology
-Check out this awesome guide: https://nashosted.com/manage-your-self-hosted-applications-using-dashmachine/
-### Python
-Instructions are for linux.
-```
-virtualenv --python=python3 DashMachineEnv
-cd DashMachineEnv && source bin/activate
-git clone https://github.com/rmountjoy92/DashMachine.git
-cd DashMachine && pip install -r requirements.txt
-python3 run.py
-```
-Then open a web browser and go to localhost:5000
-
-## Default user/password
-```
-User: admin
-Password: admin
-```
-
-## Updating
-For python, use git. For docker, just pull the latest image and recreate the container.
 
-## Configuration
-The user data folder is located at DashMachine/dashmachine/user_data. This is where the config.ini, custom backgrounds/icons, and the database file live. A reference for what can go into the config.ini file can be found on the settings page of the dashmachine by clicking the info icon next to 'Config'. 
+### Want to contribute?
+* Please submit your pull request on the develop branch, not master.
+* Please use the [pull request template](https://github.com/rmountjoy92/DashMachine/blob/master/pull_request_template.md)
+* See this link for [how to create a pull request](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request)
 
-### Note
-If you change the config.ini file, you either have to restart the container (or python script) or click the 'save' button in the config section of settings for the config to be applied. Pictures added to the backgrounds/icons folders are available immediately.
 
-## Want to contribute?
-Please use the pull request template at:
-https://github.com/rmountjoy92/DashMachine/blob/master/pull_request_template.md
+### Subreddit 
+* [Go to subreddit](https://www.reddit.com/r/DashMachine)
 
-See this link for how to create a pull request:
-https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request
+### Want to buy me a coffee?
+* [Librepay](https://liberapay.com/rmountjoy/donate)
+* [Bountysource](https://www.bountysource.com/teams/dashmachine-app)
 
-## Subreddit 
-https://www.reddit.com/r/DashMachine
+### Want a feature to be added faster?
+* [Open a bounty](https://www.bountysource.com/)
+* [Bountysource faq](https://github.com/bountysource/core/wiki/Frequently-Asked-Questions)
 
-## Want to buy me a coffee?
-recurring:
-<a href="https://liberapay.com/rmountjoy/donate"><img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg"></a>
-
-recurring or one-time:
-https://www.bountysource.com/teams/dashmachine-app
-
-## Want a feature to be added faster?
-Open a bounty on https://www.bountysource.com/
-
-Bountysource faq: https://github.com/bountysource/core/wiki/Frequently-Asked-Questions
-
-## Tech used
+### Tech used
 * Flask
 * SQLalchemy w/ SQLite
 * Jinja2
 * Materialize css
 * JavaScript/jQuery/jQueryUI
-
-## FAQs
-1. application does not work in iframe
-see https://github.com/rmountjoy92/DashMachine/issues/6

dashmachine/__init__.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 import os
+import uuid
 from flask import Flask
 from flask_caching import Cache
 from flask_sqlalchemy import SQLAlchemy
@@ -11,13 +12,23 @@
 if not os.path.isdir(user_data_folder):
     os.mkdir(user_data_folder)
 
+secret_file = os.path.join(user_data_folder, ".secret")
+if not os.path.isfile(secret_file):
+    with open(secret_file, "w") as new_file:
+        new_file.write(uuid.uuid4().hex)
+
+with open(secret_file, "r") as secret_file:
+    secret_key = secret_file.read().encode("utf-8")
+    if len(secret_key) < 32:
+        secret_key = uuid.uuid4().hex
+
 context_path = os.getenv("CONTEXT_PATH", "")
 app = Flask(__name__, static_url_path=context_path + "/static")
 cache = Cache(app, config={"CACHE_TYPE": "simple"})
 api = Api(app)
 
 app.config["AVATARS_IDENTICON_BG"] = (255, 255, 255)
-app.config["SECRET_KEY"] = "66532a62c4048f976e22a39638b6f10e"
+app.config["SECRET_KEY"] = secret_key
 app.config["SQLALCHEMY_DATABASE_URI"] = "sqlite:///user_data/site.db"
 app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
 app.config["SEND_FILE_MAX_AGE_DEFAULT"] = 0
@@ -31,12 +42,14 @@
 from dashmachine.user_system.routes import user_system
 from dashmachine.error_pages.routes import error_pages
 from dashmachine.settings_system.routes import settings_system
+from dashmachine.docs_system.routes import docs_system
 from dashmachine import sources
 
 app.register_blueprint(main, url_prefix=context_path)
 app.register_blueprint(user_system, url_prefix=context_path)
 app.register_blueprint(error_pages, url_prefix=context_path)
 app.register_blueprint(settings_system, url_prefix=context_path)
+app.register_blueprint(docs_system, url_prefix=context_path)
 
 
 from dashmachine.rest_api.resources import *