From 25f11a77cbee3e4a87b7c96d5bb5bf97a9b40aad Mon Sep 17 00:00:00 2001 From: tobiichi3227 Date: Sun, 7 Apr 2024 13:30:27 +0800 Subject: [PATCH 01/98] feat: copy result image for sharing Close #15 --- fortune_generator/index.html | 2 ++ fortune_generator/js/fortune.js | 20 +++++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/fortune_generator/index.html b/fortune_generator/index.html index 45cc805..f7c4100 100644 --- a/fortune_generator/index.html +++ b/fortune_generator/index.html @@ -12,6 +12,7 @@ + + + + + + + + Daily Fortune Generator + + + + + + + + - - - - - - -
-
-

-
- -
+ + + + + + +
-
-

+

+
+ +
+
+
+

+
+
+

+
+
+

+
-
-

+
+
+

+
-
-

+
+

+
+
+

-
-
-

+ + +
+
+

+
+
+
+
+

+
+
+

+
+
+
+
+

+
+
+

+
+
+
+
+
+
+

+
+
+

+
+
+
+
+

+
+
+

+
+
+ +
-

-
-
-

+ + +
- - -
-
-

-
-
-
-
-

-
-
-

-
-
-
-
-

-
-
-

-
-
-
-
-
-
-

-
-
-

-
-
-
-
-

-
-
-

-
-
-
-
- -
- - - -
- -
- - - - - - + + + + + diff --git a/fortune_generator/js/fortune.js b/fortune_generator/js/fortune.js index 1bcc1db..8a79751 100644 --- a/fortune_generator/js/fortune.js +++ b/fortune_generator/js/fortune.js @@ -1,20 +1,19 @@ let ip = null; -fetch("https://api.ipify.org?format=json").then(response => { +fetch("https://api.ipify.org?format=json").then((response) => { if (response.ok) { return response.json(); } throw new Error("Network response was not ok."); -}).then(res => { +}).then((res) => { ip = res.ip; - -}).catch(_error => { - if ('caches' in window) { - caches.match('https://api.ipify.org?format=json').then(response => { +}).catch((_error) => { + if ("caches" in window) { + caches.match("https://api.ipify.org?format=json").then((response) => { if (response) { return response.json(); } - }).then(data => { + }).then((data) => { if (ip === null && data !== undefined) { ip = JSON.parse(data).ip; } @@ -22,7 +21,6 @@ fetch("https://api.ipify.org?format=json").then(response => { } }); - let goodFortunes = []; let badFortunes = []; let special_events = []; @@ -31,27 +29,61 @@ let fortune_generated = false; // using async and await to prevent fetching the data too late... async function fetch_data() { await fetch("./json/fortune.json") - .then(response => response.json()) - .then(data => { - goodFortunes = data.goodFortunes; - badFortunes = data.badFortunes; - }) + .then((response) => response.json()) + .then((data) => { + goodFortunes = data.goodFortunes; + badFortunes = data.badFortunes; + }); await fetch("./json/special.json") - .then(response => response.json()) - .then(data => { - special_events = data.special_events; - }) + .then((response) => response.json()) + .then((data) => { + special_events = data.special_events; + }); } -const textColorClass = ["good-fortune", "good-fortune", "good-fortune", "good-fortune", "good-fortune", "middle-fortune", "bad-fortune", "bad-fortune"]; -const fortuneStatus = ["大吉", "中吉", "小吉", "吉", "末吉", "中平", "凶", "大凶"]; -const chineseMonth = ["一", "二", "三", "四", "五", "六", "七", "八", "九", "十", "十一", "十二"]; -const week = ['日', '一', '二', '三', '四', '五', '六']; +const textColorClass = [ + "good-fortune", + "good-fortune", + "good-fortune", + "good-fortune", + "good-fortune", + "middle-fortune", + "bad-fortune", + "bad-fortune", +]; +const fortuneStatus = [ + "大吉", + "中吉", + "小吉", + "吉", + "末吉", + "中平", + "凶", + "大凶", +]; +const chineseMonth = [ + "一", + "二", + "三", + "四", + "五", + "六", + "七", + "八", + "九", + "十", + "十一", + "十二", +]; +const week = ["日", "一", "二", "三", "四", "五", "六"]; -const title = `今日運勢`; -const allGood = `萬事皆宜`; -const allBad = `諸事不宜`; +const title = + `今日運勢`; +const allGood = + `萬事皆宜`; +const allBad = + `諸事不宜`; // date const d = new Date(); @@ -63,7 +95,11 @@ const year = d.getFullYear(); function daysDiff(eventIndex) { // define the date right now and the special event date const startDate = new Date(year, month - 1, date); - const endDate = new Date(special_events[eventIndex].year, special_events[eventIndex].month - 1, special_events[eventIndex].date); + const endDate = new Date( + special_events[eventIndex].year, + special_events[eventIndex].month - 1, + special_events[eventIndex].date, + ); // calculate the difference in milliseconds and convert it to days const timeDiff = Math.ceil((endDate - startDate) / (1000 * 60 * 60 * 24)); @@ -71,15 +107,15 @@ function daysDiff(eventIndex) { } // pre-search jquery - save to a variable to improve performance -const J_l_1_event = $('#l-1-event'); -const J_l_1_desc = $('#l-1-desc'); -const J_l_2_event= $('#l-2-event'); -const J_l_2_desc = $('#l-2-desc'); -const J_r_1_event = $('#r-1-event'); -const J_r_1_desc = $('#r-1-desc'); -const J_r_2_event= $('#r-2-event'); -const J_r_2_desc = $('#r-2-desc'); -const J_ip_to_fortune = $('#ip-to-fortune'); +const J_l_1_event = $("#l-1-event"); +const J_l_1_desc = $("#l-1-desc"); +const J_l_2_event = $("#l-2-event"); +const J_l_2_desc = $("#l-2-desc"); +const J_r_1_event = $("#r-1-event"); +const J_r_1_desc = $("#r-1-desc"); +const J_r_2_event = $("#r-2-event"); +const J_r_2_desc = $("#r-2-desc"); +const J_ip_to_fortune = $("#ip-to-fortune"); let special = false; let special_events_index = 0; @@ -90,23 +126,34 @@ async function init_page() { await fetch_data(); // hide the elements of show fortune page - $('#result-page').hide(); + $("#result-page").hide(); // show date before button pressed - const showMonth = `${chineseMonth[month - 1] + "月"}`; - const showDate = `${("0" + date).slice(-2)}`; - const showDay = `${"星期" + week[day]}`; + const showMonth = + `${ + chineseMonth[month - 1] + "月" + }`; + const showDate = `${ + ("0" + date).slice(-2) + }`; + const showDay = + `${ + "星期" + week[day] + }`; + + $("#month").html(showMonth); + $("#date").html(showDate); + $("#weekday").html(showDay); - $('#month').html(showMonth); - $('#date').html(showDate); - $('#weekday').html(showDay); - const showSpecialEventCount = 2; let eventIndexPtr = 0, eventIndexList = Array(showSpecialEventCount).fill(-1); // check if there is special event today for (let i = 0; i < special_events.length; i++) { if (daysDiff(i) > 0) { - if (eventIndexPtr < showSpecialEventCount && eventIndexList[eventIndexPtr] == -1) { + if ( + eventIndexPtr < showSpecialEventCount && + eventIndexList[eventIndexPtr] == -1 + ) { eventIndexList[eventIndexPtr] = i; eventIndexPtr++; } @@ -119,23 +166,33 @@ async function init_page() { for (let eventIndex = 0; eventIndex < showSpecialEventCount; eventIndex++) { if (eventIndexList[eventIndex] != -1) { const days = daysDiff(eventIndexList[eventIndex]); - const upcoming_event = `距離${special_events[eventIndexList[eventIndex]].event}還剩${days}天`; - $(`#upcoming-event-${eventIndex + 1}`).html(upcoming_event) + const upcoming_event = + `距離${ + special_events[eventIndexList[eventIndex]].event + }還剩${days}天`; + $(`#upcoming-event-${eventIndex + 1}`).html(upcoming_event); } } // show special event if today is a special day if (special) { - const special_event_today = `今日是${special_events[special_events_index].event}`; - $('#special-day').html(special_event_today); + const special_event_today = + `今日是${ + special_events[special_events_index].event + }`; + $("#special-day").html(special_event_today); } - const last_date_str = localStorage.getItem('last_date'); + const last_date_str = localStorage.getItem("last_date"); if (last_date_str !== null && last_date_str !== undefined) { const now_date = new Date(); const last_date = new Date(last_date_str); - - if (now_date.getFullYear() === last_date.getFullYear() && now_date.getMonth() === last_date.getMonth() && now_date.getDate() === last_date.getDate()) { + + if ( + now_date.getFullYear() === last_date.getFullYear() && + now_date.getMonth() === last_date.getMonth() && + now_date.getDate() === last_date.getDate() + ) { fortune_generated = true; Appear(); } @@ -143,59 +200,78 @@ async function init_page() { } // event bar -const good_span = event => `宜: ${event}`; -const bad_span = event => `忌: ${event}`; -const desc_span = desc => `${desc}`; +const good_span = (event) => + `宜: ${event}`; +const bad_span = (event) => + `忌: ${event}`; +const desc_span = (desc) => + `${desc}`; function Appear() { - $('#title').html(title); - $('#btn').html('打卡成功'); + $("#title").html(title); + $("#btn").html("打卡成功"); // disable the btn - $('#btn').attr("disabled", "disabled"); + $("#btn").attr("disabled", "disabled"); //change page - $('#init-page').hide(); - $('#result-page').show(); - + $("#init-page").hide(); + $("#result-page").show(); + // some lengths const goodLen = goodFortunes.length; const badLen = badFortunes.length; const statusLen = fortuneStatus.length; - + let status_index = -1; let seed1 = -1; let seed2 = -1; if (!fortune_generated) { // transform ip to four numbers - const num = ip.split(".").map(num => parseInt(num)); + const num = ip.split(".").map((num) => parseInt(num)); // TODO: improve the hash process - const hashDate = Math.round(Math.log10(year * ((month << (Math.log10(num[3]) + day - 1)) * (date << Math.log10(num[2] << day))))); - seed1 = (num[0] >> hashDate) * (num[1] >> Math.min(hashDate, 2)) + (num[2] << 1) * (num[3] >> 3) + (date << 3) * (month << hashDate) + (year * day) >> 2; - seed2 = (num[0] << (hashDate + 2)) * (num[1] << hashDate) + (num[2] << 1) * (num[3] << 2) + (date << (hashDate - 1)) * (month << 4) + year >> hashDate + (date * day) >> 1; + const hashDate = Math.round( + Math.log10( + year * + ((month << (Math.log10(num[3]) + day - 1)) * + (date << Math.log10(num[2] << day))), + ), + ); + seed1 = (num[0] >> hashDate) * (num[1] >> Math.min(hashDate, 2)) + + (num[2] << 1) * (num[3] >> 3) + (date << 3) * (month << hashDate) + + (year * day) >> 2; + seed2 = (num[0] << (hashDate + 2)) * (num[1] << hashDate) + + (num[2] << 1) * (num[3] << 2) + + (date << (hashDate - 1)) * (month << 4) + year >> + hashDate + (date * day) >> 1; // decide the status status_index = ((seed1 + seed2) % statusLen + statusLen) % statusLen; // update last record - localStorage.setItem('last_date', d.toISOString()); - localStorage.setItem('last_status_index', status_index.toString()); - localStorage.setItem('last_seed1', seed1.toString()); - localStorage.setItem('last_seed2', seed2.toString()); + localStorage.setItem("last_date", d.toISOString()); + localStorage.setItem("last_status_index", status_index.toString()); + localStorage.setItem("last_seed1", seed1.toString()); + localStorage.setItem("last_seed2", seed2.toString()); } else { - status_index = parseInt(localStorage.getItem('last_status_index')); - seed1 = parseInt(localStorage.getItem('last_seed1')); - seed2 = parseInt(localStorage.getItem('last_seed2')); + status_index = parseInt(localStorage.getItem("last_status_index")); + seed1 = parseInt(localStorage.getItem("last_seed1")); + seed2 = parseInt(localStorage.getItem("last_seed2")); } - - const status = `§ ${fortuneStatus[status_index]} §`; - + + const status = `§ ${fortuneStatus[status_index]} §`; + if (special) { status_index = special_events[special_events_index].status_index; - const special_status = `§ ${fortuneStatus[status_index]} §`; + const special_status = `§ ${ + fortuneStatus[status_index] + } §`; J_ip_to_fortune.html(special_status); - } - else { + } else { J_ip_to_fortune.html(status); } @@ -206,31 +282,40 @@ function Appear() { let l2 = (((seed1 << 1) + date) % goodLen + goodLen) % goodLen; while (set.has(goodFortunes[l2].event)) { l2 = (l2 + 1) % goodLen; - } + } set.add(goodFortunes[l2].event); let r1 = (((seed1 >> 1) + (d.getMonth() << 3)) % badLen + badLen) % badLen; while (set.has(badFortunes[r1].event)) { r1 = (r1 + 2) % badLen; - } + } set.add(badFortunes[r1].event); - let r2 = ((((((seed1 << 3) + (d.getFullYear() >> 5) * (date << 2)) % badLen) * seed2) >> 6) % badLen + badLen) % badLen; + let r2 = ((((((seed1 << 3) + (d.getFullYear() >> 5) * (date << 2)) % badLen) * + seed2) >> 6) % badLen + badLen) % badLen; while (set.has(badFortunes[r2].event)) { r2 = (r2 + 1) % badLen; - } + } - // organize the stuffs below this line... + // organize the stuffs below this line... const l1_desc_list = goodFortunes[l1].description; const l2_desc_list = goodFortunes[l2].description; const r1_desc_list = badFortunes[r1].description; const r2_desc_list = badFortunes[r2].description; const l_1_event = good_span(goodFortunes[l1].event); - const l_1_desc = desc_span(l1_desc_list[Math.abs(seed1) % l1_desc_list.length]); + const l_1_desc = desc_span( + l1_desc_list[Math.abs(seed1) % l1_desc_list.length], + ); const l_2_event = good_span(goodFortunes[l2].event); - const l_2_desc = desc_span(l2_desc_list[Math.abs(seed2) % l2_desc_list.length]); + const l_2_desc = desc_span( + l2_desc_list[Math.abs(seed2) % l2_desc_list.length], + ); const r_1_event = bad_span(badFortunes[r1].event); - const r_1_desc = desc_span(r1_desc_list[Math.abs(seed1) % r1_desc_list.length]); + const r_1_desc = desc_span( + r1_desc_list[Math.abs(seed1) % r1_desc_list.length], + ); const r_2_event = bad_span(badFortunes[r2].event); - const r_2_desc = desc_span(r2_desc_list[Math.abs(seed2) % r2_desc_list.length]); + const r_2_desc = desc_span( + r2_desc_list[Math.abs(seed2) % r2_desc_list.length], + ); if (special) { // instead clear variable name, use short variable name for here... cuz it's too repetitive @@ -242,7 +327,7 @@ function Appear() { J_r_1_desc.html(desc_span(Data.badFortunes.r_1_desc)); J_r_2_event.html(bad_span(Data.badFortunes.r_2_event)); J_r_2_desc.html(desc_span(Data.badFortunes.r_2_desc)); - + if (Data.badFortunes.r_1_event.length == 0) { J_r_1_event.html(r_1_event); J_r_1_desc.html(r_1_desc); @@ -259,7 +344,7 @@ function Appear() { J_l_1_desc.html(desc_span(Data.goodFortunes.l_1_desc)); J_l_2_event.html(good_span(Data.goodFortunes.l_2_event)); J_l_2_desc.html(desc_span(Data.goodFortunes.l_2_desc)); - + if (Data.goodFortunes.l_1_event.length == 0) { J_l_1_event.html(l_1_event); J_l_1_desc.html(l_1_desc); @@ -269,8 +354,7 @@ function Appear() { J_l_2_desc.html(l_2_desc); } } - } - else{ + } else { if (status_index == 0) { J_r_1_event.html(allGood); } else { diff --git a/fortune_generator/js/matrix.js b/fortune_generator/js/matrix.js index d0acfd0..0ee77a9 100644 --- a/fortune_generator/js/matrix.js +++ b/fortune_generator/js/matrix.js @@ -1,13 +1,14 @@ -const canvas = document.getElementById("Matrix") -const context = canvas.getContext("2d") +const canvas = document.getElementById("Matrix"); +const context = canvas.getContext("2d"); -canvas.height = window.innerHeight + 100; -canvas.width = window.innerWidth + 5; +canvas.height = globalThis.innerHeight + 100; +canvas.width = globalThis.innerWidth + 5; -const chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./*-+#$%^@!~?><:;[]{}=_αβΓγΔδεζηΘθικΛλμΞξΠπρΣσςτυΦφχΨψΩω×≦≧≠∞≒≡～∩∠∪∟⊿∫∮∵∴＄￥〒￠￡℃€℉╩◢ⅩⅨⅧⅦⅥⅤⅣⅢⅡⅠあいうえおがぎぐげござじずぜぞだぢつでづどにぬのばひぴぶへぺぼみゃょァゐゎè"; +const chars = + "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./*-+#$%^@!~?><:;[]{}=_αβΓγΔδεζηΘθικΛλμΞξΠπρΣσςτυΦφχΨψΩω×≦≧≠∞≒≡～∩∠∪∟⊿∫∮∵∴＄￥〒￠￡℃€℉╩◢ⅩⅨⅧⅦⅥⅤⅣⅢⅡⅠあいうえおがぎぐげござじずぜぞだぢつでづどにぬのばひぴぶへぺぼみゃょァゐゎè"; const fontSize = 16; -const columns = canvas.width / fontSize; +const columns = canvas.width / fontSize; const charArr = []; for (let i = 0; i < columns; i++) { @@ -23,14 +24,14 @@ context.fillRect(0, 0, canvas.width, canvas.height); function Update() { context.fillStyle = "rgba(0, 0, 0, 0.05)"; context.fillRect(0, 0, canvas.width, canvas.height); - + if (frame == 0) { const a = parseInt(Math.random() * 255); str = `rgba(${a}, ${Math.abs(a - 127)}, ${Math.abs(a - 255)}, 0.9)`; } context.fillStyle = str; context.font = fontSize + "px monospace"; - + for (let i = 0; i < columns; i++) { const text = chars[Math.floor(Math.random() * chars.length)]; context.fillText(text, i * fontSize, charArr[i] * fontSize); @@ -39,7 +40,7 @@ function Update() { } charArr[i]++; } - + frame++; if (frame <= 40 * (Math.floor(Math.random() * 10) + 3)) { requestAnimationFrame(Update); // 40 frames a cycle diff --git a/fortune_generator/js/scripts.js b/fortune_generator/js/scripts.js index e4d7288..c3ce266 100644 --- a/fortune_generator/js/scripts.js +++ b/fortune_generator/js/scripts.js @@ -1,49 +1,50 @@ -let darkModeIcon = document.querySelector('#dark-mode-icon'); +let darkModeIcon = document.querySelector("#dark-mode-icon"); darkModeIcon.onclick = () => { - darkModeIcon.classList.toggle('bx-sun'); - document.body.classList.toggle('dark-mode'); + darkModeIcon.classList.toggle("bx-sun"); + document.body.classList.toggle("dark-mode"); }; function copyResultImageToClipboard() { try { - const $title = $('#title').clone().wrap('
'); - $('#result-page').prepend($title.parent()); + const $title = $("#title").clone().wrap('
'); + $("#result-page").prepend($title.parent()); - const backgroundColor = getComputedStyle($('.container')[0]).backgroundColor; - htmlToImage.toBlob($('#result-page')[0], { + const backgroundColor = + getComputedStyle($(".container")[0]).backgroundColor; + htmlToImage.toBlob($("#result-page")[0], { skipFonts: true, - preferredFontFormat: 'woff2', + preferredFontFormat: "woff2", backgroundColor: backgroundColor, // Set background color dynamically - }).then(blob => { + }).then((blob) => { navigator.clipboard.write([new ClipboardItem({ [blob.type]: blob })]); showCopiedNotice(); $title.parent().remove(); - }).catch(error => { - console.error('Error converting result page to image:', error); + }).catch((error) => { + console.error("Error converting result page to image:", error); $title.parent().remove(); }); - } catch(error) { - console.error('Error copying result image to clipboard:', error); + } catch (error) { + console.error("Error copying result image to clipboard:", error); } } function showCopiedNotice() { - const notice = $('
', { - text: 'Copied to clipboard!', + const notice = $("
", { + text: "Copied to clipboard!", css: { - position: 'fixed', - bottom: '20px', - right: '20px', - padding: '10px 20px', - backgroundColor: 'rgba(0, 0, 0, 0.7)', - color: '#fff', - borderRadius: '5px', + position: "fixed", + bottom: "20px", + right: "20px", + padding: "10px 20px", + backgroundColor: "rgba(0, 0, 0, 0.7)", + color: "#fff", + borderRadius: "5px", zIndex: 1000, - } + }, }); - $('body').append(notice); + $("body").append(notice); setTimeout(() => { notice.fadeOut(300, () => { diff --git a/fortune_generator/js/service-worker.js b/fortune_generator/js/service-worker.js index 9812f60..24bf3f9 100644 --- a/fortune_generator/js/service-worker.js +++ b/fortune_generator/js/service-worker.js @@ -1,35 +1,35 @@ -const pre_cache_file_version = 'pre-v1.1.0'; -const auto_cache_file_version = 'auto-v1.1.0' +const pre_cache_file_version = "pre-v1.1.0"; +const auto_cache_file_version = "auto-v1.1.0"; const ASSETS = [ - '/images/lifeadventurer-192x192.png', - '/images/lifeadventurer-512x512.png', - '/images/lifeadventurer-180x180.png', - '/images/lifeadventurer-270x270.png', - '/images/lifeadventurer.jpg', + "/images/lifeadventurer-192x192.png", + "/images/lifeadventurer-512x512.png", + "/images/lifeadventurer-180x180.png", + "/images/lifeadventurer-270x270.png", + "/images/lifeadventurer.jpg", - 'https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css', - 'https://ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js' + "https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css", + "https://ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js", ]; const NEED_UPDATE = [ - '/fortune_generator/', - '/fortune_generator/index.html', - '/fortune_generator/css/styles.css', - '/fortune_generator/js/fortune.js', - '/fortune_generator/js/matrix.js', - '/fortune_generator/json/special.json', - '/fortune_generator/json/fortune.json', - '/fortune_generator/json/manifest.json', - 'https://api.ipify.org/?format=json', -] + "/fortune_generator/", + "/fortune_generator/index.html", + "/fortune_generator/css/styles.css", + "/fortune_generator/js/fortune.js", + "/fortune_generator/js/matrix.js", + "/fortune_generator/json/special.json", + "/fortune_generator/json/fortune.json", + "/fortune_generator/json/manifest.json", + "https://api.ipify.org/?format=json", +]; const limit_cache_size = (name, size) => { - caches.open(name).then(cache => { - cache.keys().then(keys => { + caches.open(name).then((cache) => { + cache.keys().then((keys) => { if (keys.length > size) { cache.delete(keys[0]).then(() => { - limit_cache_size(name, size) + limit_cache_size(name, size); }); } }); @@ -37,8 +37,8 @@ const limit_cache_size = (name, size) => { }; const is_in_array = (str, array) => { - let path = ''; - + let path = ""; + // Check the request's domain is the same as the current domain. if (str.indexOf(self.origin) === 0) { path = str.substring(self.origin.length); // Remove https://lifeadventurer.github.io @@ -47,56 +47,58 @@ const is_in_array = (str, array) => { } return array.indexOf(path) > -1; -} +}; -// install -self.addEventListener('install', event => { +// install +self.addEventListener("install", (event) => { self.skipWaiting(); //pre-cache files event.waitUntil( - caches.open(pre_cache_file_version).then(cache => { + caches.open(pre_cache_file_version).then((cache) => { cache.addAll(ASSETS); - }) + }), ); }); // activate -self.addEventListener('activate', event => { +self.addEventListener("activate", (event) => { event.waitUntil( - caches.keys().then(keys => { - return Promise.all(keys.map(key => { - if (pre_cache_file_version.indexOf(key) === -1 && auto_cache_file_version.indexOf(key) === -1) { + caches.keys().then((keys) => { + return Promise.all(keys.map((key) => { + if ( + pre_cache_file_version.indexOf(key) === -1 && + auto_cache_file_version.indexOf(key) === -1 + ) { return caches.delete(key); } })); - }) - ) + }), + ); }); // fetch event -self.addEventListener('fetch', event => { +self.addEventListener("fetch", (event) => { if (is_in_array(event.request.url, ASSETS)) { - // cache only strategy + // cache only strategy event.respondWith( - caches.match(event.request.url) + caches.match(event.request.url), ); } else if (is_in_array(event.request.url, NEED_UPDATE)) { event.respondWith( - fetch(event.request.url).then(async response => { + fetch(event.request.url).then(async (response) => { if (response.ok) { const cache = await caches.open(auto_cache_file_version); cache.put(event.request.url, response.clone()); - return response; + return response; } throw new Error("Network response was not ok."); - - }).catch(async _error => { + }).catch(async (_error) => { const cache = await caches.open(auto_cache_file_version); return cache.match(event.request.url); - }) - ) + }), + ); } }); diff --git a/index.html b/index.html index ac3504e..e4e3d1b 100644 --- a/index.html +++ b/index.html @@ -1,66 +1,99 @@ - - - - Generators - - - - - - - - - - -
-
-

Generators Gallery

-
-
-
-
-
+ + + + Generators + + + + + + + + + + +
-
-
- fortune generator example -
-

Fortune Generator

-

Get your daily fortune with just a click.

- Check this out -
-
-
+

+ Generators Gallery +

+
+
+
+
+
+
+
+
+
+ fortune generator example +
+

Fortune Generator

+

+ Get your daily fortune with just a click. +

+ Check this out +
+
+
+
-
-
-
- quote generator example -
-

Quote Generator

-

Generate inspiring and thought-provoking quotes effortlessly.

- Check this out -
-
-
+
+
+ quote generator example +
+

Quote Generator

+

+ Generate inspiring and thought-provoking quotes effortlessly. +

+ Check this out +
+
+
+
-
-
-
-
-
Copyright © 2023-2024 LifeAdventurer | All Rights Reserved. - - footer image - -
-
-
- - - \ No newline at end of file +
+
+
+
+ Copyright © 2023-2024 LifeAdventurer | All Rights Reserved. + + footer image + +
+
+
+ + + diff --git a/quote_generator/css/styles.css b/quote_generator/css/styles.css index 39c1b62..cc4a71b 100644 --- a/quote_generator/css/styles.css +++ b/quote_generator/css/styles.css @@ -1,5 +1,5 @@ :root { - --button-color: #9DC4FF; + --button-color: #9dc4ff; --button-hover-color: #5ca8f3; --bg-color: #ffffffd7; --text-color: #000000; @@ -18,7 +18,7 @@ html { height: 100%; text-align: center; overflow: hidden; - font-family: Georgia, 'Times New Roman', Times, serif; + font-family: Georgia, "Times New Roman", Times, serif; font-size: 24px; } @@ -66,7 +66,7 @@ button { padding: 17px 20px; border-radius: 30px; cursor: pointer; - transition: all 0.3s ease-in-out; + transition: all 0.3s ease-in-out; } button:hover { @@ -79,4 +79,4 @@ button:hover { color: var(--dark-mode-icon-color); cursor: pointer; opacity: 85%; -} \ No newline at end of file +} diff --git a/quote_generator/index.html b/quote_generator/index.html index a00b433..a8affa5 100644 --- a/quote_generator/index.html +++ b/quote_generator/index.html @@ -1,33 +1,41 @@ - - - - - - Quote Generator - - - - - - - - - -
-

Today's quote

-
-

-

-
-
- -
-
-
- - - - - - - + + + + + + Quote Generator + + + + + + + + + +
+

Today's quote

+
+

+

+
+
+ +
+
+
+ + + + + + + diff --git a/quote_generator/js/matrix.js b/quote_generator/js/matrix.js index cccfc70..d746c78 100644 --- a/quote_generator/js/matrix.js +++ b/quote_generator/js/matrix.js @@ -1,13 +1,14 @@ -const canvas = document.getElementById("Matrix") -const context = canvas.getContext("2d") +const canvas = document.getElementById("Matrix"); +const context = canvas.getContext("2d"); -canvas.height = window.innerHeight + 100; -canvas.width = window.innerWidth + 5; +canvas.height = globalThis.innerHeight + 100; +canvas.width = globalThis.innerWidth + 5; -const chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./*-+#$%^@!~?><:;[]{}=_αβΓγΔδεζηΘθικΛλμΞξΠπρΣσςτυΦφχΨψΩω×≦≧≠∞≒≡～∩∠∪∟⊿∫∮∵∴＄￥〒￠￡℃€℉╩◢ⅩⅨⅧⅦⅥⅤⅣⅢⅡⅠあいうえおがぎぐげござじずぜぞだぢつでづどにぬのばひぴぶへぺぼみゃょァゐゎè"; +const chars = + "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./*-+#$%^@!~?><:;[]{}=_αβΓγΔδεζηΘθικΛλμΞξΠπρΣσςτυΦφχΨψΩω×≦≧≠∞≒≡～∩∠∪∟⊿∫∮∵∴＄￥〒￠￡℃€℉╩◢ⅩⅨⅧⅦⅥⅤⅣⅢⅡⅠあいうえおがぎぐげござじずぜぞだぢつでづどにぬのばひぴぶへぺぼみゃょァゐゎè"; const fontSize = 16; -const columns = canvas.width / fontSize; +const columns = canvas.width / fontSize; const charArr = []; for (let i = 0; i < columns; i++) { @@ -30,7 +31,7 @@ function Update() { } context.fillStyle = str; context.font = fontSize + "px monospace"; - + for (let i = 0; i < columns; i++) { const text = chars[Math.floor(Math.random() * chars.length)]; context.fillText(text, i * fontSize, charArr[i] * fontSize); diff --git a/quote_generator/js/quote.js b/quote_generator/js/quote.js index d8be905..35e885c 100644 --- a/quote_generator/js/quote.js +++ b/quote_generator/js/quote.js @@ -5,11 +5,10 @@ const buttonElement = document.querySelector("button"); let quotes = []; fetch("./json/quotes.json") -.then(response => response.json()) -.then(data => { - quotes = data.quotes; -}); - + .then((response) => response.json()) + .then((data) => { + quotes = data.quotes; + }); function Appear() { const index = Math.floor(Math.random() * quotes.length); @@ -24,7 +23,6 @@ function Appear() { const numDarkImages = 0; const numLightImages = 0; - if (numDarkImages && numLightImages) { const isDark = Math.random() < 0.5; let randomIndex, randomImage; @@ -33,7 +31,7 @@ function Appear() { if (isDark) { randomIndex = Math.floor(Math.random() * numDarkImages) + 1; randomImage = folderPath + "dark/" + randomIndex + ".jpg"; - darkModeIcon.onclick() + darkModeIcon.onclick(); } else { randomIndex = Math.floor(Math.random() * numLightImages) + 1; randomImage = folderPath + "light/" + randomIndex + ".jpg"; diff --git a/quote_generator/js/scripts.js b/quote_generator/js/scripts.js index ab23e11..e12cda8 100644 --- a/quote_generator/js/scripts.js +++ b/quote_generator/js/scripts.js @@ -1,7 +1,6 @@ -const darkModeIcon = document.querySelector('#dark-mode-icon'); +const darkModeIcon = document.querySelector("#dark-mode-icon"); darkModeIcon.onclick = () => { - darkModeIcon.classList.toggle('bx-sun'); - document.body.classList.toggle('dark-mode'); + darkModeIcon.classList.toggle("bx-sun"); + document.body.classList.toggle("dark-mode"); }; - diff --git a/scripts.js b/scripts.js index d856735..fbd0d42 100644 --- a/scripts.js +++ b/scripts.js @@ -1,33 +1,36 @@ // fetch all folder paths of the generators from `folders.json` -let folderPaths = [] +let folderPaths = []; async function fetch_folders() { - await fetch('./folders.json') - .then(response => response.json()) - .then(data => { - folderPaths = data.folder_paths; - }) + await fetch("./folders.json") + .then((response) => response.json()) + .then((data) => { + folderPaths = data.folder_paths; + }); } async function get_generator_card_footer() { - await fetch_folders() - const repoOwner = 'LifeAdventurer'; - const repoName = 'generators'; + await fetch_folders(); + const repoOwner = "LifeAdventurer"; + const repoName = "generators"; for (let folderIndex = 1; folderIndex <= folderPaths.length; folderIndex++) { const folderPath = folderPaths[folderIndex - 1]; - const apiUrl = `https://api.github.com/repos/${repoOwner}/${repoName}/commits?path=${folderPath}`; + const apiUrl = + `https://api.github.com/repos/${repoOwner}/${repoName}/commits?path=${folderPath}`; fetch(apiUrl) - .then(response => response.json()) - .then(data => { - // the latest commit will be at the top of the list - const lastCommit = data[0].commit.author.date; - const commitTimeStamp = new Date(lastCommit).getTime() / 1000; - const currentTimeStamp = Math.floor(new Date().getTime() / 1000); - const timeDifference = currentTimeStamp - commitTimeStamp; - - $(`#last-update-${folderIndex}`).html(`Last updated ${format_time_difference(timeDifference)} ago`) - }) + .then((response) => response.json()) + .then((data) => { + // the latest commit will be at the top of the list + const lastCommit = data[0].commit.author.date; + const commitTimeStamp = new Date(lastCommit).getTime() / 1000; + const currentTimeStamp = Math.floor(new Date().getTime() / 1000); + const timeDifference = currentTimeStamp - commitTimeStamp; + + $(`#last-update-${folderIndex}`).html( + `Last updated ${format_time_difference(timeDifference)} ago`, + ); + }); // .catch(error => console.error('Error fetching data:', error)); } } @@ -39,21 +42,21 @@ function format_time_difference(seconds) { const days = Math.floor(hours / 24); if (days > 0) { - return `${days} day${days > 1 ? 's' : ''}`; - } else if(hours > 0) { - return `${hours} hour${hours > 1 ? 's' : ''}`; - } else if(minutes > 0) { - return `${minutes} minute${minutes > 1 ? 's' : ''}`; + return `${days} day${days > 1 ? "s" : ""}`; + } else if (hours > 0) { + return `${hours} hour${hours > 1 ? "s" : ""}`; + } else if (minutes > 0) { + return `${minutes} minute${minutes > 1 ? "s" : ""}`; } else { - return `${seconds} second${seconds > 1 ? 's' : ''}`; + return `${seconds} second${seconds > 1 ? "s" : ""}`; } } -get_generator_card_footer() +get_generator_card_footer(); -const darkModeIcon = document.querySelector('#dark-mode-icon'); +const darkModeIcon = document.querySelector("#dark-mode-icon"); darkModeIcon.onclick = () => { - darkModeIcon.classList.toggle('bx-sun'); - document.body.classList.toggle('dark-mode'); + darkModeIcon.classList.toggle("bx-sun"); + document.body.classList.toggle("dark-mode"); }; diff --git a/styles.css b/styles.css index 1864dd1..75999c2 100644 --- a/styles.css +++ b/styles.css @@ -64,7 +64,7 @@ h5 { .card-footer { background-color: var(--card-footer-color); - color: var(--card-footer-text-color); + color: var(--card-footer-text-color); } #footer-author { @@ -88,4 +88,4 @@ h5 { color: var(--dark-mode-icon-color); cursor: pointer; opacity: 85%; -} \ No newline at end of file +} -- 2.49.1 From 32b7abf7fc9083bf152047e9b644f3f62d137a16 Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Fri, 1 Nov 2024 16:11:36 +0800 Subject: [PATCH 34/98] Impr(fortune): Add new special events for November --- fortune_generator/json/special.json | 38 +++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/fortune_generator/json/special.json b/fortune_generator/json/special.json index e61410d..4242a15 100644 --- a/fortune_generator/json/special.json +++ b/fortune_generator/json/special.json @@ -759,6 +759,44 @@ "r_2_event": "忽略安全", "r_2_desc": "活動時忽視安全措施可能帶來風險" } + }, + { + "event": "世界善心日", + "year": "2024", + "month": "11", + "date": "13", + "status_index": "0", + "goodFortunes": { + "l_1_event": "善待他人", + "l_1_desc": "在生活中多一些善意與寬容", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "感恩節", + "year": "2024", + "month": "11", + "date": "28", + "status_index": "0", + "goodFortunes": { + "l_1_event": "家人團聚", + "l_1_desc": "共享寶貴時光", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } } ] } -- 2.49.1 From 15d3cfb35af9e52a9c9c4fbe6107cdc1e552304d Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Fri, 1 Nov 2024 21:17:14 +0800 Subject: [PATCH 35/98] Feat(fortune): Implement theme switcher (Closes #42) --- fortune_generator/css/styles.css | 47 ++++++++++++++--------- fortune_generator/index.html | 61 +++++++++++++++++++++++++----- fortune_generator/js/fortune.js | 2 +- fortune_generator/js/scripts.js | 7 ---- fortune_generator/js/theme.js | 45 ++++++++++++++++++++++ fortune_generator/json/themes.json | 38 +++++++++++++++++++ 6 files changed, 164 insertions(+), 36 deletions(-) create mode 100644 fortune_generator/js/theme.js create mode 100644 fortune_generator/json/themes.json diff --git a/fortune_generator/css/styles.css b/fortune_generator/css/styles.css index 00f5bdf..ab13334 100644 --- a/fortune_generator/css/styles.css +++ b/fortune_generator/css/styles.css @@ -1,6 +1,8 @@ :root { --button-color: #73a3eb; --button-hover-color: #459aef; + --toggle-theme-button-color: #000000; + --copy-result-button-color: #000000; --bg-color: #ffffff; --good-fortune-color: #e74c3c; --bad-fortune-color: #000000bf; @@ -11,20 +13,6 @@ --title-color: #000000cc; } -.dark-mode { - --button-color: #5d99f4; - --button-hover-color: #9ac6f1; - --bg-color: #1e1d24; - --good-fortune-color: #e74c3c; - --bad-fortune-color: #d4d4d4d9; - --middle-fortune-color: #57c857; - --desc-color: #838282; - --date-color: #0ed64aed; - --special-event-color: #6477f3; - --dark-mode-icon-color: #ffffff; - --title-color: #cdcdcd; -} - * { overflow: hidden; text-align: center; @@ -101,16 +89,39 @@ button:hover { z-index: 0; } -#dark-mode-icon { +#toggle-theme-button { margin-top: 15px; font-size: 2.4rem; - color: var(--dark-mode-icon-color); + color: var(--toggle-theme-button-color); cursor: pointer; opacity: 85%; } -#copy-result { +#copy-result-button { margin-top: 20px; font-size: 1.5rem; - color: var(--dark-mode-icon-color); + color: var(--copy-result-button-color); +} + +#themeModal { + .modal-content { + background-color: var(--bg-color) !important; + color: var(--title-color) !important; + } + + .modal-header, + .modal-footer { + background-color: var(--bg-color) !important; + color: var(--bg-color) !important; + } + + .modal-title, + .btn-close { + color: var(--title-color) !important; + } +} + +#themeItem { + background-color: var(--bg-color); + color: var(--title-color); } diff --git a/fortune_generator/index.html b/fortune_generator/index.html index 6f35bb6..ab6db38 100644 --- a/fortune_generator/index.html +++ b/fortune_generator/index.html @@ -8,17 +8,11 @@ - - - @@ -40,6 +34,7 @@ } +
@@ -116,21 +111,67 @@
- +
+ + + + + + + diff --git a/fortune_generator/js/fortune.js b/fortune_generator/js/fortune.js index 8a79751..58664cb 100644 --- a/fortune_generator/js/fortune.js +++ b/fortune_generator/js/fortune.js @@ -373,7 +373,7 @@ function Appear() { J_l_2_desc.html(l_2_desc); } } - $("#copy-result").removeClass("d-none"); + $("#copy-result-button").removeClass("d-none"); } function getLuck() { diff --git a/fortune_generator/js/scripts.js b/fortune_generator/js/scripts.js index c3ce266..55fa293 100644 --- a/fortune_generator/js/scripts.js +++ b/fortune_generator/js/scripts.js @@ -1,10 +1,3 @@ -let darkModeIcon = document.querySelector("#dark-mode-icon"); - -darkModeIcon.onclick = () => { - darkModeIcon.classList.toggle("bx-sun"); - document.body.classList.toggle("dark-mode"); -}; - function copyResultImageToClipboard() { try { const $title = $("#title").clone().wrap('
'); diff --git a/fortune_generator/js/theme.js b/fortune_generator/js/theme.js new file mode 100644 index 0000000..8b2b78d --- /dev/null +++ b/fortune_generator/js/theme.js @@ -0,0 +1,45 @@ +document.addEventListener("DOMContentLoaded", () => { + const themeListContainer = document.querySelector("#themeList"); + const root = document.documentElement; + + async function fetchThemes() { + try { + const response = await fetch("./json/themes.json"); + const themes = await response.json(); + populateThemeList(themes["themes"]); + } catch (error) { + console.error("Error fetching themes:", error); + } + } + + // Populate theme list in modal + function populateThemeList(themes) { + themeListContainer.innerHTML = ""; + themes.forEach((theme) => { + const themeItem = document.createElement("div"); + themeItem.className = + "theme-item list-group-item d-flex justify-content-between align-items-center"; + themeItem.style.cursor = "pointer"; + themeItem.id = "themeItem"; + + // Add theme name + const themeName = document.createElement("span"); + themeName.textContent = theme.name; + themeItem.appendChild(themeName); + + // Apply theme on click + themeItem.addEventListener("click", () => applyTheme(theme.properties)); + + themeListContainer.appendChild(themeItem); + }); + } + + // Apply theme by setting CSS variables + function applyTheme(properties) { + Object.entries(properties).forEach(([key, value]) => { + root.style.setProperty(`--${key}`, value); + }); + } + + fetchThemes(); +}); diff --git a/fortune_generator/json/themes.json b/fortune_generator/json/themes.json new file mode 100644 index 0000000..dcef731 --- /dev/null +++ b/fortune_generator/json/themes.json @@ -0,0 +1,38 @@ +{ + "themes": [ + { + "name": "light", + "properties": { + "bg-color": "#ffffff", + "good-fortune-color": "#e74c3c", + "bad-fortune-color": "#000000bf", + "desc-color": "#7f7f7f", + "button-color": "#73a3eb", + "button-hover-color": "#459aef", + "toggle-theme-button-color": "#000000", + "copy-result-button-color": "#000000", + "middle-fortune-color": "#5eb95e", + "date-color": "#096e1bc9", + "special-event-color": "#3e4fbb", + "title-color": "#000000cc" + } + }, + { + "name": "dark", + "properties": { + "bg-color": "#1e1d24", + "good-fortune-color": "#e74c3c", + "bad-fortune-color": "#d4d4d4d9", + "desc-color": "#838282", + "button-color": "#5d99f4", + "button-hover-color": "#9ac6f1", + "toggle-theme-button-color": "#ffffff", + "copy-result-button-color": "#ffffff", + "middle-fortune-color": "#57c857", + "date-color": "#0ed64aed", + "special-event-color": "#6477f3", + "title-color": "#cdcdcd" + } + } + ] +} -- 2.49.1 From a345a61f25d88b418adba5f1b8d454616e1a0d71 Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Fri, 1 Nov 2024 22:02:03 +0800 Subject: [PATCH 36/98] Feat(fortune): Add color dots for visual preview in theme item --- fortune_generator/css/styles.css | 12 ++++++++++++ fortune_generator/js/theme.js | 11 +++++++++++ 2 files changed, 23 insertions(+) diff --git a/fortune_generator/css/styles.css b/fortune_generator/css/styles.css index ab13334..6f9df5e 100644 --- a/fortune_generator/css/styles.css +++ b/fortune_generator/css/styles.css @@ -125,3 +125,15 @@ button:hover { background-color: var(--bg-color); color: var(--title-color); } + +.color-preview { + display: flex; /* Use flex to align dots in a row */ +} + +.color-dot { + display: inline-block; + width: 12px; /* Dot size */ + height: 12px; /* Dot size */ + border-radius: 50%; /* Circular shape */ + margin-left: 5px; /* Spacing between dots */ +} diff --git a/fortune_generator/js/theme.js b/fortune_generator/js/theme.js index 8b2b78d..b1d53b6 100644 --- a/fortune_generator/js/theme.js +++ b/fortune_generator/js/theme.js @@ -27,6 +27,17 @@ document.addEventListener("DOMContentLoaded", () => { themeName.textContent = theme.name; themeItem.appendChild(themeName); + // Add color dots for visual preview + const colorPreview = document.createElement("div"); + colorPreview.className = "color-preview"; + Object.values(theme.properties).slice(0, 3).forEach((color) => { + const colorDot = document.createElement("span"); + colorDot.style.backgroundColor = color; + colorDot.className = "color-dot"; + colorPreview.appendChild(colorDot); + }); + themeItem.appendChild(colorPreview); + // Apply theme on click themeItem.addEventListener("click", () => applyTheme(theme.properties)); -- 2.49.1 From 9b8fbe8809fa8d5c4771912b922238a98f7cc730 Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Fri, 1 Nov 2024 22:36:35 +0800 Subject: [PATCH 37/98] Feat(fortune): Add colorPreviewContainer to encapsulate dots for improved clarity --- fortune_generator/css/styles.css | 7 +++++++ fortune_generator/js/theme.js | 12 +++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/fortune_generator/css/styles.css b/fortune_generator/css/styles.css index 6f9df5e..2a34d14 100644 --- a/fortune_generator/css/styles.css +++ b/fortune_generator/css/styles.css @@ -126,6 +126,13 @@ button:hover { color: var(--title-color); } +.color-preview-container { + display: flex; + align-items: center; + padding: 3px; + border-radius: 25px; +} + .color-preview { display: flex; /* Use flex to align dots in a row */ } diff --git a/fortune_generator/js/theme.js b/fortune_generator/js/theme.js index b1d53b6..091b375 100644 --- a/fortune_generator/js/theme.js +++ b/fortune_generator/js/theme.js @@ -27,16 +27,26 @@ document.addEventListener("DOMContentLoaded", () => { themeName.textContent = theme.name; themeItem.appendChild(themeName); + const colorPreivewContainer = document.createElement("div"); + colorPreivewContainer.className = "color-preview-container"; + + const propertyKeys = Object.keys(theme.properties); + colorPreivewContainer.style.backgroundColor = + theme.properties[propertyKeys[3]]; + // Add color dots for visual preview const colorPreview = document.createElement("div"); colorPreview.className = "color-preview"; + Object.values(theme.properties).slice(0, 3).forEach((color) => { const colorDot = document.createElement("span"); colorDot.style.backgroundColor = color; colorDot.className = "color-dot"; colorPreview.appendChild(colorDot); }); - themeItem.appendChild(colorPreview); + + colorPreivewContainer.appendChild(colorPreview); + themeItem.appendChild(colorPreivewContainer); // Apply theme on click themeItem.addEventListener("click", () => applyTheme(theme.properties)); -- 2.49.1 From f9c74860dd4f5da624f46abec4f186a7c906b651 Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Fri, 1 Nov 2024 22:37:59 +0800 Subject: [PATCH 38/98] Style(fortune): Remove margin on the left for the first dot in preview container --- fortune_generator/css/styles.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fortune_generator/css/styles.css b/fortune_generator/css/styles.css index 2a34d14..805ca3b 100644 --- a/fortune_generator/css/styles.css +++ b/fortune_generator/css/styles.css @@ -144,3 +144,7 @@ button:hover { border-radius: 50%; /* Circular shape */ margin-left: 5px; /* Spacing between dots */ } + +.color-preview .color-dot:first-child { + margin-left: 0; /* No margin on the left for the first dot */ +} -- 2.49.1 From ee5b9e8ffaf15e19238bad63bd201eda569dedd2 Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Fri, 1 Nov 2024 23:20:49 +0800 Subject: [PATCH 39/98] Impr(theme): Add new theme - winter --- fortune_generator/json/themes.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/fortune_generator/json/themes.json b/fortune_generator/json/themes.json index dcef731..a3c52f2 100644 --- a/fortune_generator/json/themes.json +++ b/fortune_generator/json/themes.json @@ -33,6 +33,23 @@ "special-event-color": "#6477f3", "title-color": "#cdcdcd" } + }, + { + "name": "winter", + "properties": { + "bg-color": "#dce9ef", + "good-fortune-color": "#1683b0", + "bad-fortune-color": "#C57e4D", + "desc-color": "#726D63", + "button-color": "#9577f8", + "button-hover-color": "#9ac6f1", + "toggle-theme-button-color": "#7c6543", + "copy-result-button-color": "#63835f", + "middle-fortune-color": "#cfbbc0", + "date-color": "#cc99ff", + "special-event-color": "#8ddbf2", + "title-color": "#91c9df" + } } ] } -- 2.49.1 From 6d8017fe516480ef277fc13570492aacfb3343fb Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Fri, 1 Nov 2024 23:23:30 +0800 Subject: [PATCH 40/98] Chore(theme): Rearrange the order of the properties --- fortune_generator/js/theme.js | 2 +- fortune_generator/json/themes.json | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/fortune_generator/js/theme.js b/fortune_generator/js/theme.js index 091b375..f29a419 100644 --- a/fortune_generator/js/theme.js +++ b/fortune_generator/js/theme.js @@ -32,7 +32,7 @@ document.addEventListener("DOMContentLoaded", () => { const propertyKeys = Object.keys(theme.properties); colorPreivewContainer.style.backgroundColor = - theme.properties[propertyKeys[3]]; + theme.properties[propertyKeys[5]]; // Add color dots for visual preview const colorPreview = document.createElement("div"); diff --git a/fortune_generator/json/themes.json b/fortune_generator/json/themes.json index a3c52f2..d15f824 100644 --- a/fortune_generator/json/themes.json +++ b/fortune_generator/json/themes.json @@ -6,15 +6,15 @@ "bg-color": "#ffffff", "good-fortune-color": "#e74c3c", "bad-fortune-color": "#000000bf", + "middle-fortune-color": "#5eb95e", + "title-color": "#000000cc", "desc-color": "#7f7f7f", "button-color": "#73a3eb", "button-hover-color": "#459aef", "toggle-theme-button-color": "#000000", "copy-result-button-color": "#000000", - "middle-fortune-color": "#5eb95e", "date-color": "#096e1bc9", - "special-event-color": "#3e4fbb", - "title-color": "#000000cc" + "special-event-color": "#3e4fbb" } }, { @@ -23,15 +23,15 @@ "bg-color": "#1e1d24", "good-fortune-color": "#e74c3c", "bad-fortune-color": "#d4d4d4d9", + "middle-fortune-color": "#57c857", + "title-color": "#cdcdcd", "desc-color": "#838282", "button-color": "#5d99f4", "button-hover-color": "#9ac6f1", "toggle-theme-button-color": "#ffffff", "copy-result-button-color": "#ffffff", - "middle-fortune-color": "#57c857", "date-color": "#0ed64aed", - "special-event-color": "#6477f3", - "title-color": "#cdcdcd" + "special-event-color": "#6477f3" } }, { @@ -40,15 +40,15 @@ "bg-color": "#dce9ef", "good-fortune-color": "#1683b0", "bad-fortune-color": "#C57e4D", + "middle-fortune-color": "#cfbbc0", + "title-color": "#91c9df", "desc-color": "#726D63", "button-color": "#9577f8", "button-hover-color": "#9ac6f1", "toggle-theme-button-color": "#7c6543", "copy-result-button-color": "#63835f", - "middle-fortune-color": "#cfbbc0", "date-color": "#cc99ff", - "special-event-color": "#8ddbf2", - "title-color": "#91c9df" + "special-event-color": "#8ddbf2" } } ] -- 2.49.1 From 8d1e04090cfc99bfa7c0958e71e73ecfd597558f Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Fri, 1 Nov 2024 23:35:40 +0800 Subject: [PATCH 41/98] Feat(theme): Save selected theme to localStorage for persistence --- fortune_generator/js/theme.js | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/fortune_generator/js/theme.js b/fortune_generator/js/theme.js index f29a419..74d3a10 100644 --- a/fortune_generator/js/theme.js +++ b/fortune_generator/js/theme.js @@ -2,6 +2,9 @@ document.addEventListener("DOMContentLoaded", () => { const themeListContainer = document.querySelector("#themeList"); const root = document.documentElement; + // Apply the saved theme if it exists + applySavedTheme(); + async function fetchThemes() { try { const response = await fetch("./json/themes.json"); @@ -49,7 +52,10 @@ document.addEventListener("DOMContentLoaded", () => { themeItem.appendChild(colorPreivewContainer); // Apply theme on click - themeItem.addEventListener("click", () => applyTheme(theme.properties)); + themeItem.addEventListener("click", () => { + applyTheme(theme.properties); + saveThemeToLocalStorage(theme.name); + }); themeListContainer.appendChild(themeItem); }); @@ -62,5 +68,24 @@ document.addEventListener("DOMContentLoaded", () => { }); } + function saveThemeToLocalStorage(themeName) { + localStorage.setItem("selectedTheme", themeName); + } + + function applySavedTheme() { + const savedThemeName = localStorage.getItem("selectedTheme"); + if (savedThemeName) { + fetch("./json/themes.json") + .then((response) => response.json()) + .then((themes) => { + const theme = themes.themes.find((t) => t.name === savedThemeName); + if (theme) { + applyTheme(theme.properties); + } + }) + .catch((error) => console.error("Error fetching themes:", error)); + } + } + fetchThemes(); }); -- 2.49.1 From b93727e5b8e6fa0d004aeff95ac9aae8dda67747 Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Sat, 2 Nov 2024 16:38:25 +0800 Subject: [PATCH 42/98] Refactor: Update theme winter --- fortune_generator/json/themes.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fortune_generator/json/themes.json b/fortune_generator/json/themes.json index d15f824..823ed68 100644 --- a/fortune_generator/json/themes.json +++ b/fortune_generator/json/themes.json @@ -38,13 +38,13 @@ "name": "winter", "properties": { "bg-color": "#dce9ef", - "good-fortune-color": "#1683b0", + "good-fortune-color": "#91c9ef", "bad-fortune-color": "#C57e4D", "middle-fortune-color": "#cfbbc0", - "title-color": "#91c9df", + "title-color": "#ffc348", "desc-color": "#726D63", - "button-color": "#9577f8", - "button-hover-color": "#9ac6f1", + "button-color": "#7567b8aa", + "button-hover-color": "#7567b8dd", "toggle-theme-button-color": "#7c6543", "copy-result-button-color": "#63835f", "date-color": "#cc99ff", -- 2.49.1 From 80df03f33704c370c02326997e5ee5d47e95c8cc Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Sat, 2 Nov 2024 16:49:10 +0800 Subject: [PATCH 43/98] Docs(CONTRIBUTING): Add guidelines for contributing new themes --- CONTRIBUTING.md | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0042d24..a9d9c5a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -63,6 +63,47 @@ Special events require a more detailed structure. 2. Empty Fields: If there are no fortunes to add, leave the corresponding fields as empty strings (`""`). +### Adding New Themes + +#### JSON Theme Structure + +When adding a new theme to `fortune_generator/json/themes.json`, follow this +structure: + +```json +{ + "name": "theme_name", + "properties": { + "bg-color": "#hexcode", + "good-fortune-color": "#hexcode", + "bad-fortune-color": "#hexcode", + "middle-fortune-color": "#hexcode", + "title-color": "#hexcode", + "desc-color": "#hexcode", + "button-color": "#hexcode", + "button-hover-color": "#hexcode", + "toggle-theme-button-color": "#hexcode", + "copy-result-button-color": "#hexcode", + "date-color": "#hexcode", + "special-event-color": "#hexcode" + } +} +``` + +#### Guidelines for Adding Themes + +1. Naming: Choose a unique and descriptive name for the theme. +2. Properties: + - Ensure that all property values are in valid hexadecimal format (`#rrggbb` + or `#rrggbbaa` for transparency). + - Hex Format: Use lowercase for all hex color codes for consistency. + - Make sure the colors have sufficient contrast for readability. +3. Consistency: Maintain a visually coherent set of colors. +4. Testing: Preview your theme in the app to confirm that colors display as + expected and are user-friendly. +5. Pull Request Naming: + - Use a clear PR name like `Impr(theme): Add {theme_name} theme`. + ## Quote Generator ### Quotes -- 2.49.1 From 031364c2792b81ff768cdb5f1280ffb8a626e97c Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Tue, 5 Nov 2024 14:21:51 +0800 Subject: [PATCH 44/98] Impr(theme): Add new theme - Star Wars --- fortune_generator/json/themes.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/fortune_generator/json/themes.json b/fortune_generator/json/themes.json index 823ed68..78ef323 100644 --- a/fortune_generator/json/themes.json +++ b/fortune_generator/json/themes.json @@ -50,6 +50,23 @@ "date-color": "#cc99ff", "special-event-color": "#8ddbf2" } + }, + { + "name": "Star Wars", + "properties": { + "bg-color": "#262629", + "good-fortune-color": "#15f2fd", + "bad-fortune-color": "#ff212e", + "middle-fortune-color": "#f8ff2e", + "title-color": "#ffe81f", + "desc-color": "#c0c0c0", + "button-color": "#83e4e4", + "button-hover-color": "#449cbc", + "toggle-theme-button-color": "#15f2fd", + "copy-result-button-color": "#ff212e", + "date-color": "#ffe81f", + "special-event-color": "#fc9c43" + } } ] } -- 2.49.1 From 03a72dd1d10045f17508b8e56e20d2ed3069567d Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Tue, 5 Nov 2024 15:06:25 +0800 Subject: [PATCH 45/98] Style: Use lowercases in hex colors --- fortune_generator/json/themes.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fortune_generator/json/themes.json b/fortune_generator/json/themes.json index 78ef323..047b410 100644 --- a/fortune_generator/json/themes.json +++ b/fortune_generator/json/themes.json @@ -39,10 +39,10 @@ "properties": { "bg-color": "#dce9ef", "good-fortune-color": "#91c9ef", - "bad-fortune-color": "#C57e4D", + "bad-fortune-color": "#c57e4d", "middle-fortune-color": "#cfbbc0", "title-color": "#ffc348", - "desc-color": "#726D63", + "desc-color": "#726d63", "button-color": "#7567b8aa", "button-hover-color": "#7567b8dd", "toggle-theme-button-color": "#7c6543", -- 2.49.1 From 81808b7b578cec6781ed50ef8c771a8c9cb9d957 Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Wed, 6 Nov 2024 00:11:17 +0800 Subject: [PATCH 46/98] Impr(theme): Add new theme - Catppuccin Dark --- fortune_generator/json/themes.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/fortune_generator/json/themes.json b/fortune_generator/json/themes.json index 047b410..b42d82a 100644 --- a/fortune_generator/json/themes.json +++ b/fortune_generator/json/themes.json @@ -67,6 +67,23 @@ "date-color": "#ffe81f", "special-event-color": "#fc9c43" } + }, + { + "name": "Catppuccin Dark", + "properties": { + "bg-color": "#1e1e2e", + "good-fortune-color": "#94e2d5", + "bad-fortune-color": "#f38ba8", + "middle-fortune-color": "#f9e2af", + "title-color": "#f5c2e7", + "desc-color": "#cdd6f4", + "button-color": "#b9fbc0", + "button-hover-color": "#a6e3a1", + "toggle-theme-button-color": "#f9e2af", + "copy-result-button-color": "#f38ba8", + "date-color": "#f5c2e7", + "special-event-color": "#fab387" + } } ] } -- 2.49.1 From 85c294b1708b10f0b1a12a42f78107ab5963672f Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Wed, 6 Nov 2024 00:16:22 +0800 Subject: [PATCH 47/98] Chore(theme): Rename theme names --- fortune_generator/json/themes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fortune_generator/json/themes.json b/fortune_generator/json/themes.json index b42d82a..006b534 100644 --- a/fortune_generator/json/themes.json +++ b/fortune_generator/json/themes.json @@ -1,7 +1,7 @@ { "themes": [ { - "name": "light", + "name": "Classic Light", "properties": { "bg-color": "#ffffff", "good-fortune-color": "#e74c3c", @@ -18,7 +18,7 @@ } }, { - "name": "dark", + "name": "Classic Dark", "properties": { "bg-color": "#1e1d24", "good-fortune-color": "#e74c3c", @@ -35,7 +35,7 @@ } }, { - "name": "winter", + "name": "Winter", "properties": { "bg-color": "#dce9ef", "good-fortune-color": "#91c9ef", -- 2.49.1 From 99d2a23f3b452659d0c8676d265f3081810b1bb0 Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Wed, 6 Nov 2024 00:19:44 +0800 Subject: [PATCH 48/98] Impr(theme): Add new theme - Tokyo Night --- fortune_generator/json/themes.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/fortune_generator/json/themes.json b/fortune_generator/json/themes.json index 006b534..0cebc9d 100644 --- a/fortune_generator/json/themes.json +++ b/fortune_generator/json/themes.json @@ -84,6 +84,23 @@ "date-color": "#f5c2e7", "special-event-color": "#fab387" } + }, + { + "name": "Tokyo Night", + "properties": { + "bg-color": "#1a1b26", + "good-fortune-color": "#7dcfff", + "bad-fortune-color": "#ff5c8d", + "middle-fortune-color": "#e0af68", + "title-color": "#bb9af7", + "desc-color": "#c0caf5", + "button-color": "#6e6f8c", + "button-hover-color": "#5a5b7f", + "toggle-theme-button-color": "#7dcfff", + "copy-result-button-color": "#ff5c8d", + "date-color": "#ffbb93", + "special-event-color": "#f7768e" + } } ] } -- 2.49.1 From 3fec297ad8849189169e43efe26e8a28fa48055a Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Wed, 6 Nov 2024 15:32:46 +0800 Subject: [PATCH 49/98] Impr(theme): Add new theme - Autumn Glow --- fortune_generator/json/themes.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/fortune_generator/json/themes.json b/fortune_generator/json/themes.json index 0cebc9d..77a13ca 100644 --- a/fortune_generator/json/themes.json +++ b/fortune_generator/json/themes.json @@ -101,6 +101,23 @@ "date-color": "#ffbb93", "special-event-color": "#f7768e" } + }, + { + "name": "Autumn Glow", + "properties": { + "bg-color": "#f4ede4", + "good-fortune-color": "#e27d60", + "bad-fortune-color": "#a23b2b", + "middle-fortune-color": "#c7a17a", + "title-color": "#5a3d31", + "desc-color": "#7a6e61", + "button-color": "#c7a17a", + "button-hover-color": "#b9896e", + "toggle-theme-button-color": "#a74c3c", + "copy-result-button-color": "#7a6e61", + "date-color": "#e6b89c", + "special-event-color": "#e8a87c" + } } ] } -- 2.49.1 From 97e8a340daa24b02af0d40377eb287a13642815e Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Wed, 6 Nov 2024 15:47:48 +0800 Subject: [PATCH 50/98] Impr(theme): Refactored theme - Winter to Winter Wonderland --- fortune_generator/json/themes.json | 34 +++++++++++++++--------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/fortune_generator/json/themes.json b/fortune_generator/json/themes.json index 77a13ca..a2204bc 100644 --- a/fortune_generator/json/themes.json +++ b/fortune_generator/json/themes.json @@ -34,23 +34,6 @@ "special-event-color": "#6477f3" } }, - { - "name": "Winter", - "properties": { - "bg-color": "#dce9ef", - "good-fortune-color": "#91c9ef", - "bad-fortune-color": "#c57e4d", - "middle-fortune-color": "#cfbbc0", - "title-color": "#ffc348", - "desc-color": "#726d63", - "button-color": "#7567b8aa", - "button-hover-color": "#7567b8dd", - "toggle-theme-button-color": "#7c6543", - "copy-result-button-color": "#63835f", - "date-color": "#cc99ff", - "special-event-color": "#8ddbf2" - } - }, { "name": "Star Wars", "properties": { @@ -118,6 +101,23 @@ "date-color": "#e6b89c", "special-event-color": "#e8a87c" } + }, + { + "name": "Winter Wonderland", + "properties": { + "bg-color": "#e3f2fd", + "good-fortune-color": "#74b9ff", + "bad-fortune-color": "#6c5ce7", + "middle-fortune-color": "#81ecec", + "title-color": "#0984e3", + "desc-color": "#636e72", + "button-color": "#74b9ff", + "button-hover-color": "#a29bfe", + "toggle-theme-button-color": "#00b894", + "copy-result-button-color": "#0984e3", + "date-color": "#74b9ff", + "special-event-color": "#fdcb6e" + } } ] } -- 2.49.1 From 1464de0ff3b6b0c73713d8558894590a712575b5 Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Wed, 6 Nov 2024 18:39:54 +0800 Subject: [PATCH 51/98] Impr(theme): Add new theme - Spring Blossom --- fortune_generator/json/themes.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/fortune_generator/json/themes.json b/fortune_generator/json/themes.json index a2204bc..f07cabc 100644 --- a/fortune_generator/json/themes.json +++ b/fortune_generator/json/themes.json @@ -85,6 +85,23 @@ "special-event-color": "#f7768e" } }, + { + "name": "Spring Blossom", + "properties": { + "bg-color": "#f7f5f2", + "good-fortune-color": "#ff6f61", + "bad-fortune-color": "#6d597a", + "middle-fortune-color": "#86a77a", + "title-color": "#ff9f80", + "desc-color": "#5a5a5a", + "button-color": "#ffd166", + "button-hover-color": "#ffb347", + "toggle-theme-button-color": "#ff6f61", + "copy-result-button-color": "#6d597a", + "date-color": "#ff9f80", + "special-event-color": "#ffb6b9" + } + }, { "name": "Autumn Glow", "properties": { -- 2.49.1 From 72a3513a70bda478fc2ec877ef6be912a94c3262 Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Wed, 6 Nov 2024 21:29:04 +0800 Subject: [PATCH 52/98] Impr(theme): Add new theme - Sunny Vibes --- fortune_generator/json/themes.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/fortune_generator/json/themes.json b/fortune_generator/json/themes.json index f07cabc..04fb522 100644 --- a/fortune_generator/json/themes.json +++ b/fortune_generator/json/themes.json @@ -102,6 +102,23 @@ "special-event-color": "#ffb6b9" } }, + { + "name": "Sunny Vibes", + "properties": { + "bg-color": "#fffbeb", + "good-fortune-color": "#ff7e67", + "bad-fortune-color": "#ffcc29", + "middle-fortune-color": "#1fab89", + "title-color": "#ff8c42", + "desc-color": "#4a4a4a", + "button-color": "#ffa41b", + "button-hover-color": "#ff8500", + "toggle-theme-button-color": "#34ace0", + "copy-result-button-color": "#ffcc29", + "date-color": "#ffd32a", + "special-event-color": "#f7b731" + } + }, { "name": "Autumn Glow", "properties": { -- 2.49.1 From 9344253ebb537bb84e73eb728a6ba0bed18cad24 Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Wed, 6 Nov 2024 21:39:03 +0800 Subject: [PATCH 53/98] Impr(theme): Add new theme - Moonlit Night --- fortune_generator/json/themes.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/fortune_generator/json/themes.json b/fortune_generator/json/themes.json index 04fb522..85c6b01 100644 --- a/fortune_generator/json/themes.json +++ b/fortune_generator/json/themes.json @@ -152,6 +152,23 @@ "date-color": "#74b9ff", "special-event-color": "#fdcb6e" } + }, + { + "name": "Moonlit Night", + "properties": { + "bg-color": "#1a1a2e", + "good-fortune-color": "#7ed6df", + "bad-fortune-color": "#ffeaa7", + "middle-fortune-color": "#8c94a6", + "title-color": "#ffffff", + "desc-color": "#a4b0be", + "button-color": "#30336b", + "button-hover-color": "#535c88", + "toggle-theme-button-color": "#7ed6df", + "copy-result-button-color": "#ffeaa7", + "date-color": "#dcdde1", + "special-event-color": "#ff9ff3" + } } ] } -- 2.49.1 From 6c657ad6ab439ee8acd5fcf76f3bfe67d1a4eed9 Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Wed, 6 Nov 2024 21:54:37 +0800 Subject: [PATCH 54/98] Impr(theme): Add new theme - Lunar Eclipse --- fortune_generator/json/themes.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/fortune_generator/json/themes.json b/fortune_generator/json/themes.json index 85c6b01..6643c0a 100644 --- a/fortune_generator/json/themes.json +++ b/fortune_generator/json/themes.json @@ -169,6 +169,23 @@ "date-color": "#dcdde1", "special-event-color": "#ff9ff3" } + }, + { + "name": "Lunar Eclipse", + "properties": { + "bg-color": "#0d0e1a", + "good-fortune-color": "#7289da", + "bad-fortune-color": "#b56576", + "middle-fortune-color": "#a0a8c1", + "title-color": "#e1e1e6", + "desc-color": "#8b8b97", + "button-color": "#494e6b", + "button-hover-color": "#646b8a", + "toggle-theme-button-color": "#7289da", + "copy-result-button-color": "#b56576", + "date-color": "#d4d4dc", + "special-event-color": "#ffb86c" + } } ] } -- 2.49.1 From 2d2e9b5c78fcf46cb43ea8fd37cc034602334a1b Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Wed, 6 Nov 2024 22:05:18 +0800 Subject: [PATCH 55/98] Impr(theme): Refactored theme - Star Wars to Galactic Glow --- fortune_generator/json/themes.json | 34 +++++++++++++++--------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/fortune_generator/json/themes.json b/fortune_generator/json/themes.json index 6643c0a..1f6392a 100644 --- a/fortune_generator/json/themes.json +++ b/fortune_generator/json/themes.json @@ -34,23 +34,6 @@ "special-event-color": "#6477f3" } }, - { - "name": "Star Wars", - "properties": { - "bg-color": "#262629", - "good-fortune-color": "#15f2fd", - "bad-fortune-color": "#ff212e", - "middle-fortune-color": "#f8ff2e", - "title-color": "#ffe81f", - "desc-color": "#c0c0c0", - "button-color": "#83e4e4", - "button-hover-color": "#449cbc", - "toggle-theme-button-color": "#15f2fd", - "copy-result-button-color": "#ff212e", - "date-color": "#ffe81f", - "special-event-color": "#fc9c43" - } - }, { "name": "Catppuccin Dark", "properties": { @@ -186,6 +169,23 @@ "date-color": "#d4d4dc", "special-event-color": "#ffb86c" } + }, + { + "name": "Galactic Glow", + "properties": { + "bg-color": "#1b1d2a", + "good-fortune-color": "#00eaff", + "bad-fortune-color": "#ff5555", + "middle-fortune-color": "#ffe347", + "title-color": "#ffe81f", + "desc-color": "#c4c7d1", + "button-color": "#3b3f58", + "button-hover-color": "#52577a", + "toggle-theme-button-color": "#00eaff", + "copy-result-button-color": "#ff5555", + "date-color": "#9aedfe", + "special-event-color": "#ffa07a" + } } ] } -- 2.49.1 From 15a435cc77063ab1a1e5430129c5d7879806dd6c Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Wed, 6 Nov 2024 22:07:07 +0800 Subject: [PATCH 56/98] Impr(theme): Add new theme - Mystic Forest --- fortune_generator/json/themes.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/fortune_generator/json/themes.json b/fortune_generator/json/themes.json index 1f6392a..916754d 100644 --- a/fortune_generator/json/themes.json +++ b/fortune_generator/json/themes.json @@ -186,6 +186,23 @@ "date-color": "#9aedfe", "special-event-color": "#ffa07a" } + }, + { + "name": "Mystic Forest", + "properties": { + "bg-color": "#1c3b24", + "good-fortune-color": "#a1e887", + "bad-fortune-color": "#d94e3b", + "middle-fortune-color": "#83c5a3", + "title-color": "#e4f9e0", + "desc-color": "#b5c9b4", + "button-color": "#4a7a58", + "button-hover-color": "#6a9a76", + "toggle-theme-button-color": "#a1e887", + "copy-result-button-color": "#d94e3b", + "date-color": "#e4f9e0", + "special-event-color": "#9fd9b7" + } } ] } -- 2.49.1 From ccbea6777c00f76b40f05a54ef969d9f69fb90f4 Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Wed, 6 Nov 2024 22:09:52 +0800 Subject: [PATCH 57/98] Impr(theme): Add new theme - Vintage Sepia --- fortune_generator/json/themes.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/fortune_generator/json/themes.json b/fortune_generator/json/themes.json index 916754d..b00faa2 100644 --- a/fortune_generator/json/themes.json +++ b/fortune_generator/json/themes.json @@ -203,6 +203,23 @@ "date-color": "#e4f9e0", "special-event-color": "#9fd9b7" } + }, + { + "name": "Vintage Sepia", + "properties": { + "bg-color": "#f5e9da", + "good-fortune-color": "#d4a373", + "bad-fortune-color": "#8b5e3c", + "middle-fortune-color": "#c3a593", + "title-color": "#3f312b", + "desc-color": "#736357", + "button-color": "#a67a5b", + "button-hover-color": "#b98b6f", + "toggle-theme-button-color": "#8b5e3c", + "copy-result-button-color": "#d4a373", + "date-color": "#7f6a5d", + "special-event-color": "#c7ab93" + } } ] } -- 2.49.1 From 5874d347a0c3a7034583fbb698782925d0fed9f4 Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Wed, 6 Nov 2024 22:18:07 +0800 Subject: [PATCH 58/98] Feat(fortune): Set dynamic max-height and overflow for theme modal body with scrollable theme items --- fortune_generator/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fortune_generator/index.html b/fortune_generator/index.html index ab6db38..ca04ad8 100644 --- a/fortune_generator/index.html +++ b/fortune_generator/index.html @@ -148,7 +148,7 @@ >
-
+
-- 2.49.1 From a10be0ef619be22f35fe98048e13fb1d312b0f9e Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Wed, 6 Nov 2024 22:46:32 +0800 Subject: [PATCH 59/98] Feat(fortune): Add custom scrollbar styling for theme modal selection --- fortune_generator/css/styles.css | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/fortune_generator/css/styles.css b/fortune_generator/css/styles.css index 805ca3b..6ac434e 100644 --- a/fortune_generator/css/styles.css +++ b/fortune_generator/css/styles.css @@ -126,6 +126,24 @@ button:hover { color: var(--title-color); } +::-webkit-scrollbar { + width: 8px; +} + +::-webkit-scrollbar-track { + background: var(--bg-color); + border-radius: 10px; +} + +::-webkit-scrollbar-thumb { + background: var(--button-color); + border-radius: 10px; +} + +::-webkit-scrollbar-thumb:hover { + background: var(--button-hover-color); +} + .color-preview-container { display: flex; align-items: center; -- 2.49.1 From 68bab668b16523deb96586dd0f96594b365140dc Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Thu, 7 Nov 2024 01:14:13 +0800 Subject: [PATCH 60/98] Impr(theme): Add new theme - Metallic Shine --- fortune_generator/json/themes.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/fortune_generator/json/themes.json b/fortune_generator/json/themes.json index b00faa2..91ada0e 100644 --- a/fortune_generator/json/themes.json +++ b/fortune_generator/json/themes.json @@ -220,6 +220,23 @@ "date-color": "#7f6a5d", "special-event-color": "#c7ab93" } + }, + { + "name": "Metallic Shine", + "properties": { + "bg-color": "#2c2f33", + "good-fortune-color": "#4e8c47", + "bad-fortune-color": "#d9534f", + "middle-fortune-color": "#f1c40f", + "title-color": "#bdc3c7", + "desc-color": "#95a5a6", + "button-color": "#3498db", + "button-hover-color": "#2980b9", + "toggle-theme-button-color": "#4e8c47", + "copy-result-button-color": "#d9534f", + "date-color": "#bdc3c7", + "special-event-color": "#f39c12" + } } ] } -- 2.49.1 From eacd73f929ae03e822788c61547ecab807972bb8 Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Thu, 7 Nov 2024 09:46:51 +0800 Subject: [PATCH 61/98] Impr(theme): Add new theme - Tropical Paradise --- fortune_generator/json/themes.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/fortune_generator/json/themes.json b/fortune_generator/json/themes.json index 91ada0e..8afe534 100644 --- a/fortune_generator/json/themes.json +++ b/fortune_generator/json/themes.json @@ -237,6 +237,23 @@ "date-color": "#bdc3c7", "special-event-color": "#f39c12" } + }, + { + "name": "Tropical Paradise", + "properties": { + "bg-color": "#ffdf80", + "good-fortune-color": "#00bfae", + "bad-fortune-color": "#ff6347", + "middle-fortune-color": "#3eb489", + "title-color": "#2e8b57", + "desc-color": "#708090", + "button-color": "#ff4500", + "button-hover-color": "#ff6347", + "toggle-theme-button-color": "#00bfae", + "copy-result-button-color": "#ff6347", + "date-color": "#2e8b57", + "special-event-color": "#ff8c00" + } } ] } -- 2.49.1 From 708bcdd3426766bff01ec3a89ce2287b30217848 Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Thu, 7 Nov 2024 09:48:21 +0800 Subject: [PATCH 62/98] Impr(theme): Add new theme - Abstract Art --- fortune_generator/json/themes.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/fortune_generator/json/themes.json b/fortune_generator/json/themes.json index 8afe534..bd6f5dd 100644 --- a/fortune_generator/json/themes.json +++ b/fortune_generator/json/themes.json @@ -254,6 +254,23 @@ "date-color": "#2e8b57", "special-event-color": "#ff8c00" } + }, + { + "name": "Abstract Art", + "properties": { + "bg-color": "#f4e1d2", + "good-fortune-color": "#e1b1e3", + "bad-fortune-color": "#c93f36", + "middle-fortune-color": "#bde7e0", + "title-color": "#cf63a1", + "desc-color": "#7b6362", + "button-color": "#fc7b6d", + "button-hover-color": "#fc4f48", + "toggle-theme-button-color": "#e1b1e3", + "copy-result-button-color": "#c93f36", + "date-color": "#cf63a1", + "special-event-color": "#f6c6d4" + } } ] } -- 2.49.1 From fd9fe8b460d0d666874c1db0e898d186ad7baf05 Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Thu, 7 Nov 2024 09:51:38 +0800 Subject: [PATCH 63/98] Impr(theme): Add new theme - Zen Garden --- fortune_generator/json/themes.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/fortune_generator/json/themes.json b/fortune_generator/json/themes.json index bd6f5dd..1e9fee1 100644 --- a/fortune_generator/json/themes.json +++ b/fortune_generator/json/themes.json @@ -271,6 +271,23 @@ "date-color": "#cf63a1", "special-event-color": "#f6c6d4" } + }, + { + "name": "Zen Garden", + "properties": { + "bg-color": "#f4f1e1", + "good-fortune-color": "#8c9f6f", + "bad-fortune-color": "#e18e8b", + "middle-fortune-color": "#b7c7b5", + "title-color": "#4f5049", + "desc-color": "#78756f", + "button-color": "#c1c0b2", + "button-hover-color": "#b0b098", + "toggle-theme-button-color": "#8c9f6f", + "copy-result-button-color": "#e18e8b", + "date-color": "#4f5049", + "special-event-color": "#b7c7b5" + } } ] } -- 2.49.1 From 6b45d59ceb2d0918e4b0e0e74845ca549ad24c83 Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Thu, 7 Nov 2024 10:06:29 +0800 Subject: [PATCH 64/98] Impr(theme): Add new theme - Aurora Borealis --- fortune_generator/json/themes.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/fortune_generator/json/themes.json b/fortune_generator/json/themes.json index 1e9fee1..bc2e1a6 100644 --- a/fortune_generator/json/themes.json +++ b/fortune_generator/json/themes.json @@ -288,6 +288,23 @@ "date-color": "#4f5049", "special-event-color": "#b7c7b5" } + }, + { + "name": "Aurora Borealis", + "properties": { + "bg-color": "#0b0c1d", + "good-fortune-color": "#00d084", + "bad-fortune-color": "#455a64", + "middle-fortune-color": "#9c7ae0", + "title-color": "#d9e9f0", + "desc-color": "#95a5b3", + "button-color": "#608fcf", + "button-hover-color": "#5072b3", + "toggle-theme-button-color": "#00d084", + "copy-result-button-color": "#455a64", + "date-color": "#cfd8dc", + "special-event-color": "#a1d6ff" + } } ] } -- 2.49.1 From 03a768090b38a0f04b259d1da770805af6e9aff3 Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Thu, 7 Nov 2024 10:07:48 +0800 Subject: [PATCH 65/98] Impr(theme): Add new theme - Cyberwave --- fortune_generator/json/themes.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/fortune_generator/json/themes.json b/fortune_generator/json/themes.json index bc2e1a6..91f8fe1 100644 --- a/fortune_generator/json/themes.json +++ b/fortune_generator/json/themes.json @@ -305,6 +305,23 @@ "date-color": "#cfd8dc", "special-event-color": "#a1d6ff" } + }, + { + "name": "Cyberwave", + "properties": { + "bg-color": "#1a1a2e", + "good-fortune-color": "#00f5d4", + "bad-fortune-color": "#293462", + "middle-fortune-color": "#adff2f", + "title-color": "#f8f8ff", + "desc-color": "#adb5bd", + "button-color": "#0077b6", + "button-hover-color": "#005f87", + "toggle-theme-button-color": "#00f5d4", + "copy-result-button-color": "#293462", + "date-color": "#72efdd", + "special-event-color": "#72ddf7" + } } ] } -- 2.49.1 From ae01f41a84a1f450317dcc861061713bc30f6258 Mon Sep 17 00:00:00 2001 From: tobiichi3227 Date: Tue, 12 Nov 2024 15:28:22 +0800 Subject: [PATCH 66/98] Fix(fortune): event description typo --- fortune_generator/json/fortune.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fortune_generator/json/fortune.json b/fortune_generator/json/fortune.json index 07ebc86..03e852d 100644 --- a/fortune_generator/json/fortune.json +++ b/fortune_generator/json/fortune.json @@ -191,7 +191,7 @@ { "event": "爬山", "description": [ - "跳戰自我", + "挑戰自我", "促進健康" ] } -- 2.49.1 From 7852572f26e28aa552d2eadd44f077849f1d1979 Mon Sep 17 00:00:00 2001 From: tobiichi3227 <86729076+tobiichi3227@users.noreply.github.com> Date: Thu, 12 Dec 2024 22:48:21 +0800 Subject: [PATCH 67/98] Feat: Add support for cyclical dates in special events to avoid yearly updates (#45) * Feat(fortune): add static date and cyclical date support * Chore(Fortune): convert static event date to cyclical date * Docs: Update CONTRIBUTING.md * Chore(Fortune): Remove old special events * Fix(Fortune): Correctly set the trigger date for Thanksgiving * Impr(fortune): Make the code more readable by reducing duplication and lengthy validation blocks Additionally, strengthen the handling of edge cases (e.g., 31 in February). * Impr(fortune): Separate the default and user-defined events into different files for easier identification and management * Docs: Update CONTRIBUTING.md * Impr(fortune): Simplify events file categorization * Docs: Update CONTRIBUTING.md * Docs: Update CONTRIBUTING.md --- CONTRIBUTING.md | 47 +- fortune_generator/js/fortune.js | 123 +++- fortune_generator/json/custom_special.json | 3 + fortune_generator/json/cyclical_special.json | 726 +++++++++++++++++++ fortune_generator/json/special.json | 346 ++++----- fortune_generator/json/static_special.json | 46 ++ 6 files changed, 1081 insertions(+), 210 deletions(-) create mode 100644 fortune_generator/json/custom_special.json create mode 100644 fortune_generator/json/cyclical_special.json create mode 100644 fortune_generator/json/static_special.json diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a9d9c5a..335db40 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -34,16 +34,57 @@ 4. Maintain a positive and encouraging tone. ### Special Events +#### Date Structure +1. With year, month and date + ```json + "triggerDate": { + "year": "Year", + "month": "Month", + "date": "Date" + } + ``` + We should place events of this type in the `fortune_generator/json/custom_special.json`. + + For one-time or irregular events, or events with complex date calculations (like the Moon Festival in the lunar calendar). + + **NOTE: Any special event that does not fit into either** + - Static events (fixed date every year) + - Cyclical events (recurring on a pattern like "fourth Thursday") + +2. With only month and day + ```json + "triggerDate": { + "month": "Month", + "date": "Date" + } + ``` + + We should place events of this type in the `fortune_generator/json/static_special.json`. + + For events with fixed dates. + +3. With only month, week, weekday (like Mother's Day) + ```json + "triggerDate": { + "month": "Month", + "week": "Week", + "weekday": "Weekday" + } + ``` + + We should place events of this type in the `fortune_generator/json/cyclical_special.json`. + + For recurring events (e.g., holidays like Thanksgiving and Mother's Day). + +#### Event Structure Special events require a more detailed structure. 1. Structure: ```json { "event": "Event Name", - "year": "Year", - "month": "Month", - "date": "Date", + "triggerDate": {}, // Please refer to explaination above "status_index": "Status Index", "goodFortunes": { "l_1_event": "Good Fortune 1", diff --git a/fortune_generator/js/fortune.js b/fortune_generator/js/fortune.js index 58664cb..788ea69 100644 --- a/fortune_generator/js/fortune.js +++ b/fortune_generator/js/fortune.js @@ -35,11 +35,17 @@ async function fetch_data() { badFortunes = data.badFortunes; }); - await fetch("./json/special.json") - .then((response) => response.json()) - .then((data) => { - special_events = data.special_events; - }); + async function fetch_events(path) { + await fetch(path) + .then((response) => response.json()) + .then((data) => { + special_events.push(...data.special_events); + }); + } + + await fetch_events("./json/custom_special.json"); + await fetch_events("./json/static_special.json"); + await fetch_events("./json/cyclical_special.json"); } const textColorClass = [ @@ -92,13 +98,91 @@ const day = d.getDay(); const month = d.getMonth() + 1; const year = d.getFullYear(); +function validateNumber(value, min, max, fieldName, event) { + value = parseInt(value); + if (isNaN(value) || value < min || value > max) { + console.warn(`illegal event: ${fieldName} should be between ${min} and ${max}`, event); + return null; + } + return value; +} + +function isLeapYear(year) { + if (year % 400 === 0) return true; + if (year % 100 === 0) return false; + if (year % 4 === 0) return true; + return false; +} + +const daysPerMonth = [ + 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 +]; +const maxDate = new Date(8640000000000000); + function daysDiff(eventIndex) { // define the date right now and the special event date + const event = special_events[eventIndex]; const startDate = new Date(year, month - 1, date); + let eventYear = -1, eventMonth = -1, eventDate = -1; + if (!('triggerDate' in event)) { + console.warn('illegal event: missing `triggerDate` field', event); + return -1; + } else if (Object.prototype.toString.call(event.triggerDate) !== "[object Object]") { + console.warn('illegal event: `triggerDate` field should be a json object', event); + return -1; + } + const triggerDate = event.triggerDate; + + eventYear = year; + if ('year' in triggerDate) { + eventYear = validateNumber(triggerDate.year, 1, maxDate.getFullYear(), 'triggerDate.year', event); + if (eventYear === null) { + return -1; + } + } + + if (!('month' in triggerDate)) { + console.warn('illegal event: `triggerDate` missing `month` field', event); + return -1; + } + eventMonth = validateNumber(triggerDate.month, 1, 12, 'triggerDate.Month', event); + if (eventMonth === null) { + return -1; + } + + if (!('date' in triggerDate) && (!('week' in triggerDate) || !('weekday' in triggerDate))) { + console.warn('illegal event: `triggerDate` require (`week` and `weekday`) or `date` field', event); + return -1; + } + + if ('date' in triggerDate) { + let days = daysPerMonth[eventMonth]; + if (isLeapYear(eventYear) && eventMonth == 2) days += 1; + eventDate = validateNumber(triggerDate.date, 1, days, 'triggerDate.date', event); + if (eventDate === null) { + return -1; + } + } else { + + triggerDate.week = validateNumber(triggerDate.week, 1, 5, 'triggerDate.week', event); + triggerDate.weekday = validateNumber(triggerDate.weekday, 1, 7, 'triggerDate.weekday', event); + if (triggerDate.week === null || triggerDate.weekday === null) { + return -1; + } + + const firstDayOfMonth = new Date(eventYear, eventMonth - 1, 1); + const firstDayWeekday = firstDayOfMonth.getDay(); + + // Sunday -> 7 + const adjustedFirstDayWeekday = firstDayWeekday === 0 ? 7 : firstDayWeekday; + const firstTargetDay = 1 + (triggerDate.weekday - adjustedFirstDayWeekday + 7) % 7; + eventDate = firstTargetDay + (triggerDate.week - 1) * 7; + } + const endDate = new Date( - special_events[eventIndex].year, - special_events[eventIndex].month - 1, - special_events[eventIndex].date, + eventYear, + eventMonth - 1, + eventDate, ); // calculate the difference in milliseconds and convert it to days @@ -146,18 +230,23 @@ async function init_page() { $("#weekday").html(showDay); const showSpecialEventCount = 2; - let eventIndexPtr = 0, eventIndexList = Array(showSpecialEventCount).fill(-1); + let eventIndexList = Array(showSpecialEventCount).fill(-1); + let eventDiffDaysIndexList = Array(showSpecialEventCount).fill(Number.MAX_SAFE_INTEGER); + // check if there is special event today for (let i = 0; i < special_events.length; i++) { - if (daysDiff(i) > 0) { - if ( - eventIndexPtr < showSpecialEventCount && - eventIndexList[eventIndexPtr] == -1 - ) { - eventIndexList[eventIndexPtr] = i; - eventIndexPtr++; + let diffCount = daysDiff(i); + if (diffCount > 0) { + let j = 0; + for (; j < showSpecialEventCount; j++) { + if (diffCount < eventDiffDaysIndexList[j]) { + break; + } } - } else if (daysDiff(i) == 0) { + + eventDiffDaysIndexList[j] = diffCount; + eventIndexList[j] = i; + } else if (diffCount === 0) { special = true; special_events_index = i; } diff --git a/fortune_generator/json/custom_special.json b/fortune_generator/json/custom_special.json new file mode 100644 index 0000000..ff81a74 --- /dev/null +++ b/fortune_generator/json/custom_special.json @@ -0,0 +1,3 @@ +{ + "special_events": [] +} diff --git a/fortune_generator/json/cyclical_special.json b/fortune_generator/json/cyclical_special.json new file mode 100644 index 0000000..ee429f0 --- /dev/null +++ b/fortune_generator/json/cyclical_special.json @@ -0,0 +1,726 @@ +{ + "special_events": [ + { + "event": "元旦", + "triggerDate": { + "month": "1", + "date": "1" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "早起", + "l_1_desc": "心情愉悅迎接新年", + "l_2_event": "大掃除", + "l_2_desc": "新年新氣象" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "國際資料隱私日", + "triggerDate": { + "month": "1", + "date": "28" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "整理資料", + "l_1_desc": "注意在線資料安全", + "l_2_event": "注意隱私", + "l_2_desc": "謹慎上網" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "植樹節", + "triggerDate": { + "month": "3", + "date": "12" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "植樹造林", + "l_1_desc": "保護生態、美化環境", + "l_2_event": "節能減碳", + "l_2_desc": "延長資源壽命" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "白色情人節", + "triggerDate": { + "month": "3", + "date": "14" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "送禮物", + "l_1_desc": "表達愛意和感激之情", + "l_2_event": "觀星", + "l_2_desc": "仰望星空，共描明月" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "世界森林日", + "triggerDate": { + "month": "3", + "date": "21" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "環境教育", + "l_1_desc": "提升對自然的敬重", + "l_2_event": "節約用水", + "l_2_desc": "保護生態系統穩定" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "愚人節", + "triggerDate": { + "month": "4", + "date": "1" + }, + "status_index": "3", + "goodFortunes": { + "l_1_event": "喜笑顏開", + "l_1_desc": "與親朋好友分享快樂", + "l_2_event": "開派對", + "l_2_desc": "組織有趣的活動和遊戲" + }, + "badFortunes": { + "r_1_event": "冒犯他人", + "r_1_desc": "避免製造觸怒人的笑話", + "r_2_event": "惡作劇", + "r_2_desc": "注意避免不必要的麻煩" + } + }, + { + "event": "兒童節", + "triggerDate": { + "month": "4", + "date": "4" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "喜笑顏開", + "l_1_desc": "與親朋好友分享快樂", + "l_2_event": "開派對", + "l_2_desc": "組織有趣的活動和遊戲" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "世界健康日", + "triggerDate": { + "month": "4", + "date": "7" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "健康飲食", + "l_1_desc": "多攝取水果、蔬菜和全穀食品", + "l_2_event": "運動鍛煉", + "l_2_desc": "保持身體健康和活力" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "世界地球日", + "triggerDate": { + "month": "4", + "date": "22" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "環保行動", + "l_1_desc": "參與植樹造林或垃圾回收等環保行動", + "l_2_event": "節能減排", + "l_2_desc": "選擇環保型交通工具" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "世界閱讀日", + "triggerDate": { + "month": "4", + "date": "23" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "推廣閱讀", + "l_1_desc": "激發對知識的渴望", + "l_2_event": "書籍分享", + "l_2_desc": "與他人分享你的書單" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "世界智慧財產權日", + "triggerDate": { + "month": "4", + "date": "26" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "保護創意", + "l_1_desc": "尊重他人的創意和智慧財產權，共同維護創作人的權益", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "星際大戰日", + "triggerDate": { + "month": "5", + "date": "04" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "電影馬拉松", + "l_1_desc": "播放所有星際大戰電影", + "l_2_event": "感受原力", + "l_2_desc": "May the force be with you, always." + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "世界微笑日", + "triggerDate": { + "month": "5", + "date": "08" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "微笑", + "l_1_desc": "用微笑向世界問好", + "l_2_event": "放慢腳步", + "l_2_desc": "觀察四周的美好事物" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "母親節", + "triggerDate": { + "month": "5", + "week": "2", + "weekday": "7" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "家庭聚餐", + "l_1_desc": "表達對媽媽的感恩之心", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "世界環境日", + "triggerDate": { + "month": "6", + "date": "05" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "少用塑膠", + "l_1_desc": "選擇可重複使用的替代品", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "世界獻血者日", + "triggerDate": { + "month": "6", + "date": "14" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "捐血", + "l_1_desc": "捐出血液和血漿，分享生命要時常", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "巧克力日", + "triggerDate": { + "month": "7", + "date": "07" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "送巧克力", + "l_1_desc": "共享巧克力盛宴", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "宅宅日", + "triggerDate": { + "month": "7", + "date": "13" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "觀影", + "l_1_desc": "看心愛的電影或影集", + "l_2_event": "閱讀", + "l_2_desc": "享受片刻的寧靜" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "國際冷笑話日", + "triggerDate": { + "month": "7", + "date": "24" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "講冷笑話", + "l_1_desc": "一起嘻嘻哈哈", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "國際友誼日", + "triggerDate": { + "month": "7", + "date": "30" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "與朋友聯絡", + "l_1_desc": "回憶美好時光", + "l_2_event": "一起出遊", + "l_2_desc": "增進彼此的感情" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "國際左撇子日", + "triggerDate": { + "month": "8", + "date": "13" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "挑戰新事物", + "l_1_desc": "嘗試用左手完成任務", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "世界攝影日", + "triggerDate": { + "month": "8", + "date": "19" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "拍攝照片", + "l_1_desc": "捕捉生活中的美好瞬間", + "l_2_event": "分享作品", + "l_2_desc": "展示您的攝影技巧" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "國際狗狗日", + "triggerDate": { + "month": "8", + "date": "26" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "陪伴狗狗", + "l_1_desc": "帶狗狗散步或遊玩", + "l_2_event": "分享作品", + "l_2_desc": "展示您的攝影技巧" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "國際慈善日", + "triggerDate": { + "month": "9", + "date": "5" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "捐贈物資", + "l_1_desc": "捐贈物資或金錢，幫助有需要的人", + "l_2_event": "參與志願活動", + "l_2_desc": "參加社區慈善活動，提升社會貢獻" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "國際和平日", + "triggerDate": { + "month": "9", + "date": "21" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "分享愛心", + "l_1_desc": "與他人分享關懷與愛心，促進和平", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "教師節", + "triggerDate": { + "month": "9", + "date": "28" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "感謝老師", + "l_1_desc": "向老師表達感謝，增進師生情誼", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "世界糧食日", + "triggerDate": { + "month": "10", + "date": "16" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "節約糧食", + "l_1_desc": "支持可持續的食物系統", + "l_2_event": "捐贈食品", + "l_2_desc": "捐贈食物給有需要的人，傳遞愛心" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "聯合國日", + "triggerDate": { + "month": "10", + "date": "24" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "支持和平", + "l_1_desc": "參與促進世界和平的活動", + "l_2_event": "了解國際事務", + "l_2_desc": "增強全球視野" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "萬聖節", + "triggerDate": { + "month": "10", + "date": "31" + }, + "status_index": "4", + "goodFortunes": { + "l_1_event": "扮演角色", + "l_1_desc": "穿上喜愛的角色服裝，享受萬聖節的氛圍", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "忽略安全", + "r_2_desc": "活動時忽視安全措施可能帶來風險" + } + }, + { + "event": "世界善心日", + "triggerDate": { + "month": "11", + "date": "13" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "善待他人", + "l_1_desc": "在生活中多一些善意與寬容", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "感恩節", + "triggerDate": { + "month": "11", + "week": "4", + "weekday": "4" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "家人團聚", + "l_1_desc": "分享寶貴時光", + "l_2_event": "吃火雞大餐", + "l_2_desc": "Happy Thanksgiving!" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "棉花糖日", + "triggerDate": { + "month": "12", + "date": "07" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "吃棉花糖", + "l_1_desc": "慶祝棉花糖日", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "貓奴日", + "triggerDate": { + "month": "12", + "date": "15" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "嚕貓", + "l_1_desc": "撫平傷心的心情", + "l_2_event": "喝咖啡", + "l_2_desc": "到貓咪咖啡店去喝咖啡" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "冬至", + "triggerDate": { + "month": "12", + "date": "22" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "吃湯圓", + "l_1_desc": "團團圓圓", + "l_2_event": "保暖", + "l_2_desc": "冬至到了" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "平安夜", + "triggerDate": { + "month": "12", + "date": "24" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "除舊佈新", + "l_1_desc": "平安祥和", + "l_2_event": "交換禮物", + "l_2_desc": "獲得真心的祝福" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "聖誕節", + "triggerDate": { + "month": "12", + "date": "25" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "家庭聚會", + "l_1_desc": "一起團圓吃火雞大餐", + "l_2_event": "注意保暖", + "l_2_desc": "冬至到了" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + } + ] +} diff --git a/fortune_generator/json/special.json b/fortune_generator/json/special.json index 4242a15..3f7a451 100644 --- a/fortune_generator/json/special.json +++ b/fortune_generator/json/special.json @@ -2,9 +2,11 @@ "special_events": [ { "event": "感恩節", - "year": "2023", - "month": "11", - "date": "23", + "triggerDate": { + "month": "11", + "week": "4", + "weekday": "4" + }, "status_index": "0", "goodFortunes": { "l_1_event": "家人團聚", @@ -21,9 +23,10 @@ }, { "event": "棉花糖日", - "year": "2023", - "month": "12", - "date": "07", + "triggerDate": { + "month": "12", + "date": "07" + }, "status_index": "0", "goodFortunes": { "l_1_event": "吃棉花糖", @@ -40,9 +43,10 @@ }, { "event": "貓奴日", - "year": "2023", - "month": "12", - "date": "15", + "triggerDate": { + "month": "12", + "date": "15" + }, "status_index": "0", "goodFortunes": { "l_1_event": "嚕貓", @@ -59,9 +63,10 @@ }, { "event": "冬至", - "year": "2023", - "month": "12", - "date": "22", + "triggerDate": { + "month": "12", + "date": "22" + }, "status_index": "0", "goodFortunes": { "l_1_event": "吃湯圓", @@ -78,9 +83,10 @@ }, { "event": "平安夜", - "year": "2023", - "month": "12", - "date": "24", + "triggerDate": { + "month": "12", + "date": "24" + }, "status_index": "0", "goodFortunes": { "l_1_event": "除舊佈新", @@ -97,9 +103,10 @@ }, { "event": "聖誕節", - "year": "2023", - "month": "12", - "date": "25", + "triggerDate": { + "month": "12", + "date": "25" + }, "status_index": "0", "goodFortunes": { "l_1_event": "家庭聚會", @@ -116,9 +123,10 @@ }, { "event": "元旦", - "year": "2024", - "month": "1", - "date": "1", + "triggerDate": { + "month": "1", + "date": "1" + }, "status_index": "0", "goodFortunes": { "l_1_event": "早起", @@ -133,68 +141,12 @@ "r_2_desc": "" } }, - { - "event": "學測 Day 1", - "year": "2024", - "month": "1", - "date": "20", - "status_index": "0", - "goodFortunes": { - "l_1_event": "考試", - "l_1_desc": "如願以償，金榜題名", - "l_2_event": "祈禱", - "l_2_desc": "獲得平安、信心" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "學測 Day 2", - "year": "2024", - "month": "1", - "date": "21", - "status_index": "0", - "goodFortunes": { - "l_1_event": "參加測驗", - "l_1_desc": "天道酬勤", - "l_2_event": "安心", - "l_2_desc": "事事順利、心想事成" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "學測 Day 3", - "year": "2024", - "month": "1", - "date": "22", - "status_index": "0", - "goodFortunes": { - "l_1_event": "決戰巔峰", - "l_1_desc": "縱橫考場斬關將", - "l_2_event": "成功", - "l_2_desc": "勢在必得" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, { "event": "國際資料隱私日", - "year": "2024", - "month": "1", - "date": "28", + "triggerDate": { + "month": "1", + "date": "28" + }, "status_index": "0", "goodFortunes": { "l_1_event": "整理資料", @@ -211,9 +163,10 @@ }, { "event": "植樹節", - "year": "2024", - "month": "3", - "date": "12", + "triggerDate": { + "month": "3", + "date": "12" + }, "status_index": "0", "goodFortunes": { "l_1_event": "植樹造林", @@ -230,9 +183,10 @@ }, { "event": "白色情人節", - "year": "2024", - "month": "3", - "date": "14", + "triggerDate": { + "month": "3", + "date": "14" + }, "status_index": "0", "goodFortunes": { "l_1_event": "送禮物", @@ -249,9 +203,10 @@ }, { "event": "世界森林日", - "year": "2024", - "month": "3", - "date": "21", + "triggerDate": { + "month": "3", + "date": "21" + }, "status_index": "0", "goodFortunes": { "l_1_event": "環境教育", @@ -268,9 +223,10 @@ }, { "event": "愚人節", - "year": "2024", - "month": "4", - "date": "1", + "triggerDate": { + "month": "4", + "date": "1" + }, "status_index": "3", "goodFortunes": { "l_1_event": "喜笑顏開", @@ -287,9 +243,10 @@ }, { "event": "兒童節", - "year": "2024", - "month": "4", - "date": "4", + "triggerDate": { + "month": "4", + "date": "4" + }, "status_index": "0", "goodFortunes": { "l_1_event": "喜笑顏開", @@ -306,9 +263,10 @@ }, { "event": "世界健康日", - "year": "2024", - "month": "4", - "date": "7", + "triggerDate": { + "month": "4", + "date": "7" + }, "status_index": "0", "goodFortunes": { "l_1_event": "健康飲食", @@ -325,9 +283,10 @@ }, { "event": "世界地球日", - "year": "2024", - "month": "4", - "date": "22", + "triggerDate": { + "month": "4", + "date": "22" + }, "status_index": "0", "goodFortunes": { "l_1_event": "環保行動", @@ -344,9 +303,10 @@ }, { "event": "世界閱讀日", - "year": "2024", - "month": "4", - "date": "23", + "triggerDate": { + "month": "4", + "date": "23" + }, "status_index": "0", "goodFortunes": { "l_1_event": "推廣閱讀", @@ -363,9 +323,10 @@ }, { "event": "世界智慧財產權日", - "year": "2024", - "month": "4", - "date": "26", + "triggerDate": { + "month": "4", + "date": "26" + }, "status_index": "0", "goodFortunes": { "l_1_event": "保護創意", @@ -382,9 +343,10 @@ }, { "event": "星際大戰日", - "year": "2024", - "month": "5", - "date": "04", + "triggerDate": { + "month": "5", + "date": "04" + }, "status_index": "0", "goodFortunes": { "l_1_event": "電影馬拉松", @@ -401,9 +363,10 @@ }, { "event": "世界微笑日", - "year": "2024", - "month": "5", - "date": "08", + "triggerDate": { + "month": "5", + "date": "08" + }, "status_index": "0", "goodFortunes": { "l_1_event": "微笑", @@ -420,9 +383,11 @@ }, { "event": "母親節", - "year": "2024", - "month": "5", - "date": "12", + "triggerDate": { + "month": "5", + "week": "2", + "weekday": "7" + }, "status_index": "0", "goodFortunes": { "l_1_event": "家庭聚餐", @@ -439,9 +404,10 @@ }, { "event": "世界環境日", - "year": "2024", - "month": "6", - "date": "05", + "triggerDate": { + "month": "6", + "date": "05" + }, "status_index": "0", "goodFortunes": { "l_1_event": "少用塑膠", @@ -458,9 +424,10 @@ }, { "event": "世界獻血者日", - "year": "2024", - "month": "6", - "date": "14", + "triggerDate": { + "month": "6", + "date": "14" + }, "status_index": "0", "goodFortunes": { "l_1_event": "捐血", @@ -477,9 +444,11 @@ }, { "event": "夏至", - "year": "2024", - "month": "6", - "date": "20", + "triggerDate": { + "year": "2024", + "month": "6", + "date": "20" + }, "status_index": "0", "goodFortunes": { "l_1_event": "觀賞日出和日落", @@ -496,9 +465,10 @@ }, { "event": "巧克力日", - "year": "2024", - "month": "7", - "date": "07", + "triggerDate": { + "month": "7", + "date": "07" + }, "status_index": "0", "goodFortunes": { "l_1_event": "送巧克力", @@ -515,9 +485,10 @@ }, { "event": "宅宅日", - "year": "2024", - "month": "7", - "date": "13", + "triggerDate": { + "month": "7", + "date": "13" + }, "status_index": "0", "goodFortunes": { "l_1_event": "觀影", @@ -534,9 +505,10 @@ }, { "event": "國際冷笑話日", - "year": "2024", - "month": "7", - "date": "24", + "triggerDate": { + "month": "7", + "date": "24" + }, "status_index": "0", "goodFortunes": { "l_1_event": "講冷笑話", @@ -553,9 +525,10 @@ }, { "event": "國際友誼日", - "year": "2024", - "month": "7", - "date": "30", + "triggerDate": { + "month": "7", + "date": "30" + }, "status_index": "0", "goodFortunes": { "l_1_event": "與朋友聯絡", @@ -572,9 +545,10 @@ }, { "event": "國際左撇子日", - "year": "2024", - "month": "8", - "date": "13", + "triggerDate": { + "month": "8", + "date": "13" + }, "status_index": "0", "goodFortunes": { "l_1_event": "挑戰新事物", @@ -591,9 +565,10 @@ }, { "event": "世界攝影日", - "year": "2024", - "month": "8", - "date": "19", + "triggerDate": { + "month": "8", + "date": "19" + }, "status_index": "0", "goodFortunes": { "l_1_event": "拍攝照片", @@ -610,9 +585,10 @@ }, { "event": "國際狗狗日", - "year": "2024", - "month": "8", - "date": "26", + "triggerDate": { + "month": "8", + "date": "26" + }, "status_index": "0", "goodFortunes": { "l_1_event": "陪伴狗狗", @@ -629,9 +605,10 @@ }, { "event": "國際慈善日", - "year": "2024", - "month": "9", - "date": "5", + "triggerDate": { + "month": "9", + "date": "5" + }, "status_index": "0", "goodFortunes": { "l_1_event": "捐贈物資", @@ -648,9 +625,11 @@ }, { "event": "中秋節", - "year": "2024", - "month": "9", - "date": "17", + "triggerDate": { + "year": "2024", + "month": "9", + "date": "17" + }, "status_index": "0", "goodFortunes": { "l_1_event": "賞月", @@ -667,9 +646,10 @@ }, { "event": "國際和平日", - "year": "2024", - "month": "9", - "date": "21", + "triggerDate": { + "month": "9", + "date": "21" + }, "status_index": "0", "goodFortunes": { "l_1_event": "分享愛心", @@ -686,9 +666,10 @@ }, { "event": "教師節", - "year": "2024", - "month": "9", - "date": "28", + "triggerDate": { + "month": "9", + "date": "28" + }, "status_index": "0", "goodFortunes": { "l_1_event": "感謝老師", @@ -705,9 +686,10 @@ }, { "event": "世界糧食日", - "year": "2024", - "month": "10", - "date": "16", + "triggerDate": { + "month": "10", + "date": "16" + }, "status_index": "0", "goodFortunes": { "l_1_event": "節約糧食", @@ -724,9 +706,10 @@ }, { "event": "聯合國日", - "year": "2024", - "month": "10", - "date": "24", + "triggerDate": { + "month": "10", + "date": "24" + }, "status_index": "0", "goodFortunes": { "l_1_event": "支持和平", @@ -743,9 +726,10 @@ }, { "event": "萬聖節", - "year": "2024", - "month": "10", - "date": "31", + "triggerDate": { + "month": "10", + "date": "31" + }, "status_index": "4", "goodFortunes": { "l_1_event": "扮演角色", @@ -762,9 +746,10 @@ }, { "event": "世界善心日", - "year": "2024", - "month": "11", - "date": "13", + "triggerDate": { + "month": "11", + "date": "13" + }, "status_index": "0", "goodFortunes": { "l_1_event": "善待他人", @@ -778,25 +763,6 @@ "r_2_event": "", "r_2_desc": "" } - }, - { - "event": "感恩節", - "year": "2024", - "month": "11", - "date": "28", - "status_index": "0", - "goodFortunes": { - "l_1_event": "家人團聚", - "l_1_desc": "共享寶貴時光", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } } ] } diff --git a/fortune_generator/json/static_special.json b/fortune_generator/json/static_special.json new file mode 100644 index 0000000..d079489 --- /dev/null +++ b/fortune_generator/json/static_special.json @@ -0,0 +1,46 @@ +{ + "special_events": [ + { + "event": "夏至", + "triggerDate": { + "year": "2025", + "month": "6", + "date": "21" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "觀賞日出和日落", + "l_1_desc": "享受一年最長的白天", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "中秋節", + "triggerDate": { + "year": "2025", + "month": "10", + "date": "6" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "賞月", + "l_1_desc": "與家人一同賞月，增進感情", + "l_2_event": "吃月餅", + "l_2_desc": "與家人朋友分享月餅的美味" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + } + ] +} -- 2.49.1 From e80f077ae38981a648c0791195072c7bc1eeaadd Mon Sep 17 00:00:00 2001 From: tobiichi3227 Date: Wed, 25 Dec 2024 11:35:26 +0800 Subject: [PATCH 68/98] Fix(Fortune): Calculate the time difference for events that have already occurred based on the next year For example, if today is January 2nd, then the New Year's Day on January 1st should be calculated using January 1st of the next year. --- fortune_generator/js/fortune.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fortune_generator/js/fortune.js b/fortune_generator/js/fortune.js index 788ea69..25df2ff 100644 --- a/fortune_generator/js/fortune.js +++ b/fortune_generator/js/fortune.js @@ -133,12 +133,14 @@ function daysDiff(eventIndex) { } const triggerDate = event.triggerDate; + let isCustomEvent = false; eventYear = year; if ('year' in triggerDate) { eventYear = validateNumber(triggerDate.year, 1, maxDate.getFullYear(), 'triggerDate.year', event); if (eventYear === null) { return -1; } + isCustomEvent = true; } if (!('month' in triggerDate)) { @@ -179,12 +181,17 @@ function daysDiff(eventIndex) { eventDate = firstTargetDay + (triggerDate.week - 1) * 7; } + if (!isCustomEvent && (month > eventMonth || (month == eventMonth && date > eventDate))) { + eventYear += 1; + } + const endDate = new Date( eventYear, eventMonth - 1, eventDate, ); + // calculate the difference in milliseconds and convert it to days const timeDiff = Math.ceil((endDate - startDate) / (1000 * 60 * 60 * 24)); return timeDiff; -- 2.49.1 From 54168328c259ff4ffa8a86250ecba545d2391046 Mon Sep 17 00:00:00 2001 From: tobiichi3227 Date: Wed, 25 Dec 2024 11:39:06 +0800 Subject: [PATCH 69/98] Fix(Fortune): Categorize events by trigger date type --- fortune_generator/json/custom_special.json | 66 +++++++++++++++++++- fortune_generator/json/cyclical_special.json | 20 ------ fortune_generator/json/static_special.json | 45 +------------ 3 files changed, 66 insertions(+), 65 deletions(-) diff --git a/fortune_generator/json/custom_special.json b/fortune_generator/json/custom_special.json index ff81a74..2d07d60 100644 --- a/fortune_generator/json/custom_special.json +++ b/fortune_generator/json/custom_special.json @@ -1,3 +1,67 @@ { - "special_events": [] + "special_events": [ + { + "event": "夏至", + "triggerDate": { + "year": "2025", + "month": "6", + "date": "21" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "觀賞日出和日落", + "l_1_desc": "享受一年最長的白天", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "中秋節", + "triggerDate": { + "year": "2025", + "month": "10", + "date": "6" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "賞月", + "l_1_desc": "與家人一同賞月，增進感情", + "l_2_event": "吃月餅", + "l_2_desc": "與家人朋友分享月餅的美味" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "冬至", + "triggerDate": { + "year": "2025", + "month": "12", + "date": "21" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "吃湯圓", + "l_1_desc": "團團圓圓", + "l_2_event": "保暖", + "l_2_desc": "冬至到了" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + } + ] } diff --git a/fortune_generator/json/cyclical_special.json b/fortune_generator/json/cyclical_special.json index ee429f0..953fa43 100644 --- a/fortune_generator/json/cyclical_special.json +++ b/fortune_generator/json/cyclical_special.json @@ -662,26 +662,6 @@ "r_2_desc": "" } }, - { - "event": "冬至", - "triggerDate": { - "month": "12", - "date": "22" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "吃湯圓", - "l_1_desc": "團團圓圓", - "l_2_event": "保暖", - "l_2_desc": "冬至到了" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, { "event": "平安夜", "triggerDate": { diff --git a/fortune_generator/json/static_special.json b/fortune_generator/json/static_special.json index d079489..ff81a74 100644 --- a/fortune_generator/json/static_special.json +++ b/fortune_generator/json/static_special.json @@ -1,46 +1,3 @@ { - "special_events": [ - { - "event": "夏至", - "triggerDate": { - "year": "2025", - "month": "6", - "date": "21" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "觀賞日出和日落", - "l_1_desc": "享受一年最長的白天", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "中秋節", - "triggerDate": { - "year": "2025", - "month": "10", - "date": "6" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "賞月", - "l_1_desc": "與家人一同賞月，增進感情", - "l_2_event": "吃月餅", - "l_2_desc": "與家人朋友分享月餅的美味" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - } - ] + "special_events": [] } -- 2.49.1 From caa59577dd9d93c1011f1e696ac1522abff1d18c Mon Sep 17 00:00:00 2001 From: tobiichi3227 <86729076+tobiichi3227@users.noreply.github.com> Date: Fri, 24 Jan 2025 13:28:33 +0800 Subject: [PATCH 70/98] Fix(Fortune): Categorize events (#49) --- fortune_generator/json/cyclical_special.json | 660 ------------------ fortune_generator/json/static_special.json | 663 ++++++++++++++++++- 2 files changed, 662 insertions(+), 661 deletions(-) diff --git a/fortune_generator/json/cyclical_special.json b/fortune_generator/json/cyclical_special.json index 953fa43..4d801f6 100644 --- a/fortune_generator/json/cyclical_special.json +++ b/fortune_generator/json/cyclical_special.json @@ -1,265 +1,5 @@ { "special_events": [ - { - "event": "元旦", - "triggerDate": { - "month": "1", - "date": "1" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "早起", - "l_1_desc": "心情愉悅迎接新年", - "l_2_event": "大掃除", - "l_2_desc": "新年新氣象" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "國際資料隱私日", - "triggerDate": { - "month": "1", - "date": "28" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "整理資料", - "l_1_desc": "注意在線資料安全", - "l_2_event": "注意隱私", - "l_2_desc": "謹慎上網" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "植樹節", - "triggerDate": { - "month": "3", - "date": "12" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "植樹造林", - "l_1_desc": "保護生態、美化環境", - "l_2_event": "節能減碳", - "l_2_desc": "延長資源壽命" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "白色情人節", - "triggerDate": { - "month": "3", - "date": "14" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "送禮物", - "l_1_desc": "表達愛意和感激之情", - "l_2_event": "觀星", - "l_2_desc": "仰望星空，共描明月" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "世界森林日", - "triggerDate": { - "month": "3", - "date": "21" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "環境教育", - "l_1_desc": "提升對自然的敬重", - "l_2_event": "節約用水", - "l_2_desc": "保護生態系統穩定" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "愚人節", - "triggerDate": { - "month": "4", - "date": "1" - }, - "status_index": "3", - "goodFortunes": { - "l_1_event": "喜笑顏開", - "l_1_desc": "與親朋好友分享快樂", - "l_2_event": "開派對", - "l_2_desc": "組織有趣的活動和遊戲" - }, - "badFortunes": { - "r_1_event": "冒犯他人", - "r_1_desc": "避免製造觸怒人的笑話", - "r_2_event": "惡作劇", - "r_2_desc": "注意避免不必要的麻煩" - } - }, - { - "event": "兒童節", - "triggerDate": { - "month": "4", - "date": "4" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "喜笑顏開", - "l_1_desc": "與親朋好友分享快樂", - "l_2_event": "開派對", - "l_2_desc": "組織有趣的活動和遊戲" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "世界健康日", - "triggerDate": { - "month": "4", - "date": "7" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "健康飲食", - "l_1_desc": "多攝取水果、蔬菜和全穀食品", - "l_2_event": "運動鍛煉", - "l_2_desc": "保持身體健康和活力" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "世界地球日", - "triggerDate": { - "month": "4", - "date": "22" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "環保行動", - "l_1_desc": "參與植樹造林或垃圾回收等環保行動", - "l_2_event": "節能減排", - "l_2_desc": "選擇環保型交通工具" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "世界閱讀日", - "triggerDate": { - "month": "4", - "date": "23" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "推廣閱讀", - "l_1_desc": "激發對知識的渴望", - "l_2_event": "書籍分享", - "l_2_desc": "與他人分享你的書單" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "世界智慧財產權日", - "triggerDate": { - "month": "4", - "date": "26" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "保護創意", - "l_1_desc": "尊重他人的創意和智慧財產權，共同維護創作人的權益", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "星際大戰日", - "triggerDate": { - "month": "5", - "date": "04" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "電影馬拉松", - "l_1_desc": "播放所有星際大戰電影", - "l_2_event": "感受原力", - "l_2_desc": "May the force be with you, always." - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "世界微笑日", - "triggerDate": { - "month": "5", - "date": "08" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "微笑", - "l_1_desc": "用微笑向世界問好", - "l_2_event": "放慢腳步", - "l_2_desc": "觀察四周的美好事物" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, { "event": "母親節", "triggerDate": { @@ -281,326 +21,6 @@ "r_2_desc": "" } }, - { - "event": "世界環境日", - "triggerDate": { - "month": "6", - "date": "05" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "少用塑膠", - "l_1_desc": "選擇可重複使用的替代品", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "世界獻血者日", - "triggerDate": { - "month": "6", - "date": "14" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "捐血", - "l_1_desc": "捐出血液和血漿，分享生命要時常", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "巧克力日", - "triggerDate": { - "month": "7", - "date": "07" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "送巧克力", - "l_1_desc": "共享巧克力盛宴", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "宅宅日", - "triggerDate": { - "month": "7", - "date": "13" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "觀影", - "l_1_desc": "看心愛的電影或影集", - "l_2_event": "閱讀", - "l_2_desc": "享受片刻的寧靜" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "國際冷笑話日", - "triggerDate": { - "month": "7", - "date": "24" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "講冷笑話", - "l_1_desc": "一起嘻嘻哈哈", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "國際友誼日", - "triggerDate": { - "month": "7", - "date": "30" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "與朋友聯絡", - "l_1_desc": "回憶美好時光", - "l_2_event": "一起出遊", - "l_2_desc": "增進彼此的感情" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "國際左撇子日", - "triggerDate": { - "month": "8", - "date": "13" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "挑戰新事物", - "l_1_desc": "嘗試用左手完成任務", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "世界攝影日", - "triggerDate": { - "month": "8", - "date": "19" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "拍攝照片", - "l_1_desc": "捕捉生活中的美好瞬間", - "l_2_event": "分享作品", - "l_2_desc": "展示您的攝影技巧" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "國際狗狗日", - "triggerDate": { - "month": "8", - "date": "26" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "陪伴狗狗", - "l_1_desc": "帶狗狗散步或遊玩", - "l_2_event": "分享作品", - "l_2_desc": "展示您的攝影技巧" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "國際慈善日", - "triggerDate": { - "month": "9", - "date": "5" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "捐贈物資", - "l_1_desc": "捐贈物資或金錢，幫助有需要的人", - "l_2_event": "參與志願活動", - "l_2_desc": "參加社區慈善活動，提升社會貢獻" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "國際和平日", - "triggerDate": { - "month": "9", - "date": "21" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "分享愛心", - "l_1_desc": "與他人分享關懷與愛心，促進和平", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "教師節", - "triggerDate": { - "month": "9", - "date": "28" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "感謝老師", - "l_1_desc": "向老師表達感謝，增進師生情誼", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "世界糧食日", - "triggerDate": { - "month": "10", - "date": "16" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "節約糧食", - "l_1_desc": "支持可持續的食物系統", - "l_2_event": "捐贈食品", - "l_2_desc": "捐贈食物給有需要的人，傳遞愛心" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "聯合國日", - "triggerDate": { - "month": "10", - "date": "24" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "支持和平", - "l_1_desc": "參與促進世界和平的活動", - "l_2_event": "了解國際事務", - "l_2_desc": "增強全球視野" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "萬聖節", - "triggerDate": { - "month": "10", - "date": "31" - }, - "status_index": "4", - "goodFortunes": { - "l_1_event": "扮演角色", - "l_1_desc": "穿上喜愛的角色服裝，享受萬聖節的氛圍", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "忽略安全", - "r_2_desc": "活動時忽視安全措施可能帶來風險" - } - }, - { - "event": "世界善心日", - "triggerDate": { - "month": "11", - "date": "13" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "善待他人", - "l_1_desc": "在生活中多一些善意與寬容", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, { "event": "感恩節", "triggerDate": { @@ -621,86 +41,6 @@ "r_2_event": "", "r_2_desc": "" } - }, - { - "event": "棉花糖日", - "triggerDate": { - "month": "12", - "date": "07" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "吃棉花糖", - "l_1_desc": "慶祝棉花糖日", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "貓奴日", - "triggerDate": { - "month": "12", - "date": "15" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "嚕貓", - "l_1_desc": "撫平傷心的心情", - "l_2_event": "喝咖啡", - "l_2_desc": "到貓咪咖啡店去喝咖啡" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "平安夜", - "triggerDate": { - "month": "12", - "date": "24" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "除舊佈新", - "l_1_desc": "平安祥和", - "l_2_event": "交換禮物", - "l_2_desc": "獲得真心的祝福" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "聖誕節", - "triggerDate": { - "month": "12", - "date": "25" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "家庭聚會", - "l_1_desc": "一起團圓吃火雞大餐", - "l_2_event": "注意保暖", - "l_2_desc": "冬至到了" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } } ] } diff --git a/fortune_generator/json/static_special.json b/fortune_generator/json/static_special.json index ff81a74..36bd462 100644 --- a/fortune_generator/json/static_special.json +++ b/fortune_generator/json/static_special.json @@ -1,3 +1,664 @@ { - "special_events": [] + "special_events": [ + { + "event": "元旦", + "triggerDate": { + "month": "1", + "date": "1" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "早起", + "l_1_desc": "心情愉悅迎接新年", + "l_2_event": "大掃除", + "l_2_desc": "新年新氣象" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "國際資料隱私日", + "triggerDate": { + "month": "1", + "date": "28" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "整理資料", + "l_1_desc": "注意在線資料安全", + "l_2_event": "注意隱私", + "l_2_desc": "謹慎上網" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "植樹節", + "triggerDate": { + "month": "3", + "date": "12" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "植樹造林", + "l_1_desc": "保護生態、美化環境", + "l_2_event": "節能減碳", + "l_2_desc": "延長資源壽命" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "白色情人節", + "triggerDate": { + "month": "3", + "date": "14" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "送禮物", + "l_1_desc": "表達愛意和感激之情", + "l_2_event": "觀星", + "l_2_desc": "仰望星空，共描明月" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "世界森林日", + "triggerDate": { + "month": "3", + "date": "21" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "環境教育", + "l_1_desc": "提升對自然的敬重", + "l_2_event": "節約用水", + "l_2_desc": "保護生態系統穩定" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "愚人節", + "triggerDate": { + "month": "4", + "date": "1" + }, + "status_index": "3", + "goodFortunes": { + "l_1_event": "喜笑顏開", + "l_1_desc": "與親朋好友分享快樂", + "l_2_event": "開派對", + "l_2_desc": "組織有趣的活動和遊戲" + }, + "badFortunes": { + "r_1_event": "冒犯他人", + "r_1_desc": "避免製造觸怒人的笑話", + "r_2_event": "惡作劇", + "r_2_desc": "注意避免不必要的麻煩" + } + }, + { + "event": "兒童節", + "triggerDate": { + "month": "4", + "date": "4" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "喜笑顏開", + "l_1_desc": "與親朋好友分享快樂", + "l_2_event": "開派對", + "l_2_desc": "組織有趣的活動和遊戲" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "世界健康日", + "triggerDate": { + "month": "4", + "date": "7" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "健康飲食", + "l_1_desc": "多攝取水果、蔬菜和全穀食品", + "l_2_event": "運動鍛煉", + "l_2_desc": "保持身體健康和活力" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "世界地球日", + "triggerDate": { + "month": "4", + "date": "22" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "環保行動", + "l_1_desc": "參與植樹造林或垃圾回收等環保行動", + "l_2_event": "節能減排", + "l_2_desc": "選擇環保型交通工具" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "世界閱讀日", + "triggerDate": { + "month": "4", + "date": "23" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "推廣閱讀", + "l_1_desc": "激發對知識的渴望", + "l_2_event": "書籍分享", + "l_2_desc": "與他人分享你的書單" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "世界智慧財產權日", + "triggerDate": { + "month": "4", + "date": "26" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "保護創意", + "l_1_desc": "尊重他人的創意和智慧財產權，共同維護創作人的權益", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "星際大戰日", + "triggerDate": { + "month": "5", + "date": "04" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "電影馬拉松", + "l_1_desc": "播放所有星際大戰電影", + "l_2_event": "感受原力", + "l_2_desc": "May the force be with you, always." + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "世界微笑日", + "triggerDate": { + "month": "5", + "date": "08" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "微笑", + "l_1_desc": "用微笑向世界問好", + "l_2_event": "放慢腳步", + "l_2_desc": "觀察四周的美好事物" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "世界環境日", + "triggerDate": { + "month": "6", + "date": "05" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "少用塑膠", + "l_1_desc": "選擇可重複使用的替代品", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "世界獻血者日", + "triggerDate": { + "month": "6", + "date": "14" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "捐血", + "l_1_desc": "捐出血液和血漿，分享生命要時常", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "巧克力日", + "triggerDate": { + "month": "7", + "date": "07" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "送巧克力", + "l_1_desc": "共享巧克力盛宴", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "宅宅日", + "triggerDate": { + "month": "7", + "date": "13" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "觀影", + "l_1_desc": "看心愛的電影或影集", + "l_2_event": "閱讀", + "l_2_desc": "享受片刻的寧靜" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "國際冷笑話日", + "triggerDate": { + "month": "7", + "date": "24" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "講冷笑話", + "l_1_desc": "一起嘻嘻哈哈", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "國際友誼日", + "triggerDate": { + "month": "7", + "date": "30" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "與朋友聯絡", + "l_1_desc": "回憶美好時光", + "l_2_event": "一起出遊", + "l_2_desc": "增進彼此的感情" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "國際左撇子日", + "triggerDate": { + "month": "8", + "date": "13" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "挑戰新事物", + "l_1_desc": "嘗試用左手完成任務", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "世界攝影日", + "triggerDate": { + "month": "8", + "date": "19" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "拍攝照片", + "l_1_desc": "捕捉生活中的美好瞬間", + "l_2_event": "分享作品", + "l_2_desc": "展示您的攝影技巧" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "國際狗狗日", + "triggerDate": { + "month": "8", + "date": "26" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "陪伴狗狗", + "l_1_desc": "帶狗狗散步或遊玩", + "l_2_event": "分享作品", + "l_2_desc": "展示您的攝影技巧" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "國際慈善日", + "triggerDate": { + "month": "9", + "date": "5" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "捐贈物資", + "l_1_desc": "捐贈物資或金錢，幫助有需要的人", + "l_2_event": "參與志願活動", + "l_2_desc": "參加社區慈善活動，提升社會貢獻" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "國際和平日", + "triggerDate": { + "month": "9", + "date": "21" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "分享愛心", + "l_1_desc": "與他人分享關懷與愛心，促進和平", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "教師節", + "triggerDate": { + "month": "9", + "date": "28" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "感謝老師", + "l_1_desc": "向老師表達感謝，增進師生情誼", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "世界糧食日", + "triggerDate": { + "month": "10", + "date": "16" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "節約糧食", + "l_1_desc": "支持可持續的食物系統", + "l_2_event": "捐贈食品", + "l_2_desc": "捐贈食物給有需要的人，傳遞愛心" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "聯合國日", + "triggerDate": { + "month": "10", + "date": "24" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "支持和平", + "l_1_desc": "參與促進世界和平的活動", + "l_2_event": "了解國際事務", + "l_2_desc": "增強全球視野" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "萬聖節", + "triggerDate": { + "month": "10", + "date": "31" + }, + "status_index": "4", + "goodFortunes": { + "l_1_event": "扮演角色", + "l_1_desc": "穿上喜愛的角色服裝，享受萬聖節的氛圍", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "忽略安全", + "r_2_desc": "活動時忽視安全措施可能帶來風險" + } + }, + { + "event": "世界善心日", + "triggerDate": { + "month": "11", + "date": "13" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "善待他人", + "l_1_desc": "在生活中多一些善意與寬容", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "棉花糖日", + "triggerDate": { + "month": "12", + "date": "07" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "吃棉花糖", + "l_1_desc": "慶祝棉花糖日", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "貓奴日", + "triggerDate": { + "month": "12", + "date": "15" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "嚕貓", + "l_1_desc": "撫平傷心的心情", + "l_2_event": "喝咖啡", + "l_2_desc": "到貓咪咖啡店去喝咖啡" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "平安夜", + "triggerDate": { + "month": "12", + "date": "24" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "除舊佈新", + "l_1_desc": "平安祥和", + "l_2_event": "交換禮物", + "l_2_desc": "獲得真心的祝福" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "聖誕節", + "triggerDate": { + "month": "12", + "date": "25" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "家庭聚會", + "l_1_desc": "一起團圓吃火雞大餐", + "l_2_event": "注意保暖", + "l_2_desc": "冬至到了" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + } + ] } -- 2.49.1 From b82b3f366e5ff6d9692bae486651b16b99356894 Mon Sep 17 00:00:00 2001 From: tobiichi3227 <86729076+tobiichi3227@users.noreply.github.com> Date: Thu, 6 Feb 2025 17:25:23 +0800 Subject: [PATCH 71/98] Feat(fortune): ci add special event checker (#50) * Feat(fortune): ci add special event checker * Chore(Fortune): Move all scripts from `dev` to `scripts` and remove outdated scripts --- .github/workflows/check-events.yml | 35 +++ dev/.gitignore | 2 - dev/main.js | 289 ---------------------- dev/plot_gen.py | 40 --- scripts/check-events.py | 380 +++++++++++++++++++++++++++++ 5 files changed, 415 insertions(+), 331 deletions(-) create mode 100644 .github/workflows/check-events.yml delete mode 100644 dev/.gitignore delete mode 100644 dev/main.js delete mode 100644 dev/plot_gen.py create mode 100644 scripts/check-events.py diff --git a/.github/workflows/check-events.yml b/.github/workflows/check-events.yml new file mode 100644 index 0000000..2616ba9 --- /dev/null +++ b/.github/workflows/check-events.yml @@ -0,0 +1,35 @@ +name: Check special events + +on: + pull_request: + paths: + - 'fortune_generator/json/custom_special.json' + - 'fortune_generator/json/static_special.json' + - 'fortune_generator/json/cyclical_special.json' + + push: + paths: + - 'fortune_generator/json/custom_special.json' + - 'fortune_generator/json/static_special.json' + - 'fortune_generator/json/cyclical_special.json' + +permissions: + contents: read + +jobs: + check: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + - name: Check Custom Special Events + run: | + python3 scripts/check-events.py fortune_generator/json/custom_special.json custom + + - name: Check Static Special Events + run: | + python3 scripts/check-events.py fortune_generator/json/static_special.json static + + - name: Check Cyclical Special Events + run: | + python3 scripts/check-events.py fortune_generator/json/cyclical_special.json cyclical diff --git a/dev/.gitignore b/dev/.gitignore deleted file mode 100644 index aa165e7..0000000 --- a/dev/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -good_fortune_data.txt -bad_fortune_data.txt \ No newline at end of file diff --git a/dev/main.js b/dev/main.js deleted file mode 100644 index 4a9d501..0000000 --- a/dev/main.js +++ /dev/null @@ -1,289 +0,0 @@ -const fs = require("fs"); - -const goodFortunes = [ - { - "event": "睡覺", - "description": "品質良好，精神煥發", - }, - { - "event": "做家務", - "description": "整潔使人心情愉悅", - }, - { - "event": "冥想", - "description": "平靜心靈，緩解焦慮", - }, - { - "event": "攝影", - "description": "捕捉到美好瞬間", - }, - { - "event": "喝咖啡", - "description": "精力充沛燃燒脂肪", - }, - { - "event": "朋友聚會", - "description": "充滿歡笑和美好回憶", - }, - { - "event": "體育鍛鍊", - "description": "能量滿滿，效果顯著", - }, - { - "event": "出遊", - "description": "好天氣，好心情", - }, - { - "event": "吃大餐", - "description": "聯絡感情", - }, - { - "event": "逛書店", - "description": "新書上架，打折推銷", - }, - { - "event": "學新技能", - "description": "快速上手", - }, - { - "event": "唱歌", - "description": "被星探發掘", - }, - { - "event": "上課", - "description": "整天不累，100% 消化", - }, - { - "event": "洗澡", - "description": "重獲能量", - }, - { - "event": "請教問題", - "description": "問題皆獲高人指點", - }, - { - "event": "網購", - "description": "心儀商品皆促銷", - }, - { - "event": "放假", - "description": "休息充電，明日再戰", - }, - { - "event": "早睡", - "description": "好夢連連", - }, - { - "event": "早起", - "description": "朝氣蓬勃，神采飛揚", - }, - { - "event": "發文章", - "description": "瀏覽數暴增", - }, - { - "event": "點外賣", - "description": "準時到達，新鮮好吃", - }, - { - "event": "做善事", - "description": "積善成福", - }, - { - "event": "散步", - "description": "空氣良好，放鬆身心", - }, -]; - -const badFortunes = [ - { - "event": "體育鍛鍊", - "description": "不慎受傷", - }, - { - "event": "攝影", - "description": "照片全消失", - }, - { - "event": "出遊", - "description": "天氣不晴朗", - }, - { - "event": "吃大餐", - "description": "被要求請客", - }, - { - "event": "學新技能", - "description": "屢試不爽，始終不懂", - }, - { - "event": "唱歌", - "description": "嗓子發炎", - }, - { - "event": "洗澡", - "description": "水溫不穩", - }, - { - "event": "請教問題", - "description": "疑難雜症，均無解答", - }, - { - "event": "網購", - "description": "錯過促銷", - }, - { - "event": "放假", - "description": "隔日工作量倍增", - }, - { - "event": "晚睡", - "description": "失眠，明日精神渙散", - }, - { - "event": "晚起", - "description": "整天都不順", - }, - { - "event": "發文章", - "description": "搜索枯腸，不知所云", - }, - { - "event": "點外賣", - "description": "路況壅塞，餐點冷掉", - }, - { - "event": "喝咖啡", - "description": "晚上失眠", - }, - { - "event": "散步", - "description": "被害蟲咬傷", - }, -]; - -const badLen = badFortunes.length; -const goodLen = goodFortunes.length; -let num = null; -const dates = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 30]; -const statusLen = 8; -let buckets = {}; -let day = 0; -let run_cnt = 0; - -while (run_cnt != 2000) { - let n1 = parseInt(Math.random() * 255 + 1); - let n2 = parseInt(Math.random() * 255 + 1); - let n3 = parseInt(Math.random() * 255 + 1); - let n4 = parseInt(Math.random() * 255 + 1); - - if (!check_ip_valid(n1, n2, n3, n4)) continue; - - let index = `${n1}.${n2}.${n3}.${n4}`; - buckets[index] = [0, 0, 0, 0]; - for (let i = 1; i <= 12; i++) { - for (let j = 1; j <= dates[i - 1]; j++) { - day %= 7; - run(2023, i, j, day, [n1, n2, n3, n4]); - day++; - } - } - - run_cnt++; -} - -fs.writeFile("./res.txt", JSON.stringify(buckets), (err) => { - console.log(err); -}); - -function check_ip_valid(n1, n2, n3, n4) { - if (n1 > 255 || n2 > 255 || n3 > 255 || n4 > 255) return false; - - // private network - if (n1 === 10) return false; - - // Carrier-grade NAT - if (n1 == 100 && n2 == 64) return false; - - // localhost - if (n1 === 127 && n2 === 0 && n3 === 0) return false; - - // link-local address - if (n1 == 169 && n2 == 254) return false; - - // private network - if (n1 === 172) { if (n2 >= 16 && n2 <= 31) return false; } - - if (n1 === 192) { - if (n2 === 168) return false; // private network - if (n2 === 0 && n3 === 0) return false; // IANA RFC 5735 - if (n2 === 0 && n3 === 2) return false; // TEST-NET-1 RFC 5735 - if (n2 === 88 && n3 === 99) return false; // 6to4 - } - - if (n1 == 198) { - if (n2 == 18) return false; // RFC 2544 - if (n2 == 51 && n3 == 100) return false; // TEST-NET-2 RFC 5735 - } - - if (n1 == 203 && n3 == 113) return false; // TEST-NET-3 RFC 5735 - - // class D network - if (n1 == 224) return false; - - // class E network - if (n1 == 255) return false; - - return true; -} - -// calculate hash and write result -function run(year, month, date, day, ip) { - let num = ip; - let index = `${ip[0]}.${ip[1]}.${ip[2]}.${ip[3]}`; - - // original hash function - let hashDate = Math.round( - Math.log10( - year * - ((month << (Math.log10(num[3]) + day - 1)) * - (date << Math.log10(num[2] << day))), - ), - ); - let seed1 = (num[0] >> hashDate) * (num[1] >> Math.min(hashDate, 2)) + - (num[2] << 1) * (num[3] >> 3) + (date << 3) * (month << hashDate) + - ((year * day) >> 2); - let seed2 = (num[0] << (hashDate + 2)) * (num[1] << hashDate) + - (num[2] << 1) * (num[3] << 3) + (date << (hashDate - 1)) * (month << 4) + - (year >> hashDate) + ((date * day) >> 1); - - // make sure the events won't collide - let set = new Set(); - let l1 = (seed1 % goodLen + goodLen) % goodLen; - let l2 = (((seed1 << 1) + date) % goodLen + goodLen) % goodLen; - - while (l1 == l2) { - l2 = (l2 + 1) % goodLen; - } - - set.add(goodFortunes[l1].event); - set.add(goodFortunes[l2].event); - - let r1 = (((seed1 >> 1) + (month << 3)) % badLen + badLen) % badLen; - while (set.has(badFortunes[r1].event)) { - r1 = (r1 + 2) % badLen; - } - set.add(badFortunes[r1].event); - let r2 = - ((((((seed1 << 3) + (year >> 5) * (date << 2)) % badLen) * seed2) >> 6) % - badLen + badLen) % badLen; - while (set.has(badFortunes[r2].event)) { - r2 = (r2 + 1) % badLen; - } - - // write l1, l2, r1, r2 - buckets[index][0] = l1; - buckets[index][1] = l2; - buckets[index][2] = r1; - buckets[index][3] = r2; -} diff --git a/dev/plot_gen.py b/dev/plot_gen.py deleted file mode 100644 index da7e757..0000000 --- a/dev/plot_gen.py +++ /dev/null @@ -1,40 +0,0 @@ -import matplotlib.pyplot as plt - -# Data Processing -groups = 2 - -with open('./good_fortune_data.txt', 'r') as f: - good_fortune_data = [int(line.split(' ')[1].strip()) for line in f.readlines()] - good_fortune_data_len = len(good_fortune_data) // groups - -fig, axs = plt.subplots(groups, 1, figsize=(8, 6)) - -axs[0].bar(range(good_fortune_data_len), good_fortune_data[:good_fortune_data_len], color='skyblue', edgecolor='black') -axs[0].set_xlabel("Good Fortune Event Index") -axs[0].set_ylabel("Occurrences") - -axs[1].bar(range(good_fortune_data_len), good_fortune_data[good_fortune_data_len:], color='skyblue', edgecolor='black') -axs[1].set_xlabel("Good Fortune Event Index") -axs[1].set_ylabel("Occurrences") - -plt.tight_layout() - -plt.savefig("../docs/good_fortune_statistics.png") - -with open('./bad_fortune_data.txt', 'r') as f: - bad_fortune_data = [int(line.split(' ')[1].strip()) for line in f.readlines()] - bad_fortune_data_len = len(bad_fortune_data) // groups - -fig, axs = plt.subplots(groups, 1, figsize=(8, 6)) - -axs[0].bar(range(bad_fortune_data_len), bad_fortune_data[:bad_fortune_data_len], color='skyblue', edgecolor='black') -axs[0].set_xlabel("Bad Fortune Event Index") -axs[0].set_ylabel("Occurrences") - -axs[1].bar(range(bad_fortune_data_len), bad_fortune_data[bad_fortune_data_len:], color='skyblue', edgecolor='black') -axs[1].set_xlabel("Bad Fortune Event Index") -axs[1].set_ylabel("Occurrences") - -plt.tight_layout() - -plt.savefig("../docs/bad_fortune_statistics.png") \ No newline at end of file diff --git a/scripts/check-events.py b/scripts/check-events.py new file mode 100644 index 0000000..36d931f --- /dev/null +++ b/scripts/check-events.py @@ -0,0 +1,380 @@ +#!/bin/python3 + +import logging +import collections +import datetime +import argparse +import enum +import json + +class DateType(enum.Enum): + CUSTOM = "custom" + STATIC = "static" + CYCLICAL = "cyclical" + + def __str__(self): + return self.name.lower() + + def __repr__(self): + return str(self) + + @staticmethod + def argparse(s): + try: + return DateType[s.upper()] + except KeyError: + return s + + +args_parser = argparse.ArgumentParser(description="special events checker") +args_parser.add_argument("path", type=str, help="event json file path") +args_parser.add_argument( + "type", + type=DateType.argparse, + choices=[t for t in DateType], + help="event date type", +) + +args = args_parser.parse_args() + +special_events: dict[str, list[dict]] = {} + +try: + with open(args.path) as f: + special_events = json.loads(f.read()) +except json.JSONDecodeError: + print(f"`{args.path}` json syntax error.") + exit(-1) + +except FileNotFoundError: + print(f"`{args.path}` not found.") + print("Please contact developer to solve this problem.") + exit(-1) + +if not isinstance(special_events, dict): + print("`special_events` should be a dict") + exit(-1) + +if "special_events" not in special_events: + print(f"`special_events` not found in `{args.path}`.") + exit(-1) + +if not isinstance(special_events["special_events"], list): + print(f"`special_events` in `{args.path}` should be a list.") + exit(-1) + +MIN_STATUS_INDEX = 0 +MAX_STATUS_INDEX = 7 +DAYSPERMONTH = [0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31] + +errors: dict[int, list[str]] = collections.defaultdict(list) + + +def is_leap_year(year: int) -> bool: + """Determines whether a given year is a leap year. + + Args: + year (int): The year to check. + + Returns: + bool: True if the year is a leap year, False otherwise. + """ + + if year % 400 == 0: + return True + if year % 100 == 0: + return False + if year % 4 == 0: + return True + + return False + + +def validate_number(event_idx: int, value, min: int, max: int, field_name: str) -> int | None: + """Validates whether a given value is an integer within a specified range. + + Args: + event_idx (int): The index of the event for associating validation errors. + value (Any): The value to validate. + min (int): The minimum acceptable value (inclusive). + max (int): The maximum acceptable value (inclusive). + field_name (str): The name of the field being validated, used in error messages. + + Returns: + int | None: The validated integer value if it is within the range, otherwise None. + + Raises: + ValueError: If `value` cannot be converted to an integer. + + Validation Rules: + - If `value` cannot be converted to an integer, an error is recorded and None is returned. + - If `value` is outside the range defined by `min` and `max`, an error is recorded and None is returned. + """ + + try: + value = int(value) + except ValueError: + errors[event_idx].append(f"`{field_name}` should be between {min} and {max}") + return None + + if value < min or value > max: + errors[event_idx].append(f"`{field_name}` should be between {min} and {max}") + return None + + return value + + +def require_field_check( + obj: dict, event_idx: int, fields: list[tuple[str, type]], required_field: str = "" +) -> bool: + """ + Validates the presence and types of required fields in a given object. + + Args: + obj (dict): The object (dictionary) to validate. + event_idx (int): The index of the event for associating validation errors. + fields (list[tuple[str, type]]): A list of tuples where each tuple contains a field name and its expected type. + required_field (str, optional): An optional prefix for error messages to indicate a higher-level required field. Defaults to "". + + Returns: + bool: True if all required fields are present and have the correct types, otherwise False. + + Validation Rules: + - If a required field is missing, an error message is recorded. + - If a field is present but its type does not match the expected type, an error message is recorded. + - The `required_field` parameter, if provided, is prepended to error messages for context. + """ + + error_found = False + for field_name, field_type in fields: + if field_name not in obj: + error_found = True + msg = "" + if required_field != "": + msg = f"`{required_field}` " + + msg += f"missing `{field_name}`." + errors[event_idx].append(msg) + + elif not isinstance(obj[field_name], field_type): + error_found = True + errors[event_idx].append(f"`{field_name}` should be a `{field_type}` type.") + + if error_found: + return False + return True + + +event_names = set() +event_dates = set() + + +def check_structure(event: dict, idx: int): + if not require_field_check( + event, + idx, + [ + ("event", str), + ("triggerDate", dict), + ("status_index", str), + ("goodFortunes", dict), + ("badFortunes", dict), + ], + ): + return False + + event_name: str = event["event"] + if event_name.strip() == "": + errors[idx].append("event name should not empty.") + return + + if event_name in event_names: + errors[idx].append(f"event `{event_name}` already exists.") + + validate_number( + idx, event["status_index"], MIN_STATUS_INDEX, MAX_STATUS_INDEX, "status_index" + ) + + if require_field_check( + event["goodFortunes"], + idx, + [ + ("l_1_event", str), + ("l_1_desc", str), + ("l_2_event", str), + ("l_2_desc", str), + ], + "goodFortunes" + ): + if bool(event["goodFortunes"]["l_1_event"]) ^ bool(event["goodFortunes"]["l_1_desc"]): + # Check for inconsistency: XOR is used to ensure both l_1_event and l_1_desc + # are either both provided or both missing. If only one is provided, log an error. + errors[idx].append("First good fortune is incomplete.") + + if bool(event["goodFortunes"]["l_2_event"]) ^ bool(event["goodFortunes"]["l_2_desc"]): + # Check for inconsistency: XOR is used to ensure both l_2_event and l_2_desc + # are either both provided or both missing. If only one is provided, log an error. + errors[idx].append("Second good fortune is incomplete.") + + if require_field_check( + event["badFortunes"], + idx, + [ + ("r_1_event", str), + ("r_1_desc", str), + ("r_2_event", str), + ("r_2_desc", str), + ], + "badFortunes" + ): + if bool(event["badFortunes"]["r_1_event"]) ^ bool(event["badFortunes"]["r_1_desc"]): + # Check for inconsistency: XOR is used to ensure both r_1_event and r_1_desc + # are either both provided or both missing. If only one is provided, log an error. + errors[idx].append("First bad fortune is incomplete.") + + if bool(event["badFortunes"]["r_2_event"]) ^ bool(event["badFortunes"]["r_2_desc"]): + # Check for inconsistency: XOR is used to ensure both r_2_event and r_2_desc + # are either both provided or both missing. If only one is provided, log an error. + errors[idx].append("Second bad fortune is incomplete.") + + event_names.add(event_name) + + return True + +def check_static_date(event: dict, idx: int): + trigger_date: dict = event["triggerDate"] + corrected = require_field_check( + trigger_date, + idx, + [ + ("month", str), + ("date", str), + ], + "triggerDate", + ) + + event_name: str = event["event"] + if "year" in trigger_date: + errors[idx].append( + f"this event `{event_name}` should be placed in `custom_special.json`." + ) + + if "week" in trigger_date or "weekday" in trigger_date: + errors[idx].append( + f"this event `{event_name}` should be placed in `cyclical_special.json`." + ) + + if not corrected: + return + + month = validate_number(idx, trigger_date["month"], 1, 12, "triggerDate.month") + if month is not None: + validate_number( + idx, trigger_date["date"], 1, DAYSPERMONTH[month], "triggerDate.date" + ) + + +def check_cyclical_date(event: dict, idx: int): + trigger_date: dict = event["triggerDate"] + corrected = require_field_check( + trigger_date, + idx, + [ + ("month", str), + ("week", str), + ("weekday", str), + ], + "triggerDate", + ) + + event_name: str = event["event"] + if "year" in trigger_date: + errors[idx].append( + f"this event `{event_name}` should be placed in `custom_special.json`." + ) + + elif "date" in trigger_date: + errors[idx].append( + f"this event `{event_name}` should be placed in `static_special.json`." + ) + + if not corrected: + return + + validate_number(idx, trigger_date["month"], 1, 12, "triggerDate.month") + validate_number(idx, trigger_date["week"], 1, 5, "triggerDate.week") + validate_number(idx, trigger_date["weekday"], 1, 7, "triggerDate.weekday") + + +def check_custom_date(event: dict, idx: int): + trigger_date: dict = event["triggerDate"] + corrected = require_field_check( + trigger_date, + idx, + [ + ("year", str), + ("month", str), + ("date", str), + ], + "triggerDate", + ) + + event_name: str = event["event"] + if "week" in trigger_date or "weekday" in trigger_date: + errors[idx].append( + f"this event `{event_name}` should be placed in `cyclical_special.json`.", + ) + + elif "year" not in trigger_date: + errors[idx].append( + f"this event `{event_name}` should be placed in `static_special.json`." + ) + + if not corrected: + return + + year = validate_number( + idx, + trigger_date["year"], + datetime.datetime.min.year, + datetime.datetime.max.year, + "triggerDate.year", + ) + month = validate_number(idx, trigger_date["month"], 1, 12, "triggerDate.month") + + if year is None or month is None: + return + + days = DAYSPERMONTH[month] + if month == 2 and is_leap_year(year): + days += 1 # 29 + + date = validate_number(idx, trigger_date["date"], 1, days, "triggerDate.date") + if date is None: + return + + date_str = f"{year}/{month}/{date}" + if date_str in event_dates: + errors[idx].append(f"The date `{date_str}` of `{event_name}` is repeated.") + + event_dates.add(date_str) + + +date_checker = { + DateType.CUSTOM: check_custom_date, + DateType.STATIC: check_static_date, + DateType.CYCLICAL: check_cyclical_date, +} +check_triggerdate = date_checker[args.type] + +for idx, event in enumerate(special_events["special_events"]): + if check_structure(event, idx): + check_triggerdate(event, idx) + +if errors: + logging.error(args.path) + for idx, error_msgs in errors.items(): + logging.error(json.dumps(special_events["special_events"][idx], indent=4)) + for msg in error_msgs: + logging.error(msg) + exit(-1) -- 2.49.1 From b03665545f0863c48f09a4c2889e5fc94ed3776d Mon Sep 17 00:00:00 2001 From: Moon <108756201+LifeAdventurer@users.noreply.github.com> Date: Thu, 6 Feb 2025 17:40:23 +0800 Subject: [PATCH 72/98] CI: Update GitHub actions to latest From https://github.com/LifeAdventurer/generators/actions/runs/13175670602 --- .github/workflows/static.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 6ee98fb..f2c9e97 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -30,14 +30,14 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Pages - uses: actions/configure-pages@v3 + uses: actions/configure-pages@v5 - name: Upload artifact - uses: actions/upload-pages-artifact@v2 + uses: actions/upload-pages-artifact@v3 with: # Upload entire repository path: '.' - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v2 + uses: actions/deploy-pages@v4 -- 2.49.1 From 57f13078473259faae3410e76f084b4f9e8a982e Mon Sep 17 00:00:00 2001 From: tobiichi3227 <86729076+tobiichi3227@users.noreply.github.com> Date: Thu, 6 Feb 2025 21:08:52 +0800 Subject: [PATCH 73/98] Impr(special): Add new special events for January and February (#48) Co-authored-by: ChenKaiLiuG <141424456+ChenKaiLiuG@users.noreply.github.com> --- fortune_generator/json/static_special.json | 200 +++++++++++++++++++++ 1 file changed, 200 insertions(+) diff --git a/fortune_generator/json/static_special.json b/fortune_generator/json/static_special.json index 36bd462..05b4658 100644 --- a/fortune_generator/json/static_special.json +++ b/fortune_generator/json/static_special.json @@ -20,6 +20,46 @@ "r_2_desc": "" } }, + { + "event": "世界邏輯日", + "triggerDate": { + "month": "1", + "date": "14" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "思維訓練", + "l_1_desc": "提高自身邏輯能力", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "陷入死胡同", + "r_1_desc": "記得適當休息", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "國際擁抱日", + "triggerDate": { + "month": "1", + "date": "21" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "擁抱親朋好友", + "l_1_desc": "讓愛流動，增進情感連結", + "l_2_event": "送上擁抱", + "l_2_desc": "透過擁抱表達支持與愛意" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, { "event": "國際資料隱私日", "triggerDate": { @@ -40,6 +80,166 @@ "r_2_desc": "" } }, + { + "event": "世界濕地日", + "triggerDate": { + "month": "2", + "date": "2" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "參與保護濕地活動", + "l_1_desc": "重視濕地，參與保護", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "世界癌症日", + "triggerDate": { + "month": "2", + "date": "4" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "認識癌症", + "l_1_desc": "知道癌症並不可怕", + "l_2_event": "宣導健康生活", + "l_2_desc": "健康飲食運動，預防癌症" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "世界和平日", + "triggerDate": { + "month": "2", + "date": "5" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "參加和平遊行", + "l_1_desc": "支持和平，傳遞非暴力", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "國際比薩日", + "triggerDate": { + "month": "2", + "date": "9" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "品嚐各式比薩", + "l_1_desc": "共享比薩，樂享時光", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "國際氣象節", + "triggerDate": { + "month": "2", + "date": "10" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "了解氣候變化", + "l_1_desc": "認識氣候變遷，保護地球家園", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "世界社會正義日", + "triggerDate": { + "month": "2", + "date": "20" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "提升社會意識", + "l_1_desc": "關注不平等，參與正義行動", + "l_2_event": "支持弱勢群體", + "l_2_desc": "投身於公益事業，支持弱勢族群" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "國際母語日", + "triggerDate": { + "month": "2", + "date": "21" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "傳播母語", + "l_1_desc": "延續母語的使用，保護文化傳承", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, + { + "event": "和平紀念日", + "triggerDate": { + "month": "2", + "date": "28" + }, + "status_index": "0", + "goodFortunes": { + "l_1_event": "參與和平紀念活動", + "l_1_desc": "緬懷歷史，尊重和平的價值", + "l_2_event": "", + "l_2_desc": "" + }, + "badFortunes": { + "r_1_event": "", + "r_1_desc": "", + "r_2_event": "", + "r_2_desc": "" + } + }, { "event": "植樹節", "triggerDate": { -- 2.49.1 From 704032580ba16519666b03bbad34a8757e6c2ec7 Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Thu, 13 Feb 2025 23:14:54 +0800 Subject: [PATCH 74/98] Chore: Remove redundant file --- fortune_generator/js/fortune.js | 2 +- fortune_generator/json/special.json | 768 ---------------------------- 2 files changed, 1 insertion(+), 769 deletions(-) delete mode 100644 fortune_generator/json/special.json diff --git a/fortune_generator/js/fortune.js b/fortune_generator/js/fortune.js index 25df2ff..425a295 100644 --- a/fortune_generator/js/fortune.js +++ b/fortune_generator/js/fortune.js @@ -213,7 +213,7 @@ let special_events_index = 0; // init page async function init_page() { - // fetch fortune.json and special.json + // fetch data from `fortune.json` await fetch_data(); // hide the elements of show fortune page diff --git a/fortune_generator/json/special.json b/fortune_generator/json/special.json deleted file mode 100644 index 3f7a451..0000000 --- a/fortune_generator/json/special.json +++ /dev/null @@ -1,768 +0,0 @@ -{ - "special_events": [ - { - "event": "感恩節", - "triggerDate": { - "month": "11", - "week": "4", - "weekday": "4" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "家人團聚", - "l_1_desc": "分享寶貴時光", - "l_2_event": "吃火雞大餐", - "l_2_desc": "Happy Thanksgiving!" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "棉花糖日", - "triggerDate": { - "month": "12", - "date": "07" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "吃棉花糖", - "l_1_desc": "慶祝棉花糖日", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "貓奴日", - "triggerDate": { - "month": "12", - "date": "15" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "嚕貓", - "l_1_desc": "撫平傷心的心情", - "l_2_event": "喝咖啡", - "l_2_desc": "到貓咪咖啡店去喝咖啡" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "冬至", - "triggerDate": { - "month": "12", - "date": "22" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "吃湯圓", - "l_1_desc": "團團圓圓", - "l_2_event": "保暖", - "l_2_desc": "冬至到了" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "平安夜", - "triggerDate": { - "month": "12", - "date": "24" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "除舊佈新", - "l_1_desc": "平安祥和", - "l_2_event": "交換禮物", - "l_2_desc": "獲得真心的祝福" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "聖誕節", - "triggerDate": { - "month": "12", - "date": "25" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "家庭聚會", - "l_1_desc": "一起團圓吃火雞大餐", - "l_2_event": "注意保暖", - "l_2_desc": "冬至到了" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "元旦", - "triggerDate": { - "month": "1", - "date": "1" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "早起", - "l_1_desc": "心情愉悅迎接新年", - "l_2_event": "大掃除", - "l_2_desc": "新年新氣象" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "國際資料隱私日", - "triggerDate": { - "month": "1", - "date": "28" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "整理資料", - "l_1_desc": "注意在線資料安全", - "l_2_event": "注意隱私", - "l_2_desc": "謹慎上網" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "植樹節", - "triggerDate": { - "month": "3", - "date": "12" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "植樹造林", - "l_1_desc": "保護生態、美化環境", - "l_2_event": "節能減碳", - "l_2_desc": "延長資源壽命" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "白色情人節", - "triggerDate": { - "month": "3", - "date": "14" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "送禮物", - "l_1_desc": "表達愛意和感激之情", - "l_2_event": "觀星", - "l_2_desc": "仰望星空，共描明月" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "世界森林日", - "triggerDate": { - "month": "3", - "date": "21" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "環境教育", - "l_1_desc": "提升對自然的敬重", - "l_2_event": "節約用水", - "l_2_desc": "保護生態系統穩定" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "愚人節", - "triggerDate": { - "month": "4", - "date": "1" - }, - "status_index": "3", - "goodFortunes": { - "l_1_event": "喜笑顏開", - "l_1_desc": "與親朋好友分享快樂", - "l_2_event": "開派對", - "l_2_desc": "組織有趣的活動和遊戲" - }, - "badFortunes": { - "r_1_event": "冒犯他人", - "r_1_desc": "避免製造觸怒人的笑話", - "r_2_event": "惡作劇", - "r_2_desc": "注意避免不必要的麻煩" - } - }, - { - "event": "兒童節", - "triggerDate": { - "month": "4", - "date": "4" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "喜笑顏開", - "l_1_desc": "與親朋好友分享快樂", - "l_2_event": "開派對", - "l_2_desc": "組織有趣的活動和遊戲" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "世界健康日", - "triggerDate": { - "month": "4", - "date": "7" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "健康飲食", - "l_1_desc": "多攝取水果、蔬菜和全穀食品", - "l_2_event": "運動鍛煉", - "l_2_desc": "保持身體健康和活力" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "世界地球日", - "triggerDate": { - "month": "4", - "date": "22" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "環保行動", - "l_1_desc": "參與植樹造林或垃圾回收等環保行動", - "l_2_event": "節能減排", - "l_2_desc": "選擇環保型交通工具" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "世界閱讀日", - "triggerDate": { - "month": "4", - "date": "23" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "推廣閱讀", - "l_1_desc": "激發對知識的渴望", - "l_2_event": "書籍分享", - "l_2_desc": "與他人分享你的書單" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "世界智慧財產權日", - "triggerDate": { - "month": "4", - "date": "26" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "保護創意", - "l_1_desc": "尊重他人的創意和智慧財產權，共同維護創作人的權益", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "星際大戰日", - "triggerDate": { - "month": "5", - "date": "04" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "電影馬拉松", - "l_1_desc": "播放所有星際大戰電影", - "l_2_event": "感受原力", - "l_2_desc": "May the force be with you, always." - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "世界微笑日", - "triggerDate": { - "month": "5", - "date": "08" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "微笑", - "l_1_desc": "用微笑向世界問好", - "l_2_event": "放慢腳步", - "l_2_desc": "觀察四周的美好事物" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "母親節", - "triggerDate": { - "month": "5", - "week": "2", - "weekday": "7" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "家庭聚餐", - "l_1_desc": "表達對媽媽的感恩之心", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "世界環境日", - "triggerDate": { - "month": "6", - "date": "05" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "少用塑膠", - "l_1_desc": "選擇可重複使用的替代品", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "世界獻血者日", - "triggerDate": { - "month": "6", - "date": "14" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "捐血", - "l_1_desc": "捐出血液和血漿，分享生命要時常", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "夏至", - "triggerDate": { - "year": "2024", - "month": "6", - "date": "20" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "觀賞日出和日落", - "l_1_desc": "享受一年最長的白天", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "巧克力日", - "triggerDate": { - "month": "7", - "date": "07" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "送巧克力", - "l_1_desc": "共享巧克力盛宴", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "宅宅日", - "triggerDate": { - "month": "7", - "date": "13" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "觀影", - "l_1_desc": "看心愛的電影或影集", - "l_2_event": "閱讀", - "l_2_desc": "享受片刻的寧靜" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "國際冷笑話日", - "triggerDate": { - "month": "7", - "date": "24" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "講冷笑話", - "l_1_desc": "一起嘻嘻哈哈", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "國際友誼日", - "triggerDate": { - "month": "7", - "date": "30" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "與朋友聯絡", - "l_1_desc": "回憶美好時光", - "l_2_event": "一起出遊", - "l_2_desc": "增進彼此的感情" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "國際左撇子日", - "triggerDate": { - "month": "8", - "date": "13" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "挑戰新事物", - "l_1_desc": "嘗試用左手完成任務", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "世界攝影日", - "triggerDate": { - "month": "8", - "date": "19" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "拍攝照片", - "l_1_desc": "捕捉生活中的美好瞬間", - "l_2_event": "分享作品", - "l_2_desc": "展示您的攝影技巧" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "國際狗狗日", - "triggerDate": { - "month": "8", - "date": "26" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "陪伴狗狗", - "l_1_desc": "帶狗狗散步或遊玩", - "l_2_event": "分享作品", - "l_2_desc": "展示您的攝影技巧" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "國際慈善日", - "triggerDate": { - "month": "9", - "date": "5" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "捐贈物資", - "l_1_desc": "捐贈物資或金錢，幫助有需要的人", - "l_2_event": "參與志願活動", - "l_2_desc": "參加社區慈善活動，提升社會貢獻" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "中秋節", - "triggerDate": { - "year": "2024", - "month": "9", - "date": "17" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "賞月", - "l_1_desc": "與家人一同賞月，增進感情", - "l_2_event": "吃月餅", - "l_2_desc": "與家人朋友分享月餅的美味" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "國際和平日", - "triggerDate": { - "month": "9", - "date": "21" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "分享愛心", - "l_1_desc": "與他人分享關懷與愛心，促進和平", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "教師節", - "triggerDate": { - "month": "9", - "date": "28" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "感謝老師", - "l_1_desc": "向老師表達感謝，增進師生情誼", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "世界糧食日", - "triggerDate": { - "month": "10", - "date": "16" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "節約糧食", - "l_1_desc": "支持可持續的食物系統", - "l_2_event": "捐贈食品", - "l_2_desc": "捐贈食物給有需要的人，傳遞愛心" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "聯合國日", - "triggerDate": { - "month": "10", - "date": "24" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "支持和平", - "l_1_desc": "參與促進世界和平的活動", - "l_2_event": "了解國際事務", - "l_2_desc": "增強全球視野" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - }, - { - "event": "萬聖節", - "triggerDate": { - "month": "10", - "date": "31" - }, - "status_index": "4", - "goodFortunes": { - "l_1_event": "扮演角色", - "l_1_desc": "穿上喜愛的角色服裝，享受萬聖節的氛圍", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "忽略安全", - "r_2_desc": "活動時忽視安全措施可能帶來風險" - } - }, - { - "event": "世界善心日", - "triggerDate": { - "month": "11", - "date": "13" - }, - "status_index": "0", - "goodFortunes": { - "l_1_event": "善待他人", - "l_1_desc": "在生活中多一些善意與寬容", - "l_2_event": "", - "l_2_desc": "" - }, - "badFortunes": { - "r_1_event": "", - "r_1_desc": "", - "r_2_event": "", - "r_2_desc": "" - } - } - ] -} -- 2.49.1 From 4391176199c2bea8a8fcbd76553e2da4d675a76e Mon Sep 17 00:00:00 2001 From: tobiichi3227 <86729076+tobiichi3227@users.noreply.github.com> Date: Sun, 16 Feb 2025 14:50:49 +0800 Subject: [PATCH 75/98] Chore: Update service-worker special file cache (#53) --- fortune_generator/js/service-worker.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fortune_generator/js/service-worker.js b/fortune_generator/js/service-worker.js index 24bf3f9..7eebada 100644 --- a/fortune_generator/js/service-worker.js +++ b/fortune_generator/js/service-worker.js @@ -18,7 +18,9 @@ const NEED_UPDATE = [ "/fortune_generator/css/styles.css", "/fortune_generator/js/fortune.js", "/fortune_generator/js/matrix.js", - "/fortune_generator/json/special.json", + "/fortune_generator/json/custom_special.json", + "/fortune_generator/json/cyclical_special.json", + "/fortune_generator/json/static_special.json", "/fortune_generator/json/fortune.json", "/fortune_generator/json/manifest.json", "https://api.ipify.org/?format=json", -- 2.49.1 From 32e3156d30c2ddee9d86d1495e86dbb2e9b25480 Mon Sep 17 00:00:00 2001 From: tobiichi3227 <86729076+tobiichi3227@users.noreply.github.com> Date: Mon, 17 Feb 2025 07:44:41 +0800 Subject: [PATCH 76/98] Fix(Fortune): properly display Unicode characters (#54) --- scripts/check-events.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/check-events.py b/scripts/check-events.py index 36d931f..76d2256 100644 --- a/scripts/check-events.py +++ b/scripts/check-events.py @@ -374,7 +374,7 @@ for idx, event in enumerate(special_events["special_events"]): if errors: logging.error(args.path) for idx, error_msgs in errors.items(): - logging.error(json.dumps(special_events["special_events"][idx], indent=4)) + logging.error(json.dumps(special_events["special_events"][idx], indent=4, ensure_ascii=False)) for msg in error_msgs: logging.error(msg) exit(-1) -- 2.49.1 From 52d09db764224c0d615c8d824db2330e8f495657 Mon Sep 17 00:00:00 2001 From: tobiichi3227 <86729076+tobiichi3227@users.noreply.github.com> Date: Fri, 21 Feb 2025 01:00:49 +0800 Subject: [PATCH 77/98] Chore(Fortune): add pre-commit to check special events (#55) * Chore(Fortune): add pre-commit to check special events * Chore(Fortune): Update pre-commit hook version * Chore(Fortune): replace shell script with Python for better compatibility --- .pre-commit-config.yaml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..e01afb6 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,36 @@ +# See https://pre-commit.com for more information +# See https://pre-commit.com/hooks.html for more hooks +repos: +- repo: https://github.com/pre-commit/pre-commit-hooks + rev: v5.0.0 + hooks: + - id: trailing-whitespace + - id: end-of-file-fixer + - id: check-yaml + - id: check-added-large-files + +- repo: local + hooks: + - id: check-cyclical-event + name: check-cyclical-event + entry: python3 scripts/check-events.py fortune_generator/json/cyclical_special.json cyclical + language: python + files: fortune_generator/json/cyclical_special.json + types: [json] + pass_filenames: false + + - id: check-custom-event + name: check-custom-event + entry: python3 scripts/check-events.py fortune_generator/json/custom_special.json custom + language: python + files: fortune_generator/json/custom_special.json + types: [json] + pass_filenames: false + + - id: check-static-event + name: check-static-event + entry: python3 scripts/check-events.py fortune_generator/json/static_special.json static + language: python + files: fortune_generator/json/static_special.json + types: [json] + pass_filenames: false -- 2.49.1 From f7d450895f3eb9f468744efa377ce6ffb1a05ca6 Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Sat, 22 Feb 2025 00:38:30 +0800 Subject: [PATCH 78/98] Refactor: Update service worker paths --- fortune_generator/js/service-worker.js | 30 +++++++++++++------------- fortune_generator/manifest.json | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/fortune_generator/js/service-worker.js b/fortune_generator/js/service-worker.js index 7eebada..1702ced 100644 --- a/fortune_generator/js/service-worker.js +++ b/fortune_generator/js/service-worker.js @@ -2,27 +2,27 @@ const pre_cache_file_version = "pre-v1.1.0"; const auto_cache_file_version = "auto-v1.1.0"; const ASSETS = [ - "/images/lifeadventurer-192x192.png", - "/images/lifeadventurer-512x512.png", - "/images/lifeadventurer-180x180.png", - "/images/lifeadventurer-270x270.png", - "/images/lifeadventurer.jpg", + "/generators/images/lifeadventurer-192x192.png", + "/generators/images/lifeadventurer-512x512.png", + "/generators/images/lifeadventurer-180x180.png", + "/generators/images/lifeadventurer-270x270.png", + "/generators/images/lifeadventurer.jpg", "https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css", "https://ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js", ]; const NEED_UPDATE = [ - "/fortune_generator/", - "/fortune_generator/index.html", - "/fortune_generator/css/styles.css", - "/fortune_generator/js/fortune.js", - "/fortune_generator/js/matrix.js", - "/fortune_generator/json/custom_special.json", - "/fortune_generator/json/cyclical_special.json", - "/fortune_generator/json/static_special.json", - "/fortune_generator/json/fortune.json", - "/fortune_generator/json/manifest.json", + "/generators/fortune_generator/", + "/generators/fortune_generator/index.html", + "/generators/fortune_generator/css/styles.css", + "/generators/fortune_generator/js/fortune.js", + "/generators/fortune_generator/js/matrix.js", + "/generators/fortune_generator/json/custom_special.json", + "/generators/fortune_generator/json/cyclical_special.json", + "/generators/fortune_generator/json/static_special.json", + "/generators/fortune_generator/json/fortune.json", + "/generators/fortune_generator/json/manifest.json", "https://api.ipify.org/?format=json", ]; diff --git a/fortune_generator/manifest.json b/fortune_generator/manifest.json index 6426e93..9f82ca8 100644 --- a/fortune_generator/manifest.json +++ b/fortune_generator/manifest.json @@ -26,7 +26,7 @@ "type": "image/png" } ], - "start_url": "/fortune_generator/index.html", + "start_url": "/generators/fortune_generator/index.html", "display": "standalone", "orientation": "portrait" } -- 2.49.1 From 16b7c8dde1ee68709c7a780db918a282a5545abf Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Sat, 22 Feb 2025 01:30:08 +0800 Subject: [PATCH 79/98] Feat: Add seedMagic --- fortune_generator/js/fortune.js | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/fortune_generator/js/fortune.js b/fortune_generator/js/fortune.js index 425a295..d2f43c3 100644 --- a/fortune_generator/js/fortune.js +++ b/fortune_generator/js/fortune.js @@ -342,7 +342,21 @@ function Appear() { hashDate + (date * day) >> 1; // decide the status - status_index = ((seed1 + seed2) % statusLen + statusLen) % statusLen; + let seedMagic = 0; + if (seed1 > seed2) { + seedMagic = (seed1 ^ seed2) + parseInt(seed1.toString().split('').reverse().join('')); + } else if (seed1 < seed2) { + let collatzLen = 0; + let temp = Math.abs(seed1 - seed2); + while (temp !== 1) { + temp = temp % 2 === 0 ? temp / 2 : 3 * temp + 1; + collatzLen++; + } + seedMagic = collatzLen + seed2.toString(2).replace(/0/g, '').length; + } else { + seedMagic = seed1 + seed2; + } + status_index = ((seedMagic) % statusLen + statusLen) % statusLen; // update last record localStorage.setItem("last_date", d.toISOString()); -- 2.49.1 From 4531962dbb2a399d8c71fd3b34f7b12bf32884ed Mon Sep 17 00:00:00 2001 From: lifeadventurer Date: Sat, 22 Feb 2025 23:17:24 +0800 Subject: [PATCH 80/98] Chore: Update copyright to 2023-2025 --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index e4e3d1b..ccb5628 100644 --- a/index.html +++ b/index.html @@ -83,7 +83,7 @@