From 7aa7234a4fa2ac2d904aed5e206c543b82efb17e Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 4 Jul 2018 16:36:04 +0200 Subject: [PATCH 1/5] Readme updated. --- README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b73861532..234963412 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,18 @@ Squidex is an open source headless CMS and content management hub. In contrast to a traditional CMS Squidex provides a rich API with OData filter and Swagger definitions. It is up to you to build your UI on top of it. It can be website, a native app or just another server. We build it with ASP.NET Core and CQRS and is tested for Windows and Linux on modern browsers. -[![Gitter](https://img.shields.io/gitter/room/nwjs/nw.js.svg?style=square)](https://gitter.im/squidex-cms/Lobby) [![Slack](https://img.shields.io/badge/chat-on_slack-E01765.svg?style=square)](https://squidex-slack.herokuapp.com/) [![Build Status](http://build.squidex.io/api/badges/Squidex/squidex/status.svg)](http://build.squidex.io/Squidex/squidex) [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2FSquidex%2Fsquidex.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2FSquidex%2Fsquidex?ref=badge_shield) +[![Discourse topics](https://img.shields.io/discourse/https/support.squidex.io/topics.svg)](https://support.squidex.io) + [![Build Status](http://build.squidex.io/api/badges/Squidex/squidex/status.svg)](http://build.squidex.io/Squidex/squidex) [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2FSquidex%2Fsquidex.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2FSquidex%2Fsquidex?ref=badge_shield) Read the docs at [https://docs.squidex.io/](https://docs.squidex.io/) (work in progress) or just check out the code and play around. +## How to make feature requests or report bugs? + +Please join our community forum: https://support.squidex.io + ## Status -Current Version 1.6. Roadmap: https://trello.com/b/KakM4F3S/squidex-roadmap +Current Version 1.8.0. Roadmap: https://trello.com/b/KakM4F3S/squidex-roadmap ## Prerequisites From 7e1b4fddc851dcc01256c930a4784ae1efd6a328 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 4 Jul 2018 17:33:16 +0200 Subject: [PATCH 2/5] Link to support forum. --- README.md | 10 +- .../internal/internal-area.component.html | 14 +- .../internal/internal-area.component.scss | 51 +- .../app/theme/icomoon/demo-files/demo.css | 6 +- src/Squidex/app/theme/icomoon/demo.html | 998 +++---- .../app/theme/icomoon/fonts/icomoon.eot | Bin 24880 -> 25124 bytes .../app/theme/icomoon/fonts/icomoon.svg | 2 + .../app/theme/icomoon/fonts/icomoon.ttf | Bin 24716 -> 24960 bytes .../app/theme/icomoon/fonts/icomoon.woff | Bin 24792 -> 25036 bytes src/Squidex/app/theme/icomoon/selection.json | 2328 +++++++++-------- src/Squidex/app/theme/icomoon/style.css | 296 ++- 11 files changed, 1903 insertions(+), 1802 deletions(-) diff --git a/README.md b/README.md index 234963412..60da86bbc 100644 --- a/README.md +++ b/README.md @@ -4,12 +4,11 @@ Squidex is an open source headless CMS and content management hub. In contrast to a traditional CMS Squidex provides a rich API with OData filter and Swagger definitions. It is up to you to build your UI on top of it. It can be website, a native app or just another server. We build it with ASP.NET Core and CQRS and is tested for Windows and Linux on modern browsers. -[![Discourse topics](https://img.shields.io/discourse/https/support.squidex.io/topics.svg)](https://support.squidex.io) - [![Build Status](http://build.squidex.io/api/badges/Squidex/squidex/status.svg)](http://build.squidex.io/Squidex/squidex) [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2FSquidex%2Fsquidex.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2FSquidex%2Fsquidex?ref=badge_shield) +[![Discourse topics](https://img.shields.io/discourse/https/support.squidex.io/topics.svg)](https://support.squidex.io) [![Build Status](http://build.squidex.io/api/badges/Squidex/squidex/status.svg)](http://build.squidex.io/Squidex/squidex) [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2FSquidex%2Fsquidex.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2FSquidex%2Fsquidex?ref=badge_shield) Read the docs at [https://docs.squidex.io/](https://docs.squidex.io/) (work in progress) or just check out the code and play around. -## How to make feature requests or report bugs? +## How to make feature requests or report bugs? Please join our community forum: https://support.squidex.io @@ -20,10 +19,9 @@ Current Version 1.8.0. Roadmap: https://trello.com/b/KakM4F3S/squidex-roadmap ## Prerequisites * [Visual Studio Code](https://code.visualstudio.com/) or [Visual Studio 2017](https://www.visualstudio.com/vs/visual-studio-2017-rc/) -* [Node.js](https://nodejs.org/en/) -* [.NET Core SDK](https://www.microsoft.com/net/download/core#/current) (Already part of Visual Studio 2017) +* [Node.js](https://nodejs.org/en/) (development only) * [MongoDB](https://www.mongodb.com/) -* [Redis](https://redis.io/download) (If you want to run Squidex on multiple hosts) +* [.NET Core SDK](https://www.microsoft.com/net/download/core#/current) (Already part of Visual Studio 2017) ## Contributors diff --git a/src/Squidex/app/shell/pages/internal/internal-area.component.html b/src/Squidex/app/shell/pages/internal/internal-area.component.html index c14369e8b..c6bbe47b6 100644 --- a/src/Squidex/app/shell/pages/internal/internal-area.component.html +++ b/src/Squidex/app/shell/pages/internal/internal-area.component.html @@ -16,10 +16,12 @@ - - - - Github - + +
+ +
- +
+ Get help and support +
+ \ No newline at end of file diff --git a/src/Squidex/app/shell/pages/internal/internal-area.component.scss b/src/Squidex/app/shell/pages/internal/internal-area.component.scss index 95f49531b..539b0ed79 100644 --- a/src/Squidex/app/shell/pages/internal/internal-area.component.scss +++ b/src/Squidex/app/shell/pages/internal/internal-area.component.scss @@ -23,49 +23,52 @@ float: left; } -.github { +$support-icon-size: 50px; +$support-text-size: 200px; + +.support { &-button { & { - @include fixed(50%, -103px, auto, auto); - @include border-radius-left(3px); + @include fixed(50%, -$support-text-size, auto, auto); @include transition(transform .3s ease); - background: lighten($color-extern-github, 10%); - border: 0; - cursor: pointer; - color: $color-dark-foreground; - margin-top: -60px; - padding-left: 65px; + background: $color-theme-blue; font-size: .9rem; font-weight: bold; - height: 44px; - line-height: 40px; - width: 147px; - z-index: 1000000094; + height: $support-icon-size; + line-break: normal; + line-height: $support-icon-size - 6px; + z-index: 100000000; } &:hover { & { - @include translate(-103px, 0); + @include translate(-$support-text-size, 0); text-decoration: none; } - .github-icon { - background: $color-extern-github; + .support-icon { + background: $color-theme-blue-dark; } } } + &-icon, + &-text { + cursor: pointer; + color: $color-dark-foreground; + text-align: center; + } + + &-text { + width: $support-text-size; + } + &-icon { - @include absolute(0, auto, auto, 0); - @include border-radius-left(3px); @include transition(background-color .4s ease); - background: lighten($color-extern-github, 10%); - display: inline-block; - line-height: 44px; + background: $color-theme-blue; + line-height: $support-icon-size; font-size: 1.5rem; font-weight: normal; - width: 44px; - text-align: center; - color: $color-dark-foreground; + width: $support-icon-size; } } \ No newline at end of file diff --git a/src/Squidex/app/theme/icomoon/demo-files/demo.css b/src/Squidex/app/theme/icomoon/demo-files/demo.css index 06c37496a..9c149f296 100644 --- a/src/Squidex/app/theme/icomoon/demo-files/demo.css +++ b/src/Squidex/app/theme/icomoon/demo-files/demo.css @@ -147,19 +147,19 @@ p { font-size: 16px; } .fs1 { - font-size: 28px; + font-size: 24px; } .fs2 { font-size: 32px; } .fs3 { - font-size: 32px; + font-size: 28px; } .fs4 { font-size: 32px; } .fs5 { - font-size: 24px; + font-size: 32px; } .fs6 { font-size: 20px; diff --git a/src/Squidex/app/theme/icomoon/demo.html b/src/Squidex/app/theme/icomoon/demo.html index 42b1ac10c..c385962d3 100644 --- a/src/Squidex/app/theme/icomoon/demo.html +++ b/src/Squidex/app/theme/icomoon/demo.html @@ -9,20 +9,20 @@
-

Font Name: icomoon (Glyphs: 92)

+

Font Name: icomoon (Glyphs: 94)

-

Grid Size: 14

+

Grid Size: 24

- + - icon-single-content + icon-support
- - + +
liga: @@ -31,14 +31,14 @@
- + - icon-multiple-content + icon-control-RichText
- - + +
liga: @@ -47,465 +47,465 @@
- + - icon-type-Array + icon-download
- - + +
liga:
-
+
+
+

Grid Size: Unknown

+
- + - icon-exclamation + icon-action-Medium
- - + +
liga:
-
+
- + - icon-action-ElasticSearch + icon-circle
- - + +
liga:
-
+
- + - icon-action-Slack + icon-action-Fastly
- - + +
liga:
-
+
- + - icon-orleans + icon-control-Slug
- - + +
liga:
-
+
- + - icon-document-lock + icon-action-Algolia
- - + +
liga:
-
+
- + - icon-document-unpublish + icon-type-Tags
- - + +
liga:
-
+
- + - icon-angle-down + icon-activity
- - + +
liga:
-
+
- + - icon-angle-left + icon-history
- - + +
liga:
-
+
- + - icon-angle-right + icon-time
- - + +
liga:
-
+
- + - icon-angle-up + icon-add
- - + +
liga:
-
+
- + - icon-api + icon-plus
- - + +
liga:
-
+
- + - icon-assets + icon-check-circle
- - + +
liga:
-
+
- + - icon-bug + icon-check-circle-filled
- - + +
liga:
-
+
- + - icon-caret-down + icon-close
- - + +
liga:
-
+
- + - icon-caret-left + icon-type-References
- - + +
liga:
-
+
- + - icon-caret-right + icon-control-Checkbox
- - + +
liga:
-
+
- + - icon-caret-up + icon-control-Dropdown
- - + +
liga:
-
+
- + - icon-contents + icon-control-Input
- - + +
liga:
-
+
- + - icon-trigger-ContentChanged + icon-control-Radio
- - + +
liga:
-
+
- + - icon-control-Date + icon-control-TextArea
- - + +
liga:
-
+
- + - icon-control-DateTime + icon-control-Toggle
- - + +
liga:
-
+
- + - icon-control-Markdown + icon-copy
- - + +
liga:
-
+
- + - icon-grid + icon-dashboard
- - + +
liga:
-
+
- + - icon-list + icon-delete
- - + +
liga:
-
+
- + - icon-user-o + icon-bin
- - + +
liga:
-
+
- + - icon-rules + icon-delete-filled
- - + +
liga:
-
+
- + - icon-action-Webhook + icon-document-delete
- - + +
liga:
-
-
-

Grid Size: 16

- + - icon-hour-glass + icon-document-disable
- - + +
liga: @@ -514,14 +514,14 @@
-
- - + +
liga: @@ -530,14 +530,14 @@
- + - icon-clock + icon-drag
- - + +
liga: @@ -546,14 +546,14 @@
- + - icon-bin2 + icon-filter
- - + +
liga: @@ -562,30 +562,30 @@
- + - icon-earth + icon-github
- - + +
liga: - +
- + - icon-elapsed + icon-help
- - + +
liga: @@ -594,14 +594,14 @@
- + - icon-google + icon-location
- - + +
liga: @@ -610,14 +610,14 @@
- + - icon-lock + icon-control-Map
- - + +
liga: @@ -626,14 +626,14 @@
- + - icon-microsoft + icon-type-Geolocation
- - + +
liga: @@ -642,14 +642,14 @@
- + - icon-action-AzureQueue + icon-logo
- - + +
liga: @@ -658,14 +658,14 @@
- + - icon-pause + icon-media
- - + +
liga: @@ -674,14 +674,14 @@
- + - icon-play + icon-type-Assets
- - + +
liga: @@ -690,14 +690,14 @@
- + - icon-reset + icon-trigger-AssetChanged
- - + +
liga: @@ -706,14 +706,14 @@
- + - icon-settings2 + icon-more
- - + +
liga: @@ -722,14 +722,14 @@
- + - icon-timeout + icon-dots
- - + +
liga: @@ -738,177 +738,209 @@
- + - icon-unlocked + icon-pencil
- - + +
liga:
-
-
-

Grid Size: Unknown

-
+
- + - icon-circle + icon-reference
- - + +
liga:
-
+
- + - icon-action-Fastly + icon-schemas
- - + + +
+
+ liga: + +
+
+
+
+ + + + icon-search +
+
+ + +
+
+ liga: + +
+
+
+
+ + + + icon-settings +
+
+ +
liga:
-
+
- + - icon-control-Slug + icon-type-Boolean
- - + +
liga:
-
+
- + - icon-action-Algolia + icon-type-DateTime
- - + +
liga:
-
+
- + - icon-type-Tags + icon-type-Json
- - + +
liga:
-
+
- + - icon-activity + icon-json
- - + +
liga:
-
+
- + - icon-history + icon-type-Number
- - + +
liga:
-
+
- + - icon-time + icon-type-String
- - + +
liga:
-
+
- + - icon-add + icon-user
- - + +
liga:
+
+
+

Grid Size: 14

- + - icon-plus + icon-single-content
- - + +
liga: @@ -917,14 +949,14 @@
- + - icon-check-circle + icon-multiple-content
- - + +
liga: @@ -933,14 +965,14 @@
- + - icon-check-circle-filled + icon-type-Array
- - + +
liga: @@ -949,14 +981,14 @@
- + - icon-close + icon-exclamation
- - + +
liga: @@ -965,14 +997,14 @@
- + - icon-type-References + icon-action-ElasticSearch
- - + +
liga: @@ -981,14 +1013,14 @@
- + - icon-control-Checkbox + icon-action-Slack
- - + +
liga: @@ -997,14 +1029,14 @@
- + - icon-control-Dropdown + icon-orleans
- - + +
liga: @@ -1013,14 +1045,14 @@
- + - icon-control-Input + icon-document-lock
- - + +
liga: @@ -1029,14 +1061,14 @@
- + - icon-control-Radio + icon-document-unpublish
- - + +
liga: @@ -1045,14 +1077,14 @@
- + - icon-control-TextArea + icon-angle-down
- - + +
liga: @@ -1061,14 +1093,14 @@
- + - icon-control-Toggle + icon-angle-left
- - + +
liga: @@ -1077,14 +1109,14 @@
- + - icon-copy + icon-angle-right
- - + +
liga: @@ -1093,14 +1125,14 @@
- + - icon-dashboard + icon-angle-up
- - + +
liga: @@ -1109,14 +1141,14 @@
- + - icon-delete + icon-api
- - + +
liga: @@ -1125,14 +1157,14 @@
- + - icon-bin + icon-assets
- - + +
liga: @@ -1141,14 +1173,14 @@
- + - icon-delete-filled + icon-bug
- - + +
liga: @@ -1157,14 +1189,14 @@
- + - icon-document-delete + icon-caret-down
- - + +
liga: @@ -1173,14 +1205,14 @@
- + - icon-document-disable + icon-caret-left
- - + +
liga: @@ -1189,14 +1221,14 @@
- + - icon-document-publish + icon-caret-right
- - + +
liga: @@ -1205,14 +1237,14 @@
- + - icon-drag + icon-caret-up
- - + +
liga: @@ -1221,14 +1253,14 @@
- + - icon-filter + icon-contents
- - + +
liga: @@ -1237,14 +1269,14 @@
- + - icon-github + icon-trigger-ContentChanged
- - + +
liga: @@ -1253,14 +1285,14 @@
- + - icon-help + icon-control-Date
- - + +
liga: @@ -1269,14 +1301,14 @@
- + - icon-location + icon-control-DateTime
- - + +
liga: @@ -1285,14 +1317,14 @@
- + - icon-control-Map + icon-control-Markdown
- - + +
liga: @@ -1301,14 +1333,14 @@
- + - icon-type-Geolocation + icon-grid
- - + +
liga: @@ -1317,14 +1349,14 @@
-
- - + +
liga: @@ -1333,14 +1365,14 @@
- + - icon-media + icon-user-o
- - + +
liga: @@ -1349,14 +1381,14 @@
- + - icon-type-Assets + icon-rules
- - + +
liga: @@ -1365,257 +1397,257 @@
- + - icon-trigger-AssetChanged + icon-action-Webhook
- - + +
liga:
-
+
+
+

Grid Size: 16

+
- + - icon-more + icon-hour-glass
- - + +
liga:
-
+
- + - icon-dots + icon-spinner
- - + +
liga:
-
+
- + - icon-pencil + icon-clock
- - + +
liga:
-
+
- + - icon-reference + icon-bin2
- - + +
liga:
-
+
- + - icon-schemas + icon-earth
- - + +
liga: - +
-
+
- + - icon-search + icon-elapsed
- - + +
liga:
-
+
- + - icon-settings + icon-google
- - + +
liga:
-
+
- + - icon-type-Boolean + icon-lock
- - + +
liga:
-
+
- + - icon-type-DateTime + icon-microsoft
- - + +
liga:
-
+
- + - icon-type-Json + icon-action-AzureQueue
- - + +
liga:
-
+
- + - icon-json + icon-pause
- - + +
liga:
-
+
- + - icon-type-Number + icon-play
- - + +
liga:
-
+
- + - icon-type-String + icon-reset
- - + +
liga:
-
+
- + - icon-user + icon-settings2
- - + +
liga:
-
-
-

Grid Size: 32

- + - icon-browser + icon-timeout
- - + +
liga: @@ -1624,49 +1656,49 @@
- + - icon-checkmark + icon-unlocked
- - + +
liga:
-
+
+
+

Grid Size: 32

+
- + - icon-control-Stars + icon-browser
- - + +
liga:
-
-
-

Grid Size: 24

- + - icon-control-RichText + icon-checkmark
- - + +
liga: @@ -1675,14 +1707,14 @@
- + - icon-download + icon-control-Stars
- - + +
liga: diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.eot b/src/Squidex/app/theme/icomoon/fonts/icomoon.eot index 9e1dac2c57499fbe72b8b1632ff2cfe9062bfb1b..7d47c86cfbdde7923012b3b1973b619ae6ae7d6b 100644 GIT binary patch delta 504 zcmYk2Pe>GT6vyBD&A%O*via%ik5#a77sXW(s@c6%bm$NrOe80?+}+uAafn@aK`B=S z7l{b!(6R(Z*Sc&STJ~ZP5>g^wqKii1F;5;OkPfj!&qL7R%j5ID-*@=FcboX?6RMFk zK-sORF}ZHf>{qTnFy8~f2U04NcZ)yl?+2Cbu9fkZ$@>8K4B*bPmvyIG!--*lDT8t` zj}|&pGQ`)2BVK-f;oj@Ehr}M;JkAv|?#*BE9e~6U`CEB+p$H|M1W2wEpPO~_*%vqT zKg8cC|EO4)n+J&;a8oBfND^*Ur|}6+R*x{OJU{EStThD7-d;iS`(=UOWz;W>sqCQJKW2eI&i|4N zXpGf$uFjdhj=#+j+0dFFHA5cZd{hnS__ew2vFm=x5c(?TtGY1oGca%frJ6Jjry)dT z+SIV6nHOUhtn=-`4wBht_4Hmw%VfJD?mIQXS(JxrT-5w17c7czxOmGPE(9+N-YiqV z!E$4H;+E94KV#REEtihrluW$=_R>%H{>|#)-8iNjk*Os_r@EHd<^zX=VsK+)28N!5iEL&p2RENin&?n2xPyU#VGj@|Bib;`nH1n;t~dCkkW)4 zkURr3Gvm?8DU98W5tBbKDzi=&2;rZ$S%N7wd~<44Ftbe3>CFe@`E9;3aI=6kF + + diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.ttf b/src/Squidex/app/theme/icomoon/fonts/icomoon.ttf index 0f69edbfc429a92253c31c63d373b37cea1dfff7..a1f6fc322e9d7c727343a6f5098a8c5d0297113c 100644 GIT binary patch delta 551 zcmYk2Ur1AN6vxl`-Q9mUoA;;F%O==$p*WR=we2N?pa+RiF}#N9w!5`9Vrzqqa24z# z5kWo_BPe?AW%VL^F$h^j5_^eWGKwDcNhl)eA$IHRA?OE(FQ4;|-}h|1Li-I?0Rf;3 zY!Kl1+=bAThj+iA%u9+yDsL6Pgg@^C;2?1>W0i`eJ;ZlOl}xU3W${V;I`MsgOSiIV z>vC@(76MpxQ$3QUgv!Je@mbeIg4#M#b{Tp@MFn)?xL0mQyj!%p5>D?$aA z0peT4N3U7=^y72tZ{klhaHm)(mFc7OtVE{{g0S@hu$8f8o`RXe7} zTp*Y*4$vDJ31Qgqqv4g0;D9Fe524oxM^9r|69V`jk7^Z^@!ADm5q<|r7CnG0}sebPOg*Ivok4&SXv5!9Pn01}AAota|UU!0AXF+_% z_2XS| o)7s2R6q5~mm#j~`6v6WfzFCby}lbH8Mx6?=_;0X?sR-2eap delta 289 zcmZoT%-C~~v7UjEfq{XWp@D&!!N5OQ--us`cLz{p4-h9L=Oz~1Hoof#EJrja>ghi{|Jz;ke8U7I@62u zH<14XsG+SOzqkbGP#{Ri0m(BkGasFJpqnvbvJay&>tult{%M;_7*oSHAB+rUmPtCj z`CvT1%~u9)7LXQ(>k%qTVDw~zSaZgN%^9)PjFVr-9puyT(q+^20?LAdBVqHt_(O~U D$`(pc diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.woff b/src/Squidex/app/theme/icomoon/fonts/icomoon.woff index 29c443eeb91db9691b96965c9b834b50aaa4af6b..9d034ac442e95e82885cd7334e713e229a76aaff 100644 GIT binary patch delta 607 zcmYk4PiPZC6vp41&F*GtwB5t+mM})&xmRAw?S% z5{ihR2PFy>&%MN6N<8SLq=-dIKm@VkpQAl_5{d`O>f55?z>k^t@y#2)$9&kr)=TtU zn;0Jl1X^YbIu7<~Z7bz}5b;!AWD4dY0Om-}+kA?C+{>CJTYE>f^ABCweEAY-p8?L_ zw3&XAyqa4uF9KYcAy3T49hx7`kx1Hos*ll&G5F(<1@<7#bRlR(yagU33L*K?V1bk;%sdd zL*k<@qjR;<#D%jJJNkeF1Op-f?pWV2M)e@-UimQkRmsC9Vi@=lqt4TVc3)l%?>nsB(}c2jma5}Z#;P6gk# zpI6vvtL)O070y=_&4sUkfdMGgg=shh0m|f&Lb|LTkB#WZd|p4H_UpZUW2md_eSlj= zUE?gw19h&|tuWVE7@u-&of%xycva)=Dj5u{QeXJhq@Ya*LW%nJQbJj3oH#cobbrZ4 zHzBT>Y6=J+zouB7k(!vozz_pe%U}k=!hF3aGk}6Xu@ykR z3J7yDu_k8ZmQ(=6&H(i{fN;`M5xt!JWS}~~I3J**Lm;dy$8DFJSOGLFUI55f0ONAT zsJz77RG^pvP-7bi&-CK_U65Z~0`$!exH@Jai<$Z8WFE$D#)!!?7?oKk3xx1b+kAjA zHGDH~R4}tl(&^0y Date: Thu, 5 Jul 2018 11:46:21 +0200 Subject: [PATCH 3/5] Slack links improved. --- .../features/apps/pages/onboarding-dialog.component.html | 4 ++-- .../features/dashboard/pages/dashboard-page.component.html | 4 ++-- .../features/dashboard/pages/dashboard-page.component.scss | 2 +- .../features/dashboard/pages/dashboard-page.component.ts | 6 ------ 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/Squidex/app/features/apps/pages/onboarding-dialog.component.html b/src/Squidex/app/features/apps/pages/onboarding-dialog.component.html index e8c29068a..e2f51d47c 100644 --- a/src/Squidex/app/features/apps/pages/onboarding-dialog.component.html +++ b/src/Squidex/app/features/apps/pages/onboarding-dialog.component.html @@ -132,8 +132,8 @@

- +
-

Feedback

+

Feedback & Support

Provide feedback and request features to help us to improve Squidex. diff --git a/src/Squidex/app/features/dashboard/pages/dashboard-page.component.scss b/src/Squidex/app/features/dashboard/pages/dashboard-page.component.scss index 6a898a0e2..d03055a87 100644 --- a/src/Squidex/app/features/dashboard/pages/dashboard-page.component.scss +++ b/src/Squidex/app/features/dashboard/pages/dashboard-page.component.scss @@ -65,7 +65,7 @@ color: $color-title; font-weight: light; font-size: 1.2rem; - margin-top: .4rem; + margin-top: 1rem; } &-href { diff --git a/src/Squidex/app/features/dashboard/pages/dashboard-page.component.ts b/src/Squidex/app/features/dashboard/pages/dashboard-page.component.ts index b561445b0..a87b1323b 100644 --- a/src/Squidex/app/features/dashboard/pages/dashboard-page.component.ts +++ b/src/Squidex/app/features/dashboard/pages/dashboard-page.component.ts @@ -20,8 +20,6 @@ import { UsagesService } from '@app/shared'; -declare var _urq: any; - @Component({ selector: 'sqx-dashboard-page', styleUrls: ['./dashboard-page.component.scss'], @@ -175,10 +173,6 @@ export class DashboardPageComponent implements OnDestroy, OnInit { }; })); } - - public showForum() { - _urq.push(['Feedback_Open']); - } } function createLabels(dtos: { date: DateTime }[]): string[] { From 8e39ec198df0e00b67b564d8e51e37eca5e44eff Mon Sep 17 00:00:00 2001 From: Sebastian Date: Fri, 6 Jul 2018 12:21:11 +0200 Subject: [PATCH 4/5] 1) Fix singletons 2) Fix modals. --- .../Contents/Guards/GuardContent.cs | 3 +- .../Contents/SingletonCommandMiddleware.cs | 2 +- .../event-consumers-page.component.ts | 4 +- .../apps/pages/apps-page.component.ts | 7 +- .../pages/content/content-page.component.html | 2 +- .../pages/content/content-page.component.ts | 4 +- .../pages/contents/contents-page.component.ts | 4 +- .../pages/contents/search-form.component.ts | 4 +- .../content/shared/assets-editor.component.ts | 6 +- .../shared/content-item.component.html | 2 +- .../content/shared/content-item.component.ts | 4 +- .../shared/contents-selector.component.ts | 4 +- .../shared/due-time-selector.component.ts | 4 +- .../rules/pages/rules/rules-page.component.ts | 4 +- .../schemas/pages/schema/field.component.html | 2 +- .../schemas/pages/schema/field.component.ts | 7 +- .../pages/schema/schema-page.component.ts | 13 +-- .../types/string-validation.component.ts | 4 +- .../pages/schemas/schemas-page.component.ts | 4 +- .../pages/clients/client.component.ts | 4 +- .../angular/forms/dropdown.component.ts | 4 +- .../modals/dialog-renderer.component.ts | 4 +- .../angular/modals/modal-view.directive.ts | 59 +++++++---- .../modals/onboarding-tooltip.component.ts | 4 +- .../angular/modals/tooltip.component.ts | 4 +- .../app/framework/utils/modal-view.spec.ts | 100 ++++++++++++------ src/Squidex/app/framework/utils/modal-view.ts | 77 +++++++++----- .../app/shared/components/asset.component.ts | 4 +- .../language-selector.component.html | 2 +- .../components/language-selector.component.ts | 4 +- .../components/markdown-editor.component.ts | 8 +- .../components/rich-editor.component.ts | 8 +- .../schema-must-exist-published.guard.spec.ts | 8 +- .../schema-must-exist-published.guard.ts | 6 +- .../pages/internal/apps-menu.component.html | 2 +- .../pages/internal/apps-menu.component.ts | 7 +- .../internal/profile-menu.component.html | 2 +- .../pages/internal/profile-menu.component.ts | 4 +- .../Contents/Guard/GuardContentTests.cs | 4 +- 39 files changed, 241 insertions(+), 158 deletions(-) diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Guards/GuardContent.cs b/src/Squidex.Domain.Apps.Entities/Contents/Guards/GuardContent.cs index 8c02f6d88..cdb0b309a 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/Guards/GuardContent.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/Guards/GuardContent.cs @@ -5,7 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; using NodaTime; using Squidex.Domain.Apps.Core.Contents; using Squidex.Domain.Apps.Entities.Contents.Commands; @@ -25,7 +24,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Guards ValidateData(command, e); }); - if (schema.IsSingleton && command.ContentId != Guid.Empty) + if (schema.IsSingleton && command.ContentId != schema.Id) { throw new DomainException("Singleton content cannot be created."); } diff --git a/src/Squidex.Domain.Apps.Entities/Contents/SingletonCommandMiddleware.cs b/src/Squidex.Domain.Apps.Entities/Contents/SingletonCommandMiddleware.cs index 6dd070600..435094d5f 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/SingletonCommandMiddleware.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/SingletonCommandMiddleware.cs @@ -30,7 +30,7 @@ namespace Squidex.Domain.Apps.Entities.Contents var data = new NamedContentData(); - var contentId = Guid.Empty; + var contentId = schemaId.Id; var content = new CreateContent { Data = data, ContentId = contentId, SchemaId = schemaId, Publish = true }; SimpleMapper.Map(context.Command, content); diff --git a/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.ts b/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.ts index 2813e338f..30161a18b 100644 --- a/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.ts +++ b/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.ts @@ -9,7 +9,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { Subscription, timer } from 'rxjs'; import { onErrorResumeNext, switchMap } from 'rxjs/operators'; -import { ModalView } from '@app/shared'; +import { DialogModel } from '@app/shared'; import { EventConsumerDto } from './../../services/event-consumers.service'; import { EventConsumersState } from './../../state/event-consumers.state'; @@ -22,7 +22,7 @@ import { EventConsumersState } from './../../state/event-consumers.state'; export class EventConsumersPageComponent implements OnDestroy, OnInit { private timerSubscription: Subscription; - public eventConsumerErrorDialog = new ModalView(); + public eventConsumerErrorDialog = new DialogModel(); public eventConsumerError = ''; constructor( diff --git a/src/Squidex/app/features/apps/pages/apps-page.component.ts b/src/Squidex/app/features/apps/pages/apps-page.component.ts index 93a2d5fa6..c081ccb84 100644 --- a/src/Squidex/app/features/apps/pages/apps-page.component.ts +++ b/src/Squidex/app/features/apps/pages/apps-page.component.ts @@ -11,7 +11,8 @@ import { take } from 'rxjs/operators'; import { AppsState, AuthService, - ModalView, + DialogModel, + ModalModel, OnboardingService } from '@app/shared'; @@ -21,10 +22,10 @@ import { templateUrl: './apps-page.component.html' }) export class AppsPageComponent implements OnInit { - public addAppDialog = new ModalView(); + public addAppDialog = new DialogModel(); public addAppTemplate = ''; - public onboardingModal = new ModalView(); + public onboardingModal = new ModalModel(); constructor( public readonly appsState: AppsState, diff --git a/src/Squidex/app/features/content/pages/content/content-page.component.html b/src/Squidex/app/features/content/pages/content/content-page.component.html index cdf90089e..415781eb6 100644 --- a/src/Squidex/app/features/content/pages/content/content-page.component.html +++ b/src/Squidex/app/features/content/pages/content/content-page.component.html @@ -44,7 +44,7 @@ -
+
Discard changes diff --git a/src/Squidex/app/features/content/pages/content/content-page.component.ts b/src/Squidex/app/features/content/pages/content/content-page.component.ts index 63b1354cb..d8466fdcd 100644 --- a/src/Squidex/app/features/content/pages/content/content-page.component.ts +++ b/src/Squidex/app/features/content/pages/content/content-page.component.ts @@ -24,7 +24,7 @@ import { ImmutableArray, LanguagesState, MessageBus, - ModalView, + ModalModel, SchemaDetailsDto, SchemasState, Version @@ -52,7 +52,7 @@ export class ContentPageComponent implements CanComponentDeactivate, OnDestroy, public contentVersion: Version | null; public contentForm: EditContentForm; - public dropdown = new ModalView(false, true); + public dropdown = new ModalModel(); public language: AppLanguageDto; public languages: ImmutableArray; diff --git a/src/Squidex/app/features/content/pages/contents/contents-page.component.ts b/src/Squidex/app/features/content/pages/contents/contents-page.component.ts index eabb9bf18..c5732e2b7 100644 --- a/src/Squidex/app/features/content/pages/contents/contents-page.component.ts +++ b/src/Squidex/app/features/content/pages/contents/contents-page.component.ts @@ -16,7 +16,7 @@ import { ContentsState, ImmutableArray, LanguagesState, - ModalView, + ModalModel, SchemaDetailsDto, SchemasState } from '@app/shared'; @@ -35,7 +35,7 @@ export class ContentsPageComponent implements OnDestroy, OnInit { public schema: SchemaDetailsDto; - public searchModal = new ModalView(); + public searchModal = new ModalModel(); public selectedItems: { [id: string]: boolean; } = {}; public selectionCount = 0; diff --git a/src/Squidex/app/features/content/pages/contents/search-form.component.ts b/src/Squidex/app/features/content/pages/contents/search-form.component.ts index 3970fa944..babf2991b 100644 --- a/src/Squidex/app/features/content/pages/contents/search-form.component.ts +++ b/src/Squidex/app/features/content/pages/contents/search-form.component.ts @@ -8,7 +8,7 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, Output } from '@angular/core'; import { FormBuilder, FormControl } from '@angular/forms'; -import { ModalView } from '@app/shared'; +import { ModalModel } from '@app/shared'; @Component({ selector: 'sqx-search-form', @@ -40,7 +40,7 @@ export class SearchFormComponent implements OnChanges { public contentsFilter = new FormControl(); - public searchModal = new ModalView(); + public searchModal = new ModalModel(); public searchForm = this.formBuilder.group({ odataOrderBy: '', diff --git a/src/Squidex/app/features/content/shared/assets-editor.component.ts b/src/Squidex/app/features/content/shared/assets-editor.component.ts index 155beccb4..7092cfcf7 100644 --- a/src/Squidex/app/features/content/shared/assets-editor.component.ts +++ b/src/Squidex/app/features/content/shared/assets-editor.component.ts @@ -15,7 +15,7 @@ import { AssetDto, AssetsService, ImmutableArray, - ModalView, + ModalModel, Types } from '@app/shared'; @@ -35,7 +35,7 @@ export class AssetsEditorComponent implements ControlValueAccessor { private callChange = (v: any) => { /* NOOP */ }; private callTouched = () => { /* NOOP */ }; - public selectorModal = new ModalView(); + public assetsDialog = new ModalModel(); public newAssets = ImmutableArray.empty(); public oldAssets = ImmutableArray.empty(); @@ -96,7 +96,7 @@ export class AssetsEditorComponent implements ControlValueAccessor { this.updateValue(); } - this.selectorModal.hide(); + this.assetsDialog.hide(); } public onAssetRemoving(asset: AssetDto) { diff --git a/src/Squidex/app/features/content/shared/content-item.component.html b/src/Squidex/app/features/content/shared/content-item.component.html index ef7dfb3e9..fe2a1e4ad 100644 --- a/src/Squidex/app/features/content/shared/content-item.component.html +++ b/src/Squidex/app/features/content/shared/content-item.component.html @@ -86,7 +86,7 @@ -
+
Publish diff --git a/src/Squidex/app/features/content/shared/content-item.component.ts b/src/Squidex/app/features/content/shared/content-item.component.ts index 68f18d763..fb94ecd00 100644 --- a/src/Squidex/app/features/content/shared/content-item.component.ts +++ b/src/Squidex/app/features/content/shared/content-item.component.ts @@ -14,7 +14,7 @@ import { fadeAnimation, FieldFormatter, fieldInvariant, - ModalView, + ModalModel, PatchContentForm, RootFieldDto, SchemaDetailsDto, @@ -70,7 +70,7 @@ export class ContentItemComponent implements OnChanges { public patchForm: PatchContentForm; - public dropdown = new ModalView(false, true); + public dropdown = new ModalModel(); public values: any[] = []; diff --git a/src/Squidex/app/features/content/shared/contents-selector.component.ts b/src/Squidex/app/features/content/shared/contents-selector.component.ts index aaa5169f2..bfb764f39 100644 --- a/src/Squidex/app/features/content/shared/contents-selector.component.ts +++ b/src/Squidex/app/features/content/shared/contents-selector.component.ts @@ -12,7 +12,7 @@ import { ContentDto, LanguageDto, ManualContentsState, - ModalView, + ModalModel, SchemaDetailsDto } from '@app/shared'; @@ -37,7 +37,7 @@ export class ContentsSelectorComponent implements OnInit { @Output() public selected = new EventEmitter(); - public searchModal = new ModalView(); + public searchModal = new ModalModel(); public selectedItems: { [id: string]: ContentDto; } = {}; public selectionCount = 0; diff --git a/src/Squidex/app/features/content/shared/due-time-selector.component.ts b/src/Squidex/app/features/content/shared/due-time-selector.component.ts index 2f904fba4..7bef86cb4 100644 --- a/src/Squidex/app/features/content/shared/due-time-selector.component.ts +++ b/src/Squidex/app/features/content/shared/due-time-selector.component.ts @@ -8,7 +8,7 @@ import { Component } from '@angular/core'; import { Observable, Subject } from 'rxjs'; -import { fadeAnimation, ModalView } from '@app/shared'; +import { DialogModel, fadeAnimation } from '@app/shared'; @Component({ selector: 'sqx-due-time-selector', @@ -19,7 +19,7 @@ import { fadeAnimation, ModalView } from '@app/shared'; ] }) export class DueTimeSelectorComponent { - public dueTimeDialog = new ModalView(); + public dueTimeDialog = new DialogModel(); public dueTime: string | null = ''; public dueTimeFunction: Subject; public dueTimeAction: string | null = ''; diff --git a/src/Squidex/app/features/rules/pages/rules/rules-page.component.ts b/src/Squidex/app/features/rules/pages/rules/rules-page.component.ts index 8884fd630..0e6f54017 100644 --- a/src/Squidex/app/features/rules/pages/rules/rules-page.component.ts +++ b/src/Squidex/app/features/rules/pages/rules/rules-page.component.ts @@ -10,7 +10,7 @@ import { onErrorResumeNext } from 'rxjs/operators'; import { AppsState, - ModalView, + DialogModel, ruleActions, RuleDto, RulesState, @@ -27,7 +27,7 @@ export class RulesPageComponent implements OnInit { public ruleActions = ruleActions; public ruleTriggers = ruleTriggers; - public addRuleDialog = new ModalView(); + public addRuleDialog = new DialogModel(); public wizardMode = 'Wizard'; public wizardRule: RuleDto | null; diff --git a/src/Squidex/app/features/schemas/pages/schema/field.component.html b/src/Squidex/app/features/schemas/pages/schema/field.component.html index 28376f957..3705f6d56 100644 --- a/src/Squidex/app/features/schemas/pages/schema/field.component.html +++ b/src/Squidex/app/features/schemas/pages/schema/field.component.html @@ -121,7 +121,7 @@
- + diff --git a/src/Squidex/app/features/schemas/pages/schema/field.component.ts b/src/Squidex/app/features/schemas/pages/schema/field.component.ts index 4d8700237..4f9ea9a89 100644 --- a/src/Squidex/app/features/schemas/pages/schema/field.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/field.component.ts @@ -12,10 +12,11 @@ import { onErrorResumeNext } from 'rxjs/operators'; import { AppPatternDto, createProperties, + DialogModel, EditFieldForm, fadeAnimation, ImmutableArray, - ModalView, + ModalModel, NestedFieldDto, RootFieldDto, SchemaDetailsDto, @@ -44,14 +45,14 @@ export class FieldComponent implements OnInit { @Input() public patterns: ImmutableArray; - public dropdown = new ModalView(false, true); + public dropdown = new ModalModel(); public isEditing = false; public selectedTab = 0; public editForm: EditFieldForm; - public addFieldDialog = new ModalView(); + public addFieldDialog = new DialogModel(); constructor( private readonly formBuilder: FormBuilder, diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts index a912125ca..92ab4699e 100644 --- a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts @@ -14,11 +14,12 @@ import { filter, map, onErrorResumeNext } from 'rxjs/operators'; import { AppsState, + DialogModel, fadeAnimation, FieldDto, fieldTypes, MessageBus, - ModalView, + ModalModel, PatternsState, SchemaDetailsDto, SchemasState, @@ -45,14 +46,14 @@ export class SchemaPageComponent implements OnDestroy, OnInit { public schemaExport: any; public schema: SchemaDetailsDto; - public exportSchemaDialog = new ModalView(); + public exportSchemaDialog = new DialogModel(); - public configureScriptsDialog = new ModalView(); + public configureScriptsDialog = new DialogModel(); - public editOptionsDropdown = new ModalView(); - public editSchemaDialog = new ModalView(); + public editOptionsDropdown = new ModalModel(); + public editSchemaDialog = new DialogModel(); - public addFieldDialog = new ModalView(); + public addFieldDialog = new DialogModel(); constructor( public readonly appsState: AppsState, diff --git a/src/Squidex/app/features/schemas/pages/schema/types/string-validation.component.ts b/src/Squidex/app/features/schemas/pages/schema/types/string-validation.component.ts index 392fa8a1a..22f64ffaa 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/string-validation.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/types/string-validation.component.ts @@ -14,7 +14,7 @@ import { AppPatternDto, FieldDto, ImmutableArray, - ModalView, + ModalModel, StringFieldPropertiesDto } from '@app/shared'; @@ -43,7 +43,7 @@ export class StringValidationComponent implements OnDestroy, OnInit { public showPatternSuggestions: Observable; public patternName: string; - public patternsModal = new ModalView(false, false); + public patternsModal = new ModalModel(); public ngOnDestroy() { this.patternSubscription.unsubscribe(); diff --git a/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.ts b/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.ts index 87af6628b..5414d50ee 100644 --- a/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.ts +++ b/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.ts @@ -14,8 +14,8 @@ import { map, onErrorResumeNext } from 'rxjs/operators'; import { AppsState, CreateCategoryForm, + DialogModel, MessageBus, - ModalView, SchemaDto, SchemasState } from '@app/shared'; @@ -30,7 +30,7 @@ import { SchemaCloning } from './../messages'; export class SchemasPageComponent implements OnDestroy, OnInit { private schemaCloningSubscription: Subscription; - public addSchemaDialog = new ModalView(); + public addSchemaDialog = new DialogModel(); public addCategoryForm = new CreateCategoryForm(this.formBuilder); public schemasFilter = new FormControl(); diff --git a/src/Squidex/app/features/settings/pages/clients/client.component.ts b/src/Squidex/app/features/settings/pages/clients/client.component.ts index 445860bf0..220ebdf44 100644 --- a/src/Squidex/app/features/settings/pages/clients/client.component.ts +++ b/src/Squidex/app/features/settings/pages/clients/client.component.ts @@ -15,8 +15,8 @@ import { AppClientsService, AppsState, ClientsState, + DialogModel, DialogService, - ModalView, RenameClientForm, UpdateAppClientDto } from '@app/shared'; @@ -37,7 +37,7 @@ export class ClientComponent implements OnChanges { public isRenaming = false; public token: AccessTokenDto; - public tokenDialog = new ModalView(); + public tokenDialog = new DialogModel(); public renameForm = new RenameClientForm(this.formBuilder); diff --git a/src/Squidex/app/framework/angular/forms/dropdown.component.ts b/src/Squidex/app/framework/angular/forms/dropdown.component.ts index 8abf7d748..4788bce5a 100644 --- a/src/Squidex/app/framework/angular/forms/dropdown.component.ts +++ b/src/Squidex/app/framework/angular/forms/dropdown.component.ts @@ -13,7 +13,7 @@ const KEY_ESCAPE = 27; const KEY_UP = 38; const KEY_DOWN = 40; -import { ModalView } from '@app/framework/internal'; +import { ModalModel } from '@app/framework/internal'; export const SQX_DROPDOWN_CONTROL_VALUE_ACCESSOR: any = { provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => DropdownComponent), multi: true @@ -35,7 +35,7 @@ export class DropdownComponent implements AfterContentInit, ControlValueAccessor @ContentChildren(TemplateRef) public templates: QueryList; - public dropdown = new ModalView(); + public dropdown = new ModalModel(); public selectedItem: any; public selectedIndex = -1; diff --git a/src/Squidex/app/framework/angular/modals/dialog-renderer.component.ts b/src/Squidex/app/framework/angular/modals/dialog-renderer.component.ts index 31f1f8b9b..2dabc425a 100644 --- a/src/Squidex/app/framework/angular/modals/dialog-renderer.component.ts +++ b/src/Squidex/app/framework/angular/modals/dialog-renderer.component.ts @@ -9,10 +9,10 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; import { Subscription } from 'rxjs'; import { + DialogModel, DialogRequest, DialogService, fadeAnimation, - ModalView, Notification } from '@app/framework/internal'; @@ -29,7 +29,7 @@ export class DialogRendererComponent implements OnDestroy, OnInit { private dialogsSubscription: Subscription; private notificationsSubscription: Subscription; - public dialogView = new ModalView(false, true); + public dialogView = new DialogModel(); public dialogRequest: DialogRequest | null = null; public notifications: Notification[] = []; diff --git a/src/Squidex/app/framework/angular/modals/modal-view.directive.ts b/src/Squidex/app/framework/angular/modals/modal-view.directive.ts index 895a8873f..160488675 100644 --- a/src/Squidex/app/framework/angular/modals/modal-view.directive.ts +++ b/src/Squidex/app/framework/angular/modals/modal-view.directive.ts @@ -8,7 +8,11 @@ import { Directive, EmbeddedViewRef, Input, OnChanges, OnDestroy, Renderer2, SimpleChanges, TemplateRef, ViewContainerRef } from '@angular/core'; import { Subscription } from 'rxjs'; -import { ModalView, Types } from '@app/framework/internal'; +import { + DialogModel, + ModalModel, + Types +} from '@app/framework/internal'; import { RootViewComponent } from './root-view.component'; @@ -21,7 +25,7 @@ export class ModalViewDirective implements OnChanges, OnDestroy { private renderedView: EmbeddedViewRef | null = null; @Input('sqxModalView') - public modalView: ModalView | any; + public modalView: DialogModel | ModalModel | any; @Input('sqxModalViewOnRoot') public placeOnRoot = false; @@ -29,6 +33,9 @@ export class ModalViewDirective implements OnChanges, OnDestroy { @Input('sqxModalViewCloseAuto') public closeAuto = true; + @Input('sqxModalViewCloseAlways') + public closeAlways = false; + constructor( private readonly templateRef: TemplateRef, private readonly renderer: Renderer2, @@ -38,9 +45,10 @@ export class ModalViewDirective implements OnChanges, OnDestroy { } public ngOnDestroy() { - this.stopListening(); + this.unsubscribeToModal(); + this.unsubscribeToClick(); - if (Types.is(this.modalView, ModalView)) { + if (Types.is(this.modalView, DialogModel) || Types.is(this.modalView, ModalModel)) { this.modalView.hide(); } } @@ -50,12 +58,9 @@ export class ModalViewDirective implements OnChanges, OnDestroy { return; } - if (this.subscription) { - this.subscription.unsubscribe(); - this.subscription = null; - } + this.unsubscribeToModal(); - if (Types.is(this.modalView, ModalView)) { + if (Types.is(this.modalView, DialogModel) || Types.is(this.modalView, ModalModel)) { this.subscription = this.modalView.isOpen.subscribe(isOpen => { this.update(isOpen); @@ -71,11 +76,9 @@ export class ModalViewDirective implements OnChanges, OnDestroy { } if (isOpen && !this.renderedView) { - if (this.placeOnRoot) { - this.renderedView = this.rootView.viewContainer.createEmbeddedView(this.templateRef); - } else { - this.renderedView = this.viewContainer.createEmbeddedView(this.templateRef); - } + const container = this.getContainer(); + + this.renderedView = container.createEmbeddedView(this.templateRef); if (this.renderedView.rootNodes[0].style) { this.renderer.setStyle(this.renderedView.rootNodes[0], 'display', 'block'); @@ -85,18 +88,21 @@ export class ModalViewDirective implements OnChanges, OnDestroy { this.startListening(); }); } else if (!isOpen && this.renderedView) { - this.renderedView = null; + const container = this.getContainer(); + const containerIndex = container.indexOf(this.renderedView); - if (this.placeOnRoot) { - this.rootView.viewContainer.clear(); - } else { - this.viewContainer.clear(); - } + container.remove(containerIndex); - this.stopListening(); + this.renderedView = null; + + this.unsubscribeToClick(); } } + private getContainer() { + return this.placeOnRoot ? this.rootView.viewContainer : this.viewContainer; + } + private startListening() { if (!this.closeAuto) { return; @@ -112,7 +118,7 @@ export class ModalViewDirective implements OnChanges, OnDestroy { return; } - if (this.modalView.closeAlways) { + if (this.closeAlways) { this.modalView.hide(); } else { try { @@ -133,7 +139,14 @@ export class ModalViewDirective implements OnChanges, OnDestroy { }); } - private stopListening() { + private unsubscribeToModal() { + if (this.subscription) { + this.subscription.unsubscribe(); + this.subscription = null; + } + } + + private unsubscribeToClick() { if (this.documentClickListener) { this.documentClickListener(); this.documentClickListener = null; diff --git a/src/Squidex/app/framework/angular/modals/onboarding-tooltip.component.ts b/src/Squidex/app/framework/angular/modals/onboarding-tooltip.component.ts index ba3347821..b6cee0c64 100644 --- a/src/Squidex/app/framework/angular/modals/onboarding-tooltip.component.ts +++ b/src/Squidex/app/framework/angular/modals/onboarding-tooltip.component.ts @@ -9,7 +9,7 @@ import { Component, Input, OnDestroy, OnInit, Renderer2 } from '@angular/core'; import { fadeAnimation, - ModalView, + ModalModel, OnboardingService, Types } from '@app/framework/internal'; @@ -27,7 +27,7 @@ export class OnboardingTooltipComponent implements OnDestroy, OnInit { private closeTimer: any; private forMouseDownListener: Function | null; - public tooltipModal = new ModalView(); + public tooltipModal = new ModalModel(); @Input() public for: any; diff --git a/src/Squidex/app/framework/angular/modals/tooltip.component.ts b/src/Squidex/app/framework/angular/modals/tooltip.component.ts index 0dc5c3898..69759bbbe 100644 --- a/src/Squidex/app/framework/angular/modals/tooltip.component.ts +++ b/src/Squidex/app/framework/angular/modals/tooltip.component.ts @@ -7,7 +7,7 @@ import { ChangeDetectionStrategy, Component, Input, OnDestroy, OnInit, Renderer2 } from '@angular/core'; -import { ModalView } from './../../utils/modal-view'; +import { ModalModel } from './../../utils/modal-view'; import { fadeAnimation } from './../animations'; @@ -30,7 +30,7 @@ export class TooltipComponent implements OnDestroy, OnInit { @Input() public position = 'topLeft'; - public modal = new ModalView(false, false); + public modal = new ModalModel(); constructor( private readonly renderer: Renderer2 diff --git a/src/Squidex/app/framework/utils/modal-view.spec.ts b/src/Squidex/app/framework/utils/modal-view.spec.ts index 6b1e23438..6f19b71a3 100644 --- a/src/Squidex/app/framework/utils/modal-view.spec.ts +++ b/src/Squidex/app/framework/utils/modal-view.spec.ts @@ -5,75 +5,115 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ModalView } from './modal-view'; +import { DialogModel, ModalModel, Openable } from './modal-view'; -describe('ModalView', () => { +describe('DialogModel', () => { it('should have default values', () => { - const dialog = new ModalView(); + const dialog = new DialogModel(); checkValue(dialog, false); + }); + + it('should become open after show', () => { + const dialog = new DialogModel(); + + dialog.show(); - expect(dialog.closeAlways).toBeFalsy(); + checkValue(dialog, true); }); - it('should have initial true value', () => { - const dialog = new ModalView(true); + it('should become open after toggle', () => { + const dialog = new DialogModel(); + + dialog.toggle(); checkValue(dialog, true); }); - it('should have initial false value', () => { - const dialog = new ModalView(false); + it('should become closed after hide', () => { + const dialog = new DialogModel().show(); + + dialog.hide(); checkValue(dialog, false); }); - it('should have close always set by constructor', () => { - const dialog = new ModalView(false, true); + it('should become closed after toggle', () => { + const dialog = new DialogModel().show(); + + dialog.toggle(); - expect(dialog.closeAlways).toBeTruthy(); + checkValue(dialog, false); + }); + + it('should not hide other dialog', () => { + const dialog1 = new DialogModel().show(); + const dialog2 = new DialogModel(); + + dialog2.toggle(); + + checkValue(dialog1, true); + checkValue(dialog2, true); + }); +}); + +describe('ModalModel', () => { + it('should have default values', () => { + const modal = new ModalModel(); + + checkValue(modal, false); }); it('should become open after show', () => { - const dialog = new ModalView(false); + const modal = new ModalModel(); - dialog.show(); + modal.show(); - checkValue(dialog, true); + checkValue(modal, true); }); it('should become open after toggle', () => { - const dialog = new ModalView(false); + const modal = new ModalModel(); - dialog.toggle(); + modal.toggle(); - checkValue(dialog, true); + checkValue(modal, true); }); it('should become closed after hide', () => { - const dialog = new ModalView(true); + const modal = new ModalModel().show(); - dialog.hide(); + modal.hide(); - checkValue(dialog, false); + checkValue(modal, false); }); it('should become closed after toggle', () => { - const dialog = new ModalView(true); + const modal = new ModalModel().show(); - dialog.toggle(); + modal.toggle(); - checkValue(dialog, false); + checkValue(modal, false); }); - function checkValue(dialog: ModalView, expected: boolean) { - let result: boolean; + it('should hide other modal', () => { + const modal1 = new ModalModel().show(); + const modal2 = new ModalModel(); - dialog.isOpen.subscribe(value => { - result = value; - }).unsubscribe(); + modal2.toggle(); - expect(result!).toBe(expected); - } + checkValue(modal1, false); + checkValue(modal2, true); + }); }); +function checkValue(modal: Openable, expected: boolean) { + let result: boolean; + + modal.isOpen.subscribe(value => { + result = value; + }).unsubscribe(); + + expect(result!).toBe(expected); +} + diff --git a/src/Squidex/app/framework/utils/modal-view.ts b/src/Squidex/app/framework/utils/modal-view.ts index a999d4ed8..a77cda5f6 100644 --- a/src/Squidex/app/framework/utils/modal-view.ts +++ b/src/Squidex/app/framework/utils/modal-view.ts @@ -7,49 +7,78 @@ import { BehaviorSubject, Observable } from 'rxjs'; -export class ModalView { - private readonly isOpen$: BehaviorSubject; - private static openView: ModalView | null = null; +export interface Openable { + isOpen: Observable; +} + +export class DialogModel implements Openable { + private readonly isOpen$ = new BehaviorSubject(false); public get isOpen(): Observable { return this.isOpen$; } - constructor(isOpen = false, - public readonly closeAlways: boolean = false - ) { - this.isOpen$ = new BehaviorSubject(isOpen); + public show(): DialogModel { + this.isOpen$.next(true); + + return this; } - public show() { - if (ModalView.openView !== this && ModalView.openView) { - ModalView.openView.hide(); - } + public hide(): DialogModel { + this.isOpen$.next(false); - ModalView.openView = this; + return this; + } - this.isOpen$.next(true); + public toggle(): DialogModel { + this.isOpen$.next(!this.isOpen$.value); + + return this; } +} + +export class ModalModel implements Openable { + private readonly isOpen$ = new BehaviorSubject(false); - public hide() { - if (ModalView.openView === this) { - ModalView.openView = null; + public get isOpen(): Observable { + return this.isOpen$; + } + + public show(): ModalModel { + if (!this.isOpen$.value) { + if (openModal && openModal !== this) { + openModal.hide(); + } + + openModal = this; + + this.isOpen$.next(true); } - this.isOpen$.next(false); + return this; } - public toggle() { - let isOpenSnapshot = false; + public hide(): ModalModel { + if (this.isOpen$.value) { + if (openModal === this) { + openModal = null; + } - this.isOpen.subscribe(v => { - isOpenSnapshot = v; - }).unsubscribe(); + this.isOpen$.next(false); + } + + return this; + } - if (isOpenSnapshot) { + public toggle(): ModalModel { + if (this.isOpen$.value) { this.hide(); } else { this.show(); } + + return this; } -} \ No newline at end of file +} + +let openModal: ModalModel | null = null; \ No newline at end of file diff --git a/src/Squidex/app/shared/components/asset.component.ts b/src/Squidex/app/shared/components/asset.component.ts index 919a56a30..583cd8e95 100644 --- a/src/Squidex/app/shared/components/asset.component.ts +++ b/src/Squidex/app/shared/components/asset.component.ts @@ -14,9 +14,9 @@ import { AssetsService, AuthService, DateTime, + DialogModel, DialogService, fadeAnimation, - ModalView, RenameAssetForm, Types, UpdateAssetDto, @@ -68,7 +68,7 @@ export class AssetComponent implements OnInit { @Output() public failed = new EventEmitter(); - public renameDialog = new ModalView(); + public renameDialog = new DialogModel(); public renameForm = new RenameAssetForm(this.formBuilder); public progress = 0; diff --git a/src/Squidex/app/shared/components/language-selector.component.html b/src/Squidex/app/shared/components/language-selector.component.html index 466bc2802..f0f18e0ae 100644 --- a/src/Squidex/app/shared/components/language-selector.component.html +++ b/src/Squidex/app/shared/components/language-selector.component.html @@ -8,7 +8,7 @@ -
+
{{language.iso2Code}}     ({{language.englishName}})
diff --git a/src/Squidex/app/shared/components/language-selector.component.ts b/src/Squidex/app/shared/components/language-selector.component.ts index eb3637bb3..3dc2783ff 100644 --- a/src/Squidex/app/shared/components/language-selector.component.ts +++ b/src/Squidex/app/shared/components/language-selector.component.ts @@ -7,7 +7,7 @@ import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core'; -import { fadeAnimation, ModalView } from '@app/shared/internal'; +import { fadeAnimation, ModalModel } from '@app/shared/internal'; export interface Language { iso2Code: string; englishName: string; isMasterLanguage: true; } @@ -20,7 +20,7 @@ export interface Language { iso2Code: string; englishName: string; isMasterLangu ] }) export class LanguageSelectorComponent implements OnChanges, OnInit { - public dropdown = new ModalView(false, true); + public dropdown = new ModalModel(); @Input() public size: string; diff --git a/src/Squidex/app/shared/components/markdown-editor.component.ts b/src/Squidex/app/shared/components/markdown-editor.component.ts index b2190d3ba..8fbc06107 100644 --- a/src/Squidex/app/shared/components/markdown-editor.component.ts +++ b/src/Squidex/app/shared/components/markdown-editor.component.ts @@ -10,7 +10,7 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; import { AssetDto, - ModalView, + DialogModel, ResourceLoaderService, Types } from '@app/shared/internal'; @@ -34,7 +34,7 @@ export class MarkdownEditorComponent implements ControlValueAccessor, AfterViewI private value: string; private isDisabled = false; - public selectorModal = new ModalView(); + public assetsDialog = new DialogModel(); @ViewChild('editor') public editor: ElementRef; @@ -79,7 +79,7 @@ export class MarkdownEditorComponent implements ControlValueAccessor, AfterViewI } private showSelector = () => { - this.selectorModal.show(); + this.assetsDialog.show(); } public ngAfterViewInit() { @@ -206,6 +206,6 @@ export class MarkdownEditorComponent implements ControlValueAccessor, AfterViewI this.simplemde.codemirror.replaceSelection(content); } - this.selectorModal.hide(); + this.assetsDialog.hide(); } } \ No newline at end of file diff --git a/src/Squidex/app/shared/components/rich-editor.component.ts b/src/Squidex/app/shared/components/rich-editor.component.ts index a0ce4f0cc..0375d4733 100644 --- a/src/Squidex/app/shared/components/rich-editor.component.ts +++ b/src/Squidex/app/shared/components/rich-editor.component.ts @@ -10,7 +10,7 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; import { AssetDto, - ModalView, + DialogModel, ResourceLoaderService, Types } from '@app/shared/internal'; @@ -35,7 +35,7 @@ export class RichEditorComponent implements ControlValueAccessor, AfterViewInit, private value: string; private isDisabled = false; - public selectorModal = new ModalView(); + public assetsDialog = new DialogModel(); @ViewChild('editor') public editor: ElementRef; @@ -63,7 +63,7 @@ export class RichEditorComponent implements ControlValueAccessor, AfterViewInit, } private showSelector = () => { - this.selectorModal.show(); + this.assetsDialog.show(); } private getEditorOptions() { @@ -147,6 +147,6 @@ export class RichEditorComponent implements ControlValueAccessor, AfterViewInit, this.tinyEditor.execCommand('mceInsertContent', false, content); } - this.selectorModal.hide(); + this.assetsDialog.hide(); } } \ No newline at end of file diff --git a/src/Squidex/app/shared/guards/schema-must-exist-published.guard.spec.ts b/src/Squidex/app/shared/guards/schema-must-exist-published.guard.spec.ts index b5c10375a..9013eae45 100644 --- a/src/Squidex/app/shared/guards/schema-must-exist-published.guard.spec.ts +++ b/src/Squidex/app/shared/guards/schema-must-exist-published.guard.spec.ts @@ -9,8 +9,6 @@ import { Router, RouterStateSnapshot } from '@angular/router'; import { of } from 'rxjs'; import { IMock, Mock, Times } from 'typemoq'; -import { MathHelper } from '@app/framework'; - import { SchemaDetailsDto } from './../services/schemas.service'; import { SchemasState } from './../state/schemas.state'; import { SchemaMustExistPublishedGuard } from './schema-must-exist-published.guard'; @@ -50,7 +48,7 @@ describe('SchemaMustExistPublishedGuard', () => { it('should load schema and return false when not found', () => { schemasState.setup(x => x.select('123')) - .returns(() => of({ isPublished: false })); + .returns(() => of({ isPublished: false })); let result: boolean; @@ -80,7 +78,7 @@ describe('SchemaMustExistPublishedGuard', () => { it('should redirect to content when singleton', () => { schemasState.setup(x => x.select('123')) - .returns(() => of({ isSingleton: true })); + .returns(() => of({ isSingleton: true, id: 'schema-id' })); let result: boolean; @@ -90,6 +88,6 @@ describe('SchemaMustExistPublishedGuard', () => { expect(result!).toBeFalsy(); - router.verify(x => x.navigate([state.url, MathHelper.EMPTY_GUID]), Times.once()); + router.verify(x => x.navigate([state.url, 'schema-id']), Times.once()); }); }); \ No newline at end of file diff --git a/src/Squidex/app/shared/guards/schema-must-exist-published.guard.ts b/src/Squidex/app/shared/guards/schema-must-exist-published.guard.ts index 0d34f3f6a..c74df86d9 100644 --- a/src/Squidex/app/shared/guards/schema-must-exist-published.guard.ts +++ b/src/Squidex/app/shared/guards/schema-must-exist-published.guard.ts @@ -10,7 +10,7 @@ import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from import { Observable } from 'rxjs'; import { map, tap } from 'rxjs/operators'; -import { allParams, MathHelper } from '@app/framework'; +import { allParams } from '@app/framework'; import { SchemasState } from './../state/schemas.state'; @@ -32,8 +32,8 @@ export class SchemaMustExistPublishedGuard implements CanActivate { this.router.navigate(['/404']); } - if (dto && dto.isSingleton && state.url.indexOf(MathHelper.EMPTY_GUID) < 0) { - this.router.navigate([state.url, MathHelper.EMPTY_GUID]); + if (dto && dto.isSingleton && state.url.indexOf(dto.id) < 0) { + this.router.navigate([state.url, dto.id]); } }), map(s => s !== null && s.isPublished)); diff --git a/src/Squidex/app/shell/pages/internal/apps-menu.component.html b/src/Squidex/app/shell/pages/internal/apps-menu.component.html index e39cbbad1..10d0d738a 100644 --- a/src/Squidex/app/shell/pages/internal/apps-menu.component.html +++ b/src/Squidex/app/shell/pages/internal/apps-menu.component.html @@ -11,7 +11,7 @@ -
+
All Apps {{apps.length}} diff --git a/src/Squidex/app/shell/pages/internal/apps-menu.component.ts b/src/Squidex/app/shell/pages/internal/apps-menu.component.ts index 80e2a49e7..44bd0ad0a 100644 --- a/src/Squidex/app/shell/pages/internal/apps-menu.component.ts +++ b/src/Squidex/app/shell/pages/internal/apps-menu.component.ts @@ -9,8 +9,9 @@ import { Component } from '@angular/core'; import { AppsState, + DialogModel, fadeAnimation, - ModalView + ModalModel } from '@app/shared'; @Component({ @@ -22,9 +23,9 @@ import { ] }) export class AppsMenuComponent { - public addAppDialog = new ModalView(); + public addAppDialog = new DialogModel(); - public appsMenu = new ModalView(false, true); + public appsMenu = new ModalModel(); constructor( public readonly appsState: AppsState diff --git a/src/Squidex/app/shell/pages/internal/profile-menu.component.html b/src/Squidex/app/shell/pages/internal/profile-menu.component.html index 8b0bd2b44..c52bdefe6 100644 --- a/src/Squidex/app/shell/pages/internal/profile-menu.component.html +++ b/src/Squidex/app/shell/pages/internal/profile-menu.component.html @@ -8,7 +8,7 @@ -
+
Administration diff --git a/src/Squidex/app/shell/pages/internal/profile-menu.component.ts b/src/Squidex/app/shell/pages/internal/profile-menu.component.ts index 672a298f4..127b3b9f0 100644 --- a/src/Squidex/app/shell/pages/internal/profile-menu.component.ts +++ b/src/Squidex/app/shell/pages/internal/profile-menu.component.ts @@ -13,7 +13,7 @@ import { ApiUrlConfig, AuthService, fadeAnimation, - ModalView + ModalModel } from '@app/shared'; @Component({ @@ -27,7 +27,7 @@ import { export class ProfileMenuComponent implements OnDestroy, OnInit { private authenticationSubscription: Subscription; - public modalMenu = new ModalView(false, true); + public modalMenu = new ModalModel(); public profileDisplayName = ''; public profileId = ''; diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Guard/GuardContentTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Guard/GuardContentTests.cs index 56357383f..ba975fc28 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Guard/GuardContentTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Guard/GuardContentTests.cs @@ -43,11 +43,11 @@ namespace Squidex.Domain.Apps.Entities.Contents.Guard } [Fact] - public void CanCreate_should_not_throw_exception_if_singleton_and_id_empty() + public void CanCreate_should_not_throw_exception_if_singleton_and_id_is_schema_id() { A.CallTo(() => schema.IsSingleton).Returns(true); - var command = new CreateContent { Data = new NamedContentData(), ContentId = Guid.Empty }; + var command = new CreateContent { Data = new NamedContentData(), ContentId = schema.Id }; GuardContent.CanCreate(schema, command); } From 7253354144146ab51e2e7250529bbb6aa1a42f45 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Fri, 6 Jul 2018 12:28:40 +0200 Subject: [PATCH 5/5] Added files that were missing in alst commit. --- .../content/shared/assets-editor.component.html | 4 ++-- .../content/shared/references-editor.component.html | 4 ++-- .../content/shared/references-editor.component.ts | 13 +++---------- .../components/markdown-editor.component.html | 2 +- .../shared/components/rich-editor.component.html | 2 +- 5 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/Squidex/app/features/content/shared/assets-editor.component.html b/src/Squidex/app/features/content/shared/assets-editor.component.html index 70da5dcb2..92528dafc 100644 --- a/src/Squidex/app/features/content/shared/assets-editor.component.html +++ b/src/Squidex/app/features/content/shared/assets-editor.component.html @@ -1,7 +1,7 @@
-
+
Drop files here to add them.
@@ -16,6 +16,6 @@
- + \ No newline at end of file diff --git a/src/Squidex/app/features/content/shared/references-editor.component.html b/src/Squidex/app/features/content/shared/references-editor.component.html index 52c39f60b..cefec023c 100644 --- a/src/Squidex/app/features/content/shared/references-editor.component.html +++ b/src/Squidex/app/features/content/shared/references-editor.component.html @@ -1,7 +1,7 @@
-
+
Click here to link a content.
@@ -26,7 +26,7 @@
- + ; - public isModalVisibible = false; + public selectorDialog = new DialogModel(); public schema: SchemaDetailsDto; @@ -110,14 +111,6 @@ export class ReferencesEditorComponent implements ControlValueAccessor, OnInit { this.callTouched = fn; } - public showModal() { - this.isModalVisibible = true; - } - - public hideModal() { - this.isModalVisibible = false; - } - public select(contents: ContentDto[]) { for (let content of contents) { this.contentItems = this.contentItems.push(content); @@ -127,7 +120,7 @@ export class ReferencesEditorComponent implements ControlValueAccessor, OnInit { this.updateValue(); } - this.hideModal(); + this.selectorDialog.hide(); } public remove(content: ContentDto) { diff --git a/src/Squidex/app/shared/components/markdown-editor.component.html b/src/Squidex/app/shared/components/markdown-editor.component.html index 40b944e04..1060de076 100644 --- a/src/Squidex/app/shared/components/markdown-editor.component.html +++ b/src/Squidex/app/shared/components/markdown-editor.component.html @@ -8,6 +8,6 @@
- + \ No newline at end of file diff --git a/src/Squidex/app/shared/components/rich-editor.component.html b/src/Squidex/app/shared/components/rich-editor.component.html index 4b5cf0049..05dde5606 100644 --- a/src/Squidex/app/shared/components/rich-editor.component.html +++ b/src/Squidex/app/shared/components/rich-editor.component.html @@ -6,6 +6,6 @@
- + \ No newline at end of file