Просмотр исходного кода

Removed custom CSS from todo list, since that can be set up in streaming software

deadtom 5 дней назад
Родитель
Сommit
2829674031
3 измененных файлов с 4 добавлено и 44 удалено
  1. 1 7
      ownchatbot/templates/mgmt.html
  2. 1 16
      ownchatbot/user_handlers.py
  3. 2 21
      ownchatbot/web_panels.py

+ 1 - 7
ownchatbot/templates/mgmt.html

@@ -453,13 +453,7 @@
         <form action="/mgmt/clearlist" method="get" style="display: inline;">
             <button class="button button2" type="submit" class="button">Clear List</button>
         </form>
-        <br>
-        
-        <h1>Custom CSS for your list overlay</h1>
-        <form id="todo-css-form" method="POST" onsubmit="focusInput()" action="/mgmt/addtodocss">
-            <textarea id="cssInput" name="todo_css" rows="20" cols="80">{{ todo_css }}</textarea>
-            <button id="todo-css-form" class="button button2" type="submit">Save</button>
-        </form>
+        <br><br>
     </div>
     
     <div id='alerts' class="tabcontent">

+ 1 - 16
ownchatbot/user_handlers.py

@@ -7,27 +7,12 @@ import json
 import os
 
 
-def save_todocss(todo_css):  # Save todo list custom CSS
-    todo_list = current_app.config['LIST']
-    list_file = os.path.join(current_app.instance_path, 'todo.py')
-    try:
-        with open(list_file, 'w') as f:
-            f.write(f'LIST = {todo_list}\n\nCSS = \"\"\"{todo_css}\"\"\"')
-        f.close
-        current_app.config.from_pyfile('todo.py', silent=True)  # Reread the list into the app
-        return True
-    except Exception as stdcerror:
-        current_app.logger.error(f'Couldn\'t save todo.py: {stdcerror.args[0]}')
-        return False
-
-
 def save_todolist(list_items):  # Save todo list items
     new_list = json.dumps(list_items, indent=4)
-    todo_css = current_app.config['CSS']
     list_file = os.path.join(current_app.instance_path, 'todo.py')
     try:
         with open(list_file, 'w') as f:
-            f.write(f'LIST = {new_list}\n\nCSS = \"\"\"{todo_css}\"\"\"')
+            f.write(f'LIST = {new_list}')
         f.close
         current_app.config.from_pyfile('todo.py', silent=True)  # Reread the list into the app
         return True

+ 2 - 21
ownchatbot/web_panels.py

@@ -2,7 +2,7 @@ from flask import flash, render_template, Blueprint, current_app, redirect, requ
 from datetime import timezone
 from ownchatbot.db import get_db, reread_goals, reread_votes, rem_vote, reset_vote, reset_goal, clear_fulfilled_rewards, clear_reward_queue, rem_cool, rem_from_queue
 from ownchatbot.reward_handlers import all_active_votes, all_active_goals, all_active_rewards, get_queue, fulfill_reward, save_rewards, activate_category, deactivate_category, refund_reward, reread_categories, save_config, save_alerts, del_alert_file
-from ownchatbot.user_handlers import get_all_users, get_all_users_by_name, refund_points, adjust_points, change_email, get_email_code, del_email_code, save_todolist, save_todocss
+from ownchatbot.user_handlers import get_all_users, get_all_users_by_name, refund_points, adjust_points, change_email, get_email_code, del_email_code, save_todolist
 from ownchatbot.bot_messages import save_announce
 from ownchatbot.owncast_com import send_private_chat
 import json
@@ -105,7 +105,6 @@ def mgmt():
     announce_interval = current_app.config['ANNOUNCE_INTERVAL']
     announcements = current_app.config['ANNOUNCEMENTS']
     todolist_items = current_app.config['LIST']
-    todo_css = current_app.config['CSS']
     active_tab = request.args.get('activeTab')
     alerts_dict = current_app.config['ALERTS']
     settings_info = [
@@ -139,7 +138,6 @@ def mgmt():
                            inactive_categories=inactive_categories,
                            settings_info=settings_info,
                            items=todolist_items,
-                           todo_css=todo_css,
                            alerts_dict=alerts_dict,
                            activeTab=active_tab)
 
@@ -560,22 +558,6 @@ def clear_queue():
     return redirect(url_for('web_panels.mgmtqueue'))
 
 
-@ocb.route('/mgmt/addtodocss', methods=['POST'])
-@requires_login
-def add_todo_css():
-    if request.method == 'POST':
-        new_css = request.form.get('todo_css')
-        if not new_css:
-            new_css = """body {
-    background-color: transparent;
-    color: white;
-}"""
-        if save_todocss(new_css):  # Save todo list
-            current_app.logger.info('Saved to-do CSS.')
-        return redirect(url_for('web_panels.mgmt', activeTab='todolist'))
-    return redirect(url_for('web_panels.mgmt', activeTab='todolist'))
-
-
 @ocb.route('/mgmt/addtodoitem', methods=['POST'])
 @requires_login
 def add_todo_item():
@@ -712,5 +694,4 @@ def votes():
 @ocb.route('/todo')
 def todo():
     todolist_items = current_app.config['LIST']
-    todolist_css = current_app.config['CSS']
-    return render_template('list.html', items=todolist_items, css=todolist_css)
+    return render_template('list.html', items=todolist_items)