From e1d9eac51434feb9b026d890a9bc748e20e48a2e Mon Sep 17 00:00:00 2001 From: heimoshuiyu Date: Mon, 13 Dec 2021 22:21:24 +0800 Subject: [PATCH] Add: updating database.. --- pkg/api/handle_user.go | 8 +------- web/src/component/Database.js | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/pkg/api/handle_user.go b/pkg/api/handle_user.go index f8f5adf..a59c321 100644 --- a/pkg/api/handle_user.go +++ b/pkg/api/handle_user.go @@ -196,12 +196,6 @@ type GetUsersResponse struct { } func (api *API) HandleGetUsers(w http.ResponseWriter, r *http.Request) { - err := api.CheckAdmin(w, r) - if err != nil { - api.HandleError(w, r, err) - return - } - users, err := api.Db.GetUsers() if err != nil { api.HandleError(w, r, err) @@ -320,7 +314,7 @@ func (api *API) HandleGetUserInfo(w http.ResponseWriter, r *http.Request) { } type UpdateUserPasswordRequest struct { - ID int64 `json:"id"` + ID int64 `json:"id"` OldPassword string `json:"old_password"` NewPassword string `json:"new_password"` } diff --git a/web/src/component/Database.js b/web/src/component/Database.js index 9389e84..3ba5bde 100644 --- a/web/src/component/Database.js +++ b/web/src/component/Database.js @@ -5,6 +5,7 @@ function Database() { const [patternString, setPatternString] = useState(""); const [tags, setTags] = useState([]); const [selectedTags, setSelectedTags] = useState([]); + const [updating, setUpdating] = useState(false); function getTags() { fetch("/api/v1/get_tags") @@ -32,6 +33,8 @@ function Database() { // add dot before item array patternArray = patternArray.map((item) => "." + item); + setUpdating(true); + fetch("/api/v1/walk", { method: "POST", headers: { @@ -45,7 +48,14 @@ function Database() { }) .then((res) => res.json()) .then((data) => { - console.log(data); + if (data.error) { + alert(data.error); + } else { + alert("Database updated"); + } + }) + .finally(() => { + setUpdating(false); }); } return ( @@ -89,8 +99,9 @@ function Database() { onClick={() => { updateDatabase(); }} + disabled={updating} > - Update Database + {updating ? "Updating..." : "Update Database"} );