From 4a9f72c80eef76f34ffe295bc6c39999097e3b43 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 5 Oct 2020 10:29:13 +0200 Subject: [PATCH 1/5] CSS fix and dead code cleaned --- .../Comments/CommentsCommandMiddlewareTests.cs | 10 ---------- .../pages/comments/comments-page.component.scss | 6 ++++++ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Comments/CommentsCommandMiddlewareTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Comments/CommentsCommandMiddlewareTests.cs index b2c06eb46..c9779dade 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Comments/CommentsCommandMiddlewareTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Comments/CommentsCommandMiddlewareTests.cs @@ -142,16 +142,6 @@ namespace Squidex.Domain.Apps.Entities.Comments return new CommandContext(command, commandBus); } - private static bool IsForUser(ICommand command, string id) - { - return command is CreateComment createComment && - createComment.CommentsId == id && - createComment.Mentions == null && - createComment.AppId == null && - createComment.ExpectedVersion == EtagVersion.Any && - createComment.IsMention; - } - private void SetupUser(string id, string email) { var user = A.Fake(); diff --git a/frontend/app/features/content/pages/comments/comments-page.component.scss b/frontend/app/features/content/pages/comments/comments-page.component.scss index e69de29bb..6bb9a8b0e 100644 --- a/frontend/app/features/content/pages/comments/comments-page.component.scss +++ b/frontend/app/features/content/pages/comments/comments-page.component.scss @@ -0,0 +1,6 @@ +sqx-comments { + display: flex; + flex-direction: column; + flex-grow: 1; + height: 100%; +} \ No newline at end of file From c0635953ccba055096397402b60371417578f410 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 7 Oct 2020 14:39:17 +0200 Subject: [PATCH 2/5] Design improvements. --- frontend/app-config/webpack.config.js | 3 +- frontend/app/_theme.html | 1054 +++++++++++------ .../pages/restore/restore-page.component.html | 4 +- .../contents/contents-page.component.html | 8 +- .../custom-view-editor.component.html | 12 +- .../shared/due-time-selector.component.html | 21 +- .../shared/forms/field-editor.component.html | 29 +- .../list/content-value-editor.component.html | 15 +- .../list/content-value-editor.component.ts | 4 +- .../shared/list/content.component.html | 8 +- .../references/content-creator.component.html | 2 +- .../content-selector-item.component.html | 2 +- .../content-selector.component.html | 6 +- .../cards/api-performance-card.component.html | 6 +- .../cards/api-traffic-card.component.html | 6 +- .../pages/dashboard-config.component.html | 14 +- .../actions/generic-action.component.html | 8 +- .../pages/rules/rule-wizard.component.html | 17 +- .../content-changed-trigger.component.html | 8 +- .../triggers/usage-trigger.component.html | 4 +- .../common/schema-edit-form.component.html | 4 +- .../export/schema-export-form.component.html | 16 +- .../schema/fields/field-wizard.component.html | 33 +- .../field-form-validation.component.html | 6 +- .../fields/forms/field-form.component.html | 8 +- .../fields/types/assets-ui.component.html | 8 +- .../types/assets-validation.component.html | 12 +- .../fields/types/boolean-ui.component.html | 6 +- .../types/boolean-validation.component.html | 6 +- .../types/date-time-validation.component.html | 2 +- .../fields/types/number-ui.component.html | 6 +- .../types/number-validation.component.html | 6 +- .../fields/types/references-ui.component.html | 6 +- .../references-validation.component.html | 6 +- .../fields/types/string-ui.component.html | 6 +- .../types/string-validation.component.html | 8 +- .../schema-preview-urls-form.component.html | 4 +- .../schema-field-rules-form.component.html | 8 +- .../schema-scripts-form.component.html | 4 +- .../schema/ui/schema-ui-form.component.html | 4 +- .../pages/schemas/schema-form.component.html | 8 +- .../clients/client-add-form.component.html | 8 +- .../client-connect-form.component.html | 4 +- .../pages/clients/client.component.html | 14 +- .../contributor-add-form.component.html | 6 +- .../contributors/contributor.component.html | 2 +- .../import-contributors-dialog.component.html | 14 +- .../language-add-form.component.html | 6 +- .../pages/languages/language.component.html | 27 +- .../pages/more/more-page.component.html | 4 +- .../pages/roles/role-add-form.component.html | 8 +- .../settings/pages/roles/role.component.html | 49 +- .../workflow-add-form.component.html | 8 +- .../workflows/workflow-step.component.html | 6 +- .../pages/workflows/workflow.component.html | 9 +- .../forms/editable-title.component.html | 4 +- .../editors/checkbox-group.component.html | 8 +- .../editors/checkbox-group.component.scss | 4 +- .../forms/editors/stars.component.html | 4 +- .../forms/editors/tag-editor.component.html | 6 +- .../angular/image-source.directive.ts | 5 +- .../modals/dialog-renderer.component.html | 14 +- .../framework/angular/pager.component.html | 2 +- .../framework/angular/pager.component.scss | 2 +- .../shared/components/app-form.component.html | 8 +- .../assets/asset-dialog.component.html | 18 +- .../assets/asset-folder-dialog.component.html | 4 +- .../assets/assets-selector.component.html | 8 +- .../comments/comment.component.html | 3 +- .../forms/geolocation-editor.component.html | 4 +- .../queries/filter-comparison.component.html | 6 +- .../search/queries/sorting.component.html | 2 +- .../search/search-form.component.html | 14 +- frontend/app/style.js | 8 + frontend/app/theme/_forms.scss | 5 + 75 files changed, 1064 insertions(+), 628 deletions(-) create mode 100644 frontend/app/style.js diff --git a/frontend/app-config/webpack.config.js b/frontend/app-config/webpack.config.js index 9f8c9d4c1..cf5deeebe 100644 --- a/frontend/app-config/webpack.config.js +++ b/frontend/app-config/webpack.config.js @@ -252,6 +252,7 @@ module.exports = function (env) { */ config.entry = { 'shims': './app/shims.ts', + 'style': './app/style.js', 'app': './app/app.ts' }; @@ -304,7 +305,7 @@ module.exports = function (env) { new plugins.HtmlWebpackPlugin({ filename: 'theme.html', hash: true, - chunks: [], + chunks: ['style'], chunksSortMode: 'none', template: 'app/_theme.html' }) diff --git a/frontend/app/_theme.html b/frontend/app/_theme.html index dde63e9a4..5c222f5c3 100644 --- a/frontend/app/_theme.html +++ b/frontend/app/_theme.html @@ -9,119 +9,129 @@ -
-
+
+
+
+

Squidex Theme

+
+
+
+ +
+
-
-

Navbars

-
- -
-
+
- Navbar - -
- - -
- - -
-
- -
+
+
+ +
+
-
-
+
-
-
-
-
-

Buttons

-
+
+
+
+
+

Buttons

@@ -134,6 +144,7 @@ + Link

@@ -144,6 +155,7 @@ +

@@ -167,23 +179,17 @@

+
-
- Dropdown link - Dropdown link -
+
-
- Dropdown link - Dropdown link -
@@ -191,21 +197,14 @@
-
- Dropdown link - Dropdown link -
+
-
- Dropdown link - Dropdown link -
@@ -215,8 +214,8 @@
-
+

@@ -254,7 +253,7 @@

- +
- +
- - - - - + + +
@@ -332,15 +328,15 @@
- +   - +
- +  
@@ -348,17 +344,16 @@
- + -
+
+
-
-

Typography

-
+

Typography

@@ -383,7 +378,7 @@

Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula.

The following is rendered as bold text.

The following is rendered as italicized text.

-

An abbreviation of the word attribute is attr.

+

The following is an abbreviation attr.

@@ -401,7 +396,7 @@
- +

Blockquotes

@@ -412,6 +407,7 @@

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

+
Someone famous in Source Title
@@ -420,20 +416,25 @@

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

+
Someone famous in Source Title
+ -
+
+
-
-

Tables

-
+

Tables

+
+
+
+
@@ -493,39 +494,101 @@ + -
+
+
-
-

Forms

-
+

Tables2

-
+
-
-
- Legend +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
#Column headingColumn headingColumn heading
1Column contentColumn contentColumn content
2Column contentColumn contentColumn content
+
+
+
+
+
+ +
+
+
+
+

Forms

+
+
+ + +
+ Legend + +
+

Validation error.

+ +
    +
  • An user with the same email aready exists.
    • +
+
+ +
+
+
- - - We'll never share your email with anyone else. + + + + + We will never share your email with anyone else.
+
- - - Input with just a line. + + + + + Input with just an underlined.
+
- - + + +
+
- - @@ -533,9 +596,11 @@
+
- - @@ -543,134 +608,187 @@
+
- + +
+ +
+ + +
+ + + +
+
+
- - - This is some placeholder block-level help text for the above input. It's a bit lighter and easily wraps to a new line. + + +
-
- Radio buttons -
- + +
+

Custom Radio buttons

+ +
+ +
-
- + +
+ +
-
- + +
+ +
-
-
-
- -
- -
-
+ +
+

Custom Checkboxes

-
-
-
-
- - -
- -
- - -
-
+
+ + +
-
-
- - -
+
+ + +
+ +
+ + +
+
-
- - -
+ +
-
- - -
Success! You've done it.
-
+
+ +
+ -
- - -
Shucks, try again.
-
+ +
-
- - -
+
+ -
- - -
+ +
-
- - -
+
+ -
- - -
-
- $ +
- - - -
- .00 + +
+ + +
-
-
- -
-
+
+ + + + +
Success! You've done it.
+
+ +
+ + + + +
Shucks, try again.
+
+ +
+ + +
+
You have entered an invalid value.
+
+ + +
+ +
+ + + + +
+ The app name cannot be changed later. +
+
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + +
+
+ $ +
+ + + +
+ .00 +
+
+
+ +
+
+ + + -
+
+
-
-

Navs

-
+

Forms

Tabs

+
+
+ +
+
@@ -691,22 +826,14 @@

Pills

+
+
+
-
    +
    • Active
    • - -
      - Action - Another action - Something else here - -
      - - Separated link -
      + Dropdown
    • Link @@ -748,6 +868,7 @@

      Breadcrumbs

      +
      1. Home
        2. @@ -773,6 +894,7 @@

        Pagination

        +
          @@ -851,28 +973,48 @@
        +
        +
        +
      + +
      +
      +

      Dropdown

      +
      +
      + Action + Another action + Something else here + +
      + + Separated link +
      +
      -
      +
      +
      -
      -

      Indicators

      -
      +

      Indicators

      Alerts

      +
      +

      Warning!

      +

      Best check yo self, you're not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.

      @@ -883,6 +1025,7 @@
      + Oh snap! Change a few things up and try submitting again.
      @@ -891,6 +1034,7 @@
      + Well done! You successfully read this important alert message.
      @@ -899,13 +1043,16 @@
      + Heads up! This alert needs your attention, but it's not super important.
      +

      Badges

      +
      Primary Secondary @@ -916,6 +1063,7 @@ Light Dark
      +
      Primary Secondary @@ -928,103 +1076,99 @@
      +
      -
      +
      +
      -
      -

      Progress

      -
      +

      Progress

      +
      +
      + +
      +
      +

      Basic

      -

      Basic

      -
      +
      -

      Contextual alternatives

      +

      Contextual alternatives

      +
      -
      -
      +
      +
      -
      -
      +
      +
      -
      -
      +
      +
      -
      -
      +
      +
      -

      Multiple bars

      +

      Multiple bars

      +
      -
      -
      -
      -
      +
      +
      +
      +
      -

      Striped

      +

      Striped

      +
      -
      -
      +
      +
      -
      -
      +
      +
      -
      -
      +
      +
      -
      -
      +
      +
      -
      +
      -

      Animated

      +

      Animated

      +
      -
      -
      +
      +
      + +
      +
      +
      +
      +

      Containers

      +
      +
      -
      -
      -

      Containers

      -

      Jumbotron

      +

      This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.

      Learn more

      @@ -1063,25 +1207,32 @@
      +

      List group item heading

      +

      Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.

      List group item heading

      +

      Donec id elit non mi porta gravida at eget metus. Maecenas sed diam eget risus varius blandit.
      +
      +
      +
      +
      -

      Cards

      +

      Cards

      @@ -1092,6 +1243,7 @@

      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

      +
      Someone famous in Source Title
      @@ -1100,6 +1252,7 @@

      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

      +
      Someone famous in Source Title
      @@ -1108,6 +1261,7 @@

      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

      +
      Someone famous in Source Title
      @@ -1116,6 +1270,7 @@

      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

      +
      Someone famous in Source Title
      @@ -1124,6 +1279,7 @@

      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

      +
      Someone famous in Source Title
      @@ -1136,6 +1292,7 @@

      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

      +
      Someone famous in Source Title
      @@ -1144,6 +1301,7 @@

      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

      +
      Someone famous in Source Title
      @@ -1152,6 +1310,7 @@

      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

      +
      Someone famous in Source Title
      @@ -1160,6 +1319,7 @@

      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

      +
      Someone famous in Source Title
      @@ -1168,6 +1328,7 @@

      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.

      +
      Someone famous in Source Title
      @@ -1179,19 +1340,21 @@

      Card header

      +
      Special title treatment
      +
      Support card subtitle
      - + Card image - +
      -

      Some quick example text to build on the card title and make up the bulk of the card's content.

      +

      Some quick example text to build on the card title and make up the bulk of the card's content.

      Card link Another link
      - +
      2 days ago
      @@ -1200,34 +1363,34 @@
      +
      -
      +
      +
      -
      -

      Dialogs

      -
      +

      Modals

      +
      -
      -

      Modals

      +
      -
      -
      - -
      +
      +
      + +

      Title

      - +
      - +
      • @@ -1244,15 +1407,16 @@
      - +
      Modal body text goes here.
      - +
      - + +
      @@ -1262,18 +1426,147 @@
      +
      -
      +
      +
      -
      -

      Modals

      +

      Lists

      +
      +
      + +
      +
      +
      +
      +
      +
      +
      + My Item 1 +
      +
      + + +
      +
      +
      +
      +
      + + +
      + + +
      +
      +
      + Text +
      +
      +
      + +
      +
      +
      +
      + My Item 2 +
      +
      + + +
      +
      +
      +
      + +
      +
      +
      +
      + My Item 3 +
      +
      + + +
      +
      +
      +
      + +
      +
      +
      + My Item 4 +
      +
      + + +
      +
      +
      + +
      +
      +
      +
      + +
      +
      + +
      +
      + +
      +
      +
      +
      +
      +
      + +
      +
      +
      +
      +

      Panels

      +
      +
      +

      Default

      +
      @@ -1281,30 +1574,24 @@
      - +

      Title

      - +
      - +
      -
      +
      Alert
      - -
        -
      • One
        • -
      • Two
        • -
      • Three
        • -
      - +
      @@ -1319,6 +1606,7 @@

      Light

      +
      @@ -1326,48 +1614,29 @@
      - +

      Title

      - +
      - +
      - + Text
      +

      Dark

      +
      @@ -1375,43 +1644,47 @@
      - +

      Title

      - + - +
      - +
      - \ No newline at end of file diff --git a/frontend/app/features/administration/pages/restore/restore-page.component.html b/frontend/app/features/administration/pages/restore/restore-page.component.html index 2b4eaf396..903803700 100644 --- a/frontend/app/features/administration/pages/restore/restore-page.component.html +++ b/frontend/app/features/administration/pages/restore/restore-page.component.html @@ -57,7 +57,9 @@
      - +
      diff --git a/frontend/app/features/content/pages/contents/contents-page.component.html b/frontend/app/features/content/pages/contents/contents-page.component.html index 40f51bffb..241524d64 100644 --- a/frontend/app/features/content/pages/contents/contents-page.component.html +++ b/frontend/app/features/content/pages/contents/contents-page.component.html @@ -82,7 +82,13 @@ - +
      + + + +
      {{ 'common.actions' | sqxTranslate }} diff --git a/frontend/app/features/content/pages/contents/custom-view-editor.component.html b/frontend/app/features/content/pages/contents/custom-view-editor.component.html index 8e4e157a3..71d55aa29 100644 --- a/frontend/app/features/content/pages/contents/custom-view-editor.component.html +++ b/frontend/app/features/content/pages/contents/custom-view-editor.component.html @@ -14,9 +14,9 @@
      -
      - -
    - + - +
diff --git a/frontend/app/features/schemas/pages/schema/fields/types/assets-ui.component.html b/frontend/app/features/schemas/pages/schema/fields/types/assets-ui.component.html index 559426c59..87f84510e 100644 --- a/frontend/app/features/schemas/pages/schema/fields/types/assets-ui.component.html +++ b/frontend/app/features/schemas/pages/schema/fields/types/assets-ui.component.html @@ -4,7 +4,7 @@
- @@ -18,9 +18,9 @@
-
- -