Skip to content

Commit 6d1c5b2

Browse files
committed
highlight record; URL links; sparse crosstables; alasql; babel vs jsx
- hlr option for tables to highlight certain records - fields starting with http(s) rendered as links automatically - sparse datasets rendered as crosstables with filled nulls - alasql: builtin in-memory SQL database. Allows to analyze csv,json,excel with no extra tools - building switched to babel instead of deprecated react-tools #54 - build scripts adjustments/cleanup
1 parent dd14ed2 commit 6d1c5b2

File tree

18 files changed

+402
-46
lines changed

18 files changed

+402
-46
lines changed

README.md

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -27,33 +27,16 @@ In order to run SQL Tabs from source code follow the next steps:
2727

2828
npm install electron-prebuilt@1.4.7 -g
2929

30-
3. Install React javascript extension the application is written with:
31-
32-
npm install -g react-tools
33-
34-
35-
4. Get the code, install dependencies and build the application:
30+
3. Get the code, install dependencies and build the application:
3631

3732
git clone https://github.com/sasha-alias/sqltabs
3833
cd sqltabs
3934
npm install
4035

41-
5. Run the application:
36+
4. Run the application:
4237

4338
electron .
4439

4540

46-
When you make changes in the source code under *src/* directory it's enough to rebuild only application with the command:
47-
48-
jsx src/ build/
49-
50-
During the development it's convenient to have launched in the separate session the following:
51-
52-
jsx --watch src/ build/
53-
54-
Thus you can skip a manual rebuild. The code will be rebuilt automatically on changes.
55-
56-
57-
Contributions are welcome.
58-
41+
Contribution and issues reports are very appreciated.
5942

css/tabs.bright.css

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,3 +92,18 @@
9292
.floating-cols-header {
9393
background: rgba(255, 255, 255, 0.9);
9494
}
95+
96+
/* sqldoc table records */
97+
.record-negative-hl{
98+
background-color: #d6481c;
99+
color: white;
100+
}
101+
.record-neutral-hl{
102+
background-color: #498a4a;
103+
color: white;
104+
}
105+
.record-positive-hl{
106+
background-color: #55a9f3;
107+
color: white;
108+
}
109+

css/tabs.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ body{
185185

186186
.table-resultset {
187187
width: auto;
188+
margin-left: 10px;
188189
}
189190

190191
.table-resultset td {

css/tabs.dark.css

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,3 +168,22 @@ table {
168168
background: rgba(40, 40, 40, 0.8);
169169
color: #ffffff;
170170
}
171+
172+
/* sqldoc table records */
173+
.record-negative-hl{
174+
background-color: #c74946;
175+
color: white;
176+
}
177+
.record-negative-hl:hover{
178+
background-color: red;
179+
color: white;
180+
}
181+
.record-neutral-hl{
182+
background-color: #319e31;
183+
color: white;
184+
}
185+
.record-positive-hl{
186+
background-color: #337ab7;
187+
color: white;
188+
}
189+

driver/libpq.5.dylib

-153 KB
Binary file not shown.

driver/libpq.so.5

-182 KB
Binary file not shown.

linux_build.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
#!/bin/bash
12
rm -rf .build
23
mkdir .build
3-
jsx src/ build/
4+
npm install
45
./minify.sh
56
cp index.html .build/
67
cp main.js .build/
@@ -11,7 +12,7 @@ cp -r css .build/
1112
cp -r node_modules .build/
1213

1314
cd .build
14-
electron-packager ./ "sqltabs" --platform=linux --arch=x64 --version=1.4.7 --icon logo.png --asar --prune
15+
electron-packager ./ "sqltabs" --platform=linux --arch=x64 --electron-version=1.4.7 --icon logo.png --asar --prune
1516
rm sqltabs-linux-x64/LICENSE
1617
rm sqltabs-linux-x64/version
1718
cp ../logo.png sqltabs-linux-x64/logo.png

mac_build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
rm -rf .build
33
mkdir .build
4-
jsx src/ build/
4+
npm install
55
./minify.sh
66
cp index.html .build/
77
cp main.js .build/

package.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"toolbar": false
1212
},
1313
"dependencies": {
14+
"alasql": "^0.3.7",
1415
"async": "^1.4.2",
1516
"bootstrap": "3.3.2",
1617
"brace": "^0.9.0",
@@ -31,14 +32,17 @@
3132
"react": "^0.13.0",
3233
"react-bootstrap": "^0.23.0",
3334
"request": "^2.60.0",
34-
"sqldoc": "^0.5.0",
35+
"sqldoc": "^0.6.0",
3536
"tunnel-ssh": "^4.0.0"
3637
},
3738
"devDependencies": {
39+
"babel-cli": "^6.23.0",
40+
"babel-plugin-transform-react-jsx": "^6.23.0",
3841
"electron-packager": "^8.5.1",
3942
"uglifyjs": "^2.4.10"
4043
},
4144
"scripts": {
42-
"postinstall": "rm -r node_modules/c3/node_modules; jsx src/ build/"
45+
"postinstall": "rm -r node_modules/c3/node_modules; babel --plugins transform-react-jsx --out-dir=build src/",
46+
"build-watch": "babel --plugins transform-react-jsx --out-dir=build src/ --watch"
4347
}
4448
}

package.sh

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)