Compare commits

..

No commits in common. "cf7d1b50f880222dcdbedcea395674660ec3575d" and "3fd95643b0f7a4c95e07d444aa0728f0951b3931" have entirely different histories.

2 changed files with 7 additions and 16 deletions

View File

@ -36,7 +36,7 @@
module-margin = 1;
modules-left = "i3";
modules-center = "xwindow";
modules-right = "mailcount network pulseaudio date keyboard power";
modules-right = "mailcount network pulseaudio date power";
cursor-click = "pointer";
cursor-scroll = "ns-resize";
enable-ipc = true;
@ -200,17 +200,10 @@
label-foreground = config.theme.colors.base0A;
# format-background = colors.background;
};
"module/keyboard" = {
type = "custom/text";
content = "󰌌";
click-left = "doas systemctl restart keyd";
content-foreground = config.theme.colors.base04;
};
"module/power" = {
type = "custom/text";
content = " ";
click-left = config.powerCommand;
click-right = "polybar-msg cmd restart";
content-foreground = config.theme.colors.base04;
};
"settings" = {

View File

@ -1,8 +1,8 @@
diff --git a/cps/__init__.py b/cps/__init__.py
index f4f8dbf2..7377acdf 100644
index 269e4aca..e2b828a9 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -151,7 +151,6 @@ def create_app():
@@ -150,7 +150,6 @@ def create_app():
lm.login_view = 'web.login'
lm.anonymous_user = ub.Anonymous
@ -11,17 +11,15 @@ index f4f8dbf2..7377acdf 100644
db.CalibreDB.update_config(config)
db.CalibreDB.setup_db(config.config_calibre_dir, cli_param.settings_path)
diff --git a/cps/admin.py b/cps/admin.py
index 045a9523..825a28af 100644
index 20c58aac..99d2ad19 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -102,10 +102,6 @@ def admin_required(f):
@@ -101,8 +101,6 @@ def admin_required(f):
@admi.before_app_request
def before_request():
- if not ub.check_user_session(current_user.id,
- flask_session.get('_id')) and 'opds' not in request.path \
- and config.config_session == 1:
- if not ub.check_user_session(current_user.id, flask_session.get('_id')) and 'opds' not in request.path:
- logout_user()
g.constants = constants
g.google_site_verification = os.getenv('GOOGLE_SITE_VERIFICATION', '')
g.google_site_verification = os.getenv('GOOGLE_SITE_VERIFICATION','')
g.allow_registration = config.config_public_reg