-
+{#if menuOpen}
+
+{/if}
+
diff --git a/src/lib/layout/selection.svelte.js b/src/lib/layout/selection.svelte.js
index c6a0d7f..39524f8 100644
--- a/src/lib/layout/selection.svelte.js
+++ b/src/lib/layout/selection.svelte.js
@@ -1,18 +1,46 @@
+import { db } from '../firebase.js';
+import { doc, onSnapshot, updateDoc, arrayUnion, arrayRemove } from 'firebase/firestore';
+
let selected = $state(new Set());
let totalCountries = $state(0);
+let _uid = null;
+let _unsubscribe = null;
+
+export function initSelectionListener(uid) {
+ if (_unsubscribe) _unsubscribe();
+ _uid = uid;
+ const userRef = doc(db, 'users', uid);
+ _unsubscribe = onSnapshot(userRef, (snap) => {
+ if (snap.exists()) {
+ const codes = snap.data().visitedCountries || [];
+ selected = new Set(codes);
+ }
+ });
+}
export function toggle(id) {
+ if (!_uid) return;
+ const was = selected.has(id);
const next = new Set(selected);
- if (next.has(id)) {
+ if (was) {
next.delete(id);
} else {
next.add(id);
}
selected = next;
+ const userRef = doc(db, 'users', _uid);
+ if (was) {
+ updateDoc(userRef, { visitedCountries: arrayRemove(id) });
+ } else {
+ updateDoc(userRef, { visitedCountries: arrayUnion(id) });
+ }
}
export function clearAll() {
+ if (!_uid) return;
selected = new Set();
+ const userRef = doc(db, 'users', _uid);
+ updateDoc(userRef, { visitedCountries: [] });
}
export function getSelected() {
-
+ {#if screen === 'worldmap'}
+
- {:else}
-
+ Loading...
+
+{:else}
+
+
-
+
+
+
diff --git a/src/lib/auth/userStore.svelte.js b/src/lib/auth/userStore.svelte.js
new file mode 100644
index 0000000..329967b
--- /dev/null
+++ b/src/lib/auth/userStore.svelte.js
@@ -0,0 +1,72 @@
+import { auth, db, googleProvider } from '../firebase.js';
+import { onAuthStateChanged, signInWithPopup, signOut as fbSignOut } from 'firebase/auth';
+import { doc, getDoc, setDoc, serverTimestamp } from 'firebase/firestore';
+import { initSelectionListener } from '../layout/selection.svelte.js';
+import { initEntriesListener } from '../stores/entriesStore.svelte.js';
+
+let _initialized = false;
+
+let user = $state(null);
+let userProfile = $state(null);
+let loading = $state(true);
+let needsCountry = $state(false);
+
+export function getUser() { return user; }
+export function getUserProfile() { return userProfile; }
+export function getLoading() { return loading; }
+export function getNeedsCountry() { return needsCountry; }
+
+export async function signInWithGoogle() {
+ await signInWithPopup(auth, googleProvider);
+}
+
+export async function signOut() {
+ await fbSignOut(auth);
+ user = null;
+ userProfile = null;
+ needsCountry = false;
+}
+
+export async function setHomeCountry(country) {
+ if (!user) return;
+ await setDoc(doc(db, 'users', user.uid), {
+ displayName: user.displayName,
+ photoURL: user.photoURL,
+ email: user.email,
+ homeCountry: country,
+ visitedCountries: [],
+ createdAt: serverTimestamp(),
+ });
+ userProfile = { ...userProfile, homeCountry: country, visitedCountries: [] };
+ needsCountry = false;
+}
+
+export function initAuth() {
+ if (_initialized) return;
+ _initialized = true;
+ onAuthStateChanged(auth, async (fbUser) => {
+ if (fbUser) {
+ user = fbUser;
+ initSelectionListener(fbUser.uid);
+ initEntriesListener(fbUser.uid);
+ const docRef = doc(db, 'users', fbUser.uid);
+ const docSnap = await getDoc(docRef);
+ if (docSnap.exists()) {
+ userProfile = docSnap.data();
+ needsCountry = false;
+ } else {
+ userProfile = {
+ displayName: fbUser.displayName,
+ photoURL: fbUser.photoURL,
+ email: fbUser.email,
+ };
+ needsCountry = true;
+ }
+ } else {
+ user = null;
+ userProfile = null;
+ needsCountry = false;
+ }
+ loading = false;
+ });
+}
diff --git a/src/lib/firebase.js b/src/lib/firebase.js
new file mode 100644
index 0000000..758573c
--- /dev/null
+++ b/src/lib/firebase.js
@@ -0,0 +1,18 @@
+import { initializeApp } from "firebase/app";
+import { getAuth, GoogleAuthProvider } from "firebase/auth";
+import { getFirestore } from "firebase/firestore";
+
+const firebaseConfig = {
+ apiKey: import.meta.env.VITE_FIREBASE_API_KEY,
+ authDomain: import.meta.env.VITE_FIREBASE_AUTH_DOMAIN,
+ projectId: import.meta.env.VITE_FIREBASE_PROJECT_ID,
+ storageBucket: import.meta.env.VITE_FIREBASE_STORAGE_BUCKET,
+ messagingSenderId: import.meta.env.VITE_FIREBASE_MESSAGING_SENDER_ID,
+ appId: import.meta.env.VITE_FIREBASE_APP_ID,
+};
+
+const app = initializeApp(firebaseConfig);
+
+export const auth = getAuth(app);
+export const db = getFirestore(app);
+export const googleProvider = new GoogleAuthProvider();
diff --git a/src/lib/layout/TopBar.svelte b/src/lib/layout/TopBar.svelte
index f700cb7..e080f43 100644
--- a/src/lib/layout/TopBar.svelte
+++ b/src/lib/layout/TopBar.svelte
@@ -1,5 +1,21 @@
+ 
+
+
+ Map Journal
+Sign in to start your journey
+ +
- 
+ {#if user}
+
+ {#if user}
+
+
+ {#if menuOpen}
+
+ {/if}
+
+ {/if}