diff --git a/js/src/assets/oruga-tailwindcss.css b/js/src/assets/oruga-tailwindcss.css index f06833582..06e5fd8c2 100644 --- a/js/src/assets/oruga-tailwindcss.css +++ b/js/src/assets/oruga-tailwindcss.css @@ -193,7 +193,7 @@ body { /* Select */ .select { - @apply dark:bg-zinc-600 dark:placeholder:text-zinc-400 dark:text-zinc-50 rounded pl-2 pr-6 border-2 border-transparent h-10 shadow-none border rounded; + @apply dark:bg-zinc-600 dark:placeholder:text-zinc-400 dark:text-zinc-50 rounded pl-2 pr-8 border-2 border-transparent h-10 shadow-none border rounded; } /* Radio */ diff --git a/js/src/components/Event/SkeletonDateCalendarIcon.vue b/js/src/components/Event/SkeletonDateCalendarIcon.vue new file mode 100644 index 000000000..b31ad986d --- /dev/null +++ b/js/src/components/Event/SkeletonDateCalendarIcon.vue @@ -0,0 +1,18 @@ + + + diff --git a/js/src/graphql/group.ts b/js/src/graphql/group.ts index c68278b52..689288b65 100644 --- a/js/src/graphql/group.ts +++ b/js/src/graphql/group.ts @@ -1,5 +1,4 @@ import gql from "graphql-tag"; -import { DISCUSSION_BASIC_FIELDS_FRAGMENT } from "./discussion"; import { RESOURCE_METADATA_BASIC_FIELDS_FRAGMENT } from "./resources"; import { POST_BASIC_FIELDS } from "./post"; import { ACTOR_FRAGMENT } from "./actor"; @@ -246,7 +245,6 @@ export const GROUP_FIELDS_FRAGMENTS = gql` } } ${GROUP_BASIC_FIELDS_FRAGMENTS} - ${DISCUSSION_BASIC_FIELDS_FRAGMENT} ${RESOURCE_METADATA_BASIC_FIELDS_FRAGMENT} `; @@ -278,8 +276,6 @@ export const GET_GROUP = gql` $postsLimit: Int $membersPage: Int $membersLimit: Int - $discussionsPage: Int - $discussionsLimit: Int ) { getGroup(id: $id) { mediaSize @@ -287,9 +283,6 @@ export const GET_GROUP = gql` } } ${GROUP_FIELDS_FRAGMENTS} - ${DISCUSSION_BASIC_FIELDS_FRAGMENT} - ${POST_BASIC_FIELDS} - ${RESOURCE_METADATA_BASIC_FIELDS_FRAGMENT} `; export const CREATE_GROUP = gql` diff --git a/js/src/views/Admin/AdminGroupProfile.vue b/js/src/views/Admin/AdminGroupProfile.vue index 422672e2a..a74050f2c 100644 --- a/js/src/views/Admin/AdminGroupProfile.vue +++ b/js/src/views/Admin/AdminGroupProfile.vue @@ -114,26 +114,52 @@ >
-
- -
- + +
+ +
+ +
- {{ - props.row.actor.name - }}@{{ usernameWithDomain(props.row.actor) }}{{ props.row.actor.name }}@{{ usernameWithDomain(props.row.actor) }}
- @{{ usernameWithDomain(props.row.actor) }}@{{ usernameWithDomain(props.row.actor) }}
diff --git a/js/src/views/Admin/AdminProfile.vue b/js/src/views/Admin/AdminProfile.vue index 32ecf05d4..9494ba99a 100644 --- a/js/src/views/Admin/AdminProfile.vue +++ b/js/src/views/Admin/AdminProfile.vue @@ -199,23 +199,43 @@ v-slot="props" >
-
- -
- + +
+ +
+ +
- {{ - props.row.parent.name - }}{{ props.row.parent.name }}
- @{{ usernameWithDomain(props.row.parent) }} + @{{ usernameWithDomain(props.row.parent) }}
diff --git a/js/src/views/Admin/GroupProfiles.vue b/js/src/views/Admin/GroupProfiles.vue index cd30e5875..dbd904eea 100644 --- a/js/src/views/Admin/GroupProfiles.vue +++ b/js/src/views/Admin/GroupProfiles.vue @@ -133,7 +133,7 @@ const preferredUsername = ref(""); const name = ref(""); const domain = ref(""); -const local = useRouteQuery("local", false, booleanTransformer); +const local = useRouteQuery("local", true, booleanTransformer); const suspended = useRouteQuery("suspended", false, booleanTransformer); const page = useRouteQuery("page", 1, integerTransformer); diff --git a/js/src/views/Admin/ProfilesView.vue b/js/src/views/Admin/ProfilesView.vue index 9d51b9207..67bb16fb6 100644 --- a/js/src/views/Admin/ProfilesView.vue +++ b/js/src/views/Admin/ProfilesView.vue @@ -119,7 +119,7 @@ const preferredUsername = ref(""); const name = ref(""); const domain = ref(""); -const local = useRouteQuery("local", false, booleanTransformer); +const local = useRouteQuery("local", true, booleanTransformer); const suspended = useRouteQuery("suspended", false, booleanTransformer); const page = useRouteQuery("page", 1, integerTransformer); diff --git a/js/src/views/Event/EventView.vue b/js/src/views/Event/EventView.vue index 2d5b2015d..8046344b9 100755 --- a/js/src/views/Event/EventView.vue +++ b/js/src/views/Event/EventView.vue @@ -7,7 +7,12 @@ class="flex flex-col relative pb-2 bg-white dark:bg-zinc-700 my-2 rounded" >
+ @@ -16,7 +21,12 @@
+

-
+
+
-

+

+

{{ t("Event cancelled") }}

-