TT#128152 Remove legacy files which are not used anymore

Changes:
* couple of component migrated from legacy quasar wrapper comonents  (src/components/quasar-legcay) the normal quasar comonents
* removed unused files and folders (quasar-legcay, templates)
* removed some unused commented code
* removed unused "axios" boot file and it's dependency

Change-Id: I6baa5ee0612e2ff2b8adbe0e2ea8915c1fb230f5
mr10.0
Sergii Leonenko 4 years ago committed by Hans-Peter Herzog
parent 8cbecc1f92
commit d7782b1dcf

@ -28,7 +28,6 @@
},
"dependencies": {
"@quasar/extras": "^1.9.16",
"axios": "^0.21.1",
"core-js": "^3.6.5",
"file-saver": "^2.0.2",
"jest-junit": "^11.1.0",

@ -23,11 +23,9 @@ module.exports = function (/* ctx */) {
'filters',
'vuelidate',
'i18n',
// 'axios',
'vue-resource',
'user',
'routes',
'components',
'vue-scrollto',
'constants',
'vue-wait',

@ -1,23 +0,0 @@
import axios from 'axios'
import {
getJwt,
hasJwt
} from 'src/auth'
export default ({ Vue, store, app }) => {
const http = axios.create({
baseURL: app.config.baseHttpUrl
})
http.interceptors.request.use(function (config) {
if (hasJwt()) {
config.headers.Authorization = 'Bearer ' + getJwt()
}
return config
}, function (error) {
return Promise.reject(error)
})
Vue.http = http
Vue.$http = http
store.$http = http
}

@ -1,18 +0,0 @@
import QItemMain from 'src/components/quasar-legacy/QItemMain'
import QItemSide from 'src/components/quasar-legacy/QItemSide'
import QCollapsible from 'src/components/quasar-legacy/QCollapsible'
import QAlert from 'src/components/quasar-legacy/QAlert'
import QResizeObservable from 'src/components/quasar-legacy/QResizeObservable'
import QModal from 'src/components/quasar-legacy/QModal'
import QPopover from 'src/components/quasar-legacy/QPopover'
export default ({ Vue }) => {
Vue.component('q-item-main', QItemMain)
Vue.component('q-item-side', QItemSide)
Vue.component('q-collapsible', QCollapsible)
Vue.component('q-alert', QAlert)
Vue.component('q-resize-observable', QResizeObservable)
Vue.component('q-modal', QModal)
Vue.component('q-popover', QPopover)
}

@ -2,6 +2,7 @@
import Vue from 'vue'
import VueI18n from 'vue-i18n'
import {
getLanguageLabels,
messages
} from 'src/i18n'
import {
@ -22,6 +23,8 @@ export const i18n = new VueI18n({
})
export default ({ app, store }) => {
store.commit('user/setLanguageLabels', getLanguageLabels())
app.i18n = i18n
store.$i18n = i18n
if (!hasSession('locale')) {

@ -17,9 +17,9 @@
clickable
@click="changeSessionLanguage(language[0])"
>
<q-item-main
:label="language[1]"
/>
<q-item-section>
<q-item-label>{{ language[1] }}</q-item-label>
</q-item-section>
</q-item>
</q-list>
</q-expansion-item>
@ -54,9 +54,3 @@ export default {
}
}
</script>
<style lang="stylus" rel="stylesheet/stylus">
.csc-language-selection
.q-item-side-right
color white
</style>

@ -125,40 +125,6 @@
@click="deleteDestination(index)"
/>
</csc-more-menu>
<!-- <q-popover ref="popover">-->
<!-- <q-list-->
<!-- link-->
<!-- no-border-->
<!-- >-->
<!-- <q-item-->
<!-- v-if="destinations.length > 1 && !hasNoUpOption(index)"-->
<!-- @click="moveDestination('up', index), $refs.popover[index].close()"-->
<!-- >-->
<!-- <q-item-main :label="$t('Move up')" />-->
<!-- <q-item-side-->
<!-- icon="keyboard_arrow_up"-->
<!-- color="white"-->
<!-- />-->
<!-- </q-item>-->
<!-- <q-item-->
<!-- v-if="destinations.length > 1 && !hasNoDownOption(index)"-->
<!-- @click="moveDestination('down', index), $refs.popover[index].close()"-->
<!-- >-->
<!-- <q-item-main :label="$t('Move down')" />-->
<!-- <q-item-side-->
<!-- icon="keyboard_arrow_down"-->
<!-- color="white"-->
<!-- />-->
<!-- </q-item>-->
<!-- <q-item @click="deleteDestination(index), $refs.popover[index].close()">-->
<!-- <q-item-main :label="$t('Remove')" />-->
<!-- <q-item-side-->
<!-- icon="delete"-->
<!-- color="negative"-->
<!-- />-->
<!-- </q-item>-->
<!-- </q-list>-->
<!-- </q-popover>-->
</q-item-section>
</q-item>
</template>

@ -49,66 +49,6 @@
>
{{ $t('do not ring own phone') }}
</q-item-label>
<!-- <div-->
<!-- v-if="!isMobile"-->
<!-- >-->
<!-- <span v-if="ownPhone">-->
<!-- <span>-->
<!-- {{ $t('first ring') }}-->
<!-- </span>-->
<!-- <span>-->
<!-- {{ $t('own phone') }}-->
<!-- </span>-->
<!-- <span>-->
<!-- {{ $t('for') }}-->
<!-- </span>-->
<!-- <span>-->
<!-- {{ ownPhoneTimeout || 0 }}-->
<!-- </span>-->
<!-- <span>-->
<!-- {{ $t('secs') }}-->
<!-- </span>-->
<!-- </span>-->
<!-- <span v-else>-->
<!-- {{ $t('do not ring own phone') }}-->
<!-- </span>-->
<!-- </div>-->
<!-- <div-->
<!-- v-if="isMobile"-->
<!-- >-->
<!-- <div-->
<!-- v-if="ownPhone"-->
<!-- >-->
<!-- {{ $t('own phone') }}-->
<!-- </div>-->
<!-- <div-->
<!-- v-else-->
<!-- >-->
<!-- {{ $t('do not ring own phone') }}-->
<!-- </div>-->
<!-- <div-->
<!-- v-if="ownPhone"-->
<!-- >-->
<!-- <span v-if="ownPhone">-->
<!-- <span>-->
<!-- {{ $t('first ring') }}-->
<!-- </span>-->
<!-- <span>-->
<!-- {{ $t('for') }}-->
<!-- </span>-->
<!-- <span class="dest-values">-->
<!-- {{ ownPhoneTimeout || 0 }}-->
<!-- </span>-->
<!-- <span>-->
<!-- {{ $t('secs') }}-->
<!-- </span>-->
<!-- </span>-->
<!-- <span v-else>-->
<!-- {{ $t('do not ring own phone') }}-->
<!-- </span>-->
<!-- </div>-->
<!-- </div>-->
</q-item-section>
<q-item-section
@ -139,35 +79,6 @@
@click="showModal()"
/>
</csc-more-menu>
<!-- <q-menu-->
<!-- ref="popover"-->
<!-- >-->
<!-- <q-list-->
<!-- link-->
<!-- no-border-->
<!-- highlight-->
<!-- >-->
<!-- <q-item-->
<!-- v-if="isMobile"-->
<!-- @click="toggle();$refs.popover.close()"-->
<!-- >-->
<!-- <q-item-main-->
<!-- :label="toggleTimeoutLabel"-->
<!-- />-->
<!-- <q-item-side-->
<!-- :icon="toggleIcon"-->
<!-- color="secondary"-->
<!-- />-->
<!-- </q-item>-->
<!-- <q-item @click="showModal();$refs.popover.close()">-->
<!-- <q-item-main :label="$t('Edit timeout')" />-->
<!-- <q-item-side-->
<!-- icon="fa-edit"-->
<!-- color="secondary"-->
<!-- />-->
<!-- </q-item>-->
<!-- </q-list>-->
<!-- </q-menu>-->
</q-item-section>
</q-item>
<q-item

@ -1,46 +0,0 @@
<template>
<q-list
item-separator
link
class="csc-toolbar-btn-popover"
>
<q-item @click="initCall('audioOnly')">
<q-item-side
icon="mic"
color="primary"
/>
<q-item-main :label="$t('Audio Only')" />
</q-item>
<q-item @click="initCall('audioVideo')">
<q-item-side
icon="videocam"
color="primary"
/>
<q-item-main :label="$t('Audio + Video')" />
</q-item>
<q-item @click="initCall('audioScreen')">
<q-item-side
icon="computer"
color="primary"
/>
<q-item-main :label="$t('Audio + Screen')" />
</q-item>
</q-list>
</template>
<script>
export default {
name: 'CscCallOptionList',
data () {
return {}
},
methods: {
initCall (media) {
this.$emit('init-call', media)
}
}
}
</script>
<style lang="stylus" rel="stylesheet/stylus">
</style>

@ -1,11 +0,0 @@
<template>
<q-banner />
</template>
<script>
export default {
name: 'QAlert',
props: {
}
}
</script>

@ -1,22 +0,0 @@
<template>
<q-expansion-item
:value="value"
v-bind="$attrs"
v-on="$listeners"
@input="$emit('input', $event)"
>
<slot />
</q-expansion-item>
</template>
<script>
export default {
name: 'QCollapsible',
props: {
value: {
type: Boolean,
default: false
}
}
}
</script>

@ -1,14 +0,0 @@
<template>
<q-item-section
v-bind="$attrs"
v-on="$listeners"
>
<q-item-label>{{ $attrs.label }}</q-item-label>
</q-item-section>
</template>
<script>
export default {
name: 'QItemMain'
}
</script>

@ -1,14 +0,0 @@
<template>
<q-item-section
v-bind="$attrs"
v-on="$listeners"
>
<slot />
</q-item-section>
</template>
<script>
export default {
name: 'QItemSide'
}
</script>

@ -1,11 +0,0 @@
<template>
<div />
</template>
<script>
export default {
name: 'QModal',
props: {
}
}
</script>

@ -1,11 +0,0 @@
<template>
<div />
</template>
<script>
export default {
name: 'QPopover',
props: {
}
}
</script>

@ -1,11 +0,0 @@
<template>
<div />
</template>
<script>
export default {
name: 'QResizeObservable',
props: {
}
}
</script>

@ -158,10 +158,11 @@
<q-item
class="cursor-pointer"
>
<q-item-main
:label="muteLabel()"
<q-item-section
@click="toggleMuteAll()"
/>
>
<q-item-label>{{ muteLabel }}</q-item-label>
</q-item-section>
</q-item>
</q-list>
</q-menu>
@ -268,6 +269,11 @@ export default {
},
conferenceHasParticipants () {
return Object.keys(this.participantsList).length < 1
},
muteLabel () {
return _.isEmpty(this.mutedState)
? this.$t('Mute all')
: this.$t('Unmute all')
}
},
watch: {
@ -324,11 +330,6 @@ export default {
this.$store.dispatch('conference/unMuteAll')
}
},
muteLabel () {
return _.isEmpty(this.mutedState)
? this.$t('Mute all')
: this.$t('Unmute all')
},
async join (conferenceId) {
if (this.hasConferenceId) {
await this.$store.dispatch('conference/join', conferenceId)

@ -37,10 +37,6 @@ import CallPlugin from 'src/plugins/call'
import ConferencePlugin from 'src/plugins/conference'
import { INTERNAL_DATE_FORMAT_SLASH, INTERNAL_DATE_FORMAT_DASH, INTERNAL_DATE_FORMAT_DASH_HOUR } from 'src/constants'
import {
getLanguageLabels
} from 'src/i18n'
Vue.use(RtcEnginePlugin)
Vue.use(CallPlugin)
Vue.use(ConferencePlugin)
@ -190,9 +186,6 @@ export default function (/* { ssrContext } */) {
}).onConferenceEnded(() => {
store.dispatch('conference/leave')
})
},
function initI18n (store) {
store.commit('user/setLanguageLabels', getLanguageLabels())
}
],
// enable strict mode (adds overhead!)

@ -1,15 +0,0 @@
<template>
<div />
</template>
<script>
export default {
data () {
return {}
}
}
</script>
<style lang="stylus" rel="stylesheet/stylus">
@import '../themes/quasar.variables.styl'
</style>

@ -1,73 +0,0 @@
<template>
<!-- Configure "view" prop for QLayout -->
<q-layout>
<q-toolbar slot="header">
<!-- opens drawer below
<button class="hide-on-drawer-visible" @click="$refs.drawer.open()">
<i>menu</i>
</button>
-->
<q-toolbar-title>
Title
</q-toolbar-title>
</q-toolbar>
<!-- Navigation Tabs
<q-tabs slot="navigation">
<q-route-tab slot="title" icon="view_quilt" to="/layout/about" replace hide="icon" label="About" />
<q-route-tab slot="title" icon="view_day" to="/layout/toolbar" replace hide="icon" label="Toolbar" />
<q-route-tab slot="title" icon="view_day" to="/layout/tabs" replace label="Tabs" />
<q-route-tab slot="title" icon="input" to="/layout/drawer" replace label="Drawer" />
</q-tabs>
-->
<!-- Left Side Panel
<div slot="left">
<q-list no-border link inset-delimiter>
<q-list-header>Essential Links</q-list-header>
<q-item>
<q-item-side icon="school" />
<q-item-main label="Docs" sublabel="quasar-framework.org" />
</q-item>
<q-item>
<q-item-side icon="record_voice_over" />
<q-item-main label="Forum" sublabel="forum.quasar-framework.org" />
</q-item>
<q-item>
<q-item-side icon="chat" />
<q-item-main label="Gitter Channel" sublabel="Quasar Lobby" />
</q-item>
<q-item>
<q-item-side icon="rss feed" />
<q-item-main label="Twitter" sublabel="@quasarframework" />
</q-item>
</q-list>
</div>
-->
<!-- Right Side Panel
<div slot="right">
...
</div>
-->
<router-view />
<!-- Footer
<q-toolbar slot="footer">
...
</q-toolbar>
-->
</q-layout>
</template>
<script>
export default {
data () {
return {}
}
}
</script>
<style>
</style>

@ -1,17 +0,0 @@
<template>
<!-- if you want automatic padding use "layout-padding" class -->
<div class="layout-padding">
<!-- your content -->
</div>
</template>
<script>
export default {
data () {
return {}
}
}
</script>
<style>
</style>

@ -2306,13 +2306,6 @@ aws4@^1.8.0:
resolved "https://npm-registry.sipwise.com/aws4/-/aws4-1.10.1.tgz#e1e82e4f3e999e2cfd61b161280d16a111f86428"
integrity sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==
axios@^0.21.1:
version "0.21.1"
resolved "https://npm-registry.sipwise.com/axios/-/axios-0.21.1.tgz"
integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==
dependencies:
follow-redirects "^1.10.0"
babel-code-frame@^6.26.0:
version "6.26.0"
resolved "https://npm-registry.sipwise.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
@ -5342,11 +5335,6 @@ follow-redirects@^1.0.0:
resolved "https://npm-registry.sipwise.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db"
integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==
follow-redirects@^1.10.0:
version "1.13.1"
resolved "https://npm-registry.sipwise.com/follow-redirects/-/follow-redirects-1.13.1.tgz"
integrity sha512-SSG5xmZh1mkPGyKzjZP8zLjltIfpW32Y5QpdNJyjcfGxK3qo3NDDkZOZSFiGn1A6SclQxY9GzEwAHQ3dmYRWpg==
for-in@^1.0.2:
version "1.0.2"
resolved "https://npm-registry.sipwise.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"

Loading…
Cancel
Save