Skip to content

Commit

Permalink
If isDemo auction resets hourly (#31)
Browse files Browse the repository at this point in the history
  • Loading branch information
hmellor committed Apr 27, 2023
1 parent ce7f8d5 commit 69a3fdd
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 20 deletions.
24 changes: 19 additions & 5 deletions js/admin.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { db } from "./firebase.js";
import { getItems } from "./items.js";
import { getItems, isDemo } from "./items.js";
import { timeToString, dataListener } from "./auctions.js";
import {
doc,
Expand Down Expand Up @@ -52,16 +52,30 @@ function dataListenerCallback(data) {
// Remove winner name if auction was reset
row.children[4].innerText = "";
}
row.children[5].dataset.endTime = bids[0].endTime.toMillis();
if (isDemo) {
// Make sure some items always appear active for the demo
let now = new Date();
let endTime = bids[0].endTime.toDate();
endTime.setHours(now.getHours());
endTime.setDate(now.getDate());
endTime.setMonth(now.getMonth());
endTime.setFullYear(now.getFullYear());
row.children[5].dataset.endTime = endTime.getTime();
} else {
row.children[5].dataset.endTime = bids[0].endTime.toMillis();
}
}
}

function setClocks() {
let now = new Date().getTime();
document.querySelectorAll("tbody > tr").forEach((row) => {
row.children[5].innerText = timeToString(
row.children[5].dataset.endTime - now
);
let timeLeft = row.children[5];
if (timeLeft.dataset.endTime < now) {
timeLeft.innerHTML = "Item Ended";
} else {
timeLeft.innerText = timeToString(timeLeft.dataset.endTime - now);
}
});
}

Expand Down
17 changes: 14 additions & 3 deletions js/auctions.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { db } from "./firebase.js";
import { getItems } from "./items.js";
import { isDemo } from "./items.js";
import {
doc,
onSnapshot,
Expand Down Expand Up @@ -30,7 +30,7 @@ function setClocks() {
let timeLeft = card.querySelector(".time-left");
// disable bidding on finished auctions
if (card.dataset.endTime < now) {
timeLeft.innerHTML = "Auction Complete";
timeLeft.innerHTML = "Item Ended";
card.querySelector(".btn-primary").setAttribute("disabled", "");
} else {
timeLeft.innerHTML = timeToString(card.dataset.endTime - now);
Expand Down Expand Up @@ -149,7 +149,18 @@ function dataListenerCallback(data) {
bidCount != 1 ? "s" : ""
}]`;
// Update everything else
card.dataset.endTime = item.endTime.toMillis();
if (isDemo) {
// Make sure some items always appear active for the demo
let now = new Date();
let endTime = item.endTime.toDate();
endTime.setHours(now.getHours());
endTime.setDate(now.getDate());
endTime.setMonth(now.getMonth());
endTime.setFullYear(now.getFullYear());
card.dataset.endTime = endTime.getTime();
} else {
card.dataset.endTime = item.endTime.toMillis();
}
card.querySelector(".card-img-top").src = item.primaryImage;
card.querySelector(".title").innerText = item.title;
card.querySelector(".card-subtitle").innerText = item.subtitle;
Expand Down
24 changes: 12 additions & 12 deletions js/items.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ let items = [
detail: "",
secondaryImage: "",
amount: 55,
endTime: "2023-04-25T10:00:00+00:00",
endTime: "2023-04-25T00:00:00+00:00",
},
{
primaryImage: "",
Expand All @@ -19,7 +19,7 @@ let items = [
detail: "",
secondaryImage: "",
amount: 60,
endTime: "2023-04-25T11:00:00+00:00",
endTime: "2023-04-25T00:05:00+00:00",
},
{
primaryImage: "",
Expand All @@ -28,7 +28,7 @@ let items = [
detail: "",
secondaryImage: "",
amount: 20,
endTime: "2023-04-25T12:00:00+00:00",
endTime: "2023-04-25T00:10:00+00:00",
},
{
rimaryImage: "",
Expand All @@ -37,7 +37,7 @@ let items = [
detail: "",
secondaryImage: "",
amount: 0,
endTime: "2023-04-25T13:00:00+00:00",
endTime: "2023-04-25T00:15:00+00:00",
},
{
primaryImage: "",
Expand All @@ -46,7 +46,7 @@ let items = [
detail: "",
secondaryImage: "",
amount: 4,
endTime: "2023-04-25T14:00:00+00:00",
endTime: "2023-04-25T00:20:00+00:00",
},
{
primaryImage: "",
Expand All @@ -55,7 +55,7 @@ let items = [
detail: "",
secondaryImage: "",
amount: 0,
endTime: "2023-04-25T15:00:00+00:00",
endTime: "2023-04-25T00:25:00+00:00",
},
{
primaryImage: "",
Expand All @@ -64,7 +64,7 @@ let items = [
detail: "",
secondaryImage: "",
amount: 99,
endTime: "2023-04-25T16:00:00+00:00",
endTime: "2023-04-25T00:30:00+00:00",
},
{
primaryImage: "",
Expand All @@ -73,7 +73,7 @@ let items = [
detail: "",
secondaryImage: "",
amount: 0,
endTime: "2023-04-25T17:00:00+00:00",
endTime: "2023-04-25T00:35:00+00:00",
},
{
primaryImage: "",
Expand All @@ -82,7 +82,7 @@ let items = [
detail: "",
secondaryImage: "",
amount: 12,
endTime: "2023-04-25T18:00:00+00:00",
endTime: "2023-04-25T00:40:00+00:00",
},
{
primaryImage: "",
Expand All @@ -91,7 +91,7 @@ let items = [
detail: "",
secondaryImage: "",
amount: 6,
endTime: "2023-04-25T19:00:00+00:00",
endTime: "2023-04-25T00:45:00+00:00",
},
{
primaryImage: "",
Expand All @@ -100,7 +100,7 @@ let items = [
detail: "",
secondaryImage: "",
amount: 3,
endTime: "2023-04-25T20:00:00+00:00",
endTime: "2023-04-25T00:50:00+00:00",
},
{
primaryImage: "",
Expand All @@ -109,7 +109,7 @@ let items = [
detail: "",
secondaryImage: "",
amount: 7,
endTime: "2023-04-25T21:00:00+00:00",
endTime: "2023-04-25T00:55:00+00:00",
},
];

Expand Down

0 comments on commit 69a3fdd

Please sign in to comment.