From 73fc1f8c1dd48ba3a610657b6ed40232359713ce Mon Sep 17 00:00:00 2001 From: olaadam Date: Sat, 11 Jan 2025 21:47:18 +0100 Subject: [PATCH 1/4] zmianki --- apka/app/__pycache__/main.cpython-310.pyc | Bin 351 -> 360 bytes .../__pycache__/__init__.cpython-310.pyc | Bin 555 -> 564 bytes .../calendar_integration.cpython-310.pyc | Bin 1808 -> 1817 bytes .../backend/__pycache__/note.cpython-310.pyc | Bin 2168 -> 2168 bytes .../__pycache__/recording.cpython-310.pyc | Bin 3118 -> 3127 bytes .../__pycache__/routes.cpython-310.pyc | Bin 5897 -> 5898 bytes apka/app/frontend/static/record.js | 8 ------ apka/app/frontend/static/styles.css | 23 +++--------------- apka/app/frontend/templates/index.html | 10 +++++--- apka/app/frontend/templates/my_notes.html | 2 +- .../app/frontend/templates/my_recordings.html | 5 +++- 11 files changed, 15 insertions(+), 33 deletions(-) diff --git a/apka/app/__pycache__/main.cpython-310.pyc b/apka/app/__pycache__/main.cpython-310.pyc index 9977f59ebaaeb11c0c08ae9ce74be61d70febc5a..3d91f96d75aa90df650ac528aa79c475443a6edd 100644 GIT binary patch delta 69 zcmcc5^n!^ypO=@50SG3~s-MXHPuJGjDkiizwWv5IKPNFhF~%i7ximL5ucSD}J+s84 XG%2Q_C_gJTyCmMoz{qs6E~60uBTN^7 delta 60 zcmaFCbf1YkpO=@50SN9KteeRFPsPO9DkiizwWv5IIU^^tAjTy>ximL5ucSDppeR2p OHM=A}Gk>xfqY(gYP!(zb diff --git a/apka/app/backend/__pycache__/__init__.cpython-310.pyc b/apka/app/backend/__pycache__/__init__.cpython-310.pyc index 647e1ddd0cb809fdd540c525049e26b31ab1777b..38d43ad81baa85328ed799a30eb6381434546980 100644 GIT binary patch delta 70 zcmZ3@vW0~^pO=@50SG3~s^7?6%BbtIlb@3qpBUqkpIn-onpaXBIlbn&0SrFrrpIn-onpaXBQ&5zj Pm6}}=pP4^-En_Ilb@3qpBUqkpIn-onpaXB5db7v7vcZ_ delta 62 zcmbQqH-V2kpO=@50SN9KtlP*P#;W4uY!wq)oLW>Ilbn&0SrFrrpIn-onpaXBQ&5zj Qm6}}=pP9e8kF}c-09hdwPXGV_ diff --git a/apka/app/backend/__pycache__/note.cpython-310.pyc b/apka/app/backend/__pycache__/note.cpython-310.pyc index d287085916d13438009c57ba30316dfe40fc2ac5..1adb6ae67def020aa292aaeac011f2628bcb4d86 100644 GIT binary patch delta 31 lcmew%@I!z*pO=@50SM0DXxhl#!^oPSlNg`4c@EY%fyrch#!6i;XRDad;?$zz tnEaf?_{12O{N&Qy)Vz}7828K)kJ6-=f};Ga)a;UYBLgGT&371sxBw#-9<2ZX delta 82 zcmdlku}*?JpO=@50SIh($ diff --git a/apka/app/backend/__pycache__/routes.cpython-310.pyc b/apka/app/backend/__pycache__/routes.cpython-310.pyc index ab770c8381cf26552be9f17e40270cf973ee52c7..76cab082d2d3b3d8f1104d2bc0fd9bffbaaea1f3 100644 GIT binary patch delta 61 zcmeCw>(b-R=jG*M0D|*3n$quV(t}T=jG*M0D`A=_37U?@-AX#P0q;4EZDq-`9BjQ^W-gT%O}UMr*knUmSsk< Ol&2=;Za&Ly%MSoJI1{k| diff --git a/apka/app/frontend/static/record.js b/apka/app/frontend/static/record.js index 3cfc343..b9380d8 100644 --- a/apka/app/frontend/static/record.js +++ b/apka/app/frontend/static/record.js @@ -30,14 +30,6 @@ let stream; // Przechowujemy odniesienie do strumienia let recordingStartTime; let timerInterval; -see_events.addEventListener("click", () => { - window.location.href = "/events"; // Przenosi użytkownika na podstronę /events -}); - -see_recordings.addEventListener("click", () => { - window.location.href = "/my_recordings"; // Przenosi użytkownika na podstronę /recordings -}); - // Funkcja do pobrania okna async function selectWindow() { diff --git a/apka/app/frontend/static/styles.css b/apka/app/frontend/static/styles.css index 525ca3a..c2c2d7a 100644 --- a/apka/app/frontend/static/styles.css +++ b/apka/app/frontend/static/styles.css @@ -64,9 +64,10 @@ button:disabled { #record-btn { background-color: #800080; color: white; + margin-top: 10px; font-size: 20px; border-radius: 20px; - transition: transform 0.2s ease, background-color 0.2s ease; + transition: transform 0.3s ease, background-color 0.3s ease; } #record-btn:hover { @@ -97,16 +98,7 @@ button:disabled { transform: scale(1.05); } -#events-btn { - background-color: rgb(226, 178, 212); - margin-bottom: 10px; - color: black; - padding: 10px 20px; - font-size: 20px; - cursor: pointer; - transition: background-color 0.3s, transform 0.3s; -} -#recordings-btn { +#events-btn, #recordings-btn, #notes-btn { background-color: rgb(226, 178, 212); margin-top: 10px; color: black; @@ -115,15 +107,6 @@ button:disabled { cursor: pointer; transition: background-color 0.3s, transform 0.3s; } -#notes-btn { - background-color: rgb(226, 178, 212); - margin-bottom: 10px; - color: black; - padding: 10px 20px; - font-size: 20px; - cursor: pointer; - transition: background-color 0.3s, transform 0.3s; -} #events-btn:hover { background-color: #ea72c8; diff --git a/apka/app/frontend/templates/index.html b/apka/app/frontend/templates/index.html index 6404682..4a8040e 100644 --- a/apka/app/frontend/templates/index.html +++ b/apka/app/frontend/templates/index.html @@ -11,9 +11,13 @@

Witaj w aplikacji!

- - - + + + + + + + diff --git a/apka/app/frontend/templates/my_notes.html b/apka/app/frontend/templates/my_notes.html index ca5c5aa..db52df2 100644 --- a/apka/app/frontend/templates/my_notes.html +++ b/apka/app/frontend/templates/my_notes.html @@ -18,7 +18,7 @@

Moje Notatki

diff --git a/apka/app/frontend/templates/my_recordings.html b/apka/app/frontend/templates/my_recordings.html index 2ba076f..c606c69 100644 --- a/apka/app/frontend/templates/my_recordings.html +++ b/apka/app/frontend/templates/my_recordings.html @@ -18,7 +18,9 @@

My Recordings

@@ -39,6 +41,7 @@

My Recordings

diff --git a/apka/app/frontend/templates/record.html b/apka/app/frontend/templates/record.html new file mode 100644 index 0000000..480d727 --- /dev/null +++ b/apka/app/frontend/templates/record.html @@ -0,0 +1,29 @@ + + + + + + NoteWriter + + + + + + +
+
+

Nagraj wybrane okno

+ +
+ + +
+

Zapisz nagranie

+ + +
+
+ + \ No newline at end of file