Browse Source

Fix ydotnet sync.

pull/1074/head
Sebastian Stehle 3 years ago
parent
commit
f390b432d5
  1. 1
      backend/src/Squidex/Config/Web/WebServices.cs
  2. 12
      backend/src/Squidex/Squidex.csproj
  3. 10
      backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/TestAsset.cs
  4. 6
      frontend/src/app/features/content/pages/content/editor/content-editor.component.html
  5. 1
      frontend/src/app/features/content/pages/content/editor/content-editor.component.scss
  6. 2
      frontend/src/app/framework/angular/list-view.component.html
  7. 3
      frontend/src/app/framework/angular/list-view.component.ts
  8. 17
      frontend/src/app/shared/components/cursors.component.html
  9. 6
      frontend/src/app/shared/components/cursors.component.scss

1
backend/src/Squidex/Config/Web/WebServices.cs

@ -76,6 +76,7 @@ public static class WebServices
services.AddLocalization();
services.AddYDotNet()
.AutoCleanup()
.AddWebSockets();
services.AddMvc(options =>

12
backend/src/Squidex/Squidex.csproj

@ -76,13 +76,13 @@
<PackageReference Include="Squidex.Messaging.All" Version="6.3.7" />
<PackageReference Include="Squidex.Messaging.Subscriptions" Version="6.3.7" />
<PackageReference Include="Squidex.OpenIddict.MongoDb" Version="5.1.0" />
<PackageReference Include="Squidex.YDotNet" Version="0.2.9" />
<PackageReference Include="Squidex.YDotNet.Native" Version="0.2.9" />
<PackageReference Include="Squidex.YDotNet.Server" Version="0.2.9" />
<PackageReference Include="Squidex.YDotNet.Server.MongoDB" Version="0.2.9" />
<PackageReference Include="Squidex.YDotNet.Server.Redis" Version="0.2.9" />
<PackageReference Include="Squidex.YDotNet.Server.WebSockets" Version="0.2.9" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="YDotNet" Version="0.3.0" />
<PackageReference Include="YDotNet.Native" Version="0.3.0" />
<PackageReference Include="YDotNet.Server" Version="0.3.0" />
<PackageReference Include="YDotNet.Server.MongoDB" Version="0.3.0" />
<PackageReference Include="YDotNet.Server.Redis" Version="0.3.0" />
<PackageReference Include="YDotNet.Server.WebSockets" Version="0.3.0" />
</ItemGroup>
<PropertyGroup>

10
backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/TestAsset.cs

@ -76,16 +76,16 @@ public static class TestAsset
MimeType = "image/png",
Type = AssetType.Image,
MetadataText = "metadata-text",
Metadata =new AssetMetadata
Metadata = new AssetMetadata
{
[KnownMetadataKeys.PixelWidth] = 800,
[KnownMetadataKeys.PixelHeight] = 600,
},
TagNames = new[]
{
TagNames =
[
"tag1",
"tag2"
}.ToHashSet()
"tag2",
]
};
return asset;

6
frontend/src/app/features/content/pages/content/editor/content-editor.component.html

@ -1,6 +1,6 @@
<sqx-form-error bubble="true" closeable="true" [error]="(contentForm.error | async)"></sqx-form-error>
<sqx-list-view>
<sqx-list-view noPadding="true">
<ng-container topHeader>
<div class="alert alert-danger" *ngIf="!contentVersion && isDeleted">
{{ 'contents.deleted' | sqxTranslate }}
@ -29,6 +29,8 @@
<ng-container>
<div class="cursors" sqxCursors>
<sqx-cursors></sqx-cursors>
<sqx-content-section *ngFor="let section of contentForm.sections; trackBy: trackBySection"
[form]="contentForm"
[formCompare]="contentFormCompare"
@ -40,8 +42,6 @@
[languages]="languages"
[schema]="schema">
</sqx-content-section>
<sqx-cursors></sqx-cursors>
</div>
</ng-container>
</sqx-list-view>

1
frontend/src/app/features/content/pages/content/editor/content-editor.component.scss

@ -39,4 +39,5 @@
.cursors {
position: relative;
padding: 1.5rem;
}

2
frontend/src/app/framework/angular/list-view.component.html

@ -10,7 +10,7 @@
</div>
<div class="list-content normal" [class.loading-indicator]="isLoading" #contentElement sqxCompensateScrollbar>
<div class="inner normal" [style.minWidth]="innerWidth" [style.maxWidth]="innerWidth" [class.tabled]="table">
<div class="inner normal" [style.minWidth]="innerWidth" [style.maxWidth]="innerWidth" [class.tabled]="table" [class.tabled2]="noPadding">
<ng-container *ngTemplateOutlet="contentTemplate"></ng-container>
</div>
</div>

3
frontend/src/app/framework/angular/list-view.component.ts

@ -58,6 +58,9 @@ export class ListViewComponent extends StatefulComponent<State> implements After
@Input({ transform: booleanAttribute })
public tableNoPadding?: boolean | null;
@Input({ transform: booleanAttribute })
public noPadding?: boolean | null;
@Input({ transform: booleanAttribute })
public isLoaded: boolean | undefined | null = true;

17
frontend/src/app/shared/components/cursors.component.html

@ -1,11 +1,10 @@
<div class="cursors">
<div *ngFor="let cursor of otherCursor | async; trackBy: trackByUser" class="cursor"
[style.left]="sizeInPx(cursor.cursor.x)"
[style.top]="sizeInPx(cursor.cursor.y)">
<div class="user" [style.background]="cursor.user.id | sqxStringColor">
{{cursor.user.displayName}}
</div>
<i [style.color]="cursor.user.id | sqxStringColor" class="icon-mouse-pointer"></i>
<div *ngFor="let cursor of otherCursor | async; trackBy: trackByUser" class="cursor"
[style.left]="sizeInPx(cursor.cursor.x)"
[style.top]="sizeInPx(cursor.cursor.y)"
[class.hidden]="cursor.cursor.x < 0">
<div class="user" [style.background]="cursor.user.id | sqxStringColor">
{{cursor.user.displayName}}
</div>
<i [style.color]="cursor.user.id | sqxStringColor" class="icon-mouse-pointer"></i>
</div>

6
frontend/src/app/shared/components/cursors.component.scss

@ -1,12 +1,10 @@
@import 'mixins';
@import 'vars';
.root {
position: relative;
}
.cursor {
position: absolute;
pointer-events: none;
z-index: 100;
}
.user {

Loading…
Cancel
Save