From 55003c73abf2b7f93456a5b2c132a943305ddc3d Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 11 Aug 2020 14:46:58 +0200 Subject: [PATCH] Improve group view Signed-off-by: Thomas Citharel --- js/src/components/Group/GroupSection.vue | 50 ++++++++ js/src/views/Group/Group.vue | 141 +++++++++++------------ 2 files changed, 120 insertions(+), 71 deletions(-) create mode 100644 js/src/components/Group/GroupSection.vue diff --git a/js/src/components/Group/GroupSection.vue b/js/src/components/Group/GroupSection.vue new file mode 100644 index 000000000..b50cc64aa --- /dev/null +++ b/js/src/components/Group/GroupSection.vue @@ -0,0 +1,50 @@ + + + + diff --git a/js/src/views/Group/Group.vue b/js/src/views/Group/Group.vue index 2497a7ab1..cb4605e9e 100644 --- a/js/src/views/Group/Group.vue +++ b/js/src/views/Group/Group.vue @@ -96,67 +96,30 @@
+
-
- {{ $t("Upcoming events") }} -
- + +
+
-
-

{{ $t("No public upcoming events") }}

-
- - {{ $t("View all events") }} -
-
- {{ $t("Resources") }} -
-
- - -
-
-
-

{{ $t("No resources yet") }}

+
+

{{ $t("No discussions yet") }}

{{ $t("View all resources") }}{{ $t("View all discussions") }} -
-
-
-
- {{ $t("Public page") }} -
- -
-
-

{{ $t("No posts yet") }}

-
- {{ $t("Post a public message") }} -
-
- {{ $t("Ongoing tasks") }} + + +
@@ -180,27 +143,66 @@

{{ $t("No ongoing todos") }}

{{ $t("View all todos") }} -
-
- {{ $t("Discussions") }} -
- + + + +
+
+ + +
-
-

{{ $t("No discussions yet") }}

+
+

{{ $t("No resources yet") }}

{{ $t("View all discussions") }}{{ $t("View all resources") }} -
+ +
+ +
+ + +
+ +
+
+

{{ $t("No public upcoming events") }}

+
+ + {{ $t("View all events") }} +
+ + +
+ +
+
+

{{ $t("No posts yet") }}

+
+ {{ $t("Post a public message") }} +
@@ -221,7 +223,6 @@ {{ $t("No public upcoming events") }} -
{{ $t("Latest posts") }}
@@ -272,6 +273,7 @@ import ResourceItem from "@/components/Resource/ResourceItem.vue"; import FolderItem from "@/components/Resource/FolderItem.vue"; import RouteName from "../../router/name"; import { Address } from "@/types/address.model"; +import GroupSection from "../../components/Group/GroupSection.vue"; @Component({ apollo: { @@ -305,6 +307,7 @@ import { Address } from "@/types/address.model"; EventCard, FolderItem, ResourceItem, + GroupSection, "map-leaflet": () => import(/* webpackChunkName: "map" */ "../../components/Map.vue"), }, metaInfo() { @@ -459,10 +462,6 @@ div.container { margin: 0 2rem; section { - /deep/ h2 span { - display: block; - } - .posts-wrapper { padding-bottom: 1rem; }