Skip to content

Commit

Permalink
upgrade pocketbase version to 1.23.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@tilalx
tilalx committed Nov 25, 2024
1 parent 94a56e9 commit 7d6bee6
Show file tree
Hide file tree
Showing 12 changed files with 1,512 additions and 248 deletions.
Binary file modified .yarn/install-state.gz
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion app/components/layout/NavBar.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ let logo_url = ref('')
onMounted(async () => {
if (settings.value && settings.value.page_logo) {
logo_url.value = await pb.files.getUrl(
logo_url.value = await pb.files.getURL(
settings.value,
settings.value.page_logo,
)
Expand Down
2 changes: 1 addition & 1 deletion app/components/user/UserIcon.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const pocketbaseAuth = JSON.parse(localStorage.getItem('pocketbase_auth'))
const user = ref(pocketbaseAuth.model)
const dialogOpen = ref(false);
const { t } = useI18n();
const image = pb.files.getUrl(user.value, user.value.avatar, {'thumb': '100x100'});
const image = pb.files.getURL(user.value, user.value?.avatar, {'thumb': '100x100'});
const items = [
{
Expand Down
2 changes: 1 addition & 1 deletion app/layouts/default.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const refreshSession = async () => {
const setFavicon = () => {
if (!settings.value?.page_icon) return
const favUrl = pb.files.getUrl(settings.value, settings.value.page_icon)
const favUrl = pb.files.getURL(settings.value, settings.value.page_icon)
let link =
document.querySelector("link[rel~='icon']") ||
document.createElement('link')
Expand Down
41 changes: 23 additions & 18 deletions app/pages/login.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@
<div
v-if="
authMethods &&
(authMethods.emailPassword ||
authMethods.usernamePassword ||
authMethods.authProviders.length > 0)
(authMethods.password.enabled ||
authMethods.oauth2.enabled)
"
>
<!-- Login Form -->
Expand All @@ -32,8 +31,11 @@
<!-- Identity Field -->
<v-text-field
v-if="
authMethods.usernamePassword &&
authMethods.emailPassword
authMethods.password.enabled &&
authMethods.password.identityFields.includes(
'email',
'username',
)
"
:label="$t('account.username_or_email')"
prepend-icon="mdi-account"
Expand All @@ -46,7 +48,10 @@
class="mt-4"
></v-text-field>
<v-text-field
v-else-if="authMethods.emailPassword"
v-else-if="authMethods.password.enabled &&
authMethods.password.identityFields.includes(
'email',
)"
:label="$t('account.email')"
prepend-icon="mdi-email"
v-model="identity"
Expand All @@ -58,7 +63,10 @@
class="mt-4"
></v-text-field>
<v-text-field
v-else-if="authMethods.usernamePassword"
v-else-if="authMethods.password.enabled &&
authMethods.password.identityFields.includes(
'username',
)"
:label="$t('account.username')"
prepend-icon="mdi-account"
v-model="identity"
Expand All @@ -73,8 +81,7 @@
<!-- Password Field -->
<v-text-field
v-if="
authMethods.usernamePassword ||
authMethods.emailPassword
authMethods.password.enabled
"
:label="$t('account.password')"
prepend-icon="mdi-lock"
Expand All @@ -89,7 +96,7 @@

<!-- Reset Password Link -->
<v-row
v-if="authMethods.emailPassword"
v-if="authMethods.password.enabled"
class="text-center mt-2 mb-4"
>
<v-col cols="12" class="text-right">
Expand All @@ -106,8 +113,7 @@
<!-- Login Button -->
<v-row
v-if="
authMethods.usernamePassword ||
authMethods.emailPassword
authMethods.password.enabled
"
class="text-center mt-2"
>
Expand All @@ -128,20 +134,19 @@
<!-- Social Login Options -->
<div
v-if="
authMethods.authProviders.length > 0 &&
(authMethods.usernamePassword ||
authMethods.emailPassword)
authMethods.oauth2.enabled &&
authMethods.password.enabled
"
class="text-center mt-2"
>
{{ $t('account.or_login_with') }}
</div>
<v-row
v-if="authMethods.authProviders.length > 0"
v-if="authMethods.oauth2.enabled"
class="text-center mt-4"
>
<v-col
v-for="provider in authMethods.authProviders"
v-for="provider in authMethods.oauth2.providers"
:key="provider.name"
cols="6"
md="4"
Expand Down Expand Up @@ -184,7 +189,7 @@
<v-form
v-if="
view === 'requestReset' &&
authMethods.emailPassword
authMethods.password.enabled
"
ref="resetForm"
@submit.prevent="handleRequestPasswordReset"
Expand Down
18 changes: 9 additions & 9 deletions app/pages/settings.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,18 +154,18 @@ const signImage = ref(null)
onMounted(() => {
// Compute image URLs only on the client side
pageLogo.value = pb.files.getUrl(settings.value, settings.value.page_logo)
pageIcon.value = pb.files.getUrl(settings.value, settings.value.page_icon)
signImage.value = pb.files.getUrl(settings.value, settings.value.sign_image)
pageLogo.value = pb.files.getURL(settings.value, settings.value.page_logo)
pageIcon.value = pb.files.getURL(settings.value, settings.value.page_icon)
signImage.value = pb.files.getURL(settings.value, settings.value.sign_image)
// Subscribe to changes in the settings collection
pb.collection('settings').subscribe(
'RECORD_ID',
(e) => {
Object.assign(copySettings, e.data)
pageLogo.value = pb.files.getUrl(e.data, e.data.page_logo)
pageIcon.value = pb.files.getUrl(e.data, e.data.page_icon)
signImage.value = pb.files.getUrl(e.data, e.data.sign_image)
pageLogo.value = pb.files.getURL(e.data, e.data.page_logo)
pageIcon.value = pb.files.getURL(e.data, e.data.page_icon)
signImage.value = pb.files.getURL(e.data, e.data.sign_image)
},
{ recordId: 'settings_123456' },
)
Expand All @@ -178,7 +178,7 @@ const updateLogo = async (file) => {
.update(settings.value.id, {
page_logo: file,
})
pageLogo.value = pb.files.getUrl(updatedSettings, updatedSettings.page_logo)
pageLogo.value = pb.files.getURL(updatedSettings, updatedSettings.page_logo)
}
const updateIcon = async (file) => {
Expand All @@ -187,7 +187,7 @@ const updateIcon = async (file) => {
.update(settings.value.id, {
page_icon: file,
})
pageIcon.value = pb.files.getUrl(updatedSettings, updatedSettings.page_icon)
pageIcon.value = pb.files.getURL(updatedSettings, updatedSettings.page_icon)
}
const updateSignImage = async (file) => {
Expand All @@ -196,7 +196,7 @@ const updateSignImage = async (file) => {
.update(settings.value.id, {
sign_image: file,
})
signImage.value = pb.files.getUrl(
signImage.value = pb.files.getURL(
updatedSettings,
updatedSettings.sign_image,
)
Expand Down
12 changes: 6 additions & 6 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,22 @@
"@mdi/font": "^7.4.47",
"@nuxt/image": "^1.8.1",
"@nuxtjs/i18n": "^8.5.5",
"@types/pdfkit": "^0.13.5",
"@types/pdfkit": "^0.13.6",
"@types/qrcode": "^1.5.5",
"concurrently": "^9.0.1",
"concurrently": "^9.1.0",
"exceljs": "^4.4.0",
"h3": "^1.13.0",
"install": "^0.13.0",
"moment": "^2.30.1",
"nuxt": "^3.13.2",
"nuxt": "^3.14.1592",
"path": "^0.12.7",
"pdfkit": "^0.15.0",
"pocketbase": "^0.21.5",
"pdfkit": "^0.15.1",
"pocketbase": "^0.22.0",
"prettier": "^3.3.3",
"qrcode": "^1.5.4",
"release-it": "^17.10.0",
"release-it-snapshot-prerelease-version": "^2.1.0",
"sass": "^1.80.4",
"sass": "^1.81.0",
"vite": "5.4.11",
"vue": "3.5.13",
"vuetify-nuxt-module": "0.18.3"
Expand Down
100 changes: 48 additions & 52 deletions pocketbase/go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,88 +1,84 @@
module pocketbase

go 1.22.5
go 1.23

require (
github.com/labstack/echo/v5 v5.0.0-20230722203903-ec5b858dab61
github.com/pocketbase/pocketbase v0.22.26
)
toolchain go1.23.3

require github.com/pocketbase/pocketbase v0.23.0

require (
github.com/AlecAivazis/survey/v2 v2.3.7 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/aws/aws-sdk-go-v2 v1.32.2 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 // indirect
github.com/aws/aws-sdk-go-v2/config v1.27.31 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.30 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.12 // indirect
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.15 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.16 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.16 // indirect
github.com/aws/aws-sdk-go-v2 v1.32.5 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7 // indirect
github.com/aws/aws-sdk-go-v2/config v1.28.5 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.46 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.20 // indirect
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.40 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.24 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.24 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.16 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.18 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.18 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.16 // indirect
github.com/aws/aws-sdk-go-v2/service/s3 v1.60.1 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.22.5 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.5 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.30.5 // indirect
github.com/aws/smithy-go v1.22.0 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.24 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.5 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.5 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.5 // indirect
github.com/aws/aws-sdk-go-v2/service/s3 v1.68.0 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.24.6 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.5 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.33.1 // indirect
github.com/aws/smithy-go v1.22.1 // indirect
github.com/disintegration/imaging v1.6.2 // indirect
github.com/dlclark/regexp2 v1.11.4 // indirect
github.com/domodwyer/mailyak/v3 v3.6.2 // indirect
github.com/dop251/goja v0.0.0-20241009100908-5f46f2705ca3 // indirect
github.com/dop251/base64dec v0.0.0-20231022112746-c6c9f9a96217 // indirect
github.com/dop251/goja v0.0.0-20241024094426-79f3a7efcdbd // indirect
github.com/dop251/goja_nodejs v0.0.0-20240728170619-29b559befffc // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/fatih/color v1.17.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.5 // indirect
github.com/fatih/color v1.18.0 // indirect
github.com/fsnotify/fsnotify v1.8.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.7 // indirect
github.com/ganigeorgiev/fexpr v0.4.1 // indirect
github.com/go-ozzo/ozzo-validation/v4 v4.3.0 // indirect
github.com/go-sourcemap/sourcemap v2.1.4+incompatible // indirect
github.com/goccy/go-json v0.10.3 // indirect
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 // indirect
github.com/google/pprof v0.0.0-20241122213907-cbe949e5a41b // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
github.com/googleapis/gax-go/v2 v2.14.0 // indirect
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-sqlite3 v1.14.22 // indirect
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
github.com/ncruces/go-strftime v0.1.9 // indirect
github.com/pocketbase/dbx v1.10.1 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
github.com/spf13/cast v1.7.0 // indirect
github.com/spf13/cobra v1.8.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasttemplate v1.2.2 // indirect
go.opencensus.io v0.24.0 // indirect
gocloud.dev v0.39.0 // indirect
golang.org/x/crypto v0.28.0 // indirect
golang.org/x/image v0.19.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/oauth2 v0.22.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/term v0.25.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/time v0.6.0 // indirect
golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect
google.golang.org/api v0.194.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed // indirect
google.golang.org/grpc v1.65.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
modernc.org/gc/v3 v3.0.0-20240801135723-a856999a2e4a // indirect
modernc.org/libc v1.55.3 // indirect
gocloud.dev v0.40.0 // indirect
golang.org/x/crypto v0.29.0 // indirect
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
golang.org/x/image v0.22.0 // indirect
golang.org/x/net v0.31.0 // indirect
golang.org/x/oauth2 v0.24.0 // indirect
golang.org/x/sync v0.9.0 // indirect
golang.org/x/sys v0.27.0 // indirect
golang.org/x/term v0.26.0 // indirect
golang.org/x/text v0.20.0 // indirect
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
google.golang.org/api v0.209.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 // indirect
google.golang.org/grpc v1.68.0 // indirect
google.golang.org/protobuf v1.35.2 // indirect
modernc.org/gc/v3 v3.0.0-20241004144649-1aea3fae8852 // indirect
modernc.org/libc v1.61.2 // indirect
modernc.org/mathutil v1.6.0 // indirect
modernc.org/memory v1.8.0 // indirect
modernc.org/sqlite v1.32.0 // indirect
modernc.org/sqlite v1.34.1 // indirect
modernc.org/strutil v1.2.0 // indirect
modernc.org/token v1.1.0 // indirect
)
Loading

0 comments on commit 7d6bee6

Please sign in to comment.