diginaut/digimarks
1
0
Fork 0
mirror of https://github.com/aquatix/digimarks.git synced 2025-12-06 22:05:09 +01:00
Code Issues Releases Wiki Activity

Default theme is now a constant; linting fixes

Browse Source
This commit is contained in:
Michiel Scholten
2017-07-22 21:51:07 +02:00
parent a66360a0e3
commit 0be05d07e9
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
digimarks.py
View File

@@ -15,6 +15,7 @@ from flask_peewee.db import Database
#from flask_peewee.utils import get_object_or_404 #from flask_peewee.utils import get_object_or_404
from peewee import * # noqa from peewee import * # noqa
DEFAULT_THEME = 'green'
themes = { themes = {
'green': { 'green': {
'BODY': 'grey lighten-4', 'BODY': 'grey lighten-4',
@@ -161,7 +162,7 @@ class User(db.Model):
""" User account """ """ User account """
username = CharField() username = CharField()
key = CharField() key = CharField()
theme = CharField(default='green') theme = CharField(default=DEFAULT_THEME)
created_date = DateTimeField(default=datetime.datetime.now) created_date = DateTimeField(default=datetime.datetime.now)
def generate_key(self): def generate_key(self):
@@ -356,7 +357,7 @@ def get_theme(userkey):
usertheme = settings[userkey]['theme'] usertheme = settings[userkey]['theme']
return themes[usertheme] return themes[usertheme]
except KeyError: except KeyError:
return themes['green'] # default return themes[DEFAULT_THEME] # default
def make_external(url): def make_external(url):
@@ -371,8 +372,8 @@ def page_not_found(e):
@app.route('/') @app.route('/')
def index(): def index():
""" Homepage, point visitors to project page """ """ Homepage, point visitors to project page """
default_theme = themes['green'] theme = themes[DEFAULT_THEME]
return render_template('index.html', theme=default_theme) return render_template('index.html', theme=theme)
@app.route('/<userkey>', methods=['GET', 'POST']) @app.route('/<userkey>', methods=['GET', 'POST'])
@@ -618,7 +619,8 @@ def tag(userkey, tag):
publictag = None publictag = None
theme = get_theme(userkey) theme = get_theme(userkey)
return render_template('bookmarks.html', bookmarks=bookmarks, userkey=userkey, tags=tags, tag=tag, publictag=publictag, action=pageheader, message=message, theme=theme) return render_template('bookmarks.html', bookmarks=bookmarks, userkey=userkey, tags=tags, tag=tag, publictag=publictag, action=pageheader,
message=message, theme=theme)
@app.route('/pub/<tagkey>') @app.route('/pub/<tagkey>')
@@ -628,7 +630,7 @@ def publictag(tagkey):
try: try:
this_tag = PublicTag.get(PublicTag.tagkey == tagkey) this_tag = PublicTag.get(PublicTag.tagkey == tagkey)
bookmarks = Bookmark.select().where(Bookmark.userkey == this_tag.userkey, Bookmark.tags.contains(this_tag.tag), Bookmark.status == Bookmark.VISIBLE).order_by(Bookmark.created_date.desc()) bookmarks = Bookmark.select().where(Bookmark.userkey == this_tag.userkey, Bookmark.tags.contains(this_tag.tag), Bookmark.status == Bookmark.VISIBLE).order_by(Bookmark.created_date.desc())
theme = get_theme(userkey) theme = themes[DEFAULT_THEME]
return render_template('publicbookmarks.html', bookmarks=bookmarks, tag=tag, action=this_tag.tag, tagkey=tagkey, theme=theme) return render_template('publicbookmarks.html', bookmarks=bookmarks, tag=tag, action=this_tag.tag, tagkey=tagkey, theme=theme)
except PublicTag.DoesNotExist: except PublicTag.DoesNotExist:
abort(404) abort(404)