-
Notifications
You must be signed in to change notification settings - Fork 25
feat: Added CalDAV URL to the Accountpage #693
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.
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
Conversation
|
With the latest push, I updated the Radicale/CalDAV check to verify whether the redirect URL includes /caldav/. I also extended OcTag.vue by adding a color prop with a default value and implemented our website's highlight color (#ca8df5) as a custom option. Additionally, I added a new configuration to our Docker development stack to enable Radicale. Still missing: Unit Tests |
JammingBen
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A few annotations from my side, but overall it looks quite good already!
packages/web-runtime/tests/unit/components/Account/CalDavUrl.spec.ts
Outdated
Show resolved
Hide resolved
packages/web-runtime/tests/unit/components/Account/CalDavUrl.spec.ts
Outdated
Show resolved
Hide resolved
packages/web-runtime/tests/unit/components/Account/CalDavUrl.spec.ts
Outdated
Show resolved
Hide resolved
| const calDavAvailable = ref(false) | ||
| const copiedIcon = 'check' | ||
| const copyIcon = 'file-copy' | ||
| const checked = ref(false) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe we can give the variable a more descriptive naming
| calDavAvailable.value = true | ||
| } | ||
| } catch (error) { | ||
| console.error('CalDAV check failed:', error) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| console.error('CalDAV check failed:', error) | |
| console.info('CalDAV check failed:', error) |
Since CalDav is not required for a working OpenCloud Instance, I wouldn't announce an error
JammingBen
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some final cleanup, rest LGTM 👍
docker-compose.yml
Outdated
| #traefik.http.routers.opencloud.middlewares: cors,redirect-caldav | ||
| #traefik.http.middlewares.redirect-caldav.redirectregex.regex: '^/.well-known/caldav$' | ||
| #traefik.http.middlewares.redirect-caldav.redirectregex.replacement: '/caldav/' | ||
| #traefik.http.middlewares.redirect-caldav.redirectregex.permanent: true | ||
|
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| #traefik.http.routers.opencloud.middlewares: cors,redirect-caldav | |
| #traefik.http.middlewares.redirect-caldav.redirectregex.regex: '^/.well-known/caldav$' | |
| #traefik.http.middlewares.redirect-caldav.redirectregex.replacement: '/caldav/' | |
| #traefik.http.middlewares.redirect-caldav.redirectregex.permanent: true |
docker-compose.yml
Outdated
| traefik.http.middlewares.radicale-redirect.redirectregex.regex: '^http://(.*):5232(.*)' | ||
| traefik.http.middlewares.radicale-redirect.redirectregex.replacement: 'http://$1:9201$2' | ||
| traefik.http.middlewares.radicale-redirect.redirectregex.permanent: true |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think these can be removed as well?
| traefik.http.middlewares.radicale-redirect.redirectregex.regex: '^http://(.*):5232(.*)' | |
| traefik.http.middlewares.radicale-redirect.redirectregex.replacement: 'http://$1:9201$2' | |
| traefik.http.middlewares.radicale-redirect.redirectregex.permanent: true |
docker-compose.yml
Outdated
| #labels: | ||
| #traefik.enable: true | ||
| #traefik.http.routers.radicale.tls: true | ||
| #traefik.http.routers.radicale.rule: PathPrefix(`/`) | ||
| #traefik.http.routers.radicale.entrypoints: websecure | ||
| #traefik.http.services.radicale.loadbalancer.server.port: 5232 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| #labels: | |
| #traefik.enable: true | |
| #traefik.http.routers.radicale.tls: true | |
| #traefik.http.routers.radicale.rule: PathPrefix(`/`) | |
| #traefik.http.routers.radicale.entrypoints: websecure | |
| #traefik.http.services.radicale.loadbalancer.server.port: 5232 |
AlexAndBear
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🎉
…config to include radicale in web-dev stack.
| <oc-table-tr class="account-page-info-caldav-url"> | ||
| <oc-table-td>{{ $gettext('CalDAV URL') }}</oc-table-td> | ||
| <oc-table-td> | ||
| <span class="oc-text-truncate">{{ configStore.serverUrl }}</span> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did this change ? I thought we need a full url with /caldav slug, now its only the server url ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Only the server URL is correct, because calendar apps will use the .well-known endpoints automagically.
* feat: Added Calendar for CalDAV URL to the Accountpage (only for radicale) * feat: Include radicale in web-dev stack. --------- Co-authored-by: Jannik Stehle <j.stehle@opencloud.eu> Co-authored-by: Alex Ackermann <abackermann91@gmail.com>


Added a Calendar Panel to the User Account Page.
This includes: CalDAV URL, username and an information about the Calendar-Implementaion.
This implements: #600