Anaru/Roesstad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Update Firebase SDK to 10.14.1 and clarify initial focus person selection logic.

Browse source
This commit is contained in:
Eivind Røsstad Skeie 2025-11-25 11:41:28 +01:00
parent f88286c720
commit c9870f0a0b
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Script.js
View file

@ -1,6 +1,6 @@
import { initializeApp } from "https://www.gstatic.com/firebasejs/12.6.0/firebase-app.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/12.6.0/firebase-auth.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/12.6.0/firebase-firestore.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"; import { firebaseConfig } from "./config.js";
// --- INIT --- // --- INIT ---
@ -48,7 +48,7 @@ function startDataListener() {
// Hvis vi ikke har valgt en person å fokusere på ennå: // Hvis vi ikke har valgt en person å fokusere på ennå:
if (!focusPersonId && people.length > 0) { 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')); const me = people.find(p => p.name && (p.name.toLowerCase().includes('eivind') || p.name.toLowerCase() === 'meg'));
focusPersonId = me ? me.id : people[0].id; focusPersonId = me ? me.id : people[0].id;
} }

12
login.js
View file

@ -1,5 +1,5 @@
import { initializeApp } from "https://www.gstatic.com/firebasejs/12.6.0/firebase-app.js"; import { initializeApp } from "https://www.gstatic.com/firebasejs/10.14.1/firebase-app.js";
import { getAuth, signInWithEmailAndPassword } from "https://www.gstatic.com/firebasejs/12.6.0/firebase-auth.js"; import { getAuth, signInWithEmailAndPassword } from "https://www.gstatic.com/firebasejs/10.14.1/firebase-auth.js";
import { firebaseConfig } from "./config.js"; import { firebaseConfig } from "./config.js";
// Init // Init
@ -14,7 +14,7 @@ if (loginBtn) {
const email = document.getElementById('inp-email').value; const email = document.getElementById('inp-email').value;
const password = document.getElementById('inp-password').value; const password = document.getElementById('inp-password').value;
const msg = document.getElementById('error-msg'); const msg = document.getElementById('error-msg');
// Enkel sjekk at feltene ikke er tomme // Enkel sjekk at feltene ikke er tomme
if (!email || !password) { if (!email || !password) {
msg.textContent = "Du må skrive inn både e-post og passord."; msg.textContent = "Du må skrive inn både e-post og passord.";
@ -23,14 +23,14 @@ if (loginBtn) {
loginBtn.textContent = "Sjekker..."; loginBtn.textContent = "Sjekker...";
msg.textContent = ""; msg.textContent = "";
try { try {
// Prøver å logge inn med e-post og passord // Prøver å logge inn med e-post og passord
await signInWithEmailAndPassword(auth, email, password); await signInWithEmailAndPassword(auth, email, password);
// Suksess -> Gå til hovedsiden // Suksess -> Gå til hovedsiden
window.location.href = "Røsstad.html"; window.location.href = "Røsstad.html";
} catch (error) { } catch (error) {
console.error(error); console.error(error);
// Gi en forståelig feilmelding // Gi en forståelig feilmelding