Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@
"@vue/test-utils": "2.5.1",
"browserslist-to-esbuild": "^2.1.1",
"browserslist-useragent-regexp": "^4.1.3",
"eslint": "10.13.0",
"eslint": "10.14.0",
"franc-min": "^6.2.0",
"happy-dom": "21.0.4",
"knip": "6.43.0",
"knip": "6.44.1",
"license-checker-rseidelsohn": "4.4.2",
"node-fetch": "3.3.2",
"playwright": "^1.61.1",
Expand All @@ -72,7 +72,7 @@
"vitest": "^5.0.0",
"vitest-mock-extended": "5.1.1",
"vue": "^3.5.31",
"vue-tsc": "3.3.13",
"vue-tsc": "3.3.14",
"vue3-gettext": "^4.0.0"
},
"engines": {
Expand Down
5 changes: 4 additions & 1 deletion packages/web-pkg/src/components/Yjs/YjsCollaborators.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@
:key="item.userId"
class="yjs-collaborator-avatar relative inline-flex rounded-full border-2"
:class="{ 'yjs-collaborator-avatar-followed': item.userId === followedUser?.id }"
:style="{ borderColor: colorById[item.userId], zIndex: avatars.length - index }"
:style="{
borderColor: colorById[item.userId],
zIndex: avatars.length - (index as number)
}"
:data-test-user-id="item.userId"
>
<user-avatar
Expand Down
8 changes: 4 additions & 4 deletions packages/web-runtime/src/pages/account/accountCalendar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<account-label
class="truncate"
:label="$gettext('CalDAV URL')"
:description="configStore.serverUrl"
:description="serverUrl"
/>
</oc-table-td>
<oc-table-td>
Expand Down Expand Up @@ -107,7 +107,7 @@ import { useTask } from 'vue-concurrency'
const { $gettext } = useGettext()
const userStore = useUserStore()
const { user } = storeToRefs(userStore)
const configStore = useConfigStore()
const { serverUrl } = storeToRefs(useConfigStore())
const clientService = useClientService()

const isCalDavAvailable = ref(false)
Expand All @@ -127,7 +127,7 @@ function announceCopied() {
}

const copyCalDavUrlToClipboard = () => {
navigator.clipboard.writeText(unref(configStore.serverUrl))
navigator.clipboard.writeText(unref(serverUrl))
copyCalDavUrlIcon.value = copiedIcon
announceCopied()
setTimeout(() => (copyCalDavUrlIcon.value = copyIcon), 1500)
Expand All @@ -145,7 +145,7 @@ const loadCalDavTask = useTask(function* () {
try {
const response = yield clientService.httpAuthenticated.get(wellKnownUrl, { method: 'OPTIONS' })
isCalDavAvailable.value = response.request.responseURL.includes(
urlJoin(configStore.serverUrl, 'caldav')
urlJoin(unref(serverUrl), 'caldav')
)
} catch (e) {
console.error(e)
Expand Down
Loading
Loading