diff --git a/src/Squidex/Configurations/Identity/IdentityServices.cs b/src/Squidex/Configurations/Identity/IdentityServices.cs index 27e3522ff..2b759c8f6 100644 --- a/src/Squidex/Configurations/Identity/IdentityServices.cs +++ b/src/Squidex/Configurations/Identity/IdentityServices.cs @@ -9,7 +9,6 @@ using System.Collections.Generic; using System.Reflection; using System.Security.Cryptography.X509Certificates; -using IdentityServer4.Configuration; using IdentityServer4.Models; using IdentityServer4.Stores; using IdentityServer4.Stores.InMemory; diff --git a/src/Squidex/Startup.cs b/src/Squidex/Startup.cs index 3c6eac834..ffb910f47 100644 --- a/src/Squidex/Startup.cs +++ b/src/Squidex/Startup.cs @@ -7,7 +7,6 @@ // ========================================================================== using System; -using System.Collections.Generic; using Autofac; using Autofac.Extensions.DependencyInjection; using Microsoft.AspNetCore.Builder; @@ -101,6 +100,8 @@ namespace Squidex UseIdentity(app); UseApi(app); UseFrontend(app); + + app.UseMyEventStore(); } private void UseIdentity(IApplicationBuilder app) diff --git a/src/Squidex/app-libs/icomoon/fonts/icomoon.eot b/src/Squidex/app-libs/icomoon/fonts/icomoon.eot new file mode 100644 index 000000000..5582d0e6d Binary files /dev/null and b/src/Squidex/app-libs/icomoon/fonts/icomoon.eot differ diff --git a/src/Squidex/app-libs/icomoon/fonts/icomoon.svg b/src/Squidex/app-libs/icomoon/fonts/icomoon.svg new file mode 100644 index 000000000..0592ed7b9 --- /dev/null +++ b/src/Squidex/app-libs/icomoon/fonts/icomoon.svg @@ -0,0 +1,12 @@ + + + +Generated by IcoMoon + + + + + + + + \ No newline at end of file diff --git a/src/Squidex/app-libs/icomoon/fonts/icomoon.ttf b/src/Squidex/app-libs/icomoon/fonts/icomoon.ttf new file mode 100644 index 000000000..7d0e40d6d Binary files /dev/null and b/src/Squidex/app-libs/icomoon/fonts/icomoon.ttf differ diff --git a/src/Squidex/app-libs/icomoon/fonts/icomoon.woff b/src/Squidex/app-libs/icomoon/fonts/icomoon.woff new file mode 100644 index 000000000..673b29bde Binary files /dev/null and b/src/Squidex/app-libs/icomoon/fonts/icomoon.woff differ diff --git a/src/Squidex/app-libs/icomoon/selection.json b/src/Squidex/app-libs/icomoon/selection.json new file mode 100644 index 000000000..cd3cd8e5c --- /dev/null +++ b/src/Squidex/app-libs/icomoon/selection.json @@ -0,0 +1,101 @@ +{ + "IcoMoonType": "selection", + "icons": [ + { + "icon": { + "paths": [ + "M810 554h-256v256h-84v-256h-256v-84h256v-256h84v256h256v84z" + ], + "attrs": [ + {} + ], + "isMulticolor": false, + "isMulticolor2": false, + "tags": [ + "add" + ], + "grid": 24 + }, + "attrs": [ + {} + ], + "properties": { + "order": 1, + "id": 0, + "prevSize": 24, + "code": 59649, + "name": "plus" + }, + "setIdx": 0, + "setId": 1, + "iconIdx": 0 + }, + { + "icon": { + "paths": [ + "M512.34 20.48c-0.174 0.065-226.41 96.5-283.902 294.74-5.545 19.035 40.453 10.673 38.399 31.6-2.517 25.409-55.264 35.821-48.385 108.78 7.001 74.289 74.617 149.342 84.791 194.72v31.78c-0.615 9.802-5.639 36.405-22.285 49.4-9.13 7.105-21.442 9.661-37.671 7.78-22.528-2.612-31.493-16.604-35.078-27.9-5.881-18.616-0.409-40.331 12.793-50.52 13.271-10.243 15.084-28.513 4.029-40.82-11.055-12.296-30.785-13.965-44.056-3.7-32.168 24.839-45.65 70.615-32.785 111.34 12.146 38.328 44.789 64.147 87.363 69.080 6.067 0.699 11.848 1.040 17.335 1.040 32.945 0 55.27-11.669 68.785-22.32 40.671-32.105 43.867-85.623 44.099-91.62 0.011-0.355 0.022-0.705 0.022-1.060v-24.36h0.129v-1.64c0-14.177 12.394-25.66 27.707-25.66 14.869 0 26.889 10.843 27.578 24.46v232.2c-0.255 3.343-3.155 34.297-22.157 49.28-9.118 7.201-21.512 9.802-37.799 7.9-22.54-2.612-31.526-16.605-35.099-27.88-5.893-18.627-0.387-40.341 12.814-50.52 13.271-10.254 15.062-28.523 4.007-40.84-11.044-12.274-30.764-13.945-44.035-3.68-32.191 24.828-45.65 70.615-32.785 111.34 12.122 38.328 44.789 64.136 87.363 69.080 6.067 0.699 11.848 1.040 17.335 1.040 32.945 0 55.262-11.669 68.742-22.32 40.683-32.105 43.879-85.623 44.099-91.62 0.024-0.376 0.042-0.696 0.042-1.040v-259l0.129-0.060v-1.14c0-14.456 12.65-26.18 28.264-26.18 15.288 0 27.657 11.292 28.135 25.36v261.020c0 0.355-0.002 0.675 0.022 1.040 0.232 5.987 3.438 59.515 44.121 91.62 13.504 10.652 35.819 22.32 68.764 22.32 5.499 0 11.258-0.341 17.314-1.040 42.562-4.944 75.24-30.763 87.363-69.080 12.876-40.725-0.584-86.501-32.764-111.34-13.294-10.265-33.013-8.584-44.056 3.68-11.055 12.328-9.264 30.586 4.007 40.84 13.201 10.179 18.697 31.893 12.793 50.52-3.561 11.275-12.55 25.268-35.078 27.88-16.217 1.892-28.531-0.675-37.649-7.78-16.716-13.038-21.715-39.783-22.307-49.36v-231.8c0.445-13.816 12.612-24.9 27.642-24.9 15.313 0 27.707 11.472 27.707 25.66v1.64h0.085v24.36c0 0.365-0.002 0.716 0.022 1.060 0.22 5.987 3.438 59.515 44.121 91.62 13.503 10.651 35.818 22.32 68.763 22.32 5.487 0 11.259-0.332 17.314-1.020 42.562-4.933 75.24-30.783 87.363-69.1 12.876-40.725-0.606-86.49-32.785-111.34-13.294-10.254-33.003-8.576-44.035 3.72-11.067 12.307-9.285 30.557 3.986 40.8 13.201 10.189 18.719 31.904 12.814 50.52-3.561 11.296-12.571 25.299-35.099 27.9-16.194 1.892-28.51-0.686-37.628-7.78-16.716-13.048-21.727-39.785-22.307-49.34v-24.24c6.634-62.066 78.084-123.637 85.499-202.32 6.844-72.959-45.943-83.371-48.449-108.78-2.065-20.927 43.943-12.565 38.421-31.6-57.503-198.24-283.718-294.675-283.88-294.74z" + ], + "attrs": [ + { + "fill": "rgb(0, 0, 0)" + } + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 0, + "tags": [ + "logo" + ] + }, + "attrs": [ + { + "fill": "rgb(0, 0, 0)" + } + ], + "properties": { + "order": 3, + "id": 0, + "name": "logo", + "prevSize": 32, + "code": 59648 + }, + "setIdx": 1, + "setId": 0, + "iconIdx": 0 + } + ], + "height": 1024, + "metadata": { + "name": "icomoon" + }, + "preferences": { + "showGlyphs": true, + "showCodes": true, + "showQuickUse": true, + "showQuickUse2": true, + "showSVGs": true, + "fontPref": { + "prefix": "icon-", + "metadata": { + "fontFamily": "icomoon", + "majorVersion": 1, + "minorVersion": 0 + }, + "metrics": { + "emSize": 1024, + "baseline": 6.25, + "whitespace": 50 + }, + "embed": false + }, + "imagePref": { + "prefix": "icon-", + "png": true, + "useClassSelector": true, + "color": 0, + "bgColor": 16777215, + "classSelector": ".icon" + }, + "historySize": 100 + } +} \ No newline at end of file diff --git a/src/Squidex/app-libs/icomoon/style.css b/src/Squidex/app-libs/icomoon/style.css new file mode 100644 index 000000000..94907c513 --- /dev/null +++ b/src/Squidex/app-libs/icomoon/style.css @@ -0,0 +1,33 @@ +@font-face { + font-family: 'icomoon'; + src: url('fonts/icomoon.eot?gn3a4m'); + src: url('fonts/icomoon.eot?gn3a4m#iefix') format('embedded-opentype'), + url('fonts/icomoon.ttf?gn3a4m') format('truetype'), + url('fonts/icomoon.woff?gn3a4m') format('woff'), + url('fonts/icomoon.svg?gn3a4m#icomoon') format('svg'); + font-weight: normal; + font-style: normal; +} + +[class^="icon-"], [class*=" icon-"] { + /* use !important to prevent issues with browser extensions that change fonts */ + font-family: 'icomoon' !important; + speak: none; + font-style: normal; + font-weight: normal; + font-variant: normal; + text-transform: none; + line-height: 1; + + /* Better Font Rendering =========== */ + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +.icon-plus:before { + content: "\e901"; +} +.icon-logo:before { + content: "\e900"; +} + diff --git a/src/Squidex/app/app.component.html b/src/Squidex/app/app.component.html index 157c6ce2d..1f6df0bcc 100644 --- a/src/Squidex/app/app.component.html +++ b/src/Squidex/app/app.component.html @@ -1,5 +1,7 @@