+
+
diff --git a/src/plugins/moment.ts b/src/plugins/moment.ts
index 2a8ed17..53551d1 100644
--- a/src/plugins/moment.ts
+++ b/src/plugins/moment.ts
@@ -11,7 +11,7 @@ export default defineNuxtPlugin((nuxtApp) => {
momentDurationFormatSetup(moment as any);
moment.locale(iso);
- nuxtApp.hook('i18n:localeSwitched', ({oldLocale, newLocale}) => {
+ nuxtApp.hook('i18n:localeSwitched', ({ oldLocale, newLocale }) => {
const iso = (locales.value as LocaleObject[]).find((l) => l.code === newLocale)?.iso;
moment.locale(iso);
});
diff --git a/src/stores/auth.ts b/src/stores/auth.ts
index dcea6f9..92873b0 100644
--- a/src/stores/auth.ts
+++ b/src/stores/auth.ts
@@ -6,7 +6,7 @@ import { useIndexStore } from '@/stores/index';
export const googleAuthProvider = new GoogleAuthProvider();
googleAuthProvider.setCustomParameters({
- prompt: 'select_account'
+ prompt: 'select_account',
});
export const useAuthStore = defineStore('auth', () => {
diff --git a/src/stores/index.ts b/src/stores/index.ts
index 556b13e..3fde8c8 100644
--- a/src/stores/index.ts
+++ b/src/stores/index.ts
@@ -7,6 +7,8 @@ import {
doc,
query,
orderBy,
+ arrayUnion,
+ arrayRemove,
where,
writeBatch,
getDoc,
@@ -22,7 +24,7 @@ const addDefaultFields = {
return {
created_at: serverTimestamp(),
...docData,
- }
+ };
},
fromFirestore: firestoreDefaultConverter.fromFirestore,
};
@@ -51,21 +53,45 @@ export const useIndexStore = defineStore('store', () => {
return $moment(selectedDay.value).endOf('week').format('YYYY-MM-DD');
});
const projects = useCollection
(
- computed(() => (authUser.value ? query(collection(db, 'projects'), where('user', '==', doc(db, 'users', authUser.value!.uid)), orderBy('created_at')) : null)),
+ computed(() =>
+ authUser.value
+ ? query(
+ collection(db, 'projects'),
+ where('user', '==', doc(db, 'users', authUser.value!.uid)),
+ orderBy('created_at'),
+ )
+ : null,
+ ),
{
wait: true,
ssrKey: 'projects',
},
);
const bookmarks = useCollection(
- computed(() => (authUser.value ? query(collection(db, 'bookmarks'), where('user', '==', doc(db, 'users', authUser.value!.uid)), orderBy('created_at')) : null)),
+ computed(() =>
+ authUser.value
+ ? query(
+ collection(db, 'bookmarks'),
+ where('user', '==', doc(db, 'users', authUser.value!.uid)),
+ orderBy('created_at'),
+ )
+ : null,
+ ),
{
wait: true,
ssrKey: 'bookmarks',
},
);
const priorities = useCollection(
- computed(() => (user.value ? query(collection(db, 'priorities'), where('user', '==', doc(db, 'users', authUser.value!.uid)), orderBy('created_at')) : null)),
+ computed(() =>
+ user.value
+ ? query(
+ collection(db, 'priorities'),
+ where('user', '==', doc(db, 'users', authUser.value!.uid)),
+ orderBy('created_at'),
+ )
+ : null,
+ ),
{
wait: true,
ssrKey: 'priorities',
@@ -185,11 +211,20 @@ export const useIndexStore = defineStore('store', () => {
return p;
});
async function addPriority(name: string) {
- await addDoc(collection(db, 'priorities').withConverter(addDefaultFields), {
+ const newDoc = await addDoc(collection(db, 'priorities').withConverter(addDefaultFields), {
name,
completed: false,
user: doc(db, 'users', authUser.value!.uid),
});
+ await updateDoc(doc(db, 'users', authUser.value!.uid), {
+ priorities: arrayUnion(newDoc),
+ });
+ }
+ async function reorderPriorities(priorities: Priority[]) {
+ const prioritiesRef = priorities.map((priority: Priority) => doc(db, 'priorities', priority.id));
+ await updateDoc(doc(db, 'users', authUser.value!.uid), {
+ priorities: prioritiesRef,
+ });
}
async function updatePriority(priority: Priority) {
await updateDoc(doc(db, 'priorities', priority.id), {
@@ -199,7 +234,12 @@ export const useIndexStore = defineStore('store', () => {
}
async function deletePriority(priority: Priority, force = false) {
if (force || confirm(t('Êtes vous certain de vouloir supprimer cette priorité ?'))) {
- await deleteDoc(doc(db, 'priorities', priority.id));
+ const docRef = doc(db, 'priorities', priority.id);
+
+ await updateDoc(doc(db, 'users', authUser.value!.uid), {
+ priorities: arrayRemove(docRef),
+ });
+ await deleteDoc(docRef);
}
}
function deleteCompletedPriorities() {
@@ -311,21 +351,34 @@ export const useIndexStore = defineStore('store', () => {
}
async function addBookmark(bookmark: Bookmark) {
const addhttp = (url: string) => {
- if (!/^(?:f|ht)tps?\:\/\//.test(url)) {
- url = "https://" + url;
+ if (!/^(?:f|ht)tps?:\/\//.test(url)) {
+ url = 'https://' + url;
}
return url;
- }
-
- await addDoc(collection(db, 'bookmarks').withConverter(addDefaultFields), {
+ };
+ const newDoc = await addDoc(collection(db, 'bookmarks').withConverter(addDefaultFields), {
...bookmark,
url: addhttp(bookmark.url),
- user: authUser.value!.uid,
+ user: doc(db, 'users', authUser.value!.uid),
+ });
+ await updateDoc(doc(db, 'users', authUser.value!.uid), {
+ bookmarks: arrayUnion(newDoc),
+ });
+ }
+ async function reorderBookmarks(bookmarks: Bookmark[]) {
+ const bookmarksRef = bookmarks.map((bookmark: Bookmark) => doc(db, 'bookmarks', bookmark.id));
+ await updateDoc(doc(db, 'users', authUser.value!.uid), {
+ bookmarks: bookmarksRef,
});
}
async function deleteBookmark(bookmark: Bookmark, force = false) {
if (force || confirm(t('Êtes vous certain de vouloir supprimer ce raccourci ?'))) {
- await deleteDoc(doc(db, 'bookmarks', bookmark.id));
+ const docRef = doc(db, 'bookmarks', bookmark.id);
+
+ await updateDoc(doc(db, 'users', authUser.value!.uid), {
+ bookmarks: arrayRemove(docRef),
+ });
+ await deleteDoc(docRef);
}
}
async function createUserInfo(result: UserCredential) {
@@ -340,7 +393,7 @@ export const useIndexStore = defineStore('store', () => {
display_name: result.user.displayName,
email: result.user.email,
photo_url: result.user.photoURL,
- })
+ });
}
async function updateWeekTarget(weekly_target: string) {
await updateDoc(doc(db, 'users', authUser.value!.uid), {
@@ -390,10 +443,12 @@ export const useIndexStore = defineStore('store', () => {
addProject,
deleteProject,
addPriority,
+ reorderPriorities,
updatePriority,
deletePriority,
deleteCompletedPriorities,
addBookmark,
+ reorderBookmarks,
deleteBookmark,
createUserInfo,
updateWeekTarget,
diff --git a/src/types/index.d.ts b/src/types/index.d.ts
index 8b7ac74..28c32e3 100644
--- a/src/types/index.d.ts
+++ b/src/types/index.d.ts
@@ -46,4 +46,6 @@ type User = {
email: string;
photo_url: string;
weekly_target: string;
-}
+ bookmarks: Bookmark[];
+ priorities: Priority[];
+};
diff --git a/yarn.lock b/yarn.lock
index ef8e18d..309573a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6292,6 +6292,11 @@ smob@^1.0.0:
resolved "https://registry.yarnpkg.com/smob/-/smob-1.5.0.tgz#85d79a1403abf128d24d3ebc1cdc5e1a9548d3ab"
integrity sha512-g6T+p7QO8npa+/hNx9ohv1E5pVCmWrVCUzUXJyLdMmftX6ER0oiWY/w9knEonLpnOp6b6FenKnMfR8gqwWdwig==
+sortablejs@1.14.0:
+ version "1.14.0"
+ resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.14.0.tgz#6d2e17ccbdb25f464734df621d4f35d4ab35b3d8"
+ integrity sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==
+
source-map-js@^1.0.1, source-map-js@^1.0.2, source-map-js@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
@@ -7061,11 +7066,6 @@ vue-devtools-stub@^0.1.0:
resolved "https://registry.yarnpkg.com/vue-devtools-stub/-/vue-devtools-stub-0.1.0.tgz#a65b9485edecd4273cedcb8102c739b83add2c81"
integrity sha512-RutnB7X8c5hjq39NceArgXg28WZtZpGc3+J16ljMiYnFhKvd8hITxSWQSQ5bvldxMDU6gG5mkxl1MTQLXckVSQ==
-vue-draggable-next@^2.1.1:
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/vue-draggable-next/-/vue-draggable-next-2.2.1.tgz#adbe98c74610cca8f4eb63f92042681f96920451"
- integrity sha512-EAMS1IRHF0kZO0o5PMOinsQsXIqsrKT1hKmbICxG3UEtn7zLFkLxlAtajcCcUTisNvQ6TtCB5COjD9a1raNADw==
-
vue-eslint-parser@^9.1.0, vue-eslint-parser@^9.4.3:
version "9.4.3"
resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-9.4.3.tgz#9b04b22c71401f1e8bca9be7c3e3416a4bde76a8"
@@ -7106,6 +7106,13 @@ vue@^3.4.32:
"@vue/server-renderer" "3.4.34"
"@vue/shared" "3.4.34"
+vuedraggable@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/vuedraggable/-/vuedraggable-4.1.0.tgz#edece68adb8a4d9e06accff9dfc9040e66852270"
+ integrity sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==
+ dependencies:
+ sortablejs "1.14.0"
+
vuefire@^3.1.17:
version "3.1.24"
resolved "https://registry.yarnpkg.com/vuefire/-/vuefire-3.1.24.tgz#982e0405a393239e7eccbbdeb08ec8ec90b34181"