update commit message
This commit is contained in:
+31
-11
@@ -58,14 +58,29 @@
|
||||
}
|
||||
}
|
||||
|
||||
function setNowTarotVisibility(imageEl, labelEl, visible) {
|
||||
if (imageEl) {
|
||||
imageEl.hidden = !visible;
|
||||
}
|
||||
|
||||
if (labelEl) {
|
||||
labelEl.hidden = !visible;
|
||||
}
|
||||
}
|
||||
|
||||
function applyNowSnapshot(elements, snapshot, timeFormat) {
|
||||
const timestamp = snapshot?.timestamp ? new Date(snapshot.timestamp) : new Date();
|
||||
const dayKey = String(snapshot?.dayKey || getDateKey(timestamp));
|
||||
const currentHour = snapshot?.currentHour || null;
|
||||
const tarotAccessEnabled = window.TarotAppConfig?.hasTarotAccess?.() === true;
|
||||
|
||||
setNowTarotVisibility(elements.nowHourCardEl, elements.nowHourTarotEl, tarotAccessEnabled);
|
||||
setNowTarotVisibility(elements.nowMoonCardEl, elements.nowMoonTarotEl, tarotAccessEnabled);
|
||||
setNowTarotVisibility(elements.nowDecanCardEl, elements.nowDecanTarotEl, tarotAccessEnabled);
|
||||
|
||||
if (currentHour?.planet) {
|
||||
elements.nowHourEl.textContent = `${currentHour.planet.symbol} ${currentHour.planet.name}`;
|
||||
if (elements.nowHourTarotEl) {
|
||||
if (tarotAccessEnabled && elements.nowHourTarotEl) {
|
||||
const hourCardName = currentHour.planet?.tarot?.majorArcana || "";
|
||||
const hourTrumpNumber = currentHour.planet?.tarot?.number;
|
||||
elements.nowHourTarotEl.textContent = hourCardName
|
||||
@@ -84,7 +99,7 @@
|
||||
|
||||
nowUiHelpers.setNowCardImage(
|
||||
elements.nowHourCardEl,
|
||||
currentHour.planet?.tarot?.majorArcana,
|
||||
tarotAccessEnabled ? currentHour.planet?.tarot?.majorArcana : null,
|
||||
"Current planetary hour card",
|
||||
currentHour.planet?.tarot?.number
|
||||
);
|
||||
@@ -92,7 +107,7 @@
|
||||
elements.nowHourEl.textContent = "--";
|
||||
elements.nowCountdownEl.textContent = "--";
|
||||
if (elements.nowHourTarotEl) {
|
||||
elements.nowHourTarotEl.textContent = "--";
|
||||
elements.nowHourTarotEl.textContent = tarotAccessEnabled ? "--" : "";
|
||||
}
|
||||
if (elements.nowHourNextEl) {
|
||||
elements.nowHourNextEl.textContent = "> --";
|
||||
@@ -106,12 +121,12 @@
|
||||
elements.nowMoonEl.textContent = moon
|
||||
? `${moon.phase} (${Math.round(illuminationFraction * 100)}%)`
|
||||
: "--";
|
||||
elements.nowMoonTarotEl.textContent = moon
|
||||
? nowUiHelpers.getDisplayTarotName(moonTarot, moon?.tarot?.number)
|
||||
: "--";
|
||||
elements.nowMoonTarotEl.textContent = tarotAccessEnabled
|
||||
? (moon ? nowUiHelpers.getDisplayTarotName(moonTarot, moon?.tarot?.number) : "--")
|
||||
: "";
|
||||
nowUiHelpers.setNowCardImage(
|
||||
elements.nowMoonCardEl,
|
||||
moon?.tarot?.majorArcana,
|
||||
tarotAccessEnabled ? moon?.tarot?.majorArcana : null,
|
||||
"Current moon phase card",
|
||||
moon?.tarot?.number
|
||||
);
|
||||
@@ -140,12 +155,14 @@
|
||||
? Number(decanInfo.signDegree).toFixed(1)
|
||||
: "0.0";
|
||||
|
||||
elements.nowDecanEl.textContent = `${decanInfo.sign.symbol} ${decanInfo.sign.name} · ${signMajorName} (${signDegree}°)`;
|
||||
elements.nowDecanEl.textContent = tarotAccessEnabled
|
||||
? `${decanInfo.sign.symbol} ${decanInfo.sign.name} · ${signMajorName} (${signDegree}°)`
|
||||
: `${decanInfo.sign.symbol} ${decanInfo.sign.name} (${signDegree}°)`;
|
||||
|
||||
if (decanInfo.decan?.tarotMinorArcana) {
|
||||
if (tarotAccessEnabled && decanInfo.decan?.tarotMinorArcana) {
|
||||
elements.nowDecanTarotEl.textContent = nowUiHelpers.getDisplayTarotName(decanInfo.decan.tarotMinorArcana);
|
||||
nowUiHelpers.setNowCardImage(elements.nowDecanCardEl, decanInfo.decan.tarotMinorArcana, "Current decan card");
|
||||
} else {
|
||||
} else if (tarotAccessEnabled) {
|
||||
const signTarotName = decanInfo.sign?.tarot?.majorArcana || "--";
|
||||
elements.nowDecanTarotEl.textContent = signTarotName === "--"
|
||||
? "--"
|
||||
@@ -156,6 +173,9 @@
|
||||
"Current decan card",
|
||||
decanInfo.sign?.tarot?.number
|
||||
);
|
||||
} else {
|
||||
elements.nowDecanTarotEl.textContent = "";
|
||||
nowUiHelpers.setNowCardImage(elements.nowDecanCardEl, null, "Current decan card");
|
||||
}
|
||||
|
||||
if (elements.nowDecanCountdownEl) {
|
||||
@@ -173,7 +193,7 @@
|
||||
}
|
||||
} else {
|
||||
elements.nowDecanEl.textContent = "--";
|
||||
elements.nowDecanTarotEl.textContent = "--";
|
||||
elements.nowDecanTarotEl.textContent = tarotAccessEnabled ? "--" : "";
|
||||
nowUiHelpers.setNowCardImage(elements.nowDecanCardEl, null, "Current decan card");
|
||||
if (elements.nowDecanCountdownEl) {
|
||||
elements.nowDecanCountdownEl.textContent = "--";
|
||||
|
||||
Reference in New Issue
Block a user