From 28b057b937865dfa6f1b492027c59c494c768d0e Mon Sep 17 00:00:00 2001 From: Paulius Juzenas <59730296+Paulijuz@users.noreply.github.com> Date: Tue, 27 Feb 2024 17:59:58 +0100 Subject: [PATCH] replace eng with norsk for navn --- public/js/page.js | 2 +- public/live_view.html | 4 ++-- public/templates/auctionitems.html | 4 ++-- public/templates/live_view.html | 2 +- public/templates/viewAuctionItem.html | 2 +- public/users-test.html | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/public/js/page.js b/public/js/page.js index 4636356..8369647 100644 --- a/public/js/page.js +++ b/public/js/page.js @@ -22,7 +22,7 @@ export default function Page() { diff --git a/public/live_view.html b/public/live_view.html index a0cc74b..65d9341 100644 --- a/public/live_view.html +++ b/public/live_view.html @@ -127,7 +127,7 @@

Omegaauctionen

if (auctionItemDoc.data().fixedPrice) { for (const buyer of auctionItemDoc.data().buyers) { let user = await usersRef.doc(buyer).get(); - const fullName = `${user.data().firstname} ${user.data().lastname}`; + const fullName = `${user.data().fornavn} ${user.data().etternavn}`; spenders[fullName] = (spenders[fullName] || 0) + auctionItemDoc.data().currentPrice; total += auctionItemDoc.data().currentPrice; @@ -137,7 +137,7 @@

Omegaauctionen

const userDoc = await usersRef.doc(auctionItemDoc.data().highestBidder).get(); if (userDoc.exists) { - const fullName = `${userDoc.data().firstname} ${userDoc.data().lastname}`; + const fullName = `${userDoc.data().fornavn} ${userDoc.data().etternavn}`; spenders[fullName] = (spenders[fullName] || 0) + auctionItemDoc.data().currentPrice; total += auctionItemDoc.data().currentPrice; diff --git a/public/templates/auctionitems.html b/public/templates/auctionitems.html index 9bbaa57..6c45c67 100644 --- a/public/templates/auctionitems.html +++ b/public/templates/auctionitems.html @@ -116,9 +116,9 @@

AUKSJONSOBJEKTER

if (doc.exists) { const currBidTitle = document.createElement("h5"); currBidTitle.textContent = "Høyeste bud"; - const firstname = doc.data().firstname; + const firstname = doc.data().fornavn; const bidderName = document.createElement("small"); - bidderName.textContent = doc.data().firstname + " " + doc.data().lastname; + bidderName.textContent = doc.data().fornavn + " " + doc.data().etternavn; cardBody.appendChild(currBidTitle); cardBody.appendChild(bidderName); cardBody.appendChild(currentPrice); diff --git a/public/templates/live_view.html b/public/templates/live_view.html index e5f72b4..f87b5b4 100644 --- a/public/templates/live_view.html +++ b/public/templates/live_view.html @@ -131,7 +131,7 @@

Omegaauctionen

const userDoc = await usersRef.doc(auctionItemDoc.data().highestBidder).get(); if (userDoc.exists) { - const fullName = `${userDoc.data().firstname} ${userDoc.data().lastname}`; + const fullName = `${userDoc.data().fornavn} ${userDoc.data().etternavn}`; if (spenders[fullName] === undefined) { spenders[fullName] = auctionItemDoc.data().currentPrice; diff --git a/public/templates/viewAuctionItem.html b/public/templates/viewAuctionItem.html index 4e37028..eb4fb34 100644 --- a/public/templates/viewAuctionItem.html +++ b/public/templates/viewAuctionItem.html @@ -135,7 +135,7 @@

Registrer deg her!

// }); return db.collection("users").doc(user.uid).set({ - firstname, - lastmame, + fornavn: firstname, + etternavn: lastmame, email, grade });