Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

design: updates to Fider design (#941)

Guilherme Oenning6fc05d4fd3a8
diff --git a/app/pkg/web/engine.go b/app/pkg/web/engine.go
index 42ab2f9a2..3b568df50 100644
--- a/app/pkg/web/engine.go
+++ b/app/pkg/web/engine.go
@@ -93,7 +93,10 @@ func New(settings *models.SystemSettings) *Engine {
//Start the server.
func (e *Engine) Start(address string) {
log.Info(e, "Application is starting")
- log.Infof(e, "GO_ENV: @{Env}", dto.Props{
+ log.Infof(e, "Version: @{Version}", dto.Props{
+ "Version": e.renderer.settings.Version,
+ })
+ log.Infof(e, "Environment: @{Env}", dto.Props{
"Env": env.Config.Environment,
})
diff --git a/app/pkg/web/react_test.go b/app/pkg/web/react_test.go
index a2e8d01a3..e148fcbf7 100644
--- a/app/pkg/web/react_test.go
+++ b/app/pkg/web/react_test.go
@@ -34,6 +34,6 @@ func TestReactRenderer_RenderEmptyHomeHTML(t *testing.T) {
},
})
Expect(html).Equals(`<div id="c-header"><div class="c-env-info">Env: | Compiler: | Version: | BuildTime: N/A |TenantID: 0 | </div><div class="c-menu"><div class="container"><a href="/" class="c-menu-item-title"><h1></h1></a><div class="c-menu-item-signin"><span>Sign in</span></div></div></div></div><div id="p-home" class="page container"><div class="row"><div class="l-welcome-col col-md-4"><div class="markdown-body welcome-message"><p>We&#39;d love to hear what you&#39;re thinking about. </p>
-<p>What can we do better? This is the place for you to vote, discuss and share ideas.</p></div><form autoComplete="off" class="c-form"><div class="c-form-field"><div class="c-form-field-wrapper"><input type="text" id="input-title" tabindex="-1" maxLength="100" value="" placeholder="Enter your suggestion here..."/></div></div></form></div><div class="l-posts-col col-md-8"><div class="l-lonely center"><p><svg stroke="currentColor" fill="currentColor" stroke-width="0" viewBox="0 0 352 512" class="icon" height="1em" width="1em" xmlns="http://www.w3.org/2000/svg"><path d="M176 80c-52.94 0-96 43.06-96 96 0 8.84 7.16 16 16 16s16-7.16 16-16c0-35.3 28.72-64 64-64 8.84 0 16-7.16 16-16s-7.16-16-16-16zM96.06 459.17c0 3.15.93 6.22 2.68 8.84l24.51 36.84c2.97 4.46 7.97 7.14 13.32 7.14h78.85c5.36 0 10.36-2.68 13.32-7.14l24.51-36.84c1.74-2.62 2.67-5.7 2.68-8.84l.05-43.18H96.02l.04 43.18zM176 0C73.72 0 0 82.97 0 176c0 44.37 16.45 84.85 43.56 115.78 16.64 18.99 42.74 58.8 52.42 92.16v.06h48v-.12c-.01-4.77-.72-9.51-2.15-14.07-5.59-17.81-22.82-64.77-62.17-109.67-20.54-23.43-31.52-53.15-31.61-84.14-.2-73.64 59.67-128 127.95-128 70.58 0 128 57.42 128 128 0 30.97-11.24 60.85-31.65 84.14-39.11 44.61-56.42 91.47-62.1 109.46a47.507 47.507 0 0 0-2.22 14.3v.1h48v-.05c9.68-33.37 35.78-73.18 52.42-92.16C335.55 260.85 352 220.37 352 176 352 78.8 273.2 0 176 0z"></path></svg></p><p>It&#x27;s lonely out here. Start by sharing a suggestion!</p></div></div></div></div><div id="c-footer"><div class="container"><a class="l-powered" target="_blank" rel="noopener" href="https://getfider.com/"><img width="20" height="20" src="https://getfider.com/images/logo-100x100.png" alt="Fider"/><span>Powered by Fider</span></a></div></div>`)
+<p>What can we do better? This is the place for you to vote, discuss and share ideas.</p></div><form autoComplete="off" class="c-form"><div class="c-form-field"><div class="c-form-field-wrapper"><input type="text" id="input-title" tabindex="-1" maxLength="100" value="" placeholder="Enter your suggestion here..."/></div></div></form><div class="c-powered"><a rel="noopener" href="https://getfider.com" target="_blank">Powered by Fider</a></div></div><div class="l-posts-col col-md-8"><div class="l-lonely center"><p><img alt="No Posts" height="100" src="data:image/svg+xml;base64,PHN2ZyBpZD0iYjIxNjEzYzktMmJmMC00ZDM3LWJlZjAtM2IxOTNkMzRmYzVkIiBkYXRhLW5hbWU9IkxheWVyIDEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjY0Ny42MzYyNiIgaGVpZ2h0PSI2MzIuMTczODMiIHZpZXdCb3g9IjAgMCA2NDcuNjM2MjYgNjMyLjE3MzgzIj48cGF0aCBkPSJNNjg3LjMyNzksMjc2LjA4NjkxSDUxMi44MTgxM2ExNS4wMTgyOCwxNS4wMTgyOCwwLDAsMC0xNSwxNXYzODcuODVsLTIsLjYxMDA1LTQyLjgxMDA2LDEzLjExYTguMDA2NzYsOC4wMDY3NiwwLDAsMS05Ljk4OTc0LTUuMzFMMzE1LjY3OCwyNzEuMzk2OTFhOC4wMDMxMyw4LjAwMzEzLDAsMCwxLDUuMzEwMDYtOS45OWw2NS45NzAyMi0yMC4yLDE5MS4yNS01OC41NCw2NS45Njk3Mi0yMC4yYTcuOTg5MjcsNy45ODkyNywwLDAsMSw5Ljk5MDI0LDUuM2wzMi41NDk4LDEwNi4zMloiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yNzYuMTgxODcgLTEzMy45MTMwOSkiIGZpbGw9IiNmMmYyZjIiLz48cGF0aCBkPSJNNzI1LjQwOCwyNzQuMDg2OTFsLTM5LjIzLTEyOC4xNGExNi45OTM2OCwxNi45OTM2OCwwLDAsMC0yMS4yMy0xMS4yOGwtOTIuNzUsMjguMzlMMzgwLjk1ODI3LDIyMS42MDY5M2wtOTIuNzUsMjguNGExNy4wMTUyLDE3LjAxNTIsMCwwLDAtMTEuMjgwMjgsMjEuMjNsMTM0LjA4MDA4LDQzNy45M2ExNy4wMjY2MSwxNy4wMjY2MSwwLDAsMCwxNi4yNjAyNiwxMi4wMywxNi43ODkyNiwxNi43ODkyNiwwLDAsMCw0Ljk2OTcyLS43NWw2My41ODAwOC0xOS40NiwyLS42MnYtMi4wOWwtMiwuNjEtNjQuMTY5OTIsMTkuNjVhMTUuMDE0ODksMTUuMDE0ODksMCwwLDEtMTguNzMtOS45NWwtMTM0LjA2OTgzLTQzNy45NGExNC45NzkzNSwxNC45NzkzNSwwLDAsMSw5Ljk0OTcxLTE4LjczbDkyLjc1LTI4LjQsMTkxLjI0MDI0LTU4LjU0LDkyLjc1LTI4LjRhMTUuMTU1NTEsMTUuMTU1NTEsMCwwLDEsNC40MDk2Ni0uNjYsMTUuMDE0NjEsMTUuMDE0NjEsMCwwLDEsMTQuMzIwMzIsMTAuNjFsMzkuMDQ5OCwxMjcuNTYuNjIwMTIsMmgyLjA4MDA4WiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTI3Ni4xODE4NyAtMTMzLjkxMzA5KSIgZmlsbD0iIzNmM2Q1NiIvPjxwYXRoIGQ9Ik0zOTguODYyNzksMjYxLjczMzg5YTkuMDE1Nyw5LjAxNTcsMCwwLDEtOC42MTEzMy02LjM2NjdsLTEyLjg4MDM3LTQyLjA3MTc4YTguOTk4ODQsOC45OTg4NCwwLDAsMSw1Ljk3MTItMTEuMjQwMjNsMTc1LjkzOS01My44NjM3N2E5LjAwODY3LDkuMDA4NjcsMCwwLDEsMTEuMjQwNzIsNS45NzA3bDEyLjg4MDM3LDQyLjA3MjI3YTkuMDEwMjksOS4wMTAyOSwwLDAsMS01Ljk3MDcsMTEuMjQwNzJMNDAxLjQ5MjE5LDI2MS4zMzg4N0E4Ljk3Niw4Ljk3NiwwLDAsMSwzOTguODYyNzksMjYxLjczMzg5WiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTI3Ni4xODE4NyAtMTMzLjkxMzA5KSIgZmlsbD0iIzQzMzhjYSIvPjxjaXJjbGUgY3g9IjE5MC4xNTM1MSIgY3k9IjI0Ljk1NDY1IiByPSIyMCIgZmlsbD0iIzQzMzhjYSIvPjxjaXJjbGUgY3g9IjE5MC4xNTM1MSIgY3k9IjI0Ljk1NDY1IiByPSIxMi42NjQ2MiIgZmlsbD0iI2ZmZiIvPjxwYXRoIGQ9Ik04NzguODE4MzYsNzE2LjA4NjkxaC0zMzhhOC41MDk4MSw4LjUwOTgxLDAsMCwxLTguNS04LjV2LTQwNWE4LjUwOTUxLDguNTA5NTEsMCwwLDEsOC41LTguNWgzMzhhOC41MDk4Miw4LjUwOTgyLDAsMCwxLDguNSw4LjV2NDA1QTguNTEwMTMsOC41MTAxMywwLDAsMSw4NzguODE4MzYsNzE2LjA4NjkxWiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTI3Ni4xODE4NyAtMTMzLjkxMzA5KSIgZmlsbD0iI2U2ZTZlNiIvPjxwYXRoIGQ9Ik03MjMuMzE4MTMsMjc0LjA4NjkxaC0yMTAuNWExNy4wMjQxMSwxNy4wMjQxMSwwLDAsMC0xNywxN3Y0MDcuOGwyLS42MXYtNDA3LjE5YTE1LjAxODI4LDE1LjAxODI4LDAsMCwxLDE1LTE1SDcyMy45MzgyNVptMTgzLjUsMGgtMzk0YTE3LjAyNDExLDE3LjAyNDExLDAsMCwwLTE3LDE3djQ1OGExNy4wMjQxLDE3LjAyNDEsMCwwLDAsMTcsMTdoMzk0YTE3LjAyNDEsMTcuMDI0MSwwLDAsMCwxNy0xN3YtNDU4QTE3LjAyNDExLDE3LjAyNDExLDAsMCwwLDkwNi44MTgxMywyNzQuMDg2OTFabTE1LDQ3NWExNS4wMTgyOCwxNS4wMTgyOCwwLDAsMS0xNSwxNWgtMzk0YTE1LjAxODI4LDE1LjAxODI4LDAsMCwxLTE1LTE1di00NThhMTUuMDE4MjgsMTUuMDE4MjgsMCwwLDEsMTUtMTVoMzk0YTE1LjAxODI4LDE1LjAxODI4LDAsMCwxLDE1LDE1WiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTI3Ni4xODE4NyAtMTMzLjkxMzA5KSIgZmlsbD0iIzNmM2Q1NiIvPjxwYXRoIGQ9Ik04MDEuODE4MzYsMzE4LjA4NjkxaC0xODRhOS4wMTAxNSw5LjAxMDE1LDAsMCwxLTktOXYtNDRhOS4wMTAxNiw5LjAxMDE2LDAsMCwxLDktOWgxODRhOS4wMTAxNiw5LjAxMDE2LDAsMCwxLDksOXY0NEE5LjAxMDE1LDkuMDEwMTUsMCwwLDEsODAxLjgxODM2LDMxOC4wODY5MVoiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yNzYuMTgxODcgLTEzMy45MTMwOSkiIGZpbGw9IiM0MzM4Y2EiLz48Y2lyY2xlIGN4PSI0MzMuNjM2MjYiIGN5PSIxMDUuMTczODMiIHI9IjIwIiBmaWxsPSIjNDMzOGNhIi8+PGNpcmNsZSBjeD0iNDMzLjYzNjI2IiBjeT0iMTA1LjE3MzgzIiByPSIxMi4xODE4NyIgZmlsbD0iI2ZmZiIvPjwvc3ZnPg=="/></p><p>No posts have been created yet.</p></div></div></div></div>`)
Expect(err).IsNil()
}
diff --git a/app/pkg/web/testdata/home_ssr.html b/app/pkg/web/testdata/home_ssr.html
index 14b5184d2..6371a9ee5 100755
--- a/app/pkg/web/testdata/home_ssr.html
+++ b/app/pkg/web/testdata/home_ssr.html
@@ -30,7 +30,7 @@
<div id="root"><div id="c-header"><div class="c-env-info">Env: | Compiler: | Version: | BuildTime: N/A |TenantID: 0 | </div><div class="c-menu"><div class="container"><a href="/" class="c-menu-item-title"><h1></h1></a><div class="c-menu-item-signin"><span>Sign in</span></div></div></div></div><div id="p-home" class="page container"><div class="row"><div class="l-welcome-col col-md-4"><div class="markdown-body welcome-message"><p>We&#39;d love to hear what you&#39;re thinking about. </p>
-<p>What can we do better? This is the place for you to vote, discuss and share ideas.</p></div><form autoComplete="off" class="c-form"><div class="c-form-field"><div class="c-form-field-wrapper"><input type="text" id="input-title" tabindex="-1" maxLength="100" value="" placeholder="Enter your suggestion here..."/></div></div></form></div><div class="l-posts-col col-md-8"><div class="l-lonely center"><p><svg stroke="currentColor" fill="currentColor" stroke-width="0" viewBox="0 0 352 512" class="icon" height="1em" width="1em" xmlns="http://www.w3.org/2000/svg"><path d="M176 80c-52.94 0-96 43.06-96 96 0 8.84 7.16 16 16 16s16-7.16 16-16c0-35.3 28.72-64 64-64 8.84 0 16-7.16 16-16s-7.16-16-16-16zM96.06 459.17c0 3.15.93 6.22 2.68 8.84l24.51 36.84c2.97 4.46 7.97 7.14 13.32 7.14h78.85c5.36 0 10.36-2.68 13.32-7.14l24.51-36.84c1.74-2.62 2.67-5.7 2.68-8.84l.05-43.18H96.02l.04 43.18zM176 0C73.72 0 0 82.97 0 176c0 44.37 16.45 84.85 43.56 115.78 16.64 18.99 42.74 58.8 52.42 92.16v.06h48v-.12c-.01-4.77-.72-9.51-2.15-14.07-5.59-17.81-22.82-64.77-62.17-109.67-20.54-23.43-31.52-53.15-31.61-84.14-.2-73.64 59.67-128 127.95-128 70.58 0 128 57.42 128 128 0 30.97-11.24 60.85-31.65 84.14-39.11 44.61-56.42 91.47-62.1 109.46a47.507 47.507 0 0 0-2.22 14.3v.1h48v-.05c9.68-33.37 35.78-73.18 52.42-92.16C335.55 260.85 352 220.37 352 176 352 78.8 273.2 0 176 0z"></path></svg></p><p>It&#x27;s lonely out here. Start by sharing a suggestion!</p></div></div></div></div><div id="c-footer"><div class="container"><a class="l-powered" target="_blank" rel="noopener" href="https://getfider.com/"><img width="20" height="20" src="https://getfider.com/images/logo-100x100.png" alt="Fider"/><span>Powered by Fider</span></a></div></div></div>
+<p>What can we do better? This is the place for you to vote, discuss and share ideas.</p></div><form autoComplete="off" class="c-form"><div class="c-form-field"><div class="c-form-field-wrapper"><input type="text" id="input-title" tabindex="-1" maxLength="100" value="" placeholder="Enter your suggestion here..."/></div></div></form><div class="c-powered"><a rel="noopener" href="https://getfider.com" target="_blank">Powered by Fider</a></div></div><div class="l-posts-col col-md-8"><div class="l-lonely center"><p><img alt="No Posts" height="100" src="data:image/svg+xml;base64,PHN2ZyBpZD0iYjIxNjEzYzktMmJmMC00ZDM3LWJlZjAtM2IxOTNkMzRmYzVkIiBkYXRhLW5hbWU9IkxheWVyIDEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjY0Ny42MzYyNiIgaGVpZ2h0PSI2MzIuMTczODMiIHZpZXdCb3g9IjAgMCA2NDcuNjM2MjYgNjMyLjE3MzgzIj48cGF0aCBkPSJNNjg3LjMyNzksMjc2LjA4NjkxSDUxMi44MTgxM2ExNS4wMTgyOCwxNS4wMTgyOCwwLDAsMC0xNSwxNXYzODcuODVsLTIsLjYxMDA1LTQyLjgxMDA2LDEzLjExYTguMDA2NzYsOC4wMDY3NiwwLDAsMS05Ljk4OTc0LTUuMzFMMzE1LjY3OCwyNzEuMzk2OTFhOC4wMDMxMyw4LjAwMzEzLDAsMCwxLDUuMzEwMDYtOS45OWw2NS45NzAyMi0yMC4yLDE5MS4yNS01OC41NCw2NS45Njk3Mi0yMC4yYTcuOTg5MjcsNy45ODkyNywwLDAsMSw5Ljk5MDI0LDUuM2wzMi41NDk4LDEwNi4zMloiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yNzYuMTgxODcgLTEzMy45MTMwOSkiIGZpbGw9IiNmMmYyZjIiLz48cGF0aCBkPSJNNzI1LjQwOCwyNzQuMDg2OTFsLTM5LjIzLTEyOC4xNGExNi45OTM2OCwxNi45OTM2OCwwLDAsMC0yMS4yMy0xMS4yOGwtOTIuNzUsMjguMzlMMzgwLjk1ODI3LDIyMS42MDY5M2wtOTIuNzUsMjguNGExNy4wMTUyLDE3LjAxNTIsMCwwLDAtMTEuMjgwMjgsMjEuMjNsMTM0LjA4MDA4LDQzNy45M2ExNy4wMjY2MSwxNy4wMjY2MSwwLDAsMCwxNi4yNjAyNiwxMi4wMywxNi43ODkyNiwxNi43ODkyNiwwLDAsMCw0Ljk2OTcyLS43NWw2My41ODAwOC0xOS40NiwyLS42MnYtMi4wOWwtMiwuNjEtNjQuMTY5OTIsMTkuNjVhMTUuMDE0ODksMTUuMDE0ODksMCwwLDEtMTguNzMtOS45NWwtMTM0LjA2OTgzLTQzNy45NGExNC45NzkzNSwxNC45NzkzNSwwLDAsMSw5Ljk0OTcxLTE4LjczbDkyLjc1LTI4LjQsMTkxLjI0MDI0LTU4LjU0LDkyLjc1LTI4LjRhMTUuMTU1NTEsMTUuMTU1NTEsMCwwLDEsNC40MDk2Ni0uNjYsMTUuMDE0NjEsMTUuMDE0NjEsMCwwLDEsMTQuMzIwMzIsMTAuNjFsMzkuMDQ5OCwxMjcuNTYuNjIwMTIsMmgyLjA4MDA4WiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTI3Ni4xODE4NyAtMTMzLjkxMzA5KSIgZmlsbD0iIzNmM2Q1NiIvPjxwYXRoIGQ9Ik0zOTguODYyNzksMjYxLjczMzg5YTkuMDE1Nyw5LjAxNTcsMCwwLDEtOC42MTEzMy02LjM2NjdsLTEyLjg4MDM3LTQyLjA3MTc4YTguOTk4ODQsOC45OTg4NCwwLDAsMSw1Ljk3MTItMTEuMjQwMjNsMTc1LjkzOS01My44NjM3N2E5LjAwODY3LDkuMDA4NjcsMCwwLDEsMTEuMjQwNzIsNS45NzA3bDEyLjg4MDM3LDQyLjA3MjI3YTkuMDEwMjksOS4wMTAyOSwwLDAsMS01Ljk3MDcsMTEuMjQwNzJMNDAxLjQ5MjE5LDI2MS4zMzg4N0E4Ljk3Niw4Ljk3NiwwLDAsMSwzOTguODYyNzksMjYxLjczMzg5WiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTI3Ni4xODE4NyAtMTMzLjkxMzA5KSIgZmlsbD0iIzQzMzhjYSIvPjxjaXJjbGUgY3g9IjE5MC4xNTM1MSIgY3k9IjI0Ljk1NDY1IiByPSIyMCIgZmlsbD0iIzQzMzhjYSIvPjxjaXJjbGUgY3g9IjE5MC4xNTM1MSIgY3k9IjI0Ljk1NDY1IiByPSIxMi42NjQ2MiIgZmlsbD0iI2ZmZiIvPjxwYXRoIGQ9Ik04NzguODE4MzYsNzE2LjA4NjkxaC0zMzhhOC41MDk4MSw4LjUwOTgxLDAsMCwxLTguNS04LjV2LTQwNWE4LjUwOTUxLDguNTA5NTEsMCwwLDEsOC41LTguNWgzMzhhOC41MDk4Miw4LjUwOTgyLDAsMCwxLDguNSw4LjV2NDA1QTguNTEwMTMsOC41MTAxMywwLDAsMSw4NzguODE4MzYsNzE2LjA4NjkxWiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTI3Ni4xODE4NyAtMTMzLjkxMzA5KSIgZmlsbD0iI2U2ZTZlNiIvPjxwYXRoIGQ9Ik03MjMuMzE4MTMsMjc0LjA4NjkxaC0yMTAuNWExNy4wMjQxMSwxNy4wMjQxMSwwLDAsMC0xNywxN3Y0MDcuOGwyLS42MXYtNDA3LjE5YTE1LjAxODI4LDE1LjAxODI4LDAsMCwxLDE1LTE1SDcyMy45MzgyNVptMTgzLjUsMGgtMzk0YTE3LjAyNDExLDE3LjAyNDExLDAsMCwwLTE3LDE3djQ1OGExNy4wMjQxLDE3LjAyNDEsMCwwLDAsMTcsMTdoMzk0YTE3LjAyNDEsMTcuMDI0MSwwLDAsMCwxNy0xN3YtNDU4QTE3LjAyNDExLDE3LjAyNDExLDAsMCwwLDkwNi44MTgxMywyNzQuMDg2OTFabTE1LDQ3NWExNS4wMTgyOCwxNS4wMTgyOCwwLDAsMS0xNSwxNWgtMzk0YTE1LjAxODI4LDE1LjAxODI4LDAsMCwxLTE1LTE1di00NThhMTUuMDE4MjgsMTUuMDE4MjgsMCwwLDEsMTUtMTVoMzk0YTE1LjAxODI4LDE1LjAxODI4LDAsMCwxLDE1LDE1WiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTI3Ni4xODE4NyAtMTMzLjkxMzA5KSIgZmlsbD0iIzNmM2Q1NiIvPjxwYXRoIGQ9Ik04MDEuODE4MzYsMzE4LjA4NjkxaC0xODRhOS4wMTAxNSw5LjAxMDE1LDAsMCwxLTktOXYtNDRhOS4wMTAxNiw5LjAxMDE2LDAsMCwxLDktOWgxODRhOS4wMTAxNiw5LjAxMDE2LDAsMCwxLDksOXY0NEE5LjAxMDE1LDkuMDEwMTUsMCwwLDEsODAxLjgxODM2LDMxOC4wODY5MVoiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yNzYuMTgxODcgLTEzMy45MTMwOSkiIGZpbGw9IiM0MzM4Y2EiLz48Y2lyY2xlIGN4PSI0MzMuNjM2MjYiIGN5PSIxMDUuMTczODMiIHI9IjIwIiBmaWxsPSIjNDMzOGNhIi8+PGNpcmNsZSBjeD0iNDMzLjYzNjI2IiBjeT0iMTA1LjE3MzgzIiByPSIxMi4xODE4NyIgZmlsbD0iI2ZmZiIvPjwvc3ZnPg=="/></p><p>No posts have been created yet.</p></div></div></div></div></div>
<script id="server-data" type="application/json">
diff --git a/codecov.yml b/codecov.yml
deleted file mode 100644
index ae62564c4..000000000
--- a/codecov.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-codecov:
- notify:
- require_ci_to_pass: yes
-
-coverage:
- precision: 2
- round: nearest
- range: "70...100"
-
- status:
- project: no
- patch: no
- changes: no
-
- ignore:
- - "vendor"
-
-comment:
- layout: "reach, diff, flags, files, footer"
- behavior: default
diff --git a/esbuild.config.js b/esbuild.config.js
index 67e0cfb6a..9dd024a3e 100644
--- a/esbuild.config.js
+++ b/esbuild.config.js
@@ -1,5 +1,8 @@
/* eslint-disable @typescript-eslint/no-var-requires */
/* eslint-disable no-undef */
+
+const fs = require("fs")
+
let emptyCSS = {
name: "empty-css-imports",
setup(build) {
@@ -7,6 +10,17 @@ let emptyCSS = {
},
}
+let emptySVG = {
+ name: "empty-svg-imports",
+ setup(build) {
+ build.onLoad({ filter: /\.(svg)$/ }, async (args) => {
+ let contents = await fs.promises.readFile(args.path, "utf8")
+ let buff = Buffer.from(contents).toString("base64")
+ return { contents: `data:image/svg+xml;base64,${buff}`, loader: "text" }
+ })
+ },
+}
+
require("esbuild")
.build({
entryPoints: ["./public/ssr.tsx"],
@@ -16,6 +30,6 @@ require("esbuild")
},
inject: ["./esbuild-shim.js"],
outfile: "ssr.js",
- plugins: [emptyCSS],
+ plugins: [emptyCSS, emptySVG],
})
.catch(() => process.exit(1))
diff --git a/index.d.ts b/index.d.ts
new file mode 100644
index 000000000..6ec282b2e
--- /dev/null
+++ b/index.d.ts
@@ -0,0 +1,12 @@
+declare interface Window {
+ ga?: (cmd: string, evt: string, args?: any) => void
+ set: (key: string, value: any) => void
+}
+
+declare let __webpack_nonce__: string
+declare let __webpack_public_path__: string
+
+declare module "*.svg" {
+ const content: string
+ export default content
+}
diff --git a/package-lock.json b/package-lock.json
index 19d28765e..5b8541c88 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,36 +14,36 @@
"react-icons": "4.2.0",
"react-textarea-autosize": "8.3.2",
"react-toastify": "7.0.3",
- "tslib": "2.1.0"
+ "tslib": "2.2.0"
},
"devDependencies": {
"@types/dompurify": "2.2.1",
"@types/enzyme": "3.10.8",
"@types/jest": "26.0.22",
- "@types/jsdom": "16.2.9",
- "@types/marked": "2.0.0",
+ "@types/jsdom": "16.2.10",
+ "@types/marked": "2.0.1",
"@types/node": "14.14.37",
"@types/puppeteer": "5.4.3",
"@types/react": "17.0.3",
"@types/react-dom": "17.0.3",
"@types/react-textarea-autosize": "4.3.5",
- "@typescript-eslint/eslint-plugin": "4.19.0",
- "@typescript-eslint/parser": "4.19.0",
- "@wojtekmaj/enzyme-adapter-react-17": "0.6.0",
+ "@typescript-eslint/eslint-plugin": "4.21.0",
+ "@typescript-eslint/parser": "4.21.0",
+ "@wojtekmaj/enzyme-adapter-react-17": "0.6.1",
"autoprefixer": "10.2.5",
- "css-loader": "5.2.0",
+ "css-loader": "5.2.1",
"dotenv": "8.2.0",
"enzyme": "3.11.0",
- "esbuild": "0.10.2",
+ "esbuild": "0.11.6",
"eslint": "7.23.0",
"eslint-config-prettier": "8.1.0",
"eslint-plugin-prettier": "3.3.1",
- "eslint-plugin-react": "7.23.1",
+ "eslint-plugin-react": "7.23.2",
"eslint-plugin-react-hooks": "4.2.0",
"file-loader": "6.2.0",
- "fork-ts-checker-webpack-plugin": "6.2.0",
+ "fork-ts-checker-webpack-plugin": "6.2.1",
"jest": "26.6.3",
- "mini-css-extract-plugin": "1.4.0",
+ "mini-css-extract-plugin": "1.4.1",
"node-sass": "5.0.0",
"prettier": "2.2.1",
"puppeteer": "8.0.0",
@@ -51,8 +51,8 @@
"sass-loader": "11.0.1",
"ts-jest": "26.5.4",
"ts-loader": "8.1.0",
- "typescript": "4.2.3",
- "webpack": "5.28.0",
+ "typescript": "4.2.4",
+ "webpack": "5.31.0",
"webpack-bundle-analyzer": "4.4.0",
"webpack-cli": "4.6.0"
},
@@ -857,7 +857,6 @@
"jest-resolve": "^26.6.2",
"jest-util": "^26.6.2",
"jest-worker": "^26.6.2",
- "node-notifier": "^8.0.0",
"slash": "^3.0.0",
"source-map": "^0.6.0",
"string-length": "^4.0.1",
@@ -1156,9 +1155,9 @@
}
},
"node_modules/@types/jsdom": {
- "version": "16.2.9",
- "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-16.2.9.tgz",
- "integrity": "sha512-7+HFvB7RIrU4KGazrn0/K81yjdg1hpwshM+nbt7CNlbwN1TUq5sBFMCfVglBYYv29l6ZTmXXFEB2FnxLv5gDcg==",
+ "version": "16.2.10",
+ "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-16.2.10.tgz",
+ "integrity": "sha512-q3aIjp3ehhVSXSbvNyuireAfvU2umRiZ2aLumyeZewCnoNaokrRDdTu5IvaeE9pzNtWHXrUnM9lb22Vl3W08EA==",
"dev": true,
"dependencies": {
"@types/node": "*",
@@ -1173,9 +1172,9 @@
"dev": true
},
"node_modules/@types/marked": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/@types/marked/-/marked-2.0.0.tgz",
- "integrity": "sha512-kSOVa3R6HJvFdd3UIbTYvrSBTPHjXhNErh7/8oSCKOwqdOkk4Oj8N77n+f6dsgd1jW3j3SU5EhnmRxPhNKOmtQ==",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/@types/marked/-/marked-2.0.1.tgz",
+ "integrity": "sha512-/CFe3HvXMkh7YkJS0DGRsC0hgwWZDZbSCmY/X00bSCnZ4ukS2Glk9veIkRoPu2ElMbKpjxseXn1y9MkTwGHVjw==",
"dev": true
},
"node_modules/@types/node": {
@@ -1302,13 +1301,13 @@
}
},
"node_modules/@typescript-eslint/eslint-plugin": {
- "version": "4.19.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.19.0.tgz",
- "integrity": "sha512-CRQNQ0mC2Pa7VLwKFbrGVTArfdVDdefS+gTw0oC98vSI98IX5A8EVH4BzJ2FOB0YlCmm8Im36Elad/Jgtvveaw==",
+ "version": "4.21.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.21.0.tgz",
+ "integrity": "sha512-FPUyCPKZbVGexmbCFI3EQHzCZdy2/5f+jv6k2EDljGdXSRc0cKvbndd2nHZkSLqCNOPk0jB6lGzwIkglXcYVsQ==",
"dev": true,
"dependencies": {
- "@typescript-eslint/experimental-utils": "4.19.0",
- "@typescript-eslint/scope-manager": "4.19.0",
+ "@typescript-eslint/experimental-utils": "4.21.0",
+ "@typescript-eslint/scope-manager": "4.21.0",
"debug": "^4.1.1",
"functional-red-black-tree": "^1.0.1",
"lodash": "^4.17.15",
@@ -1334,15 +1333,15 @@
}
},
"node_modules/@typescript-eslint/experimental-utils": {
- "version": "4.19.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.19.0.tgz",
- "integrity": "sha512-9/23F1nnyzbHKuoTqFN1iXwN3bvOm/PRIXSBR3qFAYotK/0LveEOHr5JT1WZSzcD6BESl8kPOG3OoDRKO84bHA==",
+ "version": "4.21.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.21.0.tgz",
+ "integrity": "sha512-cEbgosW/tUFvKmkg3cU7LBoZhvUs+ZPVM9alb25XvR0dal4qHL3SiUqHNrzoWSxaXA9gsifrYrS1xdDV6w/gIA==",
"dev": true,
"dependencies": {
"@types/json-schema": "^7.0.3",
- "@typescript-eslint/scope-manager": "4.19.0",
- "@typescript-eslint/types": "4.19.0",
- "@typescript-eslint/typescript-estree": "4.19.0",
+ "@typescript-eslint/scope-manager": "4.21.0",
+ "@typescript-eslint/types": "4.21.0",
+ "@typescript-eslint/typescript-estree": "4.21.0",
"eslint-scope": "^5.0.0",
"eslint-utils": "^2.0.0"
},
@@ -1358,14 +1357,14 @@
}
},
"node_modules/@typescript-eslint/parser": {
- "version": "4.19.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.19.0.tgz",
- "integrity": "sha512-/uabZjo2ZZhm66rdAu21HA8nQebl3lAIDcybUoOxoI7VbZBYavLIwtOOmykKCJy+Xq6Vw6ugkiwn8Js7D6wieA==",
+ "version": "4.21.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.21.0.tgz",
+ "integrity": "sha512-eyNf7QmE5O/l1smaQgN0Lj2M/1jOuNg2NrBm1dqqQN0sVngTLyw8tdCbih96ixlhbF1oINoN8fDCyEH9SjLeIA==",
"dev": true,
"dependencies": {
- "@typescript-eslint/scope-manager": "4.19.0",
- "@typescript-eslint/types": "4.19.0",
- "@typescript-eslint/typescript-estree": "4.19.0",
+ "@typescript-eslint/scope-manager": "4.21.0",
+ "@typescript-eslint/types": "4.21.0",
+ "@typescript-eslint/typescript-estree": "4.21.0",
"debug": "^4.1.1"
},
"engines": {
@@ -1385,13 +1384,13 @@
}
},
"node_modules/@typescript-eslint/scope-manager": {
- "version": "4.19.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.19.0.tgz",
- "integrity": "sha512-GGy4Ba/hLXwJXygkXqMzduqOMc+Na6LrJTZXJWVhRrSuZeXmu8TAnniQVKgj8uTRKe4igO2ysYzH+Np879G75g==",
+ "version": "4.21.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.21.0.tgz",
+ "integrity": "sha512-kfOjF0w1Ix7+a5T1knOw00f7uAP9Gx44+OEsNQi0PvvTPLYeXJlsCJ4tYnDj5PQEYfpcgOH5yBlw7K+UEI9Agw==",
"dev": true,
"dependencies": {
- "@typescript-eslint/types": "4.19.0",
- "@typescript-eslint/visitor-keys": "4.19.0"
+ "@typescript-eslint/types": "4.21.0",
+ "@typescript-eslint/visitor-keys": "4.21.0"
},
"engines": {
"node": "^8.10.0 || ^10.13.0 || >=11.10.1"
@@ -1402,9 +1401,9 @@
}
},
"node_modules/@typescript-eslint/types": {
- "version": "4.19.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.19.0.tgz",
- "integrity": "sha512-A4iAlexVvd4IBsSTNxdvdepW0D4uR/fwxDrKUa+iEY9UWvGREu2ZyB8ylTENM1SH8F7bVC9ac9+si3LWNxcBuA==",
+ "version": "4.21.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.21.0.tgz",
+ "integrity": "sha512-+OQaupjGVVc8iXbt6M1oZMwyKQNehAfLYJJ3SdvnofK2qcjfor9pEM62rVjBknhowTkh+2HF+/KdRAc/wGBN2w==",
"dev": true,
"engines": {
"node": "^8.10.0 || ^10.13.0 || >=11.10.1"
@@ -1415,13 +1414,13 @@
}
},
"node_modules/@typescript-eslint/typescript-estree": {
- "version": "4.19.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.19.0.tgz",
- "integrity": "sha512-3xqArJ/A62smaQYRv2ZFyTA+XxGGWmlDYrsfZG68zJeNbeqRScnhf81rUVa6QG4UgzHnXw5VnMT5cg75dQGDkA==",
+ "version": "4.21.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.21.0.tgz",
+ "integrity": "sha512-ZD3M7yLaVGVYLw4nkkoGKumb7Rog7QID9YOWobFDMQKNl+vPxqVIW/uDk+MDeGc+OHcoG2nJ2HphwiPNajKw3w==",
"dev": true,
"dependencies": {
- "@typescript-eslint/types": "4.19.0",
- "@typescript-eslint/visitor-keys": "4.19.0",
+ "@typescript-eslint/types": "4.21.0",
+ "@typescript-eslint/visitor-keys": "4.21.0",
"debug": "^4.1.1",
"globby": "^11.0.1",
"is-glob": "^4.0.1",
@@ -1442,12 +1441,12 @@
}
},
"node_modules/@typescript-eslint/visitor-keys": {
- "version": "4.19.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.19.0.tgz",
- "integrity": "sha512-aGPS6kz//j7XLSlgpzU2SeTqHPsmRYxFztj2vPuMMFJXZudpRSehE3WCV+BaxwZFvfAqMoSd86TEuM0PQ59E/A==",
+ "version": "4.21.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.21.0.tgz",
+ "integrity": "sha512-dH22dROWGi5Z6p+Igc8bLVLmwy7vEe8r+8c+raPQU0LxgogPUrRAtRGtvBWmlr9waTu3n+QLt/qrS/hWzk1x5w==",
"dev": true,
"dependencies": {
- "@typescript-eslint/types": "4.19.0",
+ "@typescript-eslint/types": "4.21.0",
"eslint-visitor-keys": "^2.0.0"
},
"engines": {
@@ -1641,9 +1640,9 @@
}
},
"node_modules/@wojtekmaj/enzyme-adapter-react-17": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/@wojtekmaj/enzyme-adapter-react-17/-/enzyme-adapter-react-17-0.6.0.tgz",
- "integrity": "sha512-2lRGjZDNTaUyIHLEKqkbGIKK0I4vLgXOcwt90ddsOAGalrZGKmnHnFQzFoO9V84hF+fMYHkpRqka4JGCnvkoow==",
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/@wojtekmaj/enzyme-adapter-react-17/-/enzyme-adapter-react-17-0.6.1.tgz",
+ "integrity": "sha512-xgPfzLVpN0epIHeZofahwr5qwpukEDNAbrufgeDWN6vZPtfblGCC+OZG5TlfK+A6ePVy8sBkD8S2X4tO17JKjg==",
"dev": true,
"dependencies": {
"@wojtekmaj/enzyme-adapter-utils": "^0.1.0",
@@ -2598,7 +2597,6 @@
"dependencies": {
"anymatch": "~3.1.1",
"braces": "~3.0.2",
- "fsevents": "~2.3.1",
"glob-parent": "~5.1.0",
"is-binary-path": "~2.1.0",
"is-glob": "~4.0.1",
@@ -2958,9 +2956,9 @@
}
},
"node_modules/css-loader": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.2.0.tgz",
- "integrity": "sha512-MfRo2MjEeLXMlUkeUwN71Vx5oc6EJnx5UQ4Yi9iUtYQvrPtwLUucYptz0hc6n++kdNcyF5olYBS4vPjJDAcLkw==",
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.2.1.tgz",
+ "integrity": "sha512-YCyRzlt/jgG1xanXZDG/DHqAueOtXFHeusP9TS478oP1J++JSKOyEgGW1GHVoCj/rkS+GWOlBwqQJBr9yajQ9w==",
"dev": true,
"dependencies": {
"camelcase": "^6.2.0",
@@ -3570,9 +3568,9 @@
}
},
"node_modules/esbuild": {
- "version": "0.10.2",
- "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.10.2.tgz",
- "integrity": "sha512-/5vsZD7wTJJHC3yNXLUjXNvUDwqwNoIMvFvLd9tcDQ9el5l13pspYm3yufavjIeYvNtAbo+6N/6uoWx9dGA6ug==",
+ "version": "0.11.6",
+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.11.6.tgz",
+ "integrity": "sha512-L+nKW9ftVS/N2CVJMR9YmXHbkm+vHzlNYuo09rzipQhF7dYNvRLfWoEPSDRTl10and4owFBV9rJ2CTFNtLIOiw==",
"dev": true,
"hasInstallScript": true,
"bin": {
@@ -3606,8 +3604,7 @@
"esprima": "^4.0.1",
"estraverse": "^5.2.0",
"esutils": "^2.0.2",
- "optionator": "^0.8.1",
- "source-map": "~0.6.1"
+ "optionator": "^0.8.1"
},
"bin": {
"escodegen": "bin/escodegen.js",
@@ -3768,9 +3765,9 @@
}
},
"node_modules/eslint-plugin-react": {
- "version": "7.23.1",
- "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.23.1.tgz",
- "integrity": "sha512-MvFGhZjI8Z4HusajmSw0ougGrq3Gs4vT/0WgwksZgf5RrLrRa2oYAw56okU4tZJl8+j7IYNuTM+2RnFEuTSdRQ==",
+ "version": "7.23.2",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.23.2.tgz",
+ "integrity": "sha512-AfjgFQB+nYszudkxRkTFu0UR1zEQig0ArVMPloKhxwlwkzaw/fBiH0QWcBBhZONlXqQC51+nfqFrkn4EzHcGBw==",
"dev": true,
"dependencies": {
"array-includes": "^3.1.3",
@@ -4250,7 +4247,6 @@
"integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
"dev": true,
"dependencies": {
- "@types/yauzl": "^2.9.1",
"debug": "^4.1.1",
"get-stream": "^5.1.0",
"yauzl": "^2.10.0"
@@ -4443,9 +4439,9 @@
}
},
"node_modules/fork-ts-checker-webpack-plugin": {
- "version": "6.2.0",
- "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.2.0.tgz",
- "integrity": "sha512-DTNbOhq6lRdjYprukX54JMeYJgQ0zMow+R5BMLwWxEX2NAXthIkwnV8DBmsWjwNLSUItKZM4TCCJbtgrtKBu2Q==",
+ "version": "6.2.1",
+ "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.2.1.tgz",
+ "integrity": "sha512-Pyhn2kav/Y2g6I7aInABgcph/B78jjdXc4kGHzaAUBL4UVthknxM6aMH47JwpnuTJmdOuf6p5vMbIahsBHuWGg==",
"dev": true,
"dependencies": {
"@babel/code-frame": "^7.8.3",
@@ -5925,7 +5921,6 @@
"@types/node": "*",
"anymatch": "^3.0.3",
"fb-watchman": "^2.0.0",
- "fsevents": "^2.1.2",
"graceful-fs": "^4.2.4",
"jest-regex-util": "^26.0.0",
"jest-serializer": "^26.6.2",
@@ -6425,7 +6420,6 @@
"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
"dev": true,
"dependencies": {
- "graceful-fs": "^4.1.6",
"universalify": "^2.0.0"
},
"optionalDependencies": {
@@ -6913,9 +6907,9 @@
}
},
"node_modules/mini-css-extract-plugin": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.4.0.tgz",
- "integrity": "sha512-DyQr5DhXXARKZoc4kwvCvD95kh69dUupfuKOmBUqZ4kBTmRaRZcU32lYu3cLd6nEGXhQ1l7LzZ3F/CjItaY6VQ==",
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.4.1.tgz",
+ "integrity": "sha512-COAGbpAsU0ioFzj+/RRfO5Qv177L1Z/XAx2EmCF33b8GDDqKygMffBTws2lit8iaPdrbKEY5P+zsseBUCREZWQ==",
"dev": true,
"dependencies": {
"loader-utils": "^2.0.0",
@@ -10640,9 +10634,9 @@
}
},
"node_modules/tslib": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
- "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A=="
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
+ "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="
},
"node_modules/tsutils": {
"version": "3.21.0",
@@ -10726,9 +10720,9 @@
}
},
"node_modules/typescript": {
- "version": "4.2.3",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.3.tgz",
- "integrity": "sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw==",
+ "version": "4.2.4",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz",
+ "integrity": "sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==",
"dev": true,
"bin": {
"tsc": "bin/tsc",
@@ -11034,9 +11028,9 @@
}
},
"node_modules/webpack": {
- "version": "5.28.0",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.28.0.tgz",
- "integrity": "sha512-1xllYVmA4dIvRjHzwELgW4KjIU1fW4PEuEnjsylz7k7H5HgPOctIq7W1jrt3sKH9yG5d72//XWzsHhfoWvsQVg==",
+ "version": "5.31.0",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.31.0.tgz",
+ "integrity": "sha512-3fUfZT/FUuThWSSyL32Fsh7weUUfYP/Fjc/cGSbla5KiSo0GtI1JMssCRUopJTvmLjrw05R2q7rlLtiKdSzkzQ==",
"dev": true,
"dependencies": {
"@types/eslint-scope": "^3.7.0",
@@ -12550,9 +12544,9 @@
}
},
"@types/jsdom": {
- "version": "16.2.9",
- "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-16.2.9.tgz",
- "integrity": "sha512-7+HFvB7RIrU4KGazrn0/K81yjdg1hpwshM+nbt7CNlbwN1TUq5sBFMCfVglBYYv29l6ZTmXXFEB2FnxLv5gDcg==",
+ "version": "16.2.10",
+ "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-16.2.10.tgz",
+ "integrity": "sha512-q3aIjp3ehhVSXSbvNyuireAfvU2umRiZ2aLumyeZewCnoNaokrRDdTu5IvaeE9pzNtWHXrUnM9lb22Vl3W08EA==",
"dev": true,
"requires": {
"@types/node": "*",
@@ -12567,9 +12561,9 @@
"dev": true
},
"@types/marked": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/@types/marked/-/marked-2.0.0.tgz",
- "integrity": "sha512-kSOVa3R6HJvFdd3UIbTYvrSBTPHjXhNErh7/8oSCKOwqdOkk4Oj8N77n+f6dsgd1jW3j3SU5EhnmRxPhNKOmtQ==",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/@types/marked/-/marked-2.0.1.tgz",
+ "integrity": "sha512-/CFe3HvXMkh7YkJS0DGRsC0hgwWZDZbSCmY/X00bSCnZ4ukS2Glk9veIkRoPu2ElMbKpjxseXn1y9MkTwGHVjw==",
"dev": true
},
"@types/node": {
@@ -12696,13 +12690,13 @@
}
},
"@typescript-eslint/eslint-plugin": {
- "version": "4.19.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.19.0.tgz",
- "integrity": "sha512-CRQNQ0mC2Pa7VLwKFbrGVTArfdVDdefS+gTw0oC98vSI98IX5A8EVH4BzJ2FOB0YlCmm8Im36Elad/Jgtvveaw==",
+ "version": "4.21.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.21.0.tgz",
+ "integrity": "sha512-FPUyCPKZbVGexmbCFI3EQHzCZdy2/5f+jv6k2EDljGdXSRc0cKvbndd2nHZkSLqCNOPk0jB6lGzwIkglXcYVsQ==",
"dev": true,
"requires": {
- "@typescript-eslint/experimental-utils": "4.19.0",
- "@typescript-eslint/scope-manager": "4.19.0",
+ "@typescript-eslint/experimental-utils": "4.21.0",
+ "@typescript-eslint/scope-manager": "4.21.0",
"debug": "^4.1.1",
"functional-red-black-tree": "^1.0.1",
"lodash": "^4.17.15",
@@ -12712,55 +12706,55 @@
}
},
"@typescript-eslint/experimental-utils": {
- "version": "4.19.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.19.0.tgz",
- "integrity": "sha512-9/23F1nnyzbHKuoTqFN1iXwN3bvOm/PRIXSBR3qFAYotK/0LveEOHr5JT1WZSzcD6BESl8kPOG3OoDRKO84bHA==",
+ "version": "4.21.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.21.0.tgz",
+ "integrity": "sha512-cEbgosW/tUFvKmkg3cU7LBoZhvUs+ZPVM9alb25XvR0dal4qHL3SiUqHNrzoWSxaXA9gsifrYrS1xdDV6w/gIA==",
"dev": true,
"requires": {
"@types/json-schema": "^7.0.3",
- "@typescript-eslint/scope-manager": "4.19.0",
- "@typescript-eslint/types": "4.19.0",
- "@typescript-eslint/typescript-estree": "4.19.0",
+ "@typescript-eslint/scope-manager": "4.21.0",
+ "@typescript-eslint/types": "4.21.0",
+ "@typescript-eslint/typescript-estree": "4.21.0",
"eslint-scope": "^5.0.0",
"eslint-utils": "^2.0.0"
}
},
"@typescript-eslint/parser": {
- "version": "4.19.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.19.0.tgz",
- "integrity": "sha512-/uabZjo2ZZhm66rdAu21HA8nQebl3lAIDcybUoOxoI7VbZBYavLIwtOOmykKCJy+Xq6Vw6ugkiwn8Js7D6wieA==",
+ "version": "4.21.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.21.0.tgz",
+ "integrity": "sha512-eyNf7QmE5O/l1smaQgN0Lj2M/1jOuNg2NrBm1dqqQN0sVngTLyw8tdCbih96ixlhbF1oINoN8fDCyEH9SjLeIA==",
"dev": true,
"requires": {
- "@typescript-eslint/scope-manager": "4.19.0",
- "@typescript-eslint/types": "4.19.0",
- "@typescript-eslint/typescript-estree": "4.19.0",
+ "@typescript-eslint/scope-manager": "4.21.0",
+ "@typescript-eslint/types": "4.21.0",
+ "@typescript-eslint/typescript-estree": "4.21.0",
"debug": "^4.1.1"
}
},
"@typescript-eslint/scope-manager": {
- "version": "4.19.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.19.0.tgz",
- "integrity": "sha512-GGy4Ba/hLXwJXygkXqMzduqOMc+Na6LrJTZXJWVhRrSuZeXmu8TAnniQVKgj8uTRKe4igO2ysYzH+Np879G75g==",
+ "version": "4.21.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.21.0.tgz",
+ "integrity": "sha512-kfOjF0w1Ix7+a5T1knOw00f7uAP9Gx44+OEsNQi0PvvTPLYeXJlsCJ4tYnDj5PQEYfpcgOH5yBlw7K+UEI9Agw==",
"dev": true,
"requires": {
- "@typescript-eslint/types": "4.19.0",
- "@typescript-eslint/visitor-keys": "4.19.0"
+ "@typescript-eslint/types": "4.21.0",
+ "@typescript-eslint/visitor-keys": "4.21.0"
}
},
"@typescript-eslint/types": {
- "version": "4.19.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.19.0.tgz",
- "integrity": "sha512-A4iAlexVvd4IBsSTNxdvdepW0D4uR/fwxDrKUa+iEY9UWvGREu2ZyB8ylTENM1SH8F7bVC9ac9+si3LWNxcBuA==",
+ "version": "4.21.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.21.0.tgz",
+ "integrity": "sha512-+OQaupjGVVc8iXbt6M1oZMwyKQNehAfLYJJ3SdvnofK2qcjfor9pEM62rVjBknhowTkh+2HF+/KdRAc/wGBN2w==",
"dev": true
},
"@typescript-eslint/typescript-estree": {
- "version": "4.19.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.19.0.tgz",
- "integrity": "sha512-3xqArJ/A62smaQYRv2ZFyTA+XxGGWmlDYrsfZG68zJeNbeqRScnhf81rUVa6QG4UgzHnXw5VnMT5cg75dQGDkA==",
+ "version": "4.21.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.21.0.tgz",
+ "integrity": "sha512-ZD3M7yLaVGVYLw4nkkoGKumb7Rog7QID9YOWobFDMQKNl+vPxqVIW/uDk+MDeGc+OHcoG2nJ2HphwiPNajKw3w==",
"dev": true,
"requires": {
- "@typescript-eslint/types": "4.19.0",
- "@typescript-eslint/visitor-keys": "4.19.0",
+ "@typescript-eslint/types": "4.21.0",
+ "@typescript-eslint/visitor-keys": "4.21.0",
"debug": "^4.1.1",
"globby": "^11.0.1",
"is-glob": "^4.0.1",
@@ -12769,12 +12763,12 @@
}
},
"@typescript-eslint/visitor-keys": {
- "version": "4.19.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.19.0.tgz",
- "integrity": "sha512-aGPS6kz//j7XLSlgpzU2SeTqHPsmRYxFztj2vPuMMFJXZudpRSehE3WCV+BaxwZFvfAqMoSd86TEuM0PQ59E/A==",
+ "version": "4.21.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.21.0.tgz",
+ "integrity": "sha512-dH22dROWGi5Z6p+Igc8bLVLmwy7vEe8r+8c+raPQU0LxgogPUrRAtRGtvBWmlr9waTu3n+QLt/qrS/hWzk1x5w==",
"dev": true,
"requires": {
- "@typescript-eslint/types": "4.19.0",
+ "@typescript-eslint/types": "4.21.0",
"eslint-visitor-keys": "^2.0.0"
}
},
@@ -12948,9 +12942,9 @@
"requires": {}
},
"@wojtekmaj/enzyme-adapter-react-17": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/@wojtekmaj/enzyme-adapter-react-17/-/enzyme-adapter-react-17-0.6.0.tgz",
- "integrity": "sha512-2lRGjZDNTaUyIHLEKqkbGIKK0I4vLgXOcwt90ddsOAGalrZGKmnHnFQzFoO9V84hF+fMYHkpRqka4JGCnvkoow==",
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/@wojtekmaj/enzyme-adapter-react-17/-/enzyme-adapter-react-17-0.6.1.tgz",
+ "integrity": "sha512-xgPfzLVpN0epIHeZofahwr5qwpukEDNAbrufgeDWN6vZPtfblGCC+OZG5TlfK+A6ePVy8sBkD8S2X4tO17JKjg==",
"dev": true,
"requires": {
"@wojtekmaj/enzyme-adapter-utils": "^0.1.0",
@@ -13956,9 +13950,9 @@
}
},
"css-loader": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.2.0.tgz",
- "integrity": "sha512-MfRo2MjEeLXMlUkeUwN71Vx5oc6EJnx5UQ4Yi9iUtYQvrPtwLUucYptz0hc6n++kdNcyF5olYBS4vPjJDAcLkw==",
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-5.2.1.tgz",
+ "integrity": "sha512-YCyRzlt/jgG1xanXZDG/DHqAueOtXFHeusP9TS478oP1J++JSKOyEgGW1GHVoCj/rkS+GWOlBwqQJBr9yajQ9w==",
"dev": true,
"requires": {
"camelcase": "^6.2.0",
@@ -14422,9 +14416,9 @@
}
},
"esbuild": {
- "version": "0.10.2",
- "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.10.2.tgz",
- "integrity": "sha512-/5vsZD7wTJJHC3yNXLUjXNvUDwqwNoIMvFvLd9tcDQ9el5l13pspYm3yufavjIeYvNtAbo+6N/6uoWx9dGA6ug==",
+ "version": "0.11.6",
+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.11.6.tgz",
+ "integrity": "sha512-L+nKW9ftVS/N2CVJMR9YmXHbkm+vHzlNYuo09rzipQhF7dYNvRLfWoEPSDRTl10and4owFBV9rJ2CTFNtLIOiw==",
"dev": true
},
"escalade": {
@@ -14561,9 +14555,9 @@
}
},
"eslint-plugin-react": {
- "version": "7.23.1",
- "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.23.1.tgz",
- "integrity": "sha512-MvFGhZjI8Z4HusajmSw0ougGrq3Gs4vT/0WgwksZgf5RrLrRa2oYAw56okU4tZJl8+j7IYNuTM+2RnFEuTSdRQ==",
+ "version": "7.23.2",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.23.2.tgz",
+ "integrity": "sha512-AfjgFQB+nYszudkxRkTFu0UR1zEQig0ArVMPloKhxwlwkzaw/fBiH0QWcBBhZONlXqQC51+nfqFrkn4EzHcGBw==",
"dev": true,
"requires": {
"array-includes": "^3.1.3",
@@ -15088,9 +15082,9 @@
"dev": true
},
"fork-ts-checker-webpack-plugin": {
- "version": "6.2.0",
- "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.2.0.tgz",
- "integrity": "sha512-DTNbOhq6lRdjYprukX54JMeYJgQ0zMow+R5BMLwWxEX2NAXthIkwnV8DBmsWjwNLSUItKZM4TCCJbtgrtKBu2Q==",
+ "version": "6.2.1",
+ "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.2.1.tgz",
+ "integrity": "sha512-Pyhn2kav/Y2g6I7aInABgcph/B78jjdXc4kGHzaAUBL4UVthknxM6aMH47JwpnuTJmdOuf6p5vMbIahsBHuWGg==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.8.3",
@@ -16959,9 +16953,9 @@
"dev": true
},
"mini-css-extract-plugin": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.4.0.tgz",
- "integrity": "sha512-DyQr5DhXXARKZoc4kwvCvD95kh69dUupfuKOmBUqZ4kBTmRaRZcU32lYu3cLd6nEGXhQ1l7LzZ3F/CjItaY6VQ==",
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-1.4.1.tgz",
+ "integrity": "sha512-COAGbpAsU0ioFzj+/RRfO5Qv177L1Z/XAx2EmCF33b8GDDqKygMffBTws2lit8iaPdrbKEY5P+zsseBUCREZWQ==",
"dev": true,
"requires": {
"loader-utils": "^2.0.0",
@@ -19833,9 +19827,9 @@
}
},
"tslib": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
- "integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A=="
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
+ "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="
},
"tsutils": {
"version": "3.21.0",
@@ -19900,9 +19894,9 @@
}
},
"typescript": {
- "version": "4.2.3",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.3.tgz",
- "integrity": "sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw==",
+ "version": "4.2.4",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz",
+ "integrity": "sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==",
"dev": true
},
"unbox-primitive": {
@@ -20145,9 +20139,9 @@
"dev": true
},
"webpack": {
- "version": "5.28.0",
- "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.28.0.tgz",
- "integrity": "sha512-1xllYVmA4dIvRjHzwELgW4KjIU1fW4PEuEnjsylz7k7H5HgPOctIq7W1jrt3sKH9yG5d72//XWzsHhfoWvsQVg==",
+ "version": "5.31.0",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.31.0.tgz",
+ "integrity": "sha512-3fUfZT/FUuThWSSyL32Fsh7weUUfYP/Fjc/cGSbla5KiSo0GtI1JMssCRUopJTvmLjrw05R2q7rlLtiKdSzkzQ==",
"dev": true,
"requires": {
"@types/eslint-scope": "^3.7.0",
diff --git a/package.json b/package.json
index e301dac04..4d2ff4201 100644
--- a/package.json
+++ b/package.json
@@ -11,36 +11,36 @@
"react-icons": "4.2.0",
"react-textarea-autosize": "8.3.2",
"react-toastify": "7.0.3",
- "tslib": "2.1.0"
+ "tslib": "2.2.0"
},
"devDependencies": {
"@types/dompurify": "2.2.1",
"@types/enzyme": "3.10.8",
"@types/jest": "26.0.22",
- "@types/jsdom": "16.2.9",
- "@types/marked": "2.0.0",
+ "@types/jsdom": "16.2.10",
+ "@types/marked": "2.0.1",
"@types/node": "14.14.37",
"@types/puppeteer": "5.4.3",
"@types/react": "17.0.3",
"@types/react-dom": "17.0.3",
"@types/react-textarea-autosize": "4.3.5",
- "@typescript-eslint/eslint-plugin": "4.19.0",
- "@typescript-eslint/parser": "4.19.0",
- "@wojtekmaj/enzyme-adapter-react-17": "0.6.0",
+ "@typescript-eslint/eslint-plugin": "4.21.0",
+ "@typescript-eslint/parser": "4.21.0",
+ "@wojtekmaj/enzyme-adapter-react-17": "0.6.1",
"autoprefixer": "10.2.5",
- "css-loader": "5.2.0",
+ "css-loader": "5.2.1",
"dotenv": "8.2.0",
"enzyme": "3.11.0",
- "esbuild": "0.10.2",
+ "esbuild": "0.11.6",
"eslint": "7.23.0",
"eslint-config-prettier": "8.1.0",
"eslint-plugin-prettier": "3.3.1",
- "eslint-plugin-react": "7.23.1",
+ "eslint-plugin-react": "7.23.2",
"eslint-plugin-react-hooks": "4.2.0",
"file-loader": "6.2.0",
- "fork-ts-checker-webpack-plugin": "6.2.0",
+ "fork-ts-checker-webpack-plugin": "6.2.1",
"jest": "26.6.3",
- "mini-css-extract-plugin": "1.4.0",
+ "mini-css-extract-plugin": "1.4.1",
"node-sass": "5.0.0",
"prettier": "2.2.1",
"puppeteer": "8.0.0",
@@ -48,8 +48,8 @@
"sass-loader": "11.0.1",
"ts-jest": "26.5.4",
"ts-loader": "8.1.0",
- "typescript": "4.2.3",
- "webpack": "5.28.0",
+ "typescript": "4.2.4",
+ "webpack": "5.31.0",
"webpack-bundle-analyzer": "4.4.0",
"webpack-cli": "4.6.0"
},
diff --git a/public/assets/images/undraw-empty.svg b/public/assets/images/undraw-empty.svg
new file mode 100644
index 000000000..83d2b889b
--- /dev/null
+++ b/public/assets/images/undraw-empty.svg
@@ -0,0 +1 @@
+<svg id="9af98f83-10c5-4067-bc84-20554b2827d8" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1009.54" height="789.93" viewBox="0 0 1009.54 789.93"><defs><linearGradient id="07c62293-c0d3-4921-8e06-4e39241449cd" x1="318.22" y1="488.45" x2="630.35" y2="488.45" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="gray" stop-opacity="0.25"/><stop offset="0.54" stop-color="gray" stop-opacity="0.12"/><stop offset="1" stop-color="gray" stop-opacity="0.1"/></linearGradient></defs><title>empty</title><ellipse cx="354.13" cy="741.27" rx="176.1" ry="33.36" fill="#4338ca" opacity="0.1"/><path d="M681.78,166.43c-64.72-2.24-126.36-23.14-185.22-46S379.4,72.25,316.23,60.14C275.6,52.35,229.13,51.24,196.4,73c-31.51,21-41.69,57.15-47.16,90.72-4.12,25.26-6.54,51.85,4.74,75.5,7.84,16.42,21.74,30.22,31.36,45.95,33.47,54.72,9.81,122.2-26.45,175.63-17,25.06-36.75,49-49.88,75.65S89.81,593.74,101.3,621c11.38,27,38.51,47.24,67.9,61.49,59.69,28.95,130,37.23,198.61,41.93,151.83,10.38,304.46,5.89,456.69,1.38,56.34-1.66,112.92-3.35,168.34-12.06,30.78-4.84,62.55-12.52,84.9-31.06,28.36-23.53,35.39-63.37,16.38-92.87-31.88-49.5-120-61.79-142.31-114.9-12.26-29.24.33-61.8,18.16-88.91,38.24-58.17,102.33-109.2,105.7-175.68,2.32-45.66-28.49-91.39-76.13-113-49.93-22.65-119.18-19.8-156,17.69C805.59,153.57,738.93,168.42,681.78,166.43Z" transform="translate(-95.23 -55.03)" fill="#4338ca" opacity="0.1"/><path d="M630.35,416.77l-30.63-20.65h0l15.45-23-80.9-6.45L505.2,389.15l-36.39-20.4-30.35,3.65-.36-8a225.78,225.78,0,0,0-2.51-24.9c.13-2.5.22-5.37.21-8.49,0-13.15-1.78-30.58-9.6-42.2L428,272.63,413.4,255.38a110.37,110.37,0,0,1,8-13.46c.5-.72,1-1.42,1.54-2.1,18.95-1.37,33.9-16.95,33.9-36,0-.88,0-1.76-.1-2.63,0-.35-.07-.71-.11-1.06,1.85,1,3.72,2,5.59,3,.35.5.75,1,1.19,1.59l0,0,.09.11.56.69.18.21c.2.24.41.47.62.71l.14.16c.53.59,1.09,1.19,1.69,1.78a1.8,1.8,0,0,1,.2.19l.75.7.21.19c.64.57,1.32,1.12,2,1.64l.22.16.86.59.28.18c.33.2.67.41,1,.6l.12.07c.39.21.79.41,1.19.6l.2.08q.51.22,1,.42l.31.11c.35.12.69.23,1.05.33l.22.06c.44.11.88.2,1.33.27h.05a10.88,10.88,0,0,0,1.28.13h.29a11,11,0,0,0,1.15,0h.25a11.85,11.85,0,0,0,1.43-.17,15.78,15.78,0,0,0,6.3-2.26,5.5,5.5,0,0,0,1.28-1.19c2-2.62-.2-5.49-.2-5.49h0c-.78-1.86-5.84-3.17-5.84-3.17s-16-6.68-16-12-4-32.92-45.29-39.23c0,0-26.86-1.51-34.41,12.87l-.16,1.68c-2.22,1.39-4.06,4.18-6.25,5a10.21,10.21,0,0,0-2.71,1l0-.19h0a2.58,2.58,0,0,0-.61.79,8,8,0,0,0-.83,3,11.3,11.3,0,0,1-1.31,3.63,8.07,8.07,0,0,1-.6.92h0l-.17.27a7.3,7.3,0,0,0,3.4-.55,16.93,16.93,0,0,1-1,4,3.32,3.32,0,0,0,3.08-1.84l0-.08.13-.18a8.44,8.44,0,0,0,.62-1.45l-.11.12c.2-.65.38-1.31.6-1.95a3.06,3.06,0,0,1,.49-1,2.42,2.42,0,0,1,2.07-.69l-.41,8.67h.18a11.83,11.83,0,0,1-.88,1.82c-1.42,2.3-4,3.87-4.95,6.39a9.4,9.4,0,0,0-.46,3.78c0,.75.09,1.51.15,2.26v-.06c.14,2,.18,3.9-.9,5.51-.74,1.1-1.93,1.93-2.34,3.18a3.1,3.1,0,0,0-.15,1.08,12.13,12.13,0,0,0,.68,3.21.14.14,0,0,0,0-.06,4.88,4.88,0,0,1,.17,2.36c-.45,2-2.88,3.67-2.76,5.58a2.15,2.15,0,0,0,.11.74,4.05,4.05,0,0,0,2.26,2,8.8,8.8,0,0,0,5.08,1.12,6.68,6.68,0,0,0,1.9-.65c-.7,1.61-1.42,3.2-2.15,4.71-.11.24-.23.48-.35.72,0,0-6.18-4.13-9.69,4.29a18.68,18.68,0,0,0-2.17,5.64,13.42,13.42,0,0,1-.74,2.32,14.93,14.93,0,0,1-6.68,6c-7.16,3.28-36.08,39.35-36.59,48.69a54.49,54.49,0,0,1-1.84,10.78,64.15,64.15,0,0,0-1.72,25.49,48.77,48.77,0,0,0,1.77,8.13c3.07,9.33,5.12,26.74,5.12,26.74l3.32,30.22a86,86,0,0,0,.54,12.49c-3.39,3.87-17,20-11.8,24.39,4,3.46,11,2.89,14.93,2.18-3.31,8.19-8.52,22.43-9.21,32.21-1,14.47,1.71,33.64,6,41s18.59,26.24,18.59,26.24-.67,25.9,4.44,35.31,7.17,28.93,7.17,28.93,4.77,16.48,2.38,22.54,4.43,11.1-2.73,15.13-16.32,94.86-16.32,94.86-3.69,59.53,0,62.56a3.75,3.75,0,0,0,.63.37v20s-2.56,4.2,7.85,5.05c7.13.57,27.34,1.86,39.33,2.61l9.29.58s22,4.38,31.72,0,26.95-4.28,24.39-15.85a32.92,32.92,0,0,0-1.36-4.63c-2.81-7.18-7.58-8-16.37-10-.51-.11-1-.21-1.45-.29-9.26-1.61-12.3,2.7-17.49-2.91-4.51-4.85-18.87-10.28-23.76-12,.12-.36.27-.71.39-1.08a7.32,7.32,0,0,1-3.71-1.81l13.25.84,7.89.49s18.7,3.73,27,0,22.9-3.63,20.72-13.46a28.21,28.21,0,0,0-1.15-3.94c-2.39-6.1-6.45-6.77-13.92-8.46-.43-.09-.83-.18-1.23-.25-7.87-1.37-10.45,2.29-14.86-2.47-3.78-4.06-15.71-8.61-20-10.16,0-2.22-3-5.38-4.89-8.55-2.22-3.7,1.88-16.65,1.88-16.65L411,658.74a10.38,10.38,0,0,1,2.8-.8s10.58-10.1,8.19-20.86a69.13,69.13,0,0,1-.76-9.83c3.48-3.23,8.27-8,9.63-10.94,2.22-4.79,0-28,0-28V499.56l17.7,1.79L464.62,503l4.89.5,16.06,1.62,36.91,3.73,33.26-6.3,14.39-2.72,29.59-5.6V421.83ZM386.74,176.86l-2.06-.22C385.36,176.67,386.08,176.8,386.74,176.86Z" transform="translate(-95.23 -55.03)" fill="url(#07c62293-c0d3-4921-8e06-4e39241449cd)"/><path d="M558.56,463.78c-10,14.31-45.95,6.73-45.95,6.73l-27.86-26.07L481,440.91l6.29-13.36s2,.55,5.43,1.53C510.73,434.31,567,451.75,558.56,463.78Z" transform="translate(-95.23 -55.03)" fill="#efb7b9"/><path d="M492.7,429.08c-1.23,4.28-4.6,10.69-7.95,15.36L481,440.91l6.29-13.36S489.31,428.1,492.7,429.08Z" transform="translate(-95.23 -55.03)" opacity="0.1"/><path d="M397.15,278.42s-25.68,11.39-24.42,39.36a461.14,461.14,0,0,0,5.88,53.76s-5.25,42.09,16.61,52.94,42.09,19.77,42.09,19.77,34.2,3.68,38.45,5.2,17.53-21.72,15.08-25.34S457,412.9,453,406.86s-13.25-9.77-13.25-9.77-9.55-5.78-10.2-11,1.87-9.11,2.51-11.4,2.26-24.4,2.26-24.4S445.1,271.59,397.15,278.42Z" transform="translate(-95.23 -55.03)" fill="#dce6f2"/><path d="M414.1,370.39s-35.23,5.9-31.82,18.23C382.28,388.62,395.07,375.31,414.1,370.39Z" transform="translate(-95.23 -55.03)" opacity="0.1"/><path d="M414.37,375.38S395,391.19,398.79,392,414.37,375.38,414.37,375.38Z" transform="translate(-95.23 -55.03)" opacity="0.1"/><path d="M423.68,380.89s-5.19,10.63-2,9.91S423.68,380.89,423.68,380.89Z" transform="translate(-95.23 -55.03)" opacity="0.1"/><path d="M494,430.21l-2.14-.61c.61-2,.78-3.62.28-4.37-2.45-3.62-33.82-11.2-37.81-17.25s-13.25-9.77-13.25-9.77-9.55-5.78-10.2-11,1.87-9.11,2.51-11.4,2.26-24.41,2.26-24.41,10.75-78.69-37.2-71.86c0,0-25.68,11.4-24.43,39.37a459.85,459.85,0,0,0,5.89,53.76s-5.25,42.09,16.61,52.94,42.09,19.77,42.09,19.77,34.19,3.67,38.45,5.2c1.61.58,4.52-2.41,7.37-6.52l1.62,1.51,27.86,26.06s35.95,7.59,45.95-6.72C568.31,452.87,512.05,435.43,494,430.21Z" transform="translate(-95.23 -55.03)" opacity="0.1"/><path d="M382.37,173.44a8.5,8.5,0,0,0-2.77,1.07c-1,.83-1,2.25-1.25,3.49a11.48,11.48,0,0,1-2,4.78,7.19,7.19,0,0,0,3.33-.55,17.14,17.14,0,0,1-1,4,3.24,3.24,0,0,0,3-1.83,19.26,19.26,0,0,0,1.25-3.51,2.89,2.89,0,0,1,.48-1c.92-1.09,2.63-.6,4.05-.46a6.65,6.65,0,0,0,6.08-2.92c1.51-2.29,1.6-8.15-2-8.77C387.78,167.12,385.44,172.3,382.37,173.44Z" transform="translate(-95.23 -55.03)" fill="#965d7b"/><g opacity="0.1"><path d="M379.5,175.74c.09-.49.15-1,.26-1.49h0c-.95.83-1,2.24-1.25,3.49a11,11,0,0,1-.59,2.11A11.46,11.46,0,0,0,379.5,175.74Z" transform="translate(-95.23 -55.03)"/><path d="M379.82,184a16.63,16.63,0,0,0,1-4,7.16,7.16,0,0,1-3.17.55,11.57,11.57,0,0,1-1.15,2,7.12,7.12,0,0,0,3.32-.54,16.63,16.63,0,0,1-1,4,3.25,3.25,0,0,0,3-1.83,7.46,7.46,0,0,0,.6-1.43A3,3,0,0,1,379.82,184Z" transform="translate(-95.23 -55.03)"/><path d="M388.6,177.2c-1.42-.14-3.14-.63-4.06.46a3.09,3.09,0,0,0-.48,1c-.09.26-.17.53-.24.8.95-.75,2.49-.35,3.78-.22a6.68,6.68,0,0,0,6.08-2.92,5.54,5.54,0,0,0,.67-1.57A6.66,6.66,0,0,1,388.6,177.2Z" transform="translate(-95.23 -55.03)"/></g><polygon points="317.24 201 332.49 219.34 330.5 237.85 312.07 209 317.24 201" fill="#dce6f2"/><polygon points="332.48 219.34 330.61 236.75 330.49 237.85 313.86 211.81 312.07 209 312.59 208.19 317.23 201 318.26 202.24 332.48 219.34" opacity="0.1"/><path d="M435.63,231.2c-5.16,1.48-10.09,6.56-14.38,12.73a108.65,108.65,0,0,0-7.76,13.34c-1.41,2.82-2.65,5.53-3.68,7.89l-.72,1.68c-1.74,4.11-2.71,6.86-2.71,6.86S366.88,244,373.13,242c2.1-.67,4.86-5.17,7.59-10.84l.34-.72c1.73-3.64,3.43-7.7,4.94-11.52,3.09-7.85,5.38-14.67,5.38-14.67S451.38,226.7,435.63,231.2Z" transform="translate(-95.23 -55.03)" fill="#efb7b9"/><path d="M459.26,202.58s9.12,16.5,21.37,14.25,7.21-8.86,7.21-8.86Z" transform="translate(-95.23 -55.03)" fill="#444053"/><path d="M441.59,773.73c-8.08,3.69-26.35,0-26.35,0l-7.7-.48c-10-.64-26.74-1.72-32.66-2.2-8.64-.71-6.52-4.25-6.52-4.25V745.41l41.92-10.62s16.57,5.67,21.11,10.62c4.31,4.72,6.83,1.09,14.52,2.45.38.07.78.15,1.2.25,7.3,1.67,11.26,2.33,13.6,8.38a28.1,28.1,0,0,1,1.13,3.9C464,770.13,449.66,770.06,441.59,773.73Z" transform="translate(-95.23 -55.03)" fill="#a36468"/><path d="M460.71,756.49a31.34,31.34,0,0,1-4.72,2.42c-5.5,2.51-10.73,5.57-16.29,7.94s-11.55,4.06-17.57,3.61c-3.15-.23-6.37-1-9.38-.1a21.66,21.66,0,0,0-5.21,2.89c-10-.64-26.74-1.72-32.66-2.2-8.64-.71-6.52-4.25-6.52-4.25v-2.5c.31,0,.66-.09,1.06-.12a18.88,18.88,0,0,1,6.1.91c4.34,1.18,8.66,2.34,13,3.5a10.27,10.27,0,0,1,5-6.38,15.94,15.94,0,0,1,8.06-1.85c6.73.09,13.1,3.28,19.82,3.6a10.92,10.92,0,0,0,5.49-.92c.92-.46,1.73-1.13,2.63-1.64a19.2,19.2,0,0,1,4.53-1.53A99.76,99.76,0,0,0,447,755.69c1.2-.47,2.6-1.32,2.44-2.6-.21-1.7-2.88-1.9-3.58-3.46a2,2,0,0,1,.08-1.77c.38.07.78.15,1.2.25C454.41,749.78,458.37,750.44,460.71,756.49Z" transform="translate(-95.23 -55.03)" opacity="0.1"/><path d="M433.05,820.53c-9.5,4.34-31,0-31,0L393,820c-11.72-.75-31.46-2-38.43-2.59-10.17-.84-7.67-5-7.67-5V787.2l49.33-12.5s19.5,6.67,24.84,12.5c5.07,5.55,8,1.28,17.09,2.88.45.08.92.18,1.41.29,8.59,2,13.25,2.75,16,9.87a32.1,32.1,0,0,1,1.33,4.59C459.38,816.29,442.55,816.2,433.05,820.53Z" transform="translate(-95.23 -55.03)" fill="#a36468"/><path d="M455.55,800.24a37.23,37.23,0,0,1-5.55,2.85c-6.47,2.95-12.63,6.55-19.17,9.34s-13.59,4.77-20.68,4.25c-3.7-.27-7.49-1.2-11-.12A25.5,25.5,0,0,0,393,820c-11.72-.75-31.46-2-38.43-2.59-10.17-.84-7.67-5-7.67-5v-2.94a12.5,12.5,0,0,1,1.25-.14,21.94,21.94,0,0,1,7.18,1.07l15.29,4.12a12.1,12.1,0,0,1,5.93-7.51,18.66,18.66,0,0,1,9.49-2.18c7.92.11,15.41,3.86,23.32,4.24A12.91,12.91,0,0,0,415.8,808c1.09-.55,2-1.34,3.1-1.93a21.75,21.75,0,0,1,5.33-1.8,119.69,119.69,0,0,0,15.16-4.92c1.41-.56,3.06-1.56,2.87-3.06-.25-2-3.39-2.24-4.22-4.08a2.41,2.41,0,0,1,.1-2.08c.45.08.92.18,1.41.29C448.14,792.34,452.8,793.12,455.55,800.24Z" transform="translate(-95.23 -55.03)" opacity="0.1"/><path d="M411.55,647.54l-2.67,62.83s-4,12.83-1.83,16.5,5.83,7.33,4.5,9.5S394.22,762,389.05,753s-10.27-48-10.27-48l4.77-48.17Z" transform="translate(-95.23 -55.03)" fill="#444053"/><path d="M423.13,491l7.42,9.92V587.2s2.17,23,0,27.75-13.17,14.25-13.17,14.25l-9.25-47.5,2-50.25Z" transform="translate(-95.23 -55.03)" fill="#444053"/><path d="M411.55,647.54l-2.67,62.83s-4,12.83-1.83,16.5,5.83,7.33,4.5,9.5S394.22,762,389.05,753s-10.27-48-10.27-48l4.77-48.17Z" transform="translate(-95.23 -55.03)" opacity="0.1"/><path d="M423.13,491l7.42,9.92V587.2s2.17,23,0,27.75-13.17,14.25-13.17,14.25l-9.25-47.5,2-50.25Z" transform="translate(-95.23 -55.03)" opacity="0.1"/><path d="M430.55,454.2v46.67l-8.33,36.33s-2.67,87.67-.34,98.33-8,20.67-8,20.67-6,.67-6,5.33-10,18-10,18l.33,26s4.34,48.67-2.33,58,2.33,10.67,2.33,10.67c-8.33,27.33-48.33,21-51.94,18s0-62,0-62,8.94-90,15.94-94,.34-9,2.67-15-2.33-22.33-2.33-22.33-2-19.34-7-28.67-4.34-35-4.34-35-14-18.67-18.16-26-6.84-26.33-5.84-40.67c.68-9.69,5.77-23.8,9-31.92,1.55-3.89,2.67-6.41,2.67-6.41l.95.25,54.62,14.3Z" transform="translate(-95.23 -55.03)" fill="#444053"/><path d="M435.63,231.2c-5.16,1.48-10.09,6.56-14.38,12.73l-1.12,0a35.72,35.72,0,0,1-31-17.93,35.18,35.18,0,0,1-3.14-7.15c3.09-7.85,5.38-14.67,5.38-14.67S451.38,226.7,435.63,231.2Z" transform="translate(-95.23 -55.03)" opacity="0.1"/><path d="M455.88,206.2A35.75,35.75,0,1,1,389,188.68a34.93,34.93,0,0,1,3.78-5.46A36.18,36.18,0,0,1,401,176a35.75,35.75,0,0,1,54.83,27.58C455.85,204.46,455.88,205.33,455.88,206.2Z" transform="translate(-95.23 -55.03)" fill="#efb7b9"/><path d="M425.84,291.78l-.12,1.1-16.63-26c-1.74,4.11-2.71,6.86-2.71,6.86S366.88,244,373.13,242c2.1-.67,4.86-5.17,7.59-10.84l.34-.72c2.9,8.64,19.75,25.91,26.76,32.83.81.8,1.48,1.46,2,1.94l1.07,1,.56.56C414,269.4,424.76,281,425.84,291.78Z" transform="translate(-95.23 -55.03)" opacity="0.1"/><path d="M438.27,380l-1.82,58.57L436.13,449s-21.56-2-41.68-4.2c-16.2-1.77-31.47-3.68-33.82-4.8-3-1.41-9.43-2.5-14.5-3.19-3.92-.53-7-.81-7-.81s-1.15.34-2.92.66c-3.86.7-10.64,1.27-14.59-2.16-5.05-4.39,8.22-20.34,11.53-24.17l.73-.83-1.25-11.55L329.38,368s-2-17.25-5-26.5a48.88,48.88,0,0,1-1.73-8.05,64.48,64.48,0,0,1,1.68-25.26,55.08,55.08,0,0,0,1.8-10.69c.5-9.25,28.75-45,35.75-48.25a14.84,14.84,0,0,0,7.16-7.14,13.64,13.64,0,0,0,1.09-3.11c3-13,10.59-7.84,10.59-7.84,1.83,10.17,30.16,37.09,30.16,37.09l.56.56c2.81,2.88,15.33,16.4,14.44,27.94a33.87,33.87,0,0,0,1.89,12.64,213.75,213.75,0,0,1,9.85,56Z" transform="translate(-95.23 -55.03)" fill="#dce6f2"/><path d="M398.13,310.45s-7,17-12.25,19.75S400.63,336,398.13,310.45Z" transform="translate(-95.23 -55.03)" opacity="0.1"/><path d="M403.38,342.2s-16,2-16,5S403.38,342.2,403.38,342.2Z" transform="translate(-95.23 -55.03)" opacity="0.1"/><path d="M420.13,361.7s-23.25,49.5-29.75,51S420.13,361.7,420.13,361.7Z" transform="translate(-95.23 -55.03)" opacity="0.1"/><path d="M410.44,270.76l-19.23,8.36L368,244.06a13.64,13.64,0,0,0,1.09-3.11c3-13,10.59-7.84,10.59-7.84,1.83,10.17,30.16,37.09,30.16,37.09Z" transform="translate(-95.23 -55.03)" opacity="0.1"/><path d="M411.44,268.76l-19.23,8.36L369,242.06a13.64,13.64,0,0,0,1.09-3.11c3-13,10.59-7.84,10.59-7.84,1.83,10.17,30.16,37.09,30.16,37.09Z" transform="translate(-95.23 -55.03)" fill="#dce6f2"/><path d="M436.13,449s-21.56-2-41.68-4.2l36.1,9.45v11c-1.58,1.43-2.95,2.17-3.84,1.79-4.16-1.75-38.11-7.25-38.11-7.25s-19.72-10-41-22a16.43,16.43,0,0,1-1.5-.94,23.64,23.64,0,0,1-6.3-6.31c-3.93-5.69-5.85-13-6.68-20.17a87.22,87.22,0,0,1-.52-12.38A101.51,101.51,0,0,1,333.88,384a460.08,460.08,0,0,1-3-54c.25-28,26.5-38,26.5-38,48.25-4.25,33.29,73.75,33.29,73.75s-2.79,22-3.55,24.25-3.49,6-3.12,11.25,9.59,11.53,9.59,11.53,9,4.22,12.71,10.47c2.7,4.61,20.24,10.86,30.15,15.32Z" transform="translate(-95.23 -55.03)" opacity="0.1"/><path d="M452.29,184a11.32,11.32,0,0,1-1,4.78,29.55,29.55,0,0,1-1.78,3.56,16.4,16.4,0,0,1-4.38,5.44c-2.31,1.65-5.23,2.11-8,2.78s-5.65,1.74-7.23,4.1a14.34,14.34,0,0,0-1.69,4.9,10.54,10.54,0,0,1-2,4.74,3.93,3.93,0,0,1-4.68,1.12,4.73,4.73,0,0,1-1.81-2.33c-1.14-2.57-1.43-5.42-1.89-8.19s-1.11-5.62-2.81-7.85-4.71-3.7-7.38-2.83a7.11,7.11,0,0,0-4,3.88,22.24,22.24,0,0,0-1.51,5.52q-1.86,10.18-4.39,20.24a1.86,1.86,0,0,1-.33.76,1.44,1.44,0,0,1-1,.42c-2.24.3-4.39-1.27-6.65-1.1a3.82,3.82,0,0,0-.69.11,35.73,35.73,0,0,1,3.61-40.8l.18-.05a10.78,10.78,0,0,0,4-2.52,42.22,42.22,0,0,0,4-4.63l.8-1a45.61,45.61,0,0,1,7.8-7.41,8,8,0,0,1,2.66-1.44,7.88,7.88,0,0,1,2.52-.08,63.57,63.57,0,0,0,10.41.39,66.79,66.79,0,0,1,7.31-.74c6.33.18,11.73,4.65,15.73,9.55C450.24,177.83,452.16,180.72,452.29,184Z" transform="translate(-95.23 -55.03)" opacity="0.1"/><path d="M384.33,189.63c-1.39,2.28-3.9,3.83-4.84,6.33-1.38,3.63.95,8.15-1.19,11.39-.71,1.09-1.88,1.9-2.28,3.15-.68,2.11,1.18,4.36.7,6.53s-3.34,4-2.58,6.12a4,4,0,0,0,2.2,2,8.6,8.6,0,0,0,5,1.11c2.73-.45,4.76-3.13,7.53-3.33,2.25-.16,4.4,1.4,6.64,1.11a1.5,1.5,0,0,0,1-.43,1.73,1.73,0,0,0,.33-.76q2.52-10.05,4.4-20.24a21.8,21.8,0,0,1,1.5-5.52,7.17,7.17,0,0,1,4-3.88c2.67-.86,5.67.6,7.38,2.83s2.36,5.08,2.82,7.85.75,5.62,1.88,8.19a4.78,4.78,0,0,0,1.82,2.34c1.5.87,3.52.18,4.67-1.12a10.43,10.43,0,0,0,2-4.75,14.28,14.28,0,0,1,1.69-4.89c1.58-2.36,4.47-3.43,7.23-4.1s5.67-1.14,8-2.79a16.46,16.46,0,0,0,4.38-5.43c1.48-2.58,2.86-5.38,2.74-8.35-.13-3.24-2.05-6.13-4.1-8.65-4-4.9-9.41-9.37-15.74-9.54a62.2,62.2,0,0,0-7.31.74,62.57,62.57,0,0,1-10.41-.4,8.18,8.18,0,0,0-2.52.09,7.54,7.54,0,0,0-2.65,1.44,45.63,45.63,0,0,0-7.81,7.4,57.31,57.31,0,0,1-4.82,5.6,10.85,10.85,0,0,1-4,2.53c-1,.28-2,.08-2.95.39C386.09,183.52,385.7,187.37,384.33,189.63Z" transform="translate(-95.23 -55.03)" fill="#965d7b"/><path d="M480.63,216.82c-8,1.47-14.63-5-18.3-9.72a39.22,39.22,0,0,1-3.07-4.52l27.46,5.18,1.11.21S492.88,214.58,480.63,216.82Z" transform="translate(-95.23 -55.03)" opacity="0.1"/><g opacity="0.1"><path d="M376.72,214.17a8.33,8.33,0,0,0-.58-3.84c0,.1-.09.2-.12.3-.43,1.34.15,2.73.52,4.12A3,3,0,0,0,376.72,214.17Z" transform="translate(-95.23 -55.03)"/><path d="M379.1,197.8a22.22,22.22,0,0,0,.08,4.15A22.28,22.28,0,0,0,379.1,197.8Z" transform="translate(-95.23 -55.03)"/><path d="M448.55,188.45a16.4,16.4,0,0,1-4.38,5.44c-2.31,1.65-5.22,2.11-8,2.78s-5.65,1.74-7.23,4.1a14.41,14.41,0,0,0-1.69,4.9,10.47,10.47,0,0,1-2,4.75c-1.15,1.3-3.17,2-4.67,1.12a4.78,4.78,0,0,1-1.82-2.34c-1.13-2.57-1.43-5.41-1.88-8.19s-1.12-5.62-2.82-7.85-4.71-3.7-7.38-2.83a7.14,7.14,0,0,0-4,3.88,21.8,21.8,0,0,0-1.5,5.52q-1.87,10.19-4.4,20.24a1.73,1.73,0,0,1-.33.76,1.5,1.5,0,0,1-1,.43c-2.24.29-4.39-1.27-6.64-1.11-2.77.2-4.8,2.88-7.53,3.32a8.45,8.45,0,0,1-5-1.11,5.35,5.35,0,0,1-1.83-1.3,2.7,2.7,0,0,0-.37,2.33,3.9,3.9,0,0,0,2.2,2,8.45,8.45,0,0,0,5,1.11c2.73-.44,4.76-3.12,7.53-3.32,2.25-.16,4.4,1.4,6.64,1.11a1.5,1.5,0,0,0,1-.43,1.73,1.73,0,0,0,.33-.76q2.52-10,4.4-20.24a21.8,21.8,0,0,1,1.5-5.52,7.14,7.14,0,0,1,4-3.88c2.67-.87,5.67.6,7.38,2.83s2.36,5.08,2.82,7.85.75,5.62,1.88,8.19a4.78,4.78,0,0,0,1.82,2.34c1.5.87,3.52.18,4.67-1.12a10.47,10.47,0,0,0,2-4.75,14.41,14.41,0,0,1,1.69-4.9c1.58-2.36,4.47-3.42,7.23-4.1s5.67-1.13,8-2.78a16.4,16.4,0,0,0,4.38-5.44c1.48-2.57,2.86-5.37,2.74-8.34a10.74,10.74,0,0,0-.12-1.14A19.65,19.65,0,0,1,448.55,188.45Z" transform="translate(-95.23 -55.03)"/></g><path d="M451.33,188.75a35.33,35.33,0,0,1,4.45,14.85c-8.91-5-17.29-10.49-21.52-12.4-7.37-3.33-34.93-2.83-45.29-2.52a34.93,34.93,0,0,1,3.78-5.46A36.18,36.18,0,0,1,401,176a35.77,35.77,0,0,1,50.38,12.73Z" transform="translate(-95.23 -55.03)" opacity="0.1"/><path d="M483.13,212.58c-4.81,1.48-12.66-1.38-20.8-5.48a39.22,39.22,0,0,1-3.07-4.52l27.46,5.18C488.54,209,489,210.77,483.13,212.58Z" transform="translate(-95.23 -55.03)" opacity="0.1"/><path d="M422.26,154.08s-26.25-1.5-33.63,12.75l-1.19,12.63-2-.22-.4,8.59s40.12-1.75,49.25,2.37,37.5,24.88,48.87,21.38-1-6.75-1-6.75S466.51,198.2,466.51,193,462.63,160.33,422.26,154.08Z" transform="translate(-95.23 -55.03)" fill="#444053"/><path d="M371.63,622.28s16.75,16.25,24,15C395.63,637.28,375.13,635.53,371.63,622.28Z" transform="translate(-95.23 -55.03)" opacity="0.1"/><path d="M368.13,629.81s1.5,8.36,5.5,7.54S368.13,629.81,368.13,629.81Z" transform="translate(-95.23 -55.03)" opacity="0.1"/><path d="M394.38,769.53s-23.78,18.5-19.77,19S394.38,769.53,394.38,769.53Z" transform="translate(-95.23 -55.03)" opacity="0.1"/><polygon points="330.96 347.33 407.96 334.8 407.96 407.7 334.8 403.87 330.96 347.33" fill="#4338ca"/><polygon points="330.96 347.33 407.96 334.8 407.96 407.7 334.8 403.87 330.96 347.33" opacity="0.05"/><polygon points="407.96 334.8 500.3 341.71 495.19 405.15 407.96 407.7 407.96 334.8" fill="#4338ca"/><polygon points="407.96 334.8 500.3 341.71 495.19 405.15 407.96 407.7 407.96 334.8" opacity="0.1"/><polygon points="436.35 312.55 407.96 334.8 500.3 341.71 515.39 318.94 436.35 312.55" fill="#4338ca"/><polygon points="303.08 323.03 372.4 314.59 407.96 334.8 330.96 347.33 303.08 323.03" fill="#4338ca"/><polygon points="424.84 353.73 424.84 453.4 388.77 449.7 373.08 448.1 368.3 447.6 352.62 445.99 330.96 443.77 330.96 347.33 407.95 352.57 424.84 353.73" fill="#4338ca"/><polygon points="500.3 341.71 500.3 438.91 471.39 444.46 457.33 447.16 424.84 453.4 424.84 353.73 500.3 341.71" fill="#4338ca"/><polygon points="500.3 341.71 500.3 438.91 471.39 444.46 457.33 447.16 424.84 453.4 424.84 353.73 500.3 341.71" opacity="0.05"/><polygon points="303.08 368.31 330.96 347.33 424.84 353.73 411.02 377.01 303.08 368.31" fill="#4338ca"/><polygon points="303.08 368.31 330.96 347.33 424.84 353.73 411.02 377.01 303.08 368.31" fill="#fff" opacity="0.1"/><polygon points="500.3 341.71 424.84 353.73 449.4 375.73 530.23 362.17 500.3 341.71" fill="#4338ca"/><polygon points="500.3 341.71 424.84 353.73 449.4 375.73 530.23 362.17 500.3 341.71" fill="#fff" opacity="0.1"/><polygon points="471.39 444.46 457.33 447.16 457.33 426.39 470.5 423.07 471.39 444.46" fill="#fff" opacity="0.1"/><polygon points="388.77 435.96 388.77 449.7 373.08 448.1 373.08 435.96 388.77 435.96" fill="#fff" opacity="0.1"/><polygon points="368.3 440.29 368.3 447.6 352.62 445.99 352.62 440.29 368.3 440.29" fill="#fff" opacity="0.1"/><path d="M510.63,483.7c-10.75,13.75-46.25,4.25-46.25,4.25L438,460.43l-3.58-3.73,7-13s2,.66,5.34,1.82C464.44,451.7,519.68,472.13,510.63,483.7Z" transform="translate(-95.23 -55.03)" opacity="0.1"/><path d="M509.63,481.7c-10.75,13.75-46.25,4.25-46.25,4.25L437,458.43l-3.58-3.73,7-13s2,.66,5.34,1.82C463.44,449.7,518.68,470.13,509.63,481.7Z" transform="translate(-95.23 -55.03)" fill="#efb7b9"/><path d="M445.72,443.52c-1.46,4.2-5.17,10.42-8.76,14.91l-3.58-3.73,7-13S442.39,442.36,445.72,443.52Z" transform="translate(-95.23 -55.03)" opacity="0.1"/><path d="M358.38,288s-26.25,10-26.5,38a460.08,460.08,0,0,0,3,54s-7.5,41.75,13.75,53.75,41,22,41,22,33.95,5.5,38.12,7.25,18.66-20.75,16.41-24.5-33.16-13-36.83-19.25-12.71-10.46-12.71-10.46-9.22-6.29-9.59-11.54,2.35-9,3.12-11.25,3.56-24.25,3.56-24.25S406.63,283.7,358.38,288Z" transform="translate(-95.23 -55.03)" fill="#dce6f2"/><path d="M370.38,380.7s-35.5,4-32.75,16.5C337.63,397.2,351.12,384.59,370.38,380.7Z" transform="translate(-95.23 -55.03)" opacity="0.1"/><path d="M370.38,385.7s-20.15,14.75-16.45,15.75S370.38,385.7,370.38,385.7Z" transform="translate(-95.23 -55.03)" opacity="0.1"/><path d="M379.38,391.7s-5.75,10.34-2.5,9.8S379.38,391.7,379.38,391.7Z" transform="translate(-95.23 -55.03)" opacity="0.1"/><path d="M749,167.42s-38-2.29-33.56,24.37c0,0-.89,4.71,3.38,6.85,0,0,.07-2,3.9-1.31a17.51,17.51,0,0,0,4.13.2,8.57,8.57,0,0,0,5.06-2.09h0s10.69-4.41,14.85-21.89c0,0,3.08-3.82,3-4.8l-6.42,2.75s2.19,4.63.46,8.48c0,0-.2-8.31-1.44-8.12-.25,0-3.33,1.61-3.33,1.61s3.77,8.06.92,13.93c0,0,1.08-9.94-2.1-13.35l-4.52,2.64s4.41,8.33,1.42,15.13c0,0,.77-10.43-2.37-14.49l-4.1,3.19s4.15,8.22,1.62,13.86c0,0-.33-12.14-2.51-13.06,0,0-3.58,3.16-4.12,4.46,0,0,2.83,6,1.07,9.11,0,0-1.08-8.09-2-8.13,0,0-3.57,5.36-3.94,9a19.46,19.46,0,0,1,3.07-9.54,10.71,10.71,0,0,0-5.46,2.83s.55-3.79,6.34-4.12c0,0,3-4.07,3.74-4.32,0,0-5.76-.48-9.25,1.07,0,0,3.07-3.57,10.31-2l4-3.3s-7.58-1-10.8.11c0,0,3.7-3.16,11.89-.86l4.4-2.63s-6.46-1.4-10.31-.89c0,0,4.06-2.19,11.6.18l3.15-1.41s-4.74-.93-6.12-1.08-1.46-.53-1.46-.53a16.36,16.36,0,0,1,8.89,1S749.14,167.84,749,167.42Z" transform="translate(-95.23 -55.03)" fill="#4338ca"/><path d="M864.46,300.76s-38-2.29-33.56,24.37c0,0-.89,4.71,3.38,6.85,0,0,.07-2,3.91-1.31a17.51,17.51,0,0,0,4.13.2,8.56,8.56,0,0,0,5-2.08h0s10.7-4.42,14.86-21.9c0,0,3.07-3.81,2.95-4.79l-6.42,2.74s2.19,4.63.47,8.48c0,0-.21-8.31-1.44-8.12-.25,0-3.34,1.61-3.34,1.61s3.78,8.07.93,13.93c0,0,1.08-9.94-2.11-13.35L848.75,310s4.41,8.33,1.42,15.13c0,0,.77-10.43-2.37-14.49l-4.09,3.2s4.14,8.21,1.62,13.85c0,0-.33-12.14-2.51-13.06,0,0-3.58,3.16-4.13,4.46,0,0,2.84,6,1.08,9.11,0,0-1.08-8.09-2-8.13,0,0-3.57,5.36-3.94,9a19.52,19.52,0,0,1,3.08-9.54,10.76,10.76,0,0,0-5.47,2.83s.56-3.79,6.35-4.12c0,0,2.95-4.07,3.74-4.32,0,0-5.76-.48-9.25,1.07,0,0,3.07-3.57,10.3-1.95l4-3.3s-7.59-1-10.8.11c0,0,3.7-3.16,11.89-.86l4.4-2.63s-6.47-1.39-10.32-.89c0,0,4.07-2.19,11.61.18l3.15-1.41s-4.74-.93-6.13-1.08-1.46-.53-1.46-.53a16.39,16.39,0,0,1,8.9,1S864.58,301.18,864.46,300.76Z" transform="translate(-95.23 -55.03)" fill="#4338ca" opacity="0.1"/><path d="M633.61,277.09s8.75-37.09-18.29-37.22c0,0-4.49-1.68-7.32,2.16,0,0,1.93.41.62,4.07a17.8,17.8,0,0,0-.9,4,8.59,8.59,0,0,0,1.19,5.33h0s2.53,11.3,19,18.38c0,0,3.24,3.68,4.22,3.72l-1.6-6.79s-4.94,1.37-8.44-1c0,0,8.23,1.21,8.24,0,0-.25-1-3.56-1-3.56s-8.59,2.34-13.89-1.47c0,0,9.61,2.76,13.52.21L627.16,260s-9,2.93-15.16-1.18c0,0,10.15,2.54,14.69.14l-2.45-4.58s-8.8,2.68-13.93-.77c0,0,12,1.74,13.3-.24,0,0-2.5-4.07-3.69-4.83,0,0-6.36,1.78-9.16-.49,0,0,8.15.31,8.34-.55,0,0-4.67-4.43-8.23-5.43a19.6,19.6,0,0,1,8.89,4.66,10.79,10.79,0,0,0-1.86-5.87s3.64,1.2,3,7c0,0,3.5,3.6,3.61,4.42,0,0,1.45-5.59.52-9.3,0,0,3,3.64.17,10.49l2.56,4.55s2.32-7.3,1.73-10.66c0,0,2.49,4.18-1.18,11.86l1.85,4.79s2.47-6.14,2.63-10c0,0,1.47,4.38-2.16,11.41l.86,3.34s1.72-4.51,2.1-5.85.77-1.35.77-1.35a16.38,16.38,0,0,1-2.49,8.6S633.18,277.14,633.61,277.09Z" transform="translate(-95.23 -55.03)" fill="#4338ca" opacity="0.1"/><path d="M550.39,289.73s-30.52-22.83-41.43,1.9c0,0-3.33,3.45-.94,7.58,0,0,1.14-1.61,4,1.06a17.51,17.51,0,0,0,3.34,2.44,8.58,8.58,0,0,0,5.37,1h0s11.36,2.19,24.44-10.12c0,0,4.67-1.5,5.11-2.38L543.39,290s-.72,5.07-4.27,7.34c0,0,4.39-7.06,3.25-7.57-.23-.11-3.67-.5-3.67-.5s-1.28,8.82-6.88,12.15c0,0,6.37-7.71,5.58-12.31l-5.23-.28s-.89,9.39-7.13,13.43c0,0,6.37-8.29,6-13.41l-5.18.42s-1.05,9.13-6.26,12.45c0,0,6.39-10.32,5.08-12.28,0,0-4.73.67-5.9,1.45,0,0-.91,6.54-4.11,8.2,0,0,3.55-7.35,2.83-7.86,0,0-5.93,2.51-8.26,5.37a19.53,19.53,0,0,1,7.82-6.28,10.77,10.77,0,0,0-6.12-.64s2.54-2.86,7.56.05c0,0,4.7-1.77,5.5-1.55,0,0-4.55-3.57-8.32-4.19,0,0,4.54-1.3,9.69,4l5.19-.53s-5.77-5-9.08-5.84c0,0,4.83-.61,10.4,5.81l5.12.23s-4.63-4.72-8.12-6.42c0,0,4.59.4,9.59,6.53l3.41.55s-3.45-3.38-4.53-4.26-.93-1.25-.93-1.25a16.43,16.43,0,0,1,6.89,5.72S550.26,290.14,550.39,289.73Z" transform="translate(-95.23 -55.03)" fill="#4338ca" opacity="0.1"/><path d="M652,77.62s-30.52-22.84-41.43,1.9c0,0-3.33,3.45-.94,7.58,0,0,1.14-1.61,4,1.06a17.79,17.79,0,0,0,3.35,2.43,8.57,8.57,0,0,0,5.37,1h0s11.36,2.19,24.44-10.13c0,0,4.67-1.49,5.1-2.38L645,77.89s-.71,5.07-4.27,7.34c0,0,4.4-7.06,3.26-7.57-.23-.11-3.67-.5-3.67-.5S639,86,633.4,89.31c0,0,6.36-7.71,5.58-12.31l-5.23-.28s-.9,9.39-7.13,13.42c0,0,6.37-8.29,6-13.41l-5.17.42s-1.06,9.14-6.27,12.46c0,0,6.4-10.32,5.09-12.28,0,0-4.73.67-5.9,1.45,0,0-.91,6.54-4.11,8.2,0,0,3.55-7.35,2.83-7.87,0,0-5.93,2.52-8.26,5.38a19.44,19.44,0,0,1,7.82-6.28,10.7,10.7,0,0,0-6.13-.64s2.55-2.86,7.57.05c0,0,4.7-1.78,5.5-1.55,0,0-4.55-3.57-8.32-4.2,0,0,4.53-1.29,9.68,4l5.19-.53s-5.76-5-9.08-5.85c0,0,4.83-.6,10.41,5.82l5.12.22s-4.63-4.72-8.13-6.41c0,0,4.6.4,9.6,6.53l3.4.55S640,72.86,638.92,72s-.93-1.24-.93-1.24a16.4,16.4,0,0,1,6.89,5.72S651.83,78,652,77.62Z" transform="translate(-95.23 -55.03)" fill="#4338ca" opacity="0.1"/><path d="M768.62,106.55s-12.2-36.11-35.21-21.92c0,0-4.7,1-5.07,5.71,0,0,1.85-.68,2.67,3.12a18,18,0,0,0,1.37,3.91,8.66,8.66,0,0,0,3.84,3.89h0s8.12,8.25,25.88,5.52c0,0,4.69,1.42,5.55.93l-5-4.91s-3.46,3.77-7.68,3.62c0,0,7.63-3.32,7-4.39-.13-.21-2.74-2.48-2.74-2.48s-6.06,6.53-12.56,6.1c0,0,9.61-2.74,11.57-7l-4.14-3.19s-6.06,7.22-13.49,7c0,0,10-3.21,12.53-7.65l-4.5-2.59s-6,6.93-12.22,6.71c0,0,11.12-4.87,11.15-7.23,0,0-4.27-2.13-5.68-2.15,0,0-4.46,4.87-8,4.43,0,0,7.08-4.05,6.78-4.88,0,0-6.3-1.29-9.85-.25a19.49,19.49,0,0,1,10-.75,10.79,10.79,0,0,0-4.69-4s3.72-.91,6.21,4.33c0,0,4.88,1.21,5.4,1.84,0,0-1.72-5.51-4.47-8.17,0,0,4.47,1.51,5.69,8.82l4.58,2.5s-1.89-7.41-4.17-10c0,0,4.33,2.24,5.27,10.69l4.1,3.09s-1.14-6.52-3.06-9.9c0,0,3.56,2.94,4.2,10.83l2.49,2.38s-.92-4.74-1.3-6.08S761,93,761,93a16.49,16.49,0,0,1,2.43,8.62S768.27,106.81,768.62,106.55Z" transform="translate(-95.23 -55.03)" fill="#4338ca" opacity="0.1"/><path d="M689,108.33S651.1,104.11,654.23,131c0,0-1.13,4.66,3,7,0,0,.17-2,4-1.1a18.4,18.4,0,0,0,4.12.41,8.6,8.6,0,0,0,5.15-1.83h0s10.91-3.87,16-21.12c0,0,3.26-3.65,3.19-4.64l-6.55,2.42s2,4.73,0,8.49c0,0,.21-8.31-1-8.18-.25,0-3.41,1.44-3.41,1.44s3.36,8.25.22,14c0,0,1.58-9.88-1.43-13.44l-4.65,2.4s4,8.55.65,15.19c0,0,1.3-10.38-1.63-14.59l-4.25,3s3.72,8.41.91,13.92c0,0,.29-12.14-1.84-13.17,0,0-3.74,3-4.35,4.24,0,0,2.53,6.1.62,9.15,0,0-.67-8.13-1.55-8.21,0,0-3.84,5.17-4.4,8.82a19.47,19.47,0,0,1,3.56-9.38,10.76,10.76,0,0,0-5.6,2.55s.74-3.75,6.54-3.79c0,0,3.15-3.91,4-4.12,0,0-5.73-.77-9.3.6,0,0,3.25-3.42,10.39-1.43l4.21-3.09S663.22,115,660,116c0,0,3.86-3,11.92-.25l4.53-2.41s-6.39-1.72-10.26-1.41c0,0,4.17-2,11.58.77l3.22-1.25s-4.69-1.17-6.07-1.39-1.43-.6-1.43-.6a16.45,16.45,0,0,1,8.84,1.44S689.07,108.75,689,108.33Z" transform="translate(-95.23 -55.03)" fill="#4338ca" opacity="0.1"/><path d="M1020.6,402.5s-37.88-4.22-34.75,22.64c0,0-1.13,4.66,3,7,0,0,.17-2,4-1.11a17.3,17.3,0,0,0,4.12.41,8.53,8.53,0,0,0,5.15-1.83h0s10.91-3.87,15.95-21.11c0,0,3.26-3.66,3.19-4.64l-6.55,2.41s2,4.74,0,8.5c0,0,.21-8.32-1-8.18-.25,0-3.41,1.43-3.41,1.43s3.36,8.25.22,14c0,0,1.58-9.87-1.43-13.44l-4.65,2.41s4,8.55.66,15.19c0,0,1.29-10.38-1.64-14.6l-4.25,3s3.72,8.41.91,13.91c0,0,.29-12.14-1.84-13.16,0,0-3.73,3-4.35,4.24,0,0,2.54,6.1.62,9.15,0,0-.67-8.13-1.55-8.21,0,0-3.84,5.17-4.4,8.82a19.47,19.47,0,0,1,3.56-9.38,10.67,10.67,0,0,0-5.6,2.55s.74-3.76,6.54-3.8c0,0,3.16-3.91,4-4.11,0,0-5.73-.78-9.3.59,0,0,3.25-3.41,10.4-1.42l4.2-3.09s-7.52-1.42-10.79-.44c0,0,3.86-3,11.92-.26l4.53-2.4s-6.39-1.72-10.26-1.41c0,0,4.17-2,11.58.77l3.22-1.26s-4.69-1.17-6.07-1.38-1.43-.6-1.43-.6a16.39,16.39,0,0,1,8.84,1.43S1020.7,402.93,1020.6,402.5Z" transform="translate(-95.23 -55.03)" fill="#4338ca" opacity="0.1"/><path d="M1078.51,437.88s-37.88-4.21-34.75,22.64c0,0-1.12,4.66,3,7,0,0,.17-2,4-1.1a17.65,17.65,0,0,0,4.11.4A8.64,8.64,0,0,0,1060,465h0s10.9-3.87,15.94-21.12c0,0,3.27-3.65,3.19-4.64l-6.55,2.41s2,4.74,0,8.5c0,0,.21-8.31-1-8.18-.25,0-3.41,1.43-3.41,1.43s3.36,8.25.22,14c0,0,1.58-9.87-1.43-13.43l-4.65,2.4s4,8.55.66,15.19c0,0,1.29-10.38-1.64-14.59l-4.25,3s3.72,8.41.92,13.92c0,0,.28-12.15-1.85-13.17,0,0-3.73,3-4.35,4.24,0,0,2.54,6.1.62,9.15,0,0-.67-8.13-1.55-8.21,0,0-3.84,5.17-4.39,8.82a19.52,19.52,0,0,1,3.55-9.38,10.76,10.76,0,0,0-5.6,2.55s.75-3.76,6.55-3.79c0,0,3.15-3.91,4-4.12,0,0-5.73-.77-9.3.6,0,0,3.25-3.42,10.4-1.43l4.2-3.09s-7.52-1.42-10.79-.44c0,0,3.86-3,11.92-.25l4.53-2.41s-6.39-1.72-10.26-1.41c0,0,4.17-2,11.58.77l3.22-1.25s-4.69-1.17-6.06-1.39-1.44-.6-1.44-.6a16.45,16.45,0,0,1,8.84,1.44S1078.61,438.31,1078.51,437.88Z" transform="translate(-95.23 -55.03)" fill="#4338ca" opacity="0.1"/><path d="M949.94,139.87s-30.52-22.83-41.43,1.9c0,0-3.33,3.45-.94,7.58,0,0,1.14-1.61,4,1.06a17.51,17.51,0,0,0,3.34,2.44,8.59,8.59,0,0,0,5.37,1h0s11.36,2.19,24.45-10.12c0,0,4.66-1.5,5.1-2.38l-6.87-1.24s-.72,5.07-4.27,7.34c0,0,4.39-7.06,3.25-7.57-.23-.11-3.66-.5-3.66-.5s-1.29,8.82-6.89,12.15c0,0,6.37-7.71,5.58-12.31l-5.23-.28s-.89,9.39-7.13,13.43c0,0,6.38-8.29,6-13.41l-5.18.42s-1,9.13-6.26,12.45c0,0,6.4-10.32,5.08-12.28,0,0-4.73.67-5.9,1.45,0,0-.9,6.54-4.1,8.2,0,0,3.54-7.35,2.82-7.86,0,0-5.93,2.51-8.26,5.37a19.53,19.53,0,0,1,7.82-6.28,10.77,10.77,0,0,0-6.12-.64s2.55-2.86,7.57.05c0,0,4.69-1.77,5.49-1.55,0,0-4.55-3.57-8.32-4.19,0,0,4.54-1.3,9.69,4l5.19-.53s-5.76-5-9.08-5.84c0,0,4.83-.61,10.4,5.81l5.13.23s-4.64-4.72-8.13-6.42c0,0,4.6.4,9.59,6.53l3.41.55s-3.45-3.38-4.53-4.26S936,133,936,133a16.44,16.44,0,0,1,6.88,5.72S949.81,140.28,949.94,139.87Z" transform="translate(-95.23 -55.03)" fill="#4338ca" opacity="0.1"/><path d="M973.52,304.69S963,268.06,939.34,281.21c0,0-4.74.73-5.33,5.47,0,0,1.88-.59,2.53,3.24a17.73,17.73,0,0,0,1.2,4A8.59,8.59,0,0,0,941.4,298h0s7.74,8.6,25.6,6.68c0,0,4.62,1.62,5.5,1.18l-4.73-5.14s-3.63,3.62-7.83,3.28c0,0,7.76-3,7.16-4.07-.12-.22-2.62-2.61-2.62-2.61s-6.34,6.26-12.82,5.53c0,0,9.73-2.3,11.87-6.44l-4-3.38s-6.38,6.94-13.79,6.4c0,0,10.08-2.77,12.86-7.08l-4.38-2.79s-6.35,6.65-12.51,6.15c0,0,11.33-4.37,11.47-6.72,0,0-4.18-2.32-5.59-2.4,0,0-4.67,4.66-8.22,4.06,0,0,7.26-3.73,7-4.57,0,0-6.24-1.57-9.83-.7a19.51,19.51,0,0,1,10-.29,10.73,10.73,0,0,0-4.5-4.2s3.76-.75,6,4.6c0,0,4.81,1.42,5.31,2.08,0,0-1.47-5.59-4.1-8.36,0,0,4.4,1.7,5.29,9.06l4.46,2.71s-1.56-7.5-3.72-10.14c0,0,4.22,2.43,4.79,10.91l4,3.27s-.85-6.56-2.61-10c0,0,3.43,3.1,3.71,11l2.38,2.5s-.7-4.78-1-6.14,0-1.55,0-1.55a16.39,16.39,0,0,1,2.05,8.72S973.16,304.93,973.52,304.69Z" transform="translate(-95.23 -55.03)" fill="#4338ca" opacity="0.1"/><path d="M739.1,387.23s-20.43-32.18-39.4-12.92c0,0-4.34,2-3.58,6.75,0,0,1.65-1.1,3.35,2.4a17.12,17.12,0,0,0,2.26,3.46,8.54,8.54,0,0,0,4.65,2.88h0s9.85,6.08,26.45-.8c0,0,4.89.26,5.61-.41l-6-3.6s-2.47,4.5-6.6,5.35c0,0,6.62-5,5.73-5.92-.17-.18-3.25-1.76-3.25-1.76s-4.33,7.78-10.75,8.91c0,0,8.69-4.95,9.59-9.53l-4.79-2.11s-4.17,8.45-11.43,10c0,0,8.9-5.49,10.35-10.41l-5-1.44s-4.22,8.17-10.27,9.42c0,0,9.64-7.38,9.11-9.68,0,0-4.66-1.05-6-.73,0,0-3.17,5.79-6.75,6.21,0,0,5.92-5.62,5.43-6.36,0,0-6.43.25-9.63,2.1a19.46,19.46,0,0,1,9.54-3.1,10.73,10.73,0,0,0-5.49-2.77s3.39-1.77,7,2.73c0,0,5,0,5.69.5,0,0-3-5-6.29-6.87,0,0,4.7.4,7.62,7.21l5.05,1.34s-3.61-6.75-6.42-8.68c0,0,4.73,1.14,7.66,9.13l4.72,2s-2.66-6.05-5.33-8.88c0,0,4.16,2,6.65,9.51l3,1.73s-2-4.39-2.71-5.6-.43-1.49-.43-1.49a16.4,16.4,0,0,1,4.41,7.79S738.83,387.57,739.1,387.23Z" transform="translate(-95.23 -55.03)" fill="#4338ca" opacity="0.1"/><path d="M873.37,222.81s-19.43-32.79-39-14.13c0,0-4.4,1.9-3.78,6.64,0,0,1.67-1.06,3.27,2.49a17.28,17.28,0,0,0,2.15,3.54,8.49,8.49,0,0,0,4.56,3h0s9.65,6.38,26.46,0c0,0,4.88.41,5.62-.24l-5.87-3.78s-2.6,4.41-6.76,5.14c0,0,6.77-4.83,5.92-5.74-.18-.19-3.2-1.87-3.2-1.87s-4.57,7.65-11,8.58c0,0,8.84-4.68,9.87-9.22L856.89,215s-4.43,8.33-11.74,9.66c0,0,9.07-5.21,10.67-10.08l-4.94-1.6s-4.48,8-10.56,9.1c0,0,9.86-7.08,9.4-9.39,0,0-4.62-1.2-6-.92,0,0-3.35,5.69-6.94,6,0,0,6.09-5.42,5.63-6.18,0,0-6.44.05-9.69,1.8a19.52,19.52,0,0,1,9.63-2.8,10.75,10.75,0,0,0-5.41-2.94s3.45-1.67,7,2.94c0,0,5,.17,5.67.68,0,0-2.83-5-6.07-7.06,0,0,4.68.54,7.39,7.44l5,1.5s-3.39-6.86-6.15-8.88c0,0,4.7,1.29,7.38,9.36l4.65,2.17s-2.47-6.13-5-9c0,0,4.09,2.13,6.36,9.71l2.93,1.82s-1.88-4.45-2.54-5.68-.38-1.5-.38-1.5a16.43,16.43,0,0,1,4.17,7.92S873.08,223.14,873.37,222.81Z" transform="translate(-95.23 -55.03)" fill="#4338ca"/><path d="M750.44,291.76s1-38.1-25.47-32.73c0,0-4.74-.73-6.74,3.61,0,0,2,0,1.44,3.85a17.56,17.56,0,0,0-.06,4.14,8.55,8.55,0,0,0,2.25,5h0s4.77,10.54,22.38,14.12c0,0,3.91,2.95,4.89,2.79l-3-6.32s-4.55,2.34-8.46.75c0,0,8.3-.49,8.07-1.71,0-.25-1.72-3.29-1.72-3.29s-7.94,4.05-13.89,1.39c0,0,10,.75,13.27-2.54l-2.79-4.43s-8.18,4.68-15.08,1.92c0,0,10.45.42,14.41-2.85l-3.33-4s-8.07,4.42-13.79,2.08c0,0,12.12-.73,13-2.94,0,0-3.28-3.47-4.6-4,0,0-5.86,3-9.06,1.38,0,0,8-1.34,8.05-2.23,0,0-5.47-3.39-9.16-3.64a19.47,19.47,0,0,1,9.65,2.76,10.75,10.75,0,0,0-3-5.37s3.81.43,4.33,6.2c0,0,4.17,2.82,4.44,3.6,0,0,.29-5.77-1.38-9.21,0,0,3.68,2.95,2.3,10.23l3.43,3.94s.78-7.62-.47-10.79c0,0,3.28,3.59,1.26,11.85l2.77,4.31s1.18-6.51.55-10.34c0,0,2.32,4,.2,11.61l1.52,3.1s.77-4.77.87-6.16.48-1.48.48-1.48a16.42,16.42,0,0,1-.69,8.93S750,291.89,750.44,291.76Z" transform="translate(-95.23 -55.03)" fill="#4338ca"/><ellipse cx="698.97" cy="716.3" rx="26.93" ry="4.55" fill="#4338ca" opacity="0.1"/><ellipse cx="600.8" cy="785.38" rx="26.93" ry="4.55" fill="#4338ca" opacity="0.1"/><ellipse cx="93.14" cy="749.99" rx="26.93" ry="4.55" fill="#4338ca" opacity="0.1"/><ellipse cx="805.06" cy="780.83" rx="26.93" ry="4.55" fill="#4338ca" opacity="0.1"/><ellipse cx="833.1" cy="723.1" rx="40.21" ry="6.8" fill="#4338ca"/><path d="M945,767a11.61,11.61,0,0,0,3.83-5.78c.5-2.3-.48-5.05-2.67-5.89-2.46-.94-5.09.76-7.09,2.48s-4.27,3.69-6.88,3.33a10.5,10.5,0,0,0,3.24-9.81,4.11,4.11,0,0,0-.9-2c-1.37-1.46-3.84-.83-5.48.32-5.2,3.66-6.65,10.72-6.68,17.08-.52-2.29-.08-4.68-.09-7s-.66-5-2.65-6.22a7.91,7.91,0,0,0-4-1c-2.34-.08-4.95.15-6.54,1.86-2,2.12-1.47,5.69.25,8s4.35,3.8,6.77,5.42a15.13,15.13,0,0,1,4.84,4.61,4.7,4.7,0,0,1,.35.82h14.66A40.44,40.44,0,0,0,945,767Z" transform="translate(-95.23 -55.03)" fill="#4338ca"/><path d="M170.29,783.87s15.35-.47,20-3.77,23.63-7.23,24.78-1.94,23.08,26.29,5.74,26.43-40.29-2.7-44.91-5.52S170.29,783.87,170.29,783.87Z" transform="translate(-95.23 -55.03)" fill="#a8a8a8"/><path d="M221.1,802.75c-17.34.14-40.29-2.7-44.91-5.52-3.52-2.14-4.92-9.83-5.39-13.38l-.51,0s1,12.39,5.59,15.2,27.57,5.66,44.91,5.52c5,0,6.73-1.82,6.64-4.46C226.73,801.72,224.82,802.72,221.1,802.75Z" transform="translate(-95.23 -55.03)" opacity="0.2"/></svg>
\ No newline at end of file
diff --git a/public/assets/images/undraw-no-data.svg b/public/assets/images/undraw-no-data.svg
new file mode 100644
index 000000000..f4412b59c
--- /dev/null
+++ b/public/assets/images/undraw-no-data.svg
@@ -0,0 +1 @@
+<svg id="b21613c9-2bf0-4d37-bef0-3b193d34fc5d" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="647.63626" height="632.17383" viewBox="0 0 647.63626 632.17383"><path d="M687.3279,276.08691H512.81813a15.01828,15.01828,0,0,0-15,15v387.85l-2,.61005-42.81006,13.11a8.00676,8.00676,0,0,1-9.98974-5.31L315.678,271.39691a8.00313,8.00313,0,0,1,5.31006-9.99l65.97022-20.2,191.25-58.54,65.96972-20.2a7.98927,7.98927,0,0,1,9.99024,5.3l32.5498,106.32Z" transform="translate(-276.18187 -133.91309)" fill="#f2f2f2"/><path d="M725.408,274.08691l-39.23-128.14a16.99368,16.99368,0,0,0-21.23-11.28l-92.75,28.39L380.95827,221.60693l-92.75,28.4a17.0152,17.0152,0,0,0-11.28028,21.23l134.08008,437.93a17.02661,17.02661,0,0,0,16.26026,12.03,16.78926,16.78926,0,0,0,4.96972-.75l63.58008-19.46,2-.62v-2.09l-2,.61-64.16992,19.65a15.01489,15.01489,0,0,1-18.73-9.95l-134.06983-437.94a14.97935,14.97935,0,0,1,9.94971-18.73l92.75-28.4,191.24024-58.54,92.75-28.4a15.15551,15.15551,0,0,1,4.40966-.66,15.01461,15.01461,0,0,1,14.32032,10.61l39.0498,127.56.62012,2h2.08008Z" transform="translate(-276.18187 -133.91309)" fill="#3f3d56"/><path d="M398.86279,261.73389a9.0157,9.0157,0,0,1-8.61133-6.3667l-12.88037-42.07178a8.99884,8.99884,0,0,1,5.9712-11.24023l175.939-53.86377a9.00867,9.00867,0,0,1,11.24072,5.9707l12.88037,42.07227a9.01029,9.01029,0,0,1-5.9707,11.24072L401.49219,261.33887A8.976,8.976,0,0,1,398.86279,261.73389Z" transform="translate(-276.18187 -133.91309)" fill="#4338ca"/><circle cx="190.15351" cy="24.95465" r="20" fill="#4338ca"/><circle cx="190.15351" cy="24.95465" r="12.66462" fill="#fff"/><path d="M878.81836,716.08691h-338a8.50981,8.50981,0,0,1-8.5-8.5v-405a8.50951,8.50951,0,0,1,8.5-8.5h338a8.50982,8.50982,0,0,1,8.5,8.5v405A8.51013,8.51013,0,0,1,878.81836,716.08691Z" transform="translate(-276.18187 -133.91309)" fill="#e6e6e6"/><path d="M723.31813,274.08691h-210.5a17.02411,17.02411,0,0,0-17,17v407.8l2-.61v-407.19a15.01828,15.01828,0,0,1,15-15H723.93825Zm183.5,0h-394a17.02411,17.02411,0,0,0-17,17v458a17.0241,17.0241,0,0,0,17,17h394a17.0241,17.0241,0,0,0,17-17v-458A17.02411,17.02411,0,0,0,906.81813,274.08691Zm15,475a15.01828,15.01828,0,0,1-15,15h-394a15.01828,15.01828,0,0,1-15-15v-458a15.01828,15.01828,0,0,1,15-15h394a15.01828,15.01828,0,0,1,15,15Z" transform="translate(-276.18187 -133.91309)" fill="#3f3d56"/><path d="M801.81836,318.08691h-184a9.01015,9.01015,0,0,1-9-9v-44a9.01016,9.01016,0,0,1,9-9h184a9.01016,9.01016,0,0,1,9,9v44A9.01015,9.01015,0,0,1,801.81836,318.08691Z" transform="translate(-276.18187 -133.91309)" fill="#4338ca"/><circle cx="433.63626" cy="105.17383" r="20" fill="#4338ca"/><circle cx="433.63626" cy="105.17383" r="12.18187" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/public/assets/images/undraw-post.svg b/public/assets/images/undraw-post.svg
new file mode 100644
index 000000000..8b70dfdb5
--- /dev/null
+++ b/public/assets/images/undraw-post.svg
@@ -0,0 +1,88 @@
+<svg id="ff813a3e-4c7b-4d7b-b4d4-03a41dc284cb" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="843.57946"
+ height="640.51678" viewBox="0 0 843.57946 640.51678">
+ <path
+ d="M602.65363,129.74161H226.33527a48.17928,48.17928,0,0,0-48.125,48.12512V619.74252a48.17923,48.17923,0,0,0,48.125,48.12506H602.65363a48.17923,48.17923,0,0,0,48.125-48.12506V177.86673A48.17928,48.17928,0,0,0,602.65363,129.74161Z"
+ transform="translate(-178.21027 -129.74161)" fill="#f2f2f2" />
+ <path
+ d="M602.65412,143.59579H226.33527a34.30948,34.30948,0,0,0-34.271,34.27094V619.74252a34.30946,34.30946,0,0,0,34.271,34.27088H602.65412a34.30937,34.30937,0,0,0,34.27051-34.27088V177.86673A34.30938,34.30938,0,0,0,602.65412,143.59579Z"
+ transform="translate(-178.21027 -129.74161)" fill="#fff" />
+ <path d="M546.01784,272.08142H355.71616a8.01411,8.01411,0,0,1,0-16.02822H546.01784a8.01411,8.01411,0,1,1,0,16.02822Z"
+ transform="translate(-178.21027 -129.74161)" fill="#f2f2f2" />
+ <path d="M579.07606,299.12906H355.71616a8.01412,8.01412,0,0,1,0-16.02823h223.3599a8.01412,8.01412,0,0,1,0,16.02823Z"
+ transform="translate(-178.21027 -129.74161)" fill="#f2f2f2" />
+ <path d="M546.01784,393.29489H355.71616a8.01411,8.01411,0,0,1,0-16.02822H546.01784a8.01411,8.01411,0,1,1,0,16.02822Z"
+ transform="translate(-178.21027 -129.74161)" fill="#f2f2f2" />
+ <path d="M579.07606,420.34253H355.71616a8.01412,8.01412,0,0,1,0-16.02823h223.3599a8.01412,8.01412,0,0,1,0,16.02823Z"
+ transform="translate(-178.21027 -129.74161)" fill="#f2f2f2" />
+ <path d="M546.01784,514.50836H355.71616a8.01411,8.01411,0,0,1,0-16.02823H546.01784a8.01412,8.01412,0,1,1,0,16.02823Z"
+ transform="translate(-178.21027 -129.74161)" fill="#f2f2f2" />
+ <path d="M579.07606,541.556H355.71616a8.01412,8.01412,0,0,1,0-16.02823h223.3599a8.01412,8.01412,0,0,1,0,16.02823Z"
+ transform="translate(-178.21027 -129.74161)" fill="#f2f2f2" />
+ <path
+ d="M313.08745,311.40753H245.7415a3.847,3.847,0,0,1-3.84277-3.84277V247.61749a3.847,3.847,0,0,1,3.84277-3.84277h67.34595a3.847,3.847,0,0,1,3.84277,3.84277v59.94727A3.847,3.847,0,0,1,313.08745,311.40753Z"
+ transform="translate(-178.21027 -129.74161)" fill="#e6e6e6" />
+ <path
+ d="M313.08745,432.621H245.7415a3.847,3.847,0,0,1-3.84277-3.84277V368.831a3.847,3.847,0,0,1,3.84277-3.84277h67.34595a3.847,3.847,0,0,1,3.84277,3.84277v59.94727A3.847,3.847,0,0,1,313.08745,432.621Z"
+ transform="translate(-178.21027 -129.74161)" fill="#e6e6e6" />
+ <path
+ d="M313.08745,553.83447H245.7415a3.847,3.847,0,0,1-3.84277-3.84277V490.04443a3.847,3.847,0,0,1,3.84277-3.84277h67.34595a3.847,3.847,0,0,1,3.84277,3.84277V549.9917A3.847,3.847,0,0,1,313.08745,553.83447Z"
+ transform="translate(-178.21027 -129.74161)" fill="#e6e6e6" />
+ <path
+ d="M934.16522,547.652l2.98548-26.10867,14.969-130.90768,2.98548-26.10867a48.17929,48.17929,0,0,0-42.34617-53.28082L573.09668,272.40642a48.17924,48.17924,0,0,0-53.28086,42.346l-.00771.06744L498.88352,497.81005l-.00771.06744a48.17923,48.17923,0,0,0,42.34611,53.2808L880.8843,589.99806A48.17929,48.17929,0,0,0,934.16522,547.652Z"
+ transform="translate(-178.21027 -129.74161)" fill="#e6e6e6" />
+ <path
+ d="M920.40067,546.07857l3.5361-30.924,13.86792-121.278,3.536-30.92349a34.30948,34.30948,0,0,0-30.1556-37.94256L571.52276,286.17073a34.30948,34.30948,0,0,0-37.94245,30.15568l-.00771.06743L512.648,499.384l-.00776.06792A34.30934,34.30934,0,0,0,542.79584,537.394l339.66238,38.83977A34.30936,34.30936,0,0,0,920.40067,546.07857Z"
+ transform="translate(-178.21027 -129.74161)" fill="#fff" />
+ <path
+ d="M864.80353,380.15794l-189.0696-21.61976a8.01412,8.01412,0,1,1,1.82093-15.92446l189.0696,21.61976a8.01412,8.01412,0,0,1-1.82093,15.92446Z"
+ transform="translate(-178.21027 -129.74161)" fill="#e6e6e6" />
+ <path
+ d="M894.5749,410.78613,672.6611,385.4107a8.01412,8.01412,0,1,1,1.82094-15.92446l221.91379,25.37544a8.01411,8.01411,0,0,1-1.82093,15.92445Z"
+ transform="translate(-178.21027 -129.74161)" fill="#e6e6e6" />
+ <path
+ d="M888.38764,464.38258,561.218,426.97133a8.01412,8.01412,0,0,1,1.82093-15.92446l327.16968,37.41125a8.01412,8.01412,0,1,1-1.82094,15.92446Z"
+ transform="translate(-178.21027 -129.74161)" fill="#e6e6e6" />
+ <path
+ d="M886.36619,491.37532l-328.221-37.53147a8.01412,8.01412,0,0,1,1.82093-15.92446l328.221,37.53147a8.01412,8.01412,0,0,1-1.82093,15.92446Z"
+ transform="translate(-178.21027 -129.74161)" fill="#e6e6e6" />
+ <path
+ d="M882.36643,517.03944,555.19676,479.62819a8.01412,8.01412,0,1,1,1.82093-15.92446L884.18736,501.115a8.01412,8.01412,0,0,1-1.82093,15.92446Z"
+ transform="translate(-178.21027 -129.74161)" fill="#e6e6e6" />
+ <path
+ d="M880.345,544.03218l-328.221-37.53147a8.01412,8.01412,0,0,1,1.82093-15.92446l328.221,37.53147a8.01412,8.01412,0,1,1-1.82093,15.92446Z"
+ transform="translate(-178.21027 -129.74161)" fill="#e6e6e6" />
+ <path
+ d="M628.91345,392.76672l-66.90992-7.651a3.847,3.847,0,0,1-3.38133-4.25447l6.81048-59.55914a3.847,3.847,0,0,1,4.25446-3.38133l66.90993,7.651a3.847,3.847,0,0,1,3.38132,4.25446l-6.81047,59.55915A3.847,3.847,0,0,1,628.91345,392.76672Z"
+ transform="translate(-178.21027 -129.74161)" fill="#4338ca" />
+ <path d="M1020.78973,770.09988h-219a1,1,0,0,1,0-2h219a1,1,0,0,1,0,2Z" transform="translate(-178.21027 -129.74161)"
+ fill="#3f3d56" />
+ <path
+ d="M938.55609,388.06207a9.37695,9.37695,0,0,0,8.41945,11.6556l6.77492,20.32879,13.35789-1.10405-9.9707-28.5738a9.42779,9.42779,0,0,0-18.58156-2.30654Z"
+ transform="translate(-178.21027 -129.74161)" fill="#ffb8b8" />
+ <path
+ d="M948.78649,521.187l0,0a12.08366,12.08366,0,0,0,19.9793-6.32315l10.57975-48.473a47.876,47.876,0,0,0-1.23439-24.98L965.7291,403.23538a4,4,0,0,0-5.59557-2.34269l-8.08121,4.04582a4,4,0,0,0-2.05021,4.69365l.81477,2.802a134.70325,134.70325,0,0,1,1.02888,71.4844l-6.58107,25.33A12.08364,12.08364,0,0,0,948.78649,521.187Z"
+ transform="translate(-178.21027 -129.74161)" fill="#4338ca" />
+ <polygon points="728.243 629.901 716.811 629.9 711.374 585.804 728.247 585.805 728.243 629.901" fill="#ffb8b8" />
+ <path
+ d="M708.64439,626.63322H730.6922a0,0,0,0,1,0,0v13.88195a0,0,0,0,1,0,0H694.76246a0,0,0,0,1,0,0v0A13.88193,13.88193,0,0,1,708.64439,626.63322Z"
+ fill="#2f2e41" />
+ <polygon points="789.864 629.901 778.432 629.9 772.995 585.804 789.868 585.805 789.864 629.901" fill="#ffb8b8" />
+ <path
+ d="M770.26564,626.63322h22.04781a0,0,0,0,1,0,0v13.88195a0,0,0,0,1,0,0H756.38371a0,0,0,0,1,0,0v0A13.88193,13.88193,0,0,1,770.26564,626.63322Z"
+ fill="#2f2e41" />
+ <circle cx="756.38308" cy="291.8647" r="24.56103" fill="#ffb8b8" />
+ <path
+ d="M850.61084,581.78436a9.377,9.377,0,0,1,12.09228-7.77927l13.72625-16.45445,12.03377,5.90259-19.71048,22.96462a9.42779,9.42779,0,0,1-18.14182-4.63349Z"
+ transform="translate(-178.21027 -129.74161)" fill="#ffb8b8" />
+ <path
+ d="M940.57354,446.16634a26.205,26.205,0,1,0-4.91018-51.82531c-5.40118-3.27952-11.6809-5.48627-17.97478-4.925s-12.51835,4.29788-14.87192,10.16207.17487,13.59411,6.02708,15.97731c3.75184,1.52786,7.98866.78692,11.99255.1708s8.37171-1.01817,11.85634,1.04774,5.05107,7.60548,1.93026,10.18835a10.73847,10.73847,0,0,0-3.0842,11.82027C933.10715,442.83887,937.38805,446.09752,940.57354,446.16634Z"
+ transform="translate(-178.21027 -129.74161)" fill="#2f2e41" />
+ <path
+ d="M971.04643,580.81327l4.35678,165.33964a4,4,0,0,1-4.20243,4.10017l-14.35213-.73225a4,4,0,0,1-3.74658-3.36683L936.031,638.76494a2,2,0,0,0-3.92705-.12222l-23.10758,103.3966a4,4,0,0,1-5.24374,2.89644l-14.24374-.87a4,4,0,0,1-2.64986-4.05306l12.434-160.76415Z"
+ transform="translate(-178.21027 -129.74161)" fill="#2f2e41" />
+ <path
+ d="M978.03835,502.28255c2.403-25.05537-16.01923-47.71792-41.12634-49.5007-10.81772-.76813-27.61219-1.04273-33.14841,13.13648-16.6774,42.71375,12.51774,41.67582,2.45884,78.68292s-18.94294,39.128-5.14121,41.80029,75.86671,18.447,73.31817-7.60005C972.83287,562.79095,975.64139,527.27536,978.03835,502.28255Z"
+ transform="translate(-178.21027 -129.74161)" fill="#4338ca" />
+ <path
+ d="M908.71686,461.57372l0,0a12.08366,12.08366,0,0,1,16.29393,13.1781l-7.8391,48.991a47.876,47.876,0,0,1-10.26518,22.80677L881.44705,577.5737a4,4,0,0,1-6.06458.13914L869.335,570.997a4,4,0,0,1-.196-5.11813l1.78109-2.31142a134.7031,134.7031,0,0,0,27.04467-66.179l3.11643-25.98473A12.08366,12.08366,0,0,1,908.71686,461.57372Z"
+ transform="translate(-178.21027 -129.74161)" fill="#4338ca" /></svg>
\ No newline at end of file
diff --git a/public/assets/images/undraw-public-discussion.svg b/public/assets/images/undraw-public-discussion.svg
new file mode 100644
index 000000000..a21cdbcea
--- /dev/null
+++ b/public/assets/images/undraw-public-discussion.svg
@@ -0,0 +1 @@
+<svg id="a5e41641-253a-4d07-9648-f1ab5b1a0370" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="894.13386" height="586.58369" viewBox="0 0 894.13386 586.58369"><title>public_discussion</title><ellipse cx="447.06693" cy="558.52231" rx="447.06693" ry="28.06139" fill="#e6e6e6"/><path d="M836.232,156.70815a3.18216,3.18216,0,0,0-3.17882,3.17882V284.49219A3.18216,3.18216,0,0,0,836.232,287.671H981.77334a3.18216,3.18216,0,0,0,3.17881-3.17882V159.887a3.18216,3.18216,0,0,0-3.17881-3.17882Z" transform="translate(-152.93307 -156.70815)" fill="#e6e6e6"/><path d="M856.41687,231.70873a1.39761,1.39761,0,0,0,0,2.739H962.89726a1.39761,1.39761,0,0,0,0-2.739Z" transform="translate(-152.93307 -156.70815)" fill="#fff"/><path d="M855.10809,247.98221a1.39761,1.39761,0,0,0,0,2.739H961.58848a1.39761,1.39761,0,0,0,0-2.739Z" transform="translate(-152.93307 -156.70815)" fill="#fff"/><path d="M856.41687,264.2557a1.39761,1.39761,0,0,0,0,2.739H962.89726a1.39761,1.39761,0,0,0,0-2.739Z" transform="translate(-152.93307 -156.70815)" fill="#fff"/><path d="M856.41687,177.38442a1.39808,1.39808,0,0,0,0,2.7398H962.89726a1.39808,1.39808,0,0,0,0-2.7398Z" transform="translate(-152.93307 -156.70815)" fill="#fff"/><path d="M855.10809,193.65791a1.39807,1.39807,0,0,0,0,2.73979H961.58848a1.39807,1.39807,0,0,0,0-2.73979Z" transform="translate(-152.93307 -156.70815)" fill="#fff"/><path d="M856.41687,209.9314a1.39807,1.39807,0,0,0,0,2.73979H962.89726a1.39807,1.39807,0,0,0,0-2.73979Z" transform="translate(-152.93307 -156.70815)" fill="#fff"/><path d="M771.17882,207.66232A3.18216,3.18216,0,0,0,768,210.84113V335.44635a3.18216,3.18216,0,0,0,3.17882,3.17882H916.72014a3.18216,3.18216,0,0,0,3.17881-3.17882V210.84113a3.18216,3.18216,0,0,0-3.17881-3.17881Z" transform="translate(-152.93307 -156.70815)" fill="#4338ca"/><path d="M791.36367,282.66289a1.39761,1.39761,0,0,0,0,2.739H897.84406a1.39761,1.39761,0,0,0,0-2.739Z" transform="translate(-152.93307 -156.70815)" fill="#fff"/><path d="M790.0549,298.93638a1.39761,1.39761,0,0,0,0,2.739H896.53528a1.39761,1.39761,0,0,0,0-2.739Z" transform="translate(-152.93307 -156.70815)" fill="#fff"/><path d="M791.36367,315.20986a1.39761,1.39761,0,0,0,0,2.739H897.84406a1.39761,1.39761,0,0,0,0-2.739Z" transform="translate(-152.93307 -156.70815)" fill="#fff"/><path d="M791.36367,228.33859a1.39807,1.39807,0,0,0,0,2.73979H897.84406a1.39807,1.39807,0,0,0,0-2.73979Z" transform="translate(-152.93307 -156.70815)" fill="#fff"/><path d="M790.0549,244.61207a1.39807,1.39807,0,0,0,0,2.73979H896.53528a1.39807,1.39807,0,0,0,0-2.73979Z" transform="translate(-152.93307 -156.70815)" fill="#fff"/><path d="M791.36367,260.88556a1.39807,1.39807,0,0,0,0,2.73979H897.84406a1.39807,1.39807,0,0,0,0-2.73979Z" transform="translate(-152.93307 -156.70815)" fill="#fff"/><polygon points="823.848 515.784 824.611 530.278 840.63 528.752 839.105 514.259 823.848 515.784" fill="#fbbebe"/><polygon points="762.058 499.002 762.821 513.496 778.841 511.97 777.315 497.476 762.058 499.002" fill="#fbbebe"/><path d="M987.84212,475.29963l-57.97546,9.91685L926.05249,590.4877l-15.2567,67.12948,24.41072,10.67968,23.64788-66.36663,8.39119-58.73829,6.10268,58.73829.76283,73.995,37.37891-2.2885L1002.55345,528.737a134.80677,134.80677,0,0,0-14.71132-53.43732Z" transform="translate(-152.93307 -156.70815)" fill="#2f2e41"/><path d="M979.06952,681.64648s-5.33985-6.10268-5.33985-3.81418-3.05134,24.41072-3.05134,24.41072,20.59655,6.10268,20.59655,9.91685,29.75056,9.91686,28.98772,2.28851-26.69922-36.61608-26.69922-36.61608S982.88369,676.30663,979.06952,681.64648Z" transform="translate(-152.93307 -156.70815)" fill="#2f2e41"/><path d="M918.20815,664.9563s-1.62605-7.94434-2.75708-5.95486-14.71691,19.71311-14.71691,19.71311,14.88927,15.48451,13.00423,18.80031,20.96215,23.32441,24.06908,16.31579-5.11423-45.027-5.11423-45.027S924.163,662.19922,918.20815,664.9563Z" transform="translate(-152.93307 -156.70815)" fill="#2f2e41"/><polygon points="764.106 234.499 806.338 238.537 820.415 200.175 779.985 190.435 764.106 234.499" fill="#2f2e41"/><circle cx="798.67439" cy="205.31049" r="21.35938" fill="#fbbebe"/><path d="M939.4021,374.98683s0,14.49387-11.44252,20.59655,27.46205,12.96819,27.46205,12.96819l3.81418-12.96819s-11.44252-5.33985-1.52567-17.54521Z" transform="translate(-152.93307 -156.70815)" fill="#fbbebe"/><path d="M957.71014,391.7692s-13.97113,8.65367-25.675.89408l-4.83838-.89408-14.49386,3.05134-6.86552,25.93639,25.93639,64.841s45.00726,7.62835,54.16128-9.154l-5.33984-68.65514-14.49387-17.54521Z" transform="translate(-152.93307 -156.70815)" fill="#575a89"/><polygon points="811.643 235.824 836.816 200.733 834.528 196.919 801.726 180.137 801.726 169.457 852.836 183.188 856.294 188.668 826.136 254.132 811.643 235.824" fill="#575a89"/><polygon points="761.295 238.875 759.77 238.112 721.628 236.587 750.616 211.413 741.462 199.971 697.98 232.773 697.98 240.401 759.77 266.337 761.295 238.875" fill="#575a89"/><path d="M894.01342,360.11155l5.33985-3.05134s11.44252-15.2567,16.01953-9.154-10.67969,17.54521-10.67969,17.54521l-8.39118,3.05134Z" transform="translate(-152.93307 -156.70815)" fill="#fbbebe"/><path d="M956.9473,328.4539l-8.39118-4.577s-25.17355,2.28851-22.12221,7.62835,20.59654.76284,20.59654.76284l9.91685,3.05134Z" transform="translate(-152.93307 -156.70815)" fill="#fbbebe"/><path d="M935.21023,341.40346s-9.80475,3.26825-10.30262,16.1753a22.89341,22.89341,0,0,0,.68058,6.12889c.55208,2.33976.907,7.37421-3.3716,13.95318a138.11944,138.11944,0,0,0-7.8392,13.48452l-.03068.06135,10.76827,1.346,2.28969-17.84918a88.88225,88.88225,0,0,1,7.058-25.05771l.07451-.16618s4.71112,8.74922,14.13335,8.74922l-3.36508-3.36508s14.80637,6.05715,20.1905,6.05715c0,0,4.0381,2.69206,0,6.73016s-12.1143,13.46034-7.40318,20.86352.673,9.42223.673,9.42223l7.40319-4.0381,3.36508-2.019v2.69207l17.49843-2.019s4.71112-.673-5.38413-12.1143c0,0-2.66582-4.443-1.4995-8.27508a19.32915,19.32915,0,0,0,.73475-9.03963C978.622,350.50685,969.74876,325.423,935.21023,341.40346Z" transform="translate(-152.93307 -156.70815)" fill="#2f2e41"/><path d="M321.29019,353.86362a1.99183,1.99183,0,0,0-1.98974,1.98974V507.86982a1.99159,1.99159,0,0,0,1.98974,1.98975h347.0114a1.99159,1.99159,0,0,0,1.98975-1.98975V355.85336a1.99184,1.99184,0,0,0-1.98975-1.98974Z" transform="translate(-152.93307 -156.70815)" fill="#e6e6e6"/><path d="M621.34363,383.85435H368.24816a2.3877,2.3877,0,1,1,0-4.77539H621.34363a2.3877,2.3877,0,0,1,0,4.77539Z" transform="translate(-152.93307 -156.70815)" fill="#fff"/><path d="M621.34363,402.95589H368.24816a2.38769,2.38769,0,1,1,0-4.77538H621.34363a2.38769,2.38769,0,1,1,0,4.77538Z" transform="translate(-152.93307 -156.70815)" fill="#fff"/><path d="M621.34363,422.05744H368.24816a2.3877,2.3877,0,1,1,0-4.77539H621.34363a2.3877,2.3877,0,0,1,0,4.77539Z" transform="translate(-152.93307 -156.70815)" fill="#fff"/><path d="M621.34363,441.01441H368.24816a2.38769,2.38769,0,1,1,0-4.77538H621.34363a2.38769,2.38769,0,1,1,0,4.77538Z" transform="translate(-152.93307 -156.70815)" fill="#fff"/><path d="M621.34363,460.116H368.24816a2.3877,2.3877,0,1,1,0-4.77539H621.34363a2.38769,2.38769,0,0,1,0,4.77539Z" transform="translate(-152.93307 -156.70815)" fill="#fff"/><path d="M557.10017,476.0105a.68249.68249,0,0,0-.68178.68177v18.074a.68249.68249,0,0,0,.68178.68177H620.3233a.68249.68249,0,0,0,.68177-.68177v-18.074a.68249.68249,0,0,0-.68177-.68177Z" transform="translate(-152.93307 -156.70815)" fill="#fff"/><path d="M210.77727,509.513s-5.22,62.76447-6.34076,76.21377a95.64717,95.64717,0,0,1-5.60387,24.65705,23.18546,23.18546,0,0,0-2.24155,8.9662v57.15952s-4.4831,0-3.36233,4.4831,2.24155,12.32852,2.24155,12.32852h16.81162s-1.12077-3.36233,2.24155-4.4831,0-10.087,0-10.087l17.9324-67.2465,26.8986-56.03874s15.69085,50.43487,19.05317,56.03874c0,0,12.32853,62.7634,14.57008,68.36727s3.36232,5.60388,2.24155,7.84543-1.12078,4.48309,0,5.60387,22.41549,0,22.41549,0l-5.60387-79.575-10.087-95.26586L250.38828,502.7894Z" transform="translate(-152.93307 -156.70815)" fill="#2f2e41"/><path d="M207.79884,684.35493s-5.60388-20.17395-14.57008-4.4831-8.9662,21.29472-8.9662,21.29472-14.57007,21.29473,5.60388,19.05318,15.69085-12.32853,15.69085-12.32853,7.84542-4.4831,7.84542-7.84542S207.79884,684.35493,207.79884,684.35493Z" transform="translate(-152.93307 -156.70815)" fill="#2f2e41"/><path d="M298.5816,682.11338s5.60387-20.17395,14.57007-4.4831,8.9662,21.29472,8.9662,21.29472,14.57008,21.29473-5.60387,19.05318-15.69085-12.32853-15.69085-12.32853-7.84542-4.4831-7.84542-7.84542S298.5816,682.11338,298.5816,682.11338Z" transform="translate(-152.93307 -156.70815)" fill="#2f2e41"/><path d="M245.90518,358.20944s2.24155,14.57008-4.4831,17.9324,14.57007,15.69085,20.17395,15.69085,15.69085-11.20775,15.69085-11.20775-5.60388-16.81162-4.4831-20.17395Z" transform="translate(-152.93307 -156.70815)" fill="#ffb9b9"/><circle cx="105.30063" cy="189.17277" r="23.53627" fill="#ffb9b9"/><path d="M304.18547,394.07424,276.167,377.09876s-15.94172,18.09625-33.18876-2.07769l-29.57556,7.84542,4.4831,76.21269s-6.72465,30.26092-4.4831,35.8648-5.60387,7.84542-3.36232,8.9662,0,8.9662,0,8.9662,43.71022,22.41549,91.90353,5.60387l-4.4831-14.57007a11.76068,11.76068,0,0,0-2.24154-11.20775s4.48309-6.72465-1.12078-12.32853c0,0,2.24155-10.087-3.36232-14.57007L289.6154,450.113l3.36233-7.84542Z" transform="translate(-152.93307 -156.70815)" fill="#cfcce0"/><path d="M246.18852,334.95237s-2.806,6.07252,8.418,3.64351c0,0,4.209,2.429,4.209-1.2145,0,0,5.612,6.07252,7.015,2.429s4.209,1.2145,4.209,1.2145l2.806-6.07252,2.806,3.64351h9.821s2.806-24.29007-30.866-21.86106-17.10715,40.91424-17.10715,40.91424.27115-6.90814,3.07715-3.26463S246.18852,334.95237,246.18852,334.95237Z" transform="translate(-152.93307 -156.70815)" fill="#2f2e41"/><path d="M314.27245,438.90523l1.12077,23.53628s4.4831,43.71022-4.4831,62.76339v10.087s-2.24155,25.77782-13.4493,24.65705,3.36233-36.98557,3.36233-36.98557l-2.24155-49.31409-2.24155-28.01938Z" transform="translate(-152.93307 -156.70815)" fill="#ffb9b9"/><path d="M291.857,395.195l11.18029-1.81645a54.58562,54.58562,0,0,1,15.71831,28.71505c3.36232,17.9324,4.4831,21.29472,4.4831,21.29472l-26.8986,6.72465L281.77,422.09361Z" transform="translate(-152.93307 -156.70815)" fill="#cfcce0"/><path d="M244.928,401.83472a1.99184,1.99184,0,0,0-1.98975,1.98974V555.84093a1.99159,1.99159,0,0,0,1.98975,1.98974h347.0114a1.99158,1.99158,0,0,0,1.98974-1.98974V403.82446a1.99183,1.99183,0,0,0-1.98974-1.98974Z" transform="translate(-152.93307 -156.70815)" fill="#4338ca"/><path d="M544.98146,431.82545H291.886a2.3877,2.3877,0,0,1,0-4.77539H544.98146a2.38769,2.38769,0,1,1,0,4.77539Z" transform="translate(-152.93307 -156.70815)" fill="#fff"/><path d="M544.98146,450.927H291.886a2.3877,2.3877,0,0,1,0-4.77539H544.98146a2.38769,2.38769,0,1,1,0,4.77539Z" transform="translate(-152.93307 -156.70815)" fill="#fff"/><path d="M544.98146,470.02854H291.886a2.3877,2.3877,0,0,1,0-4.77539H544.98146a2.3877,2.3877,0,1,1,0,4.77539Z" transform="translate(-152.93307 -156.70815)" fill="#fff"/><path d="M544.98146,488.98552H291.886a2.3877,2.3877,0,0,1,0-4.77539H544.98146a2.3877,2.3877,0,1,1,0,4.77539Z" transform="translate(-152.93307 -156.70815)" fill="#fff"/><path d="M544.98146,508.08706H291.886a2.38769,2.38769,0,1,1,0-4.77538H544.98146a2.38769,2.38769,0,1,1,0,4.77538Z" transform="translate(-152.93307 -156.70815)" fill="#fff"/><path d="M480.738,523.9816a.68249.68249,0,0,0-.68177.68177v18.074a.68249.68249,0,0,0,.68177.68177h63.22313a.68249.68249,0,0,0,.68177-.68177v-18.074a.68249.68249,0,0,0-.68177-.68177Z" transform="translate(-152.93307 -156.70815)" fill="#fff"/><path d="M196.59109,425.45594s-10.087,42.58944,2.24155,42.58944,41.46867-48.19332,41.46867-48.19332,30.26092-15.69085,17.93239-21.29472-28.01937,8.9662-28.01937,8.9662l-18.105,25.13638-.94817-12.80786Z" transform="translate(-152.93307 -156.70815)" fill="#ffb9b9"/><path d="M220.12736,389.59114l-6.72465-6.72465s-13.4493,7.84542-14.57007,15.69085-6.72465,32.50247-6.72465,32.50247l20.73433,1.68116,6.72465-10.087Z" transform="translate(-152.93307 -156.70815)" fill="#cfcce0"/></svg>
\ No newline at end of file
diff --git a/public/assets/styles/grid.scss b/public/assets/styles/grid.scss
index 91c7c8200..ec2e79ab8 100644
--- a/public/assets/styles/grid.scss
+++ b/public/assets/styles/grid.scss
@@ -16,7 +16,7 @@
@include media("md") {
.container {
- width: 723px;
+ width: 720px;
margin-left: auto !important;
margin-right: auto !important;
}
@@ -24,7 +24,7 @@
@include media("lg") {
.container {
- width: 933px;
+ width: 960px;
margin-left: auto !important;
margin-right: auto !important;
}
diff --git a/public/assets/styles/index.scss b/public/assets/styles/index.scss
index f03157416..d0e3cb58c 100644
--- a/public/assets/styles/index.scss
+++ b/public/assets/styles/index.scss
@@ -1,4 +1,5 @@
@import "variables.scss";
@import "main.scss";
+@import "tooltip.scss";
@import "grid.scss";
@import "utility.scss";
diff --git a/public/assets/styles/main.scss b/public/assets/styles/main.scss
index 006b66d29..ccb763dc0 100644
--- a/public/assets/styles/main.scss
+++ b/public/assets/styles/main.scss
@@ -21,8 +21,7 @@ body {
overflow-x: hidden;
min-width: 320px;
font-family: $font-site;
- background-color: $bg-color;
- color: $gray-darkest;
+ color: $gray-900;
font-size: $font-size;
}
@@ -87,7 +86,7 @@ h5:last-child {
p {
margin: 0 0 14px;
- line-height: 1.38;
+ line-height: 1.5;
}
p:first-child {
margin-top: 0;
@@ -128,7 +127,7 @@ a:hover {
}
.status-open {
- color: $gray-darkest;
+ color: $gray-900;
}
.status-planned {
@@ -167,6 +166,8 @@ a:hover {
*:focus {
outline: 0;
+ box-shadow: 0 0 0 3px $blue-300;
+ transition: all 0.3s ease;
}
[type="reset"],
@@ -203,7 +204,6 @@ h2,
h3,
h4,
h5,
-.ui,
input {
text-rendering: optimizeLegibility;
-webkit-font-smoothing: antialiased;
@@ -212,7 +212,7 @@ input {
.info {
font-size: 90%;
font-weight: 400;
- color: $gray-darker;
+ color: $gray-700;
}
.right {
@@ -241,7 +241,7 @@ svg.icon {
font-weight: 600;
letter-spacing: 0.3px;
text-transform: uppercase;
- color: $gray-dark;
+ color: $gray-500;
display: block;
&.active {
cursor: pointer;
@@ -268,8 +268,8 @@ svg.icon {
blockquote {
padding: 0 8px;
- color: $gray-darkest;
- border-left: 4px solid $gray-light;
+ color: $gray-900;
+ border-left: 4px solid $gray-300;
margin: 5px 0;
}
@@ -318,13 +318,13 @@ svg.icon {
}
}
-.ui.inline.dropdown {
+.inline.dropdown {
> .text {
border-bottom: 1px dashed #9e9e9e;
}
}
-.ui.basic.red.label {
+.basic.red.label {
width: 100%;
color: #ef7878 !important;
border-color: #ef7878 !important;
@@ -396,11 +396,11 @@ svg.icon {
tr {
th {
padding: 5px;
- border-bottom: 1px solid $gray;
- background-color: $gray-lighter;
+ border-bottom: 1px solid $gray-400;
+ background-color: $gray-200;
}
td {
- border-bottom: 1px solid $gray;
+ border-bottom: 1px solid $gray-400;
padding: 5px;
}
}
diff --git a/public/assets/styles/tooltip.scss b/public/assets/styles/tooltip.scss
new file mode 100644
index 000000000..3d012aa6d
--- /dev/null
+++ b/public/assets/styles/tooltip.scss
@@ -0,0 +1,27 @@
+[data-tooltip]{
+ cursor: pointer;
+ position: relative;
+}
+
+[data-tooltip]::before {
+ background-color: $gray-700;
+ color: $white;
+ font-size: $font-size-tiny;
+ padding: 4px 6px;
+ height: max-content;
+ width: max-content;
+ border-radius: 4px;
+ position: absolute;
+ text-align: center;
+ bottom: 40px;
+ font-weight: 500;
+ left: 50%;
+ content: attr(data-tooltip);
+ transform: translate(-50%, 100%) scale(0);
+ transition: 0.1s;
+}
+
+[data-tooltip]:hover:before {
+ display: block;
+ transform: translate(-50%, 100%) scale(1);
+}
\ No newline at end of file
diff --git a/public/assets/styles/variables.scss b/public/assets/styles/variables.scss
index c580a1928..156387c4f 100644
--- a/public/assets/styles/variables.scss
+++ b/public/assets/styles/variables.scss
@@ -10,122 +10,113 @@ $font-size-xlarge: 22px;
$font-site: -apple-system, BlinkMacSystemFont, "Segoe UI", Arial, "Helvetica Neue", Helvetica, sans-serif;
$font-code: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
-$bg-color: #fdfdfd;
$white: #fff;
-// http://www.colorbox.io
-// Luminosity 98 to 15 with Sine EaseOut
-$gray-darkest: #262626;
-$gray-darker: #5c5c5c;
-$gray-dark: #929292;
-$gray: #c2c2c2;
-$gray-light: #e3e3e3;
-$gray-lighter: #f5f5f5;
-$gray-lightest: #fafafa;
+$gray-900: #111827;
+$gray-700: #374151;
+$gray-500: #6b7280;
+$gray-400: #9ca3af;
+$gray-300: #d1d5db;
+$gray-200: #e5e7eb;
+$gray-100: #f3f4f6;
+$gray-50: #f9fafb;
$gray-scale: (
- darkest: $gray-darkest,
- darker: $gray-darker,
- dark: $gray-dark,
- default: $gray,
- light: $gray-light,
- lighter: $gray-lighter,
- lightest: $gray-lightest,
+ 900: $gray-900,
+ 700: $gray-700,
+ 500: $gray-500,
+ 400: $gray-400,
+ 300: $gray-300,
+ 200: $gray-200,
+ 100: $gray-100,
+ 50: $gray-50,
);
-// http://www.colorbox.io
-// Hue 121 to 121 SineEaseOut
-// Saturation 5 to 80 SineEaseOut
-// Luminosity 100 to 40 SineEaseOut
-$green-darkest: #19801b;
-$green-darker: #23a025;
-$green-dark: #36c138;
-$green: #58dd5a;
-$green-light: #89f18b;
-$green-lighter: #bffcc0;
-$green-lightest: #f2fff2;
+$green-900: #064e3b;
+$green-700: #047857;
+$green-500: #10b981;
+$green-400: #34d399;
+$green-300: #6ee7b7;
+$green-200: #a7f3d0;
+$green-100: #d1fae5;
+$green-50: #ecfdf5;
$green-scale: (
- darkest: $green-darkest,
- darker: $green-darker,
- dark: $green-dark,
- default: $green,
- light: $green-light,
- lighter: $green-lighter,
- lightest: $green-lightest,
+ 900: $green-900,
+ 700: $green-700,
+ 500: $green-500,
+ 400: $green-400,
+ 300: $green-300,
+ 200: $green-200,
+ 100: $green-100,
+ 50: $green-50,
);
-// http://www.colorbox.io
-// Hue 40 to 40 SineEaseOut
-// Saturation 5 to 80 SineEaseOut
-// Luminosity 100 to 40 SineEaseOut
-$yellow-darkest: #664400;
-$yellow-darker: #8d5e00;
-$yellow-dark: #b47800;
-$yellow: #d78f00;
-$yellow-light: #efaa20;
-$yellow-lighter: #fbd382;
-$yellow-lightest: #fff7e6;
+$yellow-900: #78350f;
+$yellow-700: #b45309;
+$yellow-500: #f59e0b;
+$yellow-400: #fbbf24;
+$yellow-300: #fcd34d;
+$yellow-200: #fde68a;
+$yellow-100: #fef3c7;
+$yellow-50: #fffbeb;
$yellow-scale: (
- darkest: $yellow-darkest,
- darker: $yellow-darker,
- dark: $yellow-dark,
- default: $yellow,
- light: $yellow-light,
- lighter: $yellow-lighter,
- lightest: $yellow-lightest,
+ 900: $yellow-900,
+ 700: $yellow-700,
+ 500: $yellow-500,
+ 400: $yellow-400,
+ 300: $yellow-300,
+ 200: $yellow-200,
+ 100: $yellow-100,
+ 50: $yellow-50,
);
-// http://www.colorbox.io
-// Hue 0 to 0 SineEaseOut
-// Saturation 5 to 80 SineEaseOut
-// Luminosity 100 to 40 SineEaseOut
-$red-darkest: #801919;
-$red-darker: #a02323;
-$red-dark: #c13636;
-$red: #dd5858;
-$red-light: #f18989;
-$red-lighter: #fcbfbf;
-$red-lightest: #fff2f2;
+$red-900: #7f1d1d;
+$red-700: #b91c1c;
+$red-500: #ef4444;
+$red-400: #f87171;
+$red-300: #fca5a5;
+$red-200: #fecaca;
+$red-100: #fee2e2;
+$red-50: #fef2f2;
$red-scale: (
- darkest: $red-darkest,
- darker: $red-darker,
- dark: $red-dark,
- default: $red,
- light: $red-light,
- lighter: $red-lighter,
- lightest: $red-lightest,
+ 900: $red-900,
+ 700: $red-700,
+ 500: $red-500,
+ 400: $red-400,
+ 300: $red-300,
+ 200: $red-200,
+ 100: $red-100,
+ 50: $red-50,
);
-// http://www.colorbox.io
-// Hue 220 to 220 SineEaseOut
-// Saturation 5 to 80 SineEaseOut
-// Luminosity 100 to 40 SineEaseOut
-$blue-darkest: #193c80;
-$blue-darker: #234da0;
-$blue-dark: #3664c1;
-$blue: #5885dd;
-$blue-light: #89acf1;
-$blue-lighter: #bfd4fc;
-$blue-lightest: #f2f7ff;
+$blue-900: #1e3a8a;
+$blue-700: #1d4ed8;
+$blue-500: #3b82f6;
+$blue-400: #60a5fa;
+$blue-300: #93c5fd;
+$blue-200: #bfdbfe;
+$blue-100: #dbeafe;
+$blue-50: #eff6ff;
$blue-scale: (
- darkest: $blue-darkest,
- darker: $blue-darker,
- dark: $blue-dark,
- default: $blue,
- light: $blue-light,
- lighter: $blue-lighter,
- lightest: $blue-lightest,
+ 900: $blue-900,
+ 700: $blue-700,
+ 500: $blue-500,
+ 400: $blue-400,
+ 300: $blue-300,
+ 200: $blue-200,
+ 100: $blue-100,
+ 50: $blue-50,
);
-$main-color: #3b4ade;
-$admin-color: #3b4ade;
-$link-color: #3664c1;
+$main-color: #4338ca;
+$admin-color: #4338ca;
+$link-color: #3b82f6;
-$orange: #ff9320;
+$orange: #f59e0b;
// Queries
$sm-width: 576px;
@@ -175,9 +166,9 @@ $xl-width: 1200px;
@function textColorFor($color) {
@if (lightness($color) > 60) {
- @return $gray-darkest; // Lighter background, return dark color
+ @return $gray-900; // Lighter background, return dark color
} @else {
- @return $gray-lightest; // Darker background, return light color
+ @return $gray-100; // Darker background, return light color
}
}
diff --git a/public/components/ShowPostResponse.tsx b/public/components/ShowPostResponse.tsx
index e90674c51..79122bad4 100644
--- a/public/components/ShowPostResponse.tsx
+++ b/public/components/ShowPostResponse.tsx
@@ -47,7 +47,7 @@ const StatusDetails = (props: PostResponseProps): JSX.Element | null => {
)
}
-export const ShowPostResponse = (props: PostResponseProps): JSX.Element => {
+export const ShowPostResponse = (props: PostResponseProps): JSX.Element | null => {
const status = PostStatus.Get(props.status)
if (props.response && (status.show || props.response.text)) {
@@ -64,5 +64,5 @@ export const ShowPostResponse = (props: PostResponseProps): JSX.Element => {
)
}
- return <div />
+ return null
}
diff --git a/public/components/ShowTag.scss b/public/components/ShowTag.scss
index d60b34837..01cebb99d 100644
--- a/public/components/ShowTag.scss
+++ b/public/components/ShowTag.scss
@@ -1,18 +1,19 @@
@import "~@fider/assets/styles/variables.scss";
.c-tag {
- display: inline-block;
- line-height: 1;
- vertical-align: baseline;
- color: $gray-darkest;
- font-weight: 600;
- border-radius: 3px;
+ display: inline-flex;
+ justify-content: center;
+ align-items: center;
+ font-size: $font-size-tiny;
+ color: $gray-900;
+ font-weight: 500;
+ border-radius: 10px;
+ line-height: 18px;
+ padding: 0 8px;
border: 0;
- box-shadow: inset 0 -1px 0 rgba(27, 31, 35, 0.12);
- svg.icon {
- font-size: $font-size-micro;
- margin-top: -3px;
+ svg {
+ height: 8px;
margin-right: 2px;
}
@@ -25,46 +26,7 @@
min-height: 0;
min-width: 0;
overflow: hidden;
- border-radius: 50px;
-
- &.m-mini {
- padding: 5px;
- }
-
- &.m-tiny {
- padding: 6px;
- }
-
- &.m-small {
- padding: 7px;
- }
-
- &.m-normal {
- padding: 7.5px;
- }
-
- &.m-large {
- padding: 8px;
- }
- }
-
- &.m-mini {
- font-size: 75%;
- padding: 3px 5px;
- }
-
- &.m-tiny {
- font-size: 80%;
- padding: 4px 6px;
- }
-
- &.m-small {
- font-size: 85%;
- padding: 5px 7px;
- }
-
- &.m-normal {
- font-size: 90%;
- padding: 5px 8px;
+ border-radius: 50%;
+ padding: 6px;
}
}
diff --git a/public/components/ShowTag.tsx b/public/components/ShowTag.tsx
index e909042a8..322240558 100644
--- a/public/components/ShowTag.tsx
+++ b/public/components/ShowTag.tsx
@@ -3,11 +3,9 @@ import "./ShowTag.scss"
import React from "react"
import { Tag } from "@fider/models"
import { classSet } from "@fider/services"
-import { FaLock } from "react-icons/fa"
interface TagProps {
tag: Tag
- size?: "mini" | "tiny" | "small" | "normal"
circular?: boolean
}
@@ -32,7 +30,6 @@ const textColor = (color: string) => {
export const ShowTag = (props: TagProps) => {
const className = classSet({
"c-tag": true,
- [`m-${props.size || "normal"}`]: true,
"m-circular": props.circular === true,
})
@@ -45,7 +42,15 @@ export const ShowTag = (props: TagProps) => {
color: textColor(props.tag.color),
}}
>
- {!props.tag.isPublic && !props.circular && <FaLock />}
+ {!props.tag.isPublic && !props.circular && (
+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+ <path
+ fillRule="evenodd"
+ d="M5 9V7a5 5 0 0110 0v2a2 2 0 012 2v5a2 2 0 01-2 2H5a2 2 0 01-2-2v-5a2 2 0 012-2zm8-2v2H7V7a3 3 0 016 0z"
+ clipRule="evenodd"
+ />
+ </svg>
+ )}
{props.circular ? "" : props.tag.name || "Tag"}
</div>
)
diff --git a/public/components/VoteCounter.scss b/public/components/VoteCounter.scss
index 32f05543e..09849a2f2 100644
--- a/public/components/VoteCounter.scss
+++ b/public/components/VoteCounter.scss
@@ -15,10 +15,10 @@
text-align: center;
margin: 0 auto;
padding: 0 0;
- color: $gray-darker;
+ color: $gray-700;
.icon {
- color: $gray;
+ color: $gray-400;
margin-bottom: -3px;
}
}
diff --git a/public/components/common/Avatar.scss b/public/components/common/Avatar.scss
index 084605627..2572240db 100644
--- a/public/components/common/Avatar.scss
+++ b/public/components/common/Avatar.scss
@@ -20,8 +20,4 @@
width: 35px;
height: 35px;
}
-
- &.m-staff {
- border: 1px solid $admin-color;
- }
}
diff --git a/public/components/common/Avatar.tsx b/public/components/common/Avatar.tsx
index 8f832578d..b8f43f604 100644
--- a/public/components/common/Avatar.tsx
+++ b/public/components/common/Avatar.tsx
@@ -22,5 +22,5 @@ export const Avatar = (props: AvatarProps) => {
"m-staff": props.user.role && isCollaborator(props.user.role),
})
- return <img className={className} alt={props.user.name} title={props.user.name} src={`${props.user.avatarURL}?size=50`} />
+ return <img className={className} alt={props.user.name} src={`${props.user.avatarURL}?size=50`} />
}
diff --git a/public/components/common/Button.scss b/public/components/common/Button.scss
index 2f9292c36..53306b73e 100644
--- a/public/components/common/Button.scss
+++ b/public/components/common/Button.scss
@@ -27,35 +27,35 @@
}
&.m-default {
- color: $gray-darkest;
- background-color: $gray-lightest;
- border: 1px solid $gray-light;
+ color: $gray-900;
+ background-color: $gray-100;
+ border: 1px solid $gray-300;
&:hover {
- border: 1px solid $gray-dark;
+ border: 1px solid $gray-500;
}
}
&.m-positive {
color: $white;
- background-color: $green-dark;
- border: 1px solid $green-dark;
+ background-color: $green-500;
+ border: 1px solid $green-500;
&:hover {
- background-color: $green-darker;
- border-color: $green-darker;
+ background-color: $green-700;
+ border-color: $green-700;
}
}
&.m-danger {
- color: $red;
- border: 1px solid $gray-light;
+ color: $red-500;
+ border: 1px solid $gray-300;
background-color: $white;
&:hover {
color: $white;
- border: 1px solid $red;
- background-color: $red;
+ border: 1px solid $red-500;
+ background-color: $red-500;
}
}
@@ -138,7 +138,7 @@
&.m-social {
background-color: $white;
- color: $gray-darkest;
+ color: $gray-900;
text-align: center;
height: 40px;
line-height: 22px;
@@ -160,7 +160,7 @@
&:hover {
background-color: #fafafb;
- color: $gray-darkest;
+ color: $gray-900;
border: none;
box-shadow: 0 0 0 1px rgba(20, 11, 47, 0.1), 0 2px 4px -2px rgba(0, 0, 0, 0.2);
}
diff --git a/public/components/common/DropDown.scss b/public/components/common/DropDown.scss
index 80833ea7b..810a7b6be 100644
--- a/public/components/common/DropDown.scss
+++ b/public/components/common/DropDown.scss
@@ -14,7 +14,7 @@
&.is-open {
.c-dropdown-arrow {
- border-color: transparent transparent $gray;
+ border-color: transparent transparent $gray-400;
border-width: 0 5px 5px;
}
}
@@ -25,12 +25,9 @@
}
}
- &.m-style-simple {
- }
-
&.m-style-normal {
.c-dropdown-control {
- border: 1px solid $gray-light;
+ border: 1px solid $gray-300;
&:hover {
box-shadow: 0 1px 0 rgba(0, 0, 0, 0.06);
@@ -42,10 +39,10 @@
position: relative;
cursor: pointer;
overflow: hidden;
- background-color: $white;
+ background-color: transparent;
border-radius: 3px;
box-sizing: border-box;
- color: $gray-darkest;
+ color: $gray-900;
outline: none;
padding: 8px 52px 8px 10px;
transition: all 200ms ease;
@@ -56,11 +53,11 @@
}
.c-dropdown-placeholder {
- color: $gray-light;
+ color: $gray-300;
}
.c-dropdown-arrow {
- border-color: $gray-dark transparent transparent;
+ border-color: $gray-500 transparent transparent;
border-style: solid;
border-width: 5px 5px 0;
content: " ";
@@ -76,7 +73,7 @@
.c-dropdown-menu {
background-color: $white;
- border: 1px solid $gray-light;
+ border: 1px solid $gray-300;
box-shadow: 0 1px 0 rgba(0, 0, 0, 0.06);
box-sizing: border-box;
margin-top: -1px;
@@ -115,7 +112,7 @@
}
&:hover {
- background-color: $gray-lightest;
+ background-color: $gray-100;
}
&.is-selected {
@@ -125,7 +122,7 @@
.c-dropdown-noresults {
box-sizing: border-box;
- color: $gray;
+ color: $gray-400;
cursor: default;
display: block;
padding: 8px 10px;
diff --git a/public/components/common/Footer.scss b/public/components/common/Footer.scss
deleted file mode 100644
index 603660e1e..000000000
--- a/public/components/common/Footer.scss
+++ /dev/null
@@ -1,41 +0,0 @@
-@import "~@fider/assets/styles/variables.scss";
-
-#c-footer {
- flex-shrink: 0;
- height: 80px;
- font-size: $font-size-tiny;
-
- .container {
- text-align: center;
- padding-top: 10px;
- border-top: 1px solid $gray-lighter;
-
- .l-powered {
- img {
- margin: 15px auto 0px auto;
- filter: grayscale(100%);
- display: block;
- }
- span {
- color: rgba($gray-darkest, 0.5);
- display: none;
- }
- &:hover {
- img {
- filter: grayscale(0%);
- }
- span {
- display: block;
- }
- }
- }
-
- .l-links a {
- color: rgba($gray-darker, 0.9);
- margin: 0px 10px;
- &:hover {
- color: $link-color;
- }
- }
- }
-}
diff --git a/public/components/common/Footer.tsx b/public/components/common/Footer.tsx
deleted file mode 100644
index a9ef06c0f..000000000
--- a/public/components/common/Footer.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import "./Footer.scss"
-
-import React from "react"
-
-export const Footer = () => {
- return (
- <div id="c-footer">
- <div className="container">
- <a className="l-powered" target="_blank" rel="noopener" href="https://getfider.com/">
- <img width="20" height="20" src="https://getfider.com/images/logo-100x100.png" alt="Fider" />
- <span>Powered by Fider</span>
- </a>
- </div>
- </div>
- )
-}
diff --git a/public/components/common/Header.scss b/public/components/common/Header.scss
index 3c0dcf574..12aa4a117 100644
--- a/public/components/common/Header.scss
+++ b/public/components/common/Header.scss
@@ -17,9 +17,9 @@
padding: 2px;
border-radius: 0px;
font-size: 10px;
- color: $red-darkest;
- border-bottom: 1px solid $red-darkest;
- background-color: rgba($red, 0.05);
+ color: $red-900;
+ border-bottom: 1px solid $red-900;
+ background-color: rgba($red-400, 0.05);
}
.c-menu {
@@ -78,12 +78,12 @@
> span {
font-weight: 600;
text-transform: uppercase;
- color: $gray-darker;
+ color: $gray-700;
}
&:hover {
> span {
- color: $gray-darkest;
+ color: $gray-900;
}
}
@@ -111,7 +111,7 @@
font-size: $font-size-mini;
padding: 10px;
display: block;
- color: $gray-darkest;
+ color: $gray-900;
text-transform: uppercase;
font-weight: 600;
cursor: default;
@@ -121,9 +121,9 @@
font-size: $font-size-small;
padding: 10px;
display: block;
- color: $gray-darkest;
+ color: $gray-900;
&:hover {
- background-color: $gray-lighter;
+ background-color: $gray-200;
}
}
.c-menu-user-divider {
@@ -147,13 +147,13 @@
border-radius: 5px;
margin-left: -10px;
margin-top: -25px;
- background-color: $red;
+ background-color: $red-500;
border: 1px solid $white !important;
}
.c-unread-count {
display: inline-block;
- background-color: $red;
+ background-color: $red-500;
position: absolute;
right: 5px;
padding: 2px 8px;
diff --git a/public/components/common/Heading.scss b/public/components/common/Heading.scss
index d0d2e37b3..0019e28bd 100644
--- a/public/components/common/Heading.scss
+++ b/public/components/common/Heading.scss
@@ -10,7 +10,7 @@
.c-heading-subtitle {
font-weight: 400;
margin-top: 5px;
- color: $gray-darker;
+ color: $gray-700;
font-size: $font-size;
}
}
diff --git a/public/components/common/Hint.scss b/public/components/common/Hint.scss
index 1c3242fc1..f6f5a63d2 100644
--- a/public/components/common/Hint.scss
+++ b/public/components/common/Hint.scss
@@ -4,9 +4,9 @@
position: relative;
padding: 15px 35px 15px 15px;
margin-bottom: 10px;
- color: $blue-darker;
- border-left: 4px solid $blue;
- background-color: $blue-lightest;
+ color: $blue-700;
+ border-left: 2px solid $blue-500;
+ background-color: $blue-50;
.close {
position: absolute;
diff --git a/public/components/common/List.scss b/public/components/common/List.scss
index bb2938d30..262a8f9de 100644
--- a/public/components/common/List.scss
+++ b/public/components/common/List.scss
@@ -12,7 +12,7 @@
padding: 5px;
}
.c-list-item:hover {
- background-color: $gray-lighter;
+ background-color: $gray-200;
border-radius: 2px;
}
}
@@ -21,7 +21,7 @@
.c-list-item {
padding: 15px 0 0 0;
margin: 0 0 15px 0;
- border-top: 1px solid $gray-lighter;
+ border-top: 1px solid $gray-200;
&:first-child {
border-top: none;
padding-top: 0;
diff --git a/public/components/common/Message.scss b/public/components/common/Message.scss
index 596d79a60..ef3aa581a 100644
--- a/public/components/common/Message.scss
+++ b/public/components/common/Message.scss
@@ -3,28 +3,29 @@
.c-message {
padding: 15px;
margin-bottom: 10px;
+ display: flex;
+ align-items: center;
.icon {
- margin-right: 5px;
- margin-top: -4px;
+ margin-right: 6px;
height: 14px;
}
&.m-success {
- color: $green-darker;
- border-left: 4px solid $green;
- background-color: $green-lightest;
+ color: $green-700;
+ border-left: 2px solid $green-500;
+ background-color: $green-50;
}
&.m-warning {
- color: $yellow-darker;
- border-left: 4px solid $yellow;
- background-color: $yellow-lightest;
+ color: $yellow-700;
+ border-left: 2px solid $yellow-500;
+ background-color: $yellow-50;
}
&.m-error {
- color: $red-darker;
- border-left: 4px solid $red;
- background-color: $red-lightest;
+ color: $red-700;
+ border-left: 2px solid $red-500;
+ background-color: $red-50;
}
}
diff --git a/public/components/common/Modal.scss b/public/components/common/Modal.scss
index a594eebb0..d2fa24294 100644
--- a/public/components/common/Modal.scss
+++ b/public/components/common/Modal.scss
@@ -75,7 +75,7 @@
font-size: $font-size-large;
font-weight: 600;
padding: 15px 20px;
- border-bottom: 1px solid $gray-lighter;
+ border-bottom: 1px solid $gray-200;
}
.c-modal-content {
@@ -83,11 +83,11 @@
}
.c-modal-footer {
- background: $gray-lightest;
+ background: $gray-100;
padding: 10px;
border-bottom-right-radius: 3px;
border-bottom-left-radius: 3px;
- border-top: 1px solid $gray-light;
+ border-top: 1px solid $gray-300;
&.m-right {
text-align: right;
}
diff --git a/public/components/common/Moment.tsx b/public/components/common/Moment.tsx
index be5cdef23..39b3b6307 100644
--- a/public/components/common/Moment.tsx
+++ b/public/components/common/Moment.tsx
@@ -3,8 +3,7 @@ import { formatDate, timeSince } from "@fider/services"
interface MomentText {
date: Date | string
- useRelative?: boolean
- format?: "full" | "short"
+ format?: "relative" | "full" | "short"
}
export const Moment = (props: MomentText) => {
@@ -12,17 +11,16 @@ export const Moment = (props: MomentText) => {
return <span />
}
- const format = props.format || "full"
- const useRelative = typeof props.useRelative !== "undefined" ? props.useRelative : true
+ const format = props.format || "relative"
const now = new Date()
const date = props.date instanceof Date ? props.date : new Date(props.date)
-
const diff = (now.getTime() - date.getTime()) / (60 * 60 * 24 * 1000)
- const display = !useRelative || diff >= 365 ? formatDate(props.date, format) : timeSince(now, date)
+ const display =
+ diff >= 365 && format === "relative" ? formatDate(props.date, "short") : format === "relative" ? timeSince(now, date) : formatDate(props.date, format)
return (
- <span className="date" title={formatDate(props.date, "full")}>
+ <span className="date" data-tooltip={formatDate(props.date, "full")}>
{display}
</span>
)
diff --git a/public/components/common/MultiLineText.tsx b/public/components/common/MultiLineText.tsx
index 280fc8a6f..f33d34a2f 100644
--- a/public/components/common/MultiLineText.tsx
+++ b/public/components/common/MultiLineText.tsx
@@ -10,10 +10,15 @@ interface MultiLineTextProps {
export const MultiLineText = (props: MultiLineTextProps) => {
if (!props.text) {
- return <p />
+ return null
}
const html = markdown[props.style](props.text)
const className = `markdown-body ${props.className || ""}`
- return <div className={className} dangerouslySetInnerHTML={{ __html: props.maxLength ? truncate(html, props.maxLength) : html }} />
+ const tagName = props.style === "plainText" ? "p" : "div"
+
+ return React.createElement(tagName, {
+ className,
+ dangerouslySetInnerHTML: { __html: props.maxLength ? truncate(html, props.maxLength) : html },
+ })
}
diff --git a/public/components/common/PoweredByFider.scss b/public/components/common/PoweredByFider.scss
new file mode 100644
index 000000000..49202b402
--- /dev/null
+++ b/public/components/common/PoweredByFider.scss
@@ -0,0 +1,15 @@
+@import "~@fider/assets/styles/variables.scss";
+
+.c-powered {
+ text-align: center;
+ display: block;
+ margin-top: 20px;
+
+ a {
+ color: rgba($gray-900, 0.6);
+ font-size: $font-size-tiny;
+ }
+ a:hover {
+ color: $gray-900;
+ }
+}
\ No newline at end of file
diff --git a/public/components/common/PoweredByFider.tsx b/public/components/common/PoweredByFider.tsx
new file mode 100644
index 000000000..a7a445c5b
--- /dev/null
+++ b/public/components/common/PoweredByFider.tsx
@@ -0,0 +1,13 @@
+import React from "react"
+
+import "./PoweredByFider.scss"
+
+export const PoweredByFider = () => {
+ return (
+ <div className="c-powered">
+ <a rel="noopener" href="https://getfider.com" target="_blank">
+ Powered by Fider
+ </a>
+ </div>
+ )
+}
diff --git a/public/components/common/Segment.scss b/public/components/common/Segment.scss
index d7d5eadc8..61084737d 100644
--- a/public/components/common/Segment.scss
+++ b/public/components/common/Segment.scss
@@ -6,11 +6,11 @@
margin: 10px 0;
background-color: $white;
border-radius: 5px;
- box-shadow: 0px 2px 5px 0px $gray-light;
+ box-shadow: 0px 2px 5px 0px $gray-300;
transition: all 0.2s ease;
&:hover {
- box-shadow: 0px 5px 10px 0px $gray-light;
+ box-shadow: 0px 5px 10px 0px $gray-300;
}
&:first-child {
@@ -20,13 +20,13 @@
.c-segments {
position: relative;
- box-shadow: 0px 2px 5px 0px $gray-light;
+ box-shadow: 0px 2px 5px 0px $gray-300;
border-radius: 5px;
margin: 10px 0;
transition: all 0.2s ease;
&:hover {
- box-shadow: 0px 5px 10px 0px $gray-light;
+ box-shadow: 0px 5px 10px 0px $gray-300;
}
&:first-child {
diff --git a/public/components/common/Toggle.scss b/public/components/common/Toggle.scss
index 1571d16f7..a62d45dd2 100644
--- a/public/components/common/Toggle.scss
+++ b/public/components/common/Toggle.scss
@@ -27,7 +27,7 @@
border-radius: 10px;
position: relative;
cursor: pointer;
- background: $gray;
+ background: $gray-300;
}
.switch {
@@ -37,17 +37,17 @@
margin-top: 1px;
margin-left: 1px;
border-radius: 1em;
- box-shadow: 0px 1px 5px 0px $gray-dark;
- background: $gray-lightest;
+ box-shadow: 0px 1px 5px 0px $gray-500;
+ background: $gray-100;
transition: transform 0.2s ease-in;
}
input:checked ~ label {
- background: $green-dark;
+ background: $green-500;
}
input:checked ~ label .switch {
- background: $gray-lightest;
+ background: $gray-100;
transform: translatex(15px);
transition: transform 0.2s ease-in;
}
diff --git a/public/components/common/UserName.scss b/public/components/common/UserName.scss
index 11594da27..5525f5c2e 100644
--- a/public/components/common/UserName.scss
+++ b/public/components/common/UserName.scss
@@ -1,11 +1,22 @@
@import "~@fider/assets/styles/variables.scss";
.c-username {
- color: $gray-darkest;
+ color: $gray-900;
font-weight: 600;
+ display: inline-flex;
+ align-items: center;
&.m-staff {
color: $admin-color;
border-color: $admin-color;
+
+ div {
+ svg {
+ height: 14px;
+ vertical-align: text-bottom;
+ margin-left: 2px;
+ align-items: flex-end;
+ }
+ }
}
}
diff --git a/public/components/common/UserName.tsx b/public/components/common/UserName.tsx
index debbdf633..354e4fe6d 100644
--- a/public/components/common/UserName.tsx
+++ b/public/components/common/UserName.tsx
@@ -13,10 +13,26 @@ interface UserNameProps {
}
export const UserName = (props: UserNameProps) => {
+ const isStaff = props.user.role && isCollaborator(props.user.role)
const className = classSet({
"c-username": true,
- "m-staff": props.user.role && isCollaborator(props.user.role),
+ "m-staff": isStaff,
})
- return <span className={className}>{props.user.name || "Anonymous"}</span>
+ return (
+ <div className={className}>
+ <span>{props.user.name || "Anonymous"}</span>
+ {isStaff && (
+ <div data-tooltip={isStaff ? "Staff" : undefined}>
+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+ <path
+ fillRule="evenodd"
+ d="M6.267 3.455a3.066 3.066 0 001.745-.723 3.066 3.066 0 013.976 0 3.066 3.066 0 001.745.723 3.066 3.066 0 012.812 2.812c.051.643.304 1.254.723 1.745a3.066 3.066 0 010 3.976 3.066 3.066 0 00-.723 1.745 3.066 3.066 0 01-2.812 2.812 3.066 3.066 0 00-1.745.723 3.066 3.066 0 01-3.976 0 3.066 3.066 0 00-1.745-.723 3.066 3.066 0 01-2.812-2.812 3.066 3.066 0 00-.723-1.745 3.066 3.066 0 010-3.976 3.066 3.066 0 00.723-1.745 3.066 3.066 0 012.812-2.812zm7.44 5.252a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z"
+ clipRule="evenodd"
+ ></path>
+ </svg>
+ </div>
+ )}
+ </div>
+ )
}
diff --git a/public/components/common/form/Form.scss b/public/components/common/form/Form.scss
index 488abf568..6c6edccfb 100644
--- a/public/components/common/form/Form.scss
+++ b/public/components/common/form/Form.scss
@@ -53,17 +53,12 @@
-webkit-appearance: none;
appearance: none;
width: 100%;
- padding: 10px;
- outline: 0;
+ padding: 8px;
margin: 0;
resize: none !important;
- border: 1px solid $gray-light;
+ border: 1px solid $gray-300;
border-radius: 3px;
- &:focus {
- border: 1px solid $gray;
- box-shadow: 0px 0px 1px 1px $gray-light;
- }
&:disabled {
opacity: 0.45;
@@ -94,11 +89,11 @@
input[type="text"],
textarea,
select {
- border-color: $red;
+ border-color: $red-500;
}
label {
- color: $red;
+ color: $red-500;
}
}
@@ -129,7 +124,7 @@
flex: 0 0 auto;
padding: 8px 10px 9px 10px;
font-weight: 600;
- background-color: $gray-lighter;
+ background-color: $gray-200;
border-top-right-radius: 3px;
border-bottom-right-radius: 3px;
}
@@ -147,7 +142,7 @@
}
.c-form-field-error {
- color: $red;
+ color: $red-400;
font-weight: bold;
font-size: $font-size-small;
margin: 0 0 10px 0;
@@ -159,14 +154,14 @@
}
::placeholder {
- color: $gray-dark;
+ color: $gray-500;
opacity: 1;
}
:-ms-input-placeholder {
- color: $gray-dark;
+ color: $gray-500;
}
::-ms-input-placeholder {
- color: $gray-dark;
+ color: $gray-500;
}
diff --git a/public/components/common/form/ImageUploader.scss b/public/components/common/form/ImageUploader.scss
index aea22edd8..a6683e392 100644
--- a/public/components/common/form/ImageUploader.scss
+++ b/public/components/common/form/ImageUploader.scss
@@ -19,13 +19,13 @@
padding: 5px;
min-width: 50px;
min-height: 50px;
- border: 1px solid $gray-light;
+ border: 1px solid $gray-300;
cursor: pointer;
}
.c-button {
font-weight: 600;
position: absolute;
- border-color: $red;
+ border-color: $red-400;
top: 4px;
right: 0px;
border-radius: 50%;
diff --git a/public/components/common/index.tsx b/public/components/common/index.tsx
index b57b84d72..4c23cf8fa 100644
--- a/public/components/common/index.tsx
+++ b/public/components/common/index.tsx
@@ -15,7 +15,6 @@ export * from "./EnvironmentInfo"
export * from "./Avatar"
export * from "./Message"
export * from "./Hint"
-export * from "./Footer"
export * from "./Header"
export * from "./Heading"
export * from "./Legal"
@@ -31,6 +30,7 @@ export * from "./Logo"
export * from "./Toggle"
export * from "./FiderVersion"
export * from "./DropDown"
+export * from "./PoweredByFider"
import Textarea from "react-textarea-autosize"
export { Textarea }
diff --git a/public/index.tsx b/public/index.tsx
index 2cd8e06bb..a38441d9b 100644
--- a/public/index.tsx
+++ b/public/index.tsx
@@ -1,7 +1,7 @@
import React, { Suspense } from "react"
import ReactDOM from "react-dom"
import { resolveRootComponent } from "@fider/router"
-import { Header, Footer, Loader } from "@fider/components/common"
+import { Header, Loader } from "@fider/components/common"
import { ErrorBoundary } from "@fider/components"
import { classSet, Fider, FiderContext, actions } from "@fider/services"
import { IconContext } from "react-icons"
@@ -51,7 +51,6 @@ window.addEventListener("error", (evt: ErrorEvent) => {
<IconContext.Provider value={{ className: "icon" }}>
{config.showHeader && <Header />}
<Suspense fallback={<Loading />}>{React.createElement(config.component, fider.session.props)}</Suspense>
- {config.showHeader && <Footer />}
</IconContext.Provider>
</FiderContext.Provider>
</ErrorBoundary>
diff --git a/public/pages/Administration/components/SideMenu.scss b/public/pages/Administration/components/SideMenu.scss
index 0225fc1eb..1a0d8f962 100644
--- a/public/pages/Administration/components/SideMenu.scss
+++ b/public/pages/Administration/components/SideMenu.scss
@@ -18,7 +18,7 @@
> div {
width: 30px;
height: 4px;
- background-color: $gray-darkest;
+ background-color: $gray-900;
margin: 4px 0;
transition: 0.4s;
}
@@ -48,11 +48,10 @@
display: block;
padding: 12px;
border-bottom: 1px solid rgba(34, 36, 38, 0.1);
- color: $gray-darkest;
+ color: $gray-900;
&:hover {
- color: $gray-darkest;
- background-color: $gray-lighter;
+ background-color: $gray-100;
}
&.m-active {
diff --git a/public/pages/Administration/components/TagForm.scss b/public/pages/Administration/components/TagForm.scss
index d58d1740e..a5f1073f6 100644
--- a/public/pages/Administration/components/TagForm.scss
+++ b/public/pages/Administration/components/TagForm.scss
@@ -1,5 +1,5 @@
#tag-form {
- .ui.form .grouped.fields .field {
+ .form .grouped.fields .field {
margin: 0.2em 0;
}
diff --git a/public/pages/Administration/pages/AdvancedSettings.page.tsx b/public/pages/Administration/pages/AdvancedSettings.page.tsx
index 75a3d9961..85efcf99c 100644
--- a/public/pages/Administration/pages/AdvancedSettings.page.tsx
+++ b/public/pages/Administration/pages/AdvancedSettings.page.tsx
@@ -56,21 +56,18 @@ export default class AdvancedSettingsPage extends AdminBasePage<AdvancedSettings
onChange={this.setCustomCSS}
>
<p className="info">
- Custom CSS allows you to change the look and feel of Fider so that you can apply your own branding.
+ Custom CSS allows you to change the look and feel of Fider and apply your own branding.
<br />
This is a powerful and flexible feature, but requires basic understanding of <a href="https://developer.mozilla.org/en-US/docs/Learn/CSS">CSS</a>.
</p>
- <p className="info">
- Custom CSS might break the design of your site as Fider evolves. By doing this, you&apos;re taking this risk, and you will need to fix issues if
- they arise. <br /> You can minimize some issues by following these recommendations:
- </p>
+ <p className="info">Custom CSS might break the design of your site as Fider evolves. You can minimize conflict by following these recommendations:</p>
<ul className="info">
<li>
- <strong>Avoid nested selectors</strong>: Fider might change the structure of the HTML at any time, and it&apos;s likely that such changes would
+ <strong>Avoid nested selectors</strong>: Fider might change the structure of the HTML at any time. It&apos;s likely that such changes would
invalidate some rules.
</li>
<li>
- <strong>Keep it short</strong>: Customize only the essential. Avoid changing the style or structure of the entire site.
+ <strong>Keep it simple</strong>: Customize only the essential.
</li>
</ul>
</TextArea>
diff --git a/public/pages/Administration/pages/ManageAuthentication.page.scss b/public/pages/Administration/pages/ManageAuthentication.page.scss
index ca61fbc0b..927be1b74 100644
--- a/public/pages/Administration/pages/ManageAuthentication.page.scss
+++ b/public/pages/Administration/pages/ManageAuthentication.page.scss
@@ -12,12 +12,12 @@
height: 24px;
}
.m-enabled {
- color: $green-darker;
+ color: $green-700;
font-weight: 500;
font-size: $font-size-mini;
}
.m-disabled {
- color: $red;
+ color: $red-400;
font-weight: 500;
font-size: $font-size-mini;
}
diff --git a/public/pages/Administration/pages/ManageMembers.page.scss b/public/pages/Administration/pages/ManageMembers.page.scss
index 07cfca3c4..0fd43b821 100644
--- a/public/pages/Administration/pages/ManageMembers.page.scss
+++ b/public/pages/Administration/pages/ManageMembers.page.scss
@@ -10,7 +10,7 @@
.col-right {
.c-list-item:first-child {
padding-top: 15px;
- border-top: 1px solid $gray-lighter;
+ border-top: 1px solid $gray-200;
}
}
}
@@ -37,7 +37,7 @@
vertical-align: middle;
margin-left: 5px;
.c-dropdown-text {
- color: $gray-dark;
+ color: $gray-500;
}
}
.staff {
@@ -45,7 +45,7 @@
}
.blocked {
font-size: $font-size-tiny;
- color: $red;
+ color: $red-400;
}
}
diff --git a/public/pages/Administration/pages/ManageMembers.page.tsx b/public/pages/Administration/pages/ManageMembers.page.tsx
index 48e87dc2a..126f5ac92 100644
--- a/public/pages/Administration/pages/ManageMembers.page.tsx
+++ b/public/pages/Administration/pages/ManageMembers.page.tsx
@@ -4,7 +4,7 @@ import React from "react"
import { Segment, List, Input, ListItem, Avatar, UserName, DropDown, DropDownItem } from "@fider/components/common"
import { User, UserRole, UserStatus } from "@fider/models"
import { AdminBasePage } from "../components/AdminBasePage"
-import { FaUsers, FaEllipsisH, FaTimes, FaSearch } from "react-icons/fa"
+import { FaUsers, FaTimes, FaSearch } from "react-icons/fa"
import { actions, Fider } from "@fider/services"
interface ManageMembersPageState {
@@ -29,7 +29,11 @@ const UserListItem = (props: UserListItemProps) => {
const isVisitor = props.user.role === UserRole.Visitor
const renderEllipsis = () => {
- return <FaEllipsisH />
+ return (
+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" width="16" height="16" focusable="false">
+ <path d="M3 9.5A1.5 1.5 0 114.5 8 1.5 1.5 0 013 9.5zM11.5 8A1.5 1.5 0 1013 6.5 1.5 1.5 0 0011.5 8zm-5 0A1.5 1.5 0 108 6.5 1.5 1.5 0 006.5 8z"></path>
+ </svg>
+ )
}
const actionSelected = (item: DropDownItem) => {
diff --git a/public/pages/Home/Home.page.scss b/public/pages/Home/Home.page.scss
index d8a3062a3..c9e70f5a2 100644
--- a/public/pages/Home/Home.page.scss
+++ b/public/pages/Home/Home.page.scss
@@ -15,8 +15,8 @@
.l-welcome-col {
@include media("sm") {
- background-color: $gray-lighter;
- box-shadow: 1px 2px 5px 1px $gray-light;
+ background-color: $gray-100;
+ box-shadow: 1px 2px 5px 1px $gray-300;
border-radius: 3px;
margin: 0px 10px 10px 10px;
}
@@ -46,7 +46,7 @@
text-transform: uppercase;
padding: 5px 25px 5px 5px;
&:hover {
- background-color: $gray-lighter;
+ background-color: $gray-200;
}
}
}
@@ -68,7 +68,7 @@
}
.selected-tag {
.icon {
- color: $green;
+ color: $green-400;
}
}
}
diff --git a/public/pages/Home/Home.page.tsx b/public/pages/Home/Home.page.tsx
index adb0ca1a7..5bc040926 100644
--- a/public/pages/Home/Home.page.tsx
+++ b/public/pages/Home/Home.page.tsx
@@ -1,10 +1,10 @@
import "./Home.page.scss"
+import NoDataIllustration from "@fider/assets/images/undraw-no-data.svg"
import React, { useState } from "react"
import { Post, Tag, PostStatus } from "@fider/models"
-import { MultiLineText, Hint } from "@fider/components"
+import { MultiLineText, Hint, PoweredByFider } from "@fider/components"
import { SimilarPosts } from "./components/SimilarPosts"
-import { FaRegLightbulb } from "react-icons/fa"
import { PostInput } from "./components/PostInput"
import { PostsContainer } from "./components/PostsContainer"
import { useFider } from "@fider/hooks"
@@ -29,9 +29,9 @@ const Lonely = () => {
interactions with your audience.
</Hint>
<p>
- <FaRegLightbulb />
+ <img alt="No Posts" height="100" src={NoDataIllustration} />
</p>
- <p>It&apos;s lonely out here. Start by sharing a suggestion!</p>
+ <p>No posts have been created yet.</p>
</div>
)
}
@@ -63,6 +63,7 @@ const HomePage = (props: HomePageProps) => {
<div className="l-welcome-col col-md-4">
<MultiLineText className="welcome-message" text={fider.session.tenant.welcomeMessage || defaultWelcomeMessage} style="full" />
<PostInput placeholder={fider.session.tenant.invitation || "Enter your suggestion here..."} onTitleChanged={setTitle} />
+ <PoweredByFider />
</div>
<div className="l-posts-col col-md-8">
{isLonely() ? (
diff --git a/public/pages/Home/components/ListPosts.scss b/public/pages/Home/components/ListPosts.scss
index e23aefb25..3f71bc5a8 100644
--- a/public/pages/Home/components/ListPosts.scss
+++ b/public/pages/Home/components/ListPosts.scss
@@ -6,10 +6,8 @@
border-top-width: 0.1px !important;
.c-list-item-title {
- color: $gray-darkest;
+ color: $gray-900;
font-weight: 500;
- display: block;
- max-width: 85%;
margin-bottom: 10px;
font-size: $font-size-large;
&:hover {
@@ -18,8 +16,8 @@
}
.c-list-item-content {
- width: calc(100% - 55px);
- display: block;
+ flex-grow: 1;
+ align-self: center;
.c-tag {
margin: 0 3px 3px 0;
@@ -31,9 +29,8 @@
}
.c-list-item-description {
- color: $gray-darker;
- min-height: 20px;
- margin-bottom: 10px;
+ color: $gray-700;
+ margin-top: 10px;
}
}
}
diff --git a/public/pages/Home/components/ListPosts.tsx b/public/pages/Home/components/ListPosts.tsx
index 38e2e35ba..58c2c0de2 100644
--- a/public/pages/Home/components/ListPosts.tsx
+++ b/public/pages/Home/components/ListPosts.tsx
@@ -27,7 +27,7 @@ const ListPostItem = (props: { post: Post; user?: CurrentUser; tags: Tag[] }) =>
<MultiLineText className="c-list-item-description" maxLength={300} text={props.post.description} style="plainText" />
<ShowPostResponse showUser={false} status={props.post.status} response={props.post.response} />
{props.tags.map((tag) => (
- <ShowTag key={tag.id} size="tiny" tag={tag} />
+ <ShowTag key={tag.id} tag={tag} />
))}
</div>
</ListItem>
diff --git a/public/pages/Home/components/PostFilter.scss b/public/pages/Home/components/PostFilter.scss
index 66ed89e5d..8a742f340 100644
--- a/public/pages/Home/components/PostFilter.scss
+++ b/public/pages/Home/components/PostFilter.scss
@@ -11,8 +11,8 @@
.counter {
font-size: 8px;
- background-color: $gray-lighter;
- color: $gray-darkest;
+ background-color: $gray-200;
+ color: $gray-900;
display: inline-block;
min-width: 15px;
padding: 0px 5px;
diff --git a/public/pages/Home/components/TagsFilter.tsx b/public/pages/Home/components/TagsFilter.tsx
index e6f406cb2..84a88d3e6 100644
--- a/public/pages/Home/components/TagsFilter.tsx
+++ b/public/pages/Home/components/TagsFilter.tsx
@@ -53,7 +53,7 @@ export class TagsFilter extends React.Component<TagsFilterProps, TagsFilterState
render: (
<div className={this.state.selected.indexOf(t.slug) >= 0 ? "selected-tag" : ""}>
<FaCheck />
- <ShowTag tag={t} size="mini" circular={true} />
+ <ShowTag tag={t} circular={true} />
{t.name}
</div>
),
diff --git a/public/pages/MyNotifications/MyNotifications.page.scss b/public/pages/MyNotifications/MyNotifications.page.scss
index eb05a0b5f..6595354a8 100644
--- a/public/pages/MyNotifications/MyNotifications.page.scss
+++ b/public/pages/MyNotifications/MyNotifications.page.scss
@@ -12,7 +12,7 @@
text-decoration: underline;
}
}
- .ui.list {
+ .list {
.item {
a {
padding: 5px;
diff --git a/public/pages/MySettings/MySettings.page.scss b/public/pages/MySettings/MySettings.page.scss
index 9df47fab9..af16c1ece 100644
--- a/public/pages/MySettings/MySettings.page.scss
+++ b/public/pages/MySettings/MySettings.page.scss
@@ -20,7 +20,7 @@
.l-danger-zone {
h4 {
margin-top: 50px;
- color: $red;
+ color: $red-400;
}
}
@@ -30,7 +30,7 @@
}
code {
padding: 5px;
- background-color: $gray-lighter;
+ background-color: $gray-200;
}
}
}
diff --git a/public/pages/MySettings/MySettings.page.tsx b/public/pages/MySettings/MySettings.page.tsx
index 5367b08a2..8ca52c7b0 100644
--- a/public/pages/MySettings/MySettings.page.tsx
+++ b/public/pages/MySettings/MySettings.page.tsx
@@ -106,7 +106,7 @@ export default class MySettingsPage extends React.Component<MySettingsPageProps,
public render() {
const changeEmail = (
- <span className="ui info clickable" onClick={this.startChangeEmail}>
+ <span className="info clickable" onClick={this.startChangeEmail}>
change
</span>
)
diff --git a/public/pages/OAuthEcho/OAuthEcho.page.scss b/public/pages/OAuthEcho/OAuthEcho.page.scss
index 8d364d3c0..006d0d4a6 100644
--- a/public/pages/OAuthEcho/OAuthEcho.page.scss
+++ b/public/pages/OAuthEcho/OAuthEcho.page.scss
@@ -6,10 +6,10 @@
margin-bottom: 5px;
}
.icon.error {
- color: $red;
+ color: $red-400;
}
.icon.check {
- color: $green;
+ color: $green-400;
}
.icon.warn {
color: $orange;
diff --git a/public/pages/ShowPost/ShowPost.page.scss b/public/pages/ShowPost/ShowPost.page.scss
index d633374e9..f3236f74a 100644
--- a/public/pages/ShowPost/ShowPost.page.scss
+++ b/public/pages/ShowPost/ShowPost.page.scss
@@ -7,6 +7,7 @@
font-weight: 400;
margin: 0px;
font-size: $font-size-xlarge;
+ margin-bottom: 2px;
@include media("sm") {
font-size: $font-size-big;
}
@@ -21,7 +22,7 @@
.header-col,
.comments-col {
float: left;
- width: calc(100% - 230px);
+ width: calc(100% - 300px);
}
.action-col {
float: right;
@@ -38,7 +39,7 @@
.action-col {
margin-bottom: 20px;
@include media(">=md") {
- width: 200px;
+ width: 240px;
}
.subtitle + .c-list {
@@ -51,7 +52,7 @@
.icon {
height: 12px;
margin-right: 2px;
- color: $green;
+ color: $green-400;
}
}
span {
diff --git a/public/pages/ShowPost/ShowPost.page.tsx b/public/pages/ShowPost/ShowPost.page.tsx
index 893f94bac..7e7a3fa80 100644
--- a/public/pages/ShowPost/ShowPost.page.tsx
+++ b/public/pages/ShowPost/ShowPost.page.tsx
@@ -10,7 +10,6 @@ import {
ShowPostResponse,
Button,
UserName,
- Avatar,
Moment,
MultiLineText,
List,
@@ -107,7 +106,7 @@ export default class ShowPostPage extends React.Component<ShowPostPageProps, Sho
)}
<span className="info">
- <Moment date={this.props.post.createdAt} /> &middot; <Avatar user={this.props.post.user} /> <UserName user={this.props.post.user} />
+ Posted by <UserName user={this.props.post.user} /> &middot; <Moment date={this.props.post.createdAt} />
</span>
</div>
</ListItem>
@@ -121,7 +120,8 @@ export default class ShowPostPage extends React.Component<ShowPostPageProps, Sho
</Form>
) : (
<>
- <MultiLineText className="description" text={this.props.post.description} style="full" />
+ {this.props.post.description && <MultiLineText className="description" text={this.props.post.description} style="full" />}
+ {!this.props.post.description && <em className="info">No description provided.</em>}
{this.props.attachments.map((x) => (
<ImageViewer key={x} bkey={x} />
))}
diff --git a/public/pages/ShowPost/components/CommentInput.tsx b/public/pages/ShowPost/components/CommentInput.tsx
index 97cd882ec..6d33c5aa3 100644
--- a/public/pages/ShowPost/components/CommentInput.tsx
+++ b/public/pages/ShowPost/components/CommentInput.tsx
@@ -54,11 +54,11 @@ export const CommentInput = (props: CommentInputProps) => {
<>
<SignInModal isOpen={isSignInModalOpen} onClose={hideModal} />
<div className={`c-comment-input ${Fider.session.isAuthenticated && "m-authenticated"}`}>
- {Fider.session.isAuthenticated && <Avatar user={Fider.session.user} />}
+ {Fider.session.isAuthenticated && <Avatar size="large" user={Fider.session.user} />}
<Form error={error}>
{Fider.session.isAuthenticated && <UserName user={Fider.session.user} />}
<TextArea
- placeholder="Write a comment..."
+ placeholder="Leave a comment"
field="content"
value={content}
minRows={1}
diff --git a/public/pages/ShowPost/components/Comments.scss b/public/pages/ShowPost/components/Comments.scss
index 751ce3a88..92d8fdc46 100644
--- a/public/pages/ShowPost/components/Comments.scss
+++ b/public/pages/ShowPost/components/Comments.scss
@@ -1,31 +1,40 @@
@import "~@fider/assets/styles/variables.scss";
.c-comment-list {
- @include media(">=lg") {
- max-width: 650px;
- }
-
- .c-avatar {
- margin-right: 5px;
- vertical-align: top;
- margin-top: 2px;
- }
.c-comment {
- position: relative;
- margin: 0 0 20px 0;
- border-top: none;
- line-height: 1.2;
+ margin: 20px 0 0 0;
+ display: flex;
+ .c-avatar {
+ margin: 8px 8px 0 0;
+ }
.c-comment-content {
- display: inline-block;
- width: 85%;
+ flex-grow: 1;
+ background-color: $gray-50;
+ border-radius: 4px;
+ padding: 8px;
+
+ .c-comment-header {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+
+ .c-comment-author {
+ .c-comment-metadata {
+ display: inline-block;
+ font-size: $font-size-tiny;
+ color: $gray-700;
+ }
+ }
- .c-comment-metadata {
- display: inline-block;
- font-size: 80%;
- color: $gray-darker;
- margin-left: 3px;
+ .c-comment-menu {
+ align-self: center;
+ }
+ }
+
+ .c-comment-body {
+ margin-top: 5px;
}
.l-more-actions {
@@ -39,20 +48,20 @@
}
.icon {
- color: $gray-dark;
+ color: $gray-500;
font-size: 12px;
}
&:hover {
.icon {
- color: $gray-darkest;
+ color: $gray-900;
}
}
&.is-open {
display: inline-block !important;
.icon {
- color: $gray-darkest;
+ color: $gray-900;
}
}
}
@@ -61,20 +70,18 @@
}
.c-comment-input {
- margin: 0 0 15px 0;
+ display: flex;
+ margin-top: 10px;
+ .c-avatar {
+ margin-top: 8px;
+ margin-right: 8px;
+ }
.c-form {
- margin-top: 5px;
- display: inline-block;
- width: 100%;
+ padding: 8px;
+ flex-grow: 1;
textarea {
margin-top: 5px;
}
}
-
- &.m-authenticated {
- .c-form {
- width: 85%;
- }
- }
}
diff --git a/public/pages/ShowPost/components/DiscussionPanel.tsx b/public/pages/ShowPost/components/DiscussionPanel.tsx
index 0f56a1fe0..51ac5eac6 100644
--- a/public/pages/ShowPost/components/DiscussionPanel.tsx
+++ b/public/pages/ShowPost/components/DiscussionPanel.tsx
@@ -4,6 +4,7 @@ import React from "react"
import { CurrentUser, Comment, Post } from "@fider/models"
import { ShowComment } from "./ShowComment"
import { CommentInput } from "./CommentInput"
+import PostIllustration from "@fider/assets/images/undraw-post.svg"
interface DiscussionPanelProps {
user?: CurrentUser
@@ -16,10 +17,18 @@ export const DiscussionPanel = (props: DiscussionPanelProps) => {
<div className="comments-col">
<div className="c-comment-list">
<span className="subtitle">Discussion</span>
+ <CommentInput post={props.post} />
{props.comments.map((c) => (
<ShowComment key={c.id} post={props.post} comment={c} />
))}
- <CommentInput post={props.post} />
+ {props.comments.length === 0 && (
+ <div className="center">
+ <p>
+ <img alt="No Posts" height="100" src={PostIllustration} />
+ </p>
+ <p>No one has commented yet.</p>
+ </div>
+ )}
</div>
</div>
)
diff --git a/public/pages/ShowPost/components/ShowComment.tsx b/public/pages/ShowPost/components/ShowComment.tsx
index 808fe5024..772ab28e1 100644
--- a/public/pages/ShowPost/components/ShowComment.tsx
+++ b/public/pages/ShowPost/components/ShowComment.tsx
@@ -15,7 +15,6 @@ import {
MultiImageUploader,
} from "@fider/components"
import { formatDate, Failure, actions } from "@fider/services"
-import { FaEllipsisH } from "react-icons/fa"
import { useFider } from "@fider/hooks"
interface ShowCommentProps {
@@ -56,7 +55,11 @@ export const ShowComment = (props: ShowCommentProps) => {
}
const renderEllipsis = () => {
- return <FaEllipsisH />
+ return (
+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" fill="currentColor" width="16" height="16" focusable="false">
+ <path d="M3 9.5A1.5 1.5 0 114.5 8 1.5 1.5 0 013 9.5zM11.5 8A1.5 1.5 0 1013 6.5 1.5 1.5 0 0011.5 8zm-5 0A1.5 1.5 0 108 6.5 1.5 1.5 0 006.5 8z"></path>
+ </svg>
+ )
}
const closeModal = async () => {
@@ -105,37 +108,40 @@ export const ShowComment = (props: ShowCommentProps) => {
const comment = props.comment
const editedMetadata = !!comment.editedAt && !!comment.editedBy && (
- <div className="c-comment-metadata">
- <span title={`This comment has been edited by ${comment.editedBy.name} on ${formatDate(comment.editedAt)}`}>· edited</span>
- </div>
+ <span data-tooltip={`This comment has been edited by ${comment.editedBy.name} on ${formatDate(comment.editedAt)}`}>· edited</span>
)
return (
<div className="c-comment">
{modal()}
- <Avatar user={comment.user} />
+ <Avatar size="large" user={comment.user} />
<div className="c-comment-content">
- <UserName user={comment.user} />
- <div className="c-comment-metadata">
- · <Moment date={comment.createdAt} />
+ <div className="c-comment-header">
+ <div className="c-comment-author">
+ <UserName user={comment.user} />{" "}
+ <div className="c-comment-metadata">
+ · <Moment date={comment.createdAt} /> {editedMetadata}
+ </div>
+ </div>
+ <div className="c-comment-menu">
+ {!isEditing && canEditComment() && (
+ <DropDown
+ className="l-more-actions"
+ direction="left"
+ inline={true}
+ style="simple"
+ highlightSelected={false}
+ items={[
+ { label: "Edit", value: "edit" },
+ { label: "Delete", value: "delete", render: <span style={{ color: "red" }}>Delete</span> },
+ ]}
+ onChange={onActionSelected}
+ renderControl={renderEllipsis}
+ />
+ )}
+ </div>
</div>
- {editedMetadata}
- {!isEditing && canEditComment() && (
- <DropDown
- className="l-more-actions"
- direction="left"
- inline={true}
- style="simple"
- highlightSelected={false}
- items={[
- { label: "Edit", value: "edit" },
- { label: "Delete", value: "delete", render: <span style={{ color: "red" }}>Delete</span> },
- ]}
- onChange={onActionSelected}
- renderControl={renderEllipsis}
- />
- )}
- <div className="c-comment-text">
+ <div className="c-comment-body">
{isEditing ? (
<Form error={error}>
<TextArea field="content" minRows={1} value={newContent} placeholder={comment.content} onChange={setNewContent} />
diff --git a/public/pages/ShowPost/components/TagListItem.tsx b/public/pages/ShowPost/components/TagListItem.tsx
index ecfb978e9..0fe951944 100644
--- a/public/pages/ShowPost/components/TagListItem.tsx
+++ b/public/pages/ShowPost/components/TagListItem.tsx
@@ -17,7 +17,7 @@ export const TagListItem = (props: TagListItemProps) => {
return (
<ListItem onClick={onClick}>
{props.assigned ? <FaCheck /> : <svg className="icon" />}
- <ShowTag tag={props.tag} size="mini" circular={true} />
+ <ShowTag tag={props.tag} circular={true} />
<span>{props.tag.name}</span>
</ListItem>
)
diff --git a/public/pages/ShowPost/components/TagsPanel.tsx b/public/pages/ShowPost/components/TagsPanel.tsx
index 00e6cdb49..0292605cf 100644
--- a/public/pages/ShowPost/components/TagsPanel.tsx
+++ b/public/pages/ShowPost/components/TagsPanel.tsx
@@ -58,7 +58,7 @@ export const TagsPanel = (props: TagsPanelProps) => {
))}
</List>
) : (
- <span className="info">None yet</span>
+ <span className="info">None</span>
)
const editTagsList = props.tags.length > 0 && (
diff --git a/public/pages/ShowPost/components/VotesModal.scss b/public/pages/ShowPost/components/VotesModal.scss
index 780f32ef0..b2e11efa8 100644
--- a/public/pages/ShowPost/components/VotesModal.scss
+++ b/public/pages/ShowPost/components/VotesModal.scss
@@ -4,23 +4,27 @@
.c-modal-content {
height: 300px;
overflow-y: scroll;
+
.c-list-item {
- margin: 5px 0px;
+ margin: 2px 0px;
display: flex;
- .c-avatar {
- margin-right: 5px;
- }
+ align-items: center;
+
.l-user {
- vertical-align: middle;
+ margin-left: 5px;
+ flex-grow: 1;
+
span {
display: block;
+ max-width: 250px;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
}
}
+
.l-date {
- margin-left: auto;
text-align: right;
- width: 60px;
- min-width: 60px;
}
}
}
diff --git a/public/pages/ShowPost/components/VotesModal.tsx b/public/pages/ShowPost/components/VotesModal.tsx
index ef1730374..49bf3053c 100644
--- a/public/pages/ShowPost/components/VotesModal.tsx
+++ b/public/pages/ShowPost/components/VotesModal.tsx
@@ -85,7 +85,7 @@ export class VotesModal extends React.Component<VotesModalProps, VotesModalState
<span className="info">{x.user.email}</span>
</span>
<span className="l-date info">
- <Moment date={x.createdAt} useRelative={false} format="short" />
+ <Moment date={x.createdAt} />
</span>
</ListItem>
))}
diff --git a/public/pages/ShowPost/components/VotesPanel.scss b/public/pages/ShowPost/components/VotesPanel.scss
index 9f8bdc5a8..5d850f93b 100644
--- a/public/pages/ShowPost/components/VotesPanel.scss
+++ b/public/pages/ShowPost/components/VotesPanel.scss
@@ -4,7 +4,6 @@
.c-avatar {
margin: 0 -8px 0 -2px;
padding: 0;
- border: 2px solid $bg-color;
}
}
diff --git a/public/pages/ShowPost/components/VotesPanel.tsx b/public/pages/ShowPost/components/VotesPanel.tsx
index 826c5e958..4b8063b45 100644
--- a/public/pages/ShowPost/components/VotesPanel.tsx
+++ b/public/pages/ShowPost/components/VotesPanel.tsx
@@ -49,7 +49,7 @@ export const VotesPanel = (props: VotesPanelProps) => {
see details
</span>
)}
- {props.votes.length === 0 && <span className="info">None yet</span>}
+ {props.votes.length === 0 && <span className="info">None</span>}
</div>
</>
)
diff --git a/public/pages/UI/UIToolkit.page.scss b/public/pages/UI/UIToolkit.page.scss
index cfbe7d1d1..11915d3be 100644
--- a/public/pages/UI/UIToolkit.page.scss
+++ b/public/pages/UI/UIToolkit.page.scss
@@ -75,4 +75,8 @@ $color-box-size: 100px;
}
}
}
+
+ .c-tag {
+ margin-right: 5px;
+ }
}
diff --git a/public/pages/UI/UIToolkit.page.tsx b/public/pages/UI/UIToolkit.page.tsx
index e081e33ce..6eaa1a36c 100644
--- a/public/pages/UI/UIToolkit.page.tsx
+++ b/public/pages/UI/UIToolkit.page.tsx
@@ -103,49 +103,54 @@ const UIToolkitPage = () => {
return (
<div id="p-ui-toolkit" className="page container">
<div className="color-scale">
- <div className="color gray-darkest" />
- <div className="color gray-darker" />
- <div className="color gray-dark" />
- <div className="color gray-default" />
- <div className="color gray-light" />
- <div className="color gray-lighter" />
- <div className="color gray-lightest" />
+ <div className="color gray-900" />
+ <div className="color gray-700" />
+ <div className="color gray-500" />
+ <div className="color gray-400" />
+ <div className="color gray-300" />
+ <div className="color gray-200" />
+ <div className="color gray-100" />
+ <div className="color gray-50" />
</div>
<div className="color-scale">
- <div className="color green-darkest" />
- <div className="color green-darker" />
- <div className="color green-dark" />
- <div className="color green-default" />
- <div className="color green-light" />
- <div className="color green-lighter" />
- <div className="color green-lightest" />
+ <div className="color green-900" />
+ <div className="color green-700" />
+ <div className="color green-500" />
+ <div className="color green-400" />
+ <div className="color green-300" />
+ <div className="color green-200" />
+ <div className="color green-100" />
+ <div className="color green-50" />
</div>
<div className="color-scale">
- <div className="color red-darkest" />
- <div className="color red-darker" />
- <div className="color red-dark" />
- <div className="color red-default" />
- <div className="color red-light" />
- <div className="color red-lighter" />
- <div className="color red-lightest" />
+ <div className="color red-900" />
+ <div className="color red-700" />
+ <div className="color red-500" />
+ <div className="color red-400" />
+ <div className="color red-300" />
+ <div className="color red-200" />
+ <div className="color red-100" />
+ <div className="color red-50" />
</div>
<div className="color-scale">
- <div className="color blue-darkest" />
- <div className="color blue-darker" />
- <div className="color blue-dark" />
- <div className="color blue-default" />
- <div className="color blue-light" />
- <div className="color blue-lighter" />
- <div className="color blue-lightest" />
+ <div className="color blue-900" />
+ <div className="color blue-700" />
+ <div className="color blue-500" />
+ <div className="color blue-400" />
+ <div className="color blue-300" />
+ <div className="color blue-200" />
+ <div className="color blue-100" />
+ <div className="color blue-50" />
</div>
<div className="color-scale">
- <div className="color yellow-darkest" />
- <div className="color yellow-darker" />
- <div className="color yellow-dark" />
- <div className="color yellow-default" />
- <div className="color yellow-light" />
- <div className="color yellow-lighter" />
- <div className="color yellow-lightest" />
+ <div className="color yellow-900" />
+ <div className="color yellow-700" />
+ <div className="color yellow-500" />
+ <div className="color yellow-400" />
+ <div className="color yellow-300" />
+ <div className="color yellow-200" />
+ <div className="color yellow-100" />
+ <div className="color yellow-50" />
</div>
<h1>Heading 1</h1>
@@ -347,28 +352,10 @@ const UIToolkitPage = () => {
<h1>Tags</h1>
<List>
<ListItem>
- <ShowTag tag={easyTag} size="normal" />
- <ShowTag tag={hardTag} size="normal" />
- <ShowTag tag={easyTag} circular={true} size="normal" />
- <ShowTag tag={hardTag} circular={true} size="normal" />
- </ListItem>
- <ListItem>
- <ShowTag tag={easyTag} size="small" />
- <ShowTag tag={hardTag} size="small" />
- <ShowTag tag={easyTag} circular={true} size="small" />
- <ShowTag tag={hardTag} circular={true} size="small" />
- </ListItem>
- <ListItem>
- <ShowTag tag={easyTag} size="tiny" />
- <ShowTag tag={hardTag} size="tiny" />
- <ShowTag tag={easyTag} circular={true} size="tiny" />
- <ShowTag tag={hardTag} circular={true} size="tiny" />
- </ListItem>
- <ListItem>
- <ShowTag tag={easyTag} size="mini" />
- <ShowTag tag={hardTag} size="mini" />
- <ShowTag tag={easyTag} circular={true} size="mini" />
- <ShowTag tag={hardTag} circular={true} size="mini" />
+ <ShowTag tag={easyTag} />
+ <ShowTag tag={hardTag} />
+ <ShowTag tag={easyTag} circular={true} />
+ <ShowTag tag={hardTag} circular={true} />
</ListItem>
</List>
@@ -383,13 +370,13 @@ const UIToolkitPage = () => {
<h1>Moment</h1>
<List>
<ListItem>
- <Moment date="2017-06-03T16:55:06.815042Z" />
+ Relative: <Moment date="2017-06-03T16:55:06.815042Z" format="relative" />
</ListItem>
<ListItem>
- <Moment date={new Date(2014, 10, 3, 12, 53, 12, 0)} />
+ Short: <Moment date="2017-06-03T16:55:06.815042Z" format="short" />
</ListItem>
<ListItem>
- <Moment date={new Date()} />
+ Full: <Moment date="2017-06-03T16:55:06.815042Z" format="full" />
</ListItem>
</List>
@@ -400,6 +387,9 @@ const UIToolkitPage = () => {
<Message showIcon={true} type="error">
Something went wrong.
</Message>
+ <Message showIcon={true} type="warning">
+ Be careful!
+ </Message>
<Message showIcon={true} type="success">
Your order has been confirmed.
</Message>
diff --git a/public/services/markdown.ts b/public/services/markdown.ts
index fa50513de..9daf2257f 100644
--- a/public/services/markdown.ts
+++ b/public/services/markdown.ts
@@ -29,7 +29,7 @@ fullRenderer.link = link
const plainTextRenderer = new marked.Renderer()
plainTextRenderer.link = (_href, _title, text) => text
-plainTextRenderer.image = (_href, _title, _text) => ""
+plainTextRenderer.image = () => ""
plainTextRenderer.br = () => " "
plainTextRenderer.strong = (text) => text
plainTextRenderer.list = (body) => body
diff --git a/public/services/utils.spec.ts b/public/services/utils.spec.ts
index 651f4604c..edf4058d6 100644
--- a/public/services/utils.spec.ts
+++ b/public/services/utils.spec.ts
@@ -36,10 +36,10 @@ import { readFileSync } from "fs"
})
})
;[
- { input: new Date(2018, 4, 27, 10, 12, 59), expected: "May 2018" },
- { input: new Date(2058, 12, 12, 23, 21, 53), expected: "Jan 2059" },
- { input: "2018-04-11T18:13:33.128082", expected: "Apr 2018" },
- { input: "2017-11-20T07:47:42.158142", expected: "Nov 2017" },
+ { input: new Date(2018, 4, 27, 10, 12, 59), expected: "May '18" },
+ { input: new Date(2058, 12, 12, 23, 21, 53), expected: "Jan '59" },
+ { input: "2018-04-11T18:13:33.128082", expected: "Apr '18" },
+ { input: "2017-11-20T07:47:42.158142", expected: "Nov '17" },
].forEach((x) => {
test(`formatDate (short) of ${x.input} should be ${x.expected}`, () => {
const result = formatDate(x.input, "short")
diff --git a/public/services/utils.ts b/public/services/utils.ts
index d1c9a9d34..f68849f4e 100644
--- a/public/services/utils.ts
+++ b/public/services/utils.ts
@@ -43,7 +43,7 @@ export const formatDate = (input: Date | string, format: DateFormat = "full"): s
const year = date.getFullYear()
if (format === "short") {
- return `${monthNames[monthIndex].substring(0, 3)} ${year}`
+ return `${monthNames[monthIndex].substring(0, 3)} '${year.toString().substring(2)}`
}
const day = date.getDate()
diff --git a/public/ssr.tsx b/public/ssr.tsx
index 0b26f3bde..ec6177c08 100644
--- a/public/ssr.tsx
+++ b/public/ssr.tsx
@@ -2,7 +2,7 @@ import React from "react"
import { renderToStaticMarkup } from "react-dom/server"
import { Fider, FiderContext } from "./services/fider"
import { IconContext } from "react-icons"
-import { Footer, Header } from "./components"
+import { Header } from "./components"
import { resolveRootComponent, route } from "./router"
import HomePage from "./pages/Home/Home.page"
@@ -31,7 +31,6 @@ function ssrRender(url: string, pathname: string, args: any) {
<IconContext.Provider value={{ className: "icon" }}>
{config.showHeader && <Header />}
{React.createElement(config.component, args.props)}
- {config.showHeader && <Footer />}
</IconContext.Provider>
</FiderContext.Provider>
)
diff --git a/public/tsd.d.ts b/public/tsd.d.ts
deleted file mode 100644
index e7a01d5b1..000000000
--- a/public/tsd.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export {}
-
-declare global {
- interface Window {
- ga?: (cmd: string, evt: string, args?: any) => void
- set: (key: string, value: any) => void
- }
-
- let __webpack_nonce__: string
- let __webpack_public_path__: string
-}
diff --git a/tsconfig.json b/tsconfig.json
index 4bb106683..02af0839c 100755
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -22,5 +22,5 @@
"@fider/*": ["*"]
}
},
- "include": ["./public/**/*"]
+ "include": ["./public/**/*", "index.d.ts"]
}
diff --git a/webpack.config.js b/webpack.config.js
index a020b3a0a..7644901f2 100755
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -46,7 +46,7 @@ module.exports = {
},
devtool: "source-map",
resolve: {
- extensions: [".mjs", ".ts", ".tsx", ".js"],
+ extensions: [".mjs", ".ts", ".tsx", ".js", ".svg"],
alias: {
"@fider": publicFolder,
},