diff options
| -rw-r--r-- | backend/main.py | 10 | ||||
| -rw-r--r-- | frontend/.DS_Store | bin | 0 -> 6148 bytes | |||
| -rw-r--r-- | frontend/assets/.DS_Store | bin | 0 -> 6148 bytes | |||
| -rw-r--r-- | frontend/assets/fonts/Inter-Italic-VariableFont_opsz,wght.ttf | bin | 0 -> 904532 bytes | |||
| -rw-r--r-- | frontend/assets/fonts/Inter-VariableFont_opsz,wght.ttf | bin | 0 -> 874708 bytes | |||
| -rw-r--r-- | frontend/assets/img/dryer_clothes.png (renamed from frontend/dryer_clothes.png) | bin | 36448 -> 36448 bytes | |||
| -rw-r--r-- | frontend/assets/img/dryer_off.png (renamed from frontend/dryer_off.png) | bin | 31935 -> 31935 bytes | |||
| -rw-r--r-- | frontend/assets/img/dryer_on.png (renamed from frontend/dryer_on.png) | bin | 41171 -> 41171 bytes | |||
| -rw-r--r-- | frontend/assets/img/washer_clothes.png (renamed from frontend/washer_clothes.png) | bin | 37298 -> 37298 bytes | |||
| -rw-r--r-- | frontend/assets/img/washer_off.png (renamed from frontend/washer_off.png) | bin | 32719 -> 32719 bytes | |||
| -rw-r--r-- | frontend/assets/img/washer_on.png (renamed from frontend/washer_on.png) | bin | 40206 -> 40206 bytes | |||
| -rw-r--r-- | frontend/main.js | 20 | ||||
| -rw-r--r-- | frontend/start/index.html | 8 | ||||
| -rw-r--r-- | frontend/status/index.html | 8 | ||||
| -rw-r--r-- | frontend/style.css | 13 |
15 files changed, 38 insertions, 21 deletions
diff --git a/backend/main.py b/backend/main.py index a667439..ce8f103 100644 --- a/backend/main.py +++ b/backend/main.py @@ -290,14 +290,14 @@ def check_status(response: fastapi.Response, session_key: Annotated[str | None, # --- fetch machine status for block @app.post("/status") -def get_machine_status(data: BlockRequestData): +def get_machine_status(data: BlockRequestData, auth_block: Annotated[str | None, fastapi.Cookie()] = None): block_idx = data.block - 1 return [machine_status[block_idx], machine_times[block_idx], machine_durations[block_idx]] # --- get laundr(y/ies) information of user @app.post("/laundry") -def get_laundry_info(response: fastapi.Response, session_key: Annotated[str | None, fastapi.Cookie()] = None): +def get_laundry_info(response: fastapi.Response, session_key: Annotated[str | None, fastapi.Cookie()] = None, auth_block: Annotated[str | None, fastapi.Cookie()] = None): if session_key: result = [] @@ -350,3 +350,9 @@ def finish_laundry(data: FinishRequestData, response: fastapi.Response, session_ else: response.status_code = fastapi.status.HTTP_401_UNAUTHORIZED return "you got no session key, cannot" + + +# --- get information from uri search query +@app.post("/info") +def uri_to_information(data: FinishRequestData): + pass diff --git a/frontend/.DS_Store b/frontend/.DS_Store Binary files differnew file mode 100644 index 0000000..49fe6a7 --- /dev/null +++ b/frontend/.DS_Store diff --git a/frontend/assets/.DS_Store b/frontend/assets/.DS_Store Binary files differnew file mode 100644 index 0000000..4e6198d --- /dev/null +++ b/frontend/assets/.DS_Store diff --git a/frontend/assets/fonts/Inter-Italic-VariableFont_opsz,wght.ttf b/frontend/assets/fonts/Inter-Italic-VariableFont_opsz,wght.ttf Binary files differnew file mode 100644 index 0000000..43ed4f5 --- /dev/null +++ b/frontend/assets/fonts/Inter-Italic-VariableFont_opsz,wght.ttf diff --git a/frontend/assets/fonts/Inter-VariableFont_opsz,wght.ttf b/frontend/assets/fonts/Inter-VariableFont_opsz,wght.ttf Binary files differnew file mode 100644 index 0000000..e31b51e --- /dev/null +++ b/frontend/assets/fonts/Inter-VariableFont_opsz,wght.ttf diff --git a/frontend/dryer_clothes.png b/frontend/assets/img/dryer_clothes.png Binary files differindex babfc36..babfc36 100644 --- a/frontend/dryer_clothes.png +++ b/frontend/assets/img/dryer_clothes.png diff --git a/frontend/dryer_off.png b/frontend/assets/img/dryer_off.png Binary files differindex 9919a01..9919a01 100644 --- a/frontend/dryer_off.png +++ b/frontend/assets/img/dryer_off.png diff --git a/frontend/dryer_on.png b/frontend/assets/img/dryer_on.png Binary files differindex 7851dd5..7851dd5 100644 --- a/frontend/dryer_on.png +++ b/frontend/assets/img/dryer_on.png diff --git a/frontend/washer_clothes.png b/frontend/assets/img/washer_clothes.png Binary files differindex b16688a..b16688a 100644 --- a/frontend/washer_clothes.png +++ b/frontend/assets/img/washer_clothes.png diff --git a/frontend/washer_off.png b/frontend/assets/img/washer_off.png Binary files differindex 0be7233..0be7233 100644 --- a/frontend/washer_off.png +++ b/frontend/assets/img/washer_off.png diff --git a/frontend/washer_on.png b/frontend/assets/img/washer_on.png Binary files differindex 7b811a4..7b811a4 100644 --- a/frontend/washer_on.png +++ b/frontend/assets/img/washer_on.png diff --git a/frontend/main.js b/frontend/main.js index 06938ed..e677c68 100644 --- a/frontend/main.js +++ b/frontend/main.js @@ -106,25 +106,25 @@ async function updateMachines() { for (let i = 0; i < status[0].length; i++) { if (status[0][i] == "RUNNING") { if ((i + 1) % 2 == 0) { - machine_imgs[i].src = "/washer_on.png"; + machine_imgs[i].src = "/assets/img/washer_on.png"; } else { - machine_imgs[i].src = "/dryer_on.png"; + machine_imgs[i].src = "/assets/img/dryer_on.png"; } const now = Date.now(); const start = Date.parse(status[1][i]); machine_txts[i].innerHTML = Math.ceil(((start + (status[2][i] * 60000)) - now) / 60000).toString() + " min(s) left"; } else if (status[0][i] == "FINISHED") { if ((i + 1) % 2 == 0) { - machine_imgs[i].src = "/washer_clothes.png"; + machine_imgs[i].src = "/assets/img/washer_clothes.png"; } else { - machine_imgs[i].src = "/dryer_clothes.png"; + machine_imgs[i].src = "/assets/img/dryer_clothes.png"; } machine_txts[i].innerHTML = "Idle" } else { if ((i + 1) % 2 == 0) { - machine_imgs[i].src = "/washer_off.png"; + machine_imgs[i].src = "/assets/img/washer_off.png"; } else { - machine_imgs[i].src = "/dryer_off.png"; + machine_imgs[i].src = "/assets/img/dryer_off.png"; } machine_txts[i].innerHTML = "Idle" } @@ -155,19 +155,19 @@ async function startLoadTimers() { <div class="machine-container"> <div class="txtcol-dryer ${timers[i]["machine"] == 1 ? "machine-selected" : ""}"> <span>Dryer 1</span> - <img src="/dryer_${timers[i]["machine"] == 1 ? "on" : "off"}.png" alt=""> + <img src="/assets/img/dryer_${timers[i]["machine"] == 1 ? "on" : "off"}.png" alt=""> </div> <div class="txtcol-washer ${timers[i]["machine"] == 2 ? "machine-selected" : ""}"> <span>Washer 1</span> - <img src="/washer_${timers[i]["machine"] == 2 ? "on" : "off"}.png" alt=""> + <img src="/assets/img/washer_${timers[i]["machine"] == 2 ? "on" : "off"}.png" alt=""> </div> <div class="txtcol-dryer ${timers[i]["machine"] == 3 ? "machine-selected" : ""}"> <span>Dryer 2</span> - <img src="/dryer_${timers[i]["machine"] == 3 ? "on" : "off"}.png" alt=""> + <img src="/assets/img/dryer_${timers[i]["machine"] == 3 ? "on" : "off"}.png" alt=""> </div> <div class="txtcol-washer ${timers[i]["machine"] == 4 ? "machine-selected" : ""}"> <span>Washer 2</span> - <img src="/washer_${timers[i]["machine"] == 4 ? "on" : "off"}.png" alt=""> + <img src="/assets/img/washer_${timers[i]["machine"] == 4 ? "on" : "off"}.png" alt=""> </div> </div> <div class="timer-container"> diff --git a/frontend/start/index.html b/frontend/start/index.html index ec3f976..aff7020 100644 --- a/frontend/start/index.html +++ b/frontend/start/index.html @@ -34,22 +34,22 @@ <div class="machine-container"> <div class="txtcol-dryer" id="dryer1"> <span>Dryer 1</span> - <img src="/dryer_off.png" alt="" id="dryer1-img"> + <img src="/assets/img/dryer_off.png" alt="" id="dryer1-img"> <span id="dryer1-span"></span> </div> <div class="txtcol-washer machine-selected" id="washer1"> <span>Washer 1</span> - <img src="/washer_off.png" alt="" id="washer1-img"> + <img src="/assets/img/washer_off.png" alt="" id="washer1-img"> <span id="washer1-span"></span> </div> <div class="txtcol-dryer" id="dryer2"> <span>Dryer 2</span> - <img src="/dryer_off.png" alt="" id="dryer2-img"> + <img src="/assets/img/dryer_off.png" alt="" id="dryer2-img"> <span id="dryer2-span"></span> </div> <div class="txtcol-washer" id="washer2"> <span>Washer 2</span> - <img src="/washer_off.png" alt="" id="washer2-img"> + <img src="/assets/img/washer_off.png" alt="" id="washer2-img"> <span id="washer2-span"></span> </div> </div> diff --git a/frontend/status/index.html b/frontend/status/index.html index 61a2e06..49103f3 100644 --- a/frontend/status/index.html +++ b/frontend/status/index.html @@ -32,22 +32,22 @@ <div class="machine-container"> <div class="txtcol-dryer" id="dryer1"> <span>Dryer 1</span> - <img src="/dryer_off.png" alt="" id="dryer1-img"> + <img src="/assets/img/dryer_off.png" alt="" id="dryer1-img"> <span id="dryer1-span"></span> </div> <div class="txtcol-washer" id="washer1"> <span>Washer 1</span> - <img src="/washer_off.png" alt="" id="washer1-img"> + <img src="/assets/img/washer_off.png" alt="" id="washer1-img"> <span id="washer1-span"></span> </div> <div class="txtcol-dryer" id="dryer2"> <span>Dryer 2</span> - <img src="/dryer_off.png" alt="" id="dryer2-img"> + <img src="/assets/img/dryer_off.png" alt="" id="dryer2-img"> <span id="dryer2-span"></span> </div> <div class="txtcol-washer" id="washer2"> <span>Washer 2</span> - <img src="/washer_off.png" alt="" id="washer2-img"> + <img src="/assets/img/washer_off.png" alt="" id="washer2-img"> <span id="washer2-span"></span> </div> </div> diff --git a/frontend/style.css b/frontend/style.css index 5713576..1820d2b 100644 --- a/frontend/style.css +++ b/frontend/style.css @@ -1,3 +1,10 @@ +@font-face { + font-family: "Inter"; + src: + url("/assets/fonts/Inter-VariableFont_opsz,wght.tff") + url("/assets/fonts/Inter-Italic-VariableFont_opsz,wght.tff"); +} + :root { --col-1: #93B6B1; --col-2: #E8DEB6; @@ -15,7 +22,7 @@ body { flex-direction: column; gap: 16px; padding: 16px; - font-family: sans-serif; + font-family: Inter, sans-serif; } .section-container { @@ -231,3 +238,7 @@ body { #logo { font-size: 2rem; } + +button { + font-family: Inter, sans-serif; +} |
