From f03e838d2e3467597a0994487ebef0fb221d86d2 Mon Sep 17 00:00:00 2001 From: Mihai Macaneata Date: Fri, 24 Apr 2020 12:41:20 +0300 Subject: [PATCH] new theme structure --- package-lock.json | 94 +- .../volto/components/theme/App/App.jsx | 223 +++ .../MultilingualRedirector.jsx | 49 + src/theme.js | 8 +- .../pastanaga => site}/assets/fonts/icons.eot | Bin .../pastanaga => site}/assets/fonts/icons.svg | 0 .../pastanaga => site}/assets/fonts/icons.ttf | Bin .../assets/fonts/icons.woff | Bin .../default => site}/assets/images/flags.png | Bin .../collections/breadcrumb.overrides | 0 .../collections/breadcrumb.variables | 0 .../collections/form.overrides | 0 .../collections/form.variables | 0 .../collections/grid.overrides | 0 .../collections/grid.variables | 0 .../collections/menu.overrides | 0 .../collections/menu.variables | 0 .../collections/message.overrides | 0 .../collections/message.variables | 0 .../collections/table.overrides | 0 .../collections/table.variables | 0 .../elements/button.overrides | 0 .../elements/button.variables | 0 .../elements/container.overrides | 0 .../elements/container.variables | 0 .../elements/divider.overrides | 0 .../elements/divider.variables | 0 .../elements/flag.overrides | 0 .../elements/flag.variables | 0 .../elements/header.overrides | 0 .../elements/header.variables | 0 .../elements/icon.overrides | 0 .../default => site}/elements/image.overrides | 0 .../elements/image.variables | 0 .../elements/input.overrides | 0 .../elements/input.variables | 0 .../default => site}/elements/label.overrides | 0 .../elements/label.variables | 0 .../elements/list.overrides | 0 .../elements/list.variables | 0 .../elements/loader.overrides | 0 .../elements/loader.variables | 0 .../elements/placeholder.overrides | 0 .../elements/placeholder.variables | 0 .../default => site}/elements/rail.overrides | 0 .../elements/rail.variables | 0 .../elements/reveal.overrides | 0 .../elements/reveal.variables | 0 .../elements/segment.overrides | 0 .../elements/segment.variables | 0 .../elements/step.overrides | 0 .../elements/step.variables | 0 .../pastanaga => site}/extras/blocks.less | 0 .../pastanaga => site}/extras/custom.less | 2 +- .../default => site}/extras/custom.overrides | 0 .../default => site}/extras/custom.variables | 0 .../pastanaga => site}/extras/draftjs.less | 0 .../pastanaga => site}/extras/extras.less | 0 .../main.less => site/extras/main.overrides} | 22 +- .../pastanaga => site}/extras/sidebar.less | 0 .../pastanaga => site}/extras/toolbar.less | 0 .../pastanaga => site}/extras/utils.less | 0 .../globals/reset.overrides | 0 .../default => site}/globals/reset.variables | 0 .../pastanaga => site}/globals/site.overrides | 0 .../pastanaga => site}/globals/site.variables | 0 .../modules/accordion.overrides | 0 .../modules/accordion.variables | 0 .../modules/chatroom.overrides | 0 .../modules/chatroom.variables | 0 .../modules/checkbox.overrides | 0 .../modules/checkbox.variables | 0 .../default => site}/modules/dimmer.overrides | 0 .../modules/dimmer.variables | 0 .../modules/dropdown.overrides | 0 .../modules/dropdown.variables | 0 .../default => site}/modules/embed.overrides | 0 .../modules/embed.variables | 0 .../modules/modal.overrides | 0 .../modules/modal.variables | 0 .../default => site}/modules/nag.overrides | 0 .../pastanaga => site}/modules/nag.variables | 0 .../default => site}/modules/popup.overrides | 0 .../modules/popup.variables | 0 .../modules/progress.overrides | 0 .../modules/progress.variables | 0 .../modules/rating.overrides | 0 .../modules/rating.variables | 0 .../modules/search.overrides | 0 .../modules/search.variables | 0 .../default => site}/modules/shape.overrides | 0 .../modules/shape.variables | 0 .../modules/sidebar.overrides | 0 .../modules/sidebar.variables | 0 .../default => site}/modules/sticky.overrides | 0 .../modules/sticky.variables | 0 .../default => site}/modules/tab.overrides | 0 .../pastanaga => site}/modules/tab.variables | 0 .../modules/transition.overrides | 0 .../modules/transition.variables | 0 .../default => site}/modules/video.overrides | 0 .../modules/video.variables | 0 .../default => site}/views/ad.overrides | 0 .../pastanaga => site}/views/ad.variables | 0 .../default => site}/views/card.overrides | 0 .../pastanaga => site}/views/card.variables | 0 .../default => site}/views/comment.overrides | 0 .../views/comment.variables | 0 .../default => site}/views/feed.overrides | 0 .../pastanaga => site}/views/feed.variables | 0 .../default => site}/views/item.overrides | 0 .../pastanaga => site}/views/item.variables | 0 .../views/statistic.overrides | 0 .../views/statistic.variables | 0 theme/theme.config | 34 +- .../default/assets/fonts/brand-icons.eot | Bin 98640 -> 0 bytes .../default/assets/fonts/brand-icons.svg | 1008 ---------- .../default/assets/fonts/brand-icons.ttf | Bin 98404 -> 0 bytes .../default/assets/fonts/brand-icons.woff | Bin 63728 -> 0 bytes .../default/assets/fonts/brand-icons.woff2 | Bin 54488 -> 0 bytes theme/themes/default/assets/fonts/icons.eot | Bin 106004 -> 0 bytes theme/themes/default/assets/fonts/icons.svg | 1518 --------------- theme/themes/default/assets/fonts/icons.ttf | Bin 105784 -> 0 bytes theme/themes/default/assets/fonts/icons.woff | Bin 50524 -> 0 bytes theme/themes/default/assets/fonts/icons.woff2 | Bin 40148 -> 0 bytes .../default/assets/fonts/outline-icons.eot | Bin 31156 -> 0 bytes .../default/assets/fonts/outline-icons.svg | 366 ---- .../default/assets/fonts/outline-icons.ttf | Bin 30928 -> 0 bytes .../default/assets/fonts/outline-icons.woff | Bin 14712 -> 0 bytes .../default/assets/fonts/outline-icons.woff2 | Bin 12240 -> 0 bytes .../default/collections/breadcrumb.overrides | 3 - .../default/collections/breadcrumb.variables | 33 - .../themes/default/collections/form.overrides | 3 - .../themes/default/collections/form.variables | 195 -- .../themes/default/collections/grid.overrides | 4 - .../themes/default/collections/grid.variables | 103 - .../themes/default/collections/menu.overrides | 3 - .../themes/default/collections/menu.variables | 458 ----- .../default/collections/message.overrides | 3 - .../default/collections/message.variables | 158 -- .../default/collections/table.overrides | 0 .../default/collections/table.variables | 247 --- .../themes/default/elements/button.overrides | 3 - .../themes/default/elements/button.variables | 360 ---- .../default/elements/container.overrides | 3 - .../default/elements/container.variables | 58 - .../themes/default/elements/divider.overrides | 18 - .../themes/default/elements/divider.variables | 53 - theme/themes/default/elements/flag.overrides | 991 ---------- theme/themes/default/elements/flag.variables | 13 - .../themes/default/elements/header.overrides | 4 - .../themes/default/elements/header.variables | 151 -- theme/themes/default/elements/icon.overrides | 1716 ----------------- theme/themes/default/elements/icon.variables | 94 - theme/themes/default/elements/image.variables | 44 - theme/themes/default/elements/input.overrides | 3 - theme/themes/default/elements/input.variables | 101 - theme/themes/default/elements/label.variables | 254 --- theme/themes/default/elements/list.overrides | 3 - theme/themes/default/elements/list.variables | 224 --- .../themes/default/elements/loader.variables | 73 - .../default/elements/placeholder.variables | 55 - theme/themes/default/elements/rail.variables | 34 - .../themes/default/elements/reveal.variables | 18 - .../themes/default/elements/segment.overrides | 3 - .../themes/default/elements/segment.variables | 154 -- theme/themes/default/elements/step.overrides | 16 - theme/themes/default/elements/step.variables | 130 -- theme/themes/default/extras/main.overrides | 0 theme/themes/default/extras/main.variables | 0 theme/themes/default/extras/select.overrides | 0 theme/themes/default/extras/select.variables | 0 theme/themes/default/globals/reset.overrides | 447 ----- theme/themes/default/globals/site.overrides | 3 - theme/themes/default/globals/site.variables | 973 ---------- .../default/modules/accordion.overrides | 28 - .../default/modules/accordion.variables | 100 - .../themes/default/modules/checkbox.overrides | 36 - .../themes/default/modules/checkbox.variables | 193 -- theme/themes/default/modules/dimmer.variables | 58 - .../themes/default/modules/dropdown.overrides | 59 - .../themes/default/modules/dropdown.variables | 379 ---- theme/themes/default/modules/embed.variables | 53 - theme/themes/default/modules/modal.overrides | 3 - theme/themes/default/modules/modal.variables | 192 -- theme/themes/default/modules/nag.variables | 74 - theme/themes/default/modules/popup.variables | 138 -- .../themes/default/modules/progress.variables | 113 -- theme/themes/default/modules/rating.overrides | 68 - theme/themes/default/modules/rating.variables | 103 - theme/themes/default/modules/search.overrides | 3 - theme/themes/default/modules/search.variables | 161 -- theme/themes/default/modules/shape.variables | 40 - .../themes/default/modules/sidebar.variables | 45 - theme/themes/default/modules/sticky.variables | 7 - theme/themes/default/modules/tab.variables | 11 - .../default/modules/transition.overrides | 962 --------- .../default/modules/transition.variables | 10 - theme/themes/default/modules/video.variables | 16 - theme/themes/default/views/ad.variables | 13 - theme/themes/default/views/card.variables | 220 --- theme/themes/default/views/comment.variables | 98 - theme/themes/default/views/feed.variables | 141 -- theme/themes/default/views/item.variables | 157 -- .../themes/default/views/statistic.variables | 99 - .../themes/pastanaga/assets/images/flags.png | Bin 28123 -> 0 bytes .../themes/pastanaga/elements/icon.variables | 34 - .../themes/pastanaga/elements/image.overrides | 3 - .../themes/pastanaga/elements/label.overrides | 3 - .../pastanaga/elements/loader.overrides | 3 - .../pastanaga/elements/placeholder.overrides | 3 - .../themes/pastanaga/elements/rail.overrides | 3 - .../pastanaga/elements/reveal.overrides | 3 - .../themes/pastanaga/globals/reset.variables | 3 - .../pastanaga/modules/chatroom.overrides | 3 - .../pastanaga/modules/chatroom.variables | 3 - .../themes/pastanaga/modules/dimmer.overrides | 3 - .../themes/pastanaga/modules/embed.overrides | 3 - theme/themes/pastanaga/modules/nag.overrides | 3 - .../themes/pastanaga/modules/popup.overrides | 3 - .../pastanaga/modules/progress.overrides | 3 - .../themes/pastanaga/modules/shape.overrides | 3 - .../pastanaga/modules/sidebar.overrides | 3 - .../themes/pastanaga/modules/sticky.overrides | 3 - theme/themes/pastanaga/modules/tab.overrides | 3 - .../themes/pastanaga/modules/video.overrides | 3 - theme/themes/pastanaga/views/ad.overrides | 3 - theme/themes/pastanaga/views/card.overrides | 3 - .../themes/pastanaga/views/comment.overrides | 3 - theme/themes/pastanaga/views/feed.overrides | 3 - theme/themes/pastanaga/views/item.overrides | 3 - .../pastanaga/views/statistic.overrides | 3 - 232 files changed, 360 insertions(+), 13862 deletions(-) create mode 100644 src/customizations/volto/components/theme/App/App.jsx create mode 100644 src/customizations/volto/components/theme/MultilingualRedirector/MultilingualRedirector.jsx rename theme/{themes/pastanaga => site}/assets/fonts/icons.eot (100%) rename theme/{themes/pastanaga => site}/assets/fonts/icons.svg (100%) rename theme/{themes/pastanaga => site}/assets/fonts/icons.ttf (100%) rename theme/{themes/pastanaga => site}/assets/fonts/icons.woff (100%) rename theme/{themes/default => site}/assets/images/flags.png (100%) rename theme/{themes/pastanaga => site}/collections/breadcrumb.overrides (100%) rename theme/{themes/pastanaga => site}/collections/breadcrumb.variables (100%) rename theme/{themes/pastanaga => site}/collections/form.overrides (100%) rename theme/{themes/pastanaga => site}/collections/form.variables (100%) rename theme/{themes/pastanaga => site}/collections/grid.overrides (100%) rename theme/{themes/pastanaga => site}/collections/grid.variables (100%) rename theme/{themes/pastanaga => site}/collections/menu.overrides (100%) rename theme/{themes/pastanaga => site}/collections/menu.variables (100%) rename theme/{themes/pastanaga => site}/collections/message.overrides (100%) rename theme/{themes/pastanaga => site}/collections/message.variables (100%) rename theme/{themes/pastanaga => site}/collections/table.overrides (100%) rename theme/{themes/pastanaga => site}/collections/table.variables (100%) rename theme/{themes/pastanaga => site}/elements/button.overrides (100%) rename theme/{themes/pastanaga => site}/elements/button.variables (100%) rename theme/{themes/pastanaga => site}/elements/container.overrides (100%) rename theme/{themes/pastanaga => site}/elements/container.variables (100%) rename theme/{themes/pastanaga => site}/elements/divider.overrides (100%) rename theme/{themes/pastanaga => site}/elements/divider.variables (100%) rename theme/{themes/pastanaga => site}/elements/flag.overrides (100%) rename theme/{themes/pastanaga => site}/elements/flag.variables (100%) rename theme/{themes/pastanaga => site}/elements/header.overrides (100%) rename theme/{themes/pastanaga => site}/elements/header.variables (100%) rename theme/{themes/pastanaga => site}/elements/icon.overrides (100%) rename theme/{themes/default => site}/elements/image.overrides (100%) rename theme/{themes/pastanaga => site}/elements/image.variables (100%) rename theme/{themes/pastanaga => site}/elements/input.overrides (100%) rename theme/{themes/pastanaga => site}/elements/input.variables (100%) rename theme/{themes/default => site}/elements/label.overrides (100%) rename theme/{themes/pastanaga => site}/elements/label.variables (100%) rename theme/{themes/pastanaga => site}/elements/list.overrides (100%) rename theme/{themes/pastanaga => site}/elements/list.variables (100%) rename theme/{themes/default => site}/elements/loader.overrides (100%) rename theme/{themes/pastanaga => site}/elements/loader.variables (100%) rename theme/{themes/default => site}/elements/placeholder.overrides (100%) rename theme/{themes/pastanaga => site}/elements/placeholder.variables (100%) rename theme/{themes/default => site}/elements/rail.overrides (100%) rename theme/{themes/pastanaga => site}/elements/rail.variables (100%) rename theme/{themes/default => site}/elements/reveal.overrides (100%) rename theme/{themes/pastanaga => site}/elements/reveal.variables (100%) rename theme/{themes/pastanaga => site}/elements/segment.overrides (100%) rename theme/{themes/pastanaga => site}/elements/segment.variables (100%) rename theme/{themes/pastanaga => site}/elements/step.overrides (100%) rename theme/{themes/pastanaga => site}/elements/step.variables (100%) rename theme/{themes/pastanaga => site}/extras/blocks.less (100%) rename theme/{themes/pastanaga => site}/extras/custom.less (90%) rename theme/{themes/default => site}/extras/custom.overrides (100%) rename theme/{themes/default => site}/extras/custom.variables (100%) rename theme/{themes/pastanaga => site}/extras/draftjs.less (100%) rename theme/{themes/pastanaga => site}/extras/extras.less (100%) rename theme/{themes/pastanaga/extras/main.less => site/extras/main.overrides} (93%) rename theme/{themes/pastanaga => site}/extras/sidebar.less (100%) rename theme/{themes/pastanaga => site}/extras/toolbar.less (100%) rename theme/{themes/pastanaga => site}/extras/utils.less (100%) rename theme/{themes/pastanaga => site}/globals/reset.overrides (100%) rename theme/{themes/default => site}/globals/reset.variables (100%) rename theme/{themes/pastanaga => site}/globals/site.overrides (100%) rename theme/{themes/pastanaga => site}/globals/site.variables (100%) rename theme/{themes/pastanaga => site}/modules/accordion.overrides (100%) rename theme/{themes/pastanaga => site}/modules/accordion.variables (100%) rename theme/{themes/default => site}/modules/chatroom.overrides (100%) rename theme/{themes/default => site}/modules/chatroom.variables (100%) rename theme/{themes/pastanaga => site}/modules/checkbox.overrides (100%) rename theme/{themes/pastanaga => site}/modules/checkbox.variables (100%) rename theme/{themes/default => site}/modules/dimmer.overrides (100%) rename theme/{themes/pastanaga => site}/modules/dimmer.variables (100%) rename theme/{themes/pastanaga => site}/modules/dropdown.overrides (100%) rename theme/{themes/pastanaga => site}/modules/dropdown.variables (100%) rename theme/{themes/default => site}/modules/embed.overrides (100%) rename theme/{themes/pastanaga => site}/modules/embed.variables (100%) rename theme/{themes/pastanaga => site}/modules/modal.overrides (100%) rename theme/{themes/pastanaga => site}/modules/modal.variables (100%) rename theme/{themes/default => site}/modules/nag.overrides (100%) rename theme/{themes/pastanaga => site}/modules/nag.variables (100%) rename theme/{themes/default => site}/modules/popup.overrides (100%) rename theme/{themes/pastanaga => site}/modules/popup.variables (100%) rename theme/{themes/default => site}/modules/progress.overrides (100%) rename theme/{themes/pastanaga => site}/modules/progress.variables (100%) rename theme/{themes/pastanaga => site}/modules/rating.overrides (100%) rename theme/{themes/pastanaga => site}/modules/rating.variables (100%) rename theme/{themes/pastanaga => site}/modules/search.overrides (100%) rename theme/{themes/pastanaga => site}/modules/search.variables (100%) rename theme/{themes/default => site}/modules/shape.overrides (100%) rename theme/{themes/pastanaga => site}/modules/shape.variables (100%) rename theme/{themes/default => site}/modules/sidebar.overrides (100%) rename theme/{themes/pastanaga => site}/modules/sidebar.variables (100%) rename theme/{themes/default => site}/modules/sticky.overrides (100%) rename theme/{themes/pastanaga => site}/modules/sticky.variables (100%) rename theme/{themes/default => site}/modules/tab.overrides (100%) rename theme/{themes/pastanaga => site}/modules/tab.variables (100%) rename theme/{themes/pastanaga => site}/modules/transition.overrides (100%) rename theme/{themes/pastanaga => site}/modules/transition.variables (100%) rename theme/{themes/default => site}/modules/video.overrides (100%) mode change 100644 => 100755 rename theme/{themes/pastanaga => site}/modules/video.variables (100%) rename theme/{themes/default => site}/views/ad.overrides (100%) rename theme/{themes/pastanaga => site}/views/ad.variables (100%) rename theme/{themes/default => site}/views/card.overrides (100%) rename theme/{themes/pastanaga => site}/views/card.variables (100%) rename theme/{themes/default => site}/views/comment.overrides (100%) rename theme/{themes/pastanaga => site}/views/comment.variables (100%) rename theme/{themes/default => site}/views/feed.overrides (100%) rename theme/{themes/pastanaga => site}/views/feed.variables (100%) rename theme/{themes/default => site}/views/item.overrides (100%) rename theme/{themes/pastanaga => site}/views/item.variables (100%) rename theme/{themes/default => site}/views/statistic.overrides (100%) rename theme/{themes/pastanaga => site}/views/statistic.variables (100%) delete mode 100644 theme/themes/default/assets/fonts/brand-icons.eot delete mode 100644 theme/themes/default/assets/fonts/brand-icons.svg delete mode 100644 theme/themes/default/assets/fonts/brand-icons.ttf delete mode 100644 theme/themes/default/assets/fonts/brand-icons.woff delete mode 100644 theme/themes/default/assets/fonts/brand-icons.woff2 delete mode 100644 theme/themes/default/assets/fonts/icons.eot delete mode 100644 theme/themes/default/assets/fonts/icons.svg delete mode 100644 theme/themes/default/assets/fonts/icons.ttf delete mode 100644 theme/themes/default/assets/fonts/icons.woff delete mode 100644 theme/themes/default/assets/fonts/icons.woff2 delete mode 100644 theme/themes/default/assets/fonts/outline-icons.eot delete mode 100644 theme/themes/default/assets/fonts/outline-icons.svg delete mode 100644 theme/themes/default/assets/fonts/outline-icons.ttf delete mode 100644 theme/themes/default/assets/fonts/outline-icons.woff delete mode 100644 theme/themes/default/assets/fonts/outline-icons.woff2 delete mode 100644 theme/themes/default/collections/breadcrumb.overrides delete mode 100644 theme/themes/default/collections/breadcrumb.variables delete mode 100644 theme/themes/default/collections/form.overrides delete mode 100644 theme/themes/default/collections/form.variables delete mode 100644 theme/themes/default/collections/grid.overrides delete mode 100644 theme/themes/default/collections/grid.variables delete mode 100644 theme/themes/default/collections/menu.overrides delete mode 100644 theme/themes/default/collections/menu.variables delete mode 100644 theme/themes/default/collections/message.overrides delete mode 100644 theme/themes/default/collections/message.variables delete mode 100644 theme/themes/default/collections/table.overrides delete mode 100644 theme/themes/default/collections/table.variables delete mode 100644 theme/themes/default/elements/button.overrides delete mode 100644 theme/themes/default/elements/button.variables delete mode 100644 theme/themes/default/elements/container.overrides delete mode 100644 theme/themes/default/elements/container.variables delete mode 100644 theme/themes/default/elements/divider.overrides delete mode 100644 theme/themes/default/elements/divider.variables delete mode 100644 theme/themes/default/elements/flag.overrides delete mode 100644 theme/themes/default/elements/flag.variables delete mode 100644 theme/themes/default/elements/header.overrides delete mode 100644 theme/themes/default/elements/header.variables delete mode 100644 theme/themes/default/elements/icon.overrides delete mode 100644 theme/themes/default/elements/icon.variables delete mode 100644 theme/themes/default/elements/image.variables delete mode 100644 theme/themes/default/elements/input.overrides delete mode 100644 theme/themes/default/elements/input.variables delete mode 100644 theme/themes/default/elements/label.variables delete mode 100644 theme/themes/default/elements/list.overrides delete mode 100644 theme/themes/default/elements/list.variables delete mode 100644 theme/themes/default/elements/loader.variables delete mode 100644 theme/themes/default/elements/placeholder.variables delete mode 100644 theme/themes/default/elements/rail.variables delete mode 100644 theme/themes/default/elements/reveal.variables delete mode 100644 theme/themes/default/elements/segment.overrides delete mode 100644 theme/themes/default/elements/segment.variables delete mode 100644 theme/themes/default/elements/step.overrides delete mode 100644 theme/themes/default/elements/step.variables delete mode 100644 theme/themes/default/extras/main.overrides delete mode 100644 theme/themes/default/extras/main.variables delete mode 100644 theme/themes/default/extras/select.overrides delete mode 100644 theme/themes/default/extras/select.variables delete mode 100644 theme/themes/default/globals/reset.overrides delete mode 100644 theme/themes/default/globals/site.overrides delete mode 100644 theme/themes/default/globals/site.variables delete mode 100644 theme/themes/default/modules/accordion.overrides delete mode 100644 theme/themes/default/modules/accordion.variables delete mode 100644 theme/themes/default/modules/checkbox.overrides delete mode 100644 theme/themes/default/modules/checkbox.variables delete mode 100644 theme/themes/default/modules/dimmer.variables delete mode 100644 theme/themes/default/modules/dropdown.overrides delete mode 100644 theme/themes/default/modules/dropdown.variables delete mode 100644 theme/themes/default/modules/embed.variables delete mode 100644 theme/themes/default/modules/modal.overrides delete mode 100644 theme/themes/default/modules/modal.variables delete mode 100644 theme/themes/default/modules/nag.variables delete mode 100644 theme/themes/default/modules/popup.variables delete mode 100644 theme/themes/default/modules/progress.variables delete mode 100644 theme/themes/default/modules/rating.overrides delete mode 100644 theme/themes/default/modules/rating.variables delete mode 100644 theme/themes/default/modules/search.overrides delete mode 100644 theme/themes/default/modules/search.variables delete mode 100644 theme/themes/default/modules/shape.variables delete mode 100644 theme/themes/default/modules/sidebar.variables delete mode 100644 theme/themes/default/modules/sticky.variables delete mode 100644 theme/themes/default/modules/tab.variables delete mode 100644 theme/themes/default/modules/transition.overrides delete mode 100644 theme/themes/default/modules/transition.variables delete mode 100644 theme/themes/default/modules/video.variables delete mode 100644 theme/themes/default/views/ad.variables delete mode 100644 theme/themes/default/views/card.variables delete mode 100644 theme/themes/default/views/comment.variables delete mode 100644 theme/themes/default/views/feed.variables delete mode 100644 theme/themes/default/views/item.variables delete mode 100644 theme/themes/default/views/statistic.variables delete mode 100644 theme/themes/pastanaga/assets/images/flags.png delete mode 100644 theme/themes/pastanaga/elements/icon.variables delete mode 100644 theme/themes/pastanaga/elements/image.overrides delete mode 100644 theme/themes/pastanaga/elements/label.overrides delete mode 100644 theme/themes/pastanaga/elements/loader.overrides delete mode 100644 theme/themes/pastanaga/elements/placeholder.overrides delete mode 100644 theme/themes/pastanaga/elements/rail.overrides delete mode 100644 theme/themes/pastanaga/elements/reveal.overrides delete mode 100644 theme/themes/pastanaga/globals/reset.variables delete mode 100644 theme/themes/pastanaga/modules/chatroom.overrides delete mode 100644 theme/themes/pastanaga/modules/chatroom.variables delete mode 100644 theme/themes/pastanaga/modules/dimmer.overrides delete mode 100644 theme/themes/pastanaga/modules/embed.overrides delete mode 100644 theme/themes/pastanaga/modules/nag.overrides delete mode 100644 theme/themes/pastanaga/modules/popup.overrides delete mode 100644 theme/themes/pastanaga/modules/progress.overrides delete mode 100644 theme/themes/pastanaga/modules/shape.overrides delete mode 100644 theme/themes/pastanaga/modules/sidebar.overrides delete mode 100644 theme/themes/pastanaga/modules/sticky.overrides delete mode 100644 theme/themes/pastanaga/modules/tab.overrides delete mode 100755 theme/themes/pastanaga/modules/video.overrides delete mode 100644 theme/themes/pastanaga/views/ad.overrides delete mode 100644 theme/themes/pastanaga/views/card.overrides delete mode 100644 theme/themes/pastanaga/views/comment.overrides delete mode 100644 theme/themes/pastanaga/views/feed.overrides delete mode 100644 theme/themes/pastanaga/views/item.overrides delete mode 100644 theme/themes/pastanaga/views/statistic.overrides diff --git a/package-lock.json b/package-lock.json index 44a1fbb1..41a352bd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1419,33 +1419,33 @@ "integrity": "sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA==" }, "@formatjs/intl-listformat": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-1.4.4.tgz", - "integrity": "sha512-b9DFftQDQEE4fVHX8WFCIXLWdlt98XPyXoyNt9wTSOhUZBJUmu97w9y8fRZnPry6pES/D9yGLJeD4/XDjG0tbw==", + "version": "1.4.5", + "resolved": "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-1.4.5.tgz", + "integrity": "sha512-UHZdNuFZxZYhNsUIl31g0zuhRt4mD/j18HlY1t/w6nwe3p5qLySi4ZmxHplGdZMl54ap6Z4+XGEgnxxwqQ4R1g==", "requires": { - "@formatjs/intl-utils": "^2.2.2" + "@formatjs/intl-utils": "^2.2.3" } }, "@formatjs/intl-relativetimeformat": { - "version": "4.5.12", - "resolved": "https://registry.npmjs.org/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-4.5.12.tgz", - "integrity": "sha512-Fh57ZnwOgAIA61i3BQhTb8C8OrCP1zDLQ35xzJ7yv/UiDDExAS8rQPf80+7Hu/8+kydL1DDgVY1PXvE63fxF+Q==", + "version": "4.5.13", + "resolved": "https://registry.npmjs.org/@formatjs/intl-relativetimeformat/-/intl-relativetimeformat-4.5.13.tgz", + "integrity": "sha512-DocBGUaxOydgs0PuN2YGX0zw4ibYqZXLpHn9jnIpn4Gi4YopEEf+6Xf0DGMfaRvjnPe1QztagoaIOtyLvG47fw==", "requires": { - "@formatjs/intl-utils": "^2.2.2" + "@formatjs/intl-utils": "^2.2.3" } }, "@formatjs/intl-unified-numberformat": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/@formatjs/intl-unified-numberformat/-/intl-unified-numberformat-3.3.3.tgz", - "integrity": "sha512-dic7DA8REMy8gkidkCSoWqTjaLIlCyLJ5fDtlgHzK/ftwxAlbSSHkbeozZ/IKQDPbbcSppI/t9hp9KT+co/Ksg==", + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/@formatjs/intl-unified-numberformat/-/intl-unified-numberformat-3.3.4.tgz", + "integrity": "sha512-RhgGUOiMvpCOMc0EqM28JgyfFyAKsw1EfnrDAdqMKAZhbUcRj73iQwdusKXoOp++3DAEg9L2TUUes9QcAv5Ypw==", "requires": { - "@formatjs/intl-utils": "^2.2.2" + "@formatjs/intl-utils": "^2.2.3" } }, "@formatjs/intl-utils": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/@formatjs/intl-utils/-/intl-utils-2.2.2.tgz", - "integrity": "sha512-rKINaMRYH3FeNwYjEQwPtsA0kP2/hLLMB9mLi/QYfszz/huTqkInFmYilFRCX4oLlhFXDK5UQQMGNfEavN02Sg==" + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/@formatjs/intl-utils/-/intl-utils-2.2.3.tgz", + "integrity": "sha512-CeswyzLq2A3uu7dFptBTn1j815B/stndfHMr+ZPj0QxaN/Q9zLRTQxMYskRW07uPp+a7XobLFqEJHLrMu/tZEw==" }, "@formatjs/macro": { "version": "0.2.7", @@ -1689,15 +1689,15 @@ } }, "@octokit/types": { - "version": "2.11.1", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.11.1.tgz", - "integrity": "sha512-QaLoLkmFdfoNbk3eOzPv7vKrUY0nRJIYmZDoz/pTer4ICpqu80aSQTVHnnUxEFuURCiidig76CcxUOYC/bY3RQ==", + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-2.12.1.tgz", + "integrity": "sha512-LRLR1tjbcCfAmUElvTmMvLEzstpx6Xt/aQVTg2xvd+kHA2Ekp1eWl5t+gU7bcwjXHYEAzh4hH4WH+kS3vh+wRw==", "requires": { "@types/node": ">= 8" } }, "@plone/volto": { - "version": "github:eea/volto#fdae0bf5938d21a06ef7f04960f23802f54aebef", + "version": "github:eea/volto#463b1c1c13a03090921ff16b61391e5e0a0e5108", "from": "github:eea/volto#kitchen_sink", "requires": { "@babel/core": "7.7.4", @@ -2708,9 +2708,9 @@ } }, "@types/invariant": { - "version": "2.2.31", - "resolved": "https://registry.npmjs.org/@types/invariant/-/invariant-2.2.31.tgz", - "integrity": "sha512-jMlgg9pIURvy9jgBHCjQp/CyBjYHUwj91etVcDdXkFl2CwTFiQlB+8tcsMeXpXf2PFE5X2pjk4Gm43hQSMHAdA==" + "version": "2.2.32", + "resolved": "https://registry.npmjs.org/@types/invariant/-/invariant-2.2.32.tgz", + "integrity": "sha512-WjY4WVFaehHv+TOgm+dS3UI559NvsPGFz/C0nIo7KOOdC+HeC7Y3/yLzdJYQ3+oFQaTXrOVm7cNtIgMataIDVg==" }, "@types/istanbul-lib-coverage": { "version": "2.0.1", @@ -2746,9 +2746,9 @@ "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==" }, "@types/node": { - "version": "13.13.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.0.tgz", - "integrity": "sha512-WE4IOAC6r/yBZss1oQGM5zs2D7RuKR6Q+w+X2SouPofnWn+LbCqClRyhO3ZE7Ix8nmFgo/oVuuE01cJT2XB13A==" + "version": "13.13.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.2.tgz", + "integrity": "sha512-LB2R1Oyhpg8gu4SON/mfforE525+Hi/M1ineICEDftqNVTyFg1aRIeGuTvXAoWHc4nbrFncWtJgMmoyRvuGh7A==" }, "@types/parse-json": { "version": "4.0.0", @@ -9757,7 +9757,7 @@ "bundled": true, "optional": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -9868,7 +9868,7 @@ "bundled": true, "optional": true, "requires": { - "minimatch": "3.0.4" + "minimatch": "^3.0.4" } }, "inflight": { @@ -9908,7 +9908,7 @@ "bundled": true, "optional": true, "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -9938,7 +9938,7 @@ "bundled": true, "optional": true, "requires": { - "minimist": "1.2.5" + "minimist": "^1.2.5" } }, "ms": { @@ -11824,14 +11824,14 @@ "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==" }, "intl-format-cache": { - "version": "4.2.24", - "resolved": "https://registry.npmjs.org/intl-format-cache/-/intl-format-cache-4.2.24.tgz", - "integrity": "sha512-eea8rHu7ipmUilSd9+MCglgR07E+xJXmTYVFODmeLKsO3Psr/OrixDr6vWprz1whli7cwRdSc1/jHVBxrd+QBw==" + "version": "4.2.25", + "resolved": "https://registry.npmjs.org/intl-format-cache/-/intl-format-cache-4.2.25.tgz", + "integrity": "sha512-ZwHX7n/Inusc8j/8+Ng6Ik4xHmDkSxOk/kT0KOnEqxpIQQ/2o9TV5aUeorf+RbYA84yLawOcBy4SRZAHSTNTAA==" }, "intl-locales-supported": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/intl-locales-supported/-/intl-locales-supported-1.8.5.tgz", - "integrity": "sha512-0rfI2lxC5ZTi75WW/Zbvb/0f+mSggw3G4AYqhIyIGDXMZWRIyUN2a0ELWmaKxNvW46+3ybV5BhAvGSO7rI/SiQ==" + "version": "1.8.6", + "resolved": "https://registry.npmjs.org/intl-locales-supported/-/intl-locales-supported-1.8.6.tgz", + "integrity": "sha512-AeZ01biOzPLt8Tg80rRYWNnt5su/nts4iro3fzL9J6jiG1BCjqW8gHrsBUuhAs/wsyjNFGzcpNLg4To7SqDVfg==" }, "intl-messageformat": { "version": "7.8.4", @@ -12990,9 +12990,9 @@ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" }, "source-map-support": { - "version": "0.5.17", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.17.tgz", - "integrity": "sha512-bwdKOBZ5L0gFRh4KOxNap/J/MpvX9Yxsq9lFDx65s3o7F/NiHy7JRaGIS8MwW6tZPAq9UXE207Il0cfcb5yu/Q==", + "version": "0.5.18", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.18.tgz", + "integrity": "sha512-9luZr/BZ2QeU6tO2uG8N2aZpVSli4TSAOAqFOyTO51AJcD9P99c0K1h6dD6r6qo5dyT44BR5exweOaLLeldTkQ==", "requires": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -15938,9 +15938,9 @@ "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==" }, "node-abi": { - "version": "2.15.0", - "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.15.0.tgz", - "integrity": "sha512-FeLpTS0F39U7hHZU1srAK4Vx+5AHNVOTP+hxBNQknR/54laTHSFIJkDWDqiquY1LeLUgTfPN7sLPhMubx0PLAg==", + "version": "2.16.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.16.0.tgz", + "integrity": "sha512-+sa0XNlWDA6T+bDLmkCUYn6W5k5W6BPRL6mqzSCs6H/xUgtl4D5x2fORKDzopKiU6wsyn/+wXlRXwXeSp+mtoA==", "requires": { "semver": "^5.4.1" } @@ -21096,9 +21096,9 @@ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" }, "source-map-support": { - "version": "0.5.17", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.17.tgz", - "integrity": "sha512-bwdKOBZ5L0gFRh4KOxNap/J/MpvX9Yxsq9lFDx65s3o7F/NiHy7JRaGIS8MwW6tZPAq9UXE207Il0cfcb5yu/Q==", + "version": "0.5.18", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.18.tgz", + "integrity": "sha512-9luZr/BZ2QeU6tO2uG8N2aZpVSli4TSAOAqFOyTO51AJcD9P99c0K1h6dD6r6qo5dyT44BR5exweOaLLeldTkQ==", "requires": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -29720,9 +29720,9 @@ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" }, "source-map-support": { - "version": "0.5.17", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.17.tgz", - "integrity": "sha512-bwdKOBZ5L0gFRh4KOxNap/J/MpvX9Yxsq9lFDx65s3o7F/NiHy7JRaGIS8MwW6tZPAq9UXE207Il0cfcb5yu/Q==", + "version": "0.5.18", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.18.tgz", + "integrity": "sha512-9luZr/BZ2QeU6tO2uG8N2aZpVSli4TSAOAqFOyTO51AJcD9P99c0K1h6dD6r6qo5dyT44BR5exweOaLLeldTkQ==", "requires": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" diff --git a/src/customizations/volto/components/theme/App/App.jsx b/src/customizations/volto/components/theme/App/App.jsx new file mode 100644 index 00000000..e9243f88 --- /dev/null +++ b/src/customizations/volto/components/theme/App/App.jsx @@ -0,0 +1,223 @@ +/** + * App container. + * @module components/theme/App/App + */ + +import React, { Component, Fragment } from 'react'; +import PropTypes from 'prop-types'; +import { connect } from 'react-redux'; +import { compose } from 'redux'; +import { asyncConnect } from 'redux-connect'; +import { Segment } from 'semantic-ui-react'; +import { renderRoutes } from 'react-router-config'; +import { Slide, ToastContainer, toast } from 'react-toastify'; +import split from 'lodash/split'; +import join from 'lodash/join'; +import trim from 'lodash/trim'; +import cx from 'classnames'; +import { settings } from '~/config'; +import loadable from '@loadable/component'; + +import Error from '@plone/volto/error'; + +import { + Breadcrumbs, + Footer, + Header, + Icon, + OutdatedBrowser, + AppExtras, +} from '@plone/volto/components'; +import { BodyClass, getBaseUrl, getView } from '@plone/volto/helpers'; +import { + getBreadcrumbs, + getContent, + getNavigation, + getTypes, + getWorkflow, +} from '@plone/volto/actions'; + +import clearSVG from '@plone/volto/icons/clear.svg'; +import MultilingualRedirector from '@plone/volto/components/theme/MultilingualRedirector/MultilingualRedirector'; + +/** + * @export + * @class App + * @extends {Component} + */ +class App extends Component { + /** + * Property types. + * @property {Object} propTypes Property types. + * @static + */ + static propTypes = { + pathname: PropTypes.string.isRequired, + }; + + state = { + hasError: false, + error: null, + errorInfo: null, + }; + + /** + * ComponentDidMount + * @method ComponentDidMount + * @param {string} error The error + * @param {string} info The info + * @returns {undefined} + */ + componentDidMount() { + if (__CLIENT__ && process.env.SENTRY_DSN) { + const Raven = loadable(() => import('raven-js')); + Raven.config(process.env.SENTRY_DSN).install(); + } + } + + /** + * @method componentWillReceiveProps + * @param {Object} nextProps Next properties + * @returns {undefined} + */ + UNSAFE_componentWillReceiveProps(nextProps) { + if (nextProps.pathname !== this.props.pathname) { + if (this.state.hasError) { + this.setState({ hasError: false }); + } + } + } + + /** + * ComponentDidCatch + * @method ComponentDidCatch + * @param {string} error The error + * @param {string} info The info + * @returns {undefined} + */ + componentDidCatch(error, info) { + this.setState({ hasError: true, error, errorInfo: info }); + if (__CLIENT__ && process.env.SENTRY_DSN) { + const Raven = loadable(() => import('raven-js')); + Raven.captureException(error, { extra: info }); + } + } + + /** + * Render method. + * @method render + * @returns {string} Markup for the component. + */ + render() { + const path = getBaseUrl(this.props.pathname); + const action = getView(this.props.pathname); + + return ( + + + + {/* Body class depending on content type */} + {this.props.content && this.props.content['@type'] && ( + + )} + + {/* Body class depending on sections */} + +
+ + + +
+ + {this.state.hasError ? ( + + ) : ( + renderRoutes(this.props.route.routes) + )} +
+
+
+