File tree 27 files changed +43
-60
lines changed
27 files changed +43
-60
lines changed Original file line number Diff line number Diff line change 8
8
"github.com/thechosenlan/homebox/backend/internal/data/repo"
9
9
"github.com/thechosenlan/homebox/backend/internal/sys/config"
10
10
"github.com/thechosenlan/homebox/backend/pkgs/mailer"
11
- "github.com/thechosenlan/safeserve /server"
11
+ "github.com/thechosenlan/httpkit /server"
12
12
)
13
13
14
14
type app struct {
Original file line number Diff line number Diff line change 5
5
6
6
"github.com/thechosenlan/homebox/backend/internal/core/services"
7
7
"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"
10
10
)
11
11
12
12
type Results [T any ] struct {
Original file line number Diff line number Diff line change 7
7
"github.com/google/uuid"
8
8
"github.com/thechosenlan/homebox/backend/internal/core/services"
9
9
"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"
12
12
"github.com/rs/zerolog/log"
13
13
)
14
14
Original file line number Diff line number Diff line change 9
9
"github.com/thechosenlan/homebox/backend/internal/core/services"
10
10
"github.com/thechosenlan/homebox/backend/internal/data/repo"
11
11
"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"
14
14
15
15
"github.com/rs/zerolog/log"
16
16
)
Original file line number Diff line number Diff line change 8
8
9
9
"github.com/thechosenlan/homebox/backend/internal/core/services"
10
10
"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"
13
13
"github.com/rs/zerolog/log"
14
14
)
15
15
Original file line number Diff line number Diff line change 7
7
"github.com/thechosenlan/homebox/backend/internal/core/services"
8
8
"github.com/thechosenlan/homebox/backend/internal/data/repo"
9
9
"github.com/thechosenlan/homebox/backend/internal/web/adapters"
10
- "github.com/thechosenlan/safeserve /errchain"
10
+ "github.com/thechosenlan/httpkit /errchain"
11
11
)
12
12
13
13
type (
Original file line number Diff line number Diff line change @@ -12,8 +12,8 @@ import (
12
12
"github.com/thechosenlan/homebox/backend/internal/data/repo"
13
13
"github.com/thechosenlan/homebox/backend/internal/sys/validate"
14
14
"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"
17
17
"github.com/rs/zerolog/log"
18
18
)
19
19
Original file line number Diff line number Diff line change 8
8
"github.com/thechosenlan/homebox/backend/internal/data/ent/attachment"
9
9
"github.com/thechosenlan/homebox/backend/internal/data/repo"
10
10
"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"
13
13
"github.com/rs/zerolog/log"
14
14
)
15
15
Original file line number Diff line number Diff line change 7
7
"github.com/thechosenlan/homebox/backend/internal/core/services"
8
8
"github.com/thechosenlan/homebox/backend/internal/data/repo"
9
9
"github.com/thechosenlan/homebox/backend/internal/web/adapters"
10
- "github.com/thechosenlan/safeserve /errchain"
10
+ "github.com/thechosenlan/httpkit /errchain"
11
11
)
12
12
13
13
// HandleLabelsGetAll godoc
Original file line number Diff line number Diff line change 7
7
"github.com/thechosenlan/homebox/backend/internal/core/services"
8
8
"github.com/thechosenlan/homebox/backend/internal/data/repo"
9
9
"github.com/thechosenlan/homebox/backend/internal/web/adapters"
10
- "github.com/thechosenlan/safeserve /errchain"
10
+ "github.com/thechosenlan/httpkit /errchain"
11
11
)
12
12
13
13
// HandleLocationTreeQuery
Original file line number Diff line number Diff line change 7
7
"github.com/thechosenlan/homebox/backend/internal/core/services"
8
8
"github.com/thechosenlan/homebox/backend/internal/data/repo"
9
9
"github.com/thechosenlan/homebox/backend/internal/web/adapters"
10
- "github.com/thechosenlan/safeserve /errchain"
10
+ "github.com/thechosenlan/httpkit /errchain"
11
11
)
12
12
13
13
// HandleMaintenanceGetLog godoc
Original file line number Diff line number Diff line change 8
8
"github.com/hay-kot/homebox/backend/internal/core/services"
9
9
"github.com/hay-kot/homebox/backend/internal/data/repo"
10
10
"github.com/hay-kot/homebox/backend/internal/web/adapters"
11
- "github.com/hay-kot/safeserve /errchain"
11
+ "github.com/hay-kot/httpkit /errchain"
12
12
)
13
13
14
14
// HandleGetUserNotifiers godoc
Original file line number Diff line number Diff line change 7
7
"net/http"
8
8
9
9
"github.com/thechosenlan/homebox/backend/internal/web/adapters"
10
- "github.com/thechosenlan/safeserve /errchain"
10
+ "github.com/thechosenlan/httpkit /errchain"
11
11
"github.com/yeqown/go-qrcode/v2"
12
12
"github.com/yeqown/go-qrcode/writer/standard"
13
13
Original file line number Diff line number Diff line change 4
4
"net/http"
5
5
6
6
"github.com/hay-kot/homebox/backend/internal/core/services"
7
- "github.com/hay-kot/safeserve /errchain"
7
+ "github.com/hay-kot/httpkit /errchain"
8
8
)
9
9
10
10
// HandleBillOfMaterialsExport godoc
Original file line number Diff line number Diff line change 8
8
"github.com/thechosenlan/homebox/backend/internal/data/repo"
9
9
"github.com/thechosenlan/homebox/backend/internal/sys/validate"
10
10
"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"
13
13
)
14
14
15
15
// HandleGroupGet godoc
Original file line number Diff line number Diff line change 8
8
"github.com/thechosenlan/homebox/backend/internal/core/services"
9
9
"github.com/thechosenlan/homebox/backend/internal/data/repo"
10
10
"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"
13
13
"github.com/rs/zerolog/log"
14
14
)
15
15
Original file line number Diff line number Diff line change @@ -19,8 +19,8 @@ import (
19
19
"github.com/thechosenlan/homebox/backend/internal/data/repo"
20
20
"github.com/thechosenlan/homebox/backend/internal/sys/config"
21
21
"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"
24
24
"github.com/rs/zerolog"
25
25
"github.com/rs/zerolog/log"
26
26
"github.com/rs/zerolog/pkgerrors"
Original file line number Diff line number Diff line change 9
9
10
10
"github.com/thechosenlan/homebox/backend/internal/core/services"
11
11
"github.com/thechosenlan/homebox/backend/internal/sys/validate"
12
- "github.com/thechosenlan/safeserve /errchain"
12
+ "github.com/thechosenlan/httpkit /errchain"
13
13
)
14
14
15
15
type tokenHasKey struct {
Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ import (
15
15
_ "github.com/thechosenlan/homebox/backend/app/api/static/docs"
16
16
"github.com/thechosenlan/homebox/backend/internal/data/ent/authroles"
17
17
"github.com/thechosenlan/homebox/backend/internal/data/repo"
18
- "github.com/thechosenlan/safeserve /errchain"
18
+ "github.com/thechosenlan/httpkit /errchain"
19
19
httpSwagger "github.com/swaggo/http-swagger" // http-swagger middleware
20
20
)
21
21
Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ require (
12
12
github.com/gocarina/gocsv v0.0.0-20230325173030-9a18a846a479
13
13
github.com/google/uuid v1.3.0
14
14
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
16
16
github.com/mattn/go-sqlite3 v1.14.16
17
17
github.com/pkg/errors v0.9.1
18
18
github.com/rs/zerolog v1.29.0
Original file line number Diff line number Diff line change @@ -441,8 +441,8 @@ github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOn
441
441
github.com/hashicorp/memberlist v0.3.1 /go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE =
442
442
github.com/hashicorp/serf v0.9.7 /go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4 =
443
443
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 =
446
446
github.com/hpcloud/tail v1.0.0 /go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU =
447
447
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6 /go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc =
448
448
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639 /go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc =
Original file line number Diff line number Diff line change @@ -3,8 +3,8 @@ package adapters
3
3
import (
4
4
"net/http"
5
5
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"
8
8
)
9
9
10
10
// Action is a function that adapts a function to the server.Handler interface.
Original file line number Diff line number Diff line change 4
4
"net/http"
5
5
6
6
"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"
9
9
)
10
10
11
11
type CommandFunc [T any ] func (* http.Request ) (T , error )
Original file line number Diff line number Diff line change 9
9
"github.com/google/uuid"
10
10
"github.com/gorilla/schema"
11
11
"github.com/hay-kot/homebox/backend/internal/sys/validate"
12
- "github.com/hay-kot/safeserve /server"
12
+ "github.com/hay-kot/httpkit /server"
13
13
)
14
14
15
15
var queryDecoder = schema .NewDecoder ()
Original file line number Diff line number Diff line change @@ -3,8 +3,8 @@ package adapters
3
3
import (
4
4
"net/http"
5
5
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"
8
8
)
9
9
10
10
// Query is a server.Handler that decodes a query from the request and calls the provided function.
Original file line number Diff line number Diff line change @@ -8,9 +8,14 @@ import (
8
8
"github.com/go-chi/chi/v5/middleware"
9
9
"github.com/hay-kot/homebox/backend/internal/data/ent"
10
10
"github.com/hay-kot/homebox/backend/internal/sys/validate"
11
+ << << << < HEAD
11
12
"github.com/hay-kot/safeserve/errchain"
12
13
"github.com/hay-kot/safeserve/server"
13
14
>> >> >> > db80f8a (chore : refactor api endpoints (#339 ))
15
+ == == == =
16
+ "github.com/hay-kot/httpkit/errchain"
17
+ "github.com/hay-kot/httpkit/server"
18
+ >> >> >> > 64 b3ac3 (change safeserve - > httpkit (#405 ))
14
19
"github.com/rs/zerolog"
15
20
"github.com/thechosenlan/homebox/backend/internal/data/ent"
16
21
"github.com/thechosenlan/homebox/backend/internal/sys/validate"
Original file line number Diff line number Diff line change 1
- < < < << << HEAD
2
1
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 ) )
24
2
25
3
export type Currency = {
26
4
code : Codes ;
You can’t perform that action at this time.
0 commit comments