Просмотр исходного кода

[192-webreport] Removed highlight.js style files, using css important to override, fixed compariosnview ids

Evgeni 4 лет назад
Родитель
Сommit
76df598cc3

+ 38 - 19
report-viewer/package-lock.json

@@ -13784,7 +13784,8 @@
     "@highlightjs/vue-plugin": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/@highlightjs/vue-plugin/-/vue-plugin-2.1.0.tgz",
-      "integrity": "sha512-E+bmk4ncca+hBEYRV2a+1aIzIV0VSY/e5ArjpuSN9IO7wBJrzUE2u4ESCwrbQD7sAy+jWQjkV5qCCWgc+pu7CQ=="
+      "integrity": "sha512-E+bmk4ncca+hBEYRV2a+1aIzIV0VSY/e5ArjpuSN9IO7wBJrzUE2u4ESCwrbQD7sAy+jWQjkV5qCCWgc+pu7CQ==",
+      "requires": {}
     },
     "@humanwhocodes/config-array": {
       "version": "0.9.3",
@@ -14518,7 +14519,8 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-5.0.1.tgz",
       "integrity": "sha512-5J/n+Ht4r2eVuncwCXcZPHzYCz/2haktle4WcggWiKeg3jSQVUJbjviPBs6sOo3y/LG3CEfZMP9bPJjVDbexpQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "@vue/cli-service": {
       "version": "5.0.1",
@@ -15081,13 +15083,15 @@
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
       "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "acorn-jsx": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "acorn-walk": {
       "version": "8.2.0",
@@ -15156,7 +15160,8 @@
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "ansi-escapes": {
       "version": "4.3.2",
@@ -15584,7 +15589,8 @@
     "chartjs-plugin-datalabels": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/chartjs-plugin-datalabels/-/chartjs-plugin-datalabels-2.0.0.tgz",
-      "integrity": "sha512-WBsWihphzM0Y8fmQVm89+iy99mmgejmj5/jcsYqwxSioLRL/zqJ4Scv/eXq5ZqvG3TpojlGzZLeaOaSvDm7fwA=="
+      "integrity": "sha512-WBsWihphzM0Y8fmQVm89+iy99mmgejmj5/jcsYqwxSioLRL/zqJ4Scv/eXq5ZqvG3TpojlGzZLeaOaSvDm7fwA==",
+      "requires": {}
     },
     "chokidar": {
       "version": "3.5.3",
@@ -16237,7 +16243,8 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.0.2.tgz",
       "integrity": "sha512-KhprijuQv2sP4kT92sSQwhlK3SJTbDIsxcfIEySB0O+3m9esFOai7dP9bMx5enHAh2MwarVIcnwiWoOm01RIbQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "csso": {
       "version": "4.2.0",
@@ -16854,7 +16861,8 @@
       "version": "8.4.0",
       "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.4.0.tgz",
       "integrity": "sha512-CFotdUcMY18nGRo5KGsnNxpznzhkopOcOo0InID+sgQssPrzjvsyKZPvOgymTFeHrFuC3Tzdf2YndhXtULK9Iw==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "eslint-plugin-prettier": {
       "version": "4.0.0",
@@ -17471,7 +17479,8 @@
     "gitart-vue-dialog": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/gitart-vue-dialog/-/gitart-vue-dialog-1.2.4.tgz",
-      "integrity": "sha512-TytYajmH6kJ0yfEO8MA/RW0nc6ISA5kG/qpqUgDXQuuJpzxtmmdgTY0H3fxpDQIb0bTutei0xAJI3uzjXx+Khw=="
+      "integrity": "sha512-TytYajmH6kJ0yfEO8MA/RW0nc6ISA5kG/qpqUgDXQuuJpzxtmmdgTY0H3fxpDQIb0bTutei0xAJI3uzjXx+Khw==",
+      "requires": {}
     },
     "glob": {
       "version": "7.2.0",
@@ -17736,7 +17745,8 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
       "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "ieee754": {
       "version": "1.2.1",
@@ -19425,25 +19435,29 @@
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.0.3.tgz",
       "integrity": "sha512-6W5BemziRoqIdAKT+1QjM4bNcJAQ7z7zk073730NHg4cUXh3/rQHHj7pmYxUB9aGhuRhBiUf0pXvIHkRwhQP0Q==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-discard-duplicates": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.3.tgz",
       "integrity": "sha512-vPtm1Mf+kp7iAENTG7jI1MN1lk+fBqL5y+qxyi4v3H+lzsXEdfS3dwUZD45KVhgzDEgduur8ycB4hMegyMTeRw==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-discard-empty": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.0.3.tgz",
       "integrity": "sha512-xGJugpaXKakwKI7sSdZjUuN4V3zSzb2Y0LOlmTajFbNinEjTfVs9PFW2lmKBaC/E64WwYppfqLD03P8l9BuueA==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-discard-overridden": {
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.0.4.tgz",
       "integrity": "sha512-3j9QH0Qh1KkdxwiZOW82cId7zdwXVQv/gRXYDnwx5pBtR1sTkU4cXRK9lp5dSdiM0r0OICO/L8J6sV1/7m0kHg==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-loader": {
       "version": "6.2.1",
@@ -19546,7 +19560,8 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
       "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-modules-local-by-default": {
       "version": "4.0.0",
@@ -19581,7 +19596,8 @@
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.0.3.tgz",
       "integrity": "sha512-iKEplDBco9EfH7sx4ut7R2r/dwTnUqyfACf62Unc9UiyFuI7uUqZZtY+u+qp7g8Qszl/U28HIfcsI3pEABWFfA==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "postcss-normalize-display-values": {
       "version": "5.0.3",
@@ -21141,7 +21157,8 @@
     "vue-draggable-next": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/vue-draggable-next/-/vue-draggable-next-2.1.1.tgz",
-      "integrity": "sha512-f5lmA7t6LMaL4viR7dU30zzvqJzaKQs0ymL0Jy9UDT9uiZ2tXF3MzPzEvpTH2UODXZJkT+SnjeV1fXHMsgXLYA=="
+      "integrity": "sha512-f5lmA7t6LMaL4viR7dU30zzvqJzaKQs0ymL0Jy9UDT9uiZ2tXF3MzPzEvpTH2UODXZJkT+SnjeV1fXHMsgXLYA==",
+      "requires": {}
     },
     "vue-eslint-parser": {
       "version": "8.2.0",
@@ -21640,7 +21657,8 @@
           "version": "8.5.0",
           "resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
           "integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
-          "dev": true
+          "dev": true,
+          "requires": {}
         }
       }
     },
@@ -21767,7 +21785,8 @@
       "version": "7.5.7",
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz",
       "integrity": "sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "yallist": {
       "version": "4.0.0",

+ 14 - 0
report-viewer/src/components/LineOfCode.vue

@@ -72,6 +72,20 @@ pre {
   float: left;
 }
 
+pre code.hljs {
+  padding: 0 !important;
+}
+
+code.hljs {
+  padding: 0 !important;
+}
+
+.hljs {
+  background: transparent !important;
+  font-family: "JetBrains Mono", serif !important;
+  font-weight: bold;    font-size: x-small !important;
+}
+
 
 .first-line {
   margin-top: 2%;

+ 0 - 82
report-viewer/src/libs/highlightjs/styles/edited/default.min.css

@@ -1,82 +0,0 @@
-/*!
-  Theme: Default
-  Description: Original highlight.js style
-  Author: (c) Ivan Sagalaev <maniac@softwaremaniacs.org>
-  Maintainer: @highlightjs/core-team
-  Website: https://highlightjs.org/
-  License: see project LICENSE
-  Touched: 2021
-*/
-pre code.hljs {
-    display: block;
-    overflow-x: auto;
-    /* Edited attribute */
-    padding: 0;
-}
-
-code.hljs {
-    /* Edited attribute */
-    padding: 0;
-}
-
-.hljs {
-    color: #444;
-
-    /* Edited attributes */
-    background: transparent;
-    font-family: "JetBrains Mono", serif;
-    font-weight: bold;    font-size: x-small;
-}
-
-.hljs-comment {
-    color: #697070
-}
-
-.hljs-punctuation, .hljs-tag {
-    color: #444a
-}
-
-.hljs-tag .hljs-attr, .hljs-tag .hljs-name {
-    color: #444
-}
-
-.hljs-attribute, .hljs-doctag, .hljs-keyword, .hljs-meta .hljs-keyword, .hljs-name, .hljs-selector-tag {
-    font-weight: 700
-}
-
-.hljs-deletion, .hljs-number, .hljs-quote, .hljs-selector-class, .hljs-selector-id, .hljs-string, .hljs-template-tag, .hljs-type {
-    color: #800
-}
-
-.hljs-section, .hljs-title {
-    color: #800;
-    font-weight: 700
-}
-
-.hljs-link, .hljs-operator, .hljs-regexp, .hljs-selector-attr, .hljs-selector-pseudo, .hljs-symbol, .hljs-template-variable, .hljs-variable {
-    color: #ab5656
-}
-
-.hljs-literal {
-    color: #695
-}
-
-.hljs-addition, .hljs-built_in, .hljs-bullet, .hljs-code {
-    color: #397300
-}
-
-.hljs-meta {
-    color: #1f7199
-}
-
-.hljs-meta .hljs-string {
-    color: #38a
-}
-
-.hljs-emphasis {
-    font-style: italic
-}
-
-.hljs-strong {
-    font-weight: 700
-}

+ 0 - 53
report-viewer/src/libs/highlightjs/styles/edited/vs.min.css

@@ -1,53 +0,0 @@
-pre code.hljs {
-    display: block;
-    overflow-x: auto;
-    padding: 0
-}
-
-code.hljs {
-    padding: 0
-}
-
-.hljs {
-    color: #000;
-    background: transparent;
-    font-family: "JetBrains Mono", serif;
-    font-weight: bold;
-    font-size: x-small;
-}
-
-.hljs-comment, .hljs-quote, .hljs-variable {
-    color: green
-}
-
-.hljs-built_in, .hljs-keyword, .hljs-name, .hljs-selector-tag, .hljs-tag {
-    color: #00f
-}
-
-.hljs-addition, .hljs-attribute, .hljs-literal, .hljs-section, .hljs-string, .hljs-template-tag, .hljs-template-variable, .hljs-title, .hljs-type {
-    color: #a31515
-}
-
-.hljs-deletion, .hljs-meta, .hljs-selector-attr, .hljs-selector-pseudo {
-    color: #2b91af
-}
-
-.hljs-doctag {
-    color: grey
-}
-
-.hljs-attr {
-    color: red
-}
-
-.hljs-bullet, .hljs-link, .hljs-symbol {
-    color: #00b0e8
-}
-
-.hljs-emphasis {
-    font-style: italic
-}
-
-.hljs-strong {
-    font-weight: 700
-}

+ 1 - 1
report-viewer/src/main.ts

@@ -2,7 +2,7 @@ import {createApp} from "vue";
 import App from "./App.vue";
 import router from "./router";
 import store from "./store/store"
-import './libs/highlightjs/styles/edited/vs.min.css'
+import 'highlight.js/styles/vs.css'
 import 'gitart-vue-dialog/dist/style.css'
 import 'highlight.js/lib/common';
 

+ 3 - 3
report-viewer/src/views/ComparisonView.vue

@@ -12,10 +12,10 @@
         <button id="hide-button" title="Hide sidebar" @click="togglePanel">
           <img alt="hide" src="@/assets/keyboard_double_arrow_left_black_24dp.svg"></button>
       </div>
-      <TextInformation :anonymous="store.state.anonymous.has(id1)" :value="id1" label="Submission 1"/>
-      <TextInformation :anonymous="store.state.anonymous.has(id2)" :value="id2" label="Submission 2"/>
+      <TextInformation :anonymous="store.state.anonymous.has(firstId)" :value="firstId" label="Submission 1"/>
+      <TextInformation :anonymous="store.state.anonymous.has(secondId)" :value="secondId" label="Submission 2"/>
       <TextInformation :value="comparison.match_percentage" label="Match %"/>
-      <MatchTable :id1="id1" :id2="id2" :matches="comparison.allMatches" @match-selected="showMatch"/>
+      <MatchTable :id1="firstId" :id2="secondId" :matches="comparison.allMatches" @match-selected="showMatch"/>
     </div>
     <FilesContainer :container-id="1" :files="filesOfFirst" :matches="comparison.matchesInFirstSubmission"
                     files-owner="Submission 1"