Skip to content

13.1.3 #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jcdcdev merged 3 commits into from
Apr 23, 2025
Merged

13.1.3 #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be057fd
Merge v13 into dev/v13
jcdcdev Mar 16, 2025
2be3e21
chore: update NuGet & NPM packages
jcdcdev Apr 21, 2025
954e60d
+changelog-ignore:
jcdcdev Apr 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,3 +357,4 @@ src/.idea
*.sqlite.db*
/src/Umbraco.Community.BackOfficeOrganiser/.idea/
/src/Umbraco.Community.BackOfficeOrganiser/wwwroot/App_Plugins/Umbraco.Community.BackOfficeOrganiser/dist
/src/*.TestSite/umbraco/Data/TEMP
4 changes: 2 additions & 2 deletions src/TestSite.13/TestSite.13.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Umbraco.Cms" Version="13.7.1"/>
<PackageReference Include="uSync" Version="13.2.3"/>
<PackageReference Include="Umbraco.Cms" Version="13.8.0"/>
<PackageReference Include="uSync" Version="13.2.7"/>
</ItemGroup>

<ItemGroup>
Expand Down
1,049 changes: 535 additions & 514 deletions src/TestSite.13/packages.lock.json
View file
Open in desktop

Large diffs are not rendered by default.

3,093 changes: 1,924 additions & 1,169 deletions src/Umbraco.Community.BackOfficeOrganiser.Client/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

36 changes: 18 additions & 18 deletions src/Umbraco.Community.BackOfficeOrganiser.Client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"name": "backoffice-organiser",
"private": true,
"version": "0.0.0",
"type": "module",
"scripts": {
"dev": "vite build --watch --emptyOutDir",
"build": "tsc && vite build --emptyOutDir",
"preview": "vite preview"
},
"dependencies": {
"lit": "^2.7.6"
},
"devDependencies": {
"@umbraco-ui/uui": "^1.5.0",
"typescript": "^5.0.2",
"vite": "^4.4.5"
}
}
"name": "backoffice-organiser",
"private": true,
"version": "0.0.0",
"type": "module",
"scripts": {
"dev": "vite build --watch --emptyOutDir",
"build": "tsc && vite build --emptyOutDir",
"preview": "vite preview"
},
"dependencies": {
"lit": "^3.3.0"
},
"devDependencies": {
"@umbraco-ui/uui": "^1.13.0",
"typescript": "^5.8.3",
"vite": "^6.3.2"
}
}
197 changes: 99 additions & 98 deletions src/Umbraco.Community.BackOfficeOrganiser.Client/src/ts/backoffice-organiser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// noinspection CssUnresolvedCustomProperty

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

Expand Down Expand Up @@ -64,80 +65,80 @@ export default class BackofficeOrganiser extends LitElement {
const look = type.selected ? "primary" : "placeholder";
return html
`
<uui-button @click="${() => this.toggleType(type)}" style="--uui-button-height: 200px" look="${look}">
${type.label}
</uui-button>
<uui-button @click="${() => this.toggleType(type)}" style="--uui-button-height: 200px" look="${look}">
${type.label}
</uui-button>
`;
})

const disableButton = this.types.filter(x => x.selected).length === 0;
const form = html`
<uui-form>
<form id="backoffice-organiser-form" @submit=${this.onSubmit} name="backofficeOrganiserForm">
<uui-form-layout-item>
<uui-label slot="label" for="parent" required="">Select types</uui-label>
<span slot="description">
<uui-form>
<form id="backoffice-organiser-form" @submit=${this.onSubmit} name="backofficeOrganiserForm">
<uui-form-layout-item>
<uui-label slot="label" for="parent" required="">Select types</uui-label>
<span slot="description">
Select the types to organise
</span>
<div class="organise-type-container">
${organiseTypes}
</div>
</uui-form-layout-item>
<uui-button type="submit" look="primary" label="Submit" .disabled="${disableButton}"></uui-button>
</form>
</uui-form>

<uui-toast-notification-container
class="toast-container"
id="toastContainer"
auto-close="3000"
bottom-up="">
${toasts}
</uui-toast-notification-container>
`;
<div class="organise-type-container">
${organiseTypes}
</div>
</uui-form-layout-item>
<uui-button type="submit" look="primary" label="Submit" .disabled="${disableButton}"></uui-button>
</form>
</uui-form>

<uui-toast-notification-container
class="toast-container"
id="toastContainer"
auto-close="3000"
bottom-up="">
${toasts}
</uui-toast-notification-container>
`;
const loader = html`
<uui-loader-bar style="color: blue"></uui-loader-bar>
`;

return html`
<uui-box headline="Welcome">
<p>
This dashboard is designed to help you organise your Document Types, Media Types, Member Types and Data Types.
</p>
<p>
To get started, select at least one type to organise and click the submit button.
</p>
<uui-icon-registry-essential>
<uui-button look="outline"
href="https://github.com/jcdcdev/Umbraco.Community.BackOfficeOrganiser/?tab=readme-ov-file#umbracocommunitybackofficeorganiser"
target="_blank">
<uui-icon name="document"></uui-icon>
Documentation
</uui-button>

<uui-button look="outline"
href="https://github.com/jcdcdev/Umbraco.Community.BackOfficeOrganiser/issues/new?assignees=bug&template=bug.yml"
target="_blank">
<uui-icon name="alert"></uui-icon>
Report a Bug
</uui-button>

<uui-button look="outline"
href="https://github.com/jcdcdev/Umbraco.Community.BackOfficeOrganiser/issues/new?assignees=enhancement&template=feature_request.yml"
target="_blank">
<uui-icon name="wand"></uui-icon>
Request a Feature
</uui-button>
</uui-icon-registry-essential>

</uui-box>
<br>
<uui-box headline="Organise">
${this.loading ? loader : form}
</uui-box>
<uui-modal-container>
${modal}
</uui-modal-container>
<uui-box headline="Welcome">
<p>
This dashboard is designed to help you organise your Document Types, Media Types, Member Types and Data Types.
</p>
<p>
To get started, select at least one type to organise and click the submit button.
</p>
<uui-icon-registry-essential>
<uui-button look="outline"
href="https://github.com/jcdcdev/Umbraco.Community.BackOfficeOrganiser/?tab=readme-ov-file#umbracocommunitybackofficeorganiser"
target="_blank">
<uui-icon name="document"></uui-icon>
Documentation
</uui-button>

<uui-button look="outline"
href="https://github.com/jcdcdev/Umbraco.Community.BackOfficeOrganiser/issues/new?assignees=bug&template=bug.yml"
target="_blank">
<uui-icon name="alert"></uui-icon>
Report a Bug
</uui-button>

<uui-button look="outline"
href="https://github.com/jcdcdev/Umbraco.Community.BackOfficeOrganiser/issues/new?assignees=enhancement&template=feature_request.yml"
target="_blank">
<uui-icon name="wand"></uui-icon>
Request a Feature
</uui-button>
</uui-icon-registry-essential>

</uui-box>
<br>
<uui-box headline="Organise">
${this.loading ? loader : form}
</uui-box>
<uui-modal-container>
${modal}
</uui-modal-container>
`;
}

Expand Down Expand Up @@ -228,41 +229,41 @@ export default class BackofficeOrganiser extends LitElement {

static styles = [
css`
.organise-type-container uui-button {
width: 100%;
}

.toast-container {
top: 0;
left: 0;
right: 0;
height: 100vh;
padding: var(--uui-size-layout-1);
}

.organise-type-container {
display: flex;
flex-direction: row;
gap: var(--uui-size-3);
max-width: 900px;
}

.organise-type {
background-color: var(--uui-color-background);
cursor: pointer;
padding: var(--uui-size-6);
}

.organise-type.active {
background-color: var(--uui-color-selected);
color: white;
}

.alert {
padding: var(--uui-size-3);
background-color: var(--uui-color-danger-emphasis);
color: var(--uui-color-danger-contrast);
}
.organise-type-container uui-button {
width: 100%;
}

.toast-container {
top: 0;
left: 0;
right: 0;
height: 100vh;
padding: var(--uui-size-layout-1);
}

.organise-type-container {
display: flex;
flex-direction: row;
gap: var(--uui-size-3);
max-width: 900px;
}

.organise-type {
background-color: var(--uui-color-background);
cursor: pointer;
padding: var(--uui-size-6);
}

.organise-type.active {
background-color: var(--uui-color-selected);
color: white;
}

.alert {
padding: var(--uui-size-3);
background-color: var(--uui-color-danger-emphasis);
color: var(--uui-color-danger-contrast);
}
`
]
}
Expand Down
4 changes: 2 additions & 2 deletions src/Umbraco.Community.BackOfficeOrganiser/Umbraco.Community.BackOfficeOrganiser.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="jcdcdev.Umbraco.Core" Version="13.0.1"/>
<PackageReference Include="Umbraco.Community.SimpleDashboards" Version="13.0.0"/>
<PackageReference Include="jcdcdev.Umbraco.Core" Version="[13.0.1,14.0.0)"/>
<PackageReference Include="Umbraco.Community.SimpleDashboards" Version="[13.0.0,14.0.0)"/>
<PackageReference Include="Umbraco.Cms.Core" Version="[13.0.0,14.0.0)"/>
<PackageReference Include="Umbraco.Cms.Infrastructure" Version="[13.0.0,14.0.0)"/>
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Umbraco.Community.BackOfficeOrganiser/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"net8.0": {
"jcdcdev.Umbraco.Core": {
"type": "Direct",
"requested": "[13.0.1, )",
"requested": "[13.0.1, 14.0.0)",
"resolved": "13.0.1",
"contentHash": "yNWhu3EEiqqSXE2b7xy730pVylcsqAaJxaH64HuGVMcZpUq7FfiDVF2mjbB97sx6XIcFpLq8a9btpzZN83mq6w==",
"dependencies": {
Expand Down Expand Up @@ -66,7 +66,7 @@
},
"Umbraco.Community.SimpleDashboards": {
"type": "Direct",
"requested": "[13.0.0, )",
"requested": "[13.0.0, 14.0.0)",
"resolved": "13.0.0",
"contentHash": "jVeHOte1JO+5TVDLWV2eaNEtsXHCI/RX+9NdrzPRmpc4UpektVHjNMc4F/YbVgti0Q5vEVzZsahDAPXJRKAWWA==",
"dependencies": {
Expand Down
Loading