Skip to content

Commit b20bf46

Browse files
hay-kotOrell Bühler
authored and
Orell Bühler
committed
change safeserve -> httpkit (hay-kot#405)
1 parent 8f353d6 commit b20bf46

27 files changed

+43
-60
lines changed

backend/app/api/app.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/thechosenlan/homebox/backend/internal/data/repo"
99
"github.com/thechosenlan/homebox/backend/internal/sys/config"
1010
"github.com/thechosenlan/homebox/backend/pkgs/mailer"
11-
"github.com/thechosenlan/safeserve/server"
11+
"github.com/thechosenlan/httpkit/server"
1212
)
1313

1414
type app struct {

backend/app/api/handlers/v1/controller.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55

66
"github.com/thechosenlan/homebox/backend/internal/core/services"
77
"github.com/thechosenlan/homebox/backend/internal/data/repo"
8-
"github.com/thechosenlan/safeserve/errchain"
9-
"github.com/thechosenlan/safeserve/server"
8+
"github.com/thechosenlan/httpkit/errchain"
9+
"github.com/thechosenlan/httpkit/server"
1010
)
1111

1212
type Results[T any] struct {

backend/app/api/handlers/v1/v1_ctrl_actions.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"github.com/google/uuid"
88
"github.com/thechosenlan/homebox/backend/internal/core/services"
99
"github.com/thechosenlan/homebox/backend/internal/sys/validate"
10-
"github.com/thechosenlan/safeserve/errchain"
11-
"github.com/thechosenlan/safeserve/server"
10+
"github.com/thechosenlan/httpkit/errchain"
11+
"github.com/thechosenlan/httpkit/server"
1212
"github.com/rs/zerolog/log"
1313
)
1414

backend/app/api/handlers/v1/v1_ctrl_assets.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"github.com/thechosenlan/homebox/backend/internal/core/services"
1010
"github.com/thechosenlan/homebox/backend/internal/data/repo"
1111
"github.com/thechosenlan/homebox/backend/internal/sys/validate"
12-
"github.com/thechosenlan/safeserve/errchain"
13-
"github.com/thechosenlan/safeserve/server"
12+
"github.com/thechosenlan/httpkit/errchain"
13+
"github.com/thechosenlan/httpkit/server"
1414

1515
"github.com/rs/zerolog/log"
1616
)

backend/app/api/handlers/v1/v1_ctrl_auth.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88

99
"github.com/thechosenlan/homebox/backend/internal/core/services"
1010
"github.com/thechosenlan/homebox/backend/internal/sys/validate"
11-
"github.com/thechosenlan/safeserve/errchain"
12-
"github.com/thechosenlan/safeserve/server"
11+
"github.com/thechosenlan/httpkit/errchain"
12+
"github.com/thechosenlan/httpkit/server"
1313
"github.com/rs/zerolog/log"
1414
)
1515

backend/app/api/handlers/v1/v1_ctrl_group.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/thechosenlan/homebox/backend/internal/core/services"
88
"github.com/thechosenlan/homebox/backend/internal/data/repo"
99
"github.com/thechosenlan/homebox/backend/internal/web/adapters"
10-
"github.com/thechosenlan/safeserve/errchain"
10+
"github.com/thechosenlan/httpkit/errchain"
1111
)
1212

1313
type (

backend/app/api/handlers/v1/v1_ctrl_items.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"github.com/thechosenlan/homebox/backend/internal/data/repo"
1313
"github.com/thechosenlan/homebox/backend/internal/sys/validate"
1414
"github.com/thechosenlan/homebox/backend/internal/web/adapters"
15-
"github.com/thechosenlan/safeserve/errchain"
16-
"github.com/thechosenlan/safeserve/server"
15+
"github.com/thechosenlan/httpkit/errchain"
16+
"github.com/thechosenlan/httpkit/server"
1717
"github.com/rs/zerolog/log"
1818
)
1919

backend/app/api/handlers/v1/v1_ctrl_items_attachments.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"github.com/thechosenlan/homebox/backend/internal/data/ent/attachment"
99
"github.com/thechosenlan/homebox/backend/internal/data/repo"
1010
"github.com/thechosenlan/homebox/backend/internal/sys/validate"
11-
"github.com/thechosenlan/safeserve/errchain"
12-
"github.com/thechosenlan/safeserve/server"
11+
"github.com/thechosenlan/httpkit/errchain"
12+
"github.com/thechosenlan/httpkit/server"
1313
"github.com/rs/zerolog/log"
1414
)
1515

backend/app/api/handlers/v1/v1_ctrl_labels.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/thechosenlan/homebox/backend/internal/core/services"
88
"github.com/thechosenlan/homebox/backend/internal/data/repo"
99
"github.com/thechosenlan/homebox/backend/internal/web/adapters"
10-
"github.com/thechosenlan/safeserve/errchain"
10+
"github.com/thechosenlan/httpkit/errchain"
1111
)
1212

1313
// HandleLabelsGetAll godoc

backend/app/api/handlers/v1/v1_ctrl_locations.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/thechosenlan/homebox/backend/internal/core/services"
88
"github.com/thechosenlan/homebox/backend/internal/data/repo"
99
"github.com/thechosenlan/homebox/backend/internal/web/adapters"
10-
"github.com/thechosenlan/safeserve/errchain"
10+
"github.com/thechosenlan/httpkit/errchain"
1111
)
1212

1313
// HandleLocationTreeQuery

backend/app/api/handlers/v1/v1_ctrl_maint_entry.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/thechosenlan/homebox/backend/internal/core/services"
88
"github.com/thechosenlan/homebox/backend/internal/data/repo"
99
"github.com/thechosenlan/homebox/backend/internal/web/adapters"
10-
"github.com/thechosenlan/safeserve/errchain"
10+
"github.com/thechosenlan/httpkit/errchain"
1111
)
1212

1313
// HandleMaintenanceGetLog godoc

backend/app/api/handlers/v1/v1_ctrl_notifiers.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/hay-kot/homebox/backend/internal/core/services"
99
"github.com/hay-kot/homebox/backend/internal/data/repo"
1010
"github.com/hay-kot/homebox/backend/internal/web/adapters"
11-
"github.com/hay-kot/safeserve/errchain"
11+
"github.com/hay-kot/httpkit/errchain"
1212
)
1313

1414
// HandleGetUserNotifiers godoc

backend/app/api/handlers/v1/v1_ctrl_qrcode.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"net/http"
88

99
"github.com/thechosenlan/homebox/backend/internal/web/adapters"
10-
"github.com/thechosenlan/safeserve/errchain"
10+
"github.com/thechosenlan/httpkit/errchain"
1111
"github.com/yeqown/go-qrcode/v2"
1212
"github.com/yeqown/go-qrcode/writer/standard"
1313

backend/app/api/handlers/v1/v1_ctrl_reporting.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"net/http"
55

66
"github.com/hay-kot/homebox/backend/internal/core/services"
7-
"github.com/hay-kot/safeserve/errchain"
7+
"github.com/hay-kot/httpkit/errchain"
88
)
99

1010
// HandleBillOfMaterialsExport godoc

backend/app/api/handlers/v1/v1_ctrl_statistics.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"github.com/thechosenlan/homebox/backend/internal/data/repo"
99
"github.com/thechosenlan/homebox/backend/internal/sys/validate"
1010
"github.com/thechosenlan/homebox/backend/internal/web/adapters"
11-
"github.com/thechosenlan/safeserve/errchain"
12-
"github.com/thechosenlan/safeserve/server"
11+
"github.com/thechosenlan/httpkit/errchain"
12+
"github.com/thechosenlan/httpkit/server"
1313
)
1414

1515
// HandleGroupGet godoc

backend/app/api/handlers/v1/v1_ctrl_user.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"github.com/thechosenlan/homebox/backend/internal/core/services"
99
"github.com/thechosenlan/homebox/backend/internal/data/repo"
1010
"github.com/thechosenlan/homebox/backend/internal/sys/validate"
11-
"github.com/thechosenlan/safeserve/errchain"
12-
"github.com/thechosenlan/safeserve/server"
11+
"github.com/thechosenlan/httpkit/errchain"
12+
"github.com/thechosenlan/httpkit/server"
1313
"github.com/rs/zerolog/log"
1414
)
1515

backend/app/api/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"github.com/thechosenlan/homebox/backend/internal/data/repo"
2020
"github.com/thechosenlan/homebox/backend/internal/sys/config"
2121
"github.com/thechosenlan/homebox/backend/internal/web/mid"
22-
"github.com/thechosenlan/safeserve/errchain"
23-
"github.com/thechosenlan/safeserve/server"
22+
"github.com/thechosenlan/httpkit/errchain"
23+
"github.com/thechosenlan/httpkit/server"
2424
"github.com/rs/zerolog"
2525
"github.com/rs/zerolog/log"
2626
"github.com/rs/zerolog/pkgerrors"

backend/app/api/middleware.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
"github.com/thechosenlan/homebox/backend/internal/core/services"
1111
"github.com/thechosenlan/homebox/backend/internal/sys/validate"
12-
"github.com/thechosenlan/safeserve/errchain"
12+
"github.com/thechosenlan/httpkit/errchain"
1313
)
1414

1515
type tokenHasKey struct {

backend/app/api/routes.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
_ "github.com/thechosenlan/homebox/backend/app/api/static/docs"
1616
"github.com/thechosenlan/homebox/backend/internal/data/ent/authroles"
1717
"github.com/thechosenlan/homebox/backend/internal/data/repo"
18-
"github.com/thechosenlan/safeserve/errchain"
18+
"github.com/thechosenlan/httpkit/errchain"
1919
httpSwagger "github.com/swaggo/http-swagger" // http-swagger middleware
2020
)
2121

backend/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/gocarina/gocsv v0.0.0-20230325173030-9a18a846a479
1313
github.com/google/uuid v1.3.0
1414
github.com/gorilla/schema v1.2.0
15-
github.com/hay-kot/safeserve v0.0.2
15+
github.com/hay-kot/httpkit v0.0.3
1616
github.com/mattn/go-sqlite3 v1.14.16
1717
github.com/pkg/errors v0.9.1
1818
github.com/rs/zerolog v1.29.0

backend/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -441,8 +441,8 @@ github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOn
441441
github.com/hashicorp/memberlist v0.3.1/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
442442
github.com/hashicorp/serf v0.9.7/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4=
443443
github.com/hashicorp/serf v0.9.8/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4=
444-
github.com/hay-kot/safeserve v0.0.2 h1:o2MbfwRTphwuz3Pohdpw8EQiuxxTvVc/Dmav9AQTez0=
445-
github.com/hay-kot/safeserve v0.0.2/go.mod h1:RUvwyfQTmbNgm5sHt+tQOqtdcpWadXWMhLty74Vedzw=
444+
github.com/hay-kot/httpkit v0.0.3 h1:QYq01J5Jrn+ie0s1ptavNSEyydkOHqsrw4RLp+2LeJQ=
445+
github.com/hay-kot/httpkit v0.0.3/go.mod h1:1s/OJwWRyH6tBtTw76jTp6kwBYvjswziXaokPQH7eKQ=
446446
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
447447
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
448448
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=

backend/internal/web/adapters/actions.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package adapters
33
import (
44
"net/http"
55

6-
"github.com/hay-kot/safeserve/errchain"
7-
"github.com/hay-kot/safeserve/server"
6+
"github.com/hay-kot/httpkit/errchain"
7+
"github.com/hay-kot/httpkit/server"
88
)
99

1010
// Action is a function that adapts a function to the server.Handler interface.

backend/internal/web/adapters/command.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"net/http"
55

66
"github.com/google/uuid"
7-
"github.com/hay-kot/safeserve/errchain"
8-
"github.com/hay-kot/safeserve/server"
7+
"github.com/hay-kot/httpkit/errchain"
8+
"github.com/hay-kot/httpkit/server"
99
)
1010

1111
type CommandFunc[T any] func(*http.Request) (T, error)

backend/internal/web/adapters/decoders.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/google/uuid"
1010
"github.com/gorilla/schema"
1111
"github.com/hay-kot/homebox/backend/internal/sys/validate"
12-
"github.com/hay-kot/safeserve/server"
12+
"github.com/hay-kot/httpkit/server"
1313
)
1414

1515
var queryDecoder = schema.NewDecoder()

backend/internal/web/adapters/query.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package adapters
33
import (
44
"net/http"
55

6-
"github.com/hay-kot/safeserve/errchain"
7-
"github.com/hay-kot/safeserve/server"
6+
"github.com/hay-kot/httpkit/errchain"
7+
"github.com/hay-kot/httpkit/server"
88
)
99

1010
// Query is a server.Handler that decodes a query from the request and calls the provided function.

backend/internal/web/mid/errors.go

+5
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,14 @@ import (
88
"github.com/go-chi/chi/v5/middleware"
99
"github.com/hay-kot/homebox/backend/internal/data/ent"
1010
"github.com/hay-kot/homebox/backend/internal/sys/validate"
11+
<<<<<<< HEAD
1112
"github.com/hay-kot/safeserve/errchain"
1213
"github.com/hay-kot/safeserve/server"
1314
>>>>>>> db80f8a (chore: refactor api endpoints (#339))
15+
=======
16+
"github.com/hay-kot/httpkit/errchain"
17+
"github.com/hay-kot/httpkit/server"
18+
>>>>>>> 64b3ac3 (change safeserve -> httpkit (#405))
1419
"github.com/rs/zerolog"
1520
"github.com/thechosenlan/homebox/backend/internal/data/ent"
1621
"github.com/thechosenlan/homebox/backend/internal/sys/validate"

frontend/lib/data/currency.ts

-22
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,4 @@
1-
<<<<<<< HEAD
21
export type Codes = "CHF" | "USD" | "EUR" | "GBP" | "JPY" | "ZAR" | "AUD" | "NOK" | "SEK" | "DKK" | "INR" | "RMB" | "BGN";
3-
=======
4-
export type Codes =
5-
| "AUD"
6-
| "BGN"
7-
| "CHF"
8-
| "CZK"
9-
| "DKK"
10-
| "EUR"
11-
| "GBP"
12-
| "INR"
13-
| "JPY"
14-
| "NOK"
15-
| "NZD"
16-
| "PLN"
17-
| "RMB"
18-
| "RON"
19-
| "SEK"
20-
| "TRY"
21-
| "USD"
22-
| "ZAR";
23-
>>>>>>> dc08dbb (feat: add czech currency (#323))
242

253
export type Currency = {
264
code: Codes;

0 commit comments

Comments
 (0)