diff --git a/Script.js b/Script.js index 65b5c8d..4e5b92f 100644 --- a/Script.js +++ b/Script.js @@ -1,6 +1,6 @@ -import { initializeApp } from "https://www.gstatic.com/firebasejs/12.6.0/firebase-app.js"; -import { getAuth, onAuthStateChanged, signOut } from "https://www.gstatic.com/firebasejs/12.6.0/firebase-auth.js"; -import { getFirestore, collection, addDoc, updateDoc, doc, onSnapshot, query } from "https://www.gstatic.com/firebasejs/12.6.0/firebase-firestore.js"; +import { initializeApp } from "https://www.gstatic.com/firebasejs/10.14.1/firebase-app.js"; +import { getAuth, onAuthStateChanged, signOut } from "https://www.gstatic.com/firebasejs/10.14.1/firebase-auth.js"; +import { getFirestore, collection, addDoc, updateDoc, doc, onSnapshot, query } from "https://www.gstatic.com/firebasejs/10.14.1/firebase-firestore.js"; import { firebaseConfig } from "./config.js"; // --- INIT --- @@ -48,7 +48,7 @@ function startDataListener() { // Hvis vi ikke har valgt en person å fokusere på ennå: if (!focusPersonId && people.length > 0) { - // Prøv å finne "Eivind" eller "Meg" som startperson + // Prøv å finne "Eivind" eller "Meg" som startperson, ellers ta den første const me = people.find(p => p.name && (p.name.toLowerCase().includes('eivind') || p.name.toLowerCase() === 'meg')); focusPersonId = me ? me.id : people[0].id; } diff --git a/login.js b/login.js index a8ec72a..f2a2507 100644 --- a/login.js +++ b/login.js @@ -1,5 +1,5 @@ -import { initializeApp } from "https://www.gstatic.com/firebasejs/12.6.0/firebase-app.js"; -import { getAuth, signInWithEmailAndPassword } from "https://www.gstatic.com/firebasejs/12.6.0/firebase-auth.js"; +import { initializeApp } from "https://www.gstatic.com/firebasejs/10.14.1/firebase-app.js"; +import { getAuth, signInWithEmailAndPassword } from "https://www.gstatic.com/firebasejs/10.14.1/firebase-auth.js"; import { firebaseConfig } from "./config.js"; // Init @@ -14,7 +14,7 @@ if (loginBtn) { const email = document.getElementById('inp-email').value; const password = document.getElementById('inp-password').value; const msg = document.getElementById('error-msg'); - + // Enkel sjekk at feltene ikke er tomme if (!email || !password) { msg.textContent = "Du må skrive inn både e-post og passord."; @@ -23,14 +23,14 @@ if (loginBtn) { loginBtn.textContent = "Sjekker..."; msg.textContent = ""; - + try { // Prøver å logge inn med e-post og passord await signInWithEmailAndPassword(auth, email, password); - + // Suksess -> Gå til hovedsiden window.location.href = "Røsstad.html"; - + } catch (error) { console.error(error); // Gi en forståelig feilmelding