updated to v0.2.1

backend/cmd/root.go

@@ -141,9 +141,6 @@ func quickSetup(d pythonData) {
 		Password: password,
 	}
 	user.Perm.Admin = true
-<<<<<<< HEAD
-	settings.GlobalConfiguration.UserDefaults.Apply(user)
-=======
 	user.DarkMode = true
 	user.ViewMode = "normal"
 	user.LockPassword = false
@@ -156,7 +153,6 @@ func quickSetup(d pythonData) {
 		Download: true,
 		Admin:    true,
 	}
->>>>>>> v0.2.1
 	err = d.store.Users.Save(user)
 	checkErr(err)
 }

backend/cmd/users_add.go

@@ -16,12 +16,6 @@ var usersAddCmd = &cobra.Command{
 	Long:  `Create a new user and add it to the database.`,
 	Args:  cobra.ExactArgs(2), //nolint:gomnd
 	Run: python(func(cmd *cobra.Command, args []string, d pythonData) {
-<<<<<<< HEAD
-		password, err := users.HashPwd(args[1])
-		checkErr(err)
-
-=======
->>>>>>> v0.2.1
 		user := &users.User{
 			Username:     args[0],
 			Password:     args[1],

backend/cmd/users_update.go

@@ -8,12 +8,6 @@ import (
 
 func init() {
 	usersCmd.AddCommand(usersUpdateCmd)
-<<<<<<< HEAD
-
-	usersUpdateCmd.Flags().StringP("password", "p", "", "new password")
-	usersUpdateCmd.Flags().StringP("username", "u", "", "new username")
-=======
->>>>>>> v0.2.1
 }
 
 var usersUpdateCmd = &cobra.Command{

backend/filebrowser.yaml

@@ -1,19 +1,9 @@
 server:
   port: 8080
   baseURL: "/"
-  root: "/Users/steffag/git/go"
 auth:
   method: password
   signup: true
-<<<<<<< HEAD
-frontend:
-  theme: dark
-users:
-  - name: admin
-    settings:
-      hideDotfiles: true
-      singleClick: false
-=======
 userDefaults:
   darkMode: true
   disableSettings: false
@@ -28,4 +18,3 @@ userDefaults:
     delete: true
     share: true
     download: true
->>>>>>> v0.2.1

backend/http/auth.go

@@ -134,18 +134,7 @@ var signupHandler = func(w http.ResponseWriter, r *http.Request, d *data) (int,
 		Username: info.Username,
 		Password: info.Password,
 	}
-<<<<<<< HEAD
-
-	pwd, err := users.HashPwd(info.Password)
-	if err != nil {
-		return http.StatusInternalServerError, err
-	}
-
-	user.Password = pwd
-
-=======
 	settings.GlobalConfiguration.UserDefaults.Apply(user)
->>>>>>> v0.2.1
 	userHome, err := d.settings.MakeUserDir(user.Username, user.Scope, d.server.Root)
 	if err != nil {
 		log.Printf("create user: failed to mkdir user home dir: [%s]", userHome)

backend/settings/structs.go

@@ -67,15 +67,6 @@ type Frontend struct {
 // UserDefaults is a type that holds the default values
 // for some fields on User.
 type UserDefaults struct {
-<<<<<<< HEAD
-	LockPassword bool         `json:"lockPassword"`
-	Scope        string       `json:"scope"`
-	Locale       string       `json:"locale"`
-	ViewMode     string       `json:"viewMode"`
-	SingleClick  bool         `json:"singleClick"`
-	Rules        []rules.Rule `json:"rules"`
-	Sorting      struct {
-=======
 	DarkMode        bool         `json:"darkMode"`
 	LockPassword    bool         `json:"lockPassword"`
 	DisableSettings bool         `json:"disableSettings,omitempty"`
@@ -85,17 +76,12 @@ type UserDefaults struct {
 	SingleClick     bool         `json:"singleClick"`
 	Rules           []rules.Rule `json:"rules"`
 	Sorting         struct {
->>>>>>> v0.2.1
 		By  string `json:"by"`
 		Asc bool   `json:"asc"`
 	} `json:"sorting"`
 	Perm         users.Permissions `json:"perm"`
 	Permissions  users.Permissions `json:"permissions"`
-<<<<<<< HEAD
-	Commands     []string          `json:"commands,omitemptys"`
-=======
 	Commands     []string          `json:"commands,omitempty"`
->>>>>>> v0.2.1
 	HideDotfiles bool              `json:"hideDotfiles"`
 	DateFormat   bool              `json:"dateFormat"`
 }

backend/storage/bolt/users.go

@@ -74,20 +74,12 @@ func (st usersBackend) Update(user *users.User, fields ...string) error {
 }
 
 func (st usersBackend) Save(user *users.User) error {
-<<<<<<< HEAD
-	password, err := users.HashPwd(user.Password)
-	if err != nil {
-		return err
-	}
-	user.Password = password
-=======
 	log.Println("userinfo", user.Password)
 	pass, err := users.HashPwd(user.Password)
 	if err != nil {
 		return err
 	}
 	user.Password = pass
->>>>>>> v0.2.1
 	err = st.db.Save(user)
 	if err == storm.ErrAlreadyExists {
 		return errors.ErrExist