feat: ✨ Attempt to add groups back!

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc-rc.1",
+	"version": "12.119.0-calc-rc.4",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

packages/client/src/pages/my-groups/group.vue

@@ -0,0 +1,177 @@
+<template>
+<div class="mk-group-page">
+	<transition :name="$store.state.animation ? 'zoom' : ''" mode="out-in">
+		<div v-if="group" class="_section">
+			<div class="_content" style="display: flex; gap: var(--margin); flex-wrap: wrap;">
+				<MkButton inline @click="invite()">{{ $ts.invite }}</MkButton>
+				<MkButton inline @click="renameGroup()">{{ $ts.rename }}</MkButton>
+				<MkButton inline @click="transfer()">{{ $ts.transfer }}</MkButton>
+				<MkButton inline @click="deleteGroup()">{{ $ts.delete }}</MkButton>
+			</div>
+		</div>
+	</transition>
+
+	<transition :name="$store.state.animation ? 'zoom' : ''" mode="out-in">
+		<div v-if="group" class="_section members _gap">
+			<div class="_title">{{ $ts.members }}</div>
+			<div class="_content">
+				<div class="users">
+					<div v-for="user in users" :key="user.id" class="user _panel">
+						<MkAvatar :user="user" class="avatar" :show-indicator="true"/>
+						<div class="body">
+							<MkUserName :user="user" class="name"/>
+							<MkAcct :user="user" class="acct"/>
+						</div>
+						<div class="action">
+							<button class="_button" @click="removeUser(user)"><i class="fas fa-times"></i></button>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</transition>
+</div>
+</template>
+
+<script lang="ts">
+import { computed, defineComponent } from 'vue';
+import MkButton from '@/components/ui/MkButton.vue';
+import * as os from '@/os';
+
+export default defineComponent({
+	components: {
+		MkButton,
+	},
+
+	props: {
+		groupId: {
+			type: String,
+			required: true,
+		},
+	},
+
+	data() {
+		return {
+			[Symbol('Page info')]: computed(() => this.group ? {
+				title: this.group.name,
+				icon: 'fas fa-users',
+			} : null),
+			group: null,
+			users: [],
+		};
+	},
+
+	watch: {
+		groupId: 'fetch',
+	},
+
+	created() {
+		this.fetch();
+	},
+
+	methods: {
+		fetch() {
+			os.api('users/groups/show', {
+				groupId: this.groupId
+			}).then(group => {
+				this.group = group;
+				os.api('users/show', {
+					userIds: this.group.userIds
+				}).then(users => {
+					this.users = users;
+				});
+			});
+		},
+
+		invite() {
+			os.selectUser().then(user => {
+				os.apiWithDialog('users/groups/invite', {
+					groupId: this.group.id,
+					userId: user.id
+				});
+			});
+		},
+
+		removeUser(user) {
+			os.api('users/groups/pull', {
+				groupId: this.group.id,
+				userId: user.id
+			}).then(() => {
+				this.users = this.users.filter(x => x.id !== user.id);
+			});
+		},
+
+		async renameGroup() {
+			const { canceled, result: name } = await os.inputText({
+				title: this.$ts.groupName,
+				default: this.group.name
+			});
+			if (canceled) return;
+
+			await os.api('users/groups/update', {
+				groupId: this.group.id,
+				name: name
+			});
+
+			this.group.name = name;
+		},
+
+		transfer() {
+			os.selectUser().then(user => {
+				os.apiWithDialog('users/groups/transfer', {
+					groupId: this.group.id,
+					userId: user.id
+				});
+			});
+		},
+
+		async deleteGroup() {
+			const { canceled } = await os.confirm({
+				type: 'warning',
+				text: this.$t('removeAreYouSure', { x: this.group.name }),
+			});
+			if (canceled) return;
+
+			await os.apiWithDialog('users/groups/delete', {
+				groupId: this.group.id
+			});
+			this.$router.push('/my/groups');
+		}
+	}
+});
+</script>
+
+<style lang="scss" scoped>
+.mk-group-page {
+	> .members {
+		> ._content {
+			> .users {
+				> .user {
+					display: flex;
+					align-items: center;
+					padding: 16px;
+
+					> .avatar {
+						width: 50px;
+						height: 50px;
+					}
+
+					> .body {
+						flex: 1;
+						padding: 8px;
+
+						> .name {
+							display: block;
+							font-weight: bold;
+						}
+
+						> .acct {
+							opacity: 0.5;
+						}
+					}
+				}
+			}
+		}
+	}
+}
+</style>

packages/client/src/pages/my-groups/index.vue

@@ -0,0 +1,146 @@
+<template>
+<MkSpacer :content-max="700">
+	<div v-if="tab === 'owned'" class="_content">
+		<MkButton primary style="margin: 0 auto var(--margin) auto;" @click="create"><i class="fas fa-plus"></i> {{ $ts.createGroup }}</MkButton>
+
+		<MkPagination v-slot="{items}" ref="owned" :pagination="ownedPagination">
+			<div v-for="group in items" :key="group.id" class="_card">
+				<div class="_title"><MkA :to="`/my/groups/${ group.id }`" class="_link">{{ group.name }}</MkA></div>
+				<div class="_content"><MkAvatars :user-ids="group.userIds"/></div>
+			</div>
+		</MkPagination>
+	</div>
+
+	<div v-else-if="tab === 'joined'" class="_content">
+		<MkPagination v-slot="{items}" ref="joined" :pagination="joinedPagination">
+			<div v-for="group in items" :key="group.id" class="_card">
+				<div class="_title">{{ group.name }}</div>
+				<div class="_content"><MkAvatars :user-ids="group.userIds"/></div>
+				<div class="_footer">
+					<MkButton danger @click="leave(group)">{{ $ts.leaveGroup }}</MkButton>
+				</div>
+			</div>
+		</MkPagination>
+	</div>
+
+	<div v-else-if="tab === 'invites'" class="_content">
+		<MkPagination v-slot="{items}" ref="invitations" :pagination="invitationPagination">
+			<div v-for="invitation in items" :key="invitation.id" class="_card">
+				<div class="_title">{{ invitation.group.name }}</div>
+				<div class="_content"><MkAvatars :user-ids="invitation.group.userIds"/></div>
+				<div class="_footer">
+					<MkButton primary inline @click="acceptInvite(invitation)"><i class="fas fa-check"></i> {{ $ts.accept }}</MkButton>
+					<MkButton primary inline @click="rejectInvite(invitation)"><i class="fas fa-ban"></i> {{ $ts.reject }}</MkButton>
+				</div>
+			</div>
+		</MkPagination>
+	</div>
+</MkSpacer>
+</template>
+
+<script lang="ts">
+import { defineComponent, computed } from 'vue';
+import MkPagination from '@/components/ui/MkPagination.vue';
+import MkButton from '@/components/ui/MkButton.vue';
+import MkContainer from '@/components/ui/MkContainer.vue';
+import MkAvatars from '@/components/ui/MkAvatars.vue';
+import MkTab from '@/components/ui/MkTab.vue';
+import * as os from '@/os';
+
+export default defineComponent({
+	components: {
+		MkPagination,
+		MkButton,
+		MkContainer,
+		MkTab,
+		MkAvatars,
+	},
+
+	data() {
+		return {
+			[Symbol('Page info')]: computed(() => ({
+				title: this.$ts.groups,
+				icon: 'fas fa-users',
+				bg: 'var(--bg)',
+				actions: [{
+					icon: 'fas fa-plus',
+					text: this.$ts.createGroup,
+					handler: this.create,
+				}],
+				tabs: [{
+					active: this.tab === 'owned',
+					title: this.$ts.ownedGroups,
+					icon: 'fas fa-user-tie',
+					onClick: () => { this.tab = 'owned'; },
+				}, {
+					active: this.tab === 'joined',
+					title: this.$ts.joinedGroups,
+					icon: 'fas fa-id-badge',
+					onClick: () => { this.tab = 'joined'; },
+				}, {
+					active: this.tab === 'invites',
+					title: this.$ts.invites,
+					icon: 'fas fa-envelope-open-text',
+					onClick: () => { this.tab = 'invites'; },
+				},]
+			})),
+			tab: 'owned',
+			ownedPagination: {
+				endpoint: 'users/groups/owned' as const,
+				limit: 10,
+			},
+			joinedPagination: {
+				endpoint: 'users/groups/joined' as const,
+				limit: 10,
+			},
+			invitationPagination: {
+				endpoint: 'i/user-group-invites' as const,
+				limit: 10,
+			},
+		};
+	},
+
+	methods: {
+		async create() {
+			const { canceled, result: name } = await os.inputText({
+				title: this.$ts.groupName,
+			});
+			if (canceled) return;
+			await os.api('users/groups/create', { name: name });
+			this.$refs.owned.reload();
+			os.success();
+		},
+		acceptInvite(invitation) {
+			os.api('users/groups/invitations/accept', {
+				invitationId: invitation.id
+			}).then(() => {
+				os.success();
+				this.$refs.invitations.reload();
+				this.$refs.joined.reload();
+			});
+		},
+		rejectInvite(invitation) {
+			os.api('users/groups/invitations/reject', {
+				invitationId: invitation.id
+			}).then(() => {
+				this.$refs.invitations.reload();
+			});
+		},
+		async leave(group) {
+			const { canceled } = await os.confirm({
+				type: 'warning',
+				text: this.$t('leaveGroupConfirm', { name: group.name }),
+			});
+			if (canceled) return;
+			os.apiWithDialog('users/groups/leave', {
+				groupId: group.id,
+			}).then(() => {
+				this.$refs.joined.reload();
+			});
+		}
+	}
+});
+</script>
+
+<style lang="scss" scoped>
+</style>

packages/client/src/router.ts

@@ -452,6 +452,10 @@ export const routes = [{
 	path: '/my/clips',
 	component: page(() => import('./pages/my-clips/index.vue')),
 	loginRequired: true,
+}, {
+	path: '/my/groups',
+	component: page(() => import('./pages/my-groups/index.vue')),
+	loginRequired: true,
 }, {
 	path: '/my/antennas/create',
 	component: page(() => import('./pages/my-antennas/create.vue')),