Skip to content

Commit

Permalink
Merging DEV.
Browse files Browse the repository at this point in the history
  • Loading branch information
@rafaelthca
rafaelthca committed Dec 5, 2019
2 parents 2c06e68 + 49a6127 commit 03d2d79
Show file tree
Hide file tree
Showing 97 changed files with 2,542 additions and 650 deletions.
2 changes: 1 addition & 1 deletion .gitignore
View file
Expand Up @@ -15,4 +15,4 @@ omnidb_app/node_modules/
omnidb_app/omnidb-gui*
omnidb_app/package-lock.json
*.DS_Store

*.idea
2 changes: 1 addition & 1 deletion Dockerfile
View file
@@ -1,6 +1,6 @@
FROM debian:stable-slim

ENV OMNIDB_VERSION=2.16.0
ENV OMNIDB_VERSION=2.17.0
ENV SERVICE_USER=omnidb

WORKDIR /${SERVICE_USER}
Expand Down
4 changes: 2 additions & 2 deletions OmniDB/OmniDB/custom_settings.py
View file
@@ -1,7 +1,7 @@
import os

OMNIDB_VERSION = 'OmniDB 2.16.0'
OMNIDB_SHORT_VERSION = '2.16.0'
OMNIDB_VERSION = 'OmniDB 2.17.0'
OMNIDB_SHORT_VERSION = '2.17.0'
OMNIDB_ADDRESS = '127.0.0.1'
OMNIDB_WEBSOCKET_PORT = 25482
DEV_MODE = False
Expand Down
2 changes: 1 addition & 1 deletion ...OmniDB/migrations/omnidb_0.0.0_2.16.0.sql → ...OmniDB/migrations/omnidb_0.0.0_2.17.0.sql
View file
Expand Up @@ -631,4 +631,4 @@ CREATE TABLE version (
ver_id text not null,
constraint pk_versions primary key (ver_id)
);--omnidb--
INSERT INTO version VALUES('2.16.0');--omnidb--
INSERT INTO version VALUES('2.17.0');--omnidb--
1 change: 1 addition & 0 deletions OmniDB/OmniDB/migrations/omnidb_2.16.0_2.17.0.sql
View file
@@ -0,0 +1 @@
UPDATE version SET ver_id = '2.17.0';--omnidb--
3 changes: 2 additions & 1 deletion OmniDB/OmniDB/user_database.py
View file
Expand Up @@ -7,7 +7,7 @@
import OmniDB_app.include.OmniDatabase as OmniDatabase

migrations = {
'0.0.0': ('2.16.0', os.path.join(settings.BASE_DIR, 'OmniDB/migrations/omnidb_0.0.0_2.16.0.sql')),
'0.0.0': ('2.17.0', os.path.join(settings.BASE_DIR, 'OmniDB/migrations/omnidb_0.0.0_2.17.0.sql')),
'2.4.0': ('2.4.1', os.path.join(settings.BASE_DIR, 'OmniDB/migrations/omnidb_2.4.0_2.4.1.sql')),
'2.4.1': ('2.5.0', os.path.join(settings.BASE_DIR, 'OmniDB/migrations/omnidb_2.4.1_2.5.0.sql')),
'2.5.0': ('2.6.0', os.path.join(settings.BASE_DIR, 'OmniDB/migrations/omnidb_2.5.0_2.6.0.sql')),
Expand All @@ -23,6 +23,7 @@
'2.14.1': ('2.14.2', os.path.join(settings.BASE_DIR, 'OmniDB/migrations/omnidb_2.14.1_2.14.2.sql')),
'2.14.2': ('2.15.0', os.path.join(settings.BASE_DIR, 'OmniDB/migrations/omnidb_2.14.2_2.15.0.sql')),
'2.15.0': ('2.16.0', os.path.join(settings.BASE_DIR, 'OmniDB/migrations/omnidb_2.15.0_2.16.0.sql')),
'2.16.0': ('2.17.0', os.path.join(settings.BASE_DIR, 'OmniDB/migrations/omnidb_2.16.0_2.17.0.sql')),
}

def get_current_version(p_database):
Expand Down
6 changes: 5 additions & 1 deletion OmniDB/OmniDB/ws_core.py
View file
Expand Up @@ -292,7 +292,6 @@ def callback(self):
client.connect(hostname=v_conn_object['tunnel']['server'],username=v_conn_object['tunnel']['user'],key_filename=v_full_file_name,passphrase=v_conn_object['tunnel']['password'],port=int(v_conn_object['tunnel']['port']))
else:
client.connect(hostname=v_conn_object['tunnel']['server'],username=v_conn_object['tunnel']['user'],password=v_conn_object['tunnel']['password'],port=int(v_conn_object['tunnel']['port']))

tab_object['terminal_ssh_client'] = client
tab_object['terminal_object'] = custom_paramiko_expect.SSHClientInteraction(client,timeout=60, display=False)
tab_object['terminal_object'].send(v_data['v_cmd'])
Expand Down Expand Up @@ -1407,6 +1406,7 @@ def thread_terminal(self,args,ws_object):
v_tab_id = args['v_tab_id']
v_tab_object = args['v_tab_object']
v_terminal_object = v_tab_object['terminal_object']
v_terminal_ssh_client = v_tab_object['terminal_ssh_client']

while not self.cancel:
try:
Expand Down Expand Up @@ -1442,7 +1442,11 @@ def thread_terminal(self,args,ws_object):
else:
if not self.cancel:
ws_object.event_loop.add_callback(send_response_thread_safe,ws_object,json.dumps(v_response))

except Exception as exc:
transport = v_terminal_ssh_client.get_transport()
if transport == None or transport.is_active() == False:
break
if 'EOF' in str(exc):
break

Expand Down
992 changes: 982 additions & 10 deletions OmniDB/OmniDB_app/include/OmniDatabase/PostgreSQL.py
View file

Large diffs are not rendered by default.

23 changes: 18 additions & 5 deletions OmniDB/OmniDB_app/static/OmniDB_app/css/grid-icon.css
View file
@@ -1,13 +1,26 @@
/*
Copyright 2015-2017 The OmniDB Team
The MIT License (MIT)
This file is part of OmniDB.
Portions Copyright (c) 2015-2019, The OmniDB Team
Portions Copyright (c) 2017-2019, 2ndQuadrant Limited
OmniDB 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.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
OmniDB 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.
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
You should have received a copy of the GNU General Public License along with OmniDB. If not, see http://www.gnu.org/licenses/.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/

i.action-grid {
Expand Down
31 changes: 22 additions & 9 deletions OmniDB/OmniDB_app/static/OmniDB_app/css/interface-icon.css
View file
@@ -1,13 +1,26 @@
/*
Copyright 2015-2017 The OmniDB Team
This file is part of OmniDB.
OmniDB 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.
OmniDB 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 OmniDB. If not, see http://www.gnu.org/licenses/.
The MIT License (MIT)
Portions Copyright (c) 2015-2019, The OmniDB Team
Portions Copyright (c) 2017-2019, 2ndQuadrant Limited
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/

.fa-light {
Expand Down
136 changes: 116 additions & 20 deletions OmniDB/OmniDB_app/static/OmniDB_app/css/login.css
View file
@@ -1,50 +1,43 @@
html {
position: relative;
height: 100%;
height: 100vh;
}
body {
position: relative;
margin: 0px;
height: 100%;
height: 100vh;
font-family: monospace;
background-color: #F2F2F2;
}
#div_form {
position: absolute;
display: table;
top: 10%;
bottom: 10%;
right: 0;
left: 0;
width: 280px;
max-width: 100%;
margin: auto;
box-sizing: border-box;
background-color: #FFFFFF;
box-shadow: 5px 5px 8px rgba(0, 0, 0, 0.07);
border-radius: 3px;
display: flex;
align-items: center;
justify-content: center;

height: 100%;
}
#div_form .loginWrap {
display: inline-block;
padding: 10px;
width: 280px;
text-align: center;
background-color: #FFFFFF;
box-shadow: 5px 5px 8px rgba(0, 0, 0, 0.07);
border-radius: 3px;
box-sizing: border-box;
}
#div_form .div_time {
display: inline-block;
}
#div_form .version {
padding-right: 34px;
text-align: right;
color: #828282;
}
#div_form small {
display: inline-block:
}
#div_form .inputWrap {
position: relative;
display: block;
margin: 30px 0px;
margin: 20px 0px;
padding-top: 2px;
padding-bottom: 2px;
background-color: #FFFFFF;
Expand Down Expand Up @@ -91,7 +84,7 @@ body {
button {
display: inline-block;
padding: 6px 10px;
font-size: 22px;
font-size: 18px;
border: none;
color: #FFFFFF;
background-color: #839ec7;
Expand Down Expand Up @@ -155,3 +148,106 @@ body.loading .div_loading {
.isModal.isActive {
display: block;
}



/** ANIMATIONS **/
#div_form {
opacity: 0;

animation: fadeIn 0.3s linear forwards 0s;
}

#div_form .loginWrap-body {
height: 0px;
overflow: hidden;

animation: growInFromTop 0.4s linear forwards 1.4s;
}

#div_form .version,
#div_form .inputWrap,
#div_form button {
opacity: 0;

animation: fadeIn 0.6s linear forwards 1.8s;
}

#div_form .inputWrap {
overflow: hidden;
}
#div_form .inputWrap label {
transform: translateX(260px);

}
#user_title {
animation: slideInFromRight 0.45s ease forwards 2s;
}
#pwd_title {
animation: slideInFromRight 0.45s ease forwards 2.1s;
}

/* Animated Logo Omnidb styles */
#div_time .logo svg {
width: 220px;
}

.logo_omnidb path,
.logo_omnidb rect {
fill: transparent;
stroke: #818181;
stroke-width: 1px;

stroke-dasharray: 100;
stroke-dashoffset: 100;
}

.logo_omnidb_to-blue path,
.logo_omnidb_to-blue rect {
animation: svgDrawStrokes 1s linear forwards 0.3s,
svgToBlue 0.6s linear forwards 1.3s,
svgFadeStrokes 0.6s linear forwards 1.3s;
}

.logo_omnidb_to-darkblue path,
.logo_omnidb_to-darkblue rect {
animation: svgDrawStrokes 1s linear forwards 0.3s,
svgToDarkblue 0.6s linear forwards 1.3s,
svgFadeStrokes 0.6s linear forwards 1.3s;
}

@keyframes svgDrawStrokes {
to {
stroke-dashoffset: 0;
}
}
@keyframes svgFadeStrokes {
to {
stroke: transparent;
}
}
@keyframes svgToBlue {
to {
fill: #878FC6;
}
}
@keyframes svgToDarkblue {
to {
fill: #515579;
}
}
@keyframes fadeIn {
to {
opacity: 1;
}
}
@keyframes slideInFromRight {
to {
transform: translateX(0);
}
}
@keyframes growInFromTop {
to {
height: 187px;
}
}
31 changes: 22 additions & 9 deletions OmniDB/OmniDB_app/static/OmniDB_app/css/modern-style.css
View file
@@ -1,13 +1,26 @@
/*
Copyright 2015-2017 The OmniDB Team
This file is part of OmniDB.
OmniDB 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.
OmniDB 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 OmniDB. If not, see http://www.gnu.org/licenses/.
The MIT License (MIT)
Portions Copyright (c) 2015-2019, The OmniDB Team
Portions Copyright (c) 2017-2019, 2ndQuadrant Limited
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/

/* TYPOGRAPHY */
Expand Down
31 changes: 22 additions & 9 deletions OmniDB/OmniDB_app/static/OmniDB_app/css/node-icon.css
View file
@@ -1,13 +1,26 @@
/*
Copyright 2015-2017 The OmniDB Team
This file is part of OmniDB.
OmniDB 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.
OmniDB 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 OmniDB. If not, see http://www.gnu.org/licenses/.
The MIT License (MIT)
Portions Copyright (c) 2015-2019, The OmniDB Team
Portions Copyright (c) 2017-2019, 2ndQuadrant Limited
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
.node-all {
color: #22477d;
Expand Down

1 comment on commit 03d2d79

@thjack
Copy link

@thjack thjack commented on 03d2d79 Dec 6, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hola Rafael he pensado a usar omniDB y me agrada faltan algunas cosas pero supongo es porque estan en barman tengo algunos amigos en 2ndquadrant bueno te escribo por aqui para preguntarte si estas haciendo omniDb en multilenguaje si es asi me ofrezco de voluntario para traducir al español de paso que aprendo mas sobre postgres jeje solo que me digas donde cambiar que archivos y puedo ir haciendo los commits en este repositorio supongo soy Jose te escribo de Trujillo Perú

Please sign in to comment.