diff --git a/.pnp.cjs b/.pnp.cjs index 71e1dd9d8..91c2beb21 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -5234,7 +5234,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["@types/throttle-debounce", "npm:2.1.0"],\ ["@typescript-eslint/eslint-plugin", "virtual:b7c775051d99785ec73273707ec685f06b84c737b39cc023ebc60bda25254288f27e86643fb15b7a00bd8a6d76cc119d4628443d858e76eb62af2718d7eb18cf#npm:5.27.1"],\ ["@typescript-eslint/parser", "virtual:b7c775051d99785ec73273707ec685f06b84c737b39cc023ebc60bda25254288f27e86643fb15b7a00bd8a6d76cc119d4628443d858e76eb62af2718d7eb18cf#npm:5.27.1"],\ - ["ace-builds", "npm:1.4.11"],\ ["animate.css", "npm:3.7.2"],\ ["babel-loader", "virtual:b7c775051d99785ec73273707ec685f06b84c737b39cc023ebc60bda25254288f27e86643fb15b7a00bd8a6d76cc119d4628443d858e76eb62af2718d7eb18cf#npm:8.2.5"],\ ["babel-plugin-styled-components", "virtual:b7c775051d99785ec73273707ec685f06b84c737b39cc023ebc60bda25254288f27e86643fb15b7a00bd8a6d76cc119d4628443d858e76eb62af2718d7eb18cf#npm:2.0.7"],\ @@ -5262,7 +5261,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["eslint-plugin-standard", "virtual:b7c775051d99785ec73273707ec685f06b84c737b39cc023ebc60bda25254288f27e86643fb15b7a00bd8a6d76cc119d4628443d858e76eb62af2718d7eb18cf#npm:5.0.0"],\ ["file-loader", "virtual:b7c775051d99785ec73273707ec685f06b84c737b39cc023ebc60bda25254288f27e86643fb15b7a00bd8a6d76cc119d4628443d858e76eb62af2718d7eb18cf#npm:6.0.0"],\ ["fork-ts-checker-webpack-plugin", "virtual:b7c775051d99785ec73273707ec685f06b84c737b39cc023ebc60bda25254288f27e86643fb15b7a00bd8a6d76cc119d4628443d858e76eb62af2718d7eb18cf#npm:6.1.0"],\ - ["glyphicons-halflings", "npm:1.9.1"],\ ["handlebars", "npm:4.7.7"],\ ["handlebars-loader", "virtual:b7c775051d99785ec73273707ec685f06b84c737b39cc023ebc60bda25254288f27e86643fb15b7a00bd8a6d76cc119d4628443d858e76eb62af2718d7eb18cf#npm:1.7.1"],\ ["html-webpack-plugin", "virtual:b7c775051d99785ec73273707ec685f06b84c737b39cc023ebc60bda25254288f27e86643fb15b7a00bd8a6d76cc119d4628443d858e76eb62af2718d7eb18cf#npm:5.5.0"],\ @@ -10239,15 +10237,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["ace-builds", [\ - ["npm:1.4.11", {\ - "packageLocation": "./.yarn/cache/ace-builds-npm-1.4.11-424948fb36-11822e70e8.zip/node_modules/ace-builds/",\ - "packageDependencies": [\ - ["ace-builds", "npm:1.4.11"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["acorn", [\ ["npm:7.4.1", {\ "packageLocation": "./.yarn/cache/acorn-npm-7.4.1-f450b4646c-1860f23c21.zip/node_modules/acorn/",\ @@ -16313,15 +16302,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["glyphicons-halflings", [\ - ["npm:1.9.1", {\ - "packageLocation": "./.yarn/cache/glyphicons-halflings-npm-1.9.1-a68a589ee6-f966533753.zip/node_modules/glyphicons-halflings/",\ - "packageDependencies": [\ - ["glyphicons-halflings", "npm:1.9.1"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["gonzales-pe", [\ ["npm:4.3.0", {\ "packageLocation": "./.yarn/cache/gonzales-pe-npm-4.3.0-82921c6976-49d60fc49a.zip/node_modules/gonzales-pe/",\ diff --git a/.yarn/cache/ace-builds-npm-1.4.11-424948fb36-11822e70e8.zip b/.yarn/cache/ace-builds-npm-1.4.11-424948fb36-11822e70e8.zip deleted file mode 100644 index b81f4899d..000000000 Binary files a/.yarn/cache/ace-builds-npm-1.4.11-424948fb36-11822e70e8.zip and /dev/null differ diff --git a/.yarn/cache/glyphicons-halflings-npm-1.9.1-a68a589ee6-f966533753.zip b/.yarn/cache/glyphicons-halflings-npm-1.9.1-a68a589ee6-f966533753.zip deleted file mode 100644 index 3e1a3ed87..000000000 Binary files a/.yarn/cache/glyphicons-halflings-npm-1.9.1-a68a589ee6-f966533753.zip and /dev/null differ diff --git a/packages/web-console/.eslintrc.js b/packages/web-console/.eslintrc.js index 02a950a09..de7d3ea48 100644 --- a/packages/web-console/.eslintrc.js +++ b/packages/web-console/.eslintrc.js @@ -37,7 +37,6 @@ module.exports = { "plugin:react-hooks/recommended", "plugin:prettier/recommended", ], - globals: { ace: true }, parser: "@typescript-eslint/parser", parserOptions: { ecmaFeatures: {}, diff --git a/packages/web-console/README.md b/packages/web-console/README.md index ba476c021..f4a93c0d7 100644 --- a/packages/web-console/README.md +++ b/packages/web-console/README.md @@ -7,7 +7,7 @@ Yarn@3 and Webpack. ## Local development setup -### TL;DR; +## TL;DR; ``` git clone git@github.com/questdb/ui.git @@ -66,3 +66,23 @@ yarn workspace @questdb/web-console run build ``` 3. Build process emits static HTML, CSS and JS files in `packages/web-console/dist` + +## Run tests + +This monorepo contains `browser-tests` package which is used to test +`web-console` package. `browser-tests` does not yet run as part of +`web-console` build on CI, but they can be used to test changes locally. + +Tests are written with [Cypress](https://www.cypress.io/) E2E framework. + +1. start `web-console` local dev environment as explained above in this document. +2. run tests with + ``` + yarn workspace browser-tests test + ``` + + or + + ``` + yarn workspace browser-tests run cypress open + ``` diff --git a/packages/web-console/package.json b/packages/web-console/package.json index d768339ba..7133fa279 100644 --- a/packages/web-console/package.json +++ b/packages/web-console/package.json @@ -24,14 +24,6 @@ "@monaco-editor/react": "^4.3.1", "@popperjs/core": "2.4.2", "@questdb/sql-grammar": "1.0.9", - "@types/ramda": "0.27.40", - "@types/react": "16.9.35", - "@types/react-dom": "16.9.8", - "@types/react-redux": "7.1.9", - "@types/react-transition-group": "4.4.0", - "@types/styled-components": "5.1.7", - "@types/throttle-debounce": "2.1.0", - "ace-builds": "1.4.11", "animate.css": "3.7.2", "bootstrap-sass": "3.4.1", "clipboard": "2.0.6", @@ -40,7 +32,6 @@ "docsearch.js": "2.6.3", "dotenv": "^10.0.0", "echarts": "^5.2.2", - "glyphicons-halflings": "1.9.1", "jquery": "3.5.1", "monaco-editor": "^0.30.1", "prop-types": "^15.8.1", @@ -70,6 +61,13 @@ "@babel/preset-react": "^7.17.12", "@babel/preset-typescript": "^7.17.12", "@types/node": "^17.0.41", + "@types/ramda": "0.27.40", + "@types/react": "16.9.35", + "@types/react-dom": "16.9.8", + "@types/react-redux": "7.1.9", + "@types/react-transition-group": "4.4.0", + "@types/styled-components": "5.1.7", + "@types/throttle-debounce": "2.1.0", "@typescript-eslint/eslint-plugin": "^5.0.0", "@typescript-eslint/parser": "^5.0.0", "babel-loader": "^8.2.5", diff --git a/packages/web-console/src/js/console/console-controller.js b/packages/web-console/src/js/console/console-controller.js index aea128c93..9be5452ac 100644 --- a/packages/web-console/src/js/console/console-controller.js +++ b/packages/web-console/src/js/console/console-controller.js @@ -24,8 +24,6 @@ import $ from "jquery" -import * as qdb from "./globals" - export function setupConsoleController(bus) { const grid = $("#grid") const quickVis = $("#quick-vis") diff --git a/packages/web-console/src/js/console/globals.js b/packages/web-console/src/js/console/globals.js index e68af69ef..a4aaf6280 100644 --- a/packages/web-console/src/js/console/globals.js +++ b/packages/web-console/src/js/console/globals.js @@ -22,8 +22,6 @@ * ******************************************************************************/ -import $ from "jquery" - const queryBatchSize = 1000 const MSG_QUERY_EXPORT = "query.in.export" const MSG_QUERY_EXEC = "query.in.exec" @@ -41,36 +39,10 @@ const MSG_EDITOR_EXECUTE_ALT = "editor.execute.alt" const MSG_CHART_DRAW = "chart.draw" -export function toExportUrl(query) { - return ( - window.location.protocol + - "//" + - window.location.host + - "/exp?query=" + - encodeURIComponent(query) - ) -} - export function setHeight(element, height) { element.css("height", height + "px") } -export function createEditor(div) { - const edit = ace.edit(div) - edit.getSession().setMode("ace/mode/questdb") - edit.setTheme("ace/theme/dracula") - edit.setShowPrintMargin(false) - edit.setDisplayIndentGuides(false) - edit.setHighlightActiveLine(false) - edit.$blockScrolling = Infinity - - $(window).on("resize", function () { - edit.resize() - }) - - return edit -} - export { MSG_QUERY_EXPORT, MSG_QUERY_EXEC, diff --git a/packages/web-console/src/js/console/import-controller.js b/packages/web-console/src/js/console/import-controller.js index a47605983..04486ff93 100644 --- a/packages/web-console/src/js/console/import-controller.js +++ b/packages/web-console/src/js/console/import-controller.js @@ -31,7 +31,6 @@ let upperHalfHeight = 515 function resize() { const footer = $(".footer") const importTopPanel = $("#import-top") - const canvasPanel = importTopPanel.find(".ud-canvas") const importDetail = $("#import-detail") const importMenu = $("#import-menu")[0] const h = $(window)[0].innerHeight @@ -42,9 +41,6 @@ function resize() { importDetail, h - footerHeight - upperHalfHeight - importMenu.offsetHeight - 50, ) - - let r1 = importTopPanel[0].getBoundingClientRect() - let r2 = canvasPanel[0].getBoundingClientRect() } function splitterResize(x, p) { diff --git a/packages/web-console/src/js/console/quick-vis.js b/packages/web-console/src/js/console/quick-vis.js index a51453d39..fdf714a28 100644 --- a/packages/web-console/src/js/console/quick-vis.js +++ b/packages/web-console/src/js/console/quick-vis.js @@ -38,7 +38,6 @@ echarts.use([LegendComponent, GridComponent]) // https://stackoverflow.com/questions/7837456/how-to-compare-arrays-in-javascript // -// attach the .equals method to Array's prototype to call it on any array function arrayEquals(left, right) { // if the other array is a falsy value, return if (!left || !right) { @@ -68,17 +67,6 @@ function arrayEquals(left, right) { // end of copy paste $.fn.quickVis = function (msgBus) { - var defaults = { - minColumnWidth: 60, - rowHeight: 28, - divCacheSize: 128, - viewportHeight: 400, - yMaxThreshold: 10000000, - maxRowsToAnalyze: 100, - bottomMargin: 75, - minVpHeight: 120, - minDivHeight: 160, - } var bus = msgBus var div = $(this) const btnDraw = $("#_qvis_frm_draw") diff --git a/packages/web-console/src/styles/_badgets_labels.scss b/packages/web-console/src/styles/_badgets_labels.scss deleted file mode 100755 index 9de9a0e88..000000000 --- a/packages/web-console/src/styles/_badgets_labels.scss +++ /dev/null @@ -1,101 +0,0 @@ -/*!****************************************************************************** - * ___ _ ____ ____ - * / _ \ _ _ ___ ___| |_| _ \| __ ) - * | | | | | | |/ _ \/ __| __| | | | _ \ - * | |_| | |_| | __/\__ \ |_| |_| | |_) | - * \__\_\\__,_|\___||___/\__|____/|____/ - * - * Copyright (c) 2014-2019 Appsicle - * Copyright (c) 2019-2022 QuestDB - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - ******************************************************************************/ - -.label { - background-color: $light-gray; - color: $label-badget-color; - font-family: "Open Sans", -apple-system, BlinkMacSystemFont, Helvetica, Roboto, - sans-serif; - font-size: 10px; - font-weight: 600; - padding: 3px 8px; - text-shadow: none; -} - -.badge { - background-color: $light-gray; - color: $label-badget-color; - font-family: "Open Sans", -apple-system, BlinkMacSystemFont, Helvetica, Roboto, - sans-serif; - font-size: 11px; - font-weight: 600; - padding-bottom: 4px; - padding-left: 6px; - padding-right: 6px; - text-shadow: none; -} - -.label-primary, -.badge-primary { - background-color: $navy; - color: #ffffff; -} - -.label-success, -.badge-success { - background-color: $blue; - color: #ffffff; -} - -.label-warning, -.badge-warning { - background-color: $yellow; - color: #ffffff; -} - -.label-warning-light, -.badge-warning-light { - background-color: $yellow; - color: #ffffff; -} - -.label-danger, -.badge-danger { - background-color: $red; - color: #ffffff; -} - -.label-info, -.badge-info { - background-color: $lazur; - color: #ffffff; -} - -.label-inverse, -.badge-inverse { - background-color: #262626; - color: #ffffff; -} - -.label-white, -.badge-white { - background-color: #ffffff; - color: #5e5e5e; -} - -.label-white, -.badge-disable { - background-color: #2a2e36; - color: #8b91a0; -} diff --git a/packages/web-console/src/styles/_base.scss b/packages/web-console/src/styles/_base.scss index 31225433e..92afa4182 100755 --- a/packages/web-console/src/styles/_base.scss +++ b/packages/web-console/src/styles/_base.scss @@ -59,14 +59,6 @@ body { scrollbar-width: thin; } -.ace_scrollbar-v { - width: 10px !important; -} - -.ace_scrollbar-h { - height: 10px !important; -} - html, body { height: 100%; @@ -837,15 +829,6 @@ table.table-mail tr td { font-size: inherit; } -.jumbotron { - border-radius: 6px; - padding: 40px; -} - -.jumbotron h1 { - margin-top: 0; -} - /* COLORS */ .text-navy { diff --git a/packages/web-console/src/styles/_metismenu.scss b/packages/web-console/src/styles/_metismenu.scss deleted file mode 100755 index 15cc748d9..000000000 --- a/packages/web-console/src/styles/_metismenu.scss +++ /dev/null @@ -1,101 +0,0 @@ -/*!****************************************************************************** - * ___ _ ____ ____ - * / _ \ _ _ ___ ___| |_| _ \| __ ) - * | | | | | | |/ _ \/ __| __| | | | _ \ - * | |_| | |_| | __/\__ \ |_| |_| | |_) | - * \__\_\\__,_|\___||___/\__|____/|____/ - * - * Copyright (c) 2014-2019 Appsicle - * Copyright (c) 2019-2022 QuestDB - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - ******************************************************************************/ - -/* - * metismenu - v2.0.2 - * A jQuery menu plugin - * https://github.com/onokumus/metisMenu - * - * Made by Osman Nuri Okumus - * Under MIT License - */ - -.metismenu .plus-minus, -.metismenu .plus-times { - float: right; -} - -.metismenu .arrow { - float: right; - line-height: 1.42857; -} - -.metismenu .glyphicon.arrow:before { - content: "\e079"; -} - -.metismenu .active > a > .glyphicon.arrow:before { - content: "\e114"; -} - -.metismenu .fa.arrow:before { - content: "\f104"; -} - -.metismenu .active > a > .fa.arrow:before { - content: "\f107"; -} - -.metismenu .ion.arrow:before { - content: "\f3d2"; -} - -.metismenu .active > a > .ion.arrow:before { - content: "\f3d0"; -} - -.metismenu .fa.plus-minus:before, -.metismenu .fa.plus-times:before { - content: "\f067"; -} - -.metismenu .active > a > .fa.plus-times { - -webkit-transform: rotate(45deg); - -ms-transform: rotate(45deg); - transform: rotate(45deg); -} - -.metismenu .active > a > .fa.plus-minus:before { - content: "\f068"; -} - -.metismenu .collapse { - display: none; -} - -.metismenu .collapse.in { - display: block; -} - -.metismenu .collapsing { - position: relative; - height: 0; - overflow: hidden; - -webkit-transition-timing-function: ease; - transition-timing-function: ease; - -webkit-transition-duration: 0.35s; - transition-duration: 0.35s; - -webkit-transition-property: height, visibility; - transition-property: height, visibility; -} diff --git a/packages/web-console/src/styles/_sidebar.scss b/packages/web-console/src/styles/_sidebar.scss deleted file mode 100755 index 176659521..000000000 --- a/packages/web-console/src/styles/_sidebar.scss +++ /dev/null @@ -1,214 +0,0 @@ -/*!****************************************************************************** - * ___ _ ____ ____ - * / _ \ _ _ ___ ___| |_| _ \| __ ) - * | | | | | | |/ _ \/ __| __| | | | _ \ - * | |_| | |_| | __/\__ \ |_| |_| | |_) | - * \__\_\\__,_|\___||___/\__|____/|____/ - * - * Copyright (c) 2014-2019 Appsicle - * Copyright (c) 2019-2022 QuestDB - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - ******************************************************************************/ - -.sidebard-panel { - width: 220px; - background: darken($gray, 3%); - padding: 10px 20px; - position: absolute; - right: 0; -} - -.sidebard-panel .feed-element img.img-circle { - width: 32px; - height: 32px; -} - -.sidebard-panel .feed-element, -.media-body, -.sidebard-panel p { - font-size: 12px; -} - -.sidebard-panel .feed-element { - margin-top: 20px; - padding-bottom: 0; -} - -.sidebard-panel .list-group { - margin-bottom: 10px; -} - -.sidebard-panel .list-group .list-group-item { - padding: 5px 0; - font-size: 12px; - border: 0; -} - -.sidebar-content .wrapper, -.wrapper.sidebar-content { - padding-right: 230px !important; -} - -.body-small .sidebar-content .wrapper, -.body-small .wrapper.sidebar-content { - padding-right: 20px !important; -} - -// Right sidebar - -#right-sidebar { - background-color: #fff; - border-left: 1px solid #e7eaec; - border-top: 1px solid #e7eaec; - overflow: hidden; - position: fixed; - top: 60px; - width: 260px !important; - z-index: 1009; - bottom: 0; - right: -260px; -} - -#right-sidebar.sidebar-open { - right: 0; -} - -#right-sidebar.sidebar-open.sidebar-top { - top: 0; - border-top: none; -} - -.sidebar-container { - ul.nav-tabs { - border: none; - } - - ul.nav-tabs.navs-4 li { - width: 25%; - } - ul.nav-tabs.navs-3 li { - width: 33.3333%; - } - ul.nav-tabs.navs-2 li { - width: 50%; - } - - ul.nav-tabs li { - border: none; - } - - ul.nav-tabs li a { - border: none; - padding: 12px 10px; - margin: 0; - border-radius: 0; - background: $nav-bg; - color: #fff; - text-align: center; - - border-right: 1px solid lighten($nav-bg, 2%); - } - - ul.nav-tabs li.active a { - border: none; - background: #f9f9f9; - color: $text-color; - font-weight: bold; - } - - .nav-tabs > li.active > a:hover, - .nav-tabs > li.active > a:focus { - border: none; - } - - ul.sidebar-list { - margin: 0; - padding: 0; - } - - ul.sidebar-list li { - border-bottom: 1px solid $border-color; - padding: 15px 20px; - list-style: none; - - font-size: 12px; - } - - ul.sidebar-list li:nth-child(2n + 2) { - // background: #f9f9f9; - } - - .sidebar-message:nth-child(2n + 2) { - background: #f9f9f9; - } - - ul.sidebar-list li a { - text-decoration: none; - color: inherit; - } - - .sidebar-content { - padding: 15px 20px; - font-size: 12px; - } - - .date-item { - } - - .sidebar-title { - background: #f9f9f9; - padding: 20px; - border-bottom: 1px solid $border-color; - - h3 { - margin-bottom: 3px; - padding-left: 2px; - } - } - - .tab-content { - h4 { - margin-bottom: 5px; - } - } - - .sidebar-message > a > .pull-left { - margin-right: 10px; - } - - .sidebar-message > a { - text-decoration: none; - color: inherit; - } - - .sidebar-message { - padding: 15px 20px; - } - - .sidebar-message:hover { - // background: #f9f9f9; - } - - .sidebar-message .message-avatar { - height: 38px; - width: 38px; - border-radius: 50%; - } - - .setings-item { - padding: 15px 20px; - border-bottom: 1px solid $border-color; - } -} diff --git a/packages/web-console/src/styles/main.scss b/packages/web-console/src/styles/main.scss index cb0c7077b..6949f753f 100644 --- a/packages/web-console/src/styles/main.scss +++ b/packages/web-console/src/styles/main.scss @@ -43,34 +43,9 @@ $fa-font-path: "~@fortawesome/fontawesome-free/webfonts"; @import "~bootstrap-sass/assets/stylesheets/bootstrap/_variables"; @import "~bootstrap-sass/assets/stylesheets/bootstrap/_mixins"; @import "~bootstrap-sass/assets/stylesheets/bootstrap/_normalize"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/_print"; @import "~bootstrap-sass/assets/stylesheets/bootstrap/_scaffolding"; @import "~bootstrap-sass/assets/stylesheets/bootstrap/_type"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/_code"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/_grid"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/_tables"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/_forms"; @import "~bootstrap-sass/assets/stylesheets/bootstrap/_buttons"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/_component-animations"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/_dropdowns"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/_button-groups"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/_input-groups"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/_navs"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/_navbar"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/_breadcrumbs"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/_pagination"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/_pager"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/_labels"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/_badges"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/_jumbotron"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/_thumbnails"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/_alerts"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/_media"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/_list-group"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/_panels"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/_responsive-embed"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/_wells"; -@import "~bootstrap-sass/assets/stylesheets/bootstrap/_close"; @import "~animate.css/source/_base.css"; @@ -98,23 +73,9 @@ $spacing-s: 4px !default; @import "typography"; @import "navigation"; @import "buttons"; -@import "badgets_labels"; -@import "sidebar"; @import "base"; -@import "metismenu"; @import "media"; -// Clear layout on print mode -@media print { - nav.navbar-static-side { - display: none; - } - - #page-wrapper { - margin: 0; - } -} - @import "editor"; @import "import"; @import "import-detail"; diff --git a/yarn.lock b/yarn.lock index 5922bb00a..6f74c6954 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2669,7 +2669,6 @@ __metadata: "@types/throttle-debounce": 2.1.0 "@typescript-eslint/eslint-plugin": ^5.0.0 "@typescript-eslint/parser": ^5.0.0 - ace-builds: 1.4.11 animate.css: 3.7.2 babel-loader: ^8.2.5 babel-plugin-styled-components: ^2.0.7 @@ -2697,7 +2696,6 @@ __metadata: eslint-plugin-standard: 5.0.0 file-loader: 6.0.0 fork-ts-checker-webpack-plugin: 6.1.0 - glyphicons-halflings: 1.9.1 handlebars: 4.7.7 handlebars-loader: 1.7.1 html-webpack-plugin: ^5.5.0 @@ -5672,13 +5670,6 @@ __metadata: languageName: node linkType: hard -"ace-builds@npm:1.4.11": - version: 1.4.11 - resolution: "ace-builds@npm:1.4.11" - checksum: 11822e70e84312698a7fdefed730613fb7485be6502a36222d3af6a36ae824fb55967ebb0c48d7b5ff842948d389ee25dcc48c6bafc4be0c69a44d6a8d2a937a - languageName: node - linkType: hard - "acorn-import-assertions@npm:^1.7.6": version: 1.8.0 resolution: "acorn-import-assertions@npm:1.8.0" @@ -10438,13 +10429,6 @@ __metadata: languageName: node linkType: hard -"glyphicons-halflings@npm:1.9.1": - version: 1.9.1 - resolution: "glyphicons-halflings@npm:1.9.1" - checksum: f96653375304925580ab16de5147ecd4889162d18e8902d190e5bb314efb3d9156d06e5f7b2ac0dd2137585508f48ca92abdc7e99460865a799c5d44a9ca7a59 - languageName: node - linkType: hard - "gonzales-pe@npm:^4.3.0": version: 4.3.0 resolution: "gonzales-pe@npm:4.3.0"