Skip to content

Add support for vim keybindings #703

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mohamedelhefni wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Add support for vim keybindings #703

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
96aa096
feat: add support for vim keybindings
mohamedelhefni Jan 6, 2024
11aa604
lint: remove auto formatted code
mohamedelhefni Jan 20, 2024
5582b71
Merge branch 'master' into add-vim-mode
mohamedelhefni Mar 16, 2024
b202a3c
move cog button to top-right area of query input box
mohamedelhefni May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 44 additions & 13 deletions static/css/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@
content: ' ';
position: absolute;
bottom: -1px;
left: 0; right: 0;
left: 0;
right: 0;
height: 1px;
widows: 100%;
background: #fff;
Expand Down Expand Up @@ -227,7 +228,9 @@
}


#sidebar div.tables-list #tables, #sequences, #objects {
#sidebar div.tables-list #tables,
#sequences,
#objects {
font-size: 12px;
}

Expand Down Expand Up @@ -302,7 +305,8 @@
bottom: 0px;
}

#input_resize_handler:hover, #input_resize_handler.dragging {
#input_resize_handler:hover,
#input_resize_handler.dragging {
height: 3px;
}

Expand All @@ -311,6 +315,15 @@
padding: 10px;
height: 50px;
bottom: 0px;
display: flex;
align-items: center;
justify-content: space-between;
}

#input .actions .pull-left {
display: flex;
align-items: center;
gap: 2px;
}

#input .actions #result-rows-count {
Expand Down Expand Up @@ -487,12 +500,12 @@
border: 0px none;
}

#results tr:nth-child(even) > td {
#results tr:nth-child(even)>td {
border: none;
background: #ffffff;
}

#results tr:nth-child(odd) > td {
#results tr:nth-child(odd)>td {
border: none;
background: #f9f9f9;
}
Expand Down Expand Up @@ -717,7 +730,8 @@
display: none;
}

#edit_connection, #close_connection {
#edit_connection,
#close_connection {
background: #79589f;
color: #fff;
border-color: #fff;
Expand Down Expand Up @@ -807,11 +821,27 @@
/* -------------------------------------------------------------------------- */

.schema {}
.schema i { display: inline-block; margin-right: 4px; }
.schema i.fa-folder-o { display: inline-block; }
.schema i.fa-folder-open-o { display: none; }
.schema.expanded i.fa-folder-open-o { display: inline-block; }
.schema.expanded i.fa-folder-o { display: none; }

.schema i {
Comment thread
mohamedelhefni marked this conversation as resolved.
Outdated
display: inline-block;
margin-right: 4px;
}

.schema i.fa-folder-o {
display: inline-block;
}

.schema i.fa-folder-open-o {
display: none;
}

.schema.expanded i.fa-folder-open-o {
display: inline-block;
}

.schema.expanded i.fa-folder-o {
display: none;
}

.schema .schema-name {
font-weight: bold;
Expand Down Expand Up @@ -901,7 +931,8 @@
/* Ace Customizations */
/* -------------------------------------------------------------------------- */

.ace_gutter, .ace_gutter-cell {
.ace_gutter,
.ace_gutter-cell {
background: #fff !important;
color: #bbb;
font-size: 12px;
Expand All @@ -913,4 +944,4 @@

.ace_autocomplete .ace_active-line {
background: #eee !important;
}
}
48 changes: 31 additions & 17 deletions static/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,24 +77,38 @@
<div id="custom_query"></div>
</div>
<div class="actions">
<input type="button" id="run" value="Run Query" class="btn btn-sm btn-primary" />
<div id="explain-dropdown" class="btn-group left">
<button id="explain-dropdown-toggle" type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
Explain Query <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
<li><a href="#" id="explain">Explain Query</a></li>
<li><a href="#" id="analyze">Analyze Query</a></li>
</ul>
</div>
<div id="load-query-dropdown" class="btn-group left" style="display: none">
<button id="load-local-query" type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" disabled="disabled">
Template <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
</ul>
<div class="pull-left">
<input type="button" id="run" value="Run Query" class="btn btn-sm btn-primary" />
<div id="explain-dropdown" class="btn-group left">
<button id="explain-dropdown-toggle" type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
Explain Query <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
<li><a href="#" id="explain">Explain Query</a></li>
<li><a href="#" id="analyze">Analyze Query</a></li>
</ul>
</div>
<div class="editor-modes">
<div id="editor-dropdown" class="btn-group left">
<button id="editor-dropdown-toggle" type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-cog"></i>
</button>
<ul class="dropdown-menu" role="menu">
<li class="active" id="norm-mode"><a href="#" >Normal</a></li>
<li id="vim-mode"><a href="#" >Vim</a></li>
</ul>
</div>
</div>
<div id="load-query-dropdown" class="btn-group left" style="display: none">
<button id="load-local-query" type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" disabled="disabled">
Template <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
</ul>
</div>
<div id="query_progress">Please wait, query is executing...</div>
</div>
<div id="query_progress">Please wait, query is executing...</div>

<div class="pull-right">
<span id="result-rows-count"></span>
<input type="button" id="json" value="JSON" class="btn btn-sm btn-default" />
Expand Down
29 changes: 25 additions & 4 deletions static/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1002,6 +1002,7 @@ var objectAutocompleter = {

function initEditor() {
var writeQueryTimeout = null;
var lastSelectedMode = localStorage.getItem("editorMode") || null;

editor = ace.edit("custom_query");
editor.setOptions({
Expand All @@ -1016,14 +1017,15 @@ function initEditor() {
editor.getSession().setMode("ace/mode/pgsql");
editor.getSession().setTabSize(2);
editor.getSession().setUseSoftTabs(true);
editor.setKeyboardHandler(lastSelectedMode);

editor.commands.addCommands([{
name: "run_query",
bindKey: {
win: "Ctrl-Enter",
mac: "Command-Enter"
},
exec: function(editor) {
exec: function (editor) {
runQuery();
}
}, {
Expand All @@ -1032,17 +1034,17 @@ function initEditor() {
win: "Ctrl-E",
mac: "Command-E"
},
exec: function(editor) {
exec: function (editor) {
runExplain();
}
}]);

editor.on("change", function() {
editor.on("change", function () {
Comment thread
mohamedelhefni marked this conversation as resolved.
Outdated
if (writeQueryTimeout) {
clearTimeout(writeQueryTimeout);
}

writeQueryTimeout = setTimeout(function() {
writeQueryTimeout = setTimeout(function () {
localStorage.setItem("pgweb_query", editor.getValue());
}, 1000);
});
Expand All @@ -1052,6 +1054,25 @@ function initEditor() {
editor.setValue(query);
editor.clearSelection();
}

if(lastSelectedMode == "ace/keyboard/vim") {
$("#vim-mode").addClass("active");
$("#norm-mode").removeClass("active");
}

$("#vim-mode").click(function () {
editor.setKeyboardHandler("ace/keyboard/vim");
$("#vim-mode").addClass("active");
$("#norm-mode").removeClass("active");
localStorage.setItem("editorMode", "ace/keyboard/vim");
})

$("#norm-mode").click(function () {
editor.setKeyboardHandler(null);
$("#norm-mode").addClass("active");
$("#vim-mode").removeClass("active");
localStorage.setItem("editorMode", null);
})
}

function addShortcutTooltips() {
Expand Down
8 changes: 8 additions & 0 deletions static/js/keybinding-vim.js
View file
Open in desktop

Large diffs are not rendered by default.