tsai
/
squidex
mirror of https://github.com/Squidex/squidex.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of github.com:Squidex/squidex into feature-webhooks-matrix

pull/98/head
Sebastian Stehle 8 years ago
parent
de83838fc2 ccf8413c3b
commit
de5039cce2
19 changed files with 129 additions and 124 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/Squidex.Infrastructure/CQRS/Events/EventReceiver.cs
  2. 2
      src/Squidex/app/features/content/pages/content/content-page.component.html
  3. 4
      src/Squidex/app/features/content/shared/content-item.component.html
  4. 8
      src/Squidex/app/features/dashboard/pages/dashboard-page.component.scss
  5. 4
      src/Squidex/app/features/schemas/pages/schema/field.component.scss
  6. 12
      src/Squidex/app/features/settings/pages/languages/language.component.html
  7. 2
      src/Squidex/app/features/settings/pages/languages/language.component.scss
  8. 15
      src/Squidex/app/features/settings/pages/languages/language.component.ts
  9. 7
      src/Squidex/app/framework/angular/dialog-renderer.component.ts
  10. 4
      src/Squidex/app/framework/angular/slider.component.scss
  11. 2
      src/Squidex/app/framework/angular/stars.component.scss
  12. 2
      src/Squidex/app/framework/angular/toggle.component.scss
  13. 2
      src/Squidex/app/shared/components/history.component.scss
  14. 4
      src/Squidex/app/theme/_bootstrap-vars.scss
  15. 8
      src/Squidex/app/theme/_bootstrap.scss
  16. 6
      src/Squidex/app/theme/_lists.scss
  17. 4
      src/Squidex/app/theme/_static.scss
  18. 143
      src/Squidex/app/theme/_vars.scss
  19. 20
      tests/Squidex.Domain.Apps.Read.Tests/Apps/CachingAppProviderTests.cs

4
src/Squidex.Infrastructure/CQRS/Events/EventReceiver.cs
View File

@ -142,7 +142,7 @@ namespace Squidex.Infrastructure.CQRS.Events
await subscription.SubscribeAsync(async storedEvent =>
{
await DispatchConsumer(ParseEvent(storedEvent), eventConsumer, eventConsumer.Name);
await DispatchConsumerAsync(ParseEvent(storedEvent), eventConsumer, eventConsumer.Name);
await eventConsumerInfoRepository.SetPositionAsync(eventConsumer.Name, storedEvent.EventPosition, false);
}, async exception =>
@ -187,7 +187,7 @@ namespace Squidex.Infrastructure.CQRS.Events
}
}
private async Task DispatchConsumer(Envelope<IEvent> @event, IEventConsumer eventConsumer, string consumerName)
private async Task DispatchConsumerAsync(Envelope<IEvent> @event, IEventConsumer eventConsumer, string consumerName)
{
var eventId = @event.Headers.EventId().ToString();
var eventType = @event.Payload.GetType().Name;

2
src/Squidex/app/features/content/pages/content/content-page.component.html
View File

@ -6,7 +6,7 @@
<div class="panel-title-row">
<div class="float-right">
<span *ngIf="isNewMode">
<button type="button" class="btn btn-default" (click)="saveAsDraft()" title="CTRL + S">
<button type="button" class="btn btn-secondary" (click)="saveAsDraft()" title="CTRL + S">
Save as Draft
</button>

4
src/Squidex/app/features/content/shared/content-item.component.html
View File

@ -33,7 +33,7 @@
</div>
</td>
<td *ngIf="isReference">
<button type="button" class="btn btn-link btn-danger" (click)="deleting.emit(); $event.stopPropagation()">
<i class="icon-bin2"></i>
<button type="button" class="btn btn-link btn-secondary" (click)="deleting.emit(); $event.stopPropagation()">
<i class="icon-close"></i>
</button>
</td>

8
src/Squidex/app/features/dashboard/pages/dashboard-page.component.scss
View File

@ -26,7 +26,7 @@
.subtext {
margin-top: .5rem;
margin-bottom: .8rem;
color: $color-subtext;
color: $color-text-decent;
}
.card {
@ -50,13 +50,13 @@
}
&-text {
color: $color-empty;
color: $color-text-decent;
font-weight: normal;
font-size: .9rem;
}
&-more {
color: $color-empty;
color: $color-text-decent;
font-weight: normal;
font-size: .8rem;
margin-top: .4rem;
@ -96,7 +96,7 @@
}
&-label {
color: $color-subtext;
color: $color-text-decent;
}
&-value {

4
src/Squidex/app/features/schemas/pages/schema/field.component.scss
View File

@ -32,11 +32,11 @@ $field-header: #e7ebef;
}
&-hidden {
color: $color-subtext;
color: $color-text-decent;
}
&-partitioning {
color: $color-subtext;
color: $color-text-decent;
font-weight: normal;
font-size: .85rem;
}

12
src/Squidex/app/features/settings/pages/languages/language.component.html
View File

@ -42,20 +42,20 @@
<div class="fallback-language" *ngFor="let language of fallbackLanguages; let i = index" dnd-sortable [sortableIndex]="i">
{{language.englishName}}
<button type="button" class="btn btn-link btn-sm float-right" (click)="removeFallbackLanguage(language)">
<i class="icon-bin2"></i>
<button type="button" class="btn btn-link btn-secondary btn-sm float-right" (click)="removeFallbackLanguage(language)">
<i class="icon-close"></i>
</button>
</div>
</div>
<form class="form-inline fallback-form" [formGroup]="addLanguageForm" (ngSubmit)="addLanguage()" *ngIf="otherLanguages.length > 0">
<form class="form-inline fallback-form" (ngSubmit)="addLanguage()" *ngIf="otherLanguages.length > 0">
<div class="form-group mr-1">
<select class="form-control fallback-select" formControlName="language">
<option *ngFor="let language of otherLanguages" [ngValue]="language">{{language.englishName}}</option>
<select class="form-control fallback-select" [(ngModel)]="otherLanguage" name="otherLanguage">
<option *ngFor="let otherLanguage of otherLanguages" [ngValue]="otherLanguage">{{otherLanguage.englishName}}</option>
</select>
</div>
<button type="submit" class="btn btn-success" [disabled]="!addLanguageForm.valid">Add Language</button>
<button type="submit" class="btn btn-success">Add Language</button>
</form>
</div>
</div>

2
src/Squidex/app/features/settings/pages/languages/language.component.scss
View File

@ -9,7 +9,7 @@ $field-header: #e7ebef;
}
&-optional {
color: $color-subtext;
color: $color-text-decent;
}
}

15
src/Squidex/app/features/settings/pages/languages/language.component.ts
View File

@ -6,7 +6,7 @@
*/
import { Component, EventEmitter, Input, OnChanges, OnDestroy, Output, OnInit } from '@angular/core';
import { FormBuilder, Validators } from '@angular/forms';
import { FormBuilder } from '@angular/forms';
import { Subscription } from 'rxjs';
import {
@ -39,6 +39,7 @@ export class LanguageComponent implements OnInit, OnChanges, OnDestroy {
public saving = new EventEmitter<AppLanguageDto>();
public otherLanguages: ImmutableArray<AppLanguageDto>;
public otherLanguage: AppLanguageDto;
public fallbackLanguages: AppLanguageDto[] = [];
@ -52,13 +53,6 @@ export class LanguageComponent implements OnInit, OnChanges, OnDestroy {
isOptional: [false, []]
});
public addLanguageForm =
this.formBuilder.group({
language: [null,
Validators.required
]
});
constructor(
private readonly formBuilder: FormBuilder
) {
@ -92,19 +86,21 @@ export class LanguageComponent implements OnInit, OnChanges, OnDestroy {
}
public addLanguage() {
this.addFallbackLanguage(this.addLanguageForm.controls['language'].value);
this.addFallbackLanguage(this.otherLanguage);
}
public removeFallbackLanguage(language: AppLanguageDto) {
this.fallbackLanguages.splice(this.fallbackLanguages.indexOf(language), 1);
this.otherLanguages = this.otherLanguages.push(language);
this.otherLanguage = this.otherLanguages.values[0];
}
public addFallbackLanguage(language: AppLanguageDto) {
this.fallbackLanguages.push(language);
this.otherLanguages = this.otherLanguages.filter(l => l.iso2Code !== language.iso2Code);
this.otherLanguage = this.otherLanguages.values[0];
}
public save() {
@ -138,6 +134,7 @@ export class LanguageComponent implements OnInit, OnChanges, OnDestroy {
this.allLanguages.filter(l =>
this.language.iso2Code !== l.iso2Code &&
this.language.fallback.indexOf(l.iso2Code) < 0);
this.otherLanguage = this.otherLanguages.values[0];
}
if (this.language) {

7
src/Squidex/app/framework/angular/dialog-renderer.component.ts
View File

@ -8,6 +8,8 @@
import { Component, Input, OnDestroy, OnInit } from '@angular/core';
import { Subscription } from 'rxjs';
import { fadeAnimation } from './animations';
import {
DialogRequest,
DialogService,
@ -19,7 +21,10 @@ import { ModalView } from './../utils/modal-view';
@Component({
selector: 'sqx-dialog-renderer',
styleUrls: ['./dialog-renderer.component.scss'],
templateUrl: './dialog-renderer.component.html'
templateUrl: './dialog-renderer.component.html',
animations: [
fadeAnimation
]
})
export class DialogRendererComponent implements OnDestroy, OnInit {
private dialogSubscription: Subscription;

4
src/Squidex/app/framework/angular/slider.component.scss
View File

@ -11,7 +11,7 @@ $thumb-margin: ($thumb-size - $bar-height) * .5;
& {
@include border-radius($bar-height * .5);
position: relative;
border: 1px solid $color-control;
border: 1px solid $color-input-border;
margin-bottom: 1.25rem;
margin-top: .25rem;
margin-right: $thumb-size * .5;
@ -30,7 +30,7 @@ $thumb-margin: ($thumb-size - $bar-height) * .5;
position: absolute;
width: $thumb-size;
height: $thumb-size;
border: 1px solid $color-control;
border: 1px solid $color-input-border;
background: $color-dark-foreground;
margin-top: -$thumb-margin;
margin-left: -$thumb-size * .5;

2
src/Squidex/app/framework/angular/stars.component.scss
View File

@ -4,7 +4,7 @@
$color-gold: #ffd700;
.many-stars {
color: $color-empty;
color: $color-text-decent;
}
.stars {

2
src/Squidex/app/framework/angular/toggle.component.scss
View File

@ -50,7 +50,7 @@ $toggle-button-size: $toggle-height - .3rem;
}
&.disabled {
background: $color-disabled;
background: $color-input-disabled;
border: 0;
cursor: not-allowed;
}

2
src/Squidex/app/shared/components/history.component.scss
View File

@ -24,6 +24,6 @@
&-created {
font-size: .65rem;
font-weight: normal;
color: $color-empty;
color: $color-text-decent;
}
}

4
src/Squidex/app/theme/_bootstrap-vars.scss
View File

@ -34,9 +34,9 @@ $alert-danger-text: #fff;
$btn-secondary-bg: $color-theme-secondary;
$btn-secondary-border: $color-theme-secondary;
$input-bg-disabled: $color-disabled;
$input-bg-disabled: $color-input-disabled;
$input-border-color: $color-input;
$input-color-placeholder: $color-empty;
$input-color-placeholder: $color-text-decent;
$badge-default-bg: $color-badge-default-background;
$badge-primary-bg: $color-badge-primary-background;

8
src/Squidex/app/theme/_bootstrap.scss
View File

@ -41,7 +41,7 @@
//
// Alert overrides.
//
.alert-info,
.alert-success,
.alert-warning,
.alert-info,
.alert-danger {
@ -321,6 +321,10 @@ a {
@include build-link-button($color-theme-blue);
}
&.btn-secondary {
@include build-link-button($color-text-decent);
}
&.btn-danger {
@include build-link-button($color-theme-error);
}
@ -330,7 +334,7 @@ a {
}
&.btn-decent {
@include build-link-button($color-subtext);
@include build-link-button($color-text-decent);
}
}
}

6
src/Squidex/app/theme/_lists.scss
View File

@ -57,7 +57,7 @@
// Each row is white and a has a border.
& {
@include transition(all .2s ease);
background: $color-table;
background: $color-table-background;
border: 1px solid $color-table-border;
border-bottom: 2px solid $color-table-border;
margin-bottom: .5rem;
@ -92,7 +92,7 @@
&-row {
& {
padding: 1rem 1.25rem;
background: $color-table;
background: $color-table-background;
border: 1px solid $color-border;
border-top: 0;
border-bottom-width: 2px;
@ -111,7 +111,7 @@
}
&-empty {
color: $color-empty;
color: $color-text-decent;
}
// Detail row for expandable rows.

4
src/Squidex/app/theme/_static.scss
View File

@ -25,7 +25,7 @@ noscript {
// Lightweight, table like headline.
&-headline {
& {
color: $color-empty;
color: $color-text-decent;
display: block;
margin-bottom: 1rem;
font-size: 1.3rem;
@ -51,7 +51,7 @@ noscript {
}
&-password-signup {
color: $color-empty;
color: $color-text-decent;
}
&-section {

143
src/Squidex/app/theme/_vars.scss
View File

@ -1,94 +1,93 @@
$color-background: #eef1f4;
$color-border: #dae4e9;
$color-border-dark: darken($color-border, 20%);
$color-title: #000;
$color-text: #373a3c;
$color-text-decent: #a9b2bb;
$color-subtext: $color-text-decent;
$color-empty: $color-text-decent;
$color-control: rgba(0, 0, 0, .15);
$color-input: #dbe4eb;
$color-input-border: rgba(0, 0, 0, .15);
$color-input-background: #fff;
$color-disabled: #eef1f4;
$color-extern-google: #d34836;
$color-extern-google-icon: #b02c1b;
$color-extern-microsoft: #004185;
$color-extern-microsoft-icon: #1b67b7;
$color-extern-github: #191919;
$color-extern-github-icon: #4a4a4a;
$color-theme-blue: #438cef;
$color-theme-blue-dark: #3d7dd5;
$color-theme-blue-light: #9ebeea;
$color-background: #eef1f4;
$color-border: #dae4e9;
$color-border-dark: #b3bbbf;
$color-title: #000;
$color-text: #373a3c;
$color-text-decent: #a9b2bb;
$color-input: #dbe4eb;
$color-input-background: #fff;
$color-input-disabled: #eef1f4;
$color-input-border: rgba(0, 0, 0, .15);
$color-extern-google: #d34836;
$color-extern-google-icon: #b02c1b;
$color-extern-microsoft: #004185;
$color-extern-microsoft-icon: #1b67b7;
$color-extern-github: #191919;
$color-extern-github-icon: #4a4a4a;
$color-theme-blue: #438cef;
$color-theme-blue-dark: #3d7dd5;
$color-theme-blue-light: #9ebeea;
$color-theme-blue-lightest: #d9e8fc;
$color-theme-secondary: #dce5e8;
$color-theme-secondary: #dce5e8;
$color-theme-green: #4cc159;
$color-theme-green-dark: #47b353;
$color-theme-green: #4cc159;
$color-theme-green-dark: #47b353;
$color-theme-orange: #ffb136;
$color-theme-orange-dark: #a65b00;
$color-theme-orange: #ffb136;
$color-theme-orange-dark: #a65b00;
$color-theme-error: #f00;
$color-theme-error-dark: #c00;
$color-theme-error: #f00;
$color-theme-error-dark: darken($color-theme-error, 5%);
$color-dark1-background: #2e3842;
$color-dark1-foreground: #6a7681;
$color-dark1-border1: #37424c;
$color-dark1-border2: #222a32;
$color-dark1-focus-foreground: #fff;
$color-dark1-background: #2e3842;
$color-dark1-foreground: #6a7681;
$color-dark1-border1: #37424c;
$color-dark1-border2: #222a32;
$color-dark1-focus-foreground: #fff;
$color-dark1-active-background: #273039;
$color-dark2-background: #273039;
$color-dark2-foreground: #6a7681;
$color-dark2-border1: #37424c;
$color-dark2-border2: #222a32;
$color-dark2-focus-foreground: #fff;
$color-dark2-background: #273039;
$color-dark2-foreground: #6a7681;
$color-dark2-border1: #37424c;
$color-dark2-border2: #222a32;
$color-dark2-focus-foreground: #fff;
$color-dark2-active-background: #222931;
$color-dark2-control: #2e3842;
$color-dark2-separator: #2e3842;
$color-dark2-control: #2e3842;
$color-dark2-separator: #2e3842;
$color-panel-icon: #a2b0b6;
$color-panel-icon: #a2b0b6;
$color-badge-success-background: #d6ffdb;
$color-badge-success-foreground: #3bab48;
$color-badge-success-background: #d6ffdb;
$color-badge-success-foreground: #3bab48;
$color-badge-warning-background: #ffe8cc;
$color-badge-warning-foreground: #efa243;
$color-badge-warning-background: #ffe8cc;
$color-badge-warning-foreground: #efa243;
$color-badge-danger-background: #fcc;
$color-badge-danger-foreground: #ef4343;
$color-badge-danger-background: #fcc;
$color-badge-danger-foreground: #ef4343;
$color-badge-info-background: #d0f2fb;
$color-badge-info-foreground: #43ccef;
$color-badge-info-background: #d0f2fb;
$color-badge-info-foreground: #43ccef;
$color-badge-primary-background: #cce1ff;
$color-badge-primary-foreground: #438cef;
$color-badge-primary-background: #cce1ff;
$color-badge-primary-foreground: #438cef;
$color-badge-default-background: #e6e6e6;
$color-badge-default-foreground: #999;
$color-badge-default-background: #e6e6e6;
$color-badge-default-foreground: #999;
$color-table-background: #fff;
$color-table-footer: #ecf2f6;
$color-table: #fff;
$color-table-footer: #ecf2f6;
$color-table-border: $color-border;
$color-table-header: $color-text-decent;
$color-table-border: $color-border;
$color-table-header: $color-text-decent;
$color-modal-header-background: #2e3842;
$color-modal-header-foreground: #6a7681;
$color-dark-black: #000;
$color-dark-foreground: #fff;
$color-dark-black: #000;
$color-dark-foreground: #fff;
$size-navbar-height: 3.25rem;
$size-navbar-height: 3.25rem;
$size-sidebar-width: 7rem;
$size-sidebar-width: 7rem;
$panel-padding: 1.5rem;
$panel-header: 5.4rem;
$panel-sidebar: 3.75rem;
$panel-light-background: #fff;
$panel-padding: 1.5rem;
$panel-header: 5.4rem;
$panel-sidebar: 3.75rem;
$panel-light-background: #fff;
$asset-height: 13rem;
$asset-height: 13rem;

20
tests/Squidex.Domain.Apps.Read.Tests/Apps/CachingAppProviderTests.cs
View File

@ -67,8 +67,8 @@ namespace Squidex.Domain.Apps.Read.Apps
A.CallTo(() => repository.FindAppAsync(appId.Id))
.Returns(Task.FromResult(appV1));
await ProvideAppById(appV1);
await ProvideAppByName(appV1);
await ProvideAppByIdAsync(appV1);
await ProvideAppByNameAsync(appV1);
A.CallTo(() => repository.FindAppAsync(appId.Id)).MustHaveHappened();
A.CallTo(() => repository.FindAppAsync(appId.Name)).MustNotHaveHappened();
@ -80,8 +80,8 @@ namespace Squidex.Domain.Apps.Read.Apps
A.CallTo(() => repository.FindAppAsync(appId.Name))
.Returns(Task.FromResult(appV1));
await ProvideAppByName(appV1);
await ProvideAppById(appV1);
await ProvideAppByNameAsync(appV1);
await ProvideAppByIdAsync(appV1);
A.CallTo(() => repository.FindAppAsync(appId.Id)).MustNotHaveHappened();
A.CallTo(() => repository.FindAppAsync(appId.Name)).MustHaveHappened();
@ -95,11 +95,11 @@ namespace Squidex.Domain.Apps.Read.Apps
A.CallTo(() => repository.FindAppAsync(appId.Id))
.Returns(appV1).Once();
await ProvideAppById(appV1);
await ProvideAppByIdAsync(appV1);
sut.On(Envelope.Create(new AppLanguageAdded {AppId = appId }).To<IEvent>()).Wait();
await ProvideAppById(appV2);
await ProvideAppByIdAsync(appV2);
A.CallTo(() => repository.FindAppAsync(appId.Id)).MustHaveHappened(Repeated.Exactly.Times(2));
}
@ -112,21 +112,21 @@ namespace Squidex.Domain.Apps.Read.Apps
A.CallTo(() => repository.FindAppAsync(appId.Name))
.Returns(appV1).Once();
await ProvideAppByName(appV1);
await ProvideAppByNameAsync(appV1);
sut.On(Envelope.Create(new AppLanguageAdded { AppId = appId }).To<IEvent>()).Wait();
await ProvideAppByName(appV2);
await ProvideAppByNameAsync(appV2);
A.CallTo(() => repository.FindAppAsync(appId.Name)).MustHaveHappened(Repeated.Exactly.Times(2));
}
private async Task ProvideAppById(IAppEntity app)
private async Task ProvideAppByIdAsync(IAppEntity app)
{
Assert.Equal(app, await sut.FindAppByIdAsync(appId.Id));
}
private async Task ProvideAppByName(IAppEntity app)
private async Task ProvideAppByNameAsync(IAppEntity app)
{
Assert.Equal(app, await sut.FindAppByNameAsync(appId.Name));
}

Write Preview
Loading…
Cancel
Save