Skip to content

Commit

Permalink
wip: Upgrade to Quasar 2 / Vue 3 #393
Browse files Browse the repository at this point in the history
wip: Upgrade NodeJS to v16 and Feathers v5 #392
  • Loading branch information
cnouguier committed Aug 11, 2022
1 parent 257fc6b commit 7dd04d2
Show file tree
Hide file tree
Showing 102 changed files with 440 additions and 316 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"analyze": "npm run analyze:stats && npm run analyze:treemap",
"lint": "standard src/**/*.js src/**/*.vue test/**/*.js tutorials/**/*.js --fix",
"benchmark": "node ./benchmark",
"icons:cp": "shx cp -R node_modules/@kalisio/kdk/extras/icons public/icons/kdk",
"icons:cp": "shx cp -R node_modules/@kalisio/kdk/extras/icons/* public/icons/kdk",
"tours:cp": "shx cp -R node_modules/@kalisio/kdk/extras/tours/* src/tours",
"mocha": "mocha test/**/*.test.js --timeout 30000 --require esm",
"coverage": "c8 npm run mocha",
Expand All @@ -66,7 +66,7 @@
"mocha"
],
"ignore": [
"src/statics"
"public"
],
"globals": [
"DEV",
Expand Down
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added public/icons/aktnmap-icon-128x128.png
Binary file added public/icons/aktnmap-icon-256x256.png
Binary file added public/icons/aktnmap-icon-32x32.png
Binary file added public/icons/aktnmap-icon-512x512.png
Binary file added public/icons/aktnmap-icon-64x64.png
File renamed without changes
84 changes: 84 additions & 0 deletions public/icons/kdk/json.svg
37 changes: 37 additions & 0 deletions public/icons/kdk/target.svg
22 changes: 11 additions & 11 deletions src/App.vue
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
<template>
<!-- Don't drop "q-app" class -->
<div id="q-app">
<q-ajax-bar ref="bar" position="bottom" size="8px" color="primary" :delay="250"></q-ajax-bar>
<!-- Ajax bar -->
<q-ajax-bar
ref="bar"
position="bottom"
size="8px"
color="primary"
:delay="250">
</q-ajax-bar>
<!-- Router view -->
<router-view></router-view>
</div>
</template>

<script>
import _ from 'lodash'
import logger from 'loglevel'
import { utils as kdkCoreUtils } from '@kalisio/kdk/core.client'
export default {
data () {
Expand Down Expand Up @@ -70,16 +79,7 @@ export default {
},
created () {
// Install the icon mapping function to handle kdk icons
this.$q.iconMapFn = (iconName) => {
if (iconName.startsWith('kdk:') === true) {
// we strip the "kdk:" part
const name = iconName.substring(4)
// Load the icon
const icon = this.$load('icons/' + name, 'asset')
// Return the inlined icon
return { icon: 'img:' + icon }
}
}
this.$q.iconMapFn = kdkCoreUtils.mapIconFunction
},
mounted () {
// Check for error on refresh
Expand Down
Empty file added src/assets/.gitkeep
Empty file.
Binary file removed src/assets/aktnmap-banner.png
Diff not rendered.
Binary file removed src/assets/aktnmap-logo.png
Diff not rendered.
1 change: 0 additions & 1 deletion src/assets/sad.svg
Diff not rendered.
2 changes: 1 addition & 1 deletion src/boot/i18n.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { i18n } from '@kalisio/kdk/core.client'

export default async ({ app }) => {
await i18n.initialize(app, ['core', 'map', 'app'])
await i18n.initialize(app, ['core', 'map', 'aktnmap'])
}
Loading

0 comments on commit 7dd04d2

Please sign in to comment.