From 489423048228c93f8eea5fdbfad4c2ea0ec225a0 Mon Sep 17 00:00:00 2001 From: Graham Steffaniak <42989099+gtsteffaniak@users.noreply.github.com> Date: Wed, 11 Oct 2023 09:37:32 -0500 Subject: [PATCH] V0.2.1 (update) (#49) Co-authored-by: Graham Steffaniak --- Dockerfile | 6 +++--- backend/cmd/root.go | 14 +++++--------- backend/filebrowser.yaml | 12 ++++++------ backend/settings/config.go | 15 ++++++++------- backend/users/storage.go | 2 ++ frontend/src/css/dark.css | 13 ------------- frontend/src/css/listing.css | 1 - frontend/src/views/Layout.vue | 21 ++++++++++++++++++--- roadmap.md | 2 +- 9 files changed, 43 insertions(+), 43 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9d2bd6e3..b7d36d5f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG app="/app/filebrowser" RUN apk --no-cache add \ ca-certificates \ mailcap -WORKDIR /app -COPY --from=base $app* ./ +WORKDIR / +COPY --from=base /app/filebrowser* ./ COPY --from=nbuild /app/dist/ ./frontend/dist/ -ENTRYPOINT [ "./filebrowser" ] \ No newline at end of file +ENTRYPOINT [ "./filebrowser" ] diff --git a/backend/cmd/root.go b/backend/cmd/root.go index 84080622..d9442d43 100644 --- a/backend/cmd/root.go +++ b/backend/cmd/root.go @@ -131,16 +131,12 @@ func quickSetup(d pythonData) { checkErr(err) err = d.store.Settings.SaveServer(&settings.GlobalConfiguration.Server) checkErr(err) - username := settings.GlobalConfiguration.Auth.AdminUsername - password := settings.GlobalConfiguration.Auth.AdminPassword - if username == "" || password == "" { - log.Fatal("username and password cannot be empty during quick setup") - } - user := &users.User{ - Username: username, - Password: password, - } + user := &users.User{} + settings.GlobalConfiguration.UserDefaults.Apply(user) + user.Username = settings.GlobalConfiguration.Auth.AdminUsername + user.Password = settings.GlobalConfiguration.Auth.AdminPassword user.Perm.Admin = true + user.Scope = "./" user.DarkMode = true user.ViewMode = "normal" user.LockPassword = false diff --git a/backend/filebrowser.yaml b/backend/filebrowser.yaml index 4718e8a1..71b1b6f2 100644 --- a/backend/filebrowser.yaml +++ b/backend/filebrowser.yaml @@ -13,9 +13,9 @@ userDefaults: singleClick: false permissions: admin: false - create: true - rename: true - modify: true - delete: true - share: true - download: true + create: false + rename: false + modify: false + delete: false + share: false + download: false diff --git a/backend/settings/config.go b/backend/settings/config.go index a4a839e5..646b1ce8 100644 --- a/backend/settings/config.go +++ b/backend/settings/config.go @@ -47,6 +47,7 @@ func setDefaults() Settings { return Settings{ Server: Server{ EnableThumbnails: true, + ResizePreview: false, EnableExec: false, IndexingInterval: 5, Port: 8080, @@ -60,7 +61,7 @@ func setDefaults() Settings { AdminUsername: "admin", AdminPassword: "admin", Method: "password", - Signup: true, + Signup: false, Recaptcha: Recaptcha{ Host: "", }, @@ -73,12 +74,12 @@ func setDefaults() Settings { DisableSettings: false, Locale: "en", Permissions: users.Permissions{ - Create: true, - Rename: true, - Modify: true, - Delete: true, - Share: true, - Download: true, + Create: false, + Rename: false, + Modify: false, + Delete: false, + Share: false, + Download: false, Admin: false, }, }, diff --git a/backend/users/storage.go b/backend/users/storage.go index 31aaa7ba..99e759a1 100644 --- a/backend/users/storage.go +++ b/backend/users/storage.go @@ -1,6 +1,7 @@ package users import ( + "log" "sync" "time" @@ -91,6 +92,7 @@ func (s *Storage) Update(user *User, fields ...string) error { // Save saves the user in a storage. func (s *Storage) Save(user *User) error { + log.Println("Saving new user:", user.Username) if err := user.Clean(""); err != nil { return err } diff --git a/frontend/src/css/dark.css b/frontend/src/css/dark.css index 29ba5528..b34e87f7 100644 --- a/frontend/src/css/dark.css +++ b/frontend/src/css/dark.css @@ -25,19 +25,6 @@ background: var(--background); } -/* Header */ -.dark-mode header { - background: var(--surfacePrimary); -} - -/* Header with backdrop-filter support */ -@supports (backdrop-filter: none) { - .dark-mode header { - background: transparent; - backdrop-filter: blur(16px) invert(0.1); - } -} - #search.dark-mode input { color:white } diff --git a/frontend/src/css/listing.css b/frontend/src/css/listing.css index ea09a3fd..17516c3b 100644 --- a/frontend/src/css/listing.css +++ b/frontend/src/css/listing.css @@ -94,7 +94,6 @@ body.rtl #listing { #listing.compact .item, #listing.normal .item, #listing.list .item { - width: calc(33% - 1em); max-width: 300px; margin: .5em; padding: 0.5em; diff --git a/frontend/src/views/Layout.vue b/frontend/src/views/Layout.vue index 2b92bfce..e53eff22 100644 --- a/frontend/src/views/Layout.vue +++ b/frontend/src/views/Layout.vue @@ -3,9 +3,9 @@
- - - + + +
@@ -93,4 +93,19 @@ export default { color: var(--textPrimary); } + +/* Header */ +.dark-mode-header { + color:white; + background: var(--surfacePrimary); +} + +/* Header with backdrop-filter support */ +@supports (backdrop-filter: none) { + .dark-mode-header { + background: transparent; + backdrop-filter: blur(16px) invert(0.1); + } +} + \ No newline at end of file diff --git a/roadmap.md b/roadmap.md index cf358b07..e36d884b 100644 --- a/roadmap.md +++ b/roadmap.md @@ -22,7 +22,7 @@ Future releases (within 6 months): - Add tools to sidebar - duplicate file detector. - bulk rename https://github.com/filebrowser/filebrowser/issues/2473 - - Add Job status to the sidebar - indexin status. + - Add Job status to the sidebar - index status. - Use vite instead of webpack - upgrade to vue3 - support minio/s3 https://github.com/filebrowser/filebrowser/issues/2544