Skip to content

Commit a468b35

Browse files
jcdcdevjcdcdev
authored
Merge pull request #104 from jcdcdev/dev/v13
13.1.3
2 parents 9a7468a + 954e60d commit a468b35

File tree

8 files changed

+2583
-1805
lines changed

8 files changed

+2583
-1805
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,3 +357,4 @@ src/.idea
357357
*.sqlite.db*
358358
/src/Umbraco.Community.BackOfficeOrganiser/.idea/
359359
/src/Umbraco.Community.BackOfficeOrganiser/wwwroot/App_Plugins/Umbraco.Community.BackOfficeOrganiser/dist
360+
/src/*.TestSite/umbraco/Data/TEMP

‎src/TestSite.13/TestSite.13.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Umbraco.Cms" Version="13.7.1"/>
11-
<PackageReference Include="uSync" Version="13.2.3"/>
10+
<PackageReference Include="Umbraco.Cms" Version="13.8.0"/>
11+
<PackageReference Include="uSync" Version="13.2.7"/>
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎src/TestSite.13/packages.lock.json‎

Lines changed: 535 additions & 514 deletions
Large diffs are not rendered by default.

‎src/Umbraco.Community.BackOfficeOrganiser.Client/package-lock.json‎

Lines changed: 1924 additions & 1169 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Umbraco.Community.BackOfficeOrganiser.Client/package.json‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
2-
"name": "backoffice-organiser",
3-
"private": true,
4-
"version": "0.0.0",
5-
"type": "module",
6-
"scripts": {
7-
"dev": "vite build --watch --emptyOutDir",
8-
"build": "tsc && vite build --emptyOutDir",
9-
"preview": "vite preview"
10-
},
11-
"dependencies": {
12-
"lit": "^2.7.6"
13-
},
14-
"devDependencies": {
15-
"@umbraco-ui/uui": "^1.5.0",
16-
"typescript": "^5.0.2",
17-
"vite": "^4.4.5"
18-
}
19-
}
2+
"name": "backoffice-organiser",
3+
"private": true,
4+
"version": "0.0.0",
5+
"type": "module",
6+
"scripts": {
7+
"dev": "vite build --watch --emptyOutDir",
8+
"build": "tsc && vite build --emptyOutDir",
9+
"preview": "vite preview"
10+
},
11+
"dependencies": {
12+
"lit": "^3.3.0"
13+
},
14+
"devDependencies": {
15+
"@umbraco-ui/uui": "^1.13.0",
16+
"typescript": "^5.8.3",
17+
"vite": "^6.3.2"
18+
}
19+
}

‎src/Umbraco.Community.BackOfficeOrganiser.Client/src/ts/backoffice-organiser.ts‎

Lines changed: 99 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// noinspection CssUnresolvedCustomProperty
22

3-
import {css, customElement, html, LitElement, property, state} from "lit-element";
3+
import {css, html, LitElement} from "lit";
4+
import {customElement, property, state} from 'lit/decorators.js';
45
import {OrganiseType} from "./organise-type.ts";
56
import {Toast} from "./toast.ts";
67

@@ -64,80 +65,80 @@ export default class BackofficeOrganiser extends LitElement {
6465
const look = type.selected ? "primary" : "placeholder";
6566
return html
6667
`
67-
<uui-button @click="${() => this.toggleType(type)}" style="--uui-button-height: 200px" look="${look}">
68-
${type.label}
69-
</uui-button>
68+
<uui-button @click="${() => this.toggleType(type)}" style="--uui-button-height: 200px" look="${look}">
69+
${type.label}
70+
</uui-button>
7071
`;
7172
})
7273

7374
const disableButton = this.types.filter(x => x.selected).length === 0;
7475
const form = html`
75-
<uui-form>
76-
<form id="backoffice-organiser-form" @submit=${this.onSubmit} name="backofficeOrganiserForm">
77-
<uui-form-layout-item>
78-
<uui-label slot="label" for="parent" required="">Select types</uui-label>
79-
<span slot="description">
76+
<uui-form>
77+
<form id="backoffice-organiser-form" @submit=${this.onSubmit} name="backofficeOrganiserForm">
78+
<uui-form-layout-item>
79+
<uui-label slot="label" for="parent" required="">Select types</uui-label>
80+
<span slot="description">
8081
Select the types to organise
8182
</span>
82-
<div class="organise-type-container">
83-
${organiseTypes}
84-
</div>
85-
</uui-form-layout-item>
86-
<uui-button type="submit" look="primary" label="Submit" .disabled="${disableButton}"></uui-button>
87-
</form>
88-
</uui-form>
89-
90-
<uui-toast-notification-container
91-
class="toast-container"
92-
id="toastContainer"
93-
auto-close="3000"
94-
bottom-up="">
95-
${toasts}
96-
</uui-toast-notification-container>
97-
`;
83+
<div class="organise-type-container">
84+
${organiseTypes}
85+
</div>
86+
</uui-form-layout-item>
87+
<uui-button type="submit" look="primary" label="Submit" .disabled="${disableButton}"></uui-button>
88+
</form>
89+
</uui-form>
90+
91+
<uui-toast-notification-container
92+
class="toast-container"
93+
id="toastContainer"
94+
auto-close="3000"
95+
bottom-up="">
96+
${toasts}
97+
</uui-toast-notification-container>
98+
`;
9899
const loader = html`
99100
<uui-loader-bar style="color: blue"></uui-loader-bar>
100101
`;
101102

102103
return html`
103-
<uui-box headline="Welcome">
104-
<p>
105-
This dashboard is designed to help you organise your Document Types, Media Types, Member Types and Data Types.
106-
</p>
107-
<p>
108-
To get started, select at least one type to organise and click the submit button.
109-
</p>
110-
<uui-icon-registry-essential>
111-
<uui-button look="outline"
112-
href="https://github.com/jcdcdev/Umbraco.Community.BackOfficeOrganiser/?tab=readme-ov-file#umbracocommunitybackofficeorganiser"
113-
target="_blank">
114-
<uui-icon name="document"></uui-icon>
115-
Documentation
116-
</uui-button>
117-
118-
<uui-button look="outline"
119-
href="https://github.com/jcdcdev/Umbraco.Community.BackOfficeOrganiser/issues/new?assignees=bug&template=bug.yml"
120-
target="_blank">
121-
<uui-icon name="alert"></uui-icon>
122-
Report a Bug
123-
</uui-button>
124-
125-
<uui-button look="outline"
126-
href="https://github.com/jcdcdev/Umbraco.Community.BackOfficeOrganiser/issues/new?assignees=enhancement&template=feature_request.yml"
127-
target="_blank">
128-
<uui-icon name="wand"></uui-icon>
129-
Request a Feature
130-
</uui-button>
131-
</uui-icon-registry-essential>
132-
133-
</uui-box>
134-
<br>
135-
<uui-box headline="Organise">
136-
${this.loading ? loader : form}
137-
</uui-box>
138-
<uui-modal-container>
139-
${modal}
140-
</uui-modal-container>
104+
<uui-box headline="Welcome">
105+
<p>
106+
This dashboard is designed to help you organise your Document Types, Media Types, Member Types and Data Types.
107+
</p>
108+
<p>
109+
To get started, select at least one type to organise and click the submit button.
110+
</p>
111+
<uui-icon-registry-essential>
112+
<uui-button look="outline"
113+
href="https://github.com/jcdcdev/Umbraco.Community.BackOfficeOrganiser/?tab=readme-ov-file#umbracocommunitybackofficeorganiser"
114+
target="_blank">
115+
<uui-icon name="document"></uui-icon>
116+
Documentation
117+
</uui-button>
118+
119+
<uui-button look="outline"
120+
href="https://github.com/jcdcdev/Umbraco.Community.BackOfficeOrganiser/issues/new?assignees=bug&template=bug.yml"
121+
target="_blank">
122+
<uui-icon name="alert"></uui-icon>
123+
Report a Bug
124+
</uui-button>
125+
126+
<uui-button look="outline"
127+
href="https://github.com/jcdcdev/Umbraco.Community.BackOfficeOrganiser/issues/new?assignees=enhancement&template=feature_request.yml"
128+
target="_blank">
129+
<uui-icon name="wand"></uui-icon>
130+
Request a Feature
131+
</uui-button>
132+
</uui-icon-registry-essential>
133+
134+
</uui-box>
135+
<br>
136+
<uui-box headline="Organise">
137+
${this.loading ? loader : form}
138+
</uui-box>
139+
<uui-modal-container>
140+
${modal}
141+
</uui-modal-container>
141142
`;
142143
}
143144

@@ -228,41 +229,41 @@ export default class BackofficeOrganiser extends LitElement {
228229

229230
static styles = [
230231
css`
231-
.organise-type-container uui-button {
232-
width: 100%;
233-
}
234-
235-
.toast-container {
236-
top: 0;
237-
left: 0;
238-
right: 0;
239-
height: 100vh;
240-
padding: var(--uui-size-layout-1);
241-
}
242-
243-
.organise-type-container {
244-
display: flex;
245-
flex-direction: row;
246-
gap: var(--uui-size-3);
247-
max-width: 900px;
248-
}
249-
250-
.organise-type {
251-
background-color: var(--uui-color-background);
252-
cursor: pointer;
253-
padding: var(--uui-size-6);
254-
}
255-
256-
.organise-type.active {
257-
background-color: var(--uui-color-selected);
258-
color: white;
259-
}
260-
261-
.alert {
262-
padding: var(--uui-size-3);
263-
background-color: var(--uui-color-danger-emphasis);
264-
color: var(--uui-color-danger-contrast);
265-
}
232+
.organise-type-container uui-button {
233+
width: 100%;
234+
}
235+
236+
.toast-container {
237+
top: 0;
238+
left: 0;
239+
right: 0;
240+
height: 100vh;
241+
padding: var(--uui-size-layout-1);
242+
}
243+
244+
.organise-type-container {
245+
display: flex;
246+
flex-direction: row;
247+
gap: var(--uui-size-3);
248+
max-width: 900px;
249+
}
250+
251+
.organise-type {
252+
background-color: var(--uui-color-background);
253+
cursor: pointer;
254+
padding: var(--uui-size-6);
255+
}
256+
257+
.organise-type.active {
258+
background-color: var(--uui-color-selected);
259+
color: white;
260+
}
261+
262+
.alert {
263+
padding: var(--uui-size-3);
264+
background-color: var(--uui-color-danger-emphasis);
265+
color: var(--uui-color-danger-contrast);
266+
}
266267
`
267268
]
268269
}

‎src/Umbraco.Community.BackOfficeOrganiser/Umbraco.Community.BackOfficeOrganiser.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
</PropertyGroup>
2424

2525
<ItemGroup>
26-
<PackageReference Include="jcdcdev.Umbraco.Core" Version="13.0.1"/>
27-
<PackageReference Include="Umbraco.Community.SimpleDashboards" Version="13.0.0"/>
26+
<PackageReference Include="jcdcdev.Umbraco.Core" Version="[13.0.1,14.0.0)"/>
27+
<PackageReference Include="Umbraco.Community.SimpleDashboards" Version="[13.0.0,14.0.0)"/>
2828
<PackageReference Include="Umbraco.Cms.Core" Version="[13.0.0,14.0.0)"/>
2929
<PackageReference Include="Umbraco.Cms.Infrastructure" Version="[13.0.0,14.0.0)"/>
3030
</ItemGroup>

‎src/Umbraco.Community.BackOfficeOrganiser/packages.lock.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"net8.0": {
55
"jcdcdev.Umbraco.Core": {
66
"type": "Direct",
7-
"requested": "[13.0.1, )",
7+
"requested": "[13.0.1, 14.0.0)",
88
"resolved": "13.0.1",
99
"contentHash": "yNWhu3EEiqqSXE2b7xy730pVylcsqAaJxaH64HuGVMcZpUq7FfiDVF2mjbB97sx6XIcFpLq8a9btpzZN83mq6w==",
1010
"dependencies": {
@@ -66,7 +66,7 @@
6666
},
6767
"Umbraco.Community.SimpleDashboards": {
6868
"type": "Direct",
69-
"requested": "[13.0.0, )",
69+
"requested": "[13.0.0, 14.0.0)",
7070
"resolved": "13.0.0",
7171
"contentHash": "jVeHOte1JO+5TVDLWV2eaNEtsXHCI/RX+9NdrzPRmpc4UpektVHjNMc4F/YbVgti0Q5vEVzZsahDAPXJRKAWWA==",
7272
"dependencies": {

0 commit comments

Comments
 (0)