Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support touring with Vue.js 3. #963

Merged
merged 1 commit into from
Mar 3, 2023
Merged

Support touring with Vue.js 3. #963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 25 additions & 75 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@
"zip": "node ./src-script/7zip-bin-wrapper.js"
},
"dependencies": {
"@globalhive/vuejs-tour": "^1.3.4",
"@quasar/extras": "^1.15.6",
"@types/yargs": "^15.0.5",
"axios": "^0.26.1",
Expand Down Expand Up @@ -150,7 +151,6 @@
"uuid": "^8.3.2",
"vue": "^3.2.45",
"vue-router": "^4.1.6",
"vue-tour": "^2.0.0",
"vuex": "^4.1.0",
"ws": "^8.5.0",
"xml2js": "^0.4.23",
Expand Down
2 changes: 1 addition & 1 deletion quasar.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module.exports = configure(function (ctx) {
// app boot file (/src/boot)
// --> boot files are part of "main.js"
// https://quasar.dev/quasar-cli/cli-documentation/boot-files
boot: ['axios', 'globalapi', 'ws'],
boot: ['axios', 'globalapi', 'tour', 'ws'],

// https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-css
css: ['app.sass'],
Expand Down
6 changes: 3 additions & 3 deletions src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ limitations under the License.
>
<q-icon name="warning" style="font-size: 2.5em; color: red" />
</q-btn>
<!-- <VueTour /> -->
<zcl-tour />
</div>
</template>

<script>
import { defineComponent } from 'vue'
import { QSpinnerGears } from 'quasar'
// import VueTour from './tutorials/VueTour.vue'
import ZclTour from './tutorials/ZclTour.vue'
import CommonMixin from './util/common-mixin'
const rendApi = require(`../src-shared/rend-api.js`)
const restApi = require(`../src-shared/rest-api.js`)
Expand Down Expand Up @@ -85,7 +85,7 @@ async function initLoad(store) {
export default defineComponent({
name: 'App',
components: {
// VueTour,
ZclTour,
},
mixins: [CommonMixin],
computed: {
Expand Down
14 changes: 14 additions & 0 deletions src/boot/tour.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { boot } from 'quasar/wrappers'
import VueJsTour from '@globalhive/vuejs-tour'
import '@globalhive/vuejs-tour/dist/style.css'
import '../css/zclTour.scss'

export let startTour = () => {}

export const setStartTour = (startTourFunction) => {
startTour = startTourFunction
}

export default boot(async ({ app }) => {
app.use(VueJsTour)
})
2 changes: 1 addition & 1 deletion src/components/InitialContent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ limitations under the License.
-->

<template>
<div>
<div class="q-px-lg">
<div v-if="uiTheme === 'matter'">
<h3 id="zcl-advanced-platform">Welcome to Matter</h3>
</div>
Expand Down
Loading