From ea07f04a347f393ac03d8f0d12aa1b95a2564ea4 Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Wed, 26 May 2021 13:25:11 -0300 Subject: [PATCH 01/22] add forward and back button instead of just up --- navigator/navigator.html | 4 ++++ navigator/navigator.js | 22 ++++++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/navigator/navigator.html b/navigator/navigator.html index f6bb570..caf2832 100644 --- a/navigator/navigator.html +++ b/navigator/navigator.html @@ -33,6 +33,10 @@
+ +
+ +
diff --git a/navigator/navigator.js b/navigator/navigator.js index 578175f..4be7ef6 100644 --- a/navigator/navigator.js +++ b/navigator/navigator.js @@ -82,6 +82,9 @@ class NavEntry { path_str() { return "/" + this.path.join('/'); } + parent_dir() { + return this.path.slice(0, this.path.length - 1); + } show() { document.getElementById("nav-contents-view").appendChild(this.dom_element); } @@ -253,6 +256,7 @@ class NavDir extends NavEntry { class NavWindow { constructor() { this.path_stack = [new NavDir("/", this)]; + this.path_stack_index = this.path_stack.length - 1; this.selected_entry = this.pwd(); this.entries = []; this.window = document.getElementById("nav-contents-view"); @@ -281,21 +285,29 @@ class NavWindow { this.show_selected_properties(); } pwd() { - return this.path_stack[this.path_stack.length - 1]; + return this.path_stack[this.path_stack_index]; } cd(new_dir) { + this.path_stack.length = this.path_stack_index + 1; this.path_stack.push(new_dir); + this.path_stack_index = this.path_stack.length - 1; this.refresh().catch(() => { this.path_stack.pop(); this.refresh(); window.alert(new_dir.path_str() + " is inaccessible."); }); } - up() { - if(this.path_stack.length > 1) - this.path_stack.pop(); + back() { + this.path_stack_index = Math.max(this.path_stack_index - 1, 0); this.refresh(); } + forward() { + this.path_stack_index = Math.min(this.path_stack_index + 1, this.path_stack.length - 1); + this.refresh(); + } + up() { + this.cd(new NavDir(this.pwd().parent_dir())); + } show_selected_properties() { this.selected_entry.show_properties(); } @@ -418,6 +430,8 @@ class NavWindow { let nav_window = new NavWindow(); function set_up_buttons() { + document.getElementById("nav-back-btn").addEventListener("click", nav_window.back.bind(nav_window)); + document.getElementById("nav-forward-btn").addEventListener("click", nav_window.forward.bind(nav_window)); document.getElementById("nav-up-dir-btn").addEventListener("click", nav_window.up.bind(nav_window)); document.getElementById("nav-refresh-btn").addEventListener("click", nav_window.refresh.bind(nav_window)); document.getElementById("nav-mkdir-btn").addEventListener("click", nav_window.mkdir.bind(nav_window)); From 049cd5f489cda8ed0b623daed35f03194468ed96 Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Wed, 26 May 2021 13:35:51 -0300 Subject: [PATCH 02/22] fix returning to previous dir on inaccessible --- navigator/navigator.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/navigator/navigator.js b/navigator/navigator.js index 4be7ef6..b2d40ae 100644 --- a/navigator/navigator.js +++ b/navigator/navigator.js @@ -208,7 +208,11 @@ class NavDir extends NavEntry { } async get_children(nav_window_ref) { var children = []; - var data = await cockpit.spawn(["/usr/share/cockpit/navigator/scripts/ls.py", this.path_str()], {err:"ignore"}); + var proc = cockpit.spawn(["/usr/share/cockpit/navigator/scripts/ls.py", this.path_str()], {err:"out", superuser: "try"}); + proc.fail((e, data) => { + window.alert(data); + }) + var data = await proc; var response = JSON.parse(data); this.stat = response["."]["stat"]; var entries = response["children"]; @@ -292,9 +296,7 @@ class NavWindow { this.path_stack.push(new_dir); this.path_stack_index = this.path_stack.length - 1; this.refresh().catch(() => { - this.path_stack.pop(); - this.refresh(); - window.alert(new_dir.path_str() + " is inaccessible."); + this.back(); }); } back() { From 9b0131a0b8ad75dbf961ac3b77a86ea149a2bc0d Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Wed, 26 May 2021 13:36:13 -0300 Subject: [PATCH 03/22] default owner and group to '?' on error while determining --- navigator/scripts/ls.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/navigator/scripts/ls.py b/navigator/scripts/ls.py index 5be3592..ea96543 100755 --- a/navigator/scripts/ls.py +++ b/navigator/scripts/ls.py @@ -14,6 +14,16 @@ def get_stat(full_path, filename = '/'): isdir = S_ISDIR(os.stat(full_path).st_mode) except OSError: pass + owner = '?' + try: + owner = getpwuid(stats.st_uid).pw_name + except: + pass + group = '?' + try: + group = getgrgid(stats.st_gid).gr_name + except: + pass response = { "filename": filename, "isdir": isdir, @@ -21,9 +31,9 @@ def get_stat(full_path, filename = '/'): "mode": stats.st_mode, "mode-str": filemode(stats.st_mode), "uid": stats.st_uid, - "owner": getpwuid(stats.st_uid).pw_name, + "owner": owner, "gid": stats.st_gid, - "group": getgrgid(stats.st_gid).gr_name, + "group": group, "size": stats.st_size, "atime": stats.st_atime, "mtime": stats.st_mtime, From f6fb166b07696ac90b5ede8c7707acc05358e5ad Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Wed, 26 May 2021 15:18:35 -0300 Subject: [PATCH 04/22] add dynamic dropdown list while typing path --- navigator/navigator.css | 1 + navigator/navigator.html | 8 ++++--- navigator/navigator.js | 48 +++++++++++++++++++++++++++++++++++++--- 3 files changed, 51 insertions(+), 6 deletions(-) diff --git a/navigator/navigator.css b/navigator/navigator.css index c343425..676830d 100644 --- a/navigator/navigator.css +++ b/navigator/navigator.css @@ -33,6 +33,7 @@ .navigation-bar { background-color: #212427; + color: inherit; flex-grow: 1; padding: 0.25em 1em 0.25em 1em; border: 1px solid #3c3f42; diff --git a/navigator/navigator.html b/navigator/navigator.html index caf2832..98f937a 100644 --- a/navigator/navigator.html +++ b/navigator/navigator.html @@ -42,9 +42,11 @@
- + + + +
diff --git a/navigator/navigator.js b/navigator/navigator.js index b2d40ae..6ce9e02 100644 --- a/navigator/navigator.js +++ b/navigator/navigator.js @@ -206,11 +206,12 @@ class NavDir extends NavEntry { } super.handleEvent(e); } - async get_children(nav_window_ref) { + async get_children(nav_window_ref, no_alert = false) { var children = []; var proc = cockpit.spawn(["/usr/share/cockpit/navigator/scripts/ls.py", this.path_str()], {err:"out", superuser: "try"}); proc.fail((e, data) => { - window.alert(data); + if(!no_alert) + window.alert(data); }) var data = await proc; var response = JSON.parse(data); @@ -284,7 +285,7 @@ class NavWindow { file.show(); this.entries.push(file); }); - document.getElementById("pwd").innerText = this.pwd().path_str(); + document.getElementById("pwd").value = this.pwd().path_str(); this.set_selected(this.pwd()); this.show_selected_properties(); } @@ -427,6 +428,44 @@ class NavWindow { await proc; this.refresh(); } + nav_bar_event_handler(e) { + switch(e.key){ + case 'Enter': + this.nav_bar_cd(); + break; + default: + break; + } + } + nav_bar_cd() { + var new_path = document.getElementById("pwd").value; + this.cd(new NavDir(new_path)); + } + async nav_bar_update_choices() { + var list = document.getElementById("possible-paths"); + var partial_path_str = document.getElementById("pwd").value; + var last_delim = partial_path_str.lastIndexOf('/'); + if(last_delim === -1) + return; + var parent_path_str = partial_path_str.slice(0, last_delim); + if(this.nav_bar_last_parent_path_str === parent_path_str) + return; + this.nav_bar_last_parent_path_str = parent_path_str; + var parent_dir = new NavDir(parent_path_str); + console.log(parent_dir.path_str()); + var error = false; + var objs = await parent_dir.get_children(this, true).catch(() => {error = true}); + if(error) + return; + objs = objs.filter((child) => {return child.nav_type === "dir"}); + while(list.firstChild) + list.removeChild(list.firstChild); + objs.forEach((obj) => { + var option = document.createElement("option"); + option.value = obj.path_str(); + list.appendChild(option); + }); + } } let nav_window = new NavWindow(); @@ -446,6 +485,9 @@ function set_up_buttons() { for(let checkbox of mode_checkboxes){ checkbox.addEventListener("change", nav_window.update_permissions_preview.bind(nav_window)); } + document.getElementById("pwd").addEventListener("input", nav_window.nav_bar_update_choices.bind(nav_window), false); + document.getElementById("pwd").addEventListener("focus", nav_window.nav_bar_update_choices.bind(nav_window), false); + document.getElementById("pwd").addEventListener("keydown", nav_window.nav_bar_event_handler.bind(nav_window)); } async function main() { From 19620e11af1e8d19ced8b2a6740d182b6ad781a4 Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Wed, 26 May 2021 17:15:28 -0300 Subject: [PATCH 05/22] implement file editor --- navigator/navigator.css | 19 +++++++++++++++++ navigator/navigator.html | 11 ++++++++++ navigator/navigator.js | 44 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 73 insertions(+), 1 deletion(-) diff --git a/navigator/navigator.css b/navigator/navigator.css index 676830d..43b6b50 100644 --- a/navigator/navigator.css +++ b/navigator/navigator.css @@ -145,4 +145,23 @@ flex-flow: row nowrap; justify-content: flex-end; align-items: flex-start; +} + +.editor-header { + font-weight: bold; +} + +.edit-file-contents { + height: 100%; + flex-basis: 0; + flex-grow: 8; + flex-flow: column nowrap; + align-items: stretch; +} + +.edit-file-contents > textarea { + flex-grow: 1; + white-space: pre; + overflow: auto; + resize: none; } \ No newline at end of file diff --git a/navigator/navigator.html b/navigator/navigator.html index 98f937a..f6269d8 100644 --- a/navigator/navigator.html +++ b/navigator/navigator.html @@ -55,6 +55,17 @@
+
+
+
+ +
+ +
+
diff --git a/navigator/navigator.js b/navigator/navigator.js index d51ff45..998a8fe 100644 --- a/navigator/navigator.js +++ b/navigator/navigator.js @@ -39,12 +39,17 @@ function format_permissions(/*int*/ mode) { function set_last_theme_state() { var toggle_switch = document.getElementById("toggle-theme"); var state = localStorage.getItem("houston-theme-state"); + var icon = document.getElementById("houston-theme-icon"); if (state === "light") { toggle_switch.checked = false; document.documentElement.setAttribute("data-theme", "light"); + icon.classList.remove("fa-moon"); + icon.classList.add("fa-sun"); } else if (state === "dark") { toggle_switch.checked = true; document.documentElement.setAttribute("data-theme", "dark"); + icon.classList.remove("fa-sun"); + icon.classList.add("fa-moon"); } else { toggle_switch.checked = false; state = "light"; @@ -53,11 +58,16 @@ function set_last_theme_state() { } function switch_theme(/*event*/ e) { + var icon = document.getElementById("houston-theme-icon"); var state = ""; if (e.target.checked) { state = "dark"; + icon.classList.remove("fa-sun"); + icon.classList.add("fa-moon"); } else { state = "light"; + icon.classList.remove("fa-moon"); + icon.classList.add("fa-sun"); } document.documentElement.setAttribute("data-theme", state); localStorage.setItem("houston-theme-state", state); From 827b138d57a741ff5a8b6fd24d8368c4f4822933 Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Thu, 27 May 2021 14:57:35 -0300 Subject: [PATCH 09/22] color scrollbar, add spinner, disable btns on edit --- navigator/navigator.css | 75 ++++++++++++++++++++++++++++++++++++++++ navigator/navigator.html | 9 +++-- navigator/navigator.js | 23 ++++++++++++ 3 files changed, 105 insertions(+), 2 deletions(-) diff --git a/navigator/navigator.css b/navigator/navigator.css index 0339a72..559f749 100644 --- a/navigator/navigator.css +++ b/navigator/navigator.css @@ -7,6 +7,10 @@ --selected: #fff; --toggle-light: #151515; --toggle-dark: #ccc; + --scrollbar-thumb: var(--border); + --scrollbar-bg: var(--navigation); + --scrollbar-color: var(--scrollbar-thumb) var(--scrollbar-bg); + --loading-bg-color: rgba(255, 255, 255, 0.5); } [data-theme="dark"] { @@ -16,8 +20,79 @@ --navigation: #151515; --font: #fff; --selected: #191a1b; + --scrollbar-thumb: var(--container); + --scrollbar-bg: var(--navigation); + --scrollbar-color: var(--scrollbar-thumb) var(--scrollbar-bg); + --loading-bg-color: rgba(33, 36, 39, 0.5); } +.pf-c-button:disabled[data-theme="dark"] { + background-color: var(--border); +} + +.nav-loader-container { + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; + background-color: var(--loading-bg-color); + z-index: 10; +} + +.nav-loader-centerer { + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 27%; + display: flex; + align-items: center; + align-content: center; +} + +.nav-loader { + margin: auto; + border: 6px solid rgba(0,0,0,0); + border-radius: 50%; + border-top: 6px solid var(--border); + width: 100px; + height: 100px; + -webkit-animation: spin 2s linear infinite; /* Safari */ + animation: spin 2s linear infinite; +} + +/* Safari */ +@-webkit-keyframes spin { + 0% { -webkit-transform: rotate(0deg); } + 100% { -webkit-transform: rotate(360deg); } +} + +@keyframes spin { + 0% { transform: rotate(0deg); } + 100% { transform: rotate(360deg); } +} + +body::-webkit-scrollbar { + width: 11px; +} + +body { + scrollbar-width: thin; + scrollbar-color: var(--scrollbar-color); +} + +body::-webkit-scrollbar-track { + background: var(--scrollbar-bg); +} + +body::-webkit-scrollbar-thumb { + background-color: var(--scrollbar-thumb) ; + border-radius: 6px; + border: 3px solid var(--scrollbar-bg); +} + + .flex-row { display: flex; flex-direction: row; diff --git a/navigator/navigator.html b/navigator/navigator.html index fc71317..4ad9451 100644 --- a/navigator/navigator.html +++ b/navigator/navigator.html @@ -30,6 +30,11 @@ +
@@ -61,9 +66,9 @@
- +
- +
diff --git a/navigator/navigator.js b/navigator/navigator.js index 998a8fe..4c4c7f8 100644 --- a/navigator/navigator.js +++ b/navigator/navigator.js @@ -227,6 +227,10 @@ class NavFile extends NavEntry { await proc; } async show_edit_file_contents() { + for (let button of document.getElementsByTagName("button")) { + if (!button.classList.contains("editor-btn")) + button.disabled = true; + } var proc_output = await cockpit.spawn(["file", "--mime-type", this.path_str()], {superuser: "try"}); var fields = proc_output.split(':'); var type = fields[1].trim(); @@ -251,6 +255,9 @@ class NavFile extends NavEntry { hide_edit_file_contents() { document.getElementById("nav-edit-contents-view").style.display = "none"; document.getElementById("nav-contents-view").style.display = "flex"; + for (let button of document.getElementsByTagName("button")) { + button.disabled = false; + } } } @@ -396,6 +403,7 @@ class NavWindow { } } async refresh() { + this.start_load(); var files = await this.pwd().get_children(this); while (this.entries.length) { var entry = this.entries.pop(); @@ -408,6 +416,7 @@ class NavWindow { document.getElementById("pwd").value = this.pwd().path_str(); this.set_selected(this.pwd()); this.show_selected_properties(); + this.stop_load(); } pwd() { return this.path_stack[this.path_stack_index]; @@ -611,6 +620,20 @@ class NavWindow { list.appendChild(option); }); } + start_load() { + document.getElementById("nav-loader-container").hidden = false; + var buttons = document.getElementsByTagName("button"); + for (let button of buttons) { + button.disabled = true; + } + } + stop_load() { + document.getElementById("nav-loader-container").hidden = true; + var buttons = document.getElementsByTagName("button"); + for (let button of buttons) { + button.disabled = false; + } + } } let nav_window = new NavWindow(); From 15dc03dcb47b6cf0d87e135d11a43ea8e53a0d56 Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Thu, 27 May 2021 15:21:49 -0300 Subject: [PATCH 10/22] add copyright disclaimer --- navigator/navigator.css | 18 ++++++++++++++++++ navigator/navigator.html | 12 ++++++------ navigator/navigator.js | 18 ++++++++++++++++++ 3 files changed, 42 insertions(+), 6 deletions(-) diff --git a/navigator/navigator.css b/navigator/navigator.css index 559f749..8d2922b 100644 --- a/navigator/navigator.css +++ b/navigator/navigator.css @@ -1,3 +1,21 @@ +/* + Cockpit Navigator - A filesystem browser for Cockpit. + Copyright (C) 2021 Josh Boudreau + Copyright (C) 2021 Sam Silver + + This file is part of Cockpit Navigator. + Cockpit Navigator is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + Cockpit Navigator is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with Cockpit Navigator. If not, see . + */ + :root { /* white style */ --container: #fff; diff --git a/navigator/navigator.html b/navigator/navigator.html index 4ad9451..11eb70d 100644 --- a/navigator/navigator.html +++ b/navigator/navigator.html @@ -1,20 +1,20 @@ - diff --git a/navigator/navigator.js b/navigator/navigator.js index 4c4c7f8..c9806f5 100644 --- a/navigator/navigator.js +++ b/navigator/navigator.js @@ -1,3 +1,21 @@ +/* + Cockpit Navigator - A filesystem browser for Cockpit. + Copyright (C) 2021 Josh Boudreau + Copyright (C) 2021 Sam Silver + + This file is part of Cockpit Navigator. + Cockpit Navigator is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + Cockpit Navigator is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with Cockpit Navigator. If not, see . + */ + function property_entry_html(/*string*/ key, /*string*/ value) { var html = '
'; html += '' + key + ''; From a3ee611894fbe16964a26b257bf21de57a3954db Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Thu, 27 May 2021 15:24:35 -0300 Subject: [PATCH 11/22] filesystem to File System --- README.md | 4 ++-- navigator/navigator.css | 2 +- navigator/navigator.html | 2 +- navigator/navigator.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 4a5ae36..0bef81f 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -# cockpit-navigator -File Browser for Cockpit +# Cockpit Navigator +A File System Browser for Cockpit. diff --git a/navigator/navigator.css b/navigator/navigator.css index 8d2922b..a9e6553 100644 --- a/navigator/navigator.css +++ b/navigator/navigator.css @@ -1,5 +1,5 @@ /* - Cockpit Navigator - A filesystem browser for Cockpit. + Cockpit Navigator - A File System Browser for Cockpit. Copyright (C) 2021 Josh Boudreau Copyright (C) 2021 Sam Silver diff --git a/navigator/navigator.html b/navigator/navigator.html index 11eb70d..58f86ff 100644 --- a/navigator/navigator.html +++ b/navigator/navigator.html @@ -1,6 +1,6 @@ From 65970ec074e2ddefae32c3c3d1304cda916c5b41 Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Thu, 27 May 2021 15:26:22 -0300 Subject: [PATCH 13/22] add copyright disclaimer --- makefile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/makefile b/makefile index a557e73..9db3e15 100644 --- a/makefile +++ b/makefile @@ -1,3 +1,18 @@ +# Cockpit Navigator - A File System Browser for Cockpit. +# Copyright (C) 2021 Josh Boudreau + +# This file is part of Cockpit Navigator. +# Cockpit Navigator is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# Cockpit Navigator is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# You should have received a copy of the GNU General Public License +# along with Cockpit Navigator. If not, see . + default: From db7d8f159eda9ede907caeb5a2b6013845dd78fe Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Thu, 27 May 2021 15:27:16 -0300 Subject: [PATCH 14/22] add copyright disclaimer --- navigator/scripts/ls.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/navigator/scripts/ls.py b/navigator/scripts/ls.py index ea96543..4c49b56 100755 --- a/navigator/scripts/ls.py +++ b/navigator/scripts/ls.py @@ -1,5 +1,22 @@ #!/usr/bin/env python3 +""" + Cockpit Navigator - A File System Browser for Cockpit. + Copyright (C) 2021 Josh Boudreau + + This file is part of Cockpit Navigator. + Cockpit Navigator is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + Cockpit Navigator is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with Cockpit Navigator. If not, see . +""" + import os from stat import S_ISDIR, filemode import json From e7f0736a7ad47e3cb445d4f3684a34a509e40aaf Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Thu, 27 May 2021 15:36:14 -0300 Subject: [PATCH 15/22] custom border on editor textarea --- navigator/navigator.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/navigator/navigator.css b/navigator/navigator.css index a9e6553..c987317 100644 --- a/navigator/navigator.css +++ b/navigator/navigator.css @@ -281,6 +281,10 @@ body::-webkit-scrollbar-thumb { white-space: pre; overflow: auto; resize: none; + border: 1px solid var(--border); + border-radius: 4px; + outline: none; + padding: 5px; } .nav-toggle { From 01d70fde47e418685984d8aff90058c7197ff9be Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Thu, 27 May 2021 15:36:35 -0300 Subject: [PATCH 16/22] disable navigation bar while editing file --- navigator/navigator.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/navigator/navigator.js b/navigator/navigator.js index c81669f..7d4e9dd 100644 --- a/navigator/navigator.js +++ b/navigator/navigator.js @@ -249,6 +249,7 @@ class NavFile extends NavEntry { if (!button.classList.contains("editor-btn")) button.disabled = true; } + document.getElementById("pwd").disabled = true; var proc_output = await cockpit.spawn(["file", "--mime-type", this.path_str()], {superuser: "try"}); var fields = proc_output.split(':'); var type = fields[1].trim(); @@ -276,6 +277,7 @@ class NavFile extends NavEntry { for (let button of document.getElementsByTagName("button")) { button.disabled = false; } + document.getElementById("pwd").disabled = false; } } From 72411a542da1c459696019609f65592b87152e2b Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Thu, 27 May 2021 16:04:43 -0300 Subject: [PATCH 17/22] style textarea and update button icons --- navigator/navigator.css | 4 ++++ navigator/navigator.html | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/navigator/navigator.css b/navigator/navigator.css index c987317..9202cd2 100644 --- a/navigator/navigator.css +++ b/navigator/navigator.css @@ -29,6 +29,7 @@ --scrollbar-bg: var(--navigation); --scrollbar-color: var(--scrollbar-thumb) var(--scrollbar-bg); --loading-bg-color: rgba(255, 255, 255, 0.5); + --textarea-bg: var(--navigation); } [data-theme="dark"] { @@ -42,6 +43,7 @@ --scrollbar-bg: var(--navigation); --scrollbar-color: var(--scrollbar-thumb) var(--scrollbar-bg); --loading-bg-color: rgba(33, 36, 39, 0.5); + --textarea-bg: var(--navigation); } .pf-c-button:disabled[data-theme="dark"] { @@ -285,6 +287,8 @@ body::-webkit-scrollbar-thumb { border-radius: 4px; outline: none; padding: 5px; + color: var(--font); + background-color: var(--textarea-bg); } .nav-toggle { diff --git a/navigator/navigator.html b/navigator/navigator.html index c6d20f5..a6ea1d3 100644 --- a/navigator/navigator.html +++ b/navigator/navigator.html @@ -79,7 +79,7 @@
- +
@@ -122,9 +122,9 @@
- +
- +
From fd1cbd101fb3de7f68e2c0edb2075a537ed6755a Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Thu, 27 May 2021 16:22:08 -0300 Subject: [PATCH 18/22] add footer and file/dir count --- navigator/navigator.css | 17 +++++++++++++---- navigator/navigator.html | 24 +++++++++++++++--------- navigator/navigator.js | 8 ++++++++ 3 files changed, 36 insertions(+), 13 deletions(-) diff --git a/navigator/navigator.css b/navigator/navigator.css index 9202cd2..05ccb1c 100644 --- a/navigator/navigator.css +++ b/navigator/navigator.css @@ -139,6 +139,10 @@ body::-webkit-scrollbar-thumb { margin-bottom: 1em; } +.spacer-stretchy { + flex-grow: 1; +} + .nav-hidden { display: none; } @@ -148,6 +152,7 @@ body::-webkit-scrollbar-thumb { background-color: var(--container); color: var(--font); padding: 1em; + padding-bottom: 0; } .navigation-bar { @@ -291,11 +296,15 @@ body::-webkit-scrollbar-thumb { background-color: var(--textarea-bg); } +.nav-footer { + flex: 1; + align-items: baseline; + justify-content: flex-start; + padding: 5px; +} + .nav-toggle { - position: absolute; - right: 0; - bottom: 1.5em; - margin-right: 1.9em; + justify-self: flex-end; } .switch { diff --git a/navigator/navigator.html b/navigator/navigator.html index a6ea1d3..637838d 100644 --- a/navigator/navigator.html +++ b/navigator/navigator.html @@ -127,15 +127,21 @@
-
-
- -
- -
+
+ +
+
+ 0 Directories, 0 Files +
+
+
+
+ +
+
diff --git a/navigator/navigator.js b/navigator/navigator.js index 7d4e9dd..416e490 100644 --- a/navigator/navigator.js +++ b/navigator/navigator.js @@ -423,6 +423,8 @@ class NavWindow { } } async refresh() { + var num_dirs = 0; + var num_files = 0; this.start_load(); var files = await this.pwd().get_children(this); while (this.entries.length) { @@ -430,12 +432,18 @@ class NavWindow { entry.destroy(); } files.forEach((file) => { + if (file.nav_type === "dir") + num_dirs++; + else + num_files++; file.show(); this.entries.push(file); }); document.getElementById("pwd").value = this.pwd().path_str(); this.set_selected(this.pwd()); this.show_selected_properties(); + document.getElementById("nav-num-dirs").innerText = num_dirs.toString(); + document.getElementById("nav-num-files").innerText = num_files.toString(); this.stop_load(); } pwd() { From fa75722d3a69fc80b1fd9b2bd54e528537a043cc Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Thu, 27 May 2021 16:22:43 -0300 Subject: [PATCH 19/22] default num dirs and files to "-" --- navigator/navigator.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/navigator/navigator.html b/navigator/navigator.html index 637838d..44a224e 100644 --- a/navigator/navigator.html +++ b/navigator/navigator.html @@ -131,7 +131,7 @@
- 0 Directories, 0 Files + - Directories, - Files
From 489644603b9580f5063b9b317c89fd106d32f245 Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Thu, 27 May 2021 16:46:54 -0300 Subject: [PATCH 20/22] add toggle for showing/hiding hidden files/dirs --- navigator/navigator.css | 8 +++++++- navigator/navigator.html | 11 +++++++++++ navigator/navigator.js | 17 ++++++++++++++++- 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/navigator/navigator.css b/navigator/navigator.css index 05ccb1c..fe5bd2b 100644 --- a/navigator/navigator.css +++ b/navigator/navigator.css @@ -299,10 +299,16 @@ body::-webkit-scrollbar-thumb { .nav-footer { flex: 1; align-items: baseline; - justify-content: flex-start; + justify-content: space-between; padding: 5px; } +/* .nav-footer > div > input[type="checkbox"] { + margin: 0; + position: relative; + bottom: -2px; +} */ + .nav-toggle { justify-self: flex-end; } diff --git a/navigator/navigator.html b/navigator/navigator.html index 44a224e..c4b86a7 100644 --- a/navigator/navigator.html +++ b/navigator/navigator.html @@ -134,6 +134,17 @@ - Directories, - Files
+
+
+ +
+ +
+
+
diff --git a/navigator/navigator.js b/navigator/navigator.js index 416e490..ee84630 100644 --- a/navigator/navigator.js +++ b/navigator/navigator.js @@ -109,6 +109,7 @@ class NavEntry { this.dom_element.appendChild(title); this.stat = stat; this.dom_element.addEventListener("click", this); + this.is_hidden_file = this.filename().startsWith('.'); } handleEvent(/*event*/ e) { switch (e.type) { @@ -425,6 +426,7 @@ class NavWindow { async refresh() { var num_dirs = 0; var num_files = 0; + var show_hidden = document.getElementById("nav-show-hidden").checked; this.start_load(); var files = await this.pwd().get_children(this); while (this.entries.length) { @@ -436,7 +438,8 @@ class NavWindow { num_dirs++; else num_files++; - file.show(); + if(!file.is_hidden_file || show_hidden) + file.show(); this.entries.push(file); }); document.getElementById("pwd").value = this.pwd().path_str(); @@ -662,6 +665,17 @@ class NavWindow { button.disabled = false; } } + toggle_show_hidden(e) { + var icon = document.getElementById("nav-show-hidden-icon"); + if (e.target.checked) { + icon.classList.remove("fa-low-vision"); + icon.classList.add("fa-eye"); + } else { + icon.classList.remove("fa-eye"); + icon.classList.add("fa-low-vision"); + } + this.refresh(); + } } let nav_window = new NavWindow(); @@ -685,6 +699,7 @@ function set_up_buttons() { document.getElementById("pwd").addEventListener("focus", nav_window.nav_bar_update_choices.bind(nav_window), false); document.getElementById("pwd").addEventListener("keydown", nav_window.nav_bar_event_handler.bind(nav_window)); document.getElementById("toggle-theme").addEventListener("change", switch_theme, false); + document.getElementById("nav-show-hidden").addEventListener("change", nav_window.toggle_show_hidden.bind(nav_window)); } async function main() { From 0f46f8b65d415652b8133e1ffbffe13f9e8db9fa Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Thu, 27 May 2021 16:48:52 -0300 Subject: [PATCH 21/22] move hidden files toggle closer to theme toggle --- navigator/navigator.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/navigator/navigator.html b/navigator/navigator.html index c4b86a7..998e02e 100644 --- a/navigator/navigator.html +++ b/navigator/navigator.html @@ -144,7 +144,7 @@
-
+
From 7d08fc73a1ece9b57c58f9dfd320890a6ad91a86 Mon Sep 17 00:00:00 2001 From: joshuaboud Date: Thu, 27 May 2021 17:22:55 -0300 Subject: [PATCH 22/22] add logo in footer with link to 45drives.com --- navigator/branding/logo-dark.svg | 74 +++++++++++++++++++++++++++++++ navigator/branding/logo-light.svg | 73 ++++++++++++++++++++++++++++++ navigator/navigator.css | 22 ++++++--- navigator/navigator.html | 4 ++ navigator/navigator.js | 7 +++ 5 files changed, 175 insertions(+), 5 deletions(-) create mode 100644 navigator/branding/logo-dark.svg create mode 100644 navigator/branding/logo-light.svg diff --git a/navigator/branding/logo-dark.svg b/navigator/branding/logo-dark.svg new file mode 100644 index 0000000..52ff1d2 --- /dev/null +++ b/navigator/branding/logo-dark.svg @@ -0,0 +1,74 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/navigator/branding/logo-light.svg b/navigator/branding/logo-light.svg new file mode 100644 index 0000000..ad5f8d7 --- /dev/null +++ b/navigator/branding/logo-light.svg @@ -0,0 +1,73 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/navigator/navigator.css b/navigator/navigator.css index fe5bd2b..5a830eb 100644 --- a/navigator/navigator.css +++ b/navigator/navigator.css @@ -30,6 +30,7 @@ --scrollbar-color: var(--scrollbar-thumb) var(--scrollbar-bg); --loading-bg-color: rgba(255, 255, 255, 0.5); --textarea-bg: var(--navigation); + --logo-45: #333; } [data-theme="dark"] { @@ -44,6 +45,7 @@ --scrollbar-color: var(--scrollbar-thumb) var(--scrollbar-bg); --loading-bg-color: rgba(33, 36, 39, 0.5); --textarea-bg: var(--navigation); + --logo-45: #fff; } .pf-c-button:disabled[data-theme="dark"] { @@ -303,11 +305,21 @@ body::-webkit-scrollbar-thumb { padding: 5px; } -/* .nav-footer > div > input[type="checkbox"] { - margin: 0; - position: relative; - bottom: -2px; -} */ +.nav-footer > a > img { + height: 1.25em; + width: auto; + margin-bottom: 4px; +} + +.nav-footer > a > .logo-45 { + font-weight: 900; + color: var(--logo-45); +} + +.nav-footer > a > .logo-drives { + font-weight: 600; + color: #981c20; +} .nav-toggle { justify-self: flex-end; diff --git a/navigator/navigator.html b/navigator/navigator.html index 998e02e..89c6cc2 100644 --- a/navigator/navigator.html +++ b/navigator/navigator.html @@ -134,6 +134,10 @@ - Directories, - Files
+ + 45Drives + +
diff --git a/navigator/navigator.js b/navigator/navigator.js index ee84630..feac31b 100644 --- a/navigator/navigator.js +++ b/navigator/navigator.js @@ -58,34 +58,41 @@ function set_last_theme_state() { var toggle_switch = document.getElementById("toggle-theme"); var state = localStorage.getItem("houston-theme-state"); var icon = document.getElementById("houston-theme-icon"); + var logo = document.getElementById("logo-45d"); if (state === "light") { toggle_switch.checked = false; document.documentElement.setAttribute("data-theme", "light"); icon.classList.remove("fa-moon"); icon.classList.add("fa-sun"); + logo.src = "branding/logo-light.svg"; } else if (state === "dark") { toggle_switch.checked = true; document.documentElement.setAttribute("data-theme", "dark"); icon.classList.remove("fa-sun"); icon.classList.add("fa-moon"); + logo.src = "branding/logo-dark.svg"; } else { toggle_switch.checked = false; state = "light"; localStorage.setItem("houston-theme-state", state); + logo.src = "branding/logo-light.svg"; } } function switch_theme(/*event*/ e) { var icon = document.getElementById("houston-theme-icon"); + var logo = document.getElementById("logo-45d"); var state = ""; if (e.target.checked) { state = "dark"; icon.classList.remove("fa-sun"); icon.classList.add("fa-moon"); + logo.src = "branding/logo-dark.svg"; } else { state = "light"; icon.classList.remove("fa-moon"); icon.classList.add("fa-sun"); + logo.src = "branding/logo-light.svg"; } document.documentElement.setAttribute("data-theme", state); localStorage.setItem("houston-theme-state", state);