Signed-off-by: Arne Hamann <git@arne.email>
This commit is contained in:
Arne Hamann 2023-12-11 21:48:00 +01:00
Родитель f264ff6f44
Коммит 5bb1b71322
32 изменённых файлов: 84 добавлений и 86 удалений

4
package-lock.json сгенерированный
Просмотреть файл

@ -1,12 +1,12 @@
{
"name": "maps",
"version": "1.2.0",
"version": "1.3.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "maps",
"version": "1.2.0",
"version": "1.3.0",
"license": "AGPL-3.0",
"dependencies": {
"@fortawesome/fontawesome-free": "^6.5.1",

Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "maps",
"version": "1.2.0",
"version": "1.3.0",
"description": "Maps app",
"main": "main.js",
"directories": {

Просмотреть файл

@ -67,11 +67,11 @@
</template>
<script>
import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble'
import optionsController from '../optionsController'
import {isPublic} from "../utils/common";
import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble.js'
import optionsController from '../optionsController.js'
import { isPublic } from '../utils/common.js'
export default {
name: 'AppNavigationContactsItem',

Просмотреть файл

@ -67,8 +67,8 @@
</template>
<script>
import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
import { generateUrl } from '@nextcloud/router'
import { isComputer } from '../utils'
import { isPublic } from '../utils/common'

Просмотреть файл

@ -62,9 +62,9 @@
</template>
<script>
import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble'
import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble.js'
import AppNavigationDeviceItem from './AppNavigationDeviceItem'
import optionsController from '../optionsController'

Просмотреть файл

@ -125,11 +125,11 @@
</template>
<script>
import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem'
import NcAppNavigationNew from '@nextcloud/vue/dist/Components/NcAppNavigationNew'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
import NcActionCheckbox from '@nextcloud/vue/dist/Components/NcActionCheckbox'
import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble'
import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
import NcAppNavigationNew from '@nextcloud/vue/dist/Components/NcAppNavigationNew.js'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
import NcActionCheckbox from '@nextcloud/vue/dist/Components/NcActionCheckbox.js'
import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble.js'
import { showError, showSuccess } from '@nextcloud/dialogs'
import { generateUrl } from '@nextcloud/router'
import { isPublic } from '../utils/common'

Просмотреть файл

@ -56,9 +56,9 @@
</template>
<script>
import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink'
import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink.js'
import Folder from 'vue-material-design-icons/Folder'
import { generateUrl } from "@nextcloud/router";

Просмотреть файл

@ -38,11 +38,11 @@
</template>
<script>
import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
import AppNavigationMyMapItem from './AppNavigationMyMapItem'
import optionsController from '../optionsController'
import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble'
import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble.js'
export default {
name: 'AppNavigationMyMapsItem',

Просмотреть файл

@ -48,9 +48,9 @@
</template>
<script>
import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble'
import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble.js'
import optionsController from '../optionsController'
import { showInfo } from '@nextcloud/dialogs'

Просмотреть файл

@ -80,9 +80,9 @@
</template>
<script>
import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink'
import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink.js'
import {isPublic, getToken} from "../utils/common";
import { generateUrl } from "@nextcloud/router";

Просмотреть файл

@ -44,10 +44,10 @@
</template>
<script>
import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
import AppNavigationTrackItem from './AppNavigationTrackItem'
import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble'
import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble.js'
import optionsController from '../optionsController'

Просмотреть файл

@ -71,8 +71,8 @@
</template>
<script>
import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect'
import NcButton from '@nextcloud/vue/dist/Components/NcButton'
import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect.js'
import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
export default {
name: 'FavoriteEditionForm',

Просмотреть файл

@ -38,11 +38,11 @@
<script>
import ClickOutside from 'vue-click-outside'
import NcAppNavigation from '@nextcloud/vue/dist/Components/NcAppNavigation'
import NcAppNavigationSettings from '@nextcloud/vue/dist/Components/NcAppNavigationSettings'
import NcActionCheckbox from '@nextcloud/vue/dist/Components/NcActionCheckbox'
import NcActionText from '@nextcloud/vue/dist/Components/NcActionText'
import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink'
import NcAppNavigation from '@nextcloud/vue/dist/Components/NcAppNavigation.js'
import NcAppNavigationSettings from '@nextcloud/vue/dist/Components/NcAppNavigationSettings.js'
import NcActionCheckbox from '@nextcloud/vue/dist/Components/NcActionCheckbox.js'
import NcActionText from '@nextcloud/vue/dist/Components/NcActionText.js'
import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink.js'
import optionsController from '../optionsController'

Просмотреть файл

@ -42,10 +42,10 @@
</template>
<script>
import NcAppNavigation from '@nextcloud/vue/dist/Components/NcAppNavigation'
import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem'
import NcAppNavigationNew from '@nextcloud/vue/dist/Components/NcAppNavigationNew'
import NcAppNavigationSpacer from '@nextcloud/vue/dist/Components/NcAppNavigationSpacer'
import NcAppNavigation from '@nextcloud/vue/dist/Components/NcAppNavigation.js'
import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
import NcAppNavigationNew from '@nextcloud/vue/dist/Components/NcAppNavigationNew.js'
import NcAppNavigationSpacer from '@nextcloud/vue/dist/Components/NcAppNavigationSpacer.js'
import { mapMutations, mapState, mapActions } from 'vuex'
import { PUBLIC_FAVORITES_NAMESPACE } from '../store/modules/publicFavorites'
import MapMode from '../data/enum/MapMode'

Просмотреть файл

@ -83,9 +83,9 @@
</template>
<script>
import NcAppSidebar from '@nextcloud/vue/dist/Components/NcAppSidebar'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent'
import NcAppSidebar from '@nextcloud/vue/dist/Components/NcAppSidebar.js'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
import { emit } from '@nextcloud/event-bus'
import { generateUrl, generateFilePath } from '@nextcloud/router'
import { showError } from "@nextcloud/dialogs";

Просмотреть файл

@ -14,8 +14,8 @@
<script>
import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem';
import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble';
import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js';
import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble.js';
export default {
name: 'PhotoSideBarTabDeviceItem',

Просмотреть файл

@ -29,8 +29,8 @@
<script>
import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem';
import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble';
import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js';
import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble.js';
export default {
name: 'PhotoSideBarTabTrackItem',

Просмотреть файл

@ -163,16 +163,16 @@
import { generateUrl } from '@nextcloud/router'
import moment from '@nextcloud/moment'
import NcButton from '@nextcloud/vue/dist/Components/NcButton'
import NcActions from '@nextcloud/vue/dist/Components/NcActions'
import NcListItem from '@nextcloud/vue/dist/Components/NcListItem'
import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble'
import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem'
import NcAppNavigationSettings from '@nextcloud/vue/dist/Components/NcAppNavigationSettings'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
import NcListItem from '@nextcloud/vue/dist/Components/NcListItem.js'
import NcCounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble.js'
import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
import NcAppNavigationSettings from '@nextcloud/vue/dist/Components/NcAppNavigationSettings.js'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
import { getToken } from '../../utils/common'
import NcTimezonePicker from '@nextcloud/vue/dist/Components/NcTimezonePicker'
import NcTimezonePicker from '@nextcloud/vue/dist/Components/NcTimezonePicker.js'
import PhotoSideBarTabTrackItem from './PhotoSideBarTabTrackItem'
import PhotoSideBarTabDeviceItem from './PhotoSideBarTabDeviceItem'

Просмотреть файл

@ -39,8 +39,8 @@
</template>
<script>
import NcAppSidebarTab from '@nextcloud/vue/dist/Components/NcAppSidebarTab'
import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent'
import NcAppSidebarTab from '@nextcloud/vue/dist/Components/NcAppSidebarTab.js'
import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
export default {
name: 'SidebarTab',

Просмотреть файл

@ -108,7 +108,7 @@
<script>
import { generateUrl } from '@nextcloud/router'
import { getCurrentUser } from '@nextcloud/auth'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
import L from 'leaflet'
import { LMarker, LTooltip, LPopup } from 'vue2-leaflet'

Просмотреть файл

@ -61,7 +61,7 @@
import L from 'leaflet'
import { LMarker, LTooltip, LPopup, LFeatureGroup, LPolyline } from 'vue2-leaflet'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
import { isComputer } from '../../utils'
import { binSearch, isPublic } from '../../utils/common'

Просмотреть файл

@ -39,7 +39,7 @@
</template>
<script>
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
import L from 'leaflet'
import { LMarker, LTooltip, LPopup } from 'vue2-leaflet'

Просмотреть файл

@ -33,7 +33,7 @@
</template>
<script>
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
import L from 'leaflet'
import { LMarker, LPopup } from 'vue2-leaflet'

Просмотреть файл

@ -61,7 +61,7 @@
import { generateUrl } from '@nextcloud/router'
import moment from '@nextcloud/moment'
import { basename } from '@nextcloud/paths'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
import L from 'leaflet'
import { LMarker, LTooltip, LPopup } from 'vue2-leaflet'

Просмотреть файл

@ -69,7 +69,7 @@
import { generateUrl } from '@nextcloud/router'
import moment from '@nextcloud/moment'
import { basename } from '@nextcloud/paths'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
import L from 'leaflet'
import { LMarker, LTooltip, LPopup } from 'vue2-leaflet'

Просмотреть файл

@ -74,8 +74,8 @@ import { generateUrl } from '@nextcloud/router'
import { getCurrentUser } from '@nextcloud/auth'
import { LMarker, LPopup, LIcon } from 'vue2-leaflet'
import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect'
import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar'
import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect.js'
import NcAvatar from '@nextcloud/vue/dist/Components/NcAvatar.js'
import { formatAddress } from '../../utils'
import { searchContacts, geocode, searchAddress } from '../../network'

Просмотреть файл

@ -39,7 +39,7 @@
</template>
<script>
import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect'
import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect.js'
import L from 'leaflet'

Просмотреть файл

@ -7,7 +7,7 @@
<LPopup :options="popupOptions"
class="popup-track-wrapper">
<NcActionButton v-if="track.isUpdateable"
icon="icon-colorpicker"
icon="icon-colorpicker"
@click="$emit('change-color', track)">
{{ t('maps', 'Change color') }}
</NcActionButton>
@ -25,19 +25,19 @@
icon="icon-download"
:close-after-click="true"
@click="closeafterclickworkaround">
<!--
<!--
looks like close-after-click not working in this popovermenu
therefore added workaround closeafterclickworkaround
-->
{{ t('maps', 'Download track') }}
</NcActionLink>
<NcActionLink v-if="isPublic() && !(track.hideDownload)"
<NcActionLink v-if="isPublic() && !(track.hideDownload)"
target="_self"
:href="downloadTrackShareUrl"
icon="icon-download"
:close-after-click="true"
@click="closeafterclickworkaround">
<!--
<!--
looks like close-after-click not working in this popovermenu
therefore added workaround closeafterclickworkaround
-->
@ -82,8 +82,8 @@
import L from 'leaflet'
import { LMarker, LTooltip, LPopup, LFeatureGroup, LPolyline } from 'vue2-leaflet'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
import NcActionLink from '@nextcloud/vue/dist/Components/NcActionLink.js'
import moment from '@nextcloud/moment'
import { generateUrl } from "@nextcloud/router";
@ -268,7 +268,7 @@ export default {
},
methods: {
// looks like close-after-click not working for NcAcionLink
// looks like close-after-click not working for NcAcionLink
// added working closeafterclickworkaround
closeafterclickworkaround() {
this.$refs.featgroup.mapObject.closePopup()

Просмотреть файл

@ -20,7 +20,7 @@
*
*/
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
import { generateUrl } from '@nextcloud/router'
import { showError, showSuccess } from '@nextcloud/dialogs'

Просмотреть файл

@ -204,10 +204,10 @@
</template>
<script>
import NcContent from '@nextcloud/vue/dist/Components/NcContent'
import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent'
import NcActions from '@nextcloud/vue/dist/Components/NcActions'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
import NcContent from '@nextcloud/vue/dist/Components/NcContent.js'
import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent.js'
import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
import { showError, showInfo, showSuccess } from '@nextcloud/dialogs'
import moment from '@nextcloud/moment'

Просмотреть файл

@ -35,8 +35,8 @@
</template>
<script>
import NcContent from '@nextcloud/vue/dist/Components/NcContent'
import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent'
import NcContent from '@nextcloud/vue/dist/Components/NcContent.js'
import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent.js'
import MapContainer from '../components/MapContainer'
import PublicFavoriteShareSideBar from '../components/PublicFavoriteShareSideBar'
import { mapActions, mapGetters, mapState } from 'vuex'

Просмотреть файл

@ -5,8 +5,6 @@ const buildMode = process.env.NODE_ENV
const isDev = buildMode === 'development'
webpackConfig.devtool = isDev ? 'cheap-source-map' : 'source-map'
webpackConfig.resolve.extensions = [".*",".ts",".js",".vue",".jsx",".tsx"]
webpackConfig.stats = {
colors: true,
modules: false,