diff --git a/.gitignore b/.gitignore index ba435e214..9a576afea 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,7 @@ erl_crash.dump .env.production .env.test -.env +/.env .env.2 setup_db.psql diff --git a/js/.babelrc b/js/.babelrc deleted file mode 100644 index a736dde9b..000000000 --- a/js/.babelrc +++ /dev/null @@ -1,5 +0,0 @@ -{ - "presets": [ - "@vue/app" - ] -} \ No newline at end of file diff --git a/js/.env b/js/.env new file mode 100644 index 000000000..2b749cb2d --- /dev/null +++ b/js/.env @@ -0,0 +1 @@ +VUE_APP_INJECT_COMMENT = \ No newline at end of file diff --git a/js/.gitignore b/js/.gitignore index 10ca88b8c..db755fec3 100644 --- a/js/.gitignore +++ b/js/.gitignore @@ -27,4 +27,3 @@ yarn-error.log* *.sln *.sw* -.env diff --git a/js/babel.config.js b/js/babel.config.js new file mode 100644 index 000000000..dc91850bf --- /dev/null +++ b/js/babel.config.js @@ -0,0 +1,7 @@ +module.exports = { + presets: [ + [ + "@vue/app", {useBuiltIns: "entry"} + ] + ] +}; diff --git a/js/package.json b/js/package.json index ebfc18572..7af8d1cf1 100644 --- a/js/package.json +++ b/js/package.json @@ -4,7 +4,7 @@ "license": "AGPL-3.0", "private": true, "scripts": { - "build": "vue-cli-service build", + "build": "vue-cli-service build --modern", "test:unit": "vue-cli-service test:unit", "test:e2e": "vue-cli-service test:e2e", "lint": "vue-cli-service lint", @@ -24,6 +24,7 @@ "buefy": "^0.8.2", "graphql": "^14.5.8", "graphql-tag": "^2.10.1", + "intersection-observer": "^0.7.0", "leaflet": "^1.4.0", "lodash": "^4.17.11", "ngeohash": "^0.6.3", @@ -45,12 +46,13 @@ "@types/leaflet": "^1.5.2", "@types/lodash": "^4.14.141", "@types/mocha": "^5.2.6", - "@vue/cli-plugin-babel": "^3.6.0", - "@vue/cli-plugin-e2e-cypress": "^4.0.0-rc.7", - "@vue/cli-plugin-pwa": "^3.6.0", - "@vue/cli-plugin-typescript": "^3.6.0", - "@vue/cli-plugin-unit-mocha": "^3.6.0", - "@vue/cli-service": "^3.6.0", + "@vue/cli-plugin-babel": "^4.0.3", + "@vue/cli-plugin-e2e-cypress": "^4.0.3", + "@vue/cli-plugin-pwa": "^4.0.3", + "@vue/cli-plugin-router": "^4.0.3", + "@vue/cli-plugin-typescript": "^4.0.3", + "@vue/cli-plugin-unit-mocha": "^4.0.3", + "@vue/cli-service": "^4.0.3", "@vue/eslint-config-typescript": "^4.0.0", "@vue/test-utils": "^1.0.0-beta.29", "apollo-link-error": "^1.1.12", @@ -63,7 +65,7 @@ "tslint": "^5.20.0", "tslint-config-airbnb": "^5.11.2", "typescript": "^3.6.3", - "vue-cli-plugin-styleguidist": "^3.24.2", + "vue-cli-plugin-styleguidist": "^3.25.0", "vue-cli-plugin-webpack-bundle-analyzer": "^1.3.0", "vue-i18n-extract": "^1.0.2", "vue-svg-inline-loader": "^1.3.0", @@ -72,7 +74,7 @@ }, "browserslist": [ ">0.25%", - "not ie 11", + "ie 11", "not op_mini all" ], "engines": { diff --git a/js/public/index.html b/js/public/index.html index e5cc633db..0b9087c40 100644 --- a/js/public/index.html +++ b/js/public/index.html @@ -6,7 +6,7 @@ - + <%= VUE_APP_INJECT_COMMENT %> diff --git a/js/src/App.vue b/js/src/App.vue index 957ca94ff..6bdc00e88 100644 --- a/js/src/App.vue +++ b/js/src/App.vue @@ -99,9 +99,10 @@ $mdi-font-path: "~@mdi/font/fonts"; body { // background: #f7f8fa; background: #ebebeb; + font-family: BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Fira Sans','Droid Sans','Helvetica Neue',Helvetica,Arial,sans-serif; main { - margin: 1rem auto; + margin: 1rem auto 0; } } diff --git a/js/src/views/Event/Edit.vue b/js/src/views/Event/Edit.vue index 533240ad2..275abc916 100644 --- a/js/src/views/Event/Edit.vue +++ b/js/src/views/Event/Edit.vue @@ -277,7 +277,7 @@ import { EventVisibility, IEvent, ParticipantRole, } from '@/types/event.model'; -import { CURRENT_ACTOR_CLIENT, IDENTITIES, LOGGED_USER_DRAFTS, LOGGED_USER_PARTICIPATIONS } from '@/graphql/actor'; +import { CURRENT_ACTOR_CLIENT, LOGGED_USER_DRAFTS, LOGGED_USER_PARTICIPATIONS } from '@/graphql/actor'; import { IPerson, Person } from '@/types/actor'; import PictureUpload from '@/components/PictureUpload.vue'; import EditorComponent from '@/components/Editor.vue'; @@ -289,6 +289,7 @@ import AddressAutoComplete from '@/components/Event/AddressAutoComplete.vue'; import { buildFileFromIPicture, buildFileVariable, readFileAsync } from '@/utils/image'; import IdentityPickerWrapper from '@/views/Account/IdentityPickerWrapper.vue'; import { RouteName } from '@/router'; +import 'intersection-observer'; @Component({ components: { IdentityPickerWrapper, AddressAutoComplete, TagInput, DateTimePicker, PictureUpload, Editor: EditorComponent }, diff --git a/js/src/views/Event/Participants.vue b/js/src/views/Event/Participants.vue index 68737aa96..3d5998add 100644 --- a/js/src/views/Event/Participants.vue +++ b/js/src/views/Event/Participants.vue @@ -1,6 +1,3 @@ -import {ParticipantRole} from "@/types/event.model"; -import {ParticipantRole} from "@/types/event.model"; -import {ParticipantRole} from "@/types/event.model";