{item.name}
@@ -60,16 +60,16 @@
{#if $isPlanModeActive}
-
+
{/if}
{/if}
diff --git a/src/lib/components/List.svelte b/src/lib/components/List.svelte
deleted file mode 100644
index 6cc717c..0000000
--- a/src/lib/components/List.svelte
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
+
diff --git a/src/lib/models/Category.ts b/src/lib/models/Category.ts
index e08e0bb..fb2b2e4 100644
--- a/src/lib/models/Category.ts
+++ b/src/lib/models/Category.ts
@@ -1,6 +1,6 @@
export type Category = {
id: string;
name: string;
- user: string;
+ owner: string;
order: number;
};
diff --git a/src/lib/models/Invitation.ts b/src/lib/models/Invitation.ts
new file mode 100644
index 0000000..175d44a
--- /dev/null
+++ b/src/lib/models/Invitation.ts
@@ -0,0 +1,10 @@
+import type { InvitationState } from '$lib/types/InvitationState';
+
+export type Invitation = {
+ id: string;
+ list: string;
+ owner: string;
+ ownerName: string;
+ guest: string;
+ state: InvitationState;
+};
diff --git a/src/lib/models/Item.ts b/src/lib/models/Item.ts
index 470175f..c7e0316 100644
--- a/src/lib/models/Item.ts
+++ b/src/lib/models/Item.ts
@@ -5,5 +5,4 @@ export type Item = {
picked: boolean;
category: string | null;
list: string;
- user: string;
};
diff --git a/src/lib/models/List.ts b/src/lib/models/List.ts
index a54dae5..1366d87 100644
--- a/src/lib/models/List.ts
+++ b/src/lib/models/List.ts
@@ -2,5 +2,6 @@ export type List = {
id: string;
name: string;
isTemplate: boolean;
- user: string;
+ owner: string;
+ sharedWith: string[];
};
diff --git a/src/lib/pocketbase.ts b/src/lib/pocketbase.ts
index e109a50..998724b 100644
--- a/src/lib/pocketbase.ts
+++ b/src/lib/pocketbase.ts
@@ -5,6 +5,9 @@ import type { Item } from './models/Item';
import type { Category } from './models/Category';
import { deepClone } from './util';
import type { List } from './models/List';
+import type { User } from './models/User';
+import { InvitationState } from './types/InvitationState';
+import type { Invitation } from './models/Invitation';
export const pb = new PocketBase(PUBLIC_POCKETBASE_URL);
@@ -21,8 +24,7 @@ export async function getItemsInListQuery(listId: string, picked: boolean = fals
picked: item.picked,
quantity: item.quantity,
category: item.category ? item.category : null,
- list: item.list,
- user: item.user
+ list: item.list
} as Item;
});
}
@@ -32,7 +34,7 @@ export async function getCategoryQuery(id: string) {
return {
id: category.id,
name: category.name,
- user: category.user,
+ owner: category.owner,
order: category.order
} as Category;
}
@@ -52,39 +54,62 @@ export async function getItemsPerCategory(id: string) {
picked: item.picked,
quantity: item.quantity,
category: item.category ? item.category : null,
- list: item.list,
- user: item.user
+ list: item.list
} as Item;
});
}
-export async function getCategoriesQuery() {
- const categories = deepClone(await pb.collection('categories').getFullList
());
+export async function getMyCategoriesQuery() {
+ const userId = pb.authStore.model?.id;
+ const categories = deepClone(
+ await pb.collection('categories').getFullList({ filter: `owner = "${userId}"` })
+ );
return categories
.map((category) => {
return {
id: category.id,
name: category.name,
- user: category.user,
+ owner: category.owner,
order: category.order
} as Category;
})
.sort((a, b) => a.order - b.order);
}
+export async function createCategoryQuery(name: string) {
+ const userId = pb.authStore.model?.id;
+
+ // check if category already exists
+ const categories = await pb.collection('categories').getFullList({
+ filter: `owner = "${userId}" && name = "${name}"`
+ });
+ if (categories.length > 0) {
+ return categories[0];
+ }
+
+ const cat = await pb.collection('categories').create({
+ name: name,
+ owner: userId,
+ order: 0
+ });
+ return {
+ id: cat.id,
+ name: cat.name,
+ owner: cat.owner,
+ order: cat.order
+ } as Category;
+}
+
export async function getListsQuery() {
- const lists = deepClone(
- await pb.collection('lists').getFullList({
- filter: 'created >= "2022-01-01 00:00:00"'
- })
- );
+ const lists = deepClone(await pb.collection('lists').getFullList());
return lists.map((list) => {
return {
id: list.id,
name: list.name,
isTemplate: list.isTemplate,
- user: list.user
+ owner: list.owner,
+ sharedWith: list.sharedWith
} as List;
});
}
@@ -92,7 +117,7 @@ export async function getListsQuery() {
export async function getTemplatesQuery() {
const templates = deepClone(
await pb.collection('lists').getFullList({
- filter: 'created >= "2022-01-01 00:00:00" && isTemplate = true'
+ filter: 'isTemplate = true'
})
);
return templates.map((template) => {
@@ -100,7 +125,8 @@ export async function getTemplatesQuery() {
id: template.id,
name: template.name,
isTemplate: template.isTemplate,
- user: template.user
+ owner: template.owner,
+ sharedWith: template.sharedWith
} as List;
});
}
@@ -111,7 +137,8 @@ export async function getListQuery(listId: string) {
id: list.id,
name: list.name,
isTemplate: list.isTemplate,
- user: list.user
+ owner: list.owner,
+ sharedWith: list.sharedWith
} as List;
}
@@ -167,3 +194,118 @@ export async function deleteCategoryAndAllItemsQuery(categoryId: string) {
export async function updateItemQuery(item: Item) {
await pb.collection('items').update(item.id, item);
}
+
+export async function getUserByUsernameOrEmailQuery(usernameEmail: string) {
+ const users = await pb
+ .collection('users')
+ .getList(1, 50, { filter: `username = "${usernameEmail}" || email = "${usernameEmail}"` });
+ return users.items.length > 0 ? users.items[0] : undefined;
+}
+
+export async function getUserByIdQuery(id: string) {
+ const user = await pb.collection('users').getOne(id);
+ return {
+ id: user.id,
+ username: user.username,
+ email: user.email
+ } as User;
+}
+
+export async function inviteUserToListQuery(
+ owner: string,
+ guest: string,
+ list: string,
+ ownerName: string
+) {
+ const invitations = await pb
+ .collection('invitations')
+ .getFullList({ filter: `guest = "${guest}" && list = "${list}"` });
+ if (invitations.length > 0) {
+ // if any invitation has InvitationState.Accepted, return
+ if (invitations.some((i) => i.state === InvitationState.Accepted)) {
+ return;
+ }
+
+ // if all invitations have InvitationState.Pending, return
+ if (invitations.every((i) => i.state === InvitationState.Pending)) {
+ return;
+ }
+ }
+
+ const invite = {
+ owner,
+ guest,
+ list,
+ ownerName,
+ state: InvitationState.Pending as string
+ };
+ await pb.collection('invitations').create(invite);
+
+ await pb
+ .collection('lists')
+ .update(list, { sharedWith: [...(await getListQuery(list)).sharedWith, guest] });
+}
+
+export async function removeGuestFromListQuery(guest: string, listId: string) {
+ const list = await getListQuery(listId);
+ await pb
+ .collection('lists')
+ .update(listId, { sharedWith: list.sharedWith.filter((g) => g !== guest) });
+}
+
+export async function removeInvitationsForListAndGuestQuery(guest: string, list: string) {
+ const invitations = await pb
+ .collection('invitations')
+ .getFullList({ filter: `guest = "${guest}" && list = "${list}"` });
+
+ await Promise.all(
+ invitations.map(async (invitation) => await pb.collection('invitations').delete(invitation.id))
+ );
+}
+
+export async function updateInvitationStateQuery(invitationId: string, state: InvitationState) {
+ await pb.collection('invitations').update(invitationId, { state: state as string });
+}
+
+export async function getInvitationsQuery() {
+ const userId = pb.authStore.model?.id;
+ const invitations = await pb
+ .collection('invitations')
+ .getList(1, 50, { filter: `guest = "${userId}"`, sort: '-created' });
+
+ return invitations.items.map((invitation) => {
+ return {
+ id: invitation.id,
+ owner: invitation.owner,
+ ownerName: invitation.ownerName,
+ guest: invitation.guest,
+ list: invitation.list,
+ state: invitation.state as InvitationState
+ } as Invitation;
+ });
+}
+
+export async function updateListSharedWithBasedOnInvitationsQuery(listId: string) {
+ const invitations = await pb.collection('invitations').getList(1, 50, {
+ filter: `list = "${listId}" && state = "${InvitationState.Accepted}" || state = "${InvitationState.Pending}"`
+ });
+
+ const sharedWith = invitations.items.map((invitation) => invitation.guest);
+
+ await pb.collection('lists').update(listId, { sharedWith });
+}
+
+export async function unfollowListQuery(listId: string) {
+ const invitations = await pb.collection('invitations').getList(1, 50, {
+ filter: `list = "${listId}" && state = "${InvitationState.Accepted}" || state = "${InvitationState.Pending}"`
+ });
+
+ await Promise.all(
+ invitations.items.map(
+ async (invitation) =>
+ await pb
+ .collection('invitations')
+ .update(invitation.id, { state: InvitationState.Declined as string })
+ )
+ );
+}
diff --git a/src/lib/types/IconType.ts b/src/lib/types/IconType.ts
index b179c6c..3689887 100644
--- a/src/lib/types/IconType.ts
+++ b/src/lib/types/IconType.ts
@@ -9,5 +9,7 @@ export enum IconType {
Template = 'template', // https://api.iconify.design/octicon:stack-24.svg
Invite = 'invite', // https://api.iconify.design/iconamoon:send-light.svg
Shared = 'shared', // https://api.iconify.design/iconamoon:link-light.svg
- Drag = 'drag' // https://api.iconify.design/material-symbols:drag-handle-rounded.svg
+ Drag = 'drag', // https://api.iconify.design/material-symbols:drag-handle-rounded.svg
+ Accept = 'accept', // https://api.iconify.design/iconamoon:check-light.svg
+ Decline = 'decline' // https://api.iconify.design/iconamoon:close-light.svg
}
diff --git a/src/lib/types/InvitationState.ts b/src/lib/types/InvitationState.ts
new file mode 100644
index 0000000..cbf0a68
--- /dev/null
+++ b/src/lib/types/InvitationState.ts
@@ -0,0 +1,5 @@
+export enum InvitationState {
+ Pending = 'Pending',
+ Accepted = 'Accepted',
+ Declined = 'Declined'
+}
diff --git a/src/routes/categories/+page.server.ts b/src/routes/categories/+page.server.ts
index 98e97e1..e03b92a 100644
--- a/src/routes/categories/+page.server.ts
+++ b/src/routes/categories/+page.server.ts
@@ -1,4 +1,4 @@
-import { getCategoriesQuery } from '$lib/pocketbase';
+import { getMyCategoriesQuery } from '$lib/pocketbase';
import { redirect, type Actions } from '@sveltejs/kit';
export const load = ({ locals }) => {
@@ -8,7 +8,7 @@ export const load = ({ locals }) => {
const getCategories = async () => {
try {
- const categories = getCategoriesQuery();
+ const categories = getMyCategoriesQuery();
return categories;
} catch (err) {
console.error(err);
diff --git a/src/routes/lists/+page.server.ts b/src/routes/lists/+page.server.ts
index f56fa1b..d28084b 100644
--- a/src/routes/lists/+page.server.ts
+++ b/src/routes/lists/+page.server.ts
@@ -1,5 +1,6 @@
-import { getListsQuery } from '$lib/pocketbase';
-import { redirect } from '@sveltejs/kit';
+import { getInvitationsQuery, getListsQuery, updateInvitationStateQuery } from '$lib/pocketbase';
+import { InvitationState } from '$lib/types/InvitationState.js';
+import { redirect, type Actions } from '@sveltejs/kit';
export const load = ({ locals }) => {
if (!locals.pb.authStore.isValid) {
@@ -14,8 +15,42 @@ export const load = ({ locals }) => {
throw err;
}
};
+ const getInvitations = async () => {
+ try {
+ return await getInvitationsQuery();
+ } catch (err) {
+ console.error(err);
+ throw err;
+ }
+ };
return {
- lists: getLists()
+ lists: getLists(),
+ invitations: getInvitations()
};
};
+
+export const actions: Actions = {
+ acceptInvitation: async ({ request }) => {
+ const values = await request.formData();
+ const id = String(values.get('invitationId'));
+ try {
+ await updateInvitationStateQuery(id, InvitationState.Accepted);
+ } catch (e) {
+ console.error(e);
+ throw e;
+ }
+ return { success: true };
+ },
+ declineInvitation: async ({ request }) => {
+ const values = await request.formData();
+ const id = String(values.get('invitationId'));
+ try {
+ await updateInvitationStateQuery(id, InvitationState.Declined);
+ } catch (e) {
+ console.error(e);
+ throw e;
+ }
+ return { success: true };
+ }
+};
diff --git a/src/routes/lists/+page.svelte b/src/routes/lists/+page.svelte
index d1ecafe..e2e3c85 100644
--- a/src/routes/lists/+page.svelte
+++ b/src/routes/lists/+page.svelte
@@ -1,6 +1,6 @@
@@ -22,24 +30,96 @@
+
+ {#if list.owner === user?.id}
+