cmdbox 0.5.1.1__py3-none-any.whl → 0.5.2__py3-none-any.whl

cmdbox/web/assets/cmdbox/list_cmd.js

@@ -15,7 +15,14 @@ const list_cmd_func = async () => {
         }
         elem.find('.cmd_title').text(row.title);
         elem.find('.cmd_mode').text(row.mode);
-        elem.find('.cmd_cmd').text(row.cmd)
+        elem.find('.cmd_cmd').text(row.cmd);
+        const tags_elem = elem.find('.cmd_tags');
+        if (row.tag && Array.isArray(row.tag)) {
+            row.tag.forEach(tag => {
+                if (tag=='') return;
+                tags_elem.append(`<span class="badge text-bg-secondary me-1"><svg class="bi bi-svg_tag" width="16" height="16" fill="currentColor"><use href="#svg_tag"></use></svg>${tag}</span>`);
+            });
+        }
         if (row.tag && Array.isArray(row.tag)) {
             const tags = new Set([...row.tag]);
             elem.find('.cmd_card').attr('data-tags', Array.from(tags).join(','));
@@ -24,49 +31,90 @@ const list_cmd_func = async () => {
     };
     py_list_cmd.forEach(row => {card_func(row, true)});
     py_list_cmd.forEach(row => {card_func(row, false)});
-    $('#cmd_item_tags').html('');
+    const cmd_item_tags = $('#cmd_item_tags').html('');
+    const tag_bot_click = (e) => {
+        const ct = $(e.currentTarget);
+        const cmd_items = $('#cmd_items').find('.cmd_card:not(.cmd_add)');
+        const andor_sw = ct.hasClass('andor_switch');
+        const and_val = $('#andor_switch').prop('checked');
+        // 選択中のボタンの場合は解除中にする
+        if (!andor_sw && ct.hasClass('btn-secondary')) {
+            ct.removeClass('btn-secondary');
+            ct.addClass('btn-outline-secondary');
+        }
+        // 解除中のボタンの場合は選択中にする
+        else if (!andor_sw && ct.hasClass('btn-outline-secondary')) {
+            ct.removeClass('btn-outline-secondary');
+            ct.addClass('btn-secondary');
+        }
+        // 選択中のタグを取得
+        const tags = new Set();
+        cmd_item_tags.find('.btn-tag').each((i, elem) => {
+            if ($(elem).hasClass('btn-secondary')) tags.add($(elem).attr('data-tag'));
+        });
+        // タグ無しボタンが選択された場合
+        if (ct.hasClass('btn_notag') && ct.hasClass('btn-secondary')) {
+            cmd_item_tags.find('.btn-tag').removeClass('btn-secondary').addClass('btn-outline-secondary');
+            cmd_items.parent().hide();
+            cmd_items.each((i, elem) => {
+                const el = $(elem);
+                const itags = el.attr('data-tags');
+                if (itags) return;
+                el.parent().show();
+            });
+            return;
+        }
+        // notagボタンの選択を解除
+        if (!andor_sw) $('#btn_notag').removeClass('btn-secondary').addClass('btn-outline-secondary');
+        // タグがない場合は全て表示
+        if (tags.size == 0) {
+            cmd_items.parent().show();
+            return;
+        }
+        // タグがある場合はタグに一致するものだけ表示
+        cmd_items.parent().hide();
+        cmd_items.each((i, elem) => {
+            const el = $(elem);
+            // andorチェックされている場合はすべてのタグを含むものを表示
+            if (and_val) {
+                const itags = el.attr('data-tags');
+                if (!itags) return;
+                const etags = itags.split(',');
+                if (etags.filter(tag => tags.has(tag)).length == tags.size) el.parent().show();
+                return;
+            }
+            // andorチェックされていない場合はいずれかのタグを含むものを表示
+            tags.forEach(tag => {
+                const itags = el.attr('data-tags');
+                if (!itags) return;
+                else if (itags.split(',').includes(tag)) el.parent().show();
+            });
+        });
+    };
+    // タグボタンを追加
     py_list_cmd.forEach(row => {
+        // タグボタンを追加
         if (!row.tag || !Array.isArray(row.tag)) return;
-        const cmd_item_tags = $('#cmd_item_tags');
         row.tag.forEach(tag => {
             if (tag=='') return;
             if (cmd_item_tags.find(`[data-tag="${tag}"]`).length > 0) return;
-            const elem = $(`<button type="button" class="btn btn-outline-secondary btn-sm btn-tag me-2">${tag}</button>`);
+            const elem = $(`<button type="button" class="btn btn-outline-secondary btn-sm btn-tag me-2">` +
+                            `<svg class="bi svg-tag" width="16" height="16" fill="currentColor"><use href="#svg_tag"></use></svg>${tag}</button>`);
             elem.attr('data-tag', tag);
-            elem.text(tag);
-            elem.click((e) => {
-                const ct = $(e.currentTarget);
-                const cmd_items = $('#cmd_items').find('.cmd_card:not(.cmd_add)');
-                if (ct.hasClass('btn-secondary')) {
-                    ct.removeClass('btn-secondary');
-                    ct.addClass('btn-outline-secondary');
-                }
-                else if (ct.hasClass('btn-outline-secondary')) {
-                    ct.removeClass('btn-outline-secondary');
-                    ct.addClass('btn-secondary');
-                }
-                const tags = new Set();
-                cmd_item_tags.find('.btn-tag').each((i, elem) => {
-                    if ($(elem).hasClass('btn-secondary')) tags.add($(elem).attr('data-tag'));
-                });
-                if (tags.size == 0) {
-                    cmd_items.parent().show();
-                    return;
-                }
-                cmd_items.parent().hide();
-                tags.forEach(tag => {
-                    cmd_items.each((i, elem) => {
-                        const el = $(elem);
-                        const itags = el.attr('data-tags');
-                        if (!itags) return;
-                        else if (itags.split(',').includes(tag)) el.parent().show();
-                    });
-                });
-            });
+            elem.click(tag_bot_click);
             cmd_item_tags.append(elem);
         });
-        
     });
+    // タグ未選択ボタンを追加
+    const noselect_bot = $(`<button type="button" class="btn btn-outline-secondary btn-sm btn_notag me-2" id="btn_notag">no tag</button>`);
+    noselect_bot.click(tag_bot_click);
+    cmd_item_tags.append(noselect_bot);
+    // and/orスイッチを追加
+    const andor_bot = $(`<div class="form-check form-switch text-secondary d-inline-block"/>`);
+    andor_bot.append('<input class="form-check-input andor_switch" type="checkbox" id="andor_switch">');
+    andor_bot.append('<label class="form-check-label" for="andor_switch">or / and</label>');
+    andor_bot.find('#andor_switch').click(tag_bot_click);
+    cmd_item_tags.append(andor_bot);
 }
 // コマンドファイルの取得が出来た時の処理
 const list_cmd_func_then = () => {
@@ -129,6 +177,8 @@ const list_cmd_func_then = () => {
                     if (next_elem) next_elem.after(elem);
                     else row_content.append(elem);
                     input_elem = elem.find('.row_content_template_input');
+                    if(row.type=='date') input_elem.attr('type', 'date');
+                    else if(row.type=='datetime') input_elem.attr('type', 'datetime-local');
                     input_elem.removeClass('row_content_template_input');
                     input_elem.val(row.default);
                 }
@@ -218,9 +268,7 @@ const list_cmd_func_then = () => {
                 // マルチの場合は追加ボタンを追加
                 if(row.multi){
                     const btn_a = $('<button class="btn btn-secondary add_buton" type="button"></button>');
-                    btn_a.append('<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-plus" viewBox="0 0 16 16">'
-                                +'<path d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4z"/>'
-                                +'</svg>');
+                    btn_a.append('<svg class="bi bi-plus" width="16" height="16" fill="currentColor"><use href="#btn_plus"></use></svg>');
                     input_elem.parent().append(btn_a);
                     let mk_func = (row, next_elem) => {
                         // row, next_elemの値を残すためにクロージャーにする
@@ -239,10 +287,8 @@ const list_cmd_func_then = () => {
                             return () => del_elem.remove();
                         }
                         const btn_t = $('<button class="btn btn-secondary" type="button"></button>');
-                        btn_t.append('<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-trash" viewBox="0 0 16 16">'
-                                +'<path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5zm3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0V6z"/>'
-                                +'<path fill-rule="evenodd" d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1v1zM4.118 4 4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4H4.118zM2.5 3V2h11v1h-11z"/>'
-                                +'</svg>');
+                        btn_trash
+                        btn_t.append('<svg class="bi bi-trash" width="16" height="16" fill="currentColor"><use href="#btn_trash"></use></svg>');
                         input_elem.parent().append(btn_t);
                         btn_t.click(mk_func(input_elem.parent().parent(), row));
                     }
@@ -525,7 +571,7 @@ const get_param = (modal_elem) => {
                 $(elem).addClass('is-valid');
             }
         } else if (data_type=='bool') {
-            if(data_val!='true' && data_val!='false') $(elem).addClass('is-invalid');
+            if(data_val!='true' && data_val!='false' && !$(elem).prop('disabled')) $(elem).addClass('is-invalid');
             else {
                 data_val = data_val=='true';
                 $(elem).removeClass('is-invalid');

cmdbox/web/assets/cmdbox/list_pipe.js

@@ -45,7 +45,8 @@ list_pipe_func_then = () => {
                 const option = $('<option></option>');
                 pipe_cmd_select.append(option);
                 option.attr('value', cmd['title']);
-                option.text(`${cmd['title']}(mode=${cmd['mode']}, cmd=${cmd['cmd']})`);
+                const tag = cmd['tag'] ? `, tag=${cmd['tag']}` : '';
+                option.text(`${cmd['title']}(mode=${cmd['mode']}, cmd=${cmd['cmd']}${tag})`);
             });
             cmd_select_template.find('.add_buton').click((e) => {
                 cmd_select_template_func($(e.currentTarget), py_list_cmd);

cmdbox/web/assets/cmdbox/main.js

@@ -1,6 +1,6 @@
 $(() => {
-    // ダークモード対応
-    cmdbox.change_dark_mode(window.matchMedia('(prefers-color-scheme: dark)').matches);
+    // カラーモード対応
+    cmdbox.change_color_mode();
     // コマンド一覧の取得と表示
     list_cmd_func().then(list_cmd_func_then);
     // コマンド一覧の検索

cmdbox/web/assets/cmdbox/result.js

@@ -1,6 +1,6 @@
 $(() => {
-    // ダークモード対応
-    cmdbox.change_dark_mode(window.matchMedia('(prefers-color-scheme: dark)').matches);
+    // カラーモード対応
+    cmdbox.change_color_mode();
     // アイコンを表示
     cmdbox.set_logoicon('.navbar-brand');
     // copyright表示

cmdbox/web/assets/cmdbox/signin.js

@@ -1,6 +1,6 @@
 $(() => {
-    // ダークモード対応
-    cmdbox.change_dark_mode(window.matchMedia('(prefers-color-scheme: dark)').matches);
+    // カラーモード対応
+    cmdbox.change_color_mode();
 
     $('.theme-item').off('click').on('click', (event) => {
         $('.theme-item').removeClass('active');

cmdbox/web/assets/cmdbox/users.js

@@ -552,9 +552,8 @@ users.passsetting_list = async () => {
     mk_card(passsetting_elem, 'Account Lockout', passsetting_root_data['lockout']);
 };
 $(() => {
-    // ダークモード対応
-    cmdbox.change_dark_mode(window.matchMedia('(prefers-color-scheme: dark)').matches);
-
+    // カラーモード対応
+    cmdbox.change_color_mode();
     // アイコンを表示
     cmdbox.set_logoicon('.navbar-brand');
     // copyright表示

cmdbox/web/assets/cmdbox/view_result.js

@@ -24,7 +24,7 @@ const render_result_func = (target_elem, result, res_size) => {
     if (!result || Array.isArray(result) && result.length<=0) return;
     const mk_table_func = () => {
         const table = $('<table class="table table-bordered table-hover table-sm"></table>');
-        const table_head = $('<thead class="table-dark bg-dark"></thead>');
+        const table_head = $('<thead></thead>');
         const table_body = $('<tbody></tbody>');
         table.append(table_head);
         table.append(table_body);

cmdbox/web/assets/filer/main.js

@@ -1,6 +1,6 @@
 $(() => {
-  // ダークモード対応
-  cmdbox.change_dark_mode(window.matchMedia('(prefers-color-scheme: dark)').matches);
+  // カラーモード対応
+  cmdbox.change_color_mode();
   // スプリッター初期化
   $('.split-pane').splitPane();
   // アイコンを表示

cmdbox/web/filer.html

@@ -29,8 +29,21 @@
                         <a class="nav-link dropdown-toggle" href="#" id="viewMenuLink" role="button" data-bs-toggle="dropdown" aria-expanded="false">
                             View
                         </a>
-                        <ul class="dropdown-menu">
-                            <li><a class="dropdown-item" href="#" onclick="cmdbox.change_dark_mode();">Change Dark Mode</a></li>
+                        <ul class="dropdown-menu viewmenu">
+                            <li class="nav-item dropdown">
+                                <span class="dropdown-item">
+                                    Change Dark Mode
+                                    <select class="d-inline-block change_color_mode" onchange="cmdbox.change_color_mode($(this).val());">
+                                        <option value="dark" selected>Dark</option>
+                                        <option value="midnight">midnight</option>
+                                        <option value="deepsea">deepsea</option>
+                                        <option value="verdant">verdant</option>
+                                        <option value="bumblebee">bumblebee</option>
+                                        <option value="crimson">crimson</option>
+                                        <option value="light">light</option>
+                                    </select>
+                                </span>
+                            </li>
                         </ul>
                     </li>
                     <li class="nav-item dropdown">
@@ -201,6 +214,7 @@
     });
 </script>
 <link rel="stylesheet" href="assets/bootstrap/bootstrap.min.5.3.0.css">
+<link rel="stylesheet" href="assets/cmdbox/color_mode.css">
 <link rel="stylesheet" href="assets/lightbox2/css/lightbox.min.css">
 <link rel="stylesheet" href="assets/tree-menu/css/tree-menu.css">
 <link rel="stylesheet" href="assets/split-pane/split-pane.css">

cmdbox/web/gui.html

@@ -51,6 +51,10 @@
         <symbol id="svg_magic_btn" viewBox="0 0 16 16">
             <path d="M9.5 2.672a.5.5 0 1 0 1 0V.843a.5.5 0 0 0-1 0zm4.5.035A.5.5 0 0 0 13.293 2L12 3.293a.5.5 0 1 0 .707.707zM7.293 4A.5.5 0 1 0 8 3.293L6.707 2A.5.5 0 0 0 6 2.707zm-.621 2.5a.5.5 0 1 0 0-1H4.843a.5.5 0 1 0 0 1zm8.485 0a.5.5 0 1 0 0-1h-1.829a.5.5 0 0 0 0 1zM13.293 10A.5.5 0 1 0 14 9.293L12.707 8a.5.5 0 1 0-.707.707zM9.5 11.157a.5.5 0 0 0 1 0V9.328a.5.5 0 0 0-1 0zm1.854-5.097a.5.5 0 0 0 0-.706l-.708-.708a.5.5 0 0 0-.707 0L8.646 5.94a.5.5 0 0 0 0 .707l.708.708a.5.5 0 0 0 .707 0l1.293-1.293Zm-3 3a.5.5 0 0 0 0-.706l-.708-.708a.5.5 0 0 0-.707 0L.646 13.94a.5.5 0 0 0 0 .707l.708.708a.5.5 0 0 0 .707 0z"/>
         </symbol>
+        <symbol id="svg_tag" viewBox="0 0 16 16">
+            <path d="M6 4.5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0m-1 0a.5.5 0 1 0-1 0 .5.5 0 0 0 1 0"/>
+            <path d="M2 1h4.586a1 1 0 0 1 .707.293l7 7a1 1 0 0 1 0 1.414l-4.586 4.586a1 1 0 0 1-1.414 0l-7-7A1 1 0 0 1 1 6.586V2a1 1 0 0 1 1-1m0 5.586 7 7L13.586 9l-7-7H2z"/>
+        </symbol>
     </svg>
     <!-- ナビゲーションバー -->
     <nav class="navbar navbar-expand-sm fixed-top p-2">
@@ -81,7 +85,20 @@
                             View
                         </a>
                         <ul class="dropdown-menu viewmenu">
-                            <li><a class="dropdown-item" href="#" onclick="cmdbox.change_dark_mode();">Change Dark Mode</a></li>
+                            <li class="nav-item dropdown">
+                                <span class="dropdown-item">
+                                    Change Dark Mode
+                                    <select class="d-inline-block change_color_mode" onchange="cmdbox.change_color_mode($(this).val());">
+                                        <option value="dark" selected>Dark</option>
+                                        <option value="midnight">midnight</option>
+                                        <option value="deepsea">deepsea</option>
+                                        <option value="verdant">verdant</option>
+                                        <option value="bumblebee">bumblebee</option>
+                                        <option value="crimson">crimson</option>
+                                        <option value="light">light</option>
+                                    </select>
+                                </span>
+                            </li>
                             <li><a class="dropdown-item" href="#" onclick="$(`#console_modal`).modal(`show`);">Console log</a></li>
                         </ul>
                     </li>
@@ -133,7 +150,8 @@
                             <div class="d-flex">
                                 <h5 class="cmd_title card-title d-inline-block">Card title</h5>
                             </div>
-                            <h6 class="card-subtitle mb-2 text-muted">mode:<span class="cmd_mode"></span>, cmd:<span class="cmd_cmd"></span></h6>
+                            <h6 class="card-subtitle mb-2">mode:<span class="cmd_mode"></span>, cmd:<span class="cmd_cmd"></span></h6>
+                            <h6 class="card-subtitle text-end"><span class="cmd_tags text-secondary"></span></h6>
                         </div>
                     </div>
                 </div>
@@ -490,6 +508,7 @@
     });
 </script>
 <link rel="stylesheet" href="assets/bootstrap/bootstrap.min.5.3.0.css">
+<link rel="stylesheet" href="assets/cmdbox/color_mode.css">
 <link rel="stylesheet" href="assets/lightbox2/css/lightbox.min.css">
 <link rel="stylesheet" href="assets/tree-menu/css/tree-menu.css">
 <script type="text/javascript" src="assets/bootstrap/bootstrap.bundle.min.5.3.0.js"></script>

cmdbox/web/result.html

@@ -66,7 +66,20 @@
                             View
                         </a>
                         <ul class="dropdown-menu viewmenu">
-                            <li><a class="dropdown-item" href="#" onclick="cmdbox.change_dark_mode();">Change Dark Mode</a></li>
+                            <li class="nav-item dropdown">
+                                <span class="dropdown-item">
+                                    Change Dark Mode
+                                    <select class="d-inline-block change_color_mode" onchange="cmdbox.change_color_mode($(this).val());">
+                                        <option value="dark" selected>Dark</option>
+                                        <option value="midnight">midnight</option>
+                                        <option value="deepsea">deepsea</option>
+                                        <option value="verdant">verdant</option>
+                                        <option value="bumblebee">bumblebee</option>
+                                        <option value="crimson">crimson</option>
+                                        <option value="light">light</option>
+                                    </select>
+                                </span>
+                            </li>
                             <li><a class="dropdown-item" href="#" onclick="$(`#console_modal`).modal(`show`);">Console log</a></li>
                         </ul>
                     </li>
@@ -183,6 +196,7 @@
     });
 </script>
 <link rel="stylesheet" href="assets/bootstrap/bootstrap.min.5.3.0.css">
+<link rel="stylesheet" href="assets/cmdbox/color_mode.css">
 <link rel="stylesheet" href="assets/lightbox2/css/lightbox.min.css">
 <script type="text/javascript" src="assets/bootstrap/bootstrap.bundle.min.5.3.0.js"></script>
 <script type="text/javascript" src="assets/jquery/jquery.min.3.2.0.js"></script>

cmdbox/web/signin.html

@@ -17,13 +17,6 @@
         <symbol id="circle-half" viewBox="0 0 16 16">
             <path d="M8 15A7 7 0 1 0 8 1v14zm0 1A8 8 0 1 1 8 0a8 8 0 0 1 0 16z"></path>
         </symbol>
-        <symbol id="moon-stars-fill" viewBox="0 0 16 16">
-            <path d="M6 .278a.768.768 0 0 1 .08.858 7.208 7.208 0 0 0-.878 3.46c0 4.021 3.278 7.277 7.318 7.277.527 0 1.04-.055 1.533-.16a.787.787 0 0 1 .81.316.733.733 0 0 1-.031.893A8.349 8.349 0 0 1 8.344 16C3.734 16 0 12.286 0 7.71 0 4.266 2.114 1.312 5.124.06A.752.752 0 0 1 6 .278z"></path>
-            <path d="M10.794 3.148a.217.217 0 0 1 .412 0l.387 1.162c.173.518.579.924 1.097 1.097l1.162.387a.217.217 0 0 1 0 .412l-1.162.387a1.734 1.734 0 0 0-1.097 1.097l-.387 1.162a.217.217 0 0 1-.412 0l-.387-1.162A1.734 1.734 0 0 0 9.31 6.593l-1.162-.387a.217.217 0 0 1 0-.412l1.162-.387a1.734 1.734 0 0 0 1.097-1.097l.387-1.162zM13.863.099a.145.145 0 0 1 .274 0l.258.774c.115.346.386.617.732.732l.774.258a.145.145 0 0 1 0 .274l-.774.258a1.156 1.156 0 0 0-.732.732l-.258.774a.145.145 0 0 1-.274 0l-.258-.774a1.156 1.156 0 0 0-.732-.732l-.774-.258a.145.145 0 0 1 0-.274l.774-.258c.346-.115.617-.386.732-.732L13.863.1z"></path>
-        </symbol>
-        <symbol id="sun-fill" viewBox="0 0 16 16">
-            <path d="M8 12a4 4 0 1 0 0-8 4 4 0 0 0 0 8zM8 0a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 0zm0 13a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 13zm8-5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2a.5.5 0 0 1 .5.5zM3 8a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2A.5.5 0 0 1 3 8zm10.657-5.657a.5.5 0 0 1 0 .707l-1.414 1.415a.5.5 0 1 1-.707-.708l1.414-1.414a.5.5 0 0 1 .707 0zm-9.193 9.193a.5.5 0 0 1 0 .707L3.05 13.657a.5.5 0 0 1-.707-.707l1.414-1.414a.5.5 0 0 1 .707 0zm9.193 2.121a.5.5 0 0 1-.707 0l-1.414-1.414a.5.5 0 0 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .707zM4.464 4.465a.5.5 0 0 1-.707 0L2.343 3.05a.5.5 0 1 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .708z"></path>
-        </symbol>
         <symbol id="google" viewBox="0 0 16 16">
             <path d="M15.545 6.558a9.4 9.4 0 0 1 .139 1.626c0 2.434-.87 4.492-2.384 5.885h.002C11.978 15.292 10.158 16 8 16A8 8 0 1 1 8 0a7.7 7.7 0 0 1 5.352 2.082l-2.284 2.284A4.35 4.35 0 0 0 8 3.166c-2.087 0-3.86 1.408-4.492 3.304a4.8 4.8 0 0 0 0 3.063h.003c.635 1.893 2.405 3.301 4.492 3.301 1.078 0 2.004-.276 2.722-.764h-.003a3.7 3.7 0 0 0 1.599-2.431H8v-3.08z"/>
         </symbol>
@@ -50,22 +43,49 @@
         </button>
         <ul class="dropdown-menu dropdown-menu-end shadow" aria-labelledby="bd-theme-text" style="">
             <li>
-                <button type="button" class="dropdown-item d-flex align-items-center theme-item" data-bs-theme-value="light" aria-pressed="false">
-                    <svg class="bi me-2 opacity-50 theme-icon" width="1em" height="1em"><use href="#sun-fill"></use></svg>
-                    Light
+                <button type="button" class="dropdown-item d-flex align-items-center theme-item" data-bs-theme-value="dark" aria-pressed="false">
+                    Dark
                     <svg class="bi ms-auto d-none" width="1em" height="1em"><use href="#check2"></use></svg>
                 </button>
             </li>
             <li>
-                <button type="button" class="dropdown-item d-flex align-items-center theme-item" data-bs-theme-value="dark" aria-pressed="false">
-                    <svg class="bi me-2 opacity-50 theme-icon" width="1em" height="1em"><use href="#moon-stars-fill"></use></svg>
-                    Dark
+                <button type="button" class="dropdown-item d-flex align-items-center theme-item" data-bs-theme-value="midnight" aria-pressed="false">
+                    Midnight
+                    <svg class="bi ms-auto d-none" width="1em" height="1em"><use href="#check2"></use></svg>
+                </button>
+            </li>
+            <li>
+                <button type="button" class="dropdown-item d-flex align-items-center theme-item" data-bs-theme-value="deepsea" aria-pressed="false">
+                    Deepsea
+                    <svg class="bi ms-auto d-none" width="1em" height="1em"><use href="#check2"></use></svg>
+                </button>
+            </li>
+            <li>
+                <button type="button" class="dropdown-item d-flex align-items-center theme-item" data-bs-theme-value="verdant" aria-pressed="false">
+                    Verdant
+                    <svg class="bi ms-auto d-none" width="1em" height="1em"><use href="#check2"></use></svg>
+                </button>
+            </li>
+            <li>
+                <button type="button" class="dropdown-item d-flex align-items-center theme-item" data-bs-theme-value="bumblebee" aria-pressed="false">
+                    Bumblebee
+                    <svg class="bi ms-auto d-none" width="1em" height="1em"><use href="#check2"></use></svg>
+                </button>
+            </li>
+            <li>
+                <button type="button" class="dropdown-item d-flex align-items-center theme-item" data-bs-theme-value="crimson" aria-pressed="false">
+                    Crimson
+                    <svg class="bi ms-auto d-none" width="1em" height="1em"><use href="#check2"></use></svg>
+                </button>
+            </li>
+            <li>
+                <button type="button" class="dropdown-item d-flex align-items-center theme-item" data-bs-theme-value="light" aria-pressed="false">
+                    Light
                     <svg class="bi ms-auto d-none" width="1em" height="1em"><use href="#check2"></use></svg>
                 </button>
             </li>
             <li>
                 <button type="button" class="dropdown-item d-flex align-items-center theme-item active" data-bs-theme-value="auto" aria-pressed="true">
-                    <svg class="bi me-2 opacity-50 theme-icon" width="1em" height="1em"><use href="#circle-half"></use></svg>
                     Auto
                     <svg class="bi ms-auto d-none" width="1em" height="1em"><use href="#check2"></use></svg>
                 </button>
@@ -124,6 +144,7 @@
     });
 </script>
 <link rel="stylesheet" href="../assets/bootstrap/bootstrap.min.5.3.0.css">
+<link rel="stylesheet" href="../assets/cmdbox/color_mode.css">
 <script type="text/javascript" src="../assets/bootstrap/bootstrap.bundle.min.5.3.0.js"></script>
 <script type="text/javascript" src="../assets/jquery/jquery.min.3.2.0.js"></script>
 <script type="text/javascript" src="../assets/cmdbox/common.js"></script>

cmdbox/web/users.html

@@ -65,7 +65,20 @@
                             View
                         </a>
                         <ul class="dropdown-menu viewmenu">
-                            <li><a class="dropdown-item" href="#" onclick="cmdbox.change_dark_mode();">Change Dark Mode</a></li>
+                            <li class="nav-item dropdown">
+                                <span class="dropdown-item">
+                                    Change Dark Mode
+                                    <select class="d-inline-block change_color_mode" onchange="cmdbox.change_color_mode($(this).val());">
+                                        <option value="dark" selected>Dark</option>
+                                        <option value="midnight">midnight</option>
+                                        <option value="deepsea">deepsea</option>
+                                        <option value="verdant">verdant</option>
+                                        <option value="">bumblebee</option>
+                                        <option value="crimson">crimson</option>
+                                        <option value="light">light</option>
+                                    </select>
+                                </span>
+                            </li>
                             <li><a class="dropdown-item" href="#" onclick="$(`#console_modal`).modal(`show`);">Console log</a></li>
                         </ul>
                     </li>
@@ -261,6 +274,7 @@
     });
 </script>
 <link rel="stylesheet" href="assets/bootstrap/bootstrap.min.5.3.0.css">
+<link rel="stylesheet" href="assets/cmdbox/color_mode.css">
 <link rel="stylesheet" href="assets/lightbox2/css/lightbox.min.css">
 <link rel="stylesheet" href="assets/tree-menu/css/tree-menu.css">
 <script type="text/javascript" src="assets/bootstrap/bootstrap.bundle.min.5.3.0.js"></script>

{cmdbox-0.5.1.1.dist-info → cmdbox-0.5.2.dist-info}/METADATA

@@ -1,16 +1,15 @@
 Metadata-Version: 2.1
 Name: cmdbox
-Version: 0.5.1.1
+Version: 0.5.2
 Summary: cmdbox: It is a command line application with a plugin mechanism.
 Home-page: https://github.com/hamacom2004jp/cmdbox
+Download-URL: https://github.com/hamacom2004jp/cmdbox
 Author: hamacom2004jp
 Author-email: hamacom2004jp@gmail.com
 Maintainer: hamacom2004jp
 Maintainer-email: hamacom2004jp@gmail.com
 License: MIT
-Download-URL: https://github.com/hamacom2004jp/cmdbox
 Keywords: cli restapi redis fastapi
-Platform: UNKNOWN
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Information Technology
@@ -21,6 +20,7 @@ Classifier: Programming Language :: Python
 Classifier: Topic :: Utilities
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
+License-File: LICENSE
 Requires-Dist: argcomplete
 Requires-Dist: cryptography
 Requires-Dist: fastapi
@@ -30,6 +30,7 @@ Requires-Dist: itsdangerous
 Requires-Dist: numpy
 Requires-Dist: Pillow
 Requires-Dist: plyer
+Requires-Dist: psycopg[binary]
 Requires-Dist: pystray
 Requires-Dist: python-multipart
 Requires-Dist: pycryptodome
@@ -286,6 +287,27 @@ aliases:                                # Specify the alias for the specified co
                                         #   e.g. /{1}_exec
         move:                           # Specify whether to move the regular expression group of the source to the target.
                                         #   e.g. true
+  audit:
+    enabled: true                       # Specify whether to enable the audit function.
+    feature:
+      mode: audit                       # Specify the mode of the feature to be audited.
+      cmd: write                        # Specify the command to be audited.
+    options:                            # Specify the options for the audit function.
+      host: localhost                   # Specify the service host of the audit Redis server.
+      port: 6379                        # Specify the service port of the audit Redis server.
+      password: password                # Specify the access password of the audit Redis server.
+      svname: server                    # Specify the audit service name of the inference server.
+      retry_count: 3                    # Specifies the number of reconnections to the audit Redis server.If less than 0 is specified, reconnection is forever.
+      retry_interval: 1                 # Specifies the number of seconds before reconnecting to the audit Redis server.
+      timeout: 1                        # Specify the maximum waiting time until the server responds.
+      pg_enabled: False                 # Specify True if using the postgresql database server.
+      pg_host: localhost                # Specify the postgresql host.
+      pg_port: 5432                     # Specify the postgresql port.
+      pg_user: postgres                 # Specify the postgresql user name.
+      pg_password: password             # Specify the postgresql password.
+      pg_dbname: audit                  # Specify the postgresql database name.
+      retention_period_days: 365        # Specify the number of days to retain audit logs.
+
 ```
 
 - The following files should also be known when using commands on the web screen or RESTAPI.
@@ -422,5 +444,3 @@ oauth2:                             # OAuth2 settings.
 # Lisence
 
 This project is licensed under the MIT License, see the LICENSE file for details
-
-