vbatts/homebox
1
0
Fork 0
forked from mirrors/homebox
Code Pull requests Activity

feat: new dashboard implementation (#168)

Browse source 
* wip: charts.js experimental work

* update lock file

* wip: frontend redesign

* wip: more UI fixes for consistency across themes

* cleanup

* improve UI log

* style updates

* fix lint errors
This commit is contained in:
Hayden 2022-12-29 17:19:15 -08:00 • committed by GitHub
parent a3954dab0f
commit 6a8a25e3f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
42 changed files with 1690 additions and 296 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/app/api/handlers/v1/v1_ctrl_items.go
View file

@ -29,7 +29,7 @@ func (ctrl *V1Controller) HandleItemsGetAll() server.HandlerFunc {
return repo.ItemQuery{
Page: queryIntOrNegativeOne(params.Get("page")),
PageSize: queryIntOrNegativeOne(params.Get("perPage")),
PageSize: queryIntOrNegativeOne(params.Get("pageSize")),
Search: params.Get("q"),
LocationIDs: queryUUIDList(params, "locations"),
LabelIDs: queryUUIDList(params, "labels"),

4
backend/app/api/static/docs/docs.go
View file

@ -1665,6 +1665,10 @@ const docTemplate = `{
"name": {
"type": "string"
},
"purchasePrice": {
"type": "string",
"example": "0"
},
"quantity": {
"type": "integer"
},

4
backend/app/api/static/docs/swagger.json
View file

@ -1657,6 +1657,10 @@
"name": {
"type": "string"
},
"purchasePrice": {
"type": "string",
"example": "0"
},
"quantity": {
"type": "integer"
},

3
backend/app/api/static/docs/swagger.yaml
View file

@ -202,6 +202,9 @@ definitions:
x-omitempty: true
name:
type: string
purchasePrice:
example: "0"
type: string
quantity:
type: integer
updatedAt:

12
backend/internal/core/services/service_items_csv.go
View file

@ -97,18 +97,18 @@ func newCsvRow(row []string) csvRow {
LabelStr: row[2],
Item: repo.ItemOut{
ItemSummary: repo.ItemSummary{
ImportRef: row[0],
Quantity: parseInt(row[3]),
Name: row[4],
Description: row[5],
Insured: parseBool(row[6]),
ImportRef: row[0],
Quantity: parseInt(row[3]),
Name: row[4],
Description: row[5],
Insured: parseBool(row[6]),
PurchasePrice: parseFloat(row[12]),
},
SerialNumber: row[7],
ModelNumber: row[8],
Manufacturer: row[9],
Notes: row[10],
PurchaseFrom: row[11],
PurchasePrice: parseFloat(row[12]),
PurchaseTime: parseDate(row[13]),
LifetimeWarranty: parseBool(row[14]),
WarrantyExpires: parseDate(row[15]),

27
backend/internal/data/repo/repo_items.go
View file

@ -101,6 +101,8 @@ type (
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
PurchasePrice float64 `json:"purchasePrice,string"`
// Edges
Location *LocationSummary `json:"location,omitempty" extensions:"x-nullable,x-omitempty"`
Labels []LabelSummary `json:"labels"`
@ -121,9 +123,8 @@ type (
WarrantyDetails string `json:"warrantyDetails"`
// Purchase
PurchaseTime time.Time `json:"purchaseTime"`
PurchaseFrom string `json:"purchaseFrom"`
PurchasePrice float64 `json:"purchasePrice,string"`
PurchaseTime time.Time `json:"purchaseTime"`
PurchaseFrom string `json:"purchaseFrom"`
// Sold
SoldTime time.Time `json:"soldTime"`
@ -157,13 +158,14 @@ func mapItemSummary(item *ent.Item) ItemSummary {
}
return ItemSummary{
ID: item.ID,
Name: item.Name,
Description: item.Description,
Quantity: item.Quantity,
CreatedAt: item.CreatedAt,
UpdatedAt: item.UpdatedAt,
Archived: item.Archived,
ID: item.ID,
Name: item.Name,
Description: item.Description,
Quantity: item.Quantity,
CreatedAt: item.CreatedAt,
UpdatedAt: item.UpdatedAt,
Archived: item.Archived,
PurchasePrice: item.PurchasePrice,
// Edges
Location: location,
@ -230,9 +232,8 @@ func mapItemOut(item *ent.Item) ItemOut {
Manufacturer: item.Manufacturer,
// Purchase
PurchaseTime: item.PurchaseTime,
PurchaseFrom: item.PurchaseFrom,
PurchasePrice: item.PurchasePrice,
PurchaseTime: item.PurchaseTime,
PurchaseFrom: item.PurchaseFrom,
// Sold
SoldTime: item.SoldTime,