diff --git a/package.json b/package.json index 513ac9a7..d7926260 100644 --- a/package.json +++ b/package.json @@ -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", @@ -66,7 +66,7 @@ "mocha" ], "ignore": [ - "src/statics" + "public" ], "globals": [ "DEV", diff --git a/src/statics/aktnmap-banner.png b/public/aktnmap-banner.png similarity index 100% rename from src/statics/aktnmap-banner.png rename to public/aktnmap-banner.png diff --git a/src/statics/aktnmap-terms_en.md b/public/aktnmap-terms_en.md similarity index 100% rename from src/statics/aktnmap-terms_en.md rename to public/aktnmap-terms_en.md diff --git a/src/statics/aktnmap-terms_fr.md b/public/aktnmap-terms_fr.md similarity index 100% rename from src/statics/aktnmap-terms_fr.md rename to public/aktnmap-terms_fr.md diff --git a/src/statics/help/en/account.png b/public/help/en/account.png similarity index 100% rename from src/statics/help/en/account.png rename to public/help/en/account.png diff --git a/src/statics/help/en/basics-events.png b/public/help/en/basics-events.png similarity index 100% rename from src/statics/help/en/basics-events.png rename to public/help/en/basics-events.png diff --git a/src/statics/help/en/basics-organisation.png b/public/help/en/basics-organisation.png similarity index 100% rename from src/statics/help/en/basics-organisation.png rename to public/help/en/basics-organisation.png diff --git a/src/statics/help/en/basics-roles.png b/public/help/en/basics-roles.png similarity index 100% rename from src/statics/help/en/basics-roles.png rename to public/help/en/basics-roles.png diff --git a/src/statics/help/en/basics.png b/public/help/en/basics.png similarity index 100% rename from src/statics/help/en/basics.png rename to public/help/en/basics.png diff --git a/src/statics/help/en/event-followup-coordinator.png b/public/help/en/event-followup-coordinator.png similarity index 100% rename from src/statics/help/en/event-followup-coordinator.png rename to public/help/en/event-followup-coordinator.png diff --git a/src/statics/help/en/event-followup-participant.png b/public/help/en/event-followup-participant.png similarity index 100% rename from src/statics/help/en/event-followup-participant.png rename to public/help/en/event-followup-participant.png diff --git a/src/statics/help/en/event-models-management.png b/public/help/en/event-models-management.png similarity index 100% rename from src/statics/help/en/event-models-management.png rename to public/help/en/event-models-management.png diff --git a/src/statics/help/en/event-workflow-basics.png b/public/help/en/event-workflow-basics.png similarity index 100% rename from src/statics/help/en/event-workflow-basics.png rename to public/help/en/event-workflow-basics.png diff --git a/src/statics/help/en/event-workflow-example.png b/public/help/en/event-workflow-example.png similarity index 100% rename from src/statics/help/en/event-workflow-example.png rename to public/help/en/event-workflow-example.png diff --git a/src/statics/help/en/event-workflow-management.png b/public/help/en/event-workflow-management.png similarity index 100% rename from src/statics/help/en/event-workflow-management.png rename to public/help/en/event-workflow-management.png diff --git a/src/statics/help/en/events-management.png b/public/help/en/events-management.png similarity index 100% rename from src/statics/help/en/events-management.png rename to public/help/en/events-management.png diff --git a/src/statics/help/en/group-members-management.png b/public/help/en/group-members-management.png similarity index 100% rename from src/statics/help/en/group-members-management.png rename to public/help/en/group-members-management.png diff --git a/src/statics/help/en/groups-management.png b/public/help/en/groups-management.png similarity index 100% rename from src/statics/help/en/groups-management.png rename to public/help/en/groups-management.png diff --git a/src/statics/help/en/home.png b/public/help/en/home.png similarity index 100% rename from src/statics/help/en/home.png rename to public/help/en/home.png diff --git a/src/statics/help/en/login.png b/public/help/en/login.png similarity index 100% rename from src/statics/help/en/login.png rename to public/help/en/login.png diff --git a/src/statics/help/en/members-add.png b/public/help/en/members-add.png similarity index 100% rename from src/statics/help/en/members-add.png rename to public/help/en/members-add.png diff --git a/src/statics/help/en/members-management.png b/public/help/en/members-management.png similarity index 100% rename from src/statics/help/en/members-management.png rename to public/help/en/members-management.png diff --git a/src/statics/help/en/organisation.png b/public/help/en/organisation.png similarity index 100% rename from src/statics/help/en/organisation.png rename to public/help/en/organisation.png diff --git a/src/statics/help/en/register.png b/public/help/en/register.png similarity index 100% rename from src/statics/help/en/register.png rename to public/help/en/register.png diff --git a/src/statics/help/fr/account.png b/public/help/fr/account.png similarity index 100% rename from src/statics/help/fr/account.png rename to public/help/fr/account.png diff --git a/src/statics/help/fr/basics-events.png b/public/help/fr/basics-events.png similarity index 100% rename from src/statics/help/fr/basics-events.png rename to public/help/fr/basics-events.png diff --git a/src/statics/help/fr/basics-organisation.png b/public/help/fr/basics-organisation.png similarity index 100% rename from src/statics/help/fr/basics-organisation.png rename to public/help/fr/basics-organisation.png diff --git a/src/statics/help/fr/basics-roles.png b/public/help/fr/basics-roles.png similarity index 100% rename from src/statics/help/fr/basics-roles.png rename to public/help/fr/basics-roles.png diff --git a/src/statics/help/fr/basics.png b/public/help/fr/basics.png similarity index 100% rename from src/statics/help/fr/basics.png rename to public/help/fr/basics.png diff --git a/src/statics/help/fr/event-followup-coordinator.png b/public/help/fr/event-followup-coordinator.png similarity index 100% rename from src/statics/help/fr/event-followup-coordinator.png rename to public/help/fr/event-followup-coordinator.png diff --git a/src/statics/help/fr/event-followup-participant.png b/public/help/fr/event-followup-participant.png similarity index 100% rename from src/statics/help/fr/event-followup-participant.png rename to public/help/fr/event-followup-participant.png diff --git a/src/statics/help/fr/event-models-management.png b/public/help/fr/event-models-management.png similarity index 100% rename from src/statics/help/fr/event-models-management.png rename to public/help/fr/event-models-management.png diff --git a/src/statics/help/fr/event-workflow-basics.png b/public/help/fr/event-workflow-basics.png similarity index 100% rename from src/statics/help/fr/event-workflow-basics.png rename to public/help/fr/event-workflow-basics.png diff --git a/src/statics/help/fr/event-workflow-example.png b/public/help/fr/event-workflow-example.png similarity index 100% rename from src/statics/help/fr/event-workflow-example.png rename to public/help/fr/event-workflow-example.png diff --git a/src/statics/help/fr/event-workflow-management.png b/public/help/fr/event-workflow-management.png similarity index 100% rename from src/statics/help/fr/event-workflow-management.png rename to public/help/fr/event-workflow-management.png diff --git a/src/statics/help/fr/events-management.png b/public/help/fr/events-management.png similarity index 100% rename from src/statics/help/fr/events-management.png rename to public/help/fr/events-management.png diff --git a/src/statics/help/fr/group-members-management.png b/public/help/fr/group-members-management.png similarity index 100% rename from src/statics/help/fr/group-members-management.png rename to public/help/fr/group-members-management.png diff --git a/src/statics/help/fr/groups-management.png b/public/help/fr/groups-management.png similarity index 100% rename from src/statics/help/fr/groups-management.png rename to public/help/fr/groups-management.png diff --git a/src/statics/help/fr/home.png b/public/help/fr/home.png similarity index 100% rename from src/statics/help/fr/home.png rename to public/help/fr/home.png diff --git a/src/statics/help/fr/login.png b/public/help/fr/login.png similarity index 100% rename from src/statics/help/fr/login.png rename to public/help/fr/login.png diff --git a/src/statics/help/fr/members-add.png b/public/help/fr/members-add.png similarity index 100% rename from src/statics/help/fr/members-add.png rename to public/help/fr/members-add.png diff --git a/src/statics/help/fr/members-management.png b/public/help/fr/members-management.png similarity index 100% rename from src/statics/help/fr/members-management.png rename to public/help/fr/members-management.png diff --git a/src/statics/help/fr/organisation.png b/public/help/fr/organisation.png similarity index 100% rename from src/statics/help/fr/organisation.png rename to public/help/fr/organisation.png diff --git a/src/statics/help/fr/register.png b/public/help/fr/register.png similarity index 100% rename from src/statics/help/fr/register.png rename to public/help/fr/register.png diff --git a/public/icons/aktnmap-icon-128x128.png b/public/icons/aktnmap-icon-128x128.png new file mode 100644 index 00000000..6ee2da90 Binary files /dev/null and b/public/icons/aktnmap-icon-128x128.png differ diff --git a/public/icons/aktnmap-icon-256x256.png b/public/icons/aktnmap-icon-256x256.png new file mode 100644 index 00000000..2d42f2f8 Binary files /dev/null and b/public/icons/aktnmap-icon-256x256.png differ diff --git a/public/icons/aktnmap-icon-32x32.png b/public/icons/aktnmap-icon-32x32.png new file mode 100644 index 00000000..739d53af Binary files /dev/null and b/public/icons/aktnmap-icon-32x32.png differ diff --git a/public/icons/aktnmap-icon-512x512.png b/public/icons/aktnmap-icon-512x512.png new file mode 100644 index 00000000..faf2b0e2 Binary files /dev/null and b/public/icons/aktnmap-icon-512x512.png differ diff --git a/public/icons/aktnmap-icon-64x64.png b/public/icons/aktnmap-icon-64x64.png new file mode 100644 index 00000000..95c09d05 Binary files /dev/null and b/public/icons/aktnmap-icon-64x64.png differ diff --git a/src/statics/json-icon.svg b/public/icons/json-icon.svg similarity index 100% rename from src/statics/json-icon.svg rename to public/icons/json-icon.svg diff --git a/public/icons/kdk/json.svg b/public/icons/kdk/json.svg new file mode 100644 index 00000000..578e037c --- /dev/null +++ b/public/icons/kdk/json.svg @@ -0,0 +1,84 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/public/icons/kdk/target.svg b/public/icons/kdk/target.svg new file mode 100644 index 00000000..efea381a --- /dev/null +++ b/public/icons/kdk/target.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/App.vue b/src/App.vue index 4dd55db0..e3726d00 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,7 +1,15 @@ @@ -9,6 +17,7 @@ @@ -611,6 +611,6 @@ export default { cursor: wait; } .position-cursor { - cursor: url('../statics/position-cursor.png'), auto; + cursor: url('/icons/kdk/position-cursor.png'), auto; } diff --git a/src/components/CustomerEditor.vue b/src/components/CustomerEditor.vue index 82d077d9..d0a4655f 100644 --- a/src/components/CustomerEditor.vue +++ b/src/components/CustomerEditor.vue @@ -44,22 +44,16 @@ - diff --git a/src/components/EventActivity.vue b/src/components/EventActivity.vue index de27944d..a899a710 100644 --- a/src/components/EventActivity.vue +++ b/src/components/EventActivity.vue @@ -41,7 +41,6 @@ export default { } }, mixins: [ - kCoreMixins.refsResolver(['map']), activityMixin, kCoreMixins.baseCollection, kMapMixins.featureSelection, @@ -321,8 +320,7 @@ export default { mounted () { // Setup event connections // this.$on('popupopen', this.onPopupOpen) - this.$on('click', this.onFeatureClicked) - this.$on('collection-refreshed', this.onCollectionRefreshed) + this.$engineEvents.on('click', this.onFeatureClicked) // Emitted from panel this.$events.$on('zoom-to-participant', this.onZoomToParticipant) this.$events.$on('filter-participant-states', this.onFilterParticipantStates) @@ -330,8 +328,7 @@ export default { beforeUnmount () { // Remove event connections // this.$off('popupopen', this.onPopupOpen) - this.$off('click', this.onFeatureClicked) - this.$off('collection-refreshed', this.onCollectionRefreshed) + this.$engineEvents.off('click', this.onFeatureClicked) this.$events.$off('zoom-to-participant', this.onZoomToParticipant) this.$events.$off('filter-participant-states', this.onFilterParticipantStates) } @@ -346,6 +343,6 @@ export default { cursor: wait; } .position-cursor { - cursor: url('../statics/position-cursor.png'), auto; + cursor: url('/icons/kdk/position-cursor.png'), auto; } diff --git a/src/components/EventActivityPanel.vue b/src/components/EventActivityPanel.vue index 033a8291..0503e972 100644 --- a/src/components/EventActivityPanel.vue +++ b/src/components/EventActivityPanel.vue @@ -2,10 +2,10 @@ -
+ diff --git a/src/components/EventCard.vue b/src/components/EventCard.vue index b8ce6c56..997228de 100644 --- a/src/components/EventCard.vue +++ b/src/components/EventCard.vue @@ -191,7 +191,6 @@ export default { kCoreMixins.baseItem, kCoreMixins.service, kCoreMixins.schemaProxy, - kCoreMixins.refsResolver(['form']), kMapMixins.navigator, mixins.events, mixins.alerts diff --git a/src/components/EventEditor.vue b/src/components/EventEditor.vue index 2367423a..db4a67e3 100644 --- a/src/components/EventEditor.vue +++ b/src/components/EventEditor.vue @@ -2,9 +2,7 @@ + v-model="isModalOpened">
diff --git a/src/components/EventLogEditor.vue b/src/components/EventLogEditor.vue index 935a25cf..7a1d1534 100644 --- a/src/components/EventLogEditor.vue +++ b/src/components/EventLogEditor.vue @@ -20,7 +20,6 @@ export default { kCoreMixins.baseModal, kCoreMixins.service, kCoreMixins.schemaProxy, - kCoreMixins.refsResolver(['form']), mixins.events ], props: { diff --git a/src/components/EventLogItem.vue b/src/components/EventLogItem.vue index db147522..e2daca7e 100644 --- a/src/components/EventLogItem.vue +++ b/src/components/EventLogItem.vue @@ -7,13 +7,13 @@ -