Commit 900926bb authored by unknown's avatar unknown

before cm lite integration

parent cd97ee82
Pipeline #3257 passed with stage
in 36 seconds
......@@ -5,8 +5,8 @@ WORKDIR /frontend
COPY package.json yarn.lock ./
# install quasar cli
RUN yarn global add @quasar/cli
RUN quasar info
RUN yarn global add @quasar/cli@latest
# copy content of physical folder into container
......@@ -18,6 +18,7 @@ ENV VUE_APP_BACKEND_API_URL ${VUE_APP_BACKEND_API_URL}
# install dependencies and compiles project
RUN yarn install && yarn build
RUN quasar info
# ---------------- PRODUCTION STAGE ----------------------
......
......@@ -23,7 +23,6 @@
@ajax-start="ajaxStart"
@ajax-stop="ajaxStop"
@empty-uploaded-bundle="updateBundle"
@on-sync="synchronize"
@tab-switch="switchFile"
@to-delete="destroy"
@to-editor="loadFromHistory"
......@@ -130,14 +129,10 @@
this.rawReport = data.raw_report;
this.folder = data.dir;
this.queries = []
},
updateReport(report) {
this.rawReport = report;
},
synchronize() {
this.$emit('on-render')
},
reportHighlight(queries) {
this.queries = queries
},
......
......@@ -9,7 +9,7 @@
<div class="col-6 column items-end self-center">
<div class="q-pr-md">
<q-btn
:color="$q.dark.isActive ? 'orange-6' : 'orange-6'"
:color="$q.dark.isActive ? 'orange-6' : 'orange'"
:unelevated="!outline"
@click="syncAndLoad"
class="q-mr-md"
......@@ -33,7 +33,7 @@
self="bottom middle"
>
Synchronize (BETA)
Synchronize
</q-tooltip>
</q-btn>
<q-btn
......@@ -66,15 +66,13 @@
<q-separator :color="separator" size="20px" style="height: 1px"/>
<div :key="item.id" :style="historyItemBg" class="row justify-start q-pl-sm q-pb-sm history"
v-for="(item, index) in filesList">
<q-list bordered class="col-9 q-mt-md list" style="max-width: 230px; ">
<q-list bordered class="col-9 q-mt-md list" style="max-width: 230px">
<q-expansion-item
:class="dark"
:header-style="activeStyleHeader('item' + index)"
:id="'item'+index"
:style="activeStyle('item' + index)"
class="fileItem"
dense
>
<template class="directory row" style="width: inherit" v-ripple v-slot:header>
<q-item-section class="col-1">
......@@ -91,7 +89,6 @@
class="q-pl-lg"
style="height: 45px; font-size: 14px; cursor: pointer"
v-on:click="loadFile"
>
<q-icon class="" name="insert_drive_file" size="18px"
style="; font-size: 14px"/>
......@@ -110,7 +107,6 @@
outline
size="sm"
style="width: 25px; height: 25px; "
>
<q-icon
name="edit"
......@@ -487,9 +483,6 @@
textColor: textColor
})
},
activeStyle(item) {
return this.selected.index === item ? this.darkActiveExpansionItemHeader : ''
},
activeStyleHeader(item) {
return this.selected.index === item ? this.activeStyleHeaderBorder : ''
},
......@@ -582,21 +575,16 @@
// this.synchronizeFromLocalStorage(cached)
// } else {
this.synchronizeFromBackend()
// }
},
computed: {
dark() {
return this.$q.dark.isActive ? 'bg-blue-grey-7' : 'bg-grey-3'
return this.$q.dark.isActive ? 'bg-blue-grey-9' : 'bg-grey-3'
},
darkActiveExpansionItemClass() {
return this.$q.dark.isActive ? 'bg-blue-5' : 'bg-blue-3'
},
darkActiveExpansionItemHeader() {
// return this.$q.dark.isActive ? 'border: 2px green solid;!important' : 'border: 1px black solid;!important'
return ''
},
modalBorder() {
return this.$q.dark.isActive ? 'border: 1px blue solid' : 'border: 2px blue solid'
},
......@@ -612,7 +600,6 @@
return {
'color': color,
'font-weight': 'bold',
'border': border,
}
},
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment