🐛 Fix issue with shape

This commit is contained in:
Meierschlumpf
2023-01-07 09:23:10 +01:00
parent 2da206d5b0
commit 6e4938482e
2 changed files with 281 additions and 201 deletions

View File

@@ -18,70 +18,12 @@
], ],
"apps": [ "apps": [
{ {
"id": "5df743d9-5cb1-457c-85d2-64ff86855652", "id": "47af36c0-47c1-4e5b-bfc7-ad645ee6a33a",
"name": "Your app", "name": "Documentation",
"url": "https://homarr.dev", "url": "https://homarr.dev",
"appearance": {
"iconUrl": "/imgs/logo/logo.png"
},
"network": {
"enabledStatusChecker": false,
"okStatus": []
},
"behaviour": { "behaviour": {
"isOpeningNewTab": true, "onClickUrl": "https://homarr.dev",
"externalUrl": "https://homarr.dev" "externalUrl": "https://homarr.dev",
},
"area": {
"type": "category",
"properties": {
"id": "47af36c0-47c1-4e5b-bfc7-ad645ee6a33f"
}
},
"shape": {
"md": {
"location": {
"x": 5,
"y": 1
},
"size": {
"width": 1,
"height": 1
}
},
"sm": {
"location": {
"x": 2,
"y": 0
},
"size": {
"width": 1,
"height": 1
}
},
"lg": {
"location": {
"x": 1,
"y": 0
},
"size": {
"width": 1,
"height": 1
}
}
},
"integration": {
"type": null,
"properties": []
}
},
{
"id": "47af36c0-47c1-4e5b-bfc7-ad645ee6a330",
"name": "Contribute",
"url": "https://github.com/ajnart/homarr",
"behaviour": {
"onClickUrl": "https://github.com/ajnart/homarr",
"externalUrl": "https://github.com/ajnart/homarr",
"isOpeningNewTab": true "isOpeningNewTab": true
}, },
"network": { "network": {
@@ -91,7 +33,7 @@
] ]
}, },
"appearance": { "appearance": {
"iconUrl": "https://cdn.jsdelivr.net/gh/walkxhub/dashboard-icons/png/github.png" "iconUrl": "/imgs/logo/logo.png"
}, },
"integration": { "integration": {
"type": null, "type": null,
@@ -106,27 +48,27 @@
"shape": { "shape": {
"md": { "md": {
"location": { "location": {
"x": 5, "x": 0,
"y": 3 "y": 10
}, },
"size": { "size": {
"width": 1, "width": 2,
"height": 1 "height": 1
} }
}, },
"sm": { "sm": {
"location": { "location": {
"x": 0, "x": 0,
"y": 2 "y": 10
}, },
"size": { "size": {
"width": 1, "width": 2,
"height": 1 "height": 1
} }
}, },
"lg": { "lg": {
"location": { "location": {
"x": 2, "x": 3,
"y": 1 "y": 1
}, },
"size": { "size": {
@@ -194,6 +136,64 @@
"properties": [] "properties": []
} }
}, },
{
"id": "5df743d9-5cb1-457c-85d2-64ff86855652",
"name": "Your app",
"url": "https://homarr.dev",
"appearance": {
"iconUrl": "/imgs/logo/logo.png"
},
"network": {
"enabledStatusChecker": false,
"okStatus": []
},
"behaviour": {
"isOpeningNewTab": true,
"externalUrl": "https://homarr.dev"
},
"area": {
"type": "category",
"properties": {
"id": "47af36c0-47c1-4e5b-bfc7-ad645ee6a33f"
}
},
"shape": {
"md": {
"location": {
"x": 2,
"y": 0
},
"size": {
"width": 1,
"height": 1
}
},
"sm": {
"location": {
"x": 2,
"y": 0
},
"size": {
"width": 1,
"height": 1
}
},
"lg": {
"location": {
"x": 1,
"y": 0
},
"size": {
"width": 1,
"height": 1
}
}
},
"integration": {
"type": null,
"properties": []
}
},
{ {
"id": "47af36c0-47c1-4e5b-bfc7-ad645ee6a990", "id": "47af36c0-47c1-4e5b-bfc7-ad645ee6a990",
"name": "Donate", "name": "Donate",
@@ -255,64 +255,6 @@
} }
} }
}, },
{
"id": "e41a11f5-9c6e-41bc-ac0e-4c4c47582faa",
"name": "Your app",
"url": "https://homarr.dev",
"appearance": {
"iconUrl": "/imgs/logo/logo.png"
},
"network": {
"enabledStatusChecker": false,
"okStatus": []
},
"behaviour": {
"isOpeningNewTab": true,
"externalUrl": ""
},
"area": {
"type": "wrapper",
"properties": {
"id": "default"
}
},
"shape": {
"md": {
"location": {
"x": 0,
"y": 6
},
"size": {
"width": 1,
"height": 1
}
},
"sm": {
"location": {
"x": 0,
"y": 6
},
"size": {
"width": 1,
"height": 1
}
},
"lg": {
"location": {
"x": 0,
"y": 6
},
"size": {
"width": 1,
"height": 1
}
}
},
"integration": {
"type": null,
"properties": []
}
},
{ {
"id": "47af36c0-47c1-4e5b-bfc7-ad645ee6a337", "id": "47af36c0-47c1-4e5b-bfc7-ad645ee6a337",
"name": "Discord", "name": "Discord",
@@ -345,11 +287,11 @@
"md": { "md": {
"location": { "location": {
"x": 0, "x": 0,
"y": 0 "y": 1
}, },
"size": { "size": {
"width": 1, "width": 1,
"height": 3 "height": 1
} }
}, },
"sm": { "sm": {
@@ -375,12 +317,70 @@
} }
}, },
{ {
"id": "47af36c0-47c1-4e5b-bfc7-ad645ee6a33a", "id": "615e43bd-f0aa-4117-ba49-b6495c039f3e",
"name": "Documentation", "name": "Your app",
"url": "https://homarr.dev", "url": "https://homarr.dev",
"appearance": {
"iconUrl": "/imgs/logo/logo.png"
},
"network": {
"enabledStatusChecker": false,
"okStatus": []
},
"behaviour": { "behaviour": {
"onClickUrl": "https://homarr.dev", "isOpeningNewTab": true,
"externalUrl": "https://homarr.dev", "externalUrl": "https://homarr.dev"
},
"area": {
"type": "wrapper",
"properties": {
"id": "default"
}
},
"shape": {
"sm": {
"location": {
"x": 0,
"y": 5
},
"size": {
"width": 1,
"height": 1
}
},
"md": {
"location": {
"x": 0,
"y": 5
},
"size": {
"width": 1,
"height": 1
}
},
"lg": {
"location": {
"x": 0,
"y": 5
},
"size": {
"width": 1,
"height": 1
}
}
},
"integration": {
"type": null,
"properties": []
}
},
{
"id": "47af36c0-47c1-4e5b-bfc7-ad645ee6a330",
"name": "Contribute",
"url": "https://github.com/ajnart/homarr",
"behaviour": {
"onClickUrl": "https://github.com/ajnart/homarr",
"externalUrl": "https://github.com/ajnart/homarr",
"isOpeningNewTab": true "isOpeningNewTab": true
}, },
"network": { "network": {
@@ -390,7 +390,7 @@
] ]
}, },
"appearance": { "appearance": {
"iconUrl": "/imgs/logo/logo.png" "iconUrl": "https://cdn.jsdelivr.net/gh/walkxhub/dashboard-icons/png/github.png"
}, },
"integration": { "integration": {
"type": null, "type": null,
@@ -402,6 +402,60 @@
"id": "47af36c0-47c1-4e5b-bfc7-ad645ee6a33f" "id": "47af36c0-47c1-4e5b-bfc7-ad645ee6a33f"
} }
}, },
"shape": {
"md": {
"location": {
"x": 2,
"y": 3
},
"size": {
"width": 1,
"height": 1
}
},
"sm": {
"location": {
"x": 1,
"y": 1
},
"size": {
"width": 1,
"height": 1
}
},
"lg": {
"location": {
"x": 2,
"y": 3
},
"size": {
"width": 1,
"height": 1
}
}
}
},
{
"id": "e41a11f5-9c6e-41bc-ac0e-4c4c47582faa",
"name": "Haha",
"url": "https://homarr.dev",
"appearance": {
"iconUrl": "/imgs/logo/logo.png"
},
"network": {
"enabledStatusChecker": false,
"okStatus": []
},
"behaviour": {
"isOpeningNewTab": true,
"externalUrl": ""
},
"area": {
"type": "category",
"properties": {
"id": "47af36c0-47c1-4e5b-bfc7-ad645ee6a33f"
}
},
"shape": { "shape": {
"md": { "md": {
"location": { "location": {
@@ -415,72 +469,32 @@
}, },
"sm": { "sm": {
"location": { "location": {
"x": 0, "x": 2,
"y": 10 "y": 2
}, },
"size": { "size": {
"width": 2, "width": 1,
"height": 1 "height": 1
} }
}, },
"lg": { "lg": {
"location": { "location": {
"x": 3, "x": 0,
"y": 1 "y": 6
}, },
"size": { "size": {
"width": 1, "width": 1,
"height": 1 "height": 1
} }
} }
},
"integration": {
"type": null,
"properties": []
} }
} }
], ],
"widgets": [ "widgets": [
{
"id": "calendar",
"properties": {
"sundayStart": false
},
"area": {
"type": "wrapper",
"properties": {
"id": "default"
}
},
"shape": {
"md": {
"location": {
"x": 0,
"y": 1
},
"size": {
"width": 3,
"height": 5
}
},
"sm": {
"location": {
"x": 0,
"y": 0
},
"size": {
"width": 3,
"height": 5
}
},
"lg": {
"location": {
"x": 0,
"y": 0
},
"size": {
"width": 3,
"height": 5
}
}
}
},
{ {
"id": "weather", "id": "weather",
"properties": { "properties": {
@@ -496,11 +510,11 @@
"shape": { "shape": {
"md": { "md": {
"location": { "location": {
"x": 4, "x": 0,
"y": 0 "y": 0
}, },
"size": { "size": {
"width": 2, "width": 3,
"height": 1 "height": 1
} }
}, },
@@ -510,22 +524,66 @@
"y": 0 "y": 0
}, },
"size": { "size": {
"width": 2, "width": 3,
"height": 1 "height": 1
} }
}, },
"lg": { "lg": {
"location": { "location": {
"x": 0, "x": 0,
"y": 1 "y": 0
}, },
"size": { "size": {
"width": 2, "width": 3,
"height": 1 "height": 1
} }
} }
} }
}, },
{
"id": "calendar",
"properties": {
"sundayStart": false
},
"area": {
"type": "wrapper",
"properties": {
"id": "default"
}
},
"shape": {
"md": {
"location": {
"x": 0,
"y": 0
},
"size": {
"width": 3,
"height": 5
}
},
"sm": {
"location": {
"x": 0,
"y": 0
},
"size": {
"width": 3,
"height": 5
}
},
"lg": {
"location": {
"x": 0,
"y": 0
},
"size": {
"width": 3,
"height": 5
}
}
}
},
{ {
"id": "date", "id": "date",
"properties": { "properties": {
@@ -540,18 +598,18 @@
"shape": { "shape": {
"sm": { "sm": {
"location": { "location": {
"x": 1, "x": 0,
"y": 1 "y": 2
}, },
"size": { "size": {
"width": 2, "width": 2,
"height": 2 "height": 1
} }
}, },
"md": { "md": {
"location": { "location": {
"x": 4, "x": 1,
"y": 2 "y": 1
}, },
"size": { "size": {
"width": 2, "width": 2,
@@ -560,8 +618,8 @@
}, },
"lg": { "lg": {
"location": { "location": {
"x": 2, "x": 1,
"y": 0 "y": 1
}, },
"size": { "size": {
"width": 2, "width": 2,

View File

@@ -112,6 +112,7 @@ export const AvailableElementTypes = ({
}, },
}, },
shape: { shape: {
sm: {
location: { location: {
x: 0, x: 0,
y: 0, y: 0,
@@ -121,6 +122,27 @@ export const AvailableElementTypes = ({
height: appTileDefinition.minHeight, height: appTileDefinition.minHeight,
}, },
}, },
md: {
location: {
x: 0,
y: 0,
},
size: {
width: appTileDefinition.minWidth,
height: appTileDefinition.minHeight,
},
},
lg: {
location: {
x: 0,
y: 0,
},
size: {
width: appTileDefinition.minWidth,
height: appTileDefinition.minHeight,
},
},
},
integration: { integration: {
type: null, type: null,
properties: [], properties: [],