add test for csv chunks #60

- Add csv to existing db #32
- [RFE] Simplify working with temporary tables #53

.eslintrc.js

@@ -12,13 +12,14 @@ module.exports = {
   },
   rules: {
     'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off'
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
+    'no-case-declarations': 'off'
   },
   overrides: [
     {
       files: [
         '**/__tests__/*.{j,t}s?(x)',
-        '**/tests/unit/**/*.spec.{j,t}s?(x)'
+        '**/tests/**/*.spec.{j,t}s?(x)'
       ],
       env: {
         mocha: true

.github/workflows/config.grenrc.js

@@ -0,0 +1,17 @@
+module.exports = {
+  dataSource: 'milestones',
+  ignoreIssuesWith: [
+    'wontfix',
+    'duplicate'
+  ],
+  milestoneMatch: 'v{{tag_name}}',
+  template: {
+    issue: '- {{name}} [{{text}}]({{url}})',
+    changelogTitle: "",
+    release: "{{body}}",
+  },
+  groupBy: {
+    'Enhancements': ["enhancement", "internal"],
+    'Bug fixes': ["bug"]
+  }
+}

.github/workflows/main.yml

@@ -25,16 +25,26 @@ jobs:
         cd dist
         zip -9 -r  dist.zip . -x "js/*.map"
 
+    - name: Create Release Notes
+      run: |
+        npm install github-release-notes@0.16.0 -g
+        gren changelog --generate  --config="/.github/workflows/config.grenrc.js"
+      env:
+        GREN_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
     - name: Create release
       uses: ncipollo/release-action@v1
       with:
         artifacts: "dist/dist.zip"
         token: ${{ secrets.GITHUB_TOKEN }}
+        bodyFile: "CHANGELOG.md"
 
     - name: Deploy 🚀
-      uses: JamesIves/github-pages-deploy-action@3.6.2
+      uses: JamesIves/github-pages-deploy-action@4.1.1
       with:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        token: ${{ secrets.GITHUB_TOKEN }}
-        BRANCH: build # The branch the action should deploy to.
+        branch: build # The branch the action should deploy to.
-        FOLDER: dist/ # The folder the action should deploy.
+        folder: dist/ # The folder the action should deploy.
-        CLEAN: false # Automatically remove deleted files from the deploy branch
+        clean: true # Automatically remove deleted files from the deploy branch
+        clean-exclude: .nojekyll
+

.github/workflows/test.yml

@@ -0,0 +1,31 @@
+name: Run tests
+on:
+  workflow_dispatch:
+  push:
+    branches:
+    - 'master'
+
+jobs:
+  test:
+    name: Run tests
+    runs-on: ubuntu-latest    
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js
+      uses: actions/setup-node@v1
+      with:
+        node-version: 10.x
+    - name: Install browsers
+      run: |
+        export DEBIAN_FRONTEND=noninteractive
+        sudo apt-get update
+        sudo apt-get install -y chromium-browser firefox
+
+    - name: Install the project
+      run: npm install
+
+    - name: Run lint
+      run: npm run lint
+
+    - name: Run karma tests
+      run: npm run test

.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 node_modules
 /dist
+/coverage
 
 # local env files
 .env.local

README.md

@@ -4,22 +4,38 @@
 
 # sqliteviz
 
-**Note: This is a work-in-progress project.**
+Sqliteviz is a single-page offline-first PWA for fully client-side visualisation of SQLite databases or CSV files.
 
-Sqliteviz is a single-page application for fully client-side visualisation of SQLite databases.
+With sqliteviz you can:
+- run SQL queries against a SQLite database and create [Plotly][11] charts based on the result sets
+- import a CSV file into a SQLite database and visualize imported data
+- manage queries and chart settings and run them against different databases
+- import/export queries and chart settings to/from a JSON file
+- export a modified SQLite database
+- use it offline from your OS application menu like any other desktop app
+
+https://user-images.githubusercontent.com/24638357/117355518-fa332680-aeb2-11eb-8a69-fbcea4f7aeb0.mp4
+
+## Quickstart
+The latest release of sqliteviz is deployed on GitHub Pages at [lana-k.github.io/sqliteviz][6].
+
+## Wiki
+For user documentation, check out sqliteviz [Wiki][7].
+
+## Motivation
 It's a kind of middleground between [Plotly Falcon][1] and [Redash][2].
-It is built on top of [react-chart-editor][3] and [sql.js][4] in [Vue.js][5]. 
 
-## Features
+## Components
-
+It is built on top of [react-chart-editor][3], [sql.js][4] and [Vue-Codemirror][8] in [Vue.js][5]. CSV parsing is performed with [Papa Parse][9].
-1. Ad-hoc and prepared visualisation of a SQLite database using flexibility
-   of SQL and richness of Plotly's `react-chart-editor` 
-2. Visualisation pallete, SQL and chart definitions, kept in local
-   storage with import/export
-3. Integration-side provided pallete
 
 [1]: https://github.com/plotly/falcon
 [2]: https://github.com/getredash/redash
 [3]: https://github.com/plotly/react-chart-editor
 [4]: https://github.com/sql-js/sql.js
 [5]: https://github.com/vuejs/vue
+[6]: https://lana-k.github.io/sqliteviz/
+[7]: https://github.com/lana-k/sqliteviz/wiki
+[8]: https://github.com/surmon-china/vue-codemirror#readme
+[9]: https://www.papaparse.com/
+[10]: https://github.com/lana-k/sqliteviz/wiki/Predefined-queries
+[11]: https://github.com/plotly/plotly.js

karma.conf.js

@@ -0,0 +1,198 @@
+// Karma configuration
+'use strict'
+const path = require('path')
+const VueLoaderPlugin = require('vue-loader/lib/plugin')
+
+function resolve (dir) {
+  return path.join(__dirname, dir)
+}
+
+module.exports = function (config) {
+  config.set({
+    // base path that will be used to resolve all patterns (eg. files, exclude)
+    basePath: '',
+
+    // frameworks to use
+    // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
+    frameworks: ['mocha', 'sinon-chai'],
+
+    // list of files / patterns to load in the browser
+    files: [
+      './karma.files.js',
+      {
+        pattern: 'node_modules/sql.js/dist/sql-wasm.wasm',
+        watched: false,
+        included: false,
+        served: true,
+        nocache: false
+      }
+    ],
+
+    // list of files / patterns to exclude
+    exclude: [],
+
+    // preprocess matching files before serving them to the browser
+    // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
+    preprocessors: {
+      './karma.files.js': ['webpack']
+    },
+
+    // test results reporter to use
+    // possible values: 'dots', 'progress'
+    // available reporters: https://npmjs.org/browse/keyword/karma-reporter
+    reporters: ['spec', 'coverage'],
+
+    coverageReporter: {
+      dir: 'coverage',
+      reporters: [{ type: 'lcov', subdir: '.' }, { type: 'text-summary' }]
+    },
+
+    // !!DONOT delete this reporter, or vue-cli-addon-ui-karma doesnot work
+    jsonResultReporter: {
+      outputFile: 'report/karma-result.json',
+      isSynchronous: true
+    },
+
+    junitReporter: {
+      outputDir: 'report', // results will be saved as $outputDir/$browserName.xml
+      outputFile: undefined, // if included, results will be saved as $outputDir/$browserName/$outputFile
+      suite: '', // suite will become the package name attribute in xml testsuite element
+      useBrowserName: true, // add browser name to report and classes names
+      nameFormatter: undefined, // function (browser, result) to customize the name attribute in xml testcase element
+      classNameFormatter: undefined, // function (browser, result) to customize the classname attribute in xml testcase element
+      properties: {} // key value pair of properties to add to the <properties> section of the report
+    },
+
+    // web server port
+    port: 9876,
+
+    // enable / disable colors in the output (reporters and logs)
+    colors: true,
+
+    // level of logging
+    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+    logLevel: config.LOG_INFO,
+
+    // enable / disable watching file and executing tests whenever any file changes
+    autoWatch: false,
+
+    customLaunchers: {
+      FirefoxHeadlessTouch: {
+        base: 'FirefoxHeadless',
+        prefs: {
+          'dom.w3c_touch_events.enabled': 1
+        }
+      }
+    },
+    // start these browsers
+    // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+    browsers: ['ChromiumHeadless', 'FirefoxHeadlessTouch'],
+
+    // Continuous Integration mode
+    // if true, Karma captures browsers, runs the tests and exits
+    singleRun: true,
+
+    // Concurrency level
+    // how many browser should be started simultaneous
+    concurrency: 2,
+
+    client: {
+      captureConsole: true,
+      mocha: {
+        timeout: 7000
+      }
+    },
+    browserConsoleLogOptions: {
+      terminal: true,
+      level: ''
+    },
+    webpack: {
+      mode: 'development',
+      entry: './src/main.js',
+      resolve: {
+        extensions: ['.js', '.vue', '.json'],
+        alias: {
+          vue$: 'vue/dist/vue.esm.js',
+          '@': resolve('src')
+        }
+      },
+      module: {
+        rules: [
+          {
+            test: /\.js$/,
+            exclude: /(node_modules|bower_components)/,
+            use: [
+              {
+                loader: 'babel-loader'
+              }
+            ]
+          },
+          {
+            test: /\.js$/,
+            include: /src/,
+            exclude: /(node_modules|bower_components|\.spec\.js$)/,
+            use: [
+              {
+                loader: 'istanbul-instrumenter-loader',
+                options: {
+                  esModules: true
+                }
+              }
+            ]
+          },
+          {
+            test: /worker\.js$/,
+            loader: 'worker-loader'
+          },
+          {
+            test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
+            loader: 'url-loader'
+          },
+          {
+            test: /\.vue$/,
+            loader: 'vue-loader',
+            options: {
+              loaders: {
+                js: 'babel-loader'
+              },
+              postLoaders: {
+                js: 'istanbul-instrumenter-loader?esModules=true'
+              }
+            }
+          },
+          {
+            test: /\.css$/,
+            use: ['vue-style-loader', 'css-loader']
+          },
+          {
+            test: /\.scss$/,
+            use: ['vue-style-loader', 'css-loader', 'sass-loader']
+          },
+          {
+            test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
+            loader: 'url-loader',
+            options: {
+              limit: 10000,
+              name: resolve('fonts/[name].[hash:7].[ext]')
+            }
+          }
+        ]
+      },
+      plugins: [new VueLoaderPlugin()],
+      node: {
+        fs: 'empty'
+      }
+    },
+    webpackMiddleware: {
+      watchOptions: {
+        ignored: /node_modules/
+      }
+    },
+    proxies: {
+      '/_karma_webpack_/sql-wasm.wasm': '/base/node_modules/sql.js/dist/sql-wasm.wasm',
+      '/base/sql-wasm.wasm': '/base/node_modules/sql.js/dist/sql-wasm.wasm'
+    }
+  })
+  // Fix the timezone
+  process.env.TZ = 'Europe/Amsterdam'
+}

karma.files.js

@@ -0,0 +1,21 @@
+import Vue from 'vue'
+import { VuePlugin } from 'vuera'
+import VModal from 'vue-js-modal'
+
+Vue.use(VuePlugin)
+Vue.use(VModal)
+Vue.config.productionTip = false
+
+// require all test files (files that ends with .spec.js)
+const testsContext = require.context('./tests', true, /\.spec.js$/)
+
+// Read more about why we need to call testContext:
+// https://www.npmjs.com/package/require-context#context-api
+testsContext.keys().forEach(testsContext)
+
+// require all src files except main.js and router/index.js for coverage.
+// you can also change this to match only the subset of files that
+// you want coverage for.
+// We don't include router/index.js to avoid installing VueRouter globally in tests
+const srcContext = require.context('./src', true, /^\.\/(?!(main|(router(\/)?(index)?))(\.js)?$)/)
+srcContext.keys().forEach(srcContext)

package.json

@@ -1,24 +1,25 @@
 {
   "name": "sqliteviz",
-  "version": "0.6.0",
+  "version": "0.13.0",
-  "license" : "Apache-2.0",
+  "license": "Apache-2.0",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "NODE_OPTIONS=--max_old_space_size=4096 vue-cli-service build",
-    "test:unit": "vue-cli-service test:unit",
+    "test": "vue-cli-service karma",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
     "codemirror": "^5.57.0",
     "core-js": "^3.6.5",
-    "debounce": "^1.2.0",
     "nanoid": "^3.1.12",
-    "plotly.js": "^1.57.1",
+    "papaparse": "^5.3.0",
+    "plotly.js": "^1.58.4",
+    "promise-worker": "^2.0.1",
     "react": "^16.13.1",
-    "react-chart-editor": "^0.42.0",
+    "react-chart-editor": "^0.45.0",
     "react-dom": "^16.13.1",
-    "sql.js": "^1.3.0",
+    "sql.js": "^1.5.0",
     "sqlite-parser": "^1.0.1",
     "vue": "^2.6.11",
     "vue-codemirror": "^4.0.6",
@@ -32,19 +33,25 @@
     "@vue/cli-plugin-babel": "^4.4.0",
     "@vue/cli-plugin-eslint": "^4.4.0",
     "@vue/cli-plugin-router": "^4.4.0",
-    "@vue/cli-plugin-unit-mocha": "^4.4.0",
     "@vue/cli-plugin-vuex": "^4.4.0",
     "@vue/cli-service": "^4.4.0",
     "@vue/eslint-config-standard": "^5.1.2",
-    "@vue/test-utils": "^1.0.3",
+    "@vue/test-utils": "^1.1.2",
     "babel-eslint": "^10.1.0",
     "chai": "^4.1.2",
+    "chai-as-promised": "^7.1.1",
     "eslint": "^6.7.2",
     "eslint-plugin-import": "^2.20.2",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.0",
     "eslint-plugin-vue": "^6.2.2",
-    "vue-template-compiler": "^2.6.11"
+    "karma": "^3.1.4",
+    "karma-firefox-launcher": "^2.1.0",
+    "karma-webpack": "^4.0.2",
+    "vue-cli-plugin-ui-karma": "^0.2.5",
+    "vue-template-compiler": "^2.6.11",
+    "workbox-webpack-plugin": "^6.1.5",
+    "worker-loader": "^3.0.8"
   }
 }

public/index.html

@@ -5,13 +5,94 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.png">
+    <link rel="manifest" href="<%= BASE_URL %>manifest.webmanifest">
     <title><%= htmlWebpackPlugin.options.title %></title>
+    <style>
+      #sqliteviz-loading-wrapper {
+        position: fixed;
+        width: 100%;
+        height: 100%;
+        left: 0;
+        top: 0;
+        background-color: white;
+      }
+    
+      #sqliteviz-loading-text {
+        display: block;
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+        color: #506784;
+        font-family: sans-serif;
+        font-size: 20px;
+      }
+      
+      #sqliteviz-loading-wrapper svg {
+        display: block;
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        transform: translate(-50%, -50%);
+      }
+
+      #sqliteviz-loading-wrapper circle {
+        position: absolute;
+        left: 0; right: 0; top: 0; bottom: 0;
+        fill: none;
+        stroke-width: 5px;
+        stroke-linecap: round;
+        stroke: #119DFF;
+      }
+
+      #sqliteviz-loading-wrapper circle.bg {
+        stroke: #C8D4E3;
+      }
+
+      #sqliteviz-loading-wrapper circle.front {
+        stroke-dasharray: 402px;
+        animation: sqliteviz-loading 2s linear 0s infinite;
+      }
+
+      @keyframes sqliteviz-loading {
+        0% {
+          stroke-dasharray: 100px 402px;
+          stroke-dashoffset: 0;
+        }
+        50% {
+          stroke-dasharray: 251px;
+          stroke-dashoffset: -251px;
+        }
+        100% {
+          stroke-dasharray: 100px 402px;
+          stroke-dashoffset: -502px;
+        }
+      }
+    </style>
   </head>
   <body>
     <noscript>
       <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
     </noscript>
-    <div id="app"></div>
+    <div id="app">
+      <div id="sqliteviz-loading-wrapper">
+        <div id="sqliteviz-loading-text">LOADING</div>
+        <svg height="170" width="170" viewBox="0 0 170 170">
+          <circle
+            class="bg"
+            cx="85"
+            cy="85"
+            r="80"
+          />
+          <circle
+            class="front"
+            cx="85"
+            cy="85"
+            r="80"
+          />
+        </svg>
+      </div>
+    </div>
     <!-- built files will be auto injected -->
   </body>
 </html>

public/manifest.webmanifest

@@ -0,0 +1,30 @@
+{
+  "background_color": "white",
+  "description": "Sqliteviz is a single-page application for fully client-side visualisation of SQLite databases or CSV.",
+  "display": "fullscreen",
+  "icons": [
+    {
+      "src": "favicon.png",
+      "sizes": "32x32",
+      "type": "image/png"
+    },
+    {
+      "src": "Logo48x48.png",
+      "sizes": "48x48",
+      "type": "image/png"
+    },
+    {
+      "src": "Logo192x192.png",
+      "sizes": "192x192",
+      "type": "image/png"
+    },
+    {
+      "src": "Logo512x512.png",
+      "sizes": "512x512",
+      "type": "image/png"
+    }
+  ],
+  "name": "sqliteviz",
+  "short_name": "sqliteviz",
+  "start_url": "index.html"
+}

public/queries.json

@@ -1,47 +1 @@
-{
+[]
-    "query": "select * from invoices",
-    "chart": {
-        "data": [
-            {
-                "type": "scatter",
-                "mode": "lines",
-                "x": null,
-                "xsrc": "InvoiceId",
-                "meta": {
-                    "columnNames": {
-                        "x": "InvoiceId",
-                        "y": "Total"
-                    }
-                },
-                "y": null,
-                "ysrc": "Total"
-            }
-        ],
-        "layout": {
-            "xaxis": {
-                "range": [
-                    1,
-                    412
-                ],
-                "autorange": true,
-                "type": "linear"
-            },
-            "yaxis": {
-                "range": [
-                    -0.39166666666666683,
-                    27.241666666666667
-                ],
-                "autorange": true,
-                "type": "linear"
-            },
-            "autosize": true,
-            "mapbox": {
-                "style": "open-street-map"
-            }
-        },
-        "frames": []
-    },
-    "name": "Invoices",
-    "id": "ieZfcITwDUTADwOmQlYyL",
-    "createdAt": "2020-11-03T14:17:49.524Z"
-}

src/App.vue

@@ -5,12 +5,62 @@
 </template>
 
 <style>
-#app, * {
+@font-face {
-  font-family: Open-Sans, Helvetica, Arial, sans-serif;
+  font-family: "Open Sans";
+  src: url("~@/assets/fonts/OpenSans-Regular.woff2");
+  font-weight: 400;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: "Open Sans";
+  src: url("~@/assets/fonts/OpenSans-SemiBold.woff2");
+  font-weight: 600;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: "Open Sans";
+  src: url("~@/assets/fonts/OpenSans-Bold.woff2");
+  font-weight: 700;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: "Open Sans";
+  src: url("~@/assets/fonts/OpenSans-Italic.woff2");
+  font-weight: 400;
+  font-style: italic;
+}
+
+@font-face {
+  font-family: "Open Sans";
+  src: url("~@/assets/fonts/OpenSans-SemiBoldItalic.woff2");
+  font-weight: 600;
+  font-style: italic;
+}
+
+@font-face {
+  font-family: "Open Sans";
+  src: url("~@/assets/fonts/OpenSans-BoldItalic.woff2");
+  font-weight: 700;
+  font-style: italic;
+}
+
+#app,
+input,
+label,
+button,
+.plotly_editor * {
+  font-family: "Open Sans", Helvetica, Arial, sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
+
 body {
   margin: 0;
 }
+.CodeMirror-hints {
+  z-index: 999 !important;
+}
 </style>

src/assets/images/body.svg

@@ -0,0 +1,9 @@
+<svg width="74" height="96" viewBox="0 0 74 96" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M42 4L28.8857 0C7.43729 16.4512 1.84318e-05 61.7961 0 96H74C71.7416 62.1085 57.5 24 42 4Z" fill="#C8D4E3"/>
+<mask id="mask0" mask-type="alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="74" height="96">
+<path d="M42 4L28.8857 0C7.43729 16.4512 1.84318e-05 61.7961 0 96H74C71.7416 62.1085 57.5 24 42 4Z" fill="#C8D4E3"/>
+</mask>
+<g mask="url(#mask0)">
+<path d="M32.0001 60.5C38.5001 73 63.5001 76.4999 73.4999 73C73.4999 73 75.7992 60.7994 75.5 60.5002C69.7339 54.7338 43.0003 57.9998 32.0001 60.5Z" fill="#A2B1C6"/>
+</g>
+</svg>

src/assets/images/bottom.svg

@@ -0,0 +1,32 @@
+<svg width="450" height="167" viewBox="0 0 450 167" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0" mask-type="alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="450" height="167">
+<rect width="450" height="167" fill="#C4C4C4"/>
+</mask>
+<g mask="url(#mask0)">
+<path d="M128.207 -169.007C70.1972 -180.849 18.745 -140.11 4.31985 -78.3322C-10.1054 -16.5539 14.3337 15.3318 37.3218 55.1891C72.3784 115.971 181.551 170.237 265.083 166.789C337.517 163.8 389.028 145.514 425.936 77.1107C489.378 -40.4679 417.444 -117.093 325.527 -102.745C214.571 -85.424 213.629 -151.57 128.207 -169.007Z" fill="#DFE8F3"/>
+<path d="M147.222 9.48716C147.222 6.72824 149.458 4.4917 152.217 4.4917H343.044C345.802 4.4917 348.039 6.72824 348.039 9.48715V122.384C348.039 125.143 345.802 127.38 343.044 127.38H152.217C149.458 127.38 147.222 125.143 147.222 122.384V9.48716Z" fill="white"/>
+<path d="M156.284 -1.57373C158.158 -3.44739 160.699 -4.5 163.349 -4.5H331.911C334.561 -4.5 337.102 -3.44739 338.976 -1.57373L346.041 5.49091H149.22L156.284 -1.57373Z" fill="#C8D4E3"/>
+<path d="M147.222 9.48715C147.222 6.72824 149.458 4.4917 152.217 4.4917H343.044C345.802 4.4917 348.039 6.72824 348.039 9.48715V27.4708H147.222V9.48715Z" fill="#A2B1C6"/>
+<path d="M254.939 67.9571C254.25 67.5335 253.597 67.0519 252.988 66.5174V57.6935H256.832V69.018C256.195 68.6869 255.564 68.3332 254.939 67.9571ZM262.341 63.5031H258.498V69.7253C259.752 70.309 261.035 70.8288 262.341 71.2829V63.5031ZM252.988 68.2855L252.737 68.0834C252.352 67.7635 251.992 67.4351 251.648 67.1068L242.53 66.0459L244.205 69.2959L255.927 70.2557C254.899 69.6758 253.916 69.0172 252.988 68.2855V68.2855ZM262.14 73.009C260.832 72.5793 259.549 72.0762 258.297 71.5018L257.828 71.2661L250.099 70.7525L251.406 73.4889L264.887 73.8004C263.966 73.5815 263.036 73.3121 262.14 73.009ZM246.097 57.6935C247.572 60.2875 249.327 62.7101 251.33 64.9176V56.1275L242.882 51.9429L242.128 61.7518L250.828 66.2395C248.547 63.8469 246.918 60.9036 246.097 57.6935V57.6935Z" fill="#119DFF"/>
+<path d="M210.738 84.2858C211.795 84.8763 212.858 85.1715 213.926 85.1715C214.815 85.1715 215.336 84.8557 215.49 84.2242C215.541 84.0085 215.567 83.7467 215.567 83.4386C215.567 83.1254 215.531 82.884 215.459 82.7146C215.387 82.54 215.266 82.4117 215.097 82.3295C214.927 82.2422 214.702 82.178 214.419 82.137C214.142 82.0959 213.788 82.0394 213.356 81.9675C212.925 81.8905 212.53 81.8058 212.17 81.7134C211.811 81.6209 211.505 81.4874 211.254 81.3129C210.72 80.938 210.463 80.3065 210.483 79.4182V79.2256C210.483 78.2912 210.792 77.6262 211.408 77.2309C212.003 76.8406 212.987 76.7071 214.358 76.8304C215.292 76.9176 216.037 77.0794 216.591 77.3156L216.229 78.4786C215.613 78.2167 214.874 78.0267 214.011 77.9086C213.744 77.8727 213.492 77.8547 213.256 77.8547C213.025 77.8547 212.815 77.8727 212.625 77.9086C212.435 77.9446 212.275 78.0113 212.147 78.1089C211.901 78.3091 211.772 78.6814 211.762 79.2256C211.747 79.8675 211.926 80.2757 212.301 80.4503C212.661 80.6197 213.087 80.7378 213.58 80.8045C214.073 80.8662 214.476 80.9226 214.789 80.974C215.102 81.0202 215.387 81.0844 215.644 81.1665C215.9 81.2487 216.121 81.3796 216.306 81.5593C216.691 81.9239 216.879 82.558 216.868 83.4617C216.843 85.038 216.185 85.9366 214.897 86.1574C214.506 86.2241 214.116 86.2575 213.726 86.2575C213.336 86.2575 212.976 86.2318 212.648 86.1805C212.324 86.1343 212.014 86.0675 211.716 85.9802C211.151 85.821 210.64 85.6105 210.183 85.3487L210.738 84.2858Z" fill="#2A3F5F"/>
+<path d="M225.779 85.2254C224.799 85.9135 223.762 86.2575 222.668 86.2575C221.389 86.2575 220.537 85.8031 220.111 84.8942C219.864 84.3808 219.721 83.7313 219.68 82.9457C219.664 82.5862 219.656 82.1909 219.656 81.7596C219.656 81.3231 219.659 80.8841 219.664 80.4425C219.674 80.001 219.708 79.5928 219.764 79.2179C219.821 78.8431 219.908 78.5068 220.026 78.209C220.149 77.9061 220.324 77.6493 220.55 77.4388C221.017 77.0024 221.736 76.7841 222.706 76.7841C223.682 76.7841 224.719 77.046 225.818 77.5697L225.941 76.9382H227.05L227.058 89.6078H225.779V85.2254ZM225.779 78.6326C224.855 78.1705 223.962 77.9394 223.099 77.9394C222.473 77.9394 222.059 77.9908 221.859 78.0935C221.659 78.1962 221.505 78.3297 221.397 78.494C221.294 78.6583 221.21 78.8842 221.143 79.1717C221.025 79.7109 220.966 80.5992 220.966 81.8366V82.006C220.966 83.1459 221.107 83.9443 221.389 84.4013C221.672 84.8686 222.188 85.1022 222.937 85.1022H223.053C223.762 85.1022 224.486 84.9071 225.225 84.5169C225.435 84.409 225.62 84.2986 225.779 84.1857V78.6326Z" fill="#2A3F5F"/>
+<path d="M230.701 73.0102L231.972 72.9024V86.1034H230.716L230.701 73.0102Z" fill="#2A3F5F"/>
+<path d="M236.608 74.7431C236.264 74.7431 236.044 74.6944 235.946 74.5968C235.792 74.4376 235.715 74.2194 235.715 73.9421C235.715 73.6597 235.73 73.4595 235.761 73.3414C235.797 73.2182 235.848 73.1232 235.915 73.0564C236.038 72.9332 236.226 72.8716 236.477 72.8716C236.734 72.8716 236.916 72.8844 237.024 72.9101C237.137 72.9358 237.23 72.9845 237.301 73.0564C237.425 73.1797 237.486 73.3825 237.486 73.6649C237.486 73.9421 237.471 74.1424 237.44 74.2656C237.414 74.3837 237.368 74.4787 237.301 74.5506C237.173 74.679 236.942 74.7431 236.608 74.7431ZM235.984 76.9382H237.248V86.1034H236L235.984 76.9382Z" fill="#2A3F5F"/>
+<path d="M245.473 85.6644C244.636 86.0598 243.864 86.2575 243.155 86.2575C241.871 86.2575 241.142 85.7081 240.968 84.6093C240.927 84.3474 240.906 83.9675 240.906 83.4694V78.0087H239.797V77.0614L240.906 76.9382L241.106 74.8433H242.177V76.9382H244.849V78.0087H242.177V83.4463C242.177 84.0778 242.223 84.4809 242.315 84.6555C242.485 84.9738 242.824 85.133 243.332 85.133C243.84 85.133 244.408 84.9764 245.034 84.6632L245.473 85.6644Z" fill="#2A3F5F"/>
+<path d="M254.715 85.6182C253.653 86.0444 252.479 86.2575 251.196 86.2575C250.451 86.2575 249.82 86.1805 249.301 86.0264C248.474 85.7902 247.925 85.3024 247.653 84.5631C247.401 83.8699 247.275 82.843 247.275 81.4823V81.0895C247.275 79.4618 247.614 78.3194 248.292 77.6622C248.903 77.0768 249.922 76.7841 251.35 76.7841C252.741 76.7841 253.691 77.1282 254.199 77.8162C254.446 78.1499 254.608 78.5556 254.685 79.0331C254.767 79.5055 254.808 79.9573 254.808 80.3886C254.808 81.0613 254.793 81.5824 254.762 81.9521C254.038 81.9829 253.388 81.9983 252.813 81.9983C252.813 81.9983 252.4 81.9983 251.573 81.9983C250.279 81.9983 249.283 81.9419 248.585 81.8289C248.585 83.0098 248.734 83.834 249.031 84.3012C249.396 84.8711 250.123 85.1561 251.211 85.1561C252.3 85.1561 253.342 84.943 254.338 84.5169L254.715 85.6182ZM253.506 80.9278V80.1884C253.506 79.3823 253.35 78.8072 253.036 78.4632C252.687 78.0781 252.084 77.8855 251.227 77.8855C250.2 77.8855 249.499 78.1089 249.124 78.5556C248.764 78.9818 248.585 79.7725 248.585 80.9278H253.506Z" fill="#2A3F5F"/>
+<path d="M256.957 76.9382H258.335L260.738 84.4167L260.969 85.1792L261.185 84.4167L263.48 76.9382H264.874L261.778 86.1034H260.099L256.957 76.9382Z" fill="#2A3F5F"/>
+<path d="M268.155 74.7431C267.811 74.7431 267.59 74.6944 267.493 74.5968C267.339 74.4376 267.262 74.2194 267.262 73.9421C267.262 73.6597 267.277 73.4595 267.308 73.3414C267.344 73.2182 267.395 73.1232 267.462 73.0564C267.585 72.9332 267.773 72.8716 268.024 72.8716C268.281 72.8716 268.463 72.8844 268.571 72.9101C268.684 72.9358 268.777 72.9845 268.848 73.0564C268.972 73.1797 269.033 73.3825 269.033 73.6649C269.033 73.9421 269.018 74.1424 268.987 74.2656C268.961 74.3837 268.915 74.4787 268.848 74.5506C268.72 74.679 268.489 74.7431 268.155 74.7431ZM267.531 76.9382H268.795V86.1034H267.547L267.531 76.9382Z" fill="#2A3F5F"/>
+<path d="M271.606 85.2331L276.296 78.001H271.506V76.9382H277.852V77.8085L273.177 85.0329H278.045V86.1034H271.606V85.2331Z" fill="#2A3F5F"/>
+<path d="M204.17 16.481C204.17 14.2739 205.959 12.4846 208.166 12.4846H336.05C338.257 12.4846 340.046 14.2739 340.046 16.481V16.481C340.046 18.6881 338.257 20.4773 336.05 20.4773H208.166C205.959 20.4773 204.17 18.6881 204.17 16.481V16.481Z" fill="#F3F6FA"/>
+<path d="M165.205 16.4808C165.205 19.2397 162.969 21.4763 160.21 21.4763C157.451 21.4763 155.214 19.2397 155.214 16.4808C155.214 13.7219 157.451 11.4854 160.21 11.4854C162.969 11.4854 165.205 13.7219 165.205 16.4808Z" fill="#C8D4E3"/>
+<path d="M181.191 16.4808C181.191 19.2397 178.954 21.4763 176.195 21.4763C173.436 21.4763 171.2 19.2397 171.2 16.4808C171.2 13.7219 173.436 11.4854 176.195 11.4854C178.954 11.4854 181.191 13.7219 181.191 16.4808Z" fill="#C8D4E3"/>
+<path d="M197.176 16.4808C197.176 19.2397 194.94 21.4763 192.181 21.4763C189.422 21.4763 187.186 19.2397 187.186 16.4808C187.186 13.7219 189.422 11.4854 192.181 11.4854C194.94 11.4854 197.176 13.7219 197.176 16.4808Z" fill="#C8D4E3"/>
+<path d="M174.099 -0.741535C174.283 -0.909843 174.524 -1.00317 174.773 -1.00317H318.49C318.739 -1.00317 318.98 -0.909843 319.164 -0.741533V-0.741533C319.837 -0.126316 319.402 0.995008 318.49 0.995008H174.773C173.861 0.995008 173.426 -0.126319 174.099 -0.741535V-0.741535Z" fill="#506784"/>
+<path d="M34.875 119.735L42.5465 126.136L30.3855 140.712L22.714 134.311L34.875 119.735Z" fill="#F3C6BF"/>
+<path d="M27.0972 129.257L34.7687 135.657C34.7687 135.657 38.808 141.112 39.3034 146.597C39.4941 148.708 37.0633 149.282 37.0633 149.282L21.3367 136.161L27.0972 129.257Z" fill="#506784"/>
+<path d="M52.8921 32.8145L92.2718 64.2858C104.874 96.2923 38.3209 133.723 38.3209 133.723L27.8556 126.058C27.8556 126.058 39.6888 108.526 50.8095 81.7699C56.8301 67.2843 54.5731 48.1488 52.8921 32.8145Z" fill="#0D76BF"/>
+<path d="M103.262 130.726H113.253V149.708H103.262V130.726Z" fill="#F3C6BF"/>
+<path d="M54.3067 42.3059C50.8101 35.8118 48.8117 31.3159 49.7739 17.8281H115.011C121.246 28.3186 125.242 54.2949 125.242 75.7754C125.242 97.2559 122.245 116.239 115.011 141.216H100.764C100.764 141.216 94.7701 101.252 92.2723 82.769C90.9679 73.116 57.0197 47.3445 54.3067 42.3059Z" fill="#119DFF"/>
+<path d="M103.262 144.426H113.253C113.253 144.426 119.849 146.027 123.744 149.921C125.242 151.42 123.744 153.418 123.744 153.418H103.262V144.426Z" fill="#506784"/>
+</g>
+</svg>

src/assets/images/checkbox_checked_disabled.svg

@@ -0,0 +1,17 @@
+<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.5" y="0.5" width="17" height="17" rx="2.5" fill="#DFE8F3" stroke="#C8D4E3"/>
+<g filter="url(#filter0_d)">
+<path d="M15.75 5.25L6.75 14.25L2.625 10.125L3.6825 9.0675L6.75 12.1275L14.6925 4.1925L15.75 5.25Z" fill="#A2B1C6"/>
+</g>
+<defs>
+<filter id="filter0_d" x="0.625" y="3.1925" width="17.125" height="14.0575" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/>
+<feOffset dy="1"/>
+<feGaussianBlur stdDeviation="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.164706 0 0 0 0 0.247059 0 0 0 0 0.372549 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/>
+</filter>
+</defs>
+</svg>

src/assets/images/error.svg

@@ -0,0 +1,5 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.99984 16.6667C6.32484 16.6667 3.33317 13.675 3.33317 10C3.33317 6.32502 6.32484 3.33335 9.99984 3.33335C13.6748 3.33335 16.6665 6.32502 16.6665 10C16.6665 13.675 13.6748 16.6667 9.99984 16.6667ZM9.99984 1.66669C8.90549 1.66669 7.82186 1.88224 6.81081 2.30102C5.79976 2.71981 4.8811 3.33364 4.10728 4.10746C2.54448 5.67027 1.6665 7.78988 1.6665 10C1.6665 12.2102 2.54448 14.3298 4.10728 15.8926C4.8811 16.6664 5.79976 17.2802 6.81081 17.699C7.82186 18.1178 8.90549 18.3334 9.99984 18.3334C12.21 18.3334 14.3296 17.4554 15.8924 15.8926C17.4552 14.3298 18.3332 12.2102 18.3332 10C18.3332 8.90567 18.1176 7.82204 17.6988 6.81099C17.28 5.79995 16.6662 4.88129 15.8924 4.10746C15.1186 3.33364 14.1999 2.71981 13.1889 2.30102C12.1778 1.88224 11.0942 1.66669 9.99984 1.66669Z" fill="#EF553B"/>
+<rect x="6.36768" y="7.54855" width="1.67" height="8.60363" transform="rotate(-45 6.36768 7.54855)" fill="#EF553B"/>
+<rect x="12.4517" y="6.36771" width="1.67" height="8.60363" transform="rotate(45 12.4517 6.36771)" fill="#EF553B"/>
+</svg>

src/assets/images/leftArm.svg

@@ -0,0 +1,4 @@
+<svg width="114" height="90" viewBox="0 0 114 90" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M96.3828 1.93895C91.4244 0.092814 86.6022 5.62505 85.858 10.6816L97.2851 15.549C100.194 10.5856 101.341 3.78508 96.3828 1.93895Z" fill="#F3C6BF"/>
+<path d="M84.9775 9.12413C75.0653 35.2035 30.7179 46.7359 21.4106 37.7265L14.5359 79.4857C67.7607 86.4912 91.9264 55.4111 99.0973 14.7138L84.9775 9.12413Z" fill="#A2B1C6"/>
+</svg>

src/assets/images/rightArm.svg

@@ -0,0 +1,4 @@
+<svg width="106" height="56" viewBox="0 0 106 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M104.252 1.40855C100.262 -2.0494 93.7773 1.40854 91.2832 5.85426L100.262 14.3939C104.751 10.7941 108.243 4.86646 104.252 1.40855Z" fill="#F3C6BF"/>
+<path d="M91.0123 4.37207C72.4568 25.1704 30.4279 22.9263 19.9527 4.37207L0 44.6615C38.409 69.8547 86.7944 50.0954 102.258 14.5286L91.0123 4.37207Z" fill="#C8D4E3"/>
+</svg>

src/assets/images/success.svg

@@ -0,0 +1,5 @@
+<svg width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.4998 16.6667C6.82484 16.6667 3.83317 13.675 3.83317 10C3.83317 6.32502 6.82484 3.33335 10.4998 3.33335C14.1748 3.33335 17.1665 6.32502 17.1665 10C17.1665 13.675 14.1748 16.6667 10.4998 16.6667ZM10.4998 1.66669C9.40549 1.66669 8.32186 1.88224 7.31081 2.30102C6.29976 2.71981 5.3811 3.33364 4.60728 4.10746C3.04448 5.67027 2.1665 7.78988 2.1665 10C2.1665 12.2102 3.04448 14.3298 4.60728 15.8926C5.3811 16.6664 6.29976 17.2802 7.31081 17.699C8.32186 18.1178 9.40549 18.3334 10.4998 18.3334C12.71 18.3334 14.8296 17.4554 16.3924 15.8926C17.9552 14.3298 18.8332 12.2102 18.8332 10C18.8332 8.90567 18.6176 7.82204 18.1988 6.81099C17.78 5.79995 17.1662 4.88129 16.3924 4.10746C15.6186 3.33364 14.6999 2.71981 13.6889 2.30102C12.6778 1.88224 11.5942 1.66669 10.4998 1.66669Z" fill="#00CC96"/>
+<rect x="6.09717" y="10.2771" width="1.67" height="4.345" transform="rotate(-45 6.09717 10.2771)" fill="#00CC96"/>
+<rect x="13.752" y="6.97589" width="1.67" height="7.74359" transform="rotate(45 13.752 6.97589)" fill="#00CC96"/>
+</svg>

src/assets/images/top.svg

@@ -0,0 +1,14 @@
+<svg width="450" height="175" viewBox="0 0 450 175" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0" mask-type="alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="450" height="175">
+<rect width="450" height="175" fill="#C4C4C4"/>
+</mask>
+<g mask="url(#mask0)">
+<path d="M128.207 1.99272C70.1972 -9.84897 18.745 30.8895 4.31985 92.6678C-10.1054 154.446 14.3337 186.332 37.3218 226.189C72.3784 286.971 181.551 341.237 265.083 337.789C337.517 334.8 389.028 316.514 425.936 248.111C489.378 130.532 417.444 53.9065 325.527 68.2551C214.571 85.576 213.629 19.4302 128.207 1.99272Z" fill="#DFE8F3"/>
+<path d="M156.284 169.426C158.158 167.553 160.699 166.5 163.349 166.5H331.911C334.561 166.5 337.102 167.553 338.976 169.426L346.041 176.491H149.22L156.284 169.426Z" fill="#C8D4E3"/>
+<path d="M174.099 170.258C174.283 170.09 174.524 169.997 174.773 169.997H318.49C318.739 169.997 318.98 170.09 319.164 170.258V170.258C319.837 170.874 319.402 171.995 318.49 171.995H174.773C173.861 171.995 173.426 170.874 174.099 170.258V170.258Z" fill="#506784"/>
+<path d="M94.227 87.881C94.3962 80.1988 92.5048 65.0608 83.5857 65.9664C83.5857 65.9664 70.5776 76.0877 75.6391 83.6188C80.7005 91.1498 93.4677 94.5083 94.227 87.881Z" fill="#F3C6BF"/>
+<path d="M89.275 91.3105L88 98C85.5023 99.4986 76.5531 99.0196 74.5 95C74.5 95 76.8298 89.9135 77.8446 84.9226L89.275 91.3105Z" fill="#F3C6BF"/>
+<path d="M92.2719 67.1161C92.2719 72.7689 84.2242 68.8872 82.3423 72.9126C80.4605 76.9379 77.3952 86.9208 77.3952 86.9208C72.6323 84.7414 66.7273 69.33 73.2936 65.1034C79.3506 61.2047 92.2719 63.0102 92.2719 67.1161Z" fill="#506784"/>
+<path d="M79.7654 83.9628C75.1522 80.7269 76.371 75.1343 79.7562 76.9534C85.1994 79.8785 81.2934 82.9808 79.7654 83.9628Z" fill="#F3C6BF"/>
+</g>
+</svg>

src/assets/styles/buttons.css

@@ -27,14 +27,6 @@ button.primary:hover {
   text-shadow: var(--shadow);
 }
 
-button.primary:disabled {
-  background: var(--color-bg-light-2);
-  border: 1px solid var(--color-border);
-  color: var(--color-text-light-2);
-  text-shadow: none;
-  cursor: default;
-}
-
 button.secondary {
   background: white;
   border: 1px solid var(--color-border);
@@ -59,5 +51,13 @@ button.toolbar:hover {
   color: var(--color-accent);
 }
 
+button.primary:disabled,
+button.secondary:disabled {
+  background: var(--color-bg-light-2);
+  border: 1px solid var(--color-border);
+  color: var(--color-text-light-2);
+  text-shadow: none;
+  cursor: default;
+}
 
 

src/assets/styles/tables.css

@@ -1,5 +1,5 @@
 .rounded-bg {
-  padding: 40px 5px 5px;
+  padding: 35px 5px 5px;
   background-color: white;
   border-radius: 5px;
   position: relative;
@@ -36,7 +36,7 @@
 }
 table {
   min-width: 100%;
-  margin-top: -40px;
+  margin-top: -35px;
   border-collapse: collapse;
 }
 thead th, .fixed-header {
@@ -56,7 +56,7 @@ tbody td {
   border-right: 1px solid var(--color-border-light);
 }
 td, th, .fixed-header {
-  padding: 12px 24px;
+  padding: 8px 24px;
   white-space: nowrap;
 }
 

src/assets/styles/tooltips.css

@@ -1,13 +1,11 @@
 .icon-tooltip {
-  visibility: hidden;
   background-color: rgba(80, 103, 132, 0.85);
   color: #fff;
   text-align: center;
-  font-size: 11px;
+  font-size: 12px;
   padding: 0 6px;
   line-height: 19px;;
   position: fixed;
-  z-index: 5;
   height: 19px;
   border-radius: var(--border-radius-medium);
   white-space: nowrap;

src/assets/styles/variables.css

@@ -20,6 +20,7 @@
   --color-bg-light-3: var(--color-gray-light-5);
   --color-bg-dark: var(--color-gray-dark);
   --color-bg-warning: var(--color-yellow);
+  --color-danger: var(--color-red);
   --color-accent: var(--color-blue-medium);
   --color-accent-shade: var(--color-blue-dark);
   --color-border-light: var(--color-gray-light-2);
@@ -39,5 +40,9 @@
   --border-radius-small: 2px;
 }
 
+.plotly-editor--theme-provider {
+  --sidebar-width: 112px;
+}
+
 
 

src/components/CheckBox.vue

@@ -1,20 +1,26 @@
 <template>
-  <div class="checkbox-container" @click.stop="onClick">
+  <div
+    :class="['checkbox-container', { 'checked': checked }, {'disabled': disabled}]"
+    @click.stop="onClick"
+  >
     <div v-show="!checked" class="unchecked" />
     <img
-      v-show="checked && theme === 'accent'"
+      v-show="checked && !disabled"
-      :src="require('@/assets/images/checkbox_checked.svg')"
+      :src="theme === 'light'
+        ? require('@/assets/images/checkbox_checked_light.svg')
+        : require('@/assets/images/checkbox_checked.svg')"
     />
     <img
-      v-show="checked && theme === 'light'"
+      v-show="checked && disabled"
-      :src="require('@/assets/images/checkbox_checked_light.svg')"
+      :src="require('@/assets/images/checkbox_checked_disabled.svg')"
     />
+    <span v-if="label" class="label">{{ label }}</span>
   </div>
 </template>
 
 <script>
 export default {
-  name: 'checkBox',
+  name: 'CheckBox',
   props: {
     theme: {
       type: String,
@@ -28,6 +34,16 @@ export default {
       type: Boolean,
       required: false,
       default: false
+    },
+    label: {
+      type: String,
+      required: false,
+      default: ''
+    },
+    disabled: {
+      type: Boolean,
+      required: false,
+      default: false
     }
   },
   data () {
@@ -37,8 +53,10 @@ export default {
   },
   methods: {
     onClick () {
-      this.checked = !this.checked
+      if (!this.disabled) {
-      this.$emit('click', this.checked)
+        this.checked = !this.checked
+        this.$emit('click', this.checked)
+      }
     }
   }
 }
@@ -46,7 +64,7 @@ export default {
 
 <style scoped>
 .checkbox-container {
-  display: inline-block;
+  display: inline-flex;
   cursor: pointer;
 }
 .unchecked {
@@ -64,4 +82,24 @@ export default {
 img {
     display: block;
 }
+.label {
+  margin-left: 6px;
+  color: var(--color-text-base);
+}
+.checked .label {
+  color: var(--color-text-active);
+}
+
+.disabled.checkbox-container {
+  cursor: default;
+}
+
+.disabled .label {
+  color: var(--color-text-light-2);
+}
+
+.disabled .unchecked,
+.disabled .unchecked:hover {
+  background-color:  var(--color-bg-light-2);
+}
 </style>

src/components/CsvImport/DelimiterSelector/ascii.js

@@ -0,0 +1,130 @@
+export default {
+  0: { name: 'null character' },
+  1: { name: 'start of header' },
+  2: { name: 'start of text' },
+  3: { name: 'end of text' },
+  4: { name: 'end of transmission' },
+  5: { name: 'enquiry' },
+  6: { name: 'acknowledge' },
+  7: { name: 'bell (ring)' },
+  8: { name: 'backspace' },
+  9: { name: 'horizontal tab' },
+  10: { name: 'line feed' },
+  11: { name: 'vertical tab' },
+  12: { name: 'form feed' },
+  13: { name: 'carriage return' },
+  14: { name: 'shift out' },
+  15: { name: 'shift in' },
+  16: { name: 'data link escape' },
+  17: { name: 'device control 1' },
+  18: { name: 'device control 2' },
+  19: { name: 'device control 3' },
+  20: { name: 'device control 4' },
+  21: { name: 'negative acknowledge' },
+  22: { name: 'synchronize' },
+  23: { name: 'end transmission block' },
+  24: { name: 'cancel' },
+  25: { name: 'end of medium' },
+  26: { name: 'substitute' },
+  27: { name: 'escape' },
+  28: { name: 'file separator' },
+  29: { name: 'group separator' },
+  30: { name: 'record separator' },
+  31: { name: 'unit separator' },
+  32: { name: 'space' },
+  33: { name: 'exclamation mark' },
+  34: { name: 'quotation mark' },
+  35: { name: 'number sign' },
+  36: { name: 'dollar sign' },
+  37: { name: 'percent sign' },
+  38: { name: 'ampersand' },
+  39: { name: 'apostrophe' },
+  40: { name: 'left parenthesis' },
+  41: { name: 'right parenthesis' },
+  42: { name: 'asterisk' },
+  43: { name: 'plus sign' },
+  44: { name: 'comma' },
+  45: { name: 'hyphen' },
+  46: { name: 'period' },
+  47: { name: 'slash' },
+  48: { name: 'digit 0' },
+  49: { name: 'digit 1' },
+  50: { name: 'digit 2' },
+  51: { name: 'digit 3' },
+  52: { name: 'digit 4' },
+  53: { name: 'digit 5' },
+  54: { name: 'digit 6' },
+  55: { name: 'digit 7' },
+  56: { name: 'digit 8' },
+  57: { name: 'digit 9' },
+  58: { name: 'colon' },
+  59: { name: 'semicolon' },
+  60: { name: 'less-than' },
+  61: { name: 'equals-to' },
+  62: { name: 'greater-than' },
+  63: { name: 'question mark' },
+  64: { name: 'at sign' },
+  65: { name: 'uppercase A' },
+  66: { name: 'uppercase B' },
+  67: { name: 'uppercase C' },
+  68: { name: 'uppercase D' },
+  69: { name: 'uppercase E' },
+  70: { name: 'uppercase F' },
+  71: { name: 'uppercase G' },
+  72: { name: 'uppercase H' },
+  73: { name: 'uppercase I' },
+  74: { name: 'uppercase J' },
+  75: { name: 'uppercase K' },
+  76: { name: 'uppercase L' },
+  77: { name: 'uppercase M' },
+  78: { name: 'uppercase N' },
+  79: { name: 'uppercase O' },
+  80: { name: 'uppercase P' },
+  81: { name: 'uppercase Q' },
+  82: { name: 'uppercase R' },
+  83: { name: 'uppercase S' },
+  84: { name: 'uppercase T' },
+  85: { name: 'uppercase U' },
+  86: { name: 'uppercase V' },
+  87: { name: 'uppercase W' },
+  88: { name: 'uppercase X' },
+  89: { name: 'uppercase Y' },
+  90: { name: 'uppercase Z' },
+  91: { name: 'left square bracket' },
+  92: { name: 'backslash' },
+  93: { name: 'right square bracket' },
+  94: { name: 'caret' },
+  95: { name: 'underscore' },
+  96: { name: 'grave accent' },
+  97: { name: 'lowercase a' },
+  98: { name: 'lowercase b' },
+  99: { name: 'lowercase c' },
+  100: { name: 'lowercase d' },
+  101: { name: 'lowercase e' },
+  102: { name: 'lowercase f' },
+  103: { name: 'lowercase g' },
+  104: { name: 'lowercase h' },
+  105: { name: 'lowercase i' },
+  106: { name: 'lowercase j' },
+  107: { name: 'lowercase k' },
+  108: { name: 'lowercase l' },
+  109: { name: 'lowercase m' },
+  110: { name: 'lowercase n' },
+  111: { name: 'lowercase o' },
+  112: { name: 'lowercase p' },
+  113: { name: 'lowercase q' },
+  114: { name: 'lowercase r' },
+  115: { name: 'lowercase s' },
+  116: { name: 'lowercase t' },
+  117: { name: 'lowercase u' },
+  118: { name: 'lowercase v' },
+  119: { name: 'lowercase w' },
+  120: { name: 'lowercase x' },
+  121: { name: 'lowercase y' },
+  122: { name: 'lowercase z' },
+  123: { name: 'left curly brace' },
+  124: { name: 'vertical bar' },
+  125: { name: 'right curly brace' },
+  126: { name: 'tilde' },
+  127: { name: 'delete (rubout)' }
+}

src/components/CsvImport/DelimiterSelector/index.vue

@@ -0,0 +1,204 @@
+<template>
+  <div :class="{ 'disabled': disabled }">
+    <div class="text-field-label">Delimiter</div>
+    <div
+      class="delimiter-selector-container"
+      :style="{ width: width }"
+      @click="onContainerClick"
+    >
+      <div class="value">
+        <input
+          :class="{ 'filled': filled }"
+          ref="delimiterInput"
+          type="text"
+          maxlength="1"
+          v-model="inputValue"
+          @click.stop
+          :disabled="disabled"
+        />
+        <div class="name">{{ getSymbolName(value) }}</div>
+      </div>
+      <div class="controls" @click.stop>
+        <clear-icon @click.native="clear" :disabled="disabled"/>
+        <drop-down-chevron
+          :disabled="disabled"
+          @click.native="!disabled && (showOptions = !showOptions)"
+        />
+      </div>
+    </div>
+    <div v-show="showOptions" class="options" :style="{ width: width }">
+      <div
+        v-for="(option, index) in options"
+        :key="index"
+        @click="chooseOption(option)"
+        class="option"
+      >
+        <pre>{{option}}</pre><div>{{ getSymbolName(option) }}</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import ascii from './ascii'
+import DropDownChevron from '@/components/svg/dropDownChevron'
+import ClearIcon from '@/components/svg/clear'
+
+export default {
+  name: 'DelimiterSelector',
+  props: ['value', 'width', 'disabled'],
+  components: { DropDownChevron, ClearIcon },
+  data () {
+    return {
+      showOptions: false,
+      options: [',', '\t', ' ', '|', ';', '\u001F', '\u001E'],
+      filled: false,
+      inputValue: ''
+    }
+  },
+  watch: {
+    inputValue () {
+      if (this.inputValue) {
+        this.filled = true
+        if (this.inputValue !== this.value) {
+          this.$emit('input', this.inputValue)
+        }
+      } else {
+        this.filled = false
+      }
+    }
+  },
+  created () {
+    this.inputValue = this.value
+  },
+  methods: {
+    getSymbolName (str) {
+      if (!str) {
+        return ''
+      }
+      return ascii[str.charCodeAt(0).toString()].name
+    },
+    chooseOption (option) {
+      this.inputValue = option
+      this.showOptions = false
+    },
+    onContainerClick (event) {
+      this.$refs.delimiterInput.focus()
+    },
+
+    clear () {
+      if (!this.disabled) {
+        this.inputValue = ''
+        this.$refs.delimiterInput.focus()
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.delimiter-selector-container {
+  background: var(--color-white);
+  border: 1px solid var(--color-border);
+  border-radius: var(--border-radius-medium-2);
+  height: 36px;
+  padding: 0 8px;
+  font-size: 12px;
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.value {
+  display: flex;
+  align-items: center;
+}
+
+.value .name {
+  color: var(--color-text-light-2);
+  cursor: default;
+  margin-left: 4px;
+}
+
+.controls {
+  display: flex;
+  align-items: center;
+}
+
+.options {
+  background: var(--color-white);
+  border: 1px solid var(--color-border);
+  border-width: 0 1px 1px 1px;
+  color: var(--color-text-base);
+  border-radius: var(--border-radius-medium-2);
+  font-size: 12px;
+  box-sizing: border-box;
+  position: absolute;
+  z-index: 2;
+}
+
+.option {
+  display: flex;
+  align-items: center;
+  height: 24px;
+  padding: 0 6px;
+}
+
+.option:hover {
+  background-color: var(--color-bg-light);
+  color: var(--color-text-active);
+  cursor: pointer;
+}
+
+.option pre {
+  background-color: var(--color-bg-warning);
+  line-height: 20px;
+  margin-right: 6px;
+  tab-size: 1;
+  font-family: monospace;
+  width: 16px;
+  text-align: center;
+}
+
+input {
+  background: var(--color-white);
+  border: none;
+  color: var(--color-text-base);
+  height: 20px;
+  font-family: monospace;
+  font-size: 12px;
+  box-sizing: border-box;
+  width: 16px;
+  text-align: center;
+}
+
+input.filled {
+  background: var(--color-bg-warning);
+}
+
+input:focus {
+  outline: none;
+}
+
+input:disabled {
+  background: var(--color-bg-light);
+  color: var(--color-text-light-2);
+  cursor: default;
+}
+
+.text-field-label {
+  font-size: 12px;
+  color: var(--color-text-base);
+  padding-left: 8px;
+  margin-bottom: 2px;
+}
+
+.disabled .text-field-label {
+  color: var(--color-text-light-2);
+}
+
+.disabled .delimiter-selector-container {
+  background: var(--color-bg-light);
+}
+</style>

src/components/CsvImport/csv.js

@@ -0,0 +1,86 @@
+import Papa from 'papaparse'
+
+const hintsByCode = {
+  MissingQuotes: 'Edit your CSV so that the field has a closing quote char.',
+  TooFewFields: 'Add fields or try another delimiter.',
+  TooManyFields: 'Edit your CSV or try another delimiter.'
+}
+
+export default {
+  getResult (source) {
+    const result = {}
+    if (source.meta.fields) {
+      result.columns = source.meta.fields.map(col => col.trim())
+      result.values = source.data.map(row => {
+        const resultRow = []
+        result.columns.forEach(col => { resultRow.push(row[col]) })
+        return resultRow
+      })
+    } else {
+      result.values = source.data
+      result.columns = []
+      for (let i = 1; i <= source.data[0].length; i++) {
+        result.columns.push(`col${i}`)
+      }
+    }
+
+    return result
+  },
+
+  parse (file, config = {}) {
+    let parsedData = null
+    return new Promise((resolve, reject) => {
+      const defaultConfig = {
+        delimiter: '', // auto-detect
+        newline: '', // auto-detect
+        quoteChar: '"',
+        escapeChar: '"',
+        header: false,
+        transformHeader: undefined,
+        dynamicTyping: true,
+        preview: 0,
+        encoding: 'UTF-8',
+        worker: true,
+        comments: false,
+        step: undefined,
+        chunk: results => {
+          if (parsedData === null) {
+            parsedData = results
+          } else {
+            parsedData.data = parsedData.data.concat(results.data)
+            parsedData.errors = parsedData.errors.concat(results.errors)
+          }
+        },
+        chunkSize: 1024 * 716,
+        complete: () => {
+          const res = {
+            data: this.getResult(parsedData),
+            delimiter: parsedData.meta.delimiter,
+            hasErrors: false
+          }
+          res.messages = parsedData.errors.map(msg => {
+            msg.type = msg.code === 'UndetectableDelimiter' ? 'info' : 'error'
+            if (msg.type === 'error') res.hasErrors = true
+            msg.hint = hintsByCode[msg.code]
+            return msg
+          })
+          resolve(res)
+        },
+        error: (error, file) => {
+          reject(error)
+        },
+        download: false,
+        downloadRequestHeaders: undefined,
+        downloadRequestBody: undefined,
+        skipEmptyLines: 'greedy',
+        fastMode: undefined,
+        beforeFirstChunk: undefined,
+        withCredentials: undefined,
+        transform: undefined,
+        delimitersToGuess: [',', '\t', '|', ';', Papa.RECORD_SEP, Papa.UNIT_SEP]
+      }
+
+      Papa.parse(file, { ...defaultConfig, ...config })
+    })
+  }
+}

src/components/CsvImport/index.vue

@@ -0,0 +1,381 @@
+<template>
+  <modal
+    :name="dialogName"
+    classes="dialog"
+    height="auto"
+    width="80%"
+    scrollable
+    :clickToClose="false"
+  >
+    <div class="dialog-header">
+      CSV import
+      <close-icon @click="cancelCsvImport" :disabled="disableDialog"/>
+    </div>
+    <div class="dialog-body">
+      <text-field
+        label="Table name"
+        v-model="tableName"
+        width="484px"
+        :disabled="disableDialog"
+        :error-msg="tableNameError"
+        id="csv-table-name"
+      />
+      <div class="chars">
+        <delimiter-selector
+          v-model="delimiter"
+          width="210px"
+          class="char-input"
+          @input="previewCsv"
+          :disabled="disableDialog"
+        />
+        <text-field
+          label="Quote char"
+          hint="The character used to quote fields."
+          v-model="quoteChar"
+          width="93px"
+          :disabled="disableDialog"
+          class="char-input"
+          id="quote-char"
+        />
+        <text-field
+          label="Escape char"
+          hint='The character used to escape the quote character within a field (e.g. "column with ""quotes"" in text").'
+          max-hint-width="242px"
+          v-model="escapeChar"
+          width="93px"
+          :disabled="disableDialog"
+          class="char-input"
+          id="escape-char"
+        />
+      </div>
+      <check-box
+        @click="header = $event"
+        :init="true"
+        label="Use first row as column headers"
+        :disabled="disableDialog"
+      />
+      <sql-table
+        v-if="previewData && (previewData.values.length > 0 || previewData.columns.length > 0)"
+        :data-set="previewData"
+        height="160"
+        class="preview-table"
+        :preview="true"
+      />
+      <div v-else class="no-data">No data</div>
+      <logs
+        class="import-csv-errors"
+        :messages="importCsvMessages"
+      />
+    </div>
+    <div class="dialog-buttons-container">
+      <button
+        class="secondary"
+        :disabled="disableDialog"
+        @click="cancelCsvImport"
+        id="csv-cancel"
+      >
+        Cancel
+      </button>
+      <button
+        v-show="!importCsvCompleted"
+        class="primary"
+        :disabled="disableDialog"
+        @click="loadFromCsv(file)"
+        id="csv-import"
+      >
+        Import
+      </button>
+      <button
+        v-show="importCsvCompleted"
+        class="primary"
+        :disabled="disableDialog"
+        @click="finish"
+        id="csv-finish"
+      >
+        Finish
+      </button>
+    </div>
+  </modal>
+</template>
+
+<script>
+import csv from './csv'
+import CloseIcon from '@/components/svg/close'
+import TextField from '@/components/TextField'
+import DelimiterSelector from './DelimiterSelector'
+import CheckBox from '@/components/CheckBox'
+import SqlTable from '@/components/SqlTable'
+import Logs from '@/components/Logs'
+import time from '@/lib/utils/time'
+import fIo from '@/lib/utils/fileIo'
+
+export default {
+  name: 'CsvImport',
+  components: {
+    CloseIcon,
+    TextField,
+    DelimiterSelector,
+    CheckBox,
+    SqlTable,
+    Logs
+  },
+  props: ['file', 'db', 'dialogName'],
+  data () {
+    return {
+      disableDialog: false,
+      tableName: '',
+      delimiter: '',
+      quoteChar: '"',
+      escapeChar: '"',
+      header: true,
+      importCsvCompleted: false,
+      importCsvMessages: [],
+      previewData: null,
+      addedTable: null,
+      tableNameError: ''
+    }
+  },
+  watch: {
+    quoteChar () {
+      this.previewCsv()
+    },
+
+    escapeChar () {
+      this.previewCsv()
+    },
+
+    header () {
+      this.previewCsv()
+    },
+    tableName: time.debounce(function () {
+      this.tableNameError = ''
+      if (!this.tableName) {
+        return
+      }
+      this.db.validateTableName(this.tableName)
+        .catch(err => {
+          this.tableNameError = err.message + '. Try another table name.'
+        })
+    }, 400)
+  },
+  methods: {
+    cancelCsvImport () {
+      if (!this.disableDialog) {
+        if (this.addedTable) {
+          this.db.execute(`DROP TABLE "${this.addedTable}"`)
+          this.db.refreshSchema()
+        }
+        this.$modal.hide(this.dialogName)
+        this.$emit('cancel')
+      }
+    },
+    reset () {
+      this.header = true
+      this.quoteChar = '"'
+      this.escapeChar = '"'
+      this.delimiter = ''
+      this.tableName = ''
+      this.disableDialog = false
+      this.importCsvCompleted = false
+      this.importCsvMessages = []
+      this.previewData = null
+      this.addedTable = null
+      this.tableNameError = ''
+    },
+    open () {
+      this.tableName = this.db.sanitizeTableName(fIo.getFileName(this.file))
+      this.$modal.show(this.dialogName)
+    },
+    async previewCsv () {
+      this.importCsvCompleted = false
+      const config = {
+        preview: 3,
+        quoteChar: this.quoteChar || '"',
+        escapeChar: this.escapeChar,
+        header: this.header,
+        delimiter: this.delimiter
+      }
+      try {
+        const start = new Date()
+        const parseResult = await csv.parse(this.file, config)
+        const end = new Date()
+        this.previewData = parseResult.data
+        this.delimiter = parseResult.delimiter
+
+        // In parseResult.messages we can get parse errors
+        this.importCsvMessages = parseResult.messages || []
+
+        if (!parseResult.hasErrors) {
+          this.importCsvMessages.push({
+            message: `Preview parsing is completed in ${time.getPeriod(start, end)}.`,
+            type: 'success'
+          })
+        }
+      } catch (err) {
+        this.importCsvMessages = [{
+          message: err,
+          type: 'error'
+        }]
+      }
+    },
+    async loadFromCsv (file) {
+      if (!this.tableName) {
+        this.tableNameError = "Table name can't be empty"
+        return
+      }
+
+      this.disableDialog = true
+      const config = {
+        quoteChar: this.quoteChar || '"',
+        escapeChar: this.escapeChar,
+        header: this.header,
+        delimiter: this.delimiter
+      }
+      const parseCsvMsg = {
+        message: 'Parsing CSV...',
+        type: 'info'
+      }
+      this.importCsvMessages.push(parseCsvMsg)
+      const parseCsvLoadingIndicator = setTimeout(() => { parseCsvMsg.type = 'loading' }, 1000)
+
+      const importMsg = {
+        message: 'Importing CSV into a SQLite database...',
+        type: 'info'
+      }
+      let importLoadingIndicator = null
+
+      const updateProgress = progress => {
+        this.$set(importMsg, 'progress', progress)
+      }
+      const progressCounterId = this.db.createProgressCounter(updateProgress)
+
+      try {
+        let start = new Date()
+        const parseResult = await csv.parse(this.file, config)
+        let end = new Date()
+
+        if (!parseResult.hasErrors) {
+          const rowCount = parseResult.data.values.length
+          let period = time.getPeriod(start, end)
+          parseCsvMsg.type = 'success'
+
+          if (parseResult.messages.length > 0) {
+            this.importCsvMessages = this.importCsvMessages.concat(parseResult.messages)
+            parseCsvMsg.message = `${rowCount} rows are parsed in ${period}.`
+          } else {
+            // Inform about csv parsing success
+            parseCsvMsg.message = `${rowCount} rows are parsed successfully in ${period}.`
+          }
+
+          // Loading indicator for csv parsing is not needed anymore
+          clearTimeout(parseCsvLoadingIndicator)
+
+          // Add info about import start
+          this.importCsvMessages.push(importMsg)
+
+          // Show import progress after 1 second
+          importLoadingIndicator = setTimeout(() => {
+            importMsg.type = 'loading'
+          }, 1000)
+
+          // Add table
+          start = new Date()
+          await this.db.addTableFromCsv(this.tableName, parseResult.data, progressCounterId)
+          end = new Date()
+
+          this.addedTable = this.tableName
+          // Inform about import success
+          period = time.getPeriod(start, end)
+          importMsg.message = `Importing CSV into a SQLite database is completed in ${period}.`
+          importMsg.type = 'success'
+
+          // Loading indicator for import is not needed anymore
+          clearTimeout(importLoadingIndicator)
+
+          this.importCsvCompleted = true
+        } else {
+          parseCsvMsg.message = 'Parsing ended with errors.'
+          parseCsvMsg.type = 'info'
+          this.importCsvMessages = this.importCsvMessages.concat(parseResult.messages)
+        }
+      } catch (err) {
+        if (parseCsvMsg.type === 'loading') {
+          parseCsvMsg.type = 'info'
+        }
+
+        if (importMsg.type === 'loading') {
+          importMsg.type = 'info'
+        }
+
+        this.importCsvMessages.push({
+          message: err,
+          type: 'error'
+        })
+      }
+
+      clearTimeout(parseCsvLoadingIndicator)
+      clearTimeout(importLoadingIndicator)
+      this.db.deleteProgressCounter(progressCounterId)
+      this.disableDialog = false
+    },
+    async finish () {
+      this.$modal.hide(this.dialogName)
+      const stmt = [
+        '/*',
+        ` * Your CSV file has been imported into ${this.addedTable} table.`,
+        ' * You can run this SQL query to make all CSV records available for charting.',
+        ' */',
+        `SELECT * FROM "${this.addedTable}"`
+      ].join('\n')
+      const tabId = await this.$store.dispatch('addTab', { query: stmt })
+      this.$store.commit('setCurrentTabId', tabId)
+      this.importCsvCompleted = false
+      this.$emit('finish')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.dialog-body {
+  padding-bottom: 0;
+}
+
+.chars {
+  display: flex;
+  align-items: flex-end;
+  margin: 24px 0 20px;
+}
+.char-input {
+  margin-right: 44px;
+}
+.preview-table {
+  margin-top: 18px;
+}
+
+.import-csv-errors {
+  height: 136px;
+  margin-top: 8px;
+}
+.no-data {
+  margin-top: 32px;
+  background-color: white;
+  border-radius: 5px;
+  position: relative;
+  border: 1px solid var(--color-border-light);
+  box-sizing: border-box;
+  height: 147px;
+  font-size: 13px;
+  color: var(--color-text-base);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+/* https://github.com/euvl/vue-js-modal/issues/623 */
+>>> .vm--modal {
+  max-width: 1152px;
+  margin: auto;
+  left: 0 !important;
+}
+</style>

src/components/DbUpload.vue

@@ -1,80 +0,0 @@
-<template>
-  <div class="db-upload-container">
-    <label for="assetsFieldHandle">
-      <div class="drop-area" @dragover="dragover" @dragleave="dragleave" @drop="drop">
-        <input
-          type="file"
-          id="assetsFieldHandle"
-          @change="loadDb"
-          ref="file"
-          accept=".db,.sqlite,.sqlite3"
-        />
-        <div class="text">
-          Drop the database file to upload here or click to choose a file from your computer.
-        </div>
-      </div>
-    </label>
-    <div id="error" class="error"></div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'DbUpload',
-  methods: {
-    loadDb () {
-      this.$db.loadDb(this.$refs.file.files[0])
-    },
-    dragover (event) {
-      event.preventDefault()
-      // TODO: Add some visual stuff to show the user can drop its files
-      if (!event.currentTarget.classList.contains('bg-green-300')) {
-        event.currentTarget.classList.remove('bg-gray-100')
-        event.currentTarget.classList.add('bg-green-300')
-      }
-    },
-    dragleave (event) {
-      // Clean up
-      event.currentTarget.classList.add('bg-gray-100')
-      event.currentTarget.classList.remove('bg-green-300')
-    },
-    drop (event) {
-      event.preventDefault()
-      this.$refs.file.files = event.dataTransfer.files
-      this.loadDb()
-      // Clean up
-      event.currentTarget.classList.add('bg-gray-100')
-      event.currentTarget.classList.remove('bg-green-300')
-    }
-  }
-}
-</script>
-
-<style scoped>
-label {
-  display: inline-block;
-  border: 1px dashed var(--color-border);
-  padding: 8px;
-  border-radius: var(--border-radius-big);
-  height: 100%;
-  width: 100%;
-  box-sizing: border-box;
-}
-
-.drop-area {
-  background-color: var(--color-bg-light-3);
-  border-radius: var(--border-radius-big);
-  color: var(--color-text-base);
-  font-size: 13px;
-  text-align: center;
-  box-sizing: border-box;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  height: 100%;
-}
-
-input {
-  display: none;
-}
-</style>

src/components/DbUploader.vue

@@ -0,0 +1,259 @@
+<template>
+  <div class="db-uploader-container" :style="{ width }">
+    <change-db-icon v-if="type === 'small'" @click.native="browse"/>
+    <div v-if="type === 'illustrated'" class="drop-area-container">
+      <div
+        class="drop-area"
+        @dragover.prevent="state = 'dragover'"
+        @dragleave.prevent="state=''"
+        @drop.prevent="drop"
+        @click="browse"
+      >
+        <div class="text">
+          Drop the database or CSV file here or click to choose a file from your computer.
+        </div>
+      </div>
+    </div>
+    <div v-if="type === 'illustrated'" id="img-container">
+      <img id="drop-file-top-img" :src="require('@/assets/images/top.svg')" />
+      <img
+        id="left-arm-img"
+        :class="{'swing': state === 'dragover'}"
+        :src="require('@/assets/images/leftArm.svg')"
+      />
+      <img
+        id="file-img"
+        ref="fileImg"
+        :class="{
+          'swing': state === 'dragover',
+          'fly': state === 'dropping',
+          'hidden': state === 'dropped'
+        }"
+        :src="require('@/assets/images/file.png')"
+      />
+      <img id="drop-file-bottom-img" :src="require('@/assets/images/bottom.svg')" />
+      <img id="body-img" :src="require('@/assets/images/body.svg')" />
+      <img
+        id="right-arm-img"
+        :class="{'swing': state === 'dragover'}"
+        :src="require('@/assets/images/rightArm.svg')"
+      />
+    </div>
+    <div id="error" class="error"></div>
+
+    <!--Parse csv dialog  -->
+    <csv-import
+      ref="addCsv"
+      :file="file"
+      :db="newDb"
+      dialog-name="importFromCsv"
+      @cancel="cancelCsvImport"
+      @finish="finish"
+    />
+  </div>
+</template>
+
+<script>
+import fIo from '@/lib/utils/fileIo'
+import ChangeDbIcon from '@/components/svg/changeDb'
+import database from '@/lib/database'
+import CsvImport from '@/components/CsvImport'
+
+export default {
+  name: 'DbUploader',
+  props: {
+    type: {
+      type: String,
+      required: false,
+      default: 'small',
+      validator: (value) => {
+        return ['illustrated', 'small'].includes(value)
+      }
+    },
+    width: {
+      type: String,
+      required: false,
+      default: 'unset'
+    }
+  },
+  components: {
+    ChangeDbIcon,
+    CsvImport
+  },
+  data () {
+    return {
+      state: '',
+      animationPromise: Promise.resolve(),
+      file: null,
+      newDb: null
+    }
+  },
+  mounted () {
+    if (this.type === 'illustrated') {
+      this.animationPromise = new Promise((resolve) => {
+        this.$refs.fileImg.addEventListener('animationend', event => {
+          if (event.animationName.startsWith('fly')) {
+            this.state = 'dropped'
+            resolve()
+          }
+        })
+      })
+    }
+  },
+  methods: {
+    cancelCsvImport () {
+      if (this.newDb) {
+        this.newDb.shutDown()
+        this.newDb = null
+      }
+    },
+
+    async finish () {
+      this.$store.commit('setDb', this.newDb)
+      if (this.$route.path !== '/editor') {
+        this.$router.push('/editor')
+      }
+    },
+
+    loadDb (file) {
+      return Promise.all([this.newDb.loadDb(file), this.animationPromise])
+        .then(this.finish)
+    },
+
+    async checkFile (file) {
+      this.state = 'dropping'
+      this.newDb = database.getNewDatabase()
+
+      if (fIo.isDatabase(file)) {
+        this.loadDb(file)
+      } else {
+        this.file = file
+        await this.$nextTick()
+        const csvImport = this.$refs.addCsv
+        csvImport.reset()
+        return Promise.all([csvImport.previewCsv(), this.animationPromise])
+          .then(csvImport.open)
+      }
+    },
+    browse () {
+      fIo.getFileFromUser('.db,.sqlite,.sqlite3,.csv')
+        .then(this.checkFile)
+    },
+
+    drop (event) {
+      this.checkFile(event.dataTransfer.files[0])
+    }
+  }
+}
+</script>
+
+<style scoped>
+.db-uploader-container {
+  position: relative;
+}
+.drop-area-container {
+  display: inline-block;
+  border: 1px dashed var(--color-border);
+  padding: 8px;
+  border-radius: var(--border-radius-big);
+  height: 100%;
+  width: 100%;
+  box-sizing: border-box;
+}
+
+.drop-area {
+  background-color: var(--color-bg-light-3);
+  border-radius: var(--border-radius-big);
+  color: var(--color-text-base);
+  font-size: 13px;
+  text-align: center;
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 100%;
+  cursor: pointer;
+}
+
+#img-container {
+  position: absolute;
+  top: 54px;
+  left: 50%;
+  transform: translate(-50%, 0);
+  width: 450px;
+  height: 338px;
+  pointer-events: none;
+}
+
+#drop-file-top-img {
+  width: 450px;
+  height: 175px;
+  position: absolute;
+  top: 0;
+  left: 0;
+}
+#drop-file-bottom-img {
+  width: 450px;
+  height: 167px;
+  position: absolute;
+  bottom: 0;
+  left: 0;
+}
+#body-img {
+  width: 74px;
+  position: absolute;
+  top: 94.05px;
+  left: 46px;
+}
+#right-arm-img {
+  width: 106px;
+  position: absolute;
+  top: 110.05px;
+  left: 78px;
+}
+#left-arm-img {
+  width: 114px;
+  position: absolute;
+  top: 69.05px;
+  left: 69px;
+}
+#file-img {
+  width: 125px;
+  position: absolute;
+  top: 15.66px;
+  left: 152px;
+}
+
+.swing {
+  animation: swing ease-in-out 0.6s infinite alternate;
+}
+#left-arm-img.swing {
+  transform-origin: 9px 83px;
+}
+#right-arm-img.swing {
+  transform-origin: 0 56px;
+}
+#file-img.swing {
+   transform-origin: -74px 139px;
+}
+@keyframes swing {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(-7deg); }
+}
+
+#file-img.fly {
+  animation: fly ease-in-out 1s 1 normal;
+  transform-origin: center center;
+}
+@keyframes fly {
+  100% {
+    transform: rotate(360deg) scale(0.5);
+    top: 183px;
+    left: 225px;
+  }
+}
+
+#file-img.hidden {
+  display: none;
+}
+</style>

src/components/LoadingIndicator.vue

@@ -0,0 +1,115 @@
+<template>
+  <svg :class="animationClass" :height="size" :width="size" :viewBox="`0 0 ${size} ${size}`">
+    <circle
+      class="loader-svg bg"
+      :style="{ strokeWidth }"
+      :cx="size / 2"
+      :cy="size / 2"
+      :r="radius"
+    />
+    <circle
+      class="loader-svg front"
+      :style="{ strokeDasharray: circleProgress, strokeDashoffset: offset, strokeWidth }"
+      :cx="size / 2"
+      :cy="size / 2"
+      :r="radius"
+    />
+  </svg>
+</template>
+
+<script>
+export default {
+  name: 'LoadingIndicator',
+  props: {
+    progress: {
+      type: Number,
+      required: false
+    },
+    size: {
+      type: Number,
+      required: false,
+      default: 20
+    }
+  },
+  computed: {
+    circleProgress () {
+      const circle = this.radius * 3.14 * 2
+      const dash = this.progress ? (circle * this.progress) / 100 : circle * 1 / 3
+      const space = circle - dash
+      return `${dash}px, ${space}px`
+    },
+    animationClass () {
+      return this.progress === undefined ? 'loading' : 'progress'
+    },
+    radius () {
+      return this.size / 2 - this.strokeWidth
+    },
+    offset () {
+      return this.radius * 3.14 / 2
+    },
+    strokeWidth () {
+      return this.size / 10
+    }
+  }
+}
+</script>
+
+<style scoped>
+.loader-svg {
+  position: absolute;
+  left: 0; right: 0; top: 0; bottom: 0;
+  fill: none;
+  stroke-linecap: round;
+  stroke: var(--color-accent);
+}
+
+.loader-svg.bg {
+  stroke: var(--color-gray-light-3);
+}
+
+.loading .loader-svg.front {
+  will-change: transform;
+  animation: fill-animation-loading 1s cubic-bezier(1,1,1,1) 0s infinite;
+  transform-origin: center;
+}
+
+/*
+  We can't change anything in loading animation except transform, opacity and filter. Because in
+  our case the Main Thread can be busy and animation will be frozen (e. g. getting a result set
+  from the web-worker after query execution).
+  But transform, opacity and filter trigger changes only in the Composite Layer stage in rendering
+  waterfall. Hence they can be processed only with Compositor Thread while the Main Thread
+  processes something else.
+  https://www.viget.com/articles/animation-performance-101-browser-under-the-hood/
+*/
+@keyframes fill-animation-loading {
+  0% {
+    transform: rotate(0deg);
+  }
+  100% {
+    transform: rotate(360deg);
+  }
+}
+
+.progress .loader-svg.front {
+  transition: stroke-dasharray 0.2s;
+}
+
+.progress .loader-svg.bg {
+  animation: bg-animation 1.5s cubic-bezier(1,1,1,1) 0s infinite;
+}
+
+@keyframes bg-animation{
+  0% {
+    r: 8;
+  }
+  50% {
+    stroke: var(--color-gray-light-2);
+    r: 9;
+  }
+  100% {
+   r: 8;
+  }
+}
+
+</style>

src/components/Logs.vue

@@ -0,0 +1,86 @@
+<template>
+  <div class="logs-container" ref="logsContainer">
+    <div v-for="(msg, index) in messages" :key="index" class="msg">
+      <img v-if="msg.type === 'error'" :src="require('@/assets/images/error.svg')">
+      <img v-if="msg.type === 'info'" :src="require('@/assets/images/info.svg')" width="20px">
+      <img v-if="msg.type === 'success'" :src="require('@/assets/images/success.svg')">
+      <loading-indicator v-if="msg.type === 'loading'" :progress="msg.progress" />
+      <span class="msg-text">{{ serializeMessage(msg) }}</span>
+    </div>
+  </div>
+</template>
+
+<script>
+import LoadingIndicator from '@/components/LoadingIndicator'
+
+export default {
+  name: 'logs',
+  props: ['messages'],
+  components: { LoadingIndicator },
+  watch: {
+    'messages.length': 'scrollToBottom'
+  },
+  mounted () {
+    this.scrollToBottom()
+  },
+  methods: {
+    async scrollToBottom () {
+      const container = this.$refs.logsContainer
+      if (container) {
+        await this.$nextTick()
+        container.scrollTop = container.scrollHeight
+      }
+    },
+
+    serializeMessage (msg) {
+      let result = ''
+      if (msg.row !== null && msg.row !== undefined) {
+        if (msg.type === 'error') {
+          result += `Error in row ${msg.row}. `
+        } else {
+          result += `Information about row ${msg.row}. `
+        }
+      }
+
+      result += msg.message
+      if (!(/(\.|!|\?)$/.test(result))) {
+        result += '.'
+      }
+
+      if (msg.hint) {
+        result += ` ${msg.hint}`
+      }
+      return result
+    }
+  }
+}
+</script>
+
+<style scoped>
+.logs-container {
+  background-color: var(--color-white);
+  padding: 0 5px;
+  border-radius: 5px;
+  border: 1px solid var(--color-border-light);
+  box-sizing: border-box;
+  overflow-y: auto;
+  color: var(--color-text-base);
+}
+.msg {
+  padding: 12px 7px;
+  border-bottom: 1px solid var(--color-border-light);
+  display: flex;
+  align-items: flex-start;
+  font-family: monospace;
+  font-size: 13px;
+}
+
+.msg:last-child {
+  border-bottom: none;
+}
+
+.msg-text {
+  margin-left: 6px;
+  margin-top: 2px;
+}
+</style>

src/components/Schema.vue

@@ -1,128 +0,0 @@
-<template>
-  <div id="schema-container">
-    <div id="schema-filter">
-      <text-field placeholder="Search table" width="100%" v-model="filter"/>
-    </div>
-    <div id="db">
-      <div @click="schemaVisible = !schemaVisible" class="db-name">
-        <svg
-          :style="{ transform: schemaVisible ? 'rotate(90deg)' : 'rotate(0)' }"
-          class="chevron-icon"
-          width="9"
-          height="9"
-          viewBox="0 0 8 12"
-          fill="none"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M0.721924 9.93097L4.85292 5.79997L0.721924 1.66897L1.99992 0.399973L7.39992 5.79997L1.99992 11.2L0.721924 9.93097Z"
-            :fill="schemaVisible ? '#506784' : 'rgba(80, 103, 132, 0.5)'"
-          />
-        </svg>
-        {{ dbName }}
-      </div>
-      <div class="db-edit">
-        <input type="file" id="actual-btn"  ref="dbfile" hidden @change="changeDb"/>
-        <label for="actual-btn">
-          <change-db-icon />
-        </label>
-      </div>
-    </div>
-    <div v-if="schemaVisible" class="schema">
-      <table-description
-        v-for="table in schema"
-        :key="table.name"
-        :name="table.name"
-        :columns="table.columns"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import TableDescription from '@/components/TableDescription'
-import TextField from '@/components/TextField'
-import ChangeDbIcon from '@/components/svg/changeDb'
-
-export default {
-  name: 'Schema',
-  components: {
-    TableDescription,
-    TextField,
-    ChangeDbIcon
-  },
-  data () {
-    return {
-      schemaVisible: true,
-      filter: null
-    }
-  },
-  computed: {
-    schema () {
-      if (!this.$store.state.schema) {
-        return []
-      }
-
-      return !this.filter
-        ? this.$store.state.schema
-        : this.$store.state.schema.filter(
-          table => table[0].toUpperCase().indexOf(this.filter.toUpperCase()) !== -1
-        )
-    },
-    dbName () {
-      return this.$store.state.dbName
-    }
-  },
-  methods: {
-    changeDb () {
-      this.$db.loadDb(this.$refs.dbfile.files[0])
-    }
-  }
-}
-</script>
-
-<style scoped>
-#schema-container {
-  position: relative;
-  padding-bottom: 24px;
-}
-
-.schema {
-  margin-left: 12px;
-  padding: 0 12px;
-}
-#schema-filter {
-  padding: 32px 12px;
-  position: sticky;
-  position: -webkit-sticky;
-  top: 0;
-  width: 100%;
-  height: 100px;
-  box-sizing: border-box;
-  background-image: linear-gradient(white 73%, transparent);;
-  z-index: 2;
-}
-.schema, .db-name {
-  color: var(--color-text-base);
-  font-size: 13px;
-  white-space: nowrap;
-}
-#db {
-  display: flex;
-  align-items: center;
-  margin-top: -5px;
-  padding: 0 12px;
-}
-
-.db-name {
-  cursor: pointer;
-}
->>> .chevron-icon {
-  -webkit-transition: transform .15s ease-in-out;
-  transition: transform .15s ease-in-out;
-}
-.db-name:hover .chevron-icon path,
->>> .table-name:hover .chevron-icon path {
-  fill: #506784;
-}
-</style>

src/components/Splitpanes/index.vue

@@ -3,13 +3,13 @@
     ref="container"
     :class="[
       'splitpanes',
-      `splitpanes--${horizontal ? 'horizontal' : 'vertical'}`,
+      `splitpanes-${horizontal ? 'horizontal' : 'vertical'}`,
-      { 'splitpanes--dragging': touch.dragging }
+      { 'splitpanes-dragging': dragging }
     ]"
   >
     <div class="movable-splitter" ref="movableSplitter" :style="movableSplitterStyle" />
     <div
-      class="splitpanes__pane"
+      class="splitpanes-pane"
       ref="left"
       :size="paneBefore.size"
       max-size="30"
@@ -19,20 +19,20 @@
     </div>
     <!-- Splitter start-->
     <div
-      class="splitpanes__splitter"
+      class="splitpanes-splitter"
-      @mousedown="onMouseDown"
+      @mousedown="bindEvents"
-      @touchstart="onMouseDown"
+      @touchstart="bindEvents"
     >
       <div
         :class="[
           'toggle-btns',
-          {'both': after.max === 100 && before.max === 100 && after.size > 0 && before.size > 0}
+          {'both': after.max === 100 && before.max === 100 && paneAfter.size > 0 && paneBefore.size > 0}
         ]"
       >
         <div
-          v-if="after.max === 100  && after.size > 0"
+          v-if="after.max === 100 && paneAfter.size > 0"
           class="toggle-btn"
-          @click="togglePane('before')"
+          @click="togglePane(paneBefore)"
         >
           <img
             class="direction-icon"
@@ -41,9 +41,9 @@
           >
         </div>
         <div
-          v-if="before.max === 100 && before.size > 0"
+          v-if="before.max === 100 && paneBefore.size > 0"
           class="toggle-btn"
-          @click="togglePane('after')"
+          @click="togglePane(paneAfter)"
         >
           <img
             class="direction-icon"
@@ -55,7 +55,7 @@
     </div>
     <!-- splitter end -->
     <div
-      class="splitpanes__pane"
+      class="splitpanes-pane"
       ref="right"
       :style="styles.after"
     >
@@ -65,6 +65,7 @@
 </template>
 
 <script>
+import splitter from './splitter'
 
 export default {
   name: 'Splitpanes',
@@ -82,10 +83,7 @@ export default {
         before: this.before.size,
         after: this.after.size
       },
-      touch: {
+      dragging: false,
-        mouseDown: false,
-        dragging: false
-      },
       movableSplitter: {
         top: 0,
         left: 0,
@@ -108,38 +106,42 @@ export default {
     },
     directionBeforeIconStyle () {
       const expanded = this.paneBefore.size !== 0
-      const translation = 'translate(-50%, -50%)'
+      const translation = 'translate(-50%, -50%) '
+      let rotation = ''
+
       if (this.horizontal) {
-        return {
+        rotation = expanded ? 'rotate(90deg)' : 'rotate(-90deg)'
-          transform: `${translation} ${expanded ? 'rotate(90deg)' : 'rotate(-90deg)'}`
-        }
       } else {
-        return {
+        rotation = expanded ? 'rotate(0deg)' : 'rotate(180deg)'
-          transform: `${translation} ${expanded ? 'rotate(0deg)' : 'rotate(180deg)'}`
+      }
-        }
+
+      return {
+        transform: translation + rotation
       }
     },
     directionAfterIconStyle () {
       const expanded = this.paneAfter.size !== 0
       const translation = 'translate(-50%, -50%)'
+      let rotation = ''
+
       if (this.horizontal) {
-        return {
+        rotation = expanded ? 'rotate(-90deg)' : 'rotate(90deg)'
-          transform: `${translation} ${expanded ? 'rotate(-90deg)' : 'rotate(90deg)'}`
-        }
       } else {
-        return {
+        rotation = expanded ? 'rotate(180deg)' : 'rotate(0deg)'
-          transform: `${translation} ${expanded ? 'rotate(180deg)' : 'rotate(0deg)'}`
+      }
-        }
+
+      return {
+        transform: translation + rotation
       }
     }
   },
 
   methods: {
     bindEvents () {
+      // Passive: false to prevent scrolling while touch dragging.
       document.addEventListener('mousemove', this.onMouseMove, { passive: false })
       document.addEventListener('mouseup', this.onMouseUp)
 
-      // Passive: false to prevent scrolling while touch dragging.
       if ('ontouchstart' in window) {
         document.addEventListener('touchmove', this.onMouseMove, { passive: false })
         document.addEventListener('touchend', this.onMouseUp)
@@ -156,24 +158,15 @@ export default {
       }
     },
 
-    onMouseDown () {
-      this.bindEvents()
-      this.touch.mouseDown = true
-    },
-
     onMouseMove (event) {
-      if (this.touch.mouseDown) {
+      event.preventDefault()
-        // Prevent scrolling while touch dragging (only works with an active event, eg. passive: false).
+      this.dragging = true
-        event.preventDefault()
+      this.movableSplitter.visibility = 'visible'
-        this.touch.dragging = true
+      this.moveSplitter(event)
-        this.$set(this.movableSplitter, 'visibility', 'visible')
-        this.moveSplitter(event)
-      }
     },
 
     onMouseUp () {
-      this.touch.mouseDown = false
+      if (this.dragging) {
-      if (this.touch.dragging) {
         const dragPercentage = this.horizontal
           ? this.movableSplitter.top
           : this.movableSplitter.left
@@ -186,65 +179,31 @@ export default {
           left: 0,
           visibility: 'hidden'
         }
+
+        this.dragging = false
       }
 
-      // Keep dragging flag until click event is finished (click happens immediately after mouseup)
+      this.unbindEvents()
-      // in order to prevent emitting `splitter-click` event if splitter was dragged.
-      setTimeout(() => {
-        this.touch.dragging = false
-        this.unbindEvents()
-      }, 100)
-    },
-
-    // Get the cursor position relative to the splitpane container.
-    getCurrentMouseDrag (event) {
-      const rect = this.container.getBoundingClientRect()
-      const { clientX, clientY } = ('ontouchstart' in window && event.touches)
-        ? event.touches[0]
-        : event
-      return {
-        x: clientX - rect.left,
-        y: clientY - rect.top
-      }
-    },
-
-    // Returns the drag percentage of the splitter relative to the 2 panes it's inbetween.
-    // if the sum of size of the 2 cells is 60%, the dragPercentage range will be 0 to 100% of this 60%.
-    getCurrentDragPercentage (drag) {
-      drag = drag[this.horizontal ? 'y' : 'x']
-      // In the code bellow 'size' refers to 'width' for vertical and 'height' for horizontal layout.
-      const containerSize = this.container[this.horizontal ? 'clientHeight' : 'clientWidth']
-      return drag * 100 / containerSize
     },
 
     moveSplitter (event) {
-      const dragPercentage = this.getCurrentDragPercentage(this.getCurrentMouseDrag(event))
+      const splitterInfo = {
-      const paneBefore = this.paneBefore
+        container: this.container,
-      const paneAfter = this.paneAfter
+        paneBeforeMax: this.paneBefore.max,
-
+        paneAfterMax: this.paneAfter.max,
-      const paneBeforeMaxReached = paneBefore.max < 100 && (dragPercentage >= paneBefore.max)
+        isHorisontal: this.horizontal
-      const paneAfterMaxReached = paneAfter.max < 100 && (dragPercentage <= 100 - paneAfter.max)
-
-      const dir = this.horizontal ? 'top' : 'left'
-
-      // Prevent dragging beyond pane max.
-      if (paneBeforeMaxReached || paneAfterMaxReached) {
-        if (paneBeforeMaxReached) {
-          this.$set(this.movableSplitter, dir, paneBefore.max)
-        } else {
-          this.$set(this.movableSplitter, dir, Math.max(100 - paneAfter.max, 0))
-        }
-      } else {
-        this.$set(this.movableSplitter, dir, Math.min(Math.max(dragPercentage, 0), paneBefore.max))
       }
+      const offset = splitter.calculateOffset(event, splitterInfo)
+      const dir = this.horizontal ? 'top' : 'left'
+      this.movableSplitter[dir] = offset
     },
-    togglePane (toggledPane) {
+
-      const pane = toggledPane === 'before' ? this.paneBefore : this.paneAfter
+    togglePane (pane) {
       if (pane.size > 0) {
         this.beforeMinimising.before = this.paneBefore.size
         this.beforeMinimising.after = this.paneAfter.size
         pane.size = 0
-        const otherPane = toggledPane === 'before' ? this.paneAfter : this.paneBefore
+        const otherPane = pane === this.paneBefore ? this.paneAfter : this.paneBefore
         otherPane.size = 100 - pane.size
       } else {
         this.paneBefore.size = this.beforeMinimising.before
@@ -265,11 +224,11 @@ export default {
   position: relative;
 }
 
-.splitpanes--vertical {flex-direction: row;}
+.splitpanes-vertical {flex-direction: row;}
-.splitpanes--horizontal {flex-direction: column;}
+.splitpanes-horizontal {flex-direction: column;}
-.splitpanes--dragging * {user-select: none;}
+.splitpanes-dragging * {user-select: none;}
 
-.splitpanes__pane {
+.splitpanes-pane {
   width: 100%;
   height: 100%;
   overflow: auto;
@@ -277,16 +236,16 @@ export default {
 
 /* Splitter */
 
-.splitpanes--vertical > .splitpanes__splitter,
+.splitpanes-vertical > .splitpanes-splitter,
-.splitpanes--vertical.splitpanes--dragging {
+.splitpanes-vertical.splitpanes-dragging {
   cursor: col-resize;
 }
-.splitpanes--horizontal > .splitpanes__splitter,
+.splitpanes-horizontal > .splitpanes-splitter,
-.splitpanes--horizontal.splitpanes--dragging {
+.splitpanes-horizontal.splitpanes-dragging {
   cursor: row-resize;
 }
 
-.splitpanes__splitter {
+.splitpanes-splitter {
   touch-action: none;
   background-color: var(--color-bg-light);
   box-sizing: border-box;
@@ -295,12 +254,12 @@ export default {
   z-index: 1;
 }
 
-.splitpanes--horizontal > .splitpanes__splitter {
+.splitpanes-horizontal > .splitpanes-splitter {
   border-top: 1px solid var(--color-border-light);
   border-bottom: 1px solid var(--color-border-light);
 }
 
-.splitpanes--vertical > .splitpanes__splitter {
+.splitpanes-vertical > .splitpanes-splitter {
   border-left: 1px solid var(--color-border-light);
   border-right: 1px solid var(--color-border-light);
 }
@@ -310,15 +269,15 @@ export default {
   background-color:rgba(162, 177, 198, 0.5);
 }
 
-.splitpanes--vertical > .splitpanes__splitter,
+.splitpanes-vertical > .splitpanes-splitter,
-.splitpanes--vertical > .movable-splitter {
+.splitpanes-vertical > .movable-splitter {
   width: 8px;
   z-index: 5;
   height: 100%
 }
 
-.splitpanes--horizontal > .splitpanes__splitter,
+.splitpanes-horizontal > .splitpanes-splitter,
-.splitpanes--horizontal > .movable-splitter {
+.splitpanes-horizontal > .movable-splitter {
   height: 8px;
   width: 100%;
   z-index: 5;
@@ -332,11 +291,11 @@ export default {
   display: flex;
 }
 
-.splitpanes--vertical > .splitpanes__splitter .toggle-btns {
+.splitpanes-vertical > .splitpanes-splitter .toggle-btns {
   flex-direction: column;
 }
 
-.splitpanes--horizontal > .splitpanes__splitter .toggle-btns {
+.splitpanes-horizontal > .splitpanes-splitter .toggle-btns {
   flex-direction: row;
 }
 
@@ -349,12 +308,12 @@ export default {
   cursor: pointer;
 }
 
-.splitpanes--vertical > .splitpanes__splitter .toggle-btn {
+.splitpanes-vertical > .splitpanes-splitter .toggle-btn {
   height: 49px;
   width: 8px;
 }
 
-.splitpanes--horizontal > .splitpanes__splitter .toggle-btn {
+.splitpanes-horizontal > .splitpanes-splitter .toggle-btn {
   width: 49px;
   height: 8px;
 }
@@ -365,20 +324,20 @@ export default {
   left: 50%;
 }
 
-.splitpanes--horizontal > .splitpanes__splitter .toggle-btns.both .toggle-btn:first-child {
+.splitpanes-horizontal > .splitpanes-splitter .toggle-btns.both .toggle-btn:first-child {
   border-radius: var(--border-radius-small) 0 0 var(--border-radius-small);
 }
 
-.splitpanes--horizontal > .splitpanes__splitter .toggle-btns.both .toggle-btn:last-child {
+.splitpanes-horizontal > .splitpanes-splitter .toggle-btns.both .toggle-btn:last-child {
   border-radius: 0 var(--border-radius-small) var(--border-radius-small) 0;
   margin-left: -1px;
 }
 
-.splitpanes--vertical > .splitpanes__splitter .toggle-btns.both .toggle-btn:first-child {
+.splitpanes-vertical > .splitpanes-splitter .toggle-btns.both .toggle-btn:first-child {
   border-radius: var(--border-radius-small) var(--border-radius-small) 0 0;
 }
 
-.splitpanes--vertical > .splitpanes__splitter .toggle-btns.both .toggle-btn:last-child {
+.splitpanes-vertical > .splitpanes-splitter .toggle-btns.both .toggle-btn:last-child {
   border-radius: 0 0 var(--border-radius-small) var(--border-radius-small);
   margin-top: -1px;
 }

src/components/Splitpanes/splitter.js

@@ -0,0 +1,36 @@
+export default {
+  // Get the cursor position relative to the splitpane container.
+  getCurrentMouseDrag (event, container) {
+    const rect = container.getBoundingClientRect()
+    const { clientX, clientY } = ('ontouchstart' in window && event.touches)
+      ? event.touches[0]
+      : event
+    return {
+      x: clientX - rect.left,
+      y: clientY - rect.top
+    }
+  },
+
+  // Returns the drag percentage of the splitter relative to the 2 panes it's inbetween.
+  getCurrentDragPercentage (event, container, isHorisontal) {
+    let drag = this.getCurrentMouseDrag(event, container)
+    drag = drag[isHorisontal ? 'y' : 'x']
+    const containerSize = container[isHorisontal ? 'clientHeight' : 'clientWidth']
+    return drag * 100 / containerSize
+  },
+
+  // Returns the new position in percents.
+  calculateOffset (event, { container, isHorisontal, paneBeforeMax, paneAfterMax }) {
+    const dragPercentage = this.getCurrentDragPercentage(event, container, isHorisontal)
+
+    const paneBeforeMaxReached = paneBeforeMax < 100 && (dragPercentage >= paneBeforeMax)
+    const paneAfterMaxReached = paneAfterMax < 100 && (dragPercentage <= 100 - paneAfterMax)
+
+    // Prevent dragging beyond pane max.
+    if (paneBeforeMaxReached || paneAfterMaxReached) {
+      return paneBeforeMaxReached ? paneBeforeMax : Math.max(100 - paneAfterMax, 0)
+    } else {
+      return Math.min(Math.max(dragPercentage, 0), paneBeforeMax)
+    }
+  }
+}

src/components/SqlEditor.vue

@@ -1,101 +0,0 @@
-<template>
-  <div class="codemirror-container">
-    <codemirror v-model="query" :options="cmOptions" @changes="onCmChange" />
-  </div>
-</template>
-
-<script>
-import CM from 'codemirror'
-import { codemirror } from 'vue-codemirror'
-import 'codemirror/lib/codemirror.css'
-import 'codemirror/mode/sql/sql.js'
-import 'codemirror/theme/neo.css'
-import 'codemirror/addon/hint/show-hint.js'
-import 'codemirror/addon/hint/show-hint.css'
-import 'codemirror/addon/hint/sql-hint.js'
-import { debounce } from 'debounce'
-
-const sqlHint = CM.hint.sql
-CM.hint.sql = (cm, options) => {
-  const token = cm.getTokenAt(cm.getCursor()).string.toUpperCase()
-  const result = sqlHint(cm, options)
-  // Don't show the hint if there is only one option
-  // and the token is already completed with this option
-  if (result.list.length === 1 && result.list[0].text.toUpperCase() === token) {
-    result.list = []
-  }
-  return result
-}
-
-export default {
-  name: 'SqlEditor',
-  props: ['value'],
-  components: {
-    codemirror
-  },
-  data () {
-    return {
-      query: this.value,
-      cmOptions: {
-        // codemirror options
-        tabSize: 4,
-        mode: 'text/x-mysql',
-        theme: 'neo',
-        lineNumbers: true,
-        line: true
-      }
-    }
-  },
-  computed: {
-    tables () {
-      const tables = {}
-      if (this.$store.state.schema) {
-        this.$store.state.schema.forEach(table => {
-          tables[table.name] = table.columns.map(column => column.name)
-        })
-      }
-      return tables
-    }
-  },
-  watch: {
-    query () {
-      this.$emit('input', this.query)
-    }
-  },
-  methods: {
-    onCmChange: debounce(function (editor) {
-      // Don't show autocomplete after a space or semicolon or in string literals
-      const ch = editor.getTokenAt(editor.getCursor()).string.slice(-1)
-      const tokenType = editor.getTokenAt(editor.getCursor()).type
-      if (tokenType === 'string' || !ch || ch === ' ' || ch === ';') {
-        return
-      }
-
-      const hintOptions = {
-        tables: this.tables,
-        completeSingle: false,
-        completeOnSingleClick: true,
-        alignWithWord: false
-      }
-
-      CM.showHint(editor, CM.hint.sql, hintOptions)
-    }, 400)
-  }
-}
-</script>
-
-<style scoped>
-.codemirror-container {
-  flex-grow: 1;
-  min-height: 0;
-}
-
->>> .vue-codemirror {
-  height: 100%;
-  max-height: 100%;
-}
->>> .CodeMirror {
-  height: 100%;
-  max-height: 100%;
-}
-</style>

src/components/SqlTable/index.vue

@@ -40,6 +40,8 @@
     <div class="table-footer">
       <div class="table-footer-count">
         {{ dataSet.values.length}} {{dataSet.values.length === 1 ? 'row' : 'rows'}} retrieved
+        <span v-if="preview">for preview</span>
+        <span v-if="time">in {{ time }}</span>
       </div>
       <pager v-show="pageCount > 1" :page-count="pageCount" v-model="currentPage" />
     </div>
@@ -47,12 +49,12 @@
 </template>
 
 <script>
-import Pager from '@/components/Pager'
+import Pager from './Pager'
 
 export default {
   name: 'SqlTable',
   components: { Pager },
-  props: ['dataSet', 'height'],
+  props: ['dataSet', 'time', 'height', 'preview'],
   data () {
     return {
       header: null,
@@ -89,9 +91,6 @@ export default {
     },
     onScrollTable () {
       this.$refs['header-container'].scrollLeft = this.$refs['table-container'].scrollLeft
-    },
-    functionName () {
-
     }
   },
   mounted () {

src/components/Tabs.vue

@@ -1,152 +0,0 @@
-<template>
-   <div id="tabs-container">
-    <div id="tabs__header" v-if="tabs.length > 0">
-      <div
-        v-for="(tab, index) in tabs"
-        :key="index"
-        @click="selectTab(tab.id)"
-        :class="[{'tab__selected': (tab.id === selectedIndex)}, 'tab']"
-      >
-        <div class="tab-name">
-          <span v-show="tab.isUnsaved">*</span>
-          <span v-if="tab.name">{{ tab.name }}</span>
-          <span v-else class="tab-untitled">{{ tab.tempName }}</span>
-        </div>
-        <div>
-          <svg
-            class="close-icon"
-            @click.stop="closeTab(index)"
-            width="10"
-            height="10"
-            viewBox="0 0 14 14"
-            fill="none"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M14 1.41L12.59 0L7 5.59L1.41 0L0 1.41L5.59 7L0 12.59L1.41 14L7 8.41L12.59 14L14 12.59L8.41 7L14 1.41Z"
-              fill="#A2B1C6"/>
-          </svg>
-        </div>
-      </div>
-    </div>
-    <tab
-      v-for="(tab, index) in tabs"
-      :key="tab.id"
-      :id="tab.id"
-      :init-name="tab.name"
-      :init-query="tab.query"
-      :init-chart="tab.chart"
-      :is-predefined="tab.isPredefined"
-      :tab-index="index"
-    />
-    <div v-if="tabs.length === 0" id="start-guide">
-      <span class="link" @click="$root.$emit('createNewQuery')">Create</span>
-      a new query from scratch or open the one from
-      <router-link class="link" to="/my-queries">My queries</router-link>
-    </div>
-  </div>
-</template>
-
-<script>
-import Tab from '@/components/Tab'
-
-export default {
-  components: {
-    Tab
-  },
-  data () {
-    return {
-    }
-  },
-  computed: {
-    tabs () {
-      return this.$store.state.tabs
-    },
-    selectedIndex () {
-      return this.$store.state.currentTabId
-    }
-  },
-  methods: {
-    selectTab (id) {
-      this.$store.commit('setCurrentTabId', id)
-    },
-    closeTab (index) {
-      this.$store.commit('deleteTab', index)
-    }
-  }
-}
-</script>
-
-<style>
-#tabs-container {
-  position: relative;
-  height: 100%;
-  background-color: var(--color-bg-light);
-}
-#tabs__header {
-  display: flex;
-  margin: 0;
-  max-width: 100%;
-  overflow: hidden;
-}
-#tabs__header .tab {
-  height: 36px;
-  background-color: var(--color-bg-light);
-  border-right: 1px solid var(--color-border-light);
-  border-bottom: 1px solid var(--color-border-light);
-  line-height: 36px;
-  font-size: 14px;
-  color: var(--color-text-base);
-  padding: 0 12px;
-  box-sizing: border-box;
-  position: relative;
-  max-width: 200px;
-  display: flex;
-  flex-shrink: 1;
-  min-width: 0;
-}
-#tabs__header .tab-name {
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  flex-shrink: 1;
-}
-
-#tabs__header div:hover {
-  cursor: pointer;
-}
-
-#tabs__header .tab__selected {
-  color: var(--color-text-active);
-  font-weight: 600;
-  border-bottom: none;
-  background-color: var(--color-white);
-}
-#tabs__header .tab__selected:hover {
-    cursor: default;
-}
-
-.close-icon {
-  margin-left: 5px;
-}
-
-.close-icon:hover path {
-  fill: var(--color-text-base);
-  cursor: pointer;
-}
-#start-guide {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  color: var(--color-text-base);
-  font-size: 14px;
-  text-align: center;
-}
-.link {
-  color: var(--color-accent);
-  text-decoration: none;
-  cursor: pointer;
-  white-space: nowrap;
-}
-</style>

src/components/TextField.vue

@@ -1,22 +1,28 @@
 <template>
   <div>
-    <div :class="['text-field-label', { error: errorMsg }]">{{ label }}</div>
+    <div v-if="label" :class="['text-field-label', { error: errorMsg }, {'disabled': disabled}]">
+      {{ label }}
+      <hint-icon class="hint" v-if="hint" :hint="hint" :max-width="maxHintWidth || '149px'"/>
+    </div>
     <input
       type="text"
       :placeholder="placeholder"
       :class="{ error: errorMsg }"
       :style="{ width: width }"
       :value="value"
-      @input="$emit('input',  $event.target.value)"
+      :disabled="disabled"
+      @input="$emit('input', $event.target.value)"
     />
-    <div class="text-field-error">{{ errorMsg }}</div>
+    <div v-show="errorMsg" class="text-field-error">{{ errorMsg }}</div>
   </div>
 </template>
 
 <script>
+import HintIcon from '@/components/svg/hint'
 export default {
   name: 'textField',
-  props: ['placeholder', 'label', 'errorMsg', 'value', 'width']
+  props: ['placeholder', 'label', 'errorMsg', 'value', 'width', 'hint', 'maxHintWidth', 'disabled'],
+  components: { HintIcon }
 }
 </script>
 
@@ -30,6 +36,7 @@ input {
   padding: 0 8px;
   font-size: 13px;
   box-sizing: border-box;
+  display: block;
 }
 
 input::placeholder {
@@ -40,24 +47,47 @@ input:focus {
   outline: none;
 }
 
+input:disabled {
+  background: var(--color-bg-light);
+  color: var(--color-text-light-2);
+  cursor: default;
+}
+
 input.error {
   border-color: var(--color-text-error);
 }
+
 .text-field-label {
   font-size: 12px;
   color: var(--color-text-base);
   padding-left: 8px;
   margin-bottom: 2px;
+  display: inline-block;
+  position: relative;
+}
+
+.text-field-label .hint{
+  position: absolute;
+  top: -2px;
+  right: -22px;
 }
 
 .text-field-label.error {
   color: var(--color-text-error);
 }
 
+.text-field-label.disabled {
+  color: var(--color-text-light-2);
+}
+
 .text-field-error {
   color: var(--color-text-error);
   font-size: 12px;
   padding-left: 8px;
   margin-top: 2px;
+  position: absolute;
+}
+.text-field-error:first-letter {
+  text-transform: uppercase;
 }
 </style>

src/components/svg/addTable.vue

@@ -0,0 +1,61 @@
+<template>
+  <span>
+    <svg
+      class="icon"
+      width="18"
+      height="18"
+      viewBox="0 0 18 18"
+      fill="none"
+      @click.stop="$emit('click')"
+      @mouseover="showTooltip"
+      @mouseout="hideTooltip"
+    >
+      <g clip-path="url(#clip0)">
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="
+            M13.6573 1.5H2.59985C1.77485 1.5 1.09985 2.175 1.09985 3V13.6649C1.09985 14.4899
+            1.77485 15.1649 2.59985
+            15.1649H9.84V13.6649H8.87866V9.08244H13.6573V9.83777H15.1573V3C15.1573
+            2.17 14.4873 1.5 13.6573 1.5ZM13.6573
+            7.58244V3H8.87866V7.58244H13.6573ZM7.37866 3H2.59985V7.58244H7.37866V3ZM2.59985
+            9.08244V13.6649H7.37866V9.08244H2.59985ZM13.1702
+            10.8434H15.6702V13.1717H18.0001V15.6717H15.6702V18H13.1702V15.6717H10.8401V13.1717H13.1702V10.8434Z
+          "
+          fill="#A2B1C6"
+        />
+      </g>
+      <defs>
+        <clipPath id="clip0">
+          <rect width="18" height="18" fill="white"/>
+        </clipPath>
+      </defs>
+    </svg>
+    <span class="icon-tooltip" :style="tooltipStyle">
+      Add new table from CSV
+    </span>
+  </span>
+</template>
+
+<script>
+import tooltipMixin from '@/tooltipMixin'
+
+export default {
+  name: 'AddTableIcon',
+  mixins: [tooltipMixin],
+  props: ['tooltip']
+}
+</script>
+
+<style scoped>
+.icon {
+  display: block;
+  margin: 0;
+  cursor: pointer;
+}
+
+.icon:hover path {
+  fill: var(--color-accent);
+}
+</style>

src/components/svg/changeDb.vue

@@ -8,7 +8,7 @@
     fill="none"
     xmlns="http://www.w3.org/2000/svg"
     @mouseover="showTooltip"
-    @mouseout="$set(tooltipStyle, 'visibility', 'hidden')"
+    @mouseout="hideTooltip"
   >
     <path
       d="M3 10.5V12.75C3 14.25 5.2875 15.54 8.25 15.75V13.5825L8.3475 13.5C5.34 13.32 3 12.045 3 10.5ZM9 9.75C5.685 9.75 3 8.4075 3 6.75V9C3 10.6575 5.685 12 9 12C9.2925 12 9.5775 12 9.87 12L12.75 9.09C11.55 9.54 10.2825 9.75 9 9.75ZM9 2.25C5.685 2.25 3 3.5925 3 5.25C3 6.9075 5.685 8.25 9 8.25C12.315 8.25 15 6.9075 15 5.25C15 3.5925 12.315 2.25 9 2.25ZM15.75 8.3475C15.6375 8.3475 15.5325 8.3925 15.4575 8.475L14.7075 9.225L16.245 10.725L16.995 9.975C17.1525 9.825 17.16 9.57 16.995 9.3975L16.065 8.475C15.99 8.3925 15.885 8.3475 15.78 8.3475H15.75ZM14.28 9.66L9.75 14.205V15.75H11.295L15.84 11.1975L14.28 9.66Z"
@@ -16,13 +16,13 @@
     />
   </svg>
   <span class="icon-tooltip" :style="tooltipStyle">
-    Change database
+    Load another database or CSV
   </span>
 </div>
 </template>
 
 <script>
-import tooltipMixin from '@/mixins/tooltips'
+import tooltipMixin from '@/tooltipMixin'
 
 export default {
   name: 'changeDbIcon',

src/components/svg/clear.vue

@@ -0,0 +1,41 @@
+<template>
+  <svg
+    :class="['clear-icon', {'disabled': disabled}]"
+    width="20"
+    height="20"
+    viewBox="0 0 20 20"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      d="M14.3481 14.849C13.8791 15.318 13.1191 15.318 12.6511 14.849L10.0001 11.819L7.34907 14.848C6.88007 15.317 6.12007 15.317 5.65207 14.848C5.18307 14.379 5.18307 13.619 5.65207 13.151L8.41007 10.001L5.65107 6.84898C5.18207 6.37998 5.18207 5.62098 5.65107 5.15198C6.12007 4.68298 6.87907 4.68298 7.34807 5.15198L10.0001 8.18298L12.6511 5.15198C13.1201 4.68298 13.8791 4.68298 14.3481 5.15198C14.8171 5.62098 14.8171 6.38098 14.3481 6.84898L11.5901 10.001L14.3481 13.151C14.8171 13.62 14.8171 14.38 14.3481 14.849V14.849Z"
+      fill="#C8D4E3"
+    />
+  </svg>
+</template>
+
+<script>
+
+export default {
+  name: 'ClearIcon',
+  props: ['disabled']
+}
+</script>
+
+<style scoped>
+.clear-icon {
+  cursor: pointer;
+}
+
+.clear-icon:hover path {
+  fill: var(--color-danger);
+}
+
+.disabled.clear-icon {
+  cursor: default;
+}
+
+.disabled.clear-icon:hover path {
+  fill: #C8D4E3;
+}
+</style>

src/components/svg/close.vue

@@ -1,12 +1,35 @@
 <template>
-  <svg @click.stop="$emit('click')" class="icon" width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <svg
-    <path d="M14 1.41L12.59 0L7 5.59L1.41 0L0 1.41L5.59 7L0 12.59L1.41 14L7 8.41L12.59 14L14 12.59L8.41 7L14 1.41Z" fill="#A2B1C6"/>
+    @click.stop="$emit('click')"
+    :class="['icon', {'disabled': disabled }]"
+    :width="size"
+    :height="size"
+    viewBox="0 0 14 14"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      d="M14 1.41L12.59 0L7 5.59L1.41 0L0 1.41L5.59 7L0 12.59L1.41 14L7 8.41L12.59 14L14 12.59L8.41 7L14 1.41Z"
+      fill="#A2B1C6"
+    />
   </svg>
 </template>
 
 <script>
 export default {
-  name: 'CloseIcon'
+  name: 'CloseIcon',
+  props: {
+    size: {
+      type: Number,
+      required: false,
+      default: 14
+    },
+    disabled: {
+      type: Boolean,
+      required: false,
+      default: false
+    }
+  }
 }
 </script>
 
@@ -14,7 +37,10 @@ export default {
 .icon {
   cursor: pointer;
 }
+.disabled {
+  pointer-events: none;
+}
 .icon:hover path {
-  fill: var(--color-text-active);
+  fill: var(--color-text-base);
 }
 </style>

src/components/svg/dropDownChevron.vue

@@ -0,0 +1,38 @@
+<template>
+  <svg
+    :class="['chevron-icon', {'disabled': disabled}]"
+    width="20"
+    height="20"
+    viewBox="0 0 20 20"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path d="M6.175 7.15002L10 10.975L13.825 7.15002L15 8.33336L10 13.3334L5 8.33336L6.175 7.15002Z" fill="#C8D4E3"/>
+  </svg>
+</template>
+
+<script>
+
+export default {
+  name: 'DropDownChevron',
+  props: ['disabled']
+}
+</script>
+
+<style scoped>
+.chevron-icon {
+  cursor: pointer;
+}
+
+.chevron-icon:hover path {
+  fill: var(--color-accent);
+}
+
+.disabled.chevron-icon {
+  cursor: default;
+}
+
+.disabled.chevron-icon:hover path {
+  fill: #C8D4E3;
+}
+</style>

src/components/svg/export.vue

@@ -9,32 +9,34 @@
       xmlns="http://www.w3.org/2000/svg"
       @click.stop="$emit('click')"
       @mouseover="showTooltip"
-      @mouseout="$set(tooltipStyle, 'visibility', 'hidden')"
+      @mouseout="hideTooltip"
     >
       <path
         d="M10.5 1.5H4.5C3.675 1.5 3 2.175 3 3V15C3 15.825 3.675 16.5 4.5 16.5H13.5C14.325 16.5 15 15.825 15 15V6L10.5 1.5ZM13.5 15H4.5V3H9.75V6.75H13.5V15ZM12 8.25V13.575L10.425 12L8.325 14.1L6.225 12L8.325 9.9L6.675 8.25H12Z"
         fill="#A2B1C6"
       />
-  </svg>
+    </svg>
-  <span class="icon-tooltip" :style="tooltipStyle">
+    <span class="icon-tooltip" :style="tooltipStyle">
-    Export query to file
+      {{ tooltip }}
-  </span>
+    </span>
   </span>
 </template>
 
 <script>
-import tooltipMixin from '@/mixins/tooltips'
+import tooltipMixin from '@/tooltipMixin'
 
 export default {
   name: 'ExportIcon',
-  mixins: [tooltipMixin]
+  mixins: [tooltipMixin],
+  props: ['tooltip']
 }
 </script>
 
 <style scoped>
 .icon {
-  vertical-align: middle;
+  display: block;
   margin: 0 12px;
+  cursor: pointer;
 }
 
 .icon:hover path {

src/components/svg/hint.vue

@@ -0,0 +1,48 @@
+<template>
+  <div>
+    <svg
+      class="hint-icon"
+      width="20"
+      height="20"
+      viewBox="0 0 20 20"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      @mouseover="showTooltip"
+      @mouseout="hideTooltip"
+    >
+      <path d="M8.75 14.1666H10.4167V12.5H8.75V14.1666ZM9.58333 16.25C5.90833 16.25 2.91667 13.2583 2.91667 9.58333C2.91667 5.90833 5.90833 2.91667 9.58333 2.91667C13.2583 2.91667 16.25 5.90833 16.25 9.58333C16.25 13.2583 13.2583 16.25 9.58333 16.25ZM9.58333 1.25C8.48898 1.25 7.40535 1.46555 6.3943 1.88434C5.38326 2.30313 4.4646 2.91696 3.69078 3.69078C2.12797 5.25358 1.25 7.3732 1.25 9.58333C1.25 11.7935 2.12797 13.9131 3.69078 15.4759C4.4646 16.2497 5.38326 16.8635 6.3943 17.2823C7.40535 17.7011 8.48898 17.9167 9.58333 17.9167C11.7935 17.9167 13.9131 17.0387 15.4759 15.4759C17.0387 13.9131 17.9167 11.7935 17.9167 9.58333C17.9167 8.48898 17.7011 7.40535 17.2823 6.3943C16.8635 5.38326 16.2497 4.4646 15.4759 3.69078C14.7021 2.91696 13.7834 2.30313 12.7724 1.88434C11.7613 1.46555 10.6777 1.25 9.58333 1.25Z" fill="#A2B1C6"/>
+      <path d="M9.91601 4.51787C8.98167 4.42606 8.05144 4.69097 7.36309 5.24472C6.68735 5.78828 6.2998 6.56661 6.2998 7.38012H7.92488C7.92488 6.97463 8.11059 6.60187 8.44779 6.33061C8.79784 6.049 9.25647 5.92005 9.73896 5.96755C10.4832 6.04076 11.0828 6.57277 11.1647 7.23265C11.2306 7.764 10.9661 8.28194 10.4744 8.58426C9.38676 9.25303 8.73742 10.343 8.73742 11.5H10.3625C10.3625 10.8243 10.7477 10.184 11.3929 9.78733C12.3808 9.17985 12.9122 8.13913 12.7798 7.07124C12.6144 5.73863 11.41 4.66476 9.91601 4.51787Z" fill="#A2B1C6"/>
+    </svg>
+    <span class="icon-tooltip" :style="{...tooltipStyle, maxWidth: maxWidth }">
+      {{ hint }}
+    </span>
+  </div>
+</template>
+
+<script>
+import tooltipMixin from '@/tooltipMixin'
+
+export default {
+  name: 'HintIcon',
+  props: ['hint', 'maxWidth'],
+  mixins: [tooltipMixin]
+}
+</script>
+
+<style scoped>
+.hint-icon {
+  display: block;
+  cursor: pointer;
+}
+.hint-icon:hover path {
+  fill: var(--color-text-base);
+}
+.icon-tooltip {
+  display: block;
+  white-space: normal;
+  height: auto;
+  line-height: normal;
+  padding: 6px;
+  box-sizing: border-box;
+}
+</style>

src/components/svg/treeChevron.vue

@@ -0,0 +1,36 @@
+<template>
+  <svg
+    :style="{ transform: expanded ? 'rotate(90deg)' : 'rotate(0)' }"
+    class="chevron-icon"
+    width="9"
+    height="9"
+    viewBox="0 0 8 12"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      d="M0.721924 9.93097L4.85292 5.79997L0.721924 1.66897L1.99992 0.399973L7.39992 5.79997L1.99992 11.2L0.721924 9.93097Z"
+      :fill="expanded ? '#506784' : 'rgba(80, 103, 132, 0.5)'"
+    />
+  </svg>
+</template>
+
+<script>
+
+export default {
+  name: 'treeChevron',
+  props: {
+    expanded: {
+      type: Boolean,
+      required: true
+    }
+  }
+}
+</script>
+
+<style scoped>
+.chevron-icon {
+  -webkit-transition: transform .15s ease-in-out;
+  transition: transform .15s ease-in-out;
+}
+</style>

src/dataBase.js

@@ -1,46 +0,0 @@
-import store from '@/store'
-import router from '@/router'
-const worker = new Worker('js/worker.sql-wasm.js')
-
-export default {
-  loadDb (file) {
-    const dbName = file.name
-    store.commit('saveDbName', dbName)
-    const f = file
-    const r = new FileReader()
-    r.onload = () => {
-      worker.onmessage = () => {
-        const getSchemaSql = `
-          SELECT name, sql
-          FROM sqlite_master
-          WHERE type='table' AND name NOT LIKE 'sqlite_%';`
-        worker.onmessage = event => {
-          store.commit('saveSchema', event.data.results[0].values)
-          if (router.currentRoute.path !== '/editor') {
-            router.push('/editor')
-          }
-        }
-        worker.postMessage({ action: 'exec', sql: getSchemaSql })
-      }
-      store.commit('saveDbFile', r.result)
-      try {
-        worker.postMessage({ action: 'open', buffer: r.result }, [r.result])
-      } catch (exception) {
-        worker.postMessage({ action: 'open', buffer: r.result })
-      }
-    }
-    r.readAsArrayBuffer(f)
-  },
-  execute (commands) {
-    return new Promise((resolve, reject) => {
-      worker.onmessage = (event) => {
-        if (event.data.error) {
-          reject(event.data.error)
-        }
-        // if it was more than one select - take only the first one
-        resolve(event.data.results[0])
-      }
-      worker.postMessage({ action: 'exec', sql: commands })
-    })
-  }
-}

src/lib/database/_sql.js

@@ -0,0 +1,81 @@
+import initSqlJs from 'sql.js/dist/sql-wasm.js'
+import dbUtils from './_statements'
+
+let SQL = null
+const sqlModuleReady = initSqlJs().then(sqlModule => { SQL = sqlModule })
+
+export default class Sql {
+  constructor () {
+    this.db = null
+  }
+
+  static build () {
+    return sqlModuleReady
+      .then(() => {
+        return new Sql()
+      })
+  }
+
+  createDb (buffer) {
+    if (this.db != null) this.db.close()
+    this.db = new SQL.Database(buffer)
+    return this.db
+  }
+
+  open (buffer) {
+    this.createDb(buffer && new Uint8Array(buffer))
+    return {
+      ready: true
+    }
+  }
+
+  exec (sql, params) {
+    if (this.db === null) {
+      this.createDb()
+    }
+    if (!sql) {
+      throw new Error('exec: Missing query string')
+    }
+    return this.db.exec(sql, params)
+  }
+
+  import (tabName, columns, values, progressCounterId, progressCallback, chunkSize = 1500) {
+    if (this.db === null) {
+      this.createDb()
+    }
+    this.db.exec(dbUtils.getCreateStatement(tabName, columns, values))
+    const chunks = dbUtils.generateChunks(values, chunkSize)
+    const chunksAmount = Math.ceil(values.length / chunkSize)
+    let count = 0
+    const insertStr = dbUtils.getInsertStmt(tabName, columns)
+    const insertStmt = this.db.prepare(insertStr)
+
+    progressCallback({ progress: 0, id: progressCounterId })
+    for (const chunk of chunks) {
+      this.db.exec('BEGIN')
+      for (const row of chunk) {
+        insertStmt.run(row)
+      }
+      this.db.exec('COMMIT')
+      count++
+      progressCallback({ progress: 100 * (count / chunksAmount), id: progressCounterId })
+    }
+
+    return {
+      finish: true
+    }
+  }
+
+  export () {
+    return this.db.export()
+  }
+
+  close () {
+    if (this.db) {
+      this.db.close()
+    }
+    return {
+      finished: true
+    }
+  }
+}

src/lib/database/_statements.js

@@ -0,0 +1,90 @@
+import sqliteParser from 'sqlite-parser'
+
+export default {
+  * generateChunks (arr, size) {
+    const count = Math.ceil(arr.length / size)
+
+    for (let i = 0; i <= count - 1; i++) {
+      const start = size * i
+      const end = start + size
+      yield arr.slice(start, end)
+    }
+  },
+
+  getInsertStmt (tabName, columns) {
+    const colList = `"${columns.join('", "')}"`
+    const params = columns.map(() => '?').join(', ')
+    return `INSERT INTO "${tabName}" (${colList}) VALUES (${params});`
+  },
+
+  getCreateStatement (tabName, columns, values) {
+    let result = `CREATE table "${tabName}"(`
+    columns.forEach((col, index) => {
+    // Get the first row of values to determine types
+      const value = values[0][index]
+      let type = ''
+      switch (typeof value) {
+        case 'number': {
+          type = 'REAL'
+          break
+        }
+        case 'boolean': {
+          type = 'INTEGER'
+          break
+        }
+        case 'string': {
+          type = 'TEXT'
+          break
+        }
+        default: type = 'TEXT'
+      }
+      result += `"${col}" ${type}, `
+    })
+    result = result.replace(/,\s$/, ');')
+    return result
+  },
+
+  getAst (sql) {
+    // There is a bug is sqlite-parser
+    // It throws an error if tokenizer has an arguments:
+    // https://github.com/codeschool/sqlite-parser/issues/59
+    const fixedSql = sql
+      .replace(/(tokenize=[^,]+)"tokenchars=.+?"/, '$1')
+      .replace(/(tokenize=[^,]+)"remove_diacritics=.+?"/, '$1')
+      .replace(/(tokenize=[^,]+)"separators=.+?"/, '$1')
+      .replace(/tokenize=.+?(,|\))/, 'tokenize=unicode61$1')
+
+    return sqliteParser(fixedSql)
+  },
+
+  /*
+   * Return an array of columns with name and type. E.g.:
+   * [
+   *   { name: 'id',    type: 'INTEGER' },
+   *   { name: 'title', type: 'NVARCHAR(30)' },
+   * ]
+  */
+  getColumns (sql) {
+    const columns = []
+    const ast = this.getAst(sql)
+
+    const columnDefinition = ast.statement[0].format === 'table'
+      ? ast.statement[0].definition
+      : ast.statement[0].result.args.expression // virtual table
+
+    columnDefinition.forEach(item => {
+      if (item.variant === 'column' && ['identifier', 'definition'].includes(item.type)) {
+        let type = item.datatype ? item.datatype.variant : 'N/A'
+        if (item.datatype && item.datatype.args) {
+          type = type + '(' + item.datatype.args.expression[0].value
+          if (item.datatype.args.expression.length === 2) {
+            type = type + ', ' + item.datatype.args.expression[1].value
+          }
+          type = type + ')'
+        }
+        columns.push({ name: item.name, type: type })
+      }
+    })
+    return columns
+  }
+}

src/lib/database/_worker.js

@@ -0,0 +1,42 @@
+import registerPromiseWorker from 'promise-worker/register'
+import Sql from './_sql'
+
+const sqlReady = Sql.build()
+
+function processMsg (sql) {
+  const data = this
+  switch (data && data.action) {
+    case 'open':
+      return sql.open(data.buffer)
+    case 'reopen':
+      return sql.open(sql.export())
+    case 'exec':
+      return sql.exec(data.sql, data.params)
+    case 'import':
+      return sql.import(
+        data.tabName,
+        data.columns,
+        data.values,
+        data.progressCounterId,
+        postMessage
+      )
+    case 'export':
+      return sql.export()
+    case 'close':
+      return sql.close()
+    default:
+      throw new Error('Invalid action : ' + (data && data.action))
+  }
+}
+
+function onError (error) {
+  return {
+    error: error.message
+  }
+}
+
+registerPromiseWorker(data => {
+  return sqlReady
+    .then(processMsg.bind(data))
+    .catch(onError)
+})

src/lib/database/index.js

@@ -0,0 +1,147 @@
+import stms from './_statements'
+import fu from '@/lib/utils/fileIo'
+// We can import workers like so because of worker-loader:
+// https://webpack.js.org/loaders/worker-loader/
+import Worker from './_worker.js'
+
+// Use promise-worker in order to turn worker into the promise based one:
+// https://github.com/nolanlawson/promise-worker
+import PromiseWorker from 'promise-worker'
+
+function getNewDatabase () {
+  const worker = new Worker()
+  return new Database(worker)
+}
+
+export default {
+  getNewDatabase
+}
+
+let progressCounterIds = 0
+class Database {
+  constructor (worker) {
+    this.dbName = null
+    this.schema = null
+    this.worker = worker
+    this.pw = new PromiseWorker(worker)
+
+    this.importProgresses = {}
+    worker.addEventListener('message', e => {
+      const progress = e.data.progress
+      if (progress !== undefined) {
+        const id = e.data.id
+        this.importProgresses[id].dispatchEvent(new CustomEvent('progress', {
+          detail: progress
+        }))
+      }
+    })
+  }
+
+  shutDown () {
+    this.worker.terminate()
+  }
+
+  createProgressCounter (callback) {
+    const id = progressCounterIds++
+    this.importProgresses[id] = new EventTarget()
+    this.importProgresses[id].addEventListener('progress', e => { callback(e.detail) })
+    return id
+  }
+
+  deleteProgressCounter (id) {
+    delete this.importProgresses[id]
+  }
+
+  async addTableFromCsv (tabName, data, progressCounterId) {
+    const result = await this.pw.postMessage({
+      action: 'import',
+      columns: data.columns,
+      values: data.values,
+      progressCounterId,
+      tabName
+    })
+
+    if (result.error) {
+      throw new Error(result.error)
+    }
+    this.dbName = this.dbName || 'database'
+    this.refreshSchema()
+  }
+
+  async loadDb (file) {
+    const fileContent = file ? await fu.readAsArrayBuffer(file) : null
+    const res = await this.pw.postMessage({ action: 'open', buffer: fileContent })
+
+    if (res.error) {
+      throw new Error(res.error)
+    }
+
+    this.dbName = file ? fu.getFileName(file) : 'database'
+    this.refreshSchema()
+  }
+
+  async refreshSchema () {
+    const getSchemaSql = `
+      SELECT name, sql
+      FROM sqlite_master
+      WHERE type='table' AND name NOT LIKE 'sqlite_%';
+    `
+    const result = await this.execute(getSchemaSql)
+    // Parse DDL statements to get column names and types
+    const parsedSchema = []
+    if (result && result.values) {
+      result.values.forEach(item => {
+        parsedSchema.push({
+          name: item[0],
+          columns: stms.getColumns(item[1])
+        })
+      })
+    }
+
+    // Refresh schema
+    this.schema = parsedSchema
+  }
+
+  async execute (commands) {
+    await this.pw.postMessage({ action: 'reopen' })
+    const results = await this.pw.postMessage({ action: 'exec', sql: commands })
+
+    if (results.error) {
+      throw new Error(results.error)
+    }
+    // if it was more than one select - take only the last one
+    return results[results.length - 1]
+  }
+
+  async export (fileName) {
+    const data = await this.pw.postMessage({ action: 'export' })
+
+    if (data.error) {
+      throw new Error(data.error)
+    }
+    fu.exportToFile(data, fileName)
+  }
+
+  async validateTableName (name) {
+    if (name.startsWith('sqlite_')) {
+      throw new Error("Table name can't start with sqlite_")
+    }
+
+    if (/[^\w]/.test(name)) {
+      throw new Error('Table name can contain only letters, digits and underscores')
+    }
+
+    if (/^(\d)/.test(name)) {
+      throw new Error("Table name can't start with a digit")
+    }
+
+    await this.execute(`BEGIN; CREATE TABLE "${name}"(id); ROLLBACK;`)
+  }
+
+  sanitizeTableName (tabName) {
+    return tabName
+      .replace(/[^\w]/g, '_') // replace everything that is not letter, digit or _  with _
+      .replace(/^(\d)/, '_$1') // add _ at beginning if starts with digit
+      .replace(/_{2,}/g, '_') // replace multiple _ with one _
+  }
+}

src/lib/storedQueries.js

@@ -0,0 +1,96 @@
+import { nanoid } from 'nanoid'
+import fu from '@/lib/utils/fileIo'
+
+export default {
+  getStoredQueries () {
+    return JSON.parse(localStorage.getItem('myQueries')) || []
+  },
+
+  duplicateQuery (baseQuery) {
+    const newQuery = JSON.parse(JSON.stringify(baseQuery))
+    newQuery.name = newQuery.name + ' Copy'
+    newQuery.id = nanoid()
+    newQuery.createdAt = new Date()
+    delete newQuery.isPredefined
+
+    return newQuery
+  },
+
+  isTabNeedName (queryTab) {
+    const isFromScratch = !queryTab.initName
+    return queryTab.isPredefined || isFromScratch
+  },
+
+  save (queryTab, newName) {
+    const value = {
+      id: queryTab.isPredefined ? nanoid() : queryTab.id,
+      query: queryTab.query,
+      chart: queryTab.$refs.chart.getChartStateForSave(),
+      name: newName || queryTab.initName
+    }
+
+    // Get queries from local storage
+    const myQueries = this.getStoredQueries()
+
+    // Set createdAt
+    if (newName) {
+      value.createdAt = new Date()
+    } else {
+      var queryIndex = myQueries.findIndex(oldQuery => oldQuery.id === queryTab.id)
+      value.createdAt = myQueries[queryIndex].createdAt
+    }
+
+    // Insert in queries list
+    if (newName) {
+      myQueries.push(value)
+    } else {
+      myQueries[queryIndex] = value
+    }
+
+    // Save to local storage
+    this.updateStorage(myQueries)
+    return value
+  },
+
+  updateStorage (value) {
+    localStorage.setItem('myQueries', JSON.stringify(value))
+  },
+
+  serialiseQueries (queryList) {
+    const preparedData = JSON.parse(JSON.stringify(queryList))
+    preparedData.forEach(query => delete query.isPredefined)
+    return JSON.stringify(preparedData, null, 4)
+  },
+
+  deserialiseQueries (str) {
+    let queryList = JSON.parse(str)
+    // Turn data into array if they are not
+    if (!Array.isArray(queryList)) {
+      queryList = [queryList]
+    }
+
+    // Generate new ids if they are the same as existing queries
+    queryList.forEach(query => {
+      const allQueriesIds = this.getStoredQueries().map(query => query.id)
+      if (allQueriesIds.includes(query.id)) {
+        query.id = nanoid()
+      }
+    })
+
+    return queryList
+  },
+
+  importQueries () {
+    return fu.importFile()
+      .then(data => {
+        return this.deserialiseQueries(data)
+      })
+  },
+
+  readPredefinedQueries () {
+    return fu.readFile('./queries.json')
+      .then(resp => {
+        return resp.json()
+      })
+  }
+}

src/lib/utils/fileIo.js

@@ -0,0 +1,82 @@
+export default {
+  isDatabase (file) {
+    const dbTypes = ['application/vnd.sqlite3', 'application/x-sqlite3']
+    return file.type
+      ? dbTypes.includes(file.type)
+      : /\.(db|sqlite(3)?)+$/.test(file.name)
+  },
+
+  getFileName (file) {
+    return file.name.replace(/\.[^.]+$/, '')
+  },
+
+  exportToFile (str, fileName, type = 'octet/stream') {
+    // Create downloader
+    const downloader = document.createElement('a')
+    const blob = new Blob([str], { type })
+    const url = URL.createObjectURL(blob)
+    downloader.href = url
+    downloader.download = fileName
+
+    // Trigger click
+    downloader.click()
+
+    // Clean up
+    URL.revokeObjectURL(url)
+  },
+
+  /**
+   * Note: if user press Cancel in file choosing dialog
+   * it will be an unsettled promise. But it's grabbed by
+   * the garbage collector (tested with FinalizationRegistry).
+   */
+  getFileFromUser (type) {
+    return new Promise(resolve => {
+      const uploader = document.createElement('input')
+
+      uploader.type = 'file'
+      uploader.accept = type
+
+      uploader.addEventListener('change', () => {
+        const file = uploader.files[0]
+        resolve(file)
+      })
+
+      uploader.click()
+    })
+  },
+
+  importFile () {
+    const reader = new FileReader()
+
+    return this.getFileFromUser('.json')
+      .then(file => {
+        return new Promise((resolve, reject) => {
+          reader.onload = e => {
+            resolve(e.target.result)
+          }
+          reader.readAsText(file)
+        })
+      })
+  },
+
+  readFile (path) {
+    return fetch(path)
+  },
+
+  readAsArrayBuffer (file) {
+    const fileReader = new FileReader()
+
+    return new Promise((resolve, reject) => {
+      fileReader.onerror = () => {
+        fileReader.abort()
+        reject(new Error('Problem parsing input file.'))
+      }
+
+      fileReader.onload = () => {
+        resolve(fileReader.result)
+      }
+      fileReader.readAsArrayBuffer(file)
+    })
+  }
+}

src/lib/utils/time.js

@@ -0,0 +1,15 @@
+export default {
+  getPeriod (start, end) {
+    const diff = end.getTime() - start.getTime()
+    const seconds = diff / 1000
+    return seconds.toFixed(3) + 's'
+  },
+
+  debounce (func, ms) {
+    let timeout
+    return function () {
+      clearTimeout(timeout)
+      timeout = setTimeout(() => func.apply(this, arguments), ms)
+    }
+  }
+}

src/main.js

@@ -1,10 +1,9 @@
 import Vue from 'vue'
-import App from './App.vue'
+import App from '@/App.vue'
-import router from './router'
+import router from '@/router'
-import store from './store'
+import store from '@/store'
 import { VuePlugin } from 'vuera'
 import VModal from 'vue-js-modal'
-import db from '@/dataBase'
 
 import '@/assets/styles/variables.css'
 import '@/assets/styles/buttons.css'
@@ -13,11 +12,14 @@ import '@/assets/styles/dialogs.css'
 import '@/assets/styles/tooltips.css'
 import '@/assets/styles/messages.css'
 
+if (!['localhost', '127.0.0.1'].includes(location.hostname)) {
+  import('./registerServiceWorker') // eslint-disable-line no-unused-expressions
+}
+
 Vue.use(VuePlugin)
 Vue.use(VModal)
 
 Vue.config.productionTip = false
-Vue.prototype.$db = db
 
 new Vue({
   router,

src/mixins/tooltips.js

@@ -1,17 +0,0 @@
-export default {
-  data () {
-    return {
-      tooltipStyle: {}
-    }
-  },
-  methods: {
-    showTooltip (e) {
-      this.tooltipStyle = {
-        visibility: 'visible',
-        position: 'fixed',
-        top: e.clientY - 12 + 'px',
-        left: e.clientX + 12 + 'px'
-      }
-    }
-  }
-}

src/registerServiceWorker.js

@@ -0,0 +1,44 @@
+let refresh = false
+
+function invokeServiceWorkerUpdateFlow (registration) {
+  const agree = confirm('New version of the app is available. Refresh now?')
+  if (agree) {
+    if (registration.waiting) {
+      // let waiting Service Worker know it should became active
+      refresh = true
+      registration.waiting.postMessage({ type: 'SKIP_WAITING' })
+    }
+  }
+}
+
+if ('serviceWorker' in navigator) {
+  window.addEventListener('load', async () => {
+    const registration = await navigator.serviceWorker.register('service-worker.js')
+    // ensure the case when the updatefound event was missed is also handled
+    // by re-invoking the prompt when there's a waiting Service Worker
+    if (registration.waiting) {
+      invokeServiceWorkerUpdateFlow(registration)
+    }
+
+    // detect Service Worker update available and wait for it to become installed
+    registration.addEventListener('updatefound', () => {
+      const newRegestration = registration.installing
+      if (newRegestration) {
+        // wait until the new Service worker is actually installed (ready to take over)
+        newRegestration.addEventListener('statechange', () => {
+          if (registration.waiting && navigator.serviceWorker.controller) {
+            invokeServiceWorkerUpdateFlow(registration)
+          }
+        })
+      }
+    })
+
+    // detect controller change and refresh the page
+    navigator.serviceWorker.addEventListener('controllerchange', () => {
+      if (refresh) {
+        window.location.reload()
+        refresh = false
+      }
+    })
+  })
+}

src/router.js

@@ -0,0 +1,50 @@
+import Vue from 'vue'
+import VueRouter from 'vue-router'
+import Editor from '@/views/Main/Editor'
+import MyQueries from '@/views/Main/MyQueries'
+import Welcome from '@/views/Welcome'
+import Main from '@/views/Main'
+import store from '@/store'
+import database from '@/lib/database'
+
+Vue.use(VueRouter)
+
+const routes = [
+  {
+    path: '/',
+    name: 'Welcome',
+    component: Welcome
+  },
+  {
+    path: '/',
+    name: 'Main',
+    component: Main,
+    children: [
+      {
+        path: '/editor',
+        name: 'Editor',
+        component: Editor
+      },
+      {
+        path: '/my-queries',
+        name: 'MyQueries',
+        component: MyQueries
+      }
+    ]
+  }
+]
+
+const router = new VueRouter({
+  routes
+})
+
+router.beforeEach(async (to, from, next) => {
+  if (!store.state.db) {
+    const newDb = database.getNewDatabase()
+    await newDb.loadDb()
+    store.commit('setDb', newDb)
+  }
+  next()
+})
+
+export default router

src/router/index.js

@@ -1,39 +0,0 @@
-import Vue from 'vue'
-import VueRouter from 'vue-router'
-import Editor from '../views/Editor'
-import MyQueries from '../views/MyQueries'
-import Home from '../views/Home'
-import MainView from '../views/MainView'
-
-Vue.use(VueRouter)
-
-const routes = [
-  {
-    path: '/',
-    name: 'Welcome',
-    component: Home
-  },
-  {
-    path: '/',
-    name: 'MainView',
-    component: MainView,
-    children: [
-      {
-        path: '/editor',
-        name: 'Editor',
-        component: Editor
-      },
-      {
-        path: '/my-queries',
-        name: 'MyQueries',
-        component: MyQueries
-      }
-    ]
-  }
-]
-
-const router = new VueRouter({
-  routes
-})
-
-export default router

src/store/actions.js

@@ -0,0 +1,30 @@
+import { nanoid } from 'nanoid'
+
+export default {
+  async addTab ({ state }, data) {
+    const tab = data ? JSON.parse(JSON.stringify(data)) : {}
+    // If no data then create a new blank one...
+    // No data.id means to create new tab, but not blank,
+    // e.g. with 'select * from csv_import' query after csv import
+    if (!data || !data.id) {
+      tab.id = nanoid()
+      tab.name = null
+      tab.tempName = state.untitledLastIndex
+        ? `Untitled ${state.untitledLastIndex}`
+        : 'Untitled'
+      tab.isUnsaved = true
+    } else {
+      tab.isUnsaved = false
+    }
+
+    // add new tab only if was not already opened
+    if (!state.tabs.some(openedTab => openedTab.id === tab.id)) {
+      state.tabs.push(tab)
+      if (!tab.name) {
+        state.untitledLastIndex += 1
+      }
+    }
+
+    return tab.id
+  }
+}

src/store/index.js

@@ -1,130 +1,13 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
-import sqliteParser from 'sqlite-parser'
+import state from '@/store/state'
+import mutations from '@/store/mutations'
+import actions from '@/store/actions'
 
 Vue.use(Vuex)
 
-function getAst (sql) {
-  // There is a bug is sqlite-parser
-  // It throws an error if tokenizer has an arguments:
-  // https://github.com/codeschool/sqlite-parser/issues/59
-  const fixedSql = sql
-    .replace(/(?<=tokenize=.+)"tokenchars=.+"/, '')
-    .replace(/(?<=tokenize=.+)"remove_diacritics=.+"/, '')
-    .replace(/(?<=tokenize=.+)"separators=.+"/, '')
-    .replace(/tokenize=.+(?=(,|\)))/, 'tokenize=unicode61')
-
-  return sqliteParser(fixedSql)
-}
-
-function getColumns (sql) {
-  const columns = []
-  const ast = getAst(sql)
-
-  const columnDefinition = ast.statement[0].format === 'table'
-    ? ast.statement[0].definition
-    : ast.statement[0].result.args.expression // virtual table
-
-  columnDefinition.forEach(item => {
-    if (item.variant === 'column' && ['identifier', 'definition'].includes(item.type)) {
-      let type = item.datatype ? item.datatype.variant : 'N/A'
-      if (item.datatype && item.datatype.args) {
-        type = type + '(' + item.datatype.args.expression[0].value
-        if (item.datatype.args.expression.length === 2) {
-          type = type + ', ' + item.datatype.args.expression[1].value
-        }
-        type = type + ')'
-      }
-      columns.push({ name: item.name, type: type })
-    }
-  })
-  return columns
-}
-
 export default new Vuex.Store({
-  state: {
+  state,
-    schema: null,
+  mutations,
-    dbFile: null,
+  actions
-    dbName: null,
-    tabs: [],
-    currentTab: null,
-    currentTabId: null,
-    untitledLastIndex: 0,
-    predefinedQueries: []
-  },
-  mutations: {
-    saveSchema (state, schema) {
-      const parsedSchema = []
-      schema.forEach(item => {
-        parsedSchema.push({
-          name: item[0],
-          columns: getColumns(item[1])
-        })
-      })
-      state.schema = parsedSchema
-    },
-    saveDbFile (state, file) {
-      state.dbFile = file
-    },
-    saveDbName (state, name) {
-      state.dbName = name
-    },
-    addTab (state, tab) {
-      state.tabs.push(tab)
-
-      if (!tab.name) {
-        state.untitledLastIndex += 1
-      }
-    },
-    updateTab (state, { index, name, id, query, chart, isUnsaved }) {
-      const tab = state.tabs[index]
-      const oldId = tab.id
-
-      if (state.currentTabId === oldId) {
-        state.currentTabId = id
-      }
-
-      tab.id = id
-      if (name) { tab.name = name }
-      if (query) { tab.query = query }
-      if (chart) { tab.chart = chart }
-      if (isUnsaved !== undefined) { tab.isUnsaved = isUnsaved }
-      delete tab.isPredefined
-
-      Vue.set(state.tabs, index, tab)
-    },
-    updateTabState (state, { index, newValue }) {
-      const tab = state.tabs[index]
-      tab.isUnsaved = newValue
-      Vue.set(state.tabs, index, tab)
-    },
-    deleteTab (state, index) {
-      if (state.tabs[index].id !== state.currentTabId) {
-      } else if (index < state.tabs.length - 1) {
-        state.currentTabId = state.tabs[index + 1].id
-      } else if (index > 0) {
-        state.currentTabId = state.tabs[index - 1].id
-      } else {
-        state.currentTabId = null
-        state.currentTab = null
-        state.untitledLastIndex = 0
-      }
-      state.tabs.splice(index, 1)
-    },
-    setCurrentTabId (state, id) {
-      state.currentTabId = id
-    },
-    setCurrentTab (state, tab) {
-      state.currentTab = tab
-    },
-    updatePredefinedQueries (state, queries) {
-      if (Array.isArray(queries)) {
-        state.predefinedQueries = queries
-      } else {
-        state.predefinedQueries = [queries]
-      }
-    }
-  },
-  actions: {
-  }
 })

src/store/mutations.js

@@ -0,0 +1,59 @@
+import Vue from 'vue'
+
+export default {
+  setDb (state, db) {
+    if (state.db) {
+      state.db.shutDown()
+    }
+    state.db = db
+  },
+
+  updateTab (state, { index, name, id, query, chart, isUnsaved }) {
+    const tab = state.tabs[index]
+    const oldId = tab.id
+
+    if (id && state.currentTabId === oldId) {
+      state.currentTabId = id
+    }
+
+    if (id) { tab.id = id }
+    if (name) { tab.name = name }
+    if (query) { tab.query = query }
+    if (chart) { tab.chart = chart }
+    if (isUnsaved !== undefined) { tab.isUnsaved = isUnsaved }
+    if (!isUnsaved) {
+      // Saved query is not predefined
+      delete tab.isPredefined
+    }
+
+    Vue.set(state.tabs, index, tab)
+  },
+  deleteTab (state, index) {
+    // If closing tab is the current opened
+    if (state.tabs[index].id === state.currentTabId) {
+      if (index < state.tabs.length - 1) {
+        state.currentTabId = state.tabs[index + 1].id
+      } else if (index > 0) {
+        state.currentTabId = state.tabs[index - 1].id
+      } else {
+        state.currentTabId = null
+        state.currentTab = null
+        state.untitledLastIndex = 0
+      }
+    }
+    state.tabs.splice(index, 1)
+  },
+  setCurrentTabId (state, id) {
+    state.currentTabId = id
+  },
+  setCurrentTab (state, tab) {
+    state.currentTab = tab
+  },
+  updatePredefinedQueries (state, queries) {
+    if (Array.isArray(queries)) {
+      state.predefinedQueries = queries
+    } else {
+      state.predefinedQueries = [queries]
+    }
+  }
+}

src/store/state.js

@@ -0,0 +1,8 @@
+export default {
+  tabs: [],
+  currentTab: null,
+  currentTabId: null,
+  untitledLastIndex: 0,
+  predefinedQueries: [],
+  db: null
+}

src/tooltipMixin.js

@@ -0,0 +1,19 @@
+export default {
+  data () {
+    return {
+      tooltipStyle: {
+        visibility: 'hidden'
+      }
+    }
+  },
+  methods: {
+    showTooltip (e) {
+      this.tooltipStyle.top = e.clientY - 12 + 'px'
+      this.tooltipStyle.left = e.clientX + 12 + 'px'
+      this.tooltipStyle.visibility = 'visible'
+    },
+    hideTooltip () {
+      this.tooltipStyle.visibility = 'hidden'
+    }
+  }
+}

src/views/Editor.vue

@@ -1,78 +0,0 @@
-<template>
-  <div>
-    <splitpanes
-      class="schema-tabs-splitter"
-      :before="{ size: 20, max: 30 }"
-      :after="{ size: 80, max: 100 }"
-    >
-      <template #left-pane>
-        <schema v-if="$store.state.schema"/>
-        <div v-else id="empty-schema-container">
-          <div class="warning">
-            Database is not uploaded. Queries can’t be run without database.
-          </div>
-          <db-upload id="db-uploader"/>
-        </div>
-      </template>
-      <template #right-pane>
-        <tabs />
-      </template>
-    </splitpanes>
-  </div>
-</template>
-
-<script>
-import Splitpanes from '@/components/Splitpanes'
-import Schema from '@/components/Schema'
-import Tabs from '@/components/Tabs'
-import dbUpload from '@/components/DbUpload'
-
-export default {
-  name: 'Editor',
-  components: {
-    Schema,
-    Splitpanes,
-    Tabs,
-    dbUpload
-  }
-}
-</script>
-
-<style scoped>
-.schema-tabs-splitter {
-  height: 100%;
-  background-color: var(--color-white);
-}
-#empty-schema-container {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  min-width: 200px;
-  height: 100%;
-}
-
-#db-uploader {
-  flex-grow: 1;
-  padding: 24px;
-  width: 100%;
-  box-sizing: border-box;
-}
-
-.warning {
-  padding: 12px 24px;
-  width: 100%;
-  box-sizing: border-box;
-}
-
->>> .db-upload-container {
-  width: 100%;
-}
-
->>>.drop-area {
-  padding: 0 15px;
-}
-
->>>.drop-area .text {
-  max-width: 200px;
-}
-</style>

src/views/Home.vue

@@ -1,70 +0,0 @@
-<template>
-  <div id="dbloader-container">
-    <h1>Sqliteviz</h1>
-    <db-upload />
-    <button id ="skip" class="secondary" @click="$router.push('/editor')">
-      Skip database connection for now
-    </button>
-  </div>
-</template>
-
-<script>
-import dbUpload from '@/components/DbUpload'
-
-export default {
-  name: 'Home',
-  components: { dbUpload },
-  methods: {
-    loadDb () {
-      this.$db.loadDb(this.$refs.file.files[0])
-    },
-    dragover (event) {
-      event.preventDefault()
-      // TODO: Add some visual stuff to show the user can drop its files
-      if (!event.currentTarget.classList.contains('bg-green-300')) {
-        event.currentTarget.classList.remove('bg-gray-100')
-        event.currentTarget.classList.add('bg-green-300')
-      }
-    },
-    dragleave (event) {
-      // Clean up
-      event.currentTarget.classList.add('bg-gray-100')
-      event.currentTarget.classList.remove('bg-green-300')
-    },
-    drop (event) {
-      event.preventDefault()
-      this.$refs.file.files = event.dataTransfer.files
-      this.loadDb()
-      // Clean up
-      event.currentTarget.classList.add('bg-gray-100')
-      event.currentTarget.classList.remove('bg-green-300')
-    }
-  }
-}
-</script>
-
-<style scoped>
-#dbloader-container {
-  width: 100vw;
-  height: 100vh;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-}
-
-h1 {
-  color: var(--color-accent);
-}
-
-#skip {
-  position: absolute;
-  bottom: 50px;
-}
-
->>>.drop-area {
-  width: 628px;
-  height: 490px;
-  padding: 0 150px;
-}
-</style>

src/views/Main/AppDiagnosticInfo.vue

@@ -0,0 +1,90 @@
+<template>
+  <div id="app-info-container">
+    <img
+      id="app-info-icon"
+      :src="require('@/assets/images/info.svg')"
+      @click="$modal.show('app-info')"
+    />
+    <modal name="app-info" classes="dialog" height="auto" width="400px">
+      <div class="dialog-header">
+        App info
+        <close-icon @click="$modal.hide('app-info')"/>
+      </div>
+      <div class="dialog-body">
+        <div v-for="(item, index) in info" :key="index" class="info-item">
+          {{item.name}}
+          <div class="divider"/>
+          <div class="options">
+            <div v-for="(opt, index) in item.info" :key="index">
+              {{opt}}
+            </div>
+          </div>
+        </div>
+      </div>
+    </modal>
+  </div>
+</template>
+
+<script>
+import CloseIcon from '@/components/svg/close'
+
+export default {
+  name: 'AppDiagnosticInfo',
+  components: { CloseIcon },
+  data () {
+    return {
+      info: [
+        {
+          name: 'sqliteviz version',
+          info: [require('../../../package.json').version]
+        }
+      ]
+    }
+  },
+
+  async created () {
+    const state = this.$store.state
+    let result = await state.db.execute('select sqlite_version()')
+    this.info.push({
+      name: 'SQLite version',
+      info: result.values[0]
+    })
+
+    result = await state.db.execute('PRAGMA compile_options')
+    this.info.push({
+      name: 'SQLite compile options',
+      info: result.values.map(row => row[0])
+    })
+  }
+}
+</script>
+
+<style scoped>
+#app-info-icon {
+  cursor: pointer;
+}
+#app-info-container {
+  display: flex;
+  justify-content: center;
+  margin-left: 32px;
+}
+.divider {
+  height: 1px;
+  background-color: var(--color-border);
+  margin: 4px 0;
+}
+.options {
+  font-family: monospace;
+  font-size: 13px;
+  margin-left: 8px;
+  overflow: auto;
+  max-height: 170px;
+}
+.info-item {
+  margin-bottom: 32px;
+   font-size: 14px;
+}
+.info-item:last-child {
+  margin-bottom: 0;
+}
+</style>

src/views/Main/Editor/Schema/TableDescription.vue

@@ -1,20 +1,7 @@
 <template>
   <div>
     <div @click="colVisible = !colVisible" class="table-name">
-      <svg
+      <tree-chevron :expanded="colVisible"/>
-        :style="{transform: colVisible ? 'rotate(90deg)' : 'rotate(0)'}"
-        class="chevron-icon"
-        width="9"
-        height="9"
-        viewBox="0 0 8 12"
-        fill="none"
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <path
-          d="M0.721924 9.93097L4.85292 5.79997L0.721924 1.66897L1.99992 0.399973L7.39992 5.79997L1.99992 11.2L0.721924 9.93097Z"
-          :fill="colVisible ? '#506784' : 'rgba(80, 103, 132, 0.5)'"
-        />
-      </svg>
       {{ name }}
     </div>
     <div v-show="colVisible" class="columns">
@@ -27,9 +14,11 @@
 </template>
 
 <script>
+import TreeChevron from '@/components/svg/treeChevron'
 
 export default {
   name: 'TableDescription',
+  components: { TreeChevron },
   props: ['name', 'columns'],
   data () {
     return {

src/views/Main/Editor/Schema/index.vue

@@ -0,0 +1,140 @@
+<template>
+  <div id="schema-container">
+    <div id="schema-filter">
+      <text-field placeholder="Search table" width="100%" v-model="filter"/>
+    </div>
+    <div id="db">
+      <div @click="schemaVisible = !schemaVisible" class="db-name">
+        <tree-chevron v-show="schema.length > 0" :expanded="schemaVisible"/>
+        {{ dbName }}
+      </div>
+      <db-uploader id="db-edit" type="small" />
+      <export-icon tooltip="Export database" @click="exportToFile"/>
+      <add-table-icon @click="addCsv"/>
+    </div>
+    <div v-show="schemaVisible" class="schema">
+      <table-description
+        v-for="table in schema"
+        :key="table.name"
+        :name="table.name"
+        :columns="table.columns"
+      />
+    </div>
+
+    <!--Parse csv dialog  -->
+    <csv-import
+      ref="addCsv"
+      :file="file"
+      :db="$store.state.db"
+      dialog-name="addCsv"
+    />
+  </div>
+</template>
+
+<script>
+import fIo from '@/lib/utils/fileIo'
+import TableDescription from './TableDescription'
+import TextField from '@/components/TextField'
+import TreeChevron from '@/components/svg/treeChevron'
+import DbUploader from '@/components/DbUploader'
+import ExportIcon from '@/components/svg/export'
+import AddTableIcon from '@/components/svg/addTable'
+import CsvImport from '@/components/CsvImport'
+
+export default {
+  name: 'Schema',
+  components: {
+    TableDescription,
+    TextField,
+    TreeChevron,
+    DbUploader,
+    ExportIcon,
+    AddTableIcon,
+    CsvImport
+  },
+  data () {
+    return {
+      schemaVisible: true,
+      filter: null,
+      file: null
+    }
+  },
+  computed: {
+    schema () {
+      if (!this.$store.state.db.schema) {
+        return []
+      }
+
+      return !this.filter
+        ? this.$store.state.db.schema
+        : this.$store.state.db.schema.filter(
+          table => table.name.toUpperCase().indexOf(this.filter.toUpperCase()) !== -1
+        )
+    },
+    dbName () {
+      return this.$store.state.db.dbName
+    }
+  },
+  methods: {
+    exportToFile () {
+      this.$store.state.db.export(`${this.dbName}.sqlite`)
+    },
+    async addCsv () {
+      this.file = await fIo.getFileFromUser('.csv')
+      await this.$nextTick()
+      const csvImport = this.$refs.addCsv
+      csvImport.reset()
+      await csvImport.previewCsv()
+      csvImport.open()
+    }
+  }
+}
+</script>
+
+<style scoped>
+#schema-container {
+  position: relative;
+  padding-bottom: 24px;
+}
+
+.schema {
+  margin-left: 12px;
+  padding: 0 12px;
+}
+#schema-filter {
+  padding: 32px 12px;
+  position: sticky;
+  position: -webkit-sticky;
+  top: 0;
+  width: 100%;
+  height: 100px;
+  box-sizing: border-box;
+  background-image: linear-gradient(white 73%, rgba(255, 255, 255, 0));
+  z-index: 2;
+}
+.schema, .db-name {
+  color: var(--color-text-base);
+  font-size: 13px;
+  white-space: nowrap;
+}
+#db {
+  display: flex;
+  align-items: center;
+  margin-top: -5px;
+  padding: 0 12px;
+}
+
+.db-name {
+  cursor: pointer;
+  margin-right: 6px;
+  max-width: 150px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  flex-shrink: 0;
+}
+
+.db-name:hover .chevron-icon path,
+>>> .table-name:hover .chevron-icon path {
+  fill: var(--color-gray-dark);
+}
+</style>

src/views/Main/Editor/Tabs/Tab/Chart/chartHelper.js

@@ -0,0 +1,40 @@
+import dereference from 'react-chart-editor/lib/lib/dereference'
+
+export function getDataSourcesFromSqlResult (sqlResult) {
+  if (!sqlResult) {
+    return {}
+  }
+  const dataSorces = {}
+  const matrix = sqlResult.values
+  const [row] = matrix
+  const transposedMatrix = row.map((value, column) => matrix.map(row => row[column]))
+  sqlResult.columns.forEach((column, index) => {
+    dataSorces[column] = transposedMatrix[index]
+  })
+  return dataSorces
+}
+
+export function getOptionsFromDataSources (dataSources) {
+  return Object.keys(dataSources).map(name => ({
+    value: name,
+    label: name
+  }))
+}
+
+export function getChartStateForSave (state, dataSources) {
+  // we don't need to save the data, only settings
+  // so we modify state.data using dereference
+  const stateCopy = JSON.parse(JSON.stringify(state))
+  const emptySources = {}
+  for (const key in dataSources) {
+    emptySources[key] = []
+  }
+  dereference(stateCopy.data, emptySources)
+  return stateCopy
+}
+
+export default {
+  getDataSourcesFromSqlResult,
+  getOptionsFromDataSources,
+  getChartStateForSave
+}

src/views/Main/Editor/Tabs/Tab/Chart/index.vue

@@ -12,10 +12,12 @@
     :dataSourceOptions="dataSourceOptions"
     :plotly="plotly"
     @onUpdate="update"
+    @onRender="go"
     :useResizeHandler="true"
     :debug="true"
     :advancedTraceTypeSelector="true"
     class="chart"
+    ref="plotlyEditor"
     :style="{ height: !sqlResult ? 'calc(100% - 40px)' : '100%' }"
   />
 </div>
@@ -26,6 +28,7 @@ import plotly from 'plotly.js/dist/plotly'
 import 'react-chart-editor/lib/react-chart-editor.min.css'
 
 import PlotlyEditor from 'react-chart-editor'
+import chartHelper from './chartHelper'
 import dereference from 'react-chart-editor/lib/lib/dereference'
 
 export default {
@@ -46,23 +49,10 @@ export default {
   },
   computed: {
     dataSources () {
-      if (!this.sqlResult) {
+      return chartHelper.getDataSourcesFromSqlResult(this.sqlResult)
-        return {}
-      }
-      const dataSorces = {}
-      const matrix = this.sqlResult.values
-      const [row] = matrix
-      const transposedMatrix = row.map((value, column) => matrix.map(row => row[column]))
-      this.sqlResult.columns.forEach((column, index) => {
-        dataSorces[column] = transposedMatrix[index]
-      })
-      return dataSorces
     },
     dataSourceOptions () {
-      return Object.keys(this.dataSources).map(name => ({
+      return chartHelper.getOptionsFromDataSources(this.dataSources)
-        value: name,
-        label: name
-      }))
     }
   },
   watch: {
@@ -73,20 +63,15 @@ export default {
     }
   },
   methods: {
+    go (data, layout, frames) {
+      // TODO: check changes and enable Save button if needed
+    },
     update (data, layout, frames) {
       this.state = { data, layout, frames }
       this.$emit('update')
     },
-    getChartSatateForSave () {
+    getChartStateForSave () {
-      // we don't need to save the data, only settings
+      return chartHelper.getChartStateForSave(this.state, this.dataSources)
-      // so we modify state.data using dereference
-      const stateCopy = JSON.parse(JSON.stringify(this.state))
-      const emptySources = {}
-      for (const key in this.dataSources) {
-        emptySources[key] = []
-      }
-      dereference(stateCopy.data, emptySources)
-      return stateCopy
     }
   }
 }

src/views/Main/Editor/Tabs/Tab/SqlEditor/hint.js

@@ -0,0 +1,50 @@
+import CM from 'codemirror'
+import 'codemirror/addon/hint/show-hint.js'
+import 'codemirror/addon/hint/sql-hint.js'
+import store from '@/store'
+
+export function getHints (cm, options) {
+  const token = cm.getTokenAt(cm.getCursor()).string.toUpperCase()
+  const result = CM.hint.sql(cm, options)
+  // Don't show the hint if there is only one option
+  // and the token is already completed with this option
+  if (result.list.length === 1 && result.list[0].text.toUpperCase() === token) {
+    result.list = []
+  }
+  return result
+}
+
+const hintOptions = {
+  get tables () {
+    const tables = {}
+    if (store.state.db.schema) {
+      store.state.db.schema.forEach(table => {
+        tables[table.name] = table.columns.map(column => column.name)
+      })
+    }
+    return tables
+  },
+  get defaultTable () {
+    const schema = store.state.db.schema
+    return schema && schema.length === 1 ? schema[0].name : null
+  },
+  completeSingle: false,
+  completeOnSingleClick: true,
+  alignWithWord: false
+}
+
+export function showHintOnDemand (editor) {
+  CM.showHint(editor, getHints, hintOptions)
+}
+
+export default function showHint (editor) {
+  // Don't show autocomplete after a space or semicolon or in string literals
+  const token = editor.getTokenAt(editor.getCursor())
+  const ch = token.string.slice(-1)
+  const tokenType = token.type
+  if (tokenType === 'string' || !ch || ch === ' ' || ch === ';') {
+    return
+  }
+
+  CM.showHint(editor, getHints, hintOptions)
+}

src/views/Main/Editor/Tabs/Tab/SqlEditor/index.vue

@@ -0,0 +1,68 @@
+<template>
+  <div class="codemirror-container">
+    <codemirror ref="cm" v-model="query" :options="cmOptions" @changes="onChange" />
+  </div>
+</template>
+
+<script>
+import showHint, { showHintOnDemand } from './hint'
+import time from '@/lib/utils/time'
+import { codemirror } from 'vue-codemirror'
+import 'codemirror/lib/codemirror.css'
+import 'codemirror/mode/sql/sql.js'
+import 'codemirror/theme/neo.css'
+import 'codemirror/addon/hint/show-hint.css'
+import 'codemirror/addon/display/autorefresh.js'
+
+export default {
+  name: 'SqlEditor',
+  props: ['value'],
+  components: { codemirror },
+  data () {
+    return {
+      query: this.value,
+      cmOptions: {
+        // codemirror options
+        tabSize: 4,
+        mode: 'text/x-mysql',
+        theme: 'neo',
+        lineNumbers: true,
+        line: true,
+        autoRefresh: true,
+        extraKeys: { 'Ctrl-Space': showHintOnDemand }
+      }
+    }
+  },
+  watch: {
+    query () {
+      this.$emit('input', this.query)
+    }
+  },
+  methods: {
+    onChange: time.debounce(showHint, 400),
+    focus () {
+      this.$refs.cm.codemirror.focus()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.codemirror-container {
+  flex-grow: 1;
+  min-height: 0;
+}
+
+>>> .vue-codemirror {
+  height: 100%;
+  max-height: 100%;
+}
+>>> .CodeMirror {
+  height: 100%;
+  max-height: 100%;
+}
+>>> .CodeMirror-cursor {
+  width: 1px;
+  background: var(--color-text-base);
+}
+</style>

src/views/Main/Editor/Tabs/Tab/index.vue

@@ -8,33 +8,38 @@
     >
       <template #left-pane>
         <div class="query-editor">
-          <sql-editor v-model="query" />
+          <sql-editor ref="sqlEditor" v-model="query" />
         </div>
       </template>
       <template #right-pane>
         <div id="bottomPane" ref="bottomPane">
           <view-switcher :view.sync="view" />
           <div v-show="view === 'table'" class="table-view">
-            <div v-show="result === null && !isGettingResults && !error" class="table-preview">
+            <div
+              v-show="result === null && !isGettingResults && !error"
+              class="table-preview result-before"
+            >
               Run your query and get results here
             </div>
-            <div v-show="isGettingResults" class="table-preview">
+            <div v-if="isGettingResults" class="table-preview result-in-progress">
+              <loading-indicator :size="30"/>
               Fetching results...
             </div>
-            <div v-show="result === undefined && !isGettingResults && !error" class="table-preview">
+            <div
+              v-show="result === undefined && !isGettingResults && !error"
+              class="table-preview result-empty"
+            >
               No rows retrieved according to your query
             </div>
-            <div v-show="error" class="table-preview error">
+            <logs v-if="error" :messages="[error]"/>
-              {{ error }}
+            <sql-table v-if="result" :data-set="result" :time="time" :height="tableViewHeight" />
-            </div>
-            <sql-table v-if="result" :data-set="result" :height="tableViewHeight" />
           </div>
           <chart
             :visible="view === 'chart'"
             :sql-result="result"
             :init-chart="initChart"
             ref="chart"
-            @update="isUnsaved = true"
+            @update="$store.commit('updateTab', { index: tabIndex, isUnsaved: true })"
           />
         </div>
       </template>
@@ -44,10 +49,13 @@
 
 <script>
 import SqlTable from '@/components/SqlTable'
-import SqlEditor from '@/components/SqlEditor'
 import Splitpanes from '@/components/Splitpanes'
-import ViewSwitcher from '@/components/ViewSwitcher'
+import LoadingIndicator from '@/components/LoadingIndicator'
-import Chart from '@/components/Chart'
+import SqlEditor from './SqlEditor'
+import ViewSwitcher from './ViewSwitcher'
+import Chart from './Chart'
+import Logs from '@/components/Logs'
+import time from '@/lib/utils/time'
 
 export default {
   name: 'Tab',
@@ -57,7 +65,9 @@ export default {
     SqlTable,
     Splitpanes,
     ViewSwitcher,
-    Chart
+    Chart,
+    LoadingIndicator,
+    Logs
   },
   data () {
     return {
@@ -65,10 +75,10 @@ export default {
       result: null,
       view: 'table',
       tableViewHeight: 0,
-      isUnsaved: !this.initName,
       isGettingResults: false,
       error: null,
-      resizeObserver: null
+      resizeObserver: null,
+      time: 0
     }
   },
   computed: {
@@ -76,9 +86,6 @@ export default {
       return this.id === this.$store.state.currentTabId
     }
   },
-  created () {
-    this.$store.commit('setCurrentTab', this)
-  },
   mounted () {
     this.resizeObserver = new ResizeObserver(this.handleResize)
     this.resizeObserver.observe(this.$refs.bottomPane)
@@ -88,35 +95,39 @@ export default {
     this.resizeObserver.unobserve(this.$refs.bottomPane)
   },
   watch: {
-    isActive () {
+    isActive: {
-      if (this.isActive) {
+      immediate: true,
-        this.$store.commit('setCurrentTab', this)
+      async handler () {
+        if (this.isActive) {
+          this.$store.commit('setCurrentTab', this)
+          await this.$nextTick()
+          this.$refs.sqlEditor.focus()
+        }
       }
     },
     query () {
-      this.isUnsaved = true
+      this.$store.commit('updateTab', { index: this.tabIndex, isUnsaved: true })
-    },
-    isUnsaved () {
-      this.$store.commit('updateTabState', { index: this.tabIndex, newValue: this.isUnsaved })
     }
   },
   methods: {
     // Run a command in the database
-    execute () {
+    async execute () {
-      // this.$refs.output.textContent = 'Fetching results...' */
       this.isGettingResults = true
       this.result = null
       this.error = null
-      this.$db.execute(this.query + ';')
+      const state = this.$store.state
-        .then(result => {
+      try {
-          this.result = result
+        const start = new Date()
-        })
+        this.result = await state.db.execute(this.query + ';')
-        .catch(err => {
+        this.time = time.getPeriod(start, new Date())
-          this.error = err
+      } catch (err) {
-        })
+        this.error = {
-        .finally(() => {
+          type: 'error',
-          this.isGettingResults = false
+          message: err
-        })
+        }
+      }
+      state.db.refreshSchema()
+      this.isGettingResults = false
     },
     handleResize () {
       if (this.view === 'chart') {
@@ -131,15 +142,12 @@ export default {
     calculateTableHeight () {
       const bottomPane = this.$refs.bottomPane
       // 88 - view swittcher height
-      // 42 - table footer width
+      // 34 - table footer width
-      // 30 - desirable space after the table
+      // 12 - desirable space after the table
       // 5 - padding-bottom of rounded table container
-      // 40 - height of table header
+      // 35 - height of table header
-      const freeSpace = bottomPane.offsetHeight - 88 - 42 - 30 - 5 - 40
+      const freeSpace = bottomPane.offsetHeight - 88 - 34 - 12 - 5 - 35
-      this.tableViewHeight = freeSpace - (freeSpace % 40)
+      this.tableViewHeight = freeSpace - (freeSpace % 35)
-    },
-    getChartSatateForSave () {
-      return this.$refs.chart.getChartSatateForSave()
     }
   }
 }
@@ -186,11 +194,32 @@ export default {
   font-size: 13px;
 }
 
-.table-preview.error {
+.result-in-progress {
-  color: var(--color-text-error);
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  will-change: opacity;
+  /*
+    We need to show loader in 1 sec after starting query execution. We can't do that with
+    setTimeout because the main thread can be busy by getting a result set from the web worker.
+    But we can use CSS animation for opacity. Opacity triggers changes only in the Composite Layer
+    stage in rendering waterfall. Hence it can be processed only with Compositor Thread while
+    the Main Thread processes a result set.
+    https://www.viget.com/articles/animation-performance-101-browser-under-the-hood/
+  */
+  animation: show-loader 1s linear 0s 1;
 }
 
-.table-preview.error::first-letter {
+@keyframes show-loader {
-  text-transform: capitalize;
+  0% {
+    opacity: 0;
+  }
+  99% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
 }
 </style>

src/views/Main/Editor/Tabs/index.vue

@@ -0,0 +1,195 @@
+<template>
+   <div id="tabs">
+    <div id="tabs-header" v-if="tabs.length > 0">
+      <div
+        v-for="(tab, index) in tabs"
+        :key="index"
+        @click="selectTab(tab.id)"
+        :class="[{'tab-selected': (tab.id === selectedIndex)}, 'tab']"
+      >
+        <div class="tab-name">
+          <span v-show="tab.isUnsaved" class="star">*</span>
+          <span v-if="tab.name">{{ tab.name }}</span>
+          <span v-else class="tab-untitled">{{ tab.tempName }}</span>
+        </div>
+        <div>
+          <close-icon class="close-icon" :size="10" @click="beforeCloseTab(index)"/>
+        </div>
+      </div>
+    </div>
+    <tab
+      v-for="(tab, index) in tabs"
+      :key="tab.id"
+      :id="tab.id"
+      :init-name="tab.name"
+      :init-query="tab.query"
+      :init-chart="tab.chart"
+      :is-predefined="tab.isPredefined"
+      :tab-index="index"
+    />
+    <div v-show="tabs.length === 0" id="start-guide">
+      <span class="link" @click="$root.$emit('createNewQuery')">Create</span>
+      a new query from scratch or open the one from
+      <router-link class="link" to="/my-queries">My queries</router-link>
+    </div>
+
+    <!--Close tab warning dialog  -->
+    <modal name="close-warn" classes="dialog" height="auto">
+      <div class="dialog-header">
+        Close tab {{
+          closingTabIndex !== null
+          ? (tabs[closingTabIndex].name || `[${tabs[closingTabIndex].tempName}]`)
+          : ''
+        }}
+        <close-icon @click="$modal.hide('close-warn')"/>
+      </div>
+      <div class="dialog-body">
+        You have unsaved changes. Save changes in {{
+          closingTabIndex !== null
+          ? (tabs[closingTabIndex].name || `[${tabs[closingTabIndex].tempName}]`)
+          : ''
+        }} before closing?
+      </div>
+      <div class="dialog-buttons-container">
+        <button class="secondary" @click="closeTab(closingTabIndex)">
+          Close without saving
+        </button>
+        <button class="secondary" @click="$modal.hide('close-warn')">Cancel</button>
+        <button class="primary" @click="saveAndClose(closingTabIndex)">Save and close</button>
+      </div>
+    </modal>
+  </div>
+</template>
+
+<script>
+import Tab from './Tab'
+import CloseIcon from '@/components/svg/close'
+
+export default {
+  components: {
+    Tab,
+    CloseIcon
+  },
+  data () {
+    return {
+      closingTabIndex: null
+    }
+  },
+  computed: {
+    tabs () {
+      return this.$store.state.tabs
+    },
+    selectedIndex () {
+      return this.$store.state.currentTabId
+    }
+  },
+  created () {
+    window.addEventListener('beforeunload', this.leavingSqliteviz)
+  },
+  methods: {
+    leavingSqliteviz (event) {
+      if (this.tabs.some(tab => tab.isUnsaved)) {
+        event.preventDefault()
+        event.returnValue = ''
+      }
+    },
+    selectTab (id) {
+      this.$store.commit('setCurrentTabId', id)
+    },
+    beforeCloseTab (index) {
+      this.closingTabIndex = index
+      if (this.tabs[index].isUnsaved) {
+        this.$modal.show('close-warn')
+      } else {
+        this.closeTab(index)
+      }
+    },
+    closeTab (index) {
+      this.$modal.hide('close-warn')
+      this.closingTabIndex = null
+      this.$store.commit('deleteTab', index)
+    },
+    saveAndClose (index) {
+      this.$root.$on('querySaved', () => {
+        this.closeTab(index)
+        this.$root.$off('querySaved')
+      })
+      this.selectTab(this.tabs[index].id)
+      this.$modal.hide('close-warn')
+      this.$nextTick(() => {
+        this.$root.$emit('saveQuery')
+      })
+    }
+  }
+}
+</script>
+
+<style>
+#tabs {
+  position: relative;
+  height: 100%;
+  background-color: var(--color-bg-light);
+}
+#tabs-header {
+  display: flex;
+  margin: 0;
+  max-width: 100%;
+  overflow: hidden;
+}
+#tabs-header .tab {
+  height: 36px;
+  background-color: var(--color-bg-light);
+  border-right: 1px solid var(--color-border-light);
+  border-bottom: 1px solid var(--color-border-light);
+  line-height: 36px;
+  font-size: 14px;
+  color: var(--color-text-base);
+  padding: 0 12px;
+  box-sizing: border-box;
+  position: relative;
+  max-width: 200px;
+  display: flex;
+  flex-shrink: 1;
+  min-width: 0;
+}
+#tabs-header .tab-name {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  flex-shrink: 1;
+}
+
+#tabs-header div:hover {
+  cursor: pointer;
+}
+
+#tabs-header .tab-selected {
+  color: var(--color-text-active);
+  font-weight: 600;
+  border-bottom: none;
+  background-color: var(--color-white);
+}
+#tabs-header .tab-selected:hover {
+    cursor: default;
+}
+
+.close-icon {
+  margin-left: 5px;
+}
+
+#start-guide {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  color: var(--color-text-base);
+  font-size: 14px;
+  text-align: center;
+}
+.link {
+  color: var(--color-accent);
+  text-decoration: none;
+  cursor: pointer;
+  white-space: nowrap;
+}
+</style>

src/views/Main/Editor/index.vue

@@ -0,0 +1,62 @@
+<template>
+  <div>
+    <splitpanes
+      class="schema-tabs-splitter"
+      :before="{ size: 20, max: 30 }"
+      :after="{ size: 80, max: 100 }"
+    >
+      <template #left-pane>
+        <schema/>
+      </template>
+      <template #right-pane>
+        <tabs />
+      </template>
+    </splitpanes>
+  </div>
+</template>
+
+<script>
+import Splitpanes from '@/components/Splitpanes'
+import Schema from './Schema'
+import Tabs from './Tabs'
+
+export default {
+  name: 'Editor',
+  components: {
+    Schema,
+    Splitpanes,
+    Tabs
+  },
+  async beforeCreate () {
+    const schema = this.$store.state.db.schema
+    if (!schema || schema.length === 0) {
+      const stmt = [
+        '/*',
+        ' * Your database is empty. In order to start building charts',
+        ' * you should create a table and insert data into it.',
+        ' */',
+        'CREATE TABLE house',
+        '(',
+        '  name TEXT,',
+        '  points INTEGER',
+        ');',
+        'INSERT INTO house VALUES',
+        "('Gryffindor', 100),",
+        "('Hufflepuff', 90),",
+        "('Ravenclaw', 95),",
+        "('Slytherin', 80);"
+      ].join('\n')
+
+      const tabId = await this.$store.dispatch('addTab', { query: stmt })
+      this.$store.commit('setCurrentTabId', tabId)
+    }
+  }
+}
+</script>
+
+<style scoped>
+.schema-tabs-splitter {
+  height: 100%;
+  background-color: var(--color-white);
+}
+</style>

src/views/Main/MainMenu.vue

@@ -3,32 +3,42 @@
     <div>
       <router-link to="/editor">Editor</router-link>
       <router-link to="/my-queries">My queries</router-link>
+      <a href="https://github.com/lana-k/sqliteviz/wiki" target="_blank">Help</a>
     </div>
-    <div>
+    <div id="nav-buttons">
       <button
-        v-if="currentQuery"
+        id="run-btn"
+        v-if="currentQuery && $route.path === '/editor'"
         class="primary"
-        :disabled="currentQuery && (!$store.state.schema || !currentQuery.query)"
+        :disabled="runDisabled"
         @click="currentQuery.execute"
       >
         Run
       </button>
       <button
-        v-if="currentQuery"
+        id="save-btn"
+        v-show="currentQuery && $route.path === '/editor'"
         class="primary"
-        :disabled="currentQuery && !currentQuery.isUnsaved"
+        :disabled="!isUnsaved"
         @click="checkQueryBeforeSave"
       >
         Save
       </button>
-      <button class="primary" @click="createNewQuery">Create</button>
+      <button
+        id="create-btn"
+        class="primary"
+        @click="createNewQuery"
+      >
+        Create
+      </button>
+      <app-diagnostic-info />
     </div>
 
     <!--Save Query dialog  -->
     <modal name="save" classes="dialog" height="auto">
       <div class="dialog-header">
         Save query
-        <close-icon @click="$modal.hide('save')"/>
+        <close-icon @click="cancelSave"/>
       </div>
       <div class="dialog-body">
         <div v-show="isPredefined" id="save-note">
@@ -44,7 +54,7 @@
         />
       </div>
       <div class="dialog-buttons-container">
-        <button class="secondary" @click="$modal.hide('save')">Cancel</button>
+        <button class="secondary" @click="cancelSave">Cancel</button>
         <button class="primary" @click="saveQuery">Save</button>
       </div>
     </modal>
@@ -52,15 +62,17 @@
 </template>
 
 <script>
-import { nanoid } from 'nanoid'
 import TextField from '@/components/TextField'
 import CloseIcon from '@/components/svg/close'
+import storedQueries from '@/lib/storedQueries'
+import AppDiagnosticInfo from './AppDiagnosticInfo'
 
 export default {
   name: 'MainMenu',
   components: {
     TextField,
-    CloseIcon
+    CloseIcon,
+    AppDiagnosticInfo
   },
   data () {
     return {
@@ -72,71 +84,69 @@ export default {
     currentQuery () {
       return this.$store.state.currentTab
     },
+    isUnsaved () {
+      if (!this.currentQuery) {
+        return false
+      }
+      const tabIndex = this.currentQuery.tabIndex
+      const tab = this.$store.state.tabs[tabIndex]
+      return tab && tab.isUnsaved
+    },
     isPredefined () {
       if (this.currentQuery) {
         return this.currentQuery.isPredefined
       } else {
         return false
       }
+    },
+    runDisabled () {
+      return this.currentQuery && (!this.$store.state.db || !this.currentQuery.query)
     }
   },
   created () {
     this.$root.$on('createNewQuery', this.createNewQuery)
+    this.$root.$on('saveQuery', this.checkQueryBeforeSave)
+    document.addEventListener('keydown', this._keyListener)
+  },
+  beforeDestroy () {
+    document.removeEventListener('keydown', this._keyListener)
   },
   methods: {
     createNewQuery () {
-      const tab = {
+      this.$store.dispatch('addTab').then(id => {
-        id: nanoid(),
+        this.$store.commit('setCurrentTabId', id)
-        name: null,
+        if (this.$route.path !== '/editor') {
-        tempName: this.$store.state.untitledLastIndex
+          this.$router.push('/editor')
-          ? `Untitled ${this.$store.state.untitledLastIndex}`
+        }
-          : 'Untitled',
+      })
-        isUnsaved: true
+    },
-      }
+    cancelSave () {
-      this.$store.commit('addTab', tab)
+      this.$modal.hide('save')
-      this.$store.commit('setCurrentTabId', tab.id)
+      this.$root.$off('querySaved')
     },
     checkQueryBeforeSave () {
       this.errorMsg = null
-      const isFromScratch = !this.currentQuery.initName
+      this.name = ''
 
-      if (isFromScratch || this.isPredefined) {
+      if (storedQueries.isTabNeedName(this.currentQuery)) {
         this.$modal.show('save')
       } else {
         this.saveQuery()
       }
     },
     saveQuery () {
-      const isFromScratch = !this.currentQuery.initName
+      const isNeedName = storedQueries.isTabNeedName(this.currentQuery)
-      if ((isFromScratch || this.isPredefined) && !this.name) {
+      if (isNeedName && !this.name) {
         this.errorMsg = 'Query name can\'t be empty'
         return
       }
       const dataSet = this.currentQuery.result
       const tabView = this.currentQuery.view
-      // Prepare query
-      const value = {
-        id: this.isPredefined ? nanoid() : this.currentQuery.id,
-        query: this.currentQuery.query,
-        chart: this.currentQuery.getChartSatateForSave(),
-        name: (!this.isPredefined && this.currentQuery.initName) || this.name,
-        createdAt: new Date()
-      }
 
       // Save query
-      let myQueries = JSON.parse(localStorage.getItem('myQueries'))
+      const value = storedQueries.save(this.currentQuery, this.name)
-      if (!myQueries) {
-        myQueries = [value]
-      } else if (isFromScratch || this.isPredefined) {
-        myQueries.push(value)
-      } else {
-        const queryIndex = myQueries.findIndex(query => query.id === this.currentQuery.id)
-        value.createdAt = myQueries[queryIndex].createdAt
-        myQueries[queryIndex] = value
-      }
-      localStorage.setItem('myQueries', JSON.stringify(myQueries))
 
-      // Update tab
+      // Update tab in store
       this.$store.commit('updateTab', {
         index: this.currentQuery.tabIndex,
         name: value.name,
@@ -158,6 +168,35 @@ export default {
 
       // Hide dialog
       this.$modal.hide('save')
+
+      // Signal about saving
+      this.$root.$emit('querySaved')
+    },
+    _keyListener (e) {
+      if (this.$route.path === '/editor') {
+        // Run query Ctrl+R or Ctrl+Enter
+        if ((e.key === 'r' || e.key === 'Enter') && (e.ctrlKey || e.metaKey)) {
+          e.preventDefault()
+          if (!this.runDisabled) {
+            this.currentQuery.execute()
+          }
+          return
+        }
+
+        // Save query Ctrl+S
+        if (e.key === 's' && (e.ctrlKey || e.metaKey)) {
+          e.preventDefault()
+          if (this.isUnsaved) {
+            this.checkQueryBeforeSave()
+          }
+          return
+        }
+      }
+      // New (blank) query Ctrl+B
+      if (e.key === 'b' && (e.ctrlKey || e.metaKey)) {
+        e.preventDefault()
+        this.createNewQuery()
+      }
     }
   }
 }
@@ -177,7 +216,7 @@ nav {
   top: 0;
   left: 0;
   width: 100vw;
-  padding: 0 52px;
+  padding: 0 16px 0 52px;
   z-index: 999;
 }
 a {
@@ -202,4 +241,8 @@ button {
 #save-note img {
   margin: -3px 6px 0 0;
 }
+
+#nav-buttons {
+  display: flex;
+}
 </style>

src/views/Main/MyQueries/index.vue

@@ -2,33 +2,26 @@
   <div>
     <div id="start-guide" v-if="showedQueries.length === 0">
       You don't have saved queries so far.
-      <span class="link" @click="create">Create</span>
+      <span class="link" @click="$root.$emit('createNewQuery')">Create</span>
       the one from scratch or
-      <label for="import-file" class="link">import</label> from a file.
+      <span @click="importQueries" class="link">import</span> from a file.
     </div>
     <div id="my-queries-content" ref="my-queries-content" v-show="showedQueries.length > 0">
       <div id="my-queries-toolbar">
         <div id="toolbar-buttons">
-          <input
+          <button id="toolbar-btns-import" class="toolbar" @click="importQueries">
-            ref="importFile"
+            Import
-            type="file"
-            accept=".json"
-            id="import-file"
-            @change="importQueries"
-          />
-          <button class="toolbar">
-            <label for="import-file">
-              Import
-            </label>
           </button>
           <button
+            id="toolbar-btns-export"
             class="toolbar"
             v-show="selectedQueriesCount > 0"
-            @click="exportQuery(selectedQueriesIds)"
+            @click="exportSelectedQueries()"
           >
             Export
           </button>
           <button
+            id="toolbar-btns-delete"
             class="toolbar"
             v-show="selectedNotPredefinedCount > 0"
             @click="showDeleteDialog(selectedQueriesIds)"
@@ -52,15 +45,12 @@
           </div>
         </div>
       </div>
-      <div
+      <div class="table-container" :style="{ 'max-height': `${maxTableHeight}px` }">
-        class="table-container" :style="{ 'max-height': `${maxTableHeight}px` }"
-      >
         <table ref="table">
           <tbody>
             <tr
               v-for="(query, index) in showedQueries"
               :key="query.id"
-              :class="{ 'predefined': query.isPredefined }"
               @click="openQuery(index)"
             >
               <td ref="name-td">
@@ -72,9 +62,10 @@
                     />
                     <div class="name">{{ query.name }}</div>
                     <div
+                      v-if="query.isPredefined"
                       class="badge"
                       @mouseover="showTooltip"
-                      @mouseout="$set(tooltipStyle, 'visibility', 'hidden')"
+                      @mouseout="hideTooltip"
                     >
                       Predefined
                       <span class="icon-tooltip" :style="tooltipStyle">
@@ -90,8 +81,14 @@
                   <div class="icons-container">
                     <rename-icon v-if="!query.isPredefined" @click="showRenameDialog(query.id)" />
                     <copy-icon @click="duplicateQuery(index)"/>
-                    <export-icon @click="exportQuery(index)"/>
+                    <export-icon
-                    <delete-icon v-if="!query.isPredefined" @click="showDeleteDialog(query.id)"/>
+                      @click="exportToFile([query], `${query.name}.json`)"
+                      tooltip="Export query to file"
+                    />
+                    <delete-icon
+                      v-if="!query.isPredefined"
+                      @click="showDeleteDialog((new Set()).add(query.id))"
+                    />
                   </div>
                 </div>
               </td>
@@ -128,21 +125,8 @@
       Delete {{ deleteGroup ? 'queries' : 'query' }}
       <close-icon @click="$modal.hide('delete')"/>
     </div>
-    <div
+    <div class="dialog-body">
-      v-if="
+      {{ deleteDialogMsg }}
-        deleteGroup || (
-          currentQueryIndex !== null
-          && currentQueryIndex >= 0
-          && currentQueryIndex < queries.length
-        )
-      "
-      class="dialog-body"
-    >
-      Are you sure you want to delete
-      {{ deleteGroup
-        ? `${selectedNotPredefinedCount} ${selectedNotPredefinedCount > 1 ? 'queries' : 'query'}`
-        : `"${queries[currentQueryIndex].name}"`
-      }}?
       <div v-show="selectedQueriesCount > selectedNotPredefinedCount" id="note">
         <img :src="require('@/assets/images/info.svg')">
         Note: Predefined queries you've selected won't be deleted
@@ -153,20 +137,20 @@
       <button class="primary" @click="deleteQuery">Delete</button>
     </div>
   </modal>
-  <a ref="downloader" />
 </div>
 </template>
 
 <script>
-import RenameIcon from '@/components/svg/rename'
+import RenameIcon from './svg/rename'
-import CopyIcon from '@/components/svg/copy'
+import CopyIcon from './svg/copy'
 import ExportIcon from '@/components/svg/export'
-import DeleteIcon from '@/components/svg/delete'
+import DeleteIcon from './svg/delete'
 import CloseIcon from '@/components/svg/close'
 import TextField from '@/components/TextField'
 import CheckBox from '@/components/CheckBox'
-import tooltipMixin from '@/mixins/tooltips'
+import tooltipMixin from '@/tooltipMixin'
-import { nanoid } from 'nanoid'
+import storedQueries from '@/lib/storedQueries'
+import fu from '@/lib/utils/fileIo'
 
 export default {
   name: 'MyQueries',
@@ -185,7 +169,7 @@ export default {
       queries: [],
       filter: null,
       newName: null,
-      currentQueryId: null,
+      processedQueryId: null,
       errorMsg: null,
       selectedQueriesIds: new Set(),
       selectedQueriesCount: 0,
@@ -218,12 +202,36 @@ export default {
     allQueries () {
       return this.predefinedQueries.concat(this.queries)
     },
-    currentQueryIndex () {
+    processedQueryIndex () {
-      return this.queries.findIndex(query => query.id === this.currentQueryId)
+      return this.queries.findIndex(query => query.id === this.processedQueryId)
+    },
+    deleteDialogMsg () {
+      if (!this.deleteGroup && (
+        this.processedQueryIndex === null ||
+          this.processedQueryIndex < 0 ||
+          this.processedQueryIndex > this.queries.length
+      )) {
+        return ''
+      }
+
+      const deleteItem = this.deleteGroup
+        ? `${this.selectedNotPredefinedCount} ${this.selectedNotPredefinedCount > 1
+          ? 'queries'
+          : 'query'}`
+        : `"${this.queries[this.processedQueryIndex].name}"`
+
+      return `Are you sure you want to delete ${deleteItem}?`
     }
   },
   created () {
-    this.queries = JSON.parse(localStorage.getItem('myQueries')) || []
+    storedQueries.readPredefinedQueries()
+      .then(queries => {
+        this.$store.commit('updatePredefinedQueries', queries)
+      })
+      .catch(console.error)
+      .finally(() => {
+        this.queries = storedQueries.getStoredQueries()
+      })
   },
   mounted () {
     this.resizeObserver = new ResizeObserver(this.calcMaxTableHeight)
@@ -264,21 +272,17 @@ export default {
       const freeSpace = this.$refs['my-queries-content'].offsetHeight - 200
       this.maxTableHeight = freeSpace - (freeSpace % 40) + 1
     },
-    create () {
-      this.$root.$emit('createNewQuery')
-      this.$router.push('/editor')
-    },
     openQuery (index) {
-      const tab = JSON.parse(JSON.stringify(this.showedQueries[index]))
+      const tab = this.showedQueries[index]
-      tab.isUnsaved = false
+      this.$store.dispatch('addTab', tab).then(id => {
-      this.$store.commit('addTab', tab)
+        this.$store.commit('setCurrentTabId', id)
-      this.$store.commit('setCurrentTabId', tab.id)
+        this.$router.push('/editor')
-      this.$router.push('/editor')
+      })
     },
     showRenameDialog (id) {
       this.errorMsg = null
-      this.currentQueryId = id
+      this.processedQueryId = id
-      this.newName = this.queries[this.currentQueryIndex].name
+      this.newName = this.queries[this.processedQueryIndex].name
       this.$modal.show('rename')
     },
     renameQuery () {
@@ -286,134 +290,102 @@ export default {
         this.errorMsg = 'Query name can\'t be empty'
         return
       }
-      const currentQuery = this.queries[this.currentQueryIndex]
+      const processedQuery = this.queries[this.processedQueryIndex]
-      currentQuery.name = this.newName
+      processedQuery.name = this.newName
-      this.$set(this.queries, this.currentQueryIndex, currentQuery)
+      this.$set(this.queries, this.processedQueryIndex, processedQuery)
 
       // update queries in local storage
-      this.saveQueriesInLocalStorage()
+      storedQueries.updateStorage(this.queries)
 
       // update tab, if renamed query is opened
-      const tabIndex = this.findTabIndex(currentQuery.id)
+      const tabIndex = this.findTabIndex(processedQuery.id)
       if (tabIndex >= 0) {
         this.$store.commit('updateTab', {
           index: tabIndex,
           name: this.newName,
-          id: currentQuery.id
+          id: processedQuery.id
         })
       }
       // hide dialog
       this.$modal.hide('rename')
     },
     duplicateQuery (index) {
-      const newQuery = JSON.parse(JSON.stringify(this.showedQueries[index]))
+      const newQuery = storedQueries.duplicateQuery(this.showedQueries[index])
-      newQuery.name = newQuery.name + ' Copy'
-      newQuery.id = nanoid()
-      newQuery.createdAt = new Date()
-      delete newQuery.isPredefined
       if (this.selectAll) {
         this.selectedQueriesIds.add(newQuery.id)
         this.selectedQueriesCount = this.selectedQueriesIds.size
       }
       this.queries.push(newQuery)
-      this.saveQueriesInLocalStorage()
+      storedQueries.updateStorage(this.queries)
     },
-    showDeleteDialog (id) {
+    showDeleteDialog (idsSet) {
-      this.deleteGroup = typeof id !== 'string'
+      this.deleteGroup = idsSet.size > 1
       if (!this.deleteGroup) {
-        this.currentQueryId = id
+        this.processedQueryId = idsSet.values().next().value
       }
       this.$modal.show('delete')
     },
     deleteQuery () {
       this.$modal.hide('delete')
       if (!this.deleteGroup) {
-        this.queries.splice(this.currentQueryIndex, 1)
+        this.queries.splice(this.processedQueryIndex, 1)
-        const tabIndex = this.findTabIndex(this.currentQueryId)
+
+        // Close deleted query tab if it was opened
+        const tabIndex = this.findTabIndex(this.processedQueryId)
         if (tabIndex >= 0) {
           this.$store.commit('deleteTab', tabIndex)
         }
-        if (this.selectedQueriesIds.has(this.currentQueryId)) {
+
-          this.selectedQueriesIds.delete(this.currentQueryId)
+        // Clear checkboxes
+        if (this.selectedQueriesIds.has(this.processedQueryId)) {
+          this.selectedQueriesIds.delete(this.processedQueryId)
         }
       } else {
         this.queries = this.selectAll
           ? []
           : this.queries.filter(query => !this.selectedQueriesIds.has(query.id))
+
+        // Close deleted queries if it was opened
         const tabs = this.$store.state.tabs
         for (let i = tabs.length - 1; i >= 0; i--) {
           if (this.selectedQueriesIds.has(tabs[i].id)) {
             this.$store.commit('deleteTab', i)
           }
         }
+
+        // Clear checkboxes
         this.selectedQueriesIds.clear()
       }
       this.selectedQueriesCount = this.selectedQueriesIds.size
-      this.saveQueriesInLocalStorage()
+      storedQueries.updateStorage(this.queries)
     },
     findTabIndex (id) {
       return this.$store.state.tabs.findIndex(tab => tab.id === id)
     },
-    exportQuery (index) {
+    exportToFile (queryList, fileName) {
-      let data
+      const jsonStr = storedQueries.serialiseQueries(queryList)
-      let name
+      fu.exportToFile(jsonStr, fileName)
+    },
+    exportSelectedQueries () {
+      const queryList = this.selectAll
+        ? this.allQueries
+        : this.allQueries.filter(query => this.selectedQueriesIds.has(query.id))
 
-      // single operation
+      this.exportToFile(queryList, 'My sqliteviz queries.json')
-      if (typeof index === 'number') {
-        data = JSON.parse(JSON.stringify(this.showedQueries[index]))
-        name = data.name
-        delete data.isPredefined
-      } else {
-        // group operation
-        data = this.selectAll
-          ? JSON.parse(JSON.stringify(this.allQueries))
-          : this.allQueries.filter(query => this.selectedQueriesIds.has(query.id))
-        name = 'My sqliteviz queries'
-        data.forEach(query => delete query.isPredefined)
-      }
-
-      // export data to file
-      const downloader = this.$refs.downloader
-      const json = JSON.stringify(data, null, 4)
-      const blob = new Blob([json], { type: 'octet/stream' })
-      const url = window.URL.createObjectURL(blob)
-      downloader.href = url
-      downloader.download = `${name}.json`
-      downloader.click()
-      window.URL.revokeObjectURL(url)
     },
     importQueries () {
-      const file = this.$refs.importFile.files[0]
+      storedQueries.importQueries()
-      const reader = new FileReader()
+        .then(importedQueries => {
-      reader.onload = (e) => {
+          if (this.selectAll) {
-        let importedQueries = JSON.parse(e.target.result)
+            importedQueries.forEach(query => {
-
+              this.selectedQueriesIds.add(query.id)
-        if (!Array.isArray(importedQueries)) {
+            })
-          importedQueries = [importedQueries]
+            this.selectedQueriesCount = this.selectedQueriesIds.size
-        }
-
-        importedQueries.forEach(query => {
-          const allQueriesIds = this.allQueries.map(query => query.id)
-          if (new Set(allQueriesIds).has(query.id)) {
-            query.id = nanoid()
           }
+
+          this.queries = this.queries.concat(importedQueries)
+          storedQueries.updateStorage(this.queries)
         })
-
-        if (this.selectAll) {
-          importedQueries.forEach(query => {
-            this.selectedQueriesIds.add(query.id)
-          })
-          this.selectedQueriesCount = this.selectedQueriesIds.size
-        }
-
-        this.queries = this.queries.concat(importedQueries)
-        this.saveQueriesInLocalStorage()
-        this.$refs.importFile.value = null
-      }
-      reader.readAsText(file)
-    },
-    saveQueriesInLocalStorage () {
-      localStorage.setItem('myQueries', JSON.stringify(this.queries))
     },
     toggleSelectAll (checked) {
       this.selectAll = checked
@@ -476,6 +448,7 @@ export default {
 }
 
 .rounded-bg {
+  padding-top: 40px;
   margin: 0 auto;
   max-width: 1500px;
   width: 100%;
@@ -551,27 +524,16 @@ tbody tr:hover td {
   text-overflow: ellipsis;
 }
 tbody tr:hover .icons-container {
-  display: block;
+  display: flex;
 }
 .dialog input {
   width: 100%;
 }
-a, #import-file {
+
-  display: none;
-}
 button.toolbar {
   margin-right: 16px;
 }
 
-button label {
-  display: block;
-  line-height: 36px;
-}
-
-button label:hover {
-  cursor: pointer;
-}
-
 .badge {
   display: none;
   background-color: var(--color-gray-light-4);
@@ -583,7 +545,7 @@ button label:hover {
   margin-left: 12px;
 }
 
-tbody tr.predefined:hover .badge {
+tbody tr:hover .badge {
   display: block;
 }
 #note {

src/views/Main/MyQueries/svg/copy.vue

@@ -9,7 +9,7 @@
       xmlns="http://www.w3.org/2000/svg"
       @click.stop="$emit('click')"
       @mouseover="showTooltip"
-      @mouseout="$set(tooltipStyle, 'visibility', 'hidden')"
+      @mouseout="hideTooltip"
     >
       <path
         d="M14.25 15.75H6V5.25H14.25V15.75ZM14.25 3.75H6C5.60218 3.75 5.22064 3.90804 4.93934 4.18934C4.65804 4.47064 4.5 4.85218 4.5 5.25V15.75C4.5 16.1478 4.65804 16.5294 4.93934 16.8107C5.22064 17.092 5.60218 17.25 6 17.25H14.25C14.6478 17.25 15.0294 17.092 15.3107 16.8107C15.592 16.5294 15.75 16.1478 15.75 15.75V5.25C15.75 4.85218 15.592 4.47064 15.3107 4.18934C15.0294 3.90804 14.6478 3.75 14.25 3.75ZM12 0.75H3C2.60218 0.75 2.22064 0.908035 1.93934 1.18934C1.65804 1.47064 1.5 1.85218 1.5 2.25V12.75H3V2.25H12V0.75Z"
@@ -23,7 +23,7 @@
 </template>
 
 <script>
-import tooltipMixin from '@/mixins/tooltips'
+import tooltipMixin from '@/tooltipMixin'
 
 export default {
   name: 'CopyIcon',
@@ -33,7 +33,7 @@ export default {
 
 <style scoped>
 .icon {
-  vertical-align: middle;
+  display: block;
   margin: 0 12px;
 }
 .icon:hover path {

src/views/Main/MyQueries/svg/delete.vue

@@ -9,7 +9,7 @@
       xmlns="http://www.w3.org/2000/svg"
       @click.stop="$emit('click')"
       @mouseover="showTooltip"
-      @mouseout="$set(tooltipStyle, 'visibility', 'hidden')"
+      @mouseout="hideTooltip"
     >
       <path
         d="M6.75 2.25V3H3V4.5H3.75V14.25C3.75 14.6478 3.90804 15.0294 4.18934 15.3107C4.47064 15.592 4.85218 15.75 5.25 15.75H12.75C13.1478 15.75 13.5294 15.592 13.8107 15.3107C14.092 15.0294 14.25 14.6478 14.25 14.25V4.5H15V3H11.25V2.25H6.75ZM5.25 4.5H12.75V14.25H5.25V4.5ZM6.75 6V12.75H8.25V6H6.75ZM9.75 6V12.75H11.25V6H9.75Z"
@@ -23,7 +23,7 @@
 </template>
 
 <script>
-import tooltipMixin from '@/mixins/tooltips'
+import tooltipMixin from '@/tooltipMixin'
 
 export default {
   name: 'DeleteIcon',
@@ -33,7 +33,7 @@ export default {
 
 <style scoped>
 .icon {
-  vertical-align: middle;
+  display: block;
   margin: 0 12px;
 }
 

src/views/Main/MyQueries/svg/rename.vue

@@ -9,7 +9,7 @@
       xmlns="http://www.w3.org/2000/svg"
       @click.stop="$emit('click')"
       @mouseover="showTooltip"
-      @mouseout="$set(tooltipStyle, 'visibility', 'hidden')"
+      @mouseout="hideTooltip"
     >
       <path
         d="M10.545 6.75L11.25 7.455L4.44 14.25H3.75V13.56L10.545 6.75ZM13.245 2.25C13.0575 2.25 12.8625 2.325 12.72 2.4675L11.3475 3.84L14.16 6.6525L15.5325 5.28C15.825 4.9875 15.825 4.5 15.5325 4.2225L13.7775 2.4675C13.6275 2.3175 13.44 2.25 13.245 2.25ZM10.545 4.6425L2.25 12.9375V15.75H5.0625L13.3575 7.455L10.545 4.6425Z"
@@ -23,7 +23,7 @@
 </template>
 
 <script>
-import tooltipMixin from '@/mixins/tooltips'
+import tooltipMixin from '@/tooltipMixin'
 
 export default {
   name: 'RenameIcon',
@@ -33,7 +33,7 @@ export default {
 
 <style scoped>
 .icon {
-  vertical-align: middle;
+  display: block;
   margin: 0 12px;
 }
 

src/views/Main/index.vue

@@ -0,0 +1,25 @@
+<template>
+  <div>
+    <main-menu />
+    <keep-alive include="Editor">
+      <router-view id="main-view" />
+    </keep-alive>
+  </div>
+</template>
+
+<script>
+import MainMenu from './MainMenu'
+import '@/assets/styles/scrollbars.css'
+
+export default {
+  name: 'Main',
+  components: { MainMenu }
+}
+</script>
+<style scoped>
+#main-view {
+  margin-top: 68px;
+  height: calc(100vh - 68px);
+  overflow-y: auto;
+}
+</style>