From 16d6d34e73fa35977e0b44ef7d3b0a9a22317dcb Mon Sep 17 00:00:00 2001 From: Roman Date: Sat, 13 Jun 2020 21:51:04 +0300 Subject: [PATCH] .vue tweaks, part 2 (rendering app still buggy) --- package.json | 1 + src/common/vars.ts | 3 + src/renderer/_vue/App.vue | 12 +--- src/renderer/_vue/assets/css/app.scss | 18 +++++- src/renderer/_vue/index.js | 1 + src/renderer/_vue/router/index.js | 8 +-- src/renderer/components/app.tsx | 1 + src/renderer/index.tsx | 6 -- src/renderer/{index.html => template.html} | 0 webpack.renderer.ts | 15 ++--- yarn.lock | 70 +++++++++++++++++++++- 11 files changed, 99 insertions(+), 36 deletions(-) delete mode 100644 src/renderer/index.tsx rename src/renderer/{index.html => template.html} (100%) diff --git a/package.json b/package.json index fb5209f820..b0cacd1f89 100644 --- a/package.json +++ b/package.json @@ -179,6 +179,7 @@ "mock-fs": "^4.12.0", "node-machine-id": "^1.1.12", "node-pty": "^0.9.0", + "openid-client": "^3.15.2", "proper-lockfile": "^4.1.1", "request": "^2.88.2", "request-promise-native": "^1.0.8", diff --git a/src/common/vars.ts b/src/common/vars.ts index ff1d06cede..60697cc17b 100644 --- a/src/common/vars.ts +++ b/src/common/vars.ts @@ -13,6 +13,9 @@ export const staticDir = path.join(contextDir, "static"); export const outDir = path.join(contextDir, "dist"); export const mainDir = path.join(contextDir, "src/main"); export const rendererDir = path.join(contextDir, "src/renderer"); +export const htmlTemplate = path.resolve(rendererDir, "template.html"); +export const sassCommonVars = path.resolve(rendererDir, "components/vars.scss"); +export const tsConfigFile = path.resolve(contextDir, "tsconfig.json"); // Apis export const staticProto = "static://" diff --git a/src/renderer/_vue/App.vue b/src/renderer/_vue/App.vue index a4b2077187..0f7c6ea8ff 100644 --- a/src/renderer/_vue/App.vue +++ b/src/renderer/_vue/App.vue @@ -24,14 +24,4 @@ export default { } } - + diff --git a/src/renderer/_vue/assets/css/app.scss b/src/renderer/_vue/assets/css/app.scss index 6a9e6c94f3..0443856eb3 100644 --- a/src/renderer/_vue/assets/css/app.scss +++ b/src/renderer/_vue/assets/css/app.scss @@ -1,8 +1,10 @@ -@import 'custom'; +@import "custom"; @import "~typeface-roboto/index.css"; @import "~material-design-icons/iconfont/material-icons.css"; -@import '~bootstrap/scss/bootstrap'; -@import '~bootstrap-vue/src/index'; +@import "~bootstrap/scss/bootstrap"; +@import "~bootstrap-vue/src/index"; +@import "~prismjs/themes/prism-tomorrow.css"; +@import "~vue-prism-editor/dist/VuePrismEditor.css"; html, body { margin: 0; @@ -201,3 +203,13 @@ h1, h2, h3, h4, h5, h6{ font-size: 16px; } } + +#lens-container { + position: absolute; + top: 0; + left: 70px; + right: 0; + height: 100%; + z-index: 100; + display: none; +} \ No newline at end of file diff --git a/src/renderer/_vue/index.js b/src/renderer/_vue/index.js index 56f03b806d..2afcbf7d42 100644 --- a/src/renderer/_vue/index.js +++ b/src/renderer/_vue/index.js @@ -1,3 +1,4 @@ +import "../../common/system-ca" import "./assets/css/app.scss" import "prismjs"; import "prismjs/components/prism-yaml" diff --git a/src/renderer/_vue/router/index.js b/src/renderer/_vue/router/index.js index a9569fbaea..a879708aa6 100644 --- a/src/renderer/_vue/router/index.js +++ b/src/renderer/_vue/router/index.js @@ -1,11 +1,9 @@ import Vue from 'vue' import Router from 'vue-router' import store from "../store"; +import { whatsNew } from './routeguard' -// Route Guard -import * as guard from './routeguard' - -Vue.use(Router) +Vue.use(Router); const router = new Router({ routes: [ @@ -16,7 +14,7 @@ const router = new Router({ meta: { routeguard: [ // guards in priority order; the first one to catch will trigger something - guard.whatsNew, + whatsNew, ], } }, diff --git a/src/renderer/components/app.tsx b/src/renderer/components/app.tsx index 6683dc1287..5b0a049439 100755 --- a/src/renderer/components/app.tsx +++ b/src/renderer/components/app.tsx @@ -1,3 +1,4 @@ +import "../../common/system-ca" import "./app.scss"; import React from "react"; diff --git a/src/renderer/index.tsx b/src/renderer/index.tsx deleted file mode 100644 index 873d58ecd3..0000000000 --- a/src/renderer/index.tsx +++ /dev/null @@ -1,6 +0,0 @@ -// Renderer process - -import "../common/system-ca" -import { appInitVue } from "./_vue"; - -appInitVue(); \ No newline at end of file diff --git a/src/renderer/index.html b/src/renderer/template.html similarity index 100% rename from src/renderer/index.html rename to src/renderer/template.html diff --git a/webpack.renderer.ts b/webpack.renderer.ts index ce173ee339..0d62de0f64 100755 --- a/webpack.renderer.ts +++ b/webpack.renderer.ts @@ -3,14 +3,11 @@ import webpack from "webpack"; import HtmlWebpackPlugin from "html-webpack-plugin"; import MiniCssExtractPlugin from "mini-css-extract-plugin"; import TerserWebpackPlugin from "terser-webpack-plugin"; -import { isDevelopment, isProduction, outDir, rendererDir } from "./src/common/vars"; +import { htmlTemplate, isDevelopment, isProduction, outDir, rendererDir, sassCommonVars, tsConfigFile } from "./src/common/vars"; import { libraryTarget, manifestPath } from "./webpack.dll"; export default function (): webpack.Configuration { const VueLoaderPlugin = require("vue-loader/lib/plugin"); - const htmlTemplate = path.resolve(rendererDir, "index.html"); - const sassCommonVars = path.resolve(rendererDir, "components/vars.scss"); - const tsConfigFile = path.resolve("tsconfig.json"); return { target: "electron-renderer", @@ -18,8 +15,8 @@ export default function (): webpack.Configuration { devtool: isProduction ? "source-map" : "eval-source-map", cache: isDevelopment, entry: { - renderer: path.resolve(rendererDir, "index.tsx"), - // renderer_vue: path.resolve(rendererDir, "_vue/index.js"), + // renderer: path.resolve(rendererDir, "component/app.tsx"), + renderer_vue: path.resolve(rendererDir, "_vue/index.js"), }, output: { path: outDir, @@ -71,8 +68,6 @@ export default function (): webpack.Configuration { { loader: "ts-loader", options: { - // transpileOnly: false, - // appendTsSuffixTo: [/\.vue$/], configFile: tsConfigFile, compilerOptions: { // localization support @@ -91,8 +86,8 @@ export default function (): webpack.Configuration { options: { shadowMode: false, loaders: { - sass: "vue-style-loader!css-loader!sass-loader?indentedSyntax=1", - scss: "vue-style-loader!css-loader!sass-loader", + css: "!!vue-style-loader!css-loader", + scss: "!!vue-style-loader!css-loader!sass-loader", } } } diff --git a/yarn.lock b/yarn.lock index 15308d9aab..47fb038b6d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1546,6 +1546,11 @@ consola "^2.10.1" node-fetch "^2.6.0" +"@panva/asn1.js@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@panva/asn1.js/-/asn1.js-1.0.0.tgz#dd55ae7b8129e02049f009408b97c61ccf9032f6" + integrity sha512-UdkG3mLEqXgnlKsWanWcgb6dOjUzJ+XC5f+aWw30qrtjxeNUSfKX1cd5FBzOaXQumoe9nIqeZUvrRJS03HCCtw== + "@sindresorhus/is@^0.14.0": version "0.14.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" @@ -1744,6 +1749,15 @@ "@types/minimatch" "*" "@types/node" "*" +"@types/got@^9.6.9": + version "9.6.11" + resolved "https://registry.yarnpkg.com/@types/got/-/got-9.6.11.tgz#482b402cc5ee459481aeeadb08142ebb1a9afb26" + integrity sha512-dr3IiDNg5TDesGyuwTrN77E1Cd7DCdmCFtEfSGqr83jMMtcwhf/SGPbN2goY4JUWQfvxwY56+e5tjfi+oXeSdA== + dependencies: + "@types/node" "*" + "@types/tough-cookie" "*" + form-data "^2.5.0" + "@types/graceful-fs@^4.1.2": version "4.1.3" resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.3.tgz#039af35fe26bec35003e8d86d2ee9c586354348f" @@ -6961,6 +6975,13 @@ jest@^26.0.1: import-local "^3.0.2" jest-cli "^26.0.1" +jose@^1.27.1: + version "1.27.1" + resolved "https://registry.yarnpkg.com/jose/-/jose-1.27.1.tgz#a1de2ecb5b3ae1ae28f0d9d0cc536349ada27ec8" + integrity sha512-VyHM6IJPw0TTGqHVNlPWg16/ASDPAmcChcLqSb3WNBvwWFoWPeFqlmAUCm8/oIG1GjZwAlUDuRKFfycowarcVA== + dependencies: + "@panva/asn1.js" "^1.0.0" + js-base64@^2.1.8: version "2.5.2" resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.2.tgz#313b6274dda718f714d00b3330bbae6e38e90209" @@ -7483,7 +7504,7 @@ make-dir@^3.0.0, make-dir@^3.0.2: dependencies: semver "^6.0.0" -make-error@1.x, make-error@^1.1.1: +make-error@1.x, make-error@^1.1.1, make-error@^1.3.6: version "1.3.6" resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== @@ -8204,6 +8225,11 @@ object-hash@^1.3.1: resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz#fde452098a951cb145f039bb7d455449ddc126df" integrity sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA== +object-hash@^2.0.1: + version "2.0.3" + resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.0.3.tgz#d12db044e03cd2ca3d77c0570d87225b02e1e6ea" + integrity sha512-JPKn0GMu+Fa3zt3Bmr66JhokJU5BaNBIh4ZeTlaCBzrBsOeXzwcKKAK1tbLiPKgvwmPXsDvvLHoWh5Bm7ofIYg== + object-inspect@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67" @@ -8265,6 +8291,11 @@ oidc-token-hash@^3.0.1: resolved "https://registry.yarnpkg.com/oidc-token-hash/-/oidc-token-hash-3.0.2.tgz#5bd4716cc48ad433f4e4e99276811019b165697e" integrity sha512-dTzp80/y/da+um+i+sOucNqiPpwRL7M/xPwj7pH1TFA2/bqQ+OK2sJahSXbemEoLtPkHcFLyhLhLWZa9yW5+RA== +oidc-token-hash@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/oidc-token-hash/-/oidc-token-hash-5.0.0.tgz#acdfb1f4310f58e64d5d74a4e8671a426986e888" + integrity sha512-8Yr4CZSv+Tn8ZkN3iN2i2w2G92mUKClp4z7EGUfdsERiYSbj7P4i/NHm72ft+aUdsiFx9UdIPSTwbyzQ6C4URg== + once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" @@ -8305,6 +8336,22 @@ openid-client@2.5.0: oidc-token-hash "^3.0.1" p-any "^1.1.0" +openid-client@^3.15.2: + version "3.15.2" + resolved "https://registry.yarnpkg.com/openid-client/-/openid-client-3.15.2.tgz#d48a6d7991d5d6117f4598bb1d19399262164128" + integrity sha512-50aBsfiSZds48ec/VvUZ3hwtpEW0L5s7gGxlsJSvo5mAeK4TG3gv0VRWI+SvCAae4MEwRegLJD3YjpkJMLi2GQ== + dependencies: + "@types/got" "^9.6.9" + base64url "^3.0.1" + got "^9.6.0" + jose "^1.27.1" + lodash "^4.17.15" + lru-cache "^5.1.1" + make-error "^1.3.6" + object-hash "^2.0.1" + oidc-token-hash "^5.0.0" + p-any "^3.0.0" + optimist@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686" @@ -8378,6 +8425,14 @@ p-any@^1.1.0: dependencies: p-some "^2.0.0" +p-any@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/p-any/-/p-any-3.0.0.tgz#79847aeed70b5d3a10ea625296c0c3d2e90a87b9" + integrity sha512-5rqbqfsRWNb0sukt0awwgJMlaep+8jV45S15SKKB34z4UuzjcofIfnriCBhWjZP2jbVtjt9yRl7buB6RlKsu9w== + dependencies: + p-cancelable "^2.0.0" + p-some "^5.0.0" + p-cancelable@^0.4.0: version "0.4.1" resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz#35f363d67d52081c8d9585e37bcceb7e0bbcb2a0" @@ -8388,6 +8443,11 @@ p-cancelable@^1.0.0: resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== +p-cancelable@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.0.0.tgz#4a3740f5bdaf5ed5d7c3e34882c6fb5d6b266a6e" + integrity sha512-wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg== + p-defer@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c" @@ -8462,6 +8522,14 @@ p-some@^2.0.0: dependencies: aggregate-error "^1.0.0" +p-some@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/p-some/-/p-some-5.0.0.tgz#8b730c74b4fe5169d7264a240ad010b6ebc686a4" + integrity sha512-Js5XZxo6vHjB9NOYAzWDYAIyyiPvva0DWESAIWIK7uhSpGsyg5FwUPxipU/SOQx5x9EqhOh545d1jo6cVkitig== + dependencies: + aggregate-error "^3.0.0" + p-cancelable "^2.0.0" + p-timeout@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz#d8dd1979595d2dc0139e1fe46b8b646cb3cdf038"