From 61d9be5b7175707727035dfa176e77cff2680ffe Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Thu, 6 Jul 2023 14:47:26 +0800
Subject: [PATCH 001/133] index futures logos

---
 logos/indices/ES=F.png  | Bin 0 -> 1353 bytes
 logos/indices/NQ=F.png  | Bin 0 -> 1353 bytes
 logos/indices/RTY=F.png | Bin 0 -> 1353 bytes
 logos/indices/YM=F.png  | Bin 0 -> 1353 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 logos/indices/ES=F.png
 create mode 100644 logos/indices/NQ=F.png
 create mode 100644 logos/indices/RTY=F.png
 create mode 100644 logos/indices/YM=F.png

diff --git a/logos/indices/ES=F.png b/logos/indices/ES=F.png
new file mode 100644
index 0000000000000000000000000000000000000000..f051711dd7e091c2871e77116158967deaf9ed33
GIT binary patch
literal 1353
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9GG
z!XV7ZFl&wk0|S$7fKP}kQ1U+v%-{D2#zdzdzW#Ro$>-U-9~I5J%n-CiB5Bu+2d_SS
z`0(k|r=LH6{{8zGuHpBef3H6Lh@NoXqWn<)><i~_y~v+)K_Pw5*RNmU%KrTMbNK2j
z?#S)TAzLSHy7A`i`}Aq&#6#Dg$?1HY-|}wdw!hzg01Z5L<89sY>q(Q(^2h8boqy4`
z>ac&?2{Er_hd4}cFsMHb%K35S_LWDUtgDXlL~Z8?-^LQM^?_-~r`0<?efu5ObGCNL
zW$BdNoDti)*Ij21-v(3+ab(7fOH#?Zde&Wk_VVqnGml;Bj~W#p+;-~G%Qx@l?YbkG
zyh}V}-I<i8M`^Y17H|Cb^Vj1y-(4GyK6&wW;>H_nVOtr4x3sOg7TbUN@85rUbFP?`
z9TJS);ZSpgFM3Bv=SjZk?LcqddiKSz=zvMdL5PieFTIjU-OUudW&Z9vq6s@?Q+IDZ
z@lZZ}k3{^AYbUO~yL#)#`;S1CFW-KM>^;@8^6I|xPfSY>s%7upb@uV>9k=gkd4HI@
zX34(0N*Q|t+E4VYzrhu`y?6cfuC>?WC!S#q-6|NjQ!sX?cGTMA@*cM&tZ&_a`TFMF
zcQ@_;qvqqX&9|lPeqO)(|IeRi(IvkgJ_Di;I}bnWn)UDdkAMIEK_Uf6e*XOV*RNkd
zXZ(Ku@%@(lPa7w{-@NbNuU~&Zefj<9`Lmc(Ao*eTs(YGVA7-umFlRMT<<o6(&A<e-
zza+>nn1NX%W$~qVfB(F_xL9r}$U9*0afvK%=MyOBafkL5C=*Cs33-6vJb<ttT!jc-
z<?BSqfmxl8p#n>x^b(*Q>dDBe7Qs1-;Vc*fDED#c|D`~ebY8il_2B=5V318$fldRN
zw>WkF_32N5ndX+Ki(^Q|oaBTCMmM!Iu`shTK0m#@G&MIio&$$ZAJ<pV&`{A)Qqoe>
zQ|wgJRn=A2R$sqh1xpYE%PFl@K_@<Cy^@;M6m`pLS5wt5Hi3kUC2bST%?wSA#YMJk
z*dnxL+s0NV>+0kkb?oly>Ee!#>gwq#tlQS*1sE^6V{2l&cMt1a)7m*T6Gd*^`uVe2
zl!b+jwY{Z{v(4Sb&Gq<^V~P$nOdfGYfdK}Zma3r!y0(_i0<X9=0vLZyGc@)NFtAoP
z_YW}G@4)BVSfr@T96V7$KqR~Igpi{NtJ0&TJgHAbr#=%6Rds5*YPz-5@+)uei3KZr
z7VcacYOvgQ$zJCTo4uFZmboeJaN+Xl16Qx>Ygi;E-Bxitcrthy*CNdgsi_IGpQ&hA
z#2Orr3^0f)U~6MCV=Ge>F(|&4BXZ!}0mUAsXJ_WNGg(MjxPD;rW7GS?wL@Z->&KJb
z=h746HVE)X95{1e%Ly_5h$BZ1?5N<(`>E>Pcye~SWFG73iUXW!Ke=QQetLOKieB1t
zm;2P}g`V|iZ<XG7a(!()v-dUWYsrSrm2cTxjzw%PyqspTA@#Ksn~K8L+~0g6|8==P
zxSyUo$y)sFE#8TD_oiP=k~{N;_sqZQoi}dWycx0cyJBiRL+buVHsu>u@d6VpgQu&X
J%Q~loCIFNVAP@im

literal 0
HcmV?d00001

diff --git a/logos/indices/NQ=F.png b/logos/indices/NQ=F.png
new file mode 100644
index 0000000000000000000000000000000000000000..f051711dd7e091c2871e77116158967deaf9ed33
GIT binary patch
literal 1353
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9GG
z!XV7ZFl&wk0|S$7fKP}kQ1U+v%-{D2#zdzdzW#Ro$>-U-9~I5J%n-CiB5Bu+2d_SS
z`0(k|r=LH6{{8zGuHpBef3H6Lh@NoXqWn<)><i~_y~v+)K_Pw5*RNmU%KrTMbNK2j
z?#S)TAzLSHy7A`i`}Aq&#6#Dg$?1HY-|}wdw!hzg01Z5L<89sY>q(Q(^2h8boqy4`
z>ac&?2{Er_hd4}cFsMHb%K35S_LWDUtgDXlL~Z8?-^LQM^?_-~r`0<?efu5ObGCNL
zW$BdNoDti)*Ij21-v(3+ab(7fOH#?Zde&Wk_VVqnGml;Bj~W#p+;-~G%Qx@l?YbkG
zyh}V}-I<i8M`^Y17H|Cb^Vj1y-(4GyK6&wW;>H_nVOtr4x3sOg7TbUN@85rUbFP?`
z9TJS);ZSpgFM3Bv=SjZk?LcqddiKSz=zvMdL5PieFTIjU-OUudW&Z9vq6s@?Q+IDZ
z@lZZ}k3{^AYbUO~yL#)#`;S1CFW-KM>^;@8^6I|xPfSY>s%7upb@uV>9k=gkd4HI@
zX34(0N*Q|t+E4VYzrhu`y?6cfuC>?WC!S#q-6|NjQ!sX?cGTMA@*cM&tZ&_a`TFMF
zcQ@_;qvqqX&9|lPeqO)(|IeRi(IvkgJ_Di;I}bnWn)UDdkAMIEK_Uf6e*XOV*RNkd
zXZ(Ku@%@(lPa7w{-@NbNuU~&Zefj<9`Lmc(Ao*eTs(YGVA7-umFlRMT<<o6(&A<e-
zza+>nn1NX%W$~qVfB(F_xL9r}$U9*0afvK%=MyOBafkL5C=*Cs33-6vJb<ttT!jc-
z<?BSqfmxl8p#n>x^b(*Q>dDBe7Qs1-;Vc*fDED#c|D`~ebY8il_2B=5V318$fldRN
zw>WkF_32N5ndX+Ki(^Q|oaBTCMmM!Iu`shTK0m#@G&MIio&$$ZAJ<pV&`{A)Qqoe>
zQ|wgJRn=A2R$sqh1xpYE%PFl@K_@<Cy^@;M6m`pLS5wt5Hi3kUC2bST%?wSA#YMJk
z*dnxL+s0NV>+0kkb?oly>Ee!#>gwq#tlQS*1sE^6V{2l&cMt1a)7m*T6Gd*^`uVe2
zl!b+jwY{Z{v(4Sb&Gq<^V~P$nOdfGYfdK}Zma3r!y0(_i0<X9=0vLZyGc@)NFtAoP
z_YW}G@4)BVSfr@T96V7$KqR~Igpi{NtJ0&TJgHAbr#=%6Rds5*YPz-5@+)uei3KZr
z7VcacYOvgQ$zJCTo4uFZmboeJaN+Xl16Qx>Ygi;E-Bxitcrthy*CNdgsi_IGpQ&hA
z#2Orr3^0f)U~6MCV=Ge>F(|&4BXZ!}0mUAsXJ_WNGg(MjxPD;rW7GS?wL@Z->&KJb
z=h746HVE)X95{1e%Ly_5h$BZ1?5N<(`>E>Pcye~SWFG73iUXW!Ke=QQetLOKieB1t
zm;2P}g`V|iZ<XG7a(!()v-dUWYsrSrm2cTxjzw%PyqspTA@#Ksn~K8L+~0g6|8==P
zxSyUo$y)sFE#8TD_oiP=k~{N;_sqZQoi}dWycx0cyJBiRL+buVHsu>u@d6VpgQu&X
J%Q~loCIFNVAP@im

literal 0
HcmV?d00001

diff --git a/logos/indices/RTY=F.png b/logos/indices/RTY=F.png
new file mode 100644
index 0000000000000000000000000000000000000000..f051711dd7e091c2871e77116158967deaf9ed33
GIT binary patch
literal 1353
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9GG
z!XV7ZFl&wk0|S$7fKP}kQ1U+v%-{D2#zdzdzW#Ro$>-U-9~I5J%n-CiB5Bu+2d_SS
z`0(k|r=LH6{{8zGuHpBef3H6Lh@NoXqWn<)><i~_y~v+)K_Pw5*RNmU%KrTMbNK2j
z?#S)TAzLSHy7A`i`}Aq&#6#Dg$?1HY-|}wdw!hzg01Z5L<89sY>q(Q(^2h8boqy4`
z>ac&?2{Er_hd4}cFsMHb%K35S_LWDUtgDXlL~Z8?-^LQM^?_-~r`0<?efu5ObGCNL
zW$BdNoDti)*Ij21-v(3+ab(7fOH#?Zde&Wk_VVqnGml;Bj~W#p+;-~G%Qx@l?YbkG
zyh}V}-I<i8M`^Y17H|Cb^Vj1y-(4GyK6&wW;>H_nVOtr4x3sOg7TbUN@85rUbFP?`
z9TJS);ZSpgFM3Bv=SjZk?LcqddiKSz=zvMdL5PieFTIjU-OUudW&Z9vq6s@?Q+IDZ
z@lZZ}k3{^AYbUO~yL#)#`;S1CFW-KM>^;@8^6I|xPfSY>s%7upb@uV>9k=gkd4HI@
zX34(0N*Q|t+E4VYzrhu`y?6cfuC>?WC!S#q-6|NjQ!sX?cGTMA@*cM&tZ&_a`TFMF
zcQ@_;qvqqX&9|lPeqO)(|IeRi(IvkgJ_Di;I}bnWn)UDdkAMIEK_Uf6e*XOV*RNkd
zXZ(Ku@%@(lPa7w{-@NbNuU~&Zefj<9`Lmc(Ao*eTs(YGVA7-umFlRMT<<o6(&A<e-
zza+>nn1NX%W$~qVfB(F_xL9r}$U9*0afvK%=MyOBafkL5C=*Cs33-6vJb<ttT!jc-
z<?BSqfmxl8p#n>x^b(*Q>dDBe7Qs1-;Vc*fDED#c|D`~ebY8il_2B=5V318$fldRN
zw>WkF_32N5ndX+Ki(^Q|oaBTCMmM!Iu`shTK0m#@G&MIio&$$ZAJ<pV&`{A)Qqoe>
zQ|wgJRn=A2R$sqh1xpYE%PFl@K_@<Cy^@;M6m`pLS5wt5Hi3kUC2bST%?wSA#YMJk
z*dnxL+s0NV>+0kkb?oly>Ee!#>gwq#tlQS*1sE^6V{2l&cMt1a)7m*T6Gd*^`uVe2
zl!b+jwY{Z{v(4Sb&Gq<^V~P$nOdfGYfdK}Zma3r!y0(_i0<X9=0vLZyGc@)NFtAoP
z_YW}G@4)BVSfr@T96V7$KqR~Igpi{NtJ0&TJgHAbr#=%6Rds5*YPz-5@+)uei3KZr
z7VcacYOvgQ$zJCTo4uFZmboeJaN+Xl16Qx>Ygi;E-Bxitcrthy*CNdgsi_IGpQ&hA
z#2Orr3^0f)U~6MCV=Ge>F(|&4BXZ!}0mUAsXJ_WNGg(MjxPD;rW7GS?wL@Z->&KJb
z=h746HVE)X95{1e%Ly_5h$BZ1?5N<(`>E>Pcye~SWFG73iUXW!Ke=QQetLOKieB1t
zm;2P}g`V|iZ<XG7a(!()v-dUWYsrSrm2cTxjzw%PyqspTA@#Ksn~K8L+~0g6|8==P
zxSyUo$y)sFE#8TD_oiP=k~{N;_sqZQoi}dWycx0cyJBiRL+buVHsu>u@d6VpgQu&X
J%Q~loCIFNVAP@im

literal 0
HcmV?d00001

diff --git a/logos/indices/YM=F.png b/logos/indices/YM=F.png
new file mode 100644
index 0000000000000000000000000000000000000000..f051711dd7e091c2871e77116158967deaf9ed33
GIT binary patch
literal 1353
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jPK-BC>eK@{oCO|{#S9GG
z!XV7ZFl&wk0|S$7fKP}kQ1U+v%-{D2#zdzdzW#Ro$>-U-9~I5J%n-CiB5Bu+2d_SS
z`0(k|r=LH6{{8zGuHpBef3H6Lh@NoXqWn<)><i~_y~v+)K_Pw5*RNmU%KrTMbNK2j
z?#S)TAzLSHy7A`i`}Aq&#6#Dg$?1HY-|}wdw!hzg01Z5L<89sY>q(Q(^2h8boqy4`
z>ac&?2{Er_hd4}cFsMHb%K35S_LWDUtgDXlL~Z8?-^LQM^?_-~r`0<?efu5ObGCNL
zW$BdNoDti)*Ij21-v(3+ab(7fOH#?Zde&Wk_VVqnGml;Bj~W#p+;-~G%Qx@l?YbkG
zyh}V}-I<i8M`^Y17H|Cb^Vj1y-(4GyK6&wW;>H_nVOtr4x3sOg7TbUN@85rUbFP?`
z9TJS);ZSpgFM3Bv=SjZk?LcqddiKSz=zvMdL5PieFTIjU-OUudW&Z9vq6s@?Q+IDZ
z@lZZ}k3{^AYbUO~yL#)#`;S1CFW-KM>^;@8^6I|xPfSY>s%7upb@uV>9k=gkd4HI@
zX34(0N*Q|t+E4VYzrhu`y?6cfuC>?WC!S#q-6|NjQ!sX?cGTMA@*cM&tZ&_a`TFMF
zcQ@_;qvqqX&9|lPeqO)(|IeRi(IvkgJ_Di;I}bnWn)UDdkAMIEK_Uf6e*XOV*RNkd
zXZ(Ku@%@(lPa7w{-@NbNuU~&Zefj<9`Lmc(Ao*eTs(YGVA7-umFlRMT<<o6(&A<e-
zza+>nn1NX%W$~qVfB(F_xL9r}$U9*0afvK%=MyOBafkL5C=*Cs33-6vJb<ttT!jc-
z<?BSqfmxl8p#n>x^b(*Q>dDBe7Qs1-;Vc*fDED#c|D`~ebY8il_2B=5V318$fldRN
zw>WkF_32N5ndX+Ki(^Q|oaBTCMmM!Iu`shTK0m#@G&MIio&$$ZAJ<pV&`{A)Qqoe>
zQ|wgJRn=A2R$sqh1xpYE%PFl@K_@<Cy^@;M6m`pLS5wt5Hi3kUC2bST%?wSA#YMJk
z*dnxL+s0NV>+0kkb?oly>Ee!#>gwq#tlQS*1sE^6V{2l&cMt1a)7m*T6Gd*^`uVe2
zl!b+jwY{Z{v(4Sb&Gq<^V~P$nOdfGYfdK}Zma3r!y0(_i0<X9=0vLZyGc@)NFtAoP
z_YW}G@4)BVSfr@T96V7$KqR~Igpi{NtJ0&TJgHAbr#=%6Rds5*YPz-5@+)uei3KZr
z7VcacYOvgQ$zJCTo4uFZmboeJaN+Xl16Qx>Ygi;E-Bxitcrthy*CNdgsi_IGpQ&hA
z#2Orr3^0f)U~6MCV=Ge>F(|&4BXZ!}0mUAsXJ_WNGg(MjxPD;rW7GS?wL@Z->&KJb
z=h746HVE)X95{1e%Ly_5h$BZ1?5N<(`>E>Pcye~SWFG73iUXW!Ke=QQetLOKieB1t
zm;2P}g`V|iZ<XG7a(!()v-dUWYsrSrm2cTxjzw%PyqspTA@#Ksn~K8L+~0g6|8==P
zxSyUo$y)sFE#8TD_oiP=k~{N;_sqZQoi}dWycx0cyJBiRL+buVHsu>u@d6VpgQu&X
J%Q~loCIFNVAP@im

literal 0
HcmV?d00001


From 11258244f3b4d90be6055d178c79e994804aee41 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Thu, 6 Jul 2023 14:54:47 +0800
Subject: [PATCH 002/133] added e-minis to web panel

---
 templates/index.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index 9160d20..e398f3d 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -2919,8 +2919,9 @@
                     /> -->
 
                     <select id="indices-items" class="form-select animation-select">
-                      <option>Dow Jones - USA</option><option>S&P 500 - USA</option><option>Nasdaq 100 - USA</option>
-                      <option>Nasdaq Composite - USA</option><option>Russell 2000 - USA</option><option>VIX - USA</option>
+                      <option>Dow Jones - USA</option><option>E-Mini Dow Jones - USA</option><option>S&P 500 - USA</option><option>E-Mini S&P 500 - USA</option>
+                      <option>Nasdaq 100 - USA</option><option>E-Mini Nasdaq 100 - USA</option>
+                      <option>Nasdaq Composite - USA</option><option>Russell 2000 - USA</option><option>E-Mini Russell 2000 - USA</option><option>VIX - USA</option>
                       <option>U.S. Dollar (DXY) - USA</option>
                       <option>S&P/TSX - Canada</option><option>IPC - Mexico</option><option>Bovespa - Brazil</option>
                       <option>Dax - Germany</option><option>FTSE 100 - UK</option><option>IBEX 35 - Spain</option>

From 266af52dc3fbc6ae957adeb58e172faec29d1336 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Thu, 6 Jul 2023 14:59:21 +0800
Subject: [PATCH 003/133] added e-minis to indices dicts

---
 server.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/server.py b/server.py
index 8b9ebbd..e446810 100755
--- a/server.py
+++ b/server.py
@@ -212,7 +212,8 @@ def index():
         'OMXS30 - Stockholm': '^OMX', 'AEX - Amsterdam': '^AEX', 'ATX - Austria': '^ATX', 'BEL 20 - Brussels': '^BFX',
         'SSMI - Switzerland': '^SSMI', 'CAC 40 - France': '^FCHI', 'IBEX 35 - Spain': '^IBEX', 'FTSE 100 - UK': '^FTSE', 'Dax - Germany': '^GDAXI',
         'Bovespa - Brazil': '^BVSP', 'IPC - Mexico': '^MXX', 'S&P/TSX - Canada': '^GSPTSE', 'VIX - USA': '^VIX', 'Russell 2000 - USA': '^RUT',
-        'Nasdaq Composite - USA': '^IXIC', 'Nasdaq 100 - USA': '^NDX', 'S&P 500 - USA': '^GSPC', 'Dow Jones - USA': '^DJI', 'U.S. Dollar (DXY) - USA': 'DX-Y.NYB'}
+        'Nasdaq Composite - USA': '^IXIC', 'Nasdaq 100 - USA': '^NDX', 'S&P 500 - USA': '^GSPC', 'Dow Jones - USA': '^DJI', 'U.S. Dollar (DXY) - USA': 'DX-Y.NYB',
+	'E-Mini Dow Jones - USA': 'YM=F', 'E-Mini S&P 500 - USA': 'ES=F', 'E-Mini Nasdaq 100 - USA': 'NQ=F', 'E-Mini Russell 2000 - USA': 'RTY=F'}
     try:
         f = open('csv/indices_settings.json', 'r')
         indices_settings = json.load(f)
@@ -1098,8 +1099,8 @@ def save_trade_settings(input_settings):
         'OMXS30 - Stockholm': '^OMX', 'AEX - Amsterdam': '^AEX', 'ATX - Austria': '^ATX', 'BEL 20 - Brussels': '^BFX',
         'SSMI - Switzerland': '^SSMI', 'CAC 40 - France': '^FCHI', 'IBEX 35 - Spain': '^IBEX', 'FTSE 100 - UK': '^FTSE', 'Dax - Germany': '^GDAXI',
         'Bovespa - Brazil': '^BVSP', 'IPC - Mexico': '^MXX', 'S&P/TSX - Canada': '^GSPTSE', 'VIX - USA': '^VIX', 'Russell 2000 - USA': '^RUT',
-        'Nasdaq Composite - USA': '^IXIC', 'Nasdaq 100 - USA': '^NDX', 'S&P 500 - USA': '^GSPC', 'Dow Jones - USA': '^DJI', 'U.S. Dollar (DXY) - USA': 'DX-Y.NYB'
-    }
+        'Nasdaq Composite - USA': '^IXIC', 'Nasdaq 100 - USA': '^NDX', 'S&P 500 - USA': '^GSPC', 'Dow Jones - USA': '^DJI', 'U.S. Dollar (DXY) - USA': 'DX-Y.NYB',
+        'E-Mini Dow Jones - USA': 'YM=F', 'E-Mini S&P 500 - USA': 'ES=F', 'E-Mini Nasdaq 100 - USA': 'NQ=F', 'E-Mini Russell 2000 - USA': 'RTY=F'}
 	
     try:
         filename = input_settings['feature'].lower() + '_settings.json'

From ded27de705b23f37a73a04417d836da59140a05a Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Thu, 6 Jul 2023 14:59:57 +0800
Subject: [PATCH 004/133] changed to version 1.3.7

---
 templates/index.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index e398f3d..fd47d70 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -39,7 +39,7 @@
     <!-- CSS Stylesheet linking -->
 
 <!--     <link href="{{ url_for('static', filename='style.css') }}" type="text/css" rel="stylesheet" />   ALWAYS CHANGE VERSIONING WHENEVER CHANGES ARE MADE TO AVOID BAD CACHING -->
-    <link rel="stylesheet" type="text/css" href="../static/style.css?ver=1.3.6"/>
+    <link rel="stylesheet" type="text/css" href="../static/style.css?ver=1.3.7"/>
 
   </head>
 
@@ -99,7 +99,7 @@
         </div>
 
         </div>
-<p class="text-white" id="version-text">Version 1.3.6</p>
+<p class="text-white" id="version-text">Version 1.3.7</p>
 <p class="text-white" id="version-text"><a href="https://docs.google.com/document/d/1TzvukZv_0Pd3TUM6Xe2wEkymn9uIT2qXUBFnMCQwp5g/edit?usp=sharing" target="_blank" id="footerlinks">Changelog</a></p>
       </nav>
 
@@ -8584,7 +8584,7 @@
     <script src="{{ url_for('static', filename='js/jquery-2.1.1.js') }}"></script>
 
 <!--     <script src="{{ url_for('static', filename='app.js') }}"></script>.  ALWAYS CHANGE VERSIONING WHENEVER CHANGES ARE MADE TO AVOID BAD CACHING -->
-    <script type='text/javascript' src='../static/app.js?ver=1.3.6'></script>
+    <script type='text/javascript' src='../static/app.js?ver=1.3.7'></script>
 
     <script>
 

From 86c0141a55d837073eaaa926666b2679e2031a95 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Thu, 6 Jul 2023 15:16:19 +0800
Subject: [PATCH 005/133] show past 2 tournaments (golf)

---
 database_caller.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/database_caller.py b/database_caller.py
index 5013dd1..5984d51 100755
--- a/database_caller.py
+++ b/database_caller.py
@@ -1181,7 +1181,10 @@ def updateLeagueEvents(api_key, time, logf):
                 ten_or_fifteen = slice(None)
                 events = []
                 if (league == 'PGA') or (league == 'LPGA') or (league == 'PGA_EU') or (league == 'LIV') or (league == 'F1') or (league == 'NASCAR'):
-                    ten_or_fifteen = slice(3)
+                    if time == 'past':
+                        ten_or_fifteen = slice(2)
+                    else:
+                        ten_or_fifteen = slice(3)
                 else:
                     ten_or_fifteen = slice(None)
                     

From db154b3c3ccbb1016edbb8b4c8b9206397c2d41f Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 7 Jul 2023 16:20:21 +0800
Subject: [PATCH 006/133] onclick = getCustomMsg func

---
 templates/index.html | 363 +------------------------------------------
 1 file changed, 5 insertions(+), 358 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index fd47d70..77f8f44 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -7676,55 +7676,33 @@
           <!-- Custom Messages -->
 
           <div class="page" id="Page13" style="display: none">
-
             <div class="row">
-
               <div class="col-lg-6 col-md-6 col-sm-12">
-
                 <div class="row g-3 align-items-center mt-3 left-div">
 
                   <div class="col-auto">
-
                     <label for="inputText" class="col-form-label"
-
                       >Message Name:
-
                     </label>
-
                   </div>
 
                   <div class="col-auto">
-
                     <input
-
                       type="text"
-
                       id="inputText13"
-
                       class="form-control"
-
                       aria-describedby="TextHelpInline"
-
                       placeholder="Message Title"
-
                     />
-
                   </div>
 
 
 
                   <div class="col-auto">
-
                     <button id="inputTextBtn13" class="btn set-btn" onclick="customMsgValidate()">Add</button>
-
                   </div>
-                  
                   <p id="demo4" style="display: none"></p>
-
                 </div>
-
-
-
                 <div id="limit-msg">
 
                 </div>
@@ -7732,573 +7710,242 @@
 
 
                 <div class="row g-3 align-items-center mt-3">
-
                   <div class="col-auto">
-
                     <label for="inputScrollSpeed13Z" class="col-form-label"
-
                       >Scroll Speed:
-
                     </label>
-
                   </div>
 
                   <div class="col-auto">
-
                     <select
-
                       id="inputScrollSpeed13"
-
                       class="form-select speed-select"
-
                     >
-
                       <option {%if message_settings.speed == 'Medium' %} selected {% endif %}>Medium</option>
-
                       <option {%if message_settings.speed == 'Slow' %} selected {% endif %}>Slow</option>
-
                       <option {%if message_settings.speed == 'Fast' %} selected {% endif %}>Fast</option>
-
                     </select>
-
                   </div>
-
                 </div>
 
 
-
                 <div class="row g-3 align-items-center mt-3 left-div">
-
                   <div class="col-auto">
-
                     <label for="inputScrollSpeedRow13Z" class="col-form-label"
-
                       >Scroll Speed (Row 2):
-
                     </label>
-
                   </div>
 
                   <div class="col-auto">
-
                     <select
-
                       id="inputScrollSpeedRow13"
-
                       class="form-select speed-select"
-
                     >
-
                       <option {%if message_settings.speed2 == 'Medium' %} selected {% endif %}>Medium</option>
-
                       <option {%if message_settings.speed2 == 'Slow' %} selected {% endif %}>Slow</option>
-
                       <option {%if message_settings.speed2 == 'Fast' %} selected {% endif %}>Fast</option>
-
                     </select>
-
                   </div>
-
                 </div>
 
 
 
                 <div class="row g-3 align-items-center mt-3">
-
                   <div class="col-auto">
-
                     <label for="inputTransition13Z" class="col-form-label"
-
                       >Intro Transition:
-
                     </label>
-
                   </div>
 
                   <div class="col-auto">
-
                     <select
-
                       id="inputTransition13"
-
                       class="form-select animation-select"
-
                     >
-
                       <option {%if message_settings.animation == 'Down' %} selected {% endif %}>Down</option>
-
                       <option {%if message_settings.animation == 'Up' %} selected {% endif %}>Up</option>
-
                       <option {%if message_settings.animation == 'Continuous' %} selected {% endif %}>Continuous</option>
-
                     </select>
-
                   </div>
-
                 </div>
 
 
 
                 <div class="row g-3 align-items-center mt-3">
-
                   <div class="col-auto">
-
                     <label for="inputText14Z" class="col-form-label"
-
                       >Message:
-
                     </label>
-
                   </div>
 
                   <div class="col-auto">
-
                     <input
-
                       type="text"
-
                       id="inputText14"
-
                       class="form-control message-input"
-
                       aria-describedby="TextHelpInline"
-                           
                       placeholder="Custom Message"
-
                     />
-
                   </div>
-                  
                   <p id="demo5" style="display: none"></p>
-
                 </div>
 
-
-
-                <!--
-
-                <div class="row g-3 align-items-center mt-3">
-
-                  <div class="col-auto">
-
-                    <label for="inputText15" class="col-form-label"
-
-                      >Optional Message (row 2):
-
-                    </label>
-
-                  </div>
-
-                  <div class="col-auto">
-
-                    <input
-
-                      type="text"
-
-                      id="inputText15"
-
-                      class="form-control"
-
-                      aria-describedby="TextHelpInline"
-
-                    />
-
-                  </div>
-
-                </div>
-
-                  
-
-                  
-
-                <div class="row g-3 align-items-center mt-3">
-
-                  <div class="col-auto">
-
-                    <label for="inputScrollSpeed14" class="col-form-label"
-
-                      >Border Color:
-
-                    </label>
-
-                  </div>
-
-                  <div class="col-auto">
-
-                    <select id="inputScrollSpeed14" class="form-select">
-
-                      <option>Rainbow</option>
-
-                      <option></option>
-
-                      <option></option>
-
-                    </select>
-
-                  </div>
-
-                </div>
-
-
-
                 
-
                 <div class="row g-3 align-items-center mt-3">
-
                   <div class="col-auto">
-
-                    <label for="inputScrollSpeed15" class="col-form-label"
-
-                      >Border:
-
-                    </label>
-
-                  </div>
-
-                  <div class="col-auto">
-
-                    <select id="inputScrollSpeed15" class="form-select">
-
-                      <option>Dotted</option>
-
-                      <option></option>
-
-                      <option></option>
-
-                    </select>
-
-                  </div>
-
-                </div>
-
-                -->
-
-
-
-                <div class="row g-3 align-items-center mt-3">
-
-                  <div class="col-auto">
-
                     <label for="inputScrollSpeed16Z" class="col-form-label"
-
                       >Text Color:
-
                     </label>
-
                   </div>
 
                   <div class="col-auto">
-
                     <select
-
                       id="inputScrollSpeed16"
-
                       class="form-select text-colour"
-
                     >
-
                       <option>Black</option>
-
                       <option>White</option>
-
                       <option>Red</option>
-
                       <option>Green</option>
-
                       <option>Dark Green</option>
-
                       <option>Blue</option>
-
                       <option>Purple</option>
-
                       <option>Pink</option>
-
                       <option>Yellow</option>
-
                       <option>Orange</option>
-
                       <option>Gold</option>
-
                       <option>Gray</option>
-
                       <option>Cyan</option>
-
                     </select>
-
                   </div>
-
                 </div>
 
-
-
                 <div class="row g-3 align-items-center mt-3">
-
                   <div class="col-auto">
-
                     <label for="inputScrollSpeed17Z" class="col-form-label"
-
                       >Text Size:
-
                     </label>
-
                   </div>
 
                   <div class="col-auto">
-
                     <select
-
                       id="inputScrollSpeed17"
-
                       class="form-select text-size"
-
                     >
-
                       <option>Large</option>
-
                       <option>Medium</option>
-
                       <option>Small</option>
-
-                      
-
                     </select>
-
                   </div>
-
                 </div>
 
 
 
-                <!--
-
-                <div class="row g-3 align-items-center mt-3">
-
-                  <div class="col-auto">
-
-                    <label for="inputScrollSpeed18" class="col-form-label"
-
-                      >Font:
-
-                    </label>
-
-                  </div>
-
-                  <div class="col-auto">
-
-                    <select id="inputScrollSpeed18" class="form-select">
-
-                      <option>Arial</option>
-
-                      <option></option>
-
-                      <option></option>
-
-                    </select>
-
-                  </div>
-
-                </div>
-
-                -->
-
-
-
                 <div class="row g-3 align-items-center mt-3">
 
                   <div class="col-auto">
-
                     <label for="inputScrollSpeed19Z" class="col-form-label"
-
                       >Background Color:
-
                     </label>
-
                   </div>
 
                   <div class="col-auto">
-
                     <select
-
                       id="inputScrollSpeed19"
-
                       class="form-select back-colour"
-
                     >
-
                       <option>Black</option>
-
                       <option>White</option>
-
                       <option>Red</option>
-
                       <option>Green</option>
-
                       <option>Dark Green</option>
-
                       <option>Blue</option>
-
                       <option>Purple</option>
-
                       <option>Pink</option>
-
                       <option>Yellow</option>
-
                       <option>Orange</option>
-
                       <option>Gold</option>
-
                       <option>Gray</option>
-
                       <option>Cyan</option>
-
                     </select>
-
                   </div>
 
                 </div>
 
 
-
                 <div class="row g-3 align-items-center mt-3">
-
                   <div class="col-auto">
-
                     <label for="inputTransition" class="col-form-label"
-
                       >Display Feature Title
-
                     </label>
-
                   </div>
 
                   <div class="col-auto">
-
                     <input
-
                       class="form-check-input title-select"
-
                       type="checkbox"
-
                       value=""
-
                       id="flexCheckChecked29"
-
-                      {%
-
-                      if
-
-                      message_settings.title%}
-
-                      checked
-
-                      {%endif%}
-
-                    />
-
+                      {% if message_settings.title%}checked{%endif%} />
                   </div>
-
                 </div>
-
               </div>
 
               <div class="col-lg-4 col-md-4 col-sm-12">
-
                 <h6 class="mt-3">List:</h6>
-
                 <div class="features-div-two">
-
                   <ul
-
                     id="messages-features"
-
-                    class="display-features-list text-white message-list"
-
-                  >
+                    class="display-features-list text-white message-list" >
 
                     {%for f in message_settings.messages %}
-
-                      <li>{{f.name}}</li>
-
+                      <li onclick="getCustomMsg(this.innerText)">{{f.name}}</li>
                     {% endfor%}
 
                   </ul>
-
                 </div>
-
               </div>
 
               <div class="col-lg-2 col-md-2 col-sm-12">
-
                 <div class="icons-list">
-
                   <i
-
                     id="messages-increase-btn"
-
                     class="fa fa-chevron-up"
-
                     aria-hidden="true"
-
                   ></i>
 
                   <br />
-
                   <br />
 
                   <i
-
                     id="messages-decrease-btn"
-
                     class="fa fa-chevron-down"
-
                     aria-hidden="true"
-
                   ></i>
 
-                  <a style="position: relative; bottom: 30px; left: 10px"
-
-                    >Sort Order</a
-
-                  >
-
-
+                  <a style="position: relative; bottom: 30px; left: 10px">Sort Order</a>
 
                   <br />
-
                   <br />
 
                   <i
-
                     id="messages-remove-btn"
-
                     class="fa fa-minus"
-
                     aria-hidden="true"
-
                   ></i>
 
-                  <span style="position: relative; bottom: 0; left: 10px"
-
-                    >Remove</span
-
-                  >
+                  <span style="position: relative; bottom: 0; left: 10px">Remove</span>
 
                 </div>
-
               </div>
-
             </div>
 
 
 
             <div class="save-btn-div">
-
               <a href="#" class="btn save-btn">Save</a>
-
             </div>
-
           </div>
-
         </div>
 
       </section>

From 843b5fcc817b3e5a1c80070a9796d0501257126a Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 7 Jul 2023 16:22:21 +0800
Subject: [PATCH 007/133] custom msg value js func

---
 static/app.js | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/static/app.js b/static/app.js
index d3e295b..0d830cd 100755
--- a/static/app.js
+++ b/static/app.js
@@ -910,11 +910,11 @@ allFeaturesTextAddBtn.map((value, index) => {
              
           else{
             tag.innerHTML = allFeaturesText[index].value;
+            tag.setAttribute("onclick", "getCustomMsg(this.innerText)");
             allFeatures[index].appendChild(tag);
             changeVarValue();
             addEventOnFeaturesList();
             createLi = false;
-          
         }}
       } else {
         var msg = "You've reached the maximum limit of items to add for this feature";
@@ -2755,3 +2755,32 @@ function setTop20() {
   });
 }
 
+
+// get custom message values
+function getCustomMsg(value) {
+  let messaged = value;
+  const the_thing = document.getElementById("inputText13");
+  const the_msg = document.getElementById("inputText14");
+  const t_color = document.getElementById("inputScrollSpeed16");
+  const b_color = document.getElementById("inputScrollSpeed19");
+  const t_size = document.getElementById("inputScrollSpeed17");
+  the_thing.value = messaged;
+
+  fetch("/fetchCustomMsg", {
+    method: "POST",
+    body: JSON.stringify(messaged),
+  })
+  .then(response => response.json())
+  .then(data => {
+    // Update the elements with the retrieved information
+    the_msg.value = data.text;
+    t_color.value = data.text_colour;
+    b_color.value = data.background_colour;
+    t_size.value = data.size;
+  })
+  .catch(error => {
+    console.error('Error:', error);
+  });
+}
+
+

From 6b7913aa9782695a42787b873c1156846f074814 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 7 Jul 2023 16:23:50 +0800
Subject: [PATCH 008/133] get custom msg value func backend

---
 server.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/server.py b/server.py
index e446810..81e4948 100755
--- a/server.py
+++ b/server.py
@@ -1515,6 +1515,24 @@ def setTop20or10():
     return index()
 
 
+@app.route("/fetchCustomMsg", methods=["POST"])
+def fetch_custom_msg():
+    value = request.data.decode('utf-8')
+    value2 = json.loads(value)
+    try:
+        with open("csv/message_settings.json") as f:
+            data = json.load(f)
+    except:
+        data = {"feature": "Custom Messages", "speed": "medium", "speed2": "medium", "animation": "down", "title": False, "messages": [{"name": "welcome", "text": "Welcome to Fintic!", "text_colour": "White", "size": "Large", "background_colour": "Black"}, {"name": "get_started", "text": "To get started, connect your device to the \"Fintic Hotspot\" and access \"fintic.local:1024\" on your web browser. You can connect your ticker to Wi-Fi there.", "text_colour": "White", "size": "Small", "background_colour": "Black"}]}
+    for i, each in enumerate(data['messages']):
+        if each['name'] == value2:
+            the_info = data['messages'][i]
+            break
+        else:
+            the_info = {}
+    return (the_info)
+
+
 if __name__ == "__main__":
     
     app.run(host='0.0.0.0', port=1024, debug=False) # the debuggger causes flickering 

From c394a216cd59fa27080a497335cca4dcc82f31ee Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 7 Jul 2023 17:40:08 +0800
Subject: [PATCH 009/133] save custom msg to json after clicking add

---
 server.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/server.py b/server.py
index 81e4948..bf65ce1 100755
--- a/server.py
+++ b/server.py
@@ -1533,6 +1533,25 @@ def fetch_custom_msg():
     return (the_info)
 
 
+@app.route("/sendMsgToJSON", methods = ['PUT', 'POST'])
+def sendMsgToJSON():
+
+    data= request.data.decode('utf-8')
+    input_settings = json.loads(data)
+
+    if input_settings['name'] != '' and input_settings['text'] != '':
+        try:
+            with open('csv/message_settings.json','r') as f:
+                message_settings = json.load(f)
+        except:
+            message_settings = {"feature": "Custom Messages", "speed": "medium", "speed2": "medium", "animation": "down", "title": False, "messages": [{"name": "welcome", "text": "Welcome to Fintic!", "text_colour": "White", "size": "Large", "background_colour": "Black"}, {"name": "get_started", "text": "To get started, connect your device to the \"Fintic Hotspot\" and access \"fintic.local:1024\" on your web browser. You can connect your ticker to Wi-Fi there.", "text_colour": "White", "size": "Small", "background_colour": "Black"}]}
+        message_settings['messages'].append(input_settings)
+        with open('csv/message_settings.json', 'w') as f:
+            json.dump(message_settings, f)
+
+    return index()
+
+
 if __name__ == "__main__":
     
     app.run(host='0.0.0.0', port=1024, debug=False) # the debuggger causes flickering 

From 9d189fb9a23a2a052357677a3179df95806dd261 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 7 Jul 2023 17:41:14 +0800
Subject: [PATCH 010/133] save custom msg to json file after clicking add

---
 static/app.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/static/app.js b/static/app.js
index 0d830cd..49c15a9 100755
--- a/static/app.js
+++ b/static/app.js
@@ -1600,8 +1600,8 @@ function getImageSettings(page) {
   return settings;
 }
 
+// ADD MSG TO LIST AND SAVE MSG TO JSON FILE
 var messages = [];
-
 messagesTextAddBtn.addEventListener("click", () => {
   let pageSelector = "Page13";
 
@@ -1624,6 +1624,11 @@ messagesTextAddBtn.addEventListener("click", () => {
     background_colour: background_colour,
   };
   messages.push(message);
+  
+  fetch("/sendMsgToJSON", {
+     method: "POST",
+     body: JSON.stringify(message),
+   });
 });
 
 function getMessageSettings(page) {

From 4d1f636a4488fc3ed250219f692d57304340d3ce Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 7 Jul 2023 18:13:12 +0800
Subject: [PATCH 011/133] fix? idk

---
 templates/index.html | 361 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 357 insertions(+), 4 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index 77f8f44..173dcce 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -7676,33 +7676,55 @@
           <!-- Custom Messages -->
 
           <div class="page" id="Page13" style="display: none">
+
             <div class="row">
+
               <div class="col-lg-6 col-md-6 col-sm-12">
+
                 <div class="row g-3 align-items-center mt-3 left-div">
 
                   <div class="col-auto">
+
                     <label for="inputText" class="col-form-label"
+
                       >Message Name:
+
                     </label>
+
                   </div>
 
                   <div class="col-auto">
+
                     <input
+
                       type="text"
+
                       id="inputText13"
+
                       class="form-control"
+
                       aria-describedby="TextHelpInline"
+
                       placeholder="Message Title"
+
                     />
+
                   </div>
 
 
 
                   <div class="col-auto">
+
                     <button id="inputTextBtn13" class="btn set-btn" onclick="customMsgValidate()">Add</button>
+
                   </div>
+                  
                   <p id="demo4" style="display: none"></p>
+
                 </div>
+
+
+
                 <div id="limit-msg">
 
                 </div>
@@ -7710,242 +7732,573 @@
 
 
                 <div class="row g-3 align-items-center mt-3">
+
                   <div class="col-auto">
+
                     <label for="inputScrollSpeed13Z" class="col-form-label"
+
                       >Scroll Speed:
+
                     </label>
+
                   </div>
 
                   <div class="col-auto">
+
                     <select
+
                       id="inputScrollSpeed13"
+
                       class="form-select speed-select"
+
                     >
+
                       <option {%if message_settings.speed == 'Medium' %} selected {% endif %}>Medium</option>
+
                       <option {%if message_settings.speed == 'Slow' %} selected {% endif %}>Slow</option>
+
                       <option {%if message_settings.speed == 'Fast' %} selected {% endif %}>Fast</option>
+
                     </select>
+
                   </div>
+
                 </div>
 
 
+
                 <div class="row g-3 align-items-center mt-3 left-div">
+
                   <div class="col-auto">
+
                     <label for="inputScrollSpeedRow13Z" class="col-form-label"
+
                       >Scroll Speed (Row 2):
+
                     </label>
+
                   </div>
 
                   <div class="col-auto">
+
                     <select
+
                       id="inputScrollSpeedRow13"
+
                       class="form-select speed-select"
+
                     >
+
                       <option {%if message_settings.speed2 == 'Medium' %} selected {% endif %}>Medium</option>
+
                       <option {%if message_settings.speed2 == 'Slow' %} selected {% endif %}>Slow</option>
+
                       <option {%if message_settings.speed2 == 'Fast' %} selected {% endif %}>Fast</option>
+
                     </select>
+
                   </div>
+
                 </div>
 
 
 
                 <div class="row g-3 align-items-center mt-3">
+
                   <div class="col-auto">
+
                     <label for="inputTransition13Z" class="col-form-label"
+
                       >Intro Transition:
+
                     </label>
+
                   </div>
 
                   <div class="col-auto">
+
                     <select
+
                       id="inputTransition13"
+
                       class="form-select animation-select"
+
                     >
+
                       <option {%if message_settings.animation == 'Down' %} selected {% endif %}>Down</option>
+
                       <option {%if message_settings.animation == 'Up' %} selected {% endif %}>Up</option>
+
                       <option {%if message_settings.animation == 'Continuous' %} selected {% endif %}>Continuous</option>
+
                     </select>
+
                   </div>
+
                 </div>
 
 
 
                 <div class="row g-3 align-items-center mt-3">
+
                   <div class="col-auto">
+
                     <label for="inputText14Z" class="col-form-label"
+
                       >Message:
+
                     </label>
+
                   </div>
 
                   <div class="col-auto">
+
                     <input
+
                       type="text"
+
                       id="inputText14"
+
                       class="form-control message-input"
+
                       aria-describedby="TextHelpInline"
+                           
                       placeholder="Custom Message"
+
                     />
+
                   </div>
+                  
                   <p id="demo5" style="display: none"></p>
+
                 </div>
 
+
+
+                <!--
+
+                <div class="row g-3 align-items-center mt-3">
+
+                  <div class="col-auto">
+
+                    <label for="inputText15" class="col-form-label"
+
+                      >Optional Message (row 2):
+
+                    </label>
+
+                  </div>
+
+                  <div class="col-auto">
+
+                    <input
+
+                      type="text"
+
+                      id="inputText15"
+
+                      class="form-control"
+
+                      aria-describedby="TextHelpInline"
+
+                    />
+
+                  </div>
+
+                </div>
+
+                  
+
+                  
+
+                <div class="row g-3 align-items-center mt-3">
+
+                  <div class="col-auto">
+
+                    <label for="inputScrollSpeed14" class="col-form-label"
+
+                      >Border Color:
+
+                    </label>
+
+                  </div>
+
+                  <div class="col-auto">
+
+                    <select id="inputScrollSpeed14" class="form-select">
+
+                      <option>Rainbow</option>
+
+                      <option></option>
+
+                      <option></option>
+
+                    </select>
+
+                  </div>
+
+                </div>
+
+
+
                 
+
                 <div class="row g-3 align-items-center mt-3">
+
                   <div class="col-auto">
+
+                    <label for="inputScrollSpeed15" class="col-form-label"
+
+                      >Border:
+
+                    </label>
+
+                  </div>
+
+                  <div class="col-auto">
+
+                    <select id="inputScrollSpeed15" class="form-select">
+
+                      <option>Dotted</option>
+
+                      <option></option>
+
+                      <option></option>
+
+                    </select>
+
+                  </div>
+
+                </div>
+
+                -->
+
+
+
+                <div class="row g-3 align-items-center mt-3">
+
+                  <div class="col-auto">
+
                     <label for="inputScrollSpeed16Z" class="col-form-label"
+
                       >Text Color:
+
                     </label>
+
                   </div>
 
                   <div class="col-auto">
+
                     <select
+
                       id="inputScrollSpeed16"
+
                       class="form-select text-colour"
+
                     >
+
                       <option>Black</option>
+
                       <option>White</option>
+
                       <option>Red</option>
+
                       <option>Green</option>
+
                       <option>Dark Green</option>
+
                       <option>Blue</option>
+
                       <option>Purple</option>
+
                       <option>Pink</option>
+
                       <option>Yellow</option>
+
                       <option>Orange</option>
+
                       <option>Gold</option>
+
                       <option>Gray</option>
+
                       <option>Cyan</option>
+
                     </select>
+
                   </div>
+
                 </div>
 
+
+
                 <div class="row g-3 align-items-center mt-3">
+
                   <div class="col-auto">
+
                     <label for="inputScrollSpeed17Z" class="col-form-label"
+
                       >Text Size:
+
                     </label>
+
                   </div>
 
                   <div class="col-auto">
+
                     <select
+
                       id="inputScrollSpeed17"
+
                       class="form-select text-size"
+
                     >
+
                       <option>Large</option>
+
                       <option>Medium</option>
+
                       <option>Small</option>
+
+                      
+
                     </select>
+
                   </div>
+
                 </div>
 
 
 
+                <!--
+
+                <div class="row g-3 align-items-center mt-3">
+
+                  <div class="col-auto">
+
+                    <label for="inputScrollSpeed18" class="col-form-label"
+
+                      >Font:
+
+                    </label>
+
+                  </div>
+
+                  <div class="col-auto">
+
+                    <select id="inputScrollSpeed18" class="form-select">
+
+                      <option>Arial</option>
+
+                      <option></option>
+
+                      <option></option>
+
+                    </select>
+
+                  </div>
+
+                </div>
+
+                -->
+
+
+
                 <div class="row g-3 align-items-center mt-3">
 
                   <div class="col-auto">
+
                     <label for="inputScrollSpeed19Z" class="col-form-label"
+
                       >Background Color:
+
                     </label>
+
                   </div>
 
                   <div class="col-auto">
+
                     <select
+
                       id="inputScrollSpeed19"
+
                       class="form-select back-colour"
+
                     >
+
                       <option>Black</option>
+
                       <option>White</option>
+
                       <option>Red</option>
+
                       <option>Green</option>
+
                       <option>Dark Green</option>
+
                       <option>Blue</option>
+
                       <option>Purple</option>
+
                       <option>Pink</option>
+
                       <option>Yellow</option>
+
                       <option>Orange</option>
+
                       <option>Gold</option>
+
                       <option>Gray</option>
+
                       <option>Cyan</option>
+
                     </select>
+
                   </div>
 
                 </div>
 
 
+
                 <div class="row g-3 align-items-center mt-3">
+
                   <div class="col-auto">
+
                     <label for="inputTransition" class="col-form-label"
+
                       >Display Feature Title
+
                     </label>
+
                   </div>
 
                   <div class="col-auto">
+
                     <input
+
                       class="form-check-input title-select"
+
                       type="checkbox"
+
                       value=""
+
                       id="flexCheckChecked29"
-                      {% if message_settings.title%}checked{%endif%} />
+
+                      {%
+
+                      if
+
+                      message_settings.title%}
+
+                      checked
+
+                      {%endif%}
+
+                    />
+
                   </div>
+
                 </div>
+
               </div>
 
               <div class="col-lg-4 col-md-4 col-sm-12">
+
                 <h6 class="mt-3">List:</h6>
+
                 <div class="features-div-two">
+
                   <ul
+
                     id="messages-features"
-                    class="display-features-list text-white message-list" >
+
+                    class="display-features-list text-white message-list"
+
+                  >
 
                     {%for f in message_settings.messages %}
+
                       <li onclick="getCustomMsg(this.innerText)">{{f.name}}</li>
+
                     {% endfor%}
 
                   </ul>
+
                 </div>
+
               </div>
 
               <div class="col-lg-2 col-md-2 col-sm-12">
+
                 <div class="icons-list">
+
                   <i
+
                     id="messages-increase-btn"
+
                     class="fa fa-chevron-up"
+
                     aria-hidden="true"
+
                   ></i>
 
                   <br />
+
                   <br />
 
                   <i
+
                     id="messages-decrease-btn"
+
                     class="fa fa-chevron-down"
+
                     aria-hidden="true"
+
                   ></i>
 
-                  <a style="position: relative; bottom: 30px; left: 10px">Sort Order</a>
+                  <a style="position: relative; bottom: 30px; left: 10px"
+
+                    >Sort Order</a
+
+                  >
+
+
 
                   <br />
+
                   <br />
 
                   <i
+
                     id="messages-remove-btn"
+
                     class="fa fa-minus"
+
                     aria-hidden="true"
+
                   ></i>
 
-                  <span style="position: relative; bottom: 0; left: 10px">Remove</span>
+                  <span style="position: relative; bottom: 0; left: 10px"
+
+                    >Remove</span
+
+                  >
 
                 </div>
+
               </div>
+
             </div>
 
 
 
             <div class="save-btn-div">
+
               <a href="#" class="btn save-btn">Save</a>
+
             </div>
+
           </div>
+
         </div>
 
       </section>

From e9833961d93bf2ee094acf1a453ad63fef9d3e01 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 7 Jul 2023 18:47:30 +0800
Subject: [PATCH 012/133] update msg button

---
 templates/index.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/templates/index.html b/templates/index.html
index 173dcce..6e58122 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -8157,7 +8157,11 @@
 
                 </div>
 
-
+                <div class="row g-3 align-items-center mt-3" style="margin-left: 15%;">
+                  <div class="col-auto">
+                    <button id="updatemsgbtn" class="btn set-btn" onclick="updateSelectedMsg()">Update Msg</button>
+                  </div>
+                </div>
 
                 <div class="row g-3 align-items-center mt-3">
 

From 7c8e685d7ca2f78c684fda2e69fd6248fd059e42 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 7 Jul 2023 23:16:37 +0800
Subject: [PATCH 013/133] message updated text

---
 templates/index.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/index.html b/templates/index.html
index 6e58122..18b1585 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -8163,6 +8163,8 @@
                   </div>
                 </div>
 
+                <div id="updated-message-p" style="display:none"><p id="msgupdated-p" style="color: red;">Message Updated!</p></div>
+                
                 <div class="row g-3 align-items-center mt-3">
 
                   <div class="col-auto">

From 605432a181c40ff5df399aeb2f06bbc46d910b90 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 7 Jul 2023 23:18:58 +0800
Subject: [PATCH 014/133] update the selected cusotm msg with any changes made

---
 static/app.js | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/static/app.js b/static/app.js
index 49c15a9..6e115bd 100755
--- a/static/app.js
+++ b/static/app.js
@@ -2761,6 +2761,8 @@ function setTop20() {
 }
 
 
+let theIndexOfMsg = 0
+
 // get custom message values
 function getCustomMsg(value) {
   let messaged = value;
@@ -2782,6 +2784,7 @@ function getCustomMsg(value) {
     t_color.value = data.text_colour;
     b_color.value = data.background_colour;
     t_size.value = data.size;
+    theIndexOfMsg = data.index;
   })
   .catch(error => {
     console.error('Error:', error);
@@ -2789,3 +2792,35 @@ function getCustomMsg(value) {
 }
 
 
+
+// get custom message values
+function updateSelectedMsg(){
+  const msg_name = document.getElementById("inputText13").value;
+  const msg_text = document.getElementById("inputText14").value;
+
+  if ((msg_name !== '') && (msg_text !== '')) {
+    const text_color = document.getElementById("inputScrollSpeed16").value;
+    const background_color = document.getElementById("inputScrollSpeed19").value;
+    const text_size = document.getElementById("inputScrollSpeed17").value;
+    document.getElementById('demo4').style.display = "none";
+    document.getElementById('demo5').style.display = "none";
+    fetch("/updateSelectedMsg", {
+      method: "POST",
+      body: JSON.stringify({'name': msg_name, 'text': msg_text, 'text_colour': text_color, 'size': text_size, 'background_colour': background_color, 'index':theIndexOfMsg}),
+    });
+    
+    const ulElement = document.getElementById("messages-features");
+    const activeListItem = ulElement.querySelector("li.active");
+    activeListItem.innerText = msg_name;
+    document.getElementById('updated-message-p').style.display = "block";
+    setTimeout(function hideElement() {
+      document.getElementById('updated-message-p').style.display = "none";
+    }, 5000);
+
+  }
+  else {
+    customMsgValidate();
+  }
+}
+
+

From 2171d2fdb950401164239d77a203209a04886894 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 7 Jul 2023 23:22:10 +0800
Subject: [PATCH 015/133] update selected custom msg with any changes made

---
 server.py | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/server.py b/server.py
index bf65ce1..38ca074 100755
--- a/server.py
+++ b/server.py
@@ -1526,6 +1526,7 @@ def fetch_custom_msg():
         data = {"feature": "Custom Messages", "speed": "medium", "speed2": "medium", "animation": "down", "title": False, "messages": [{"name": "welcome", "text": "Welcome to Fintic!", "text_colour": "White", "size": "Large", "background_colour": "Black"}, {"name": "get_started", "text": "To get started, connect your device to the \"Fintic Hotspot\" and access \"fintic.local:1024\" on your web browser. You can connect your ticker to Wi-Fi there.", "text_colour": "White", "size": "Small", "background_colour": "Black"}]}
     for i, each in enumerate(data['messages']):
         if each['name'] == value2:
+	    the_info = {'index': i, 'text': data['messages'][i]['text'], 'name': data['messages'][i]['name'], 'size':data['messages'][i]['size'], 'text_colour': data['messages'][i]['text_colour'], 'background_colour': data['messages'][i]['background_colour']}
             the_info = data['messages'][i]
             break
         else:
@@ -1552,6 +1553,31 @@ def sendMsgToJSON():
     return index()
 
 
+@app.route("/updateSelectedMsg", methods=["PUT", "POST"])
+def updateSelectedMsg():
+    value = request.data.decode('utf-8')
+    value2 = json.loads(value)
+    try:
+        with open("csv/message_settings.json") as f:
+            data = json.load(f)
+    except:
+        data = {"feature": "Custom Messages", "speed": "medium", "speed2": "medium", "animation": "down", "title": False, "messages": [{"name": "welcome", "text": "Welcome to Fintic!", "text_colour": "White", "size": "Large", "background_colour": "Black"}, {"name": "get_started", "text": "To get started, connect your device to the \"Fintic Hotspot\" and access \"fintic.local:1024\" on your web browser. You can connect your ticker to Wi-Fi there.", "text_colour": "White", "size": "Small", "background_colour": "Black"}]}
+    try:
+        data['messages'][value2['index']]['name'] = value2['name']
+        data['messages'][value2['index']]['text'] = value2['text']
+        data['messages'][value2['index']]['text_colour'] = value2['text_colour']
+        data['messages'][value2['index']]['size'] = value2['size']
+        data['messages'][value2['index']]['background_colour'] = value2['background_colour']
+        with open('csv/message_settings.json', 'w') as f:
+            json.dump(data, f)
+    except:
+        pass
+
+    return index()
+
+
+
+
 if __name__ == "__main__":
     
     app.run(host='0.0.0.0', port=1024, debug=False) # the debuggger causes flickering 

From af9788cd377d3f51c51ed117336d5fc929a13458 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 7 Jul 2023 23:26:20 +0800
Subject: [PATCH 016/133] Update server.py

---
 server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server.py b/server.py
index 38ca074..f1f40d9 100755
--- a/server.py
+++ b/server.py
@@ -1526,7 +1526,7 @@ def fetch_custom_msg():
         data = {"feature": "Custom Messages", "speed": "medium", "speed2": "medium", "animation": "down", "title": False, "messages": [{"name": "welcome", "text": "Welcome to Fintic!", "text_colour": "White", "size": "Large", "background_colour": "Black"}, {"name": "get_started", "text": "To get started, connect your device to the \"Fintic Hotspot\" and access \"fintic.local:1024\" on your web browser. You can connect your ticker to Wi-Fi there.", "text_colour": "White", "size": "Small", "background_colour": "Black"}]}
     for i, each in enumerate(data['messages']):
         if each['name'] == value2:
-	    the_info = {'index': i, 'text': data['messages'][i]['text'], 'name': data['messages'][i]['name'], 'size':data['messages'][i]['size'], 'text_colour': data['messages'][i]['text_colour'], 'background_colour': data['messages'][i]['background_colour']}
+            the_info = {'index': i, 'text': data['messages'][i]['text'], 'name': data['messages'][i]['name'], 'size':data['messages'][i]['size'], 'text_colour': data['messages'][i]['text_colour'], 'background_colour': data['messages'][i]['background_colour']}
             the_info = data['messages'][i]
             break
         else:

From 30d4d624d25841f687a0a7b507ea06e1020d2231 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 7 Jul 2023 23:35:06 +0800
Subject: [PATCH 017/133] fixed ?

---
 server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server.py b/server.py
index f1f40d9..3eb1d53 100755
--- a/server.py
+++ b/server.py
@@ -1527,7 +1527,7 @@ def fetch_custom_msg():
     for i, each in enumerate(data['messages']):
         if each['name'] == value2:
             the_info = {'index': i, 'text': data['messages'][i]['text'], 'name': data['messages'][i]['name'], 'size':data['messages'][i]['size'], 'text_colour': data['messages'][i]['text_colour'], 'background_colour': data['messages'][i]['background_colour']}
-            the_info = data['messages'][i]
+            #the_info = data['messages'][i]
             break
         else:
             the_info = {}

From 8d98c1b6882749d0ca44126fd37b0cb77ecc10b8 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Sat, 8 Jul 2023 01:11:19 +0800
Subject: [PATCH 018/133] fixed indexofmsg variable to null

---
 static/app.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/static/app.js b/static/app.js
index 6e115bd..b16b5b0 100755
--- a/static/app.js
+++ b/static/app.js
@@ -2761,7 +2761,7 @@ function setTop20() {
 }
 
 
-let theIndexOfMsg = 0
+let theIndexOfMsg = null
 
 // get custom message values
 function getCustomMsg(value) {
@@ -2812,6 +2812,7 @@ function updateSelectedMsg(){
     const ulElement = document.getElementById("messages-features");
     const activeListItem = ulElement.querySelector("li.active");
     activeListItem.innerText = msg_name;
+    theIndexOfMsg = null;
     document.getElementById('updated-message-p').style.display = "block";
     setTimeout(function hideElement() {
       document.getElementById('updated-message-p').style.display = "none";

From 04707cb9b120b1b0456df3b2cc549c3c4eea54cb Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Sat, 8 Jul 2023 01:22:46 +0800
Subject: [PATCH 019/133] remove active li after clicking update message

---
 static/app.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/app.js b/static/app.js
index b16b5b0..98c0050 100755
--- a/static/app.js
+++ b/static/app.js
@@ -2812,6 +2812,7 @@ function updateSelectedMsg(){
     const ulElement = document.getElementById("messages-features");
     const activeListItem = ulElement.querySelector("li.active");
     activeListItem.innerText = msg_name;
+    activeListItem.classList.remove("active");
     theIndexOfMsg = null;
     document.getElementById('updated-message-p').style.display = "block";
     setTimeout(function hideElement() {

From 4d6eab858f16309633f307f7e9ab685e83f93f94 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 10 Jul 2023 15:50:27 +0800
Subject: [PATCH 020/133] update stock and crypto portfolio btns

---
 templates/index.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/templates/index.html b/templates/index.html
index 18b1585..d4945fe 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1710,6 +1710,9 @@
                       aria-describedby="TextHelpInline"
                       placeholder="e.g. 200" />
                   </div>
+                  <div class="col-auto">
+                    <button id="update-stock-port-btn" class="btn set-btn" onclick="updateStockPorftolio()">Update Position</button>
+                  </div>
                 </div>
 
                 <div class="row g-3 align-items-center mt-3 left-div">
@@ -2216,6 +2219,9 @@
                       aria-describedby="TextHelpInline"
                       placeholder="e.g. 200" />
                   </div>
+                  <div class="col-auto">
+                    <button id="update-crypto-port-btn" class="btn set-btn" onclick="updateCryptoPorftolio()">Update Position</button>
+                  </div>
                 </div>
 
                 <div class="row g-3 align-items-center mt-3 left-div">

From b615240a48e38dc9cc64450bbe69d3d3a712c7b4 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 10 Jul 2023 16:20:33 +0800
Subject: [PATCH 021/133] get stock and cyrpto symbol

---
 templates/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index d4945fe..4e96bba 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1762,7 +1762,7 @@
                     id="stocks-features"
                     class="display-features-list text-white symbol-list">
                   {% for f in stocks_settings.symbols %}
-                      <li>{{f}}</li>
+                      <li onclick="getStockSymbol(this.innerText)">{{f}}</li>
                     {% endfor%}
                   </ul>
 
@@ -2279,7 +2279,7 @@
 
                   {% for f in crypto_settings.symbols %}
 
-                      <li>{{f}}</li>
+                      <li onclick="getCryptoSymbol(this.innerText)">{{f}}</li>
 
                     {% endfor%}
 

From a39279fee10cedfc1728be8bede6f30bcceea4e0 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 10 Jul 2023 16:24:45 +0800
Subject: [PATCH 022/133] load crypto and stock symbols onto text field html

---
 static/app.js | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/static/app.js b/static/app.js
index 98c0050..404b7b0 100755
--- a/static/app.js
+++ b/static/app.js
@@ -2826,3 +2826,65 @@ function updateSelectedMsg(){
 }
 
 
+
+
+
+
+
+// get stock portfolio values
+function getStockSymbol(value) {
+  let stock_symbol = value;
+  const stock_thing = document.getElementById("inputText3");
+  // const the_msg = document.getElementById("inputText14");
+  // const t_color = document.getElementById("inputScrollSpeed16");
+  // const b_color = document.getElementById("inputScrollSpeed19");
+  // const t_size = document.getElementById("inputScrollSpeed17");
+  stock_thing.value = stock_symbol;
+
+  // fetch("/fetchCustomMsg", {
+  //   method: "POST",
+  //   body: JSON.stringify(messaged),
+  // })
+  // .then(response => response.json())
+  // .then(data => {
+  //   // Update the elements with the retrieved information
+  //   the_msg.value = data.text;
+  //   t_color.value = data.text_colour;
+  //   b_color.value = data.background_colour;
+  //   t_size.value = data.size;
+  //   theIndexOfMsg = data.index;
+  // })
+  // .catch(error => {
+  //   console.error('Error:', error);
+  // });
+}
+
+
+
+// get crypto portfolio values
+function getCryptoSymbol(value) {
+  let crypto_symbol = value;
+  const crypto_thing = document.getElementById("inputText4");
+  // const the_msg = document.getElementById("inputText14");
+  // const t_color = document.getElementById("inputScrollSpeed16");
+  // const b_color = document.getElementById("inputScrollSpeed19");
+  // const t_size = document.getElementById("inputScrollSpeed17");
+  crypto_thing.value = crypto_symbol;
+
+  // fetch("/fetchCustomMsg", {
+  //   method: "POST",
+  //   body: JSON.stringify(messaged),
+  // })
+  // .then(response => response.json())
+  // .then(data => {
+  //   // Update the elements with the retrieved information
+  //   the_msg.value = data.text;
+  //   t_color.value = data.text_colour;
+  //   b_color.value = data.background_colour;
+  //   t_size.value = data.size;
+  //   theIndexOfMsg = data.index;
+  // })
+  // .catch(error => {
+  //   console.error('Error:', error);
+  // });
+}

From 58474f8eea08726f2c992d0130966cfaaa1db8e6 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 11 Jul 2023 15:51:32 +0800
Subject: [PATCH 023/133] fixed portfolio date not updating bug

---
 server.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server.py b/server.py
index 3eb1d53..0d6cf50 100755
--- a/server.py
+++ b/server.py
@@ -910,9 +910,9 @@ def savePortfolioSettings():
         symbol1 = settings['symbol']
 	
         days1 = settings['days']
-        day_start = datetime.datetime.strptime(str(days1), "%Y-%m-%d")
-        day_today = datetime.datetime.strptime(datetime.datetime.now(pytz.utc).strftime("%Y-%m-%d"), "%Y-%m-%d")
-        days1 = str((day_today - day_start).days)
+        # day_start = datetime.datetime.strptime(str(days1), "%Y-%m-%d")
+        # day_today = datetime.datetime.strptime(datetime.datetime.now(pytz.utc).strftime("%Y-%m-%d"), "%Y-%m-%d")
+        # days1 = str((day_today - day_start).days)
 
         portfolio['symbols'][symbol1] = {'shares':shares1, 'day':days1, 'cost':cost1}
 

From f3f99e6ee684e2f3525968134f336919ea424c2c Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 11 Jul 2023 16:04:17 +0800
Subject: [PATCH 024/133] number of days bug in portfolio features fixed

---
 stockTicker.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/stockTicker.py b/stockTicker.py
index c7d924a..80b32f5 100755
--- a/stockTicker.py
+++ b/stockTicker.py
@@ -1061,6 +1061,9 @@ class StockTicker():
                         try:
                             cost = portfolio_settings[cb]['cost']
                             day = portfolio_settings[cb]['day']
+                            day_start = datetime.strptime(str(day), "%Y-%m-%d")
+                            day_today = datetime.strptime(datetime.now(pytz.utc).strftime("%Y-%m-%d"), "%Y-%m-%d")
+                            day = str((day_today - day_start).days)
                             shares = portfolio_settings[cb]['shares']
 
                             original_value = float(cost) * float(shares)
@@ -1230,6 +1233,9 @@ class StockTicker():
                         try:
                             cost = portfolio_settings[cb]['cost']
                             day = portfolio_settings[cb]['day']
+                            day_start = datetime.strptime(str(day), "%Y-%m-%d")
+                            day_today = datetime.strptime(datetime.now(pytz.utc).strftime("%Y-%m-%d"), "%Y-%m-%d")
+                            day = str((day_today - day_start).days)
                             shares = portfolio_settings[cb]['shares']
 
                             original_value = float(cost) * float(shares)
@@ -2020,6 +2026,9 @@ class StockTicker():
                         try:
                             cost = portfolio_settings[symbol]['cost']
                             day = portfolio_settings[symbol]['day']
+                            day_start = datetime.strptime(str(day), "%Y-%m-%d")
+                            day_today = datetime.strptime(datetime.now(pytz.utc).strftime("%Y-%m-%d"), "%Y-%m-%d")
+                            day = str((day_today - day_start).days)
                             shares = portfolio_settings[symbol]['shares']
 
                             original_value = float(cost) * float(shares)
@@ -2286,6 +2295,9 @@ class StockTicker():
                         try:
                             cost = portfolio_settings[symbol]['cost']
                             day = portfolio_settings[symbol]['day']
+                            day_start = datetime.strptime(str(day), "%Y-%m-%d")
+                            day_today = datetime.strptime(datetime.now(pytz.utc).strftime("%Y-%m-%d"), "%Y-%m-%d")
+                            day = str((day_today - day_start).days)
                             shares = portfolio_settings[symbol]['shares']
 
                             original_value = float(cost) * float(shares)

From 356546558e68c5ab30eb485afd1d9a3916f1123b Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 11 Jul 2023 16:04:56 +0800
Subject: [PATCH 025/133] fixed bug portfolio days not updating

---
 server.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server.py b/server.py
index 0d6cf50..48c1367 100755
--- a/server.py
+++ b/server.py
@@ -946,9 +946,9 @@ def savePortfolioCryptoSettings():
         symbol1 = settings['symbol']
 	
         days1 = settings['days']
-        day_start = datetime.datetime.strptime(str(days1), "%Y-%m-%d")
-        day_today = datetime.datetime.strptime(datetime.datetime.now(pytz.utc).strftime("%Y-%m-%d"), "%Y-%m-%d")
-        days1 = str((day_today - day_start).days)
+        # day_start = datetime.datetime.strptime(str(days1), "%Y-%m-%d")
+        # day_today = datetime.datetime.strptime(datetime.datetime.now(pytz.utc).strftime("%Y-%m-%d"), "%Y-%m-%d")
+        # days1 = str((day_today - day_start).days)
 
         portfolio['symbols'][symbol1] = {'shares':shares1, 'day':days1, 'cost':cost1}
 

From a5e30dfc1c7b92cd476871e1147548dce6545846 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 11 Jul 2023 17:04:29 +0800
Subject: [PATCH 026/133] fetch crypto and stock portfolio values

---
 static/app.js | 100 ++++++++++++++++++++++++++------------------------
 1 file changed, 53 insertions(+), 47 deletions(-)

diff --git a/static/app.js b/static/app.js
index 404b7b0..66c4509 100755
--- a/static/app.js
+++ b/static/app.js
@@ -2827,64 +2827,70 @@ function updateSelectedMsg(){
 
 
 
-
-
-
-
 // get stock portfolio values
 function getStockSymbol(value) {
   let stock_symbol = value;
   const stock_thing = document.getElementById("inputText3");
-  // const the_msg = document.getElementById("inputText14");
-  // const t_color = document.getElementById("inputScrollSpeed16");
-  // const b_color = document.getElementById("inputScrollSpeed19");
-  // const t_size = document.getElementById("inputScrollSpeed17");
+  const stock_shares = document.getElementById("inputText8");
+  const stock_cost = document.getElementById("inputText9");
+  const stock_date = document.getElementById("inputText10");
+  const stock_portfolio_check = document.getElementById("flexCheckChecked4");
   stock_thing.value = stock_symbol;
 
-  // fetch("/fetchCustomMsg", {
-  //   method: "POST",
-  //   body: JSON.stringify(messaged),
-  // })
-  // .then(response => response.json())
-  // .then(data => {
-  //   // Update the elements with the retrieved information
-  //   the_msg.value = data.text;
-  //   t_color.value = data.text_colour;
-  //   b_color.value = data.background_colour;
-  //   t_size.value = data.size;
-  //   theIndexOfMsg = data.index;
-  // })
-  // .catch(error => {
-  //   console.error('Error:', error);
-  // });
-}
-
+  if (stock_portfolio_check.checked) {
+  fetch("/fetchStockPortfolio", {
+     method: "POST",
+     body: JSON.stringify(stock_symbol),
+  })
+  .then(response => response.json())
+  .then(data => {
+    if (JSON.stringify(data) !== '{}') {
+    // Update the elements with the retrieved information
+    stock_shares.value = data.shares;
+    stock_cost.value = data.cost;
+    stock_date.value = data.day;
+   } else {
+     stock_shares.value = '';
+     stock_cost.value = '';
+     stock_date.value = '';
+    }
+   })
+   .catch(error => {
+    console.error('Error:', error);
+   });
+}}
 
 
 // get crypto portfolio values
 function getCryptoSymbol(value) {
   let crypto_symbol = value;
   const crypto_thing = document.getElementById("inputText4");
-  // const the_msg = document.getElementById("inputText14");
-  // const t_color = document.getElementById("inputScrollSpeed16");
-  // const b_color = document.getElementById("inputScrollSpeed19");
-  // const t_size = document.getElementById("inputScrollSpeed17");
+  const crypto_shares = document.getElementById("cryptoshares");
+  const crypto_cost = document.getElementById("cryptocost");
+  const crypto_date = document.getElementById("cryptodate");
+  const crypto_portfolio_check = document.getElementById("crypto_portfolio_checkbox");
+
   crypto_thing.value = crypto_symbol;
 
-  // fetch("/fetchCustomMsg", {
-  //   method: "POST",
-  //   body: JSON.stringify(messaged),
-  // })
-  // .then(response => response.json())
-  // .then(data => {
-  //   // Update the elements with the retrieved information
-  //   the_msg.value = data.text;
-  //   t_color.value = data.text_colour;
-  //   b_color.value = data.background_colour;
-  //   t_size.value = data.size;
-  //   theIndexOfMsg = data.index;
-  // })
-  // .catch(error => {
-  //   console.error('Error:', error);
-  // });
-}
+  if (crypto_portfolio_check.checked) {
+  fetch("/fetchCryptoPortfolio", {
+    method: "POST",
+    body: JSON.stringify(crypto_symbol),
+  })
+  .then(response => response.json())
+  .then(data => {
+    if (JSON.stringify(data) !== '{}') {
+    // Update the elements with the retrieved information
+    crypto_shares.value = data.shares;
+    crypto_cost.value = data.cost;
+    crypto_date.value = data.day;
+  } else {
+    crypto_shares.value = '';
+    crypto_cost.value = '';
+    crypto_date.value = '';
+   }
+  })
+  .catch(error => {
+    console.error('Error:', error);
+  });
+}}

From 73a3220fb81ee3c450966102609d9db1c1838796 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 11 Jul 2023 17:05:41 +0800
Subject: [PATCH 027/133] fetch crypto and stock portfolio values and send back
 to app.js

---
 server.py | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/server.py b/server.py
index 48c1367..6982b38 100755
--- a/server.py
+++ b/server.py
@@ -1515,6 +1515,41 @@ def setTop20or10():
     return index()
 
 
+
+@app.route("/fetchStockPortfolio", methods=["POST"])
+def fetchStockPortfolio():
+    value = request.data.decode('utf-8')
+    value2 = json.loads(value)
+    try:
+        with open("csv/portfolio_settings.json") as f:
+            data = json.load(f)
+    except:
+        data = {"symbols": {}}
+    try:
+        stock_pos_info = data['symbols'][value2]
+    except:
+        stock_pos_info = {}
+
+    return (stock_pos_info)
+
+
+@app.route("/fetchCryptoPortfolio", methods=["POST"])
+def fetchCryptoPortfolio():
+    value = request.data.decode('utf-8')
+    value2 = json.loads(value)
+    try:
+        with open("csv/portfolio_crypto_settings.json") as f:
+            data = json.load(f)
+    except:
+        data = {"symbols": {}}
+    try:
+        crypto_pos_info = data['symbols'][value2]
+    except:
+        crypto_pos_info = {}
+
+    return (crypto_pos_info)
+
+
 @app.route("/fetchCustomMsg", methods=["POST"])
 def fetch_custom_msg():
     value = request.data.decode('utf-8')

From a627bf7f217a99cc0a4357e1b2a0d26166ef9ab9 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 11 Jul 2023 17:37:21 +0800
Subject: [PATCH 028/133] automatically add onclick functions to newly added
 stock crypto li items

---
 static/app.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/static/app.js b/static/app.js
index 66c4509..ec6438b 100755
--- a/static/app.js
+++ b/static/app.js
@@ -929,7 +929,13 @@ allFeaturesTextAddBtn.map((value, index) => {
             var tag = document.createElement("li");
             if (index == 2) {
               tag.innerHTML= document.getElementById("base-select").value + ',' + document.getElementById("quote-select").value;
-            } else{
+            } else if (index == 0) {
+              tag.innerHTML = allFeaturesText[index].value;
+              tag.setAttribute("onclick", "getStockSymbol(this.innerText)");
+            } else if (index == 1) {
+              tag.innerHTML = allFeaturesText[index].value;
+              tag.setAttribute("onclick", "getCryptoSymbol(this.innerText)");
+            } else {
               tag.innerHTML = allFeaturesText[index].value;
             }
             allFeatures[index].appendChild(tag);

From c3e6acdbde180608116c76d0a287dc6401915251 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 11 Jul 2023 18:25:44 +0800
Subject: [PATCH 029/133] update stock portfolio position function

---
 static/app.js | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/static/app.js b/static/app.js
index ec6438b..1b7ea5e 100755
--- a/static/app.js
+++ b/static/app.js
@@ -2900,3 +2900,36 @@ function getCryptoSymbol(value) {
     console.error('Error:', error);
   });
 }}
+
+
+
+// update stock portfolio position with new values
+function updateStockPorftolio() {
+
+  let update_stock_cost = document.getElementById('inputText9').value;
+  let update_stock_shares = document.getElementById('inputText8').value;
+  let update_symbol = document.getElementById('inputText3').value;
+  let update_stock_days = document.getElementById('inputText10').value;
+
+  let update_stock_settings = {
+    shares:update_stock_shares,
+    cost:update_stock_cost,
+    symbol:update_symbol,
+    days:update_stock_days,
+  };
+
+  if ((update_stock_shares !== '') && (update_stock_cost !== '') && (update_stock_days !== '') && (update_symbol !== '')) {
+    fetch("/savePortfolioSettings", {
+    method: "POST",
+    body: JSON.stringify(update_stock_settings),
+    });
+
+    document.getElementById('updated-stock-p').style.display = "block";
+    setTimeout(function hideElement() {
+      document.getElementById('updated-stock-p').style.display = "none";
+    }, 5000);
+
+  } else {
+    stockValidate();
+  }
+}

From bd3c48abe96db273168fbd99a1dddab424c18204 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 11 Jul 2023 18:27:20 +0800
Subject: [PATCH 030/133] stock position updated message

---
 templates/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/index.html b/templates/index.html
index 4e96bba..997b7bd 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1747,6 +1747,7 @@
                       aria-describedby="TextHelpInline"
                       placeholder="e.g. YYYY-MM-DD" />
                   </div>
+                  <div id="updated-stock-p" style="display:none"><p id="stockupdated-p" style="color: red;">Stock Position Updated!</p></div>
                 </div>
                 </div>
 

From 4c0fff8b3386d5f9468a2edf5dd29298f0d257ce Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 11 Jul 2023 18:42:06 +0800
Subject: [PATCH 031/133] crypto position updated msg

---
 templates/index.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/index.html b/templates/index.html
index 997b7bd..7446fba 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -2257,6 +2257,8 @@
                       aria-describedby="TextHelpInline"
                       placeholder="e.g. YYYY-MM-DD" />
                   </div>
+                  <div id="updated-crypto-p" style="display:none"><p id="cryptoupdated-p" style="color: red;">Crypto Position Updated!</p></div>
+                  
                 </div>
                 </div>
                 

From a8d3b16006177425fd69c7f4224d14ce1dcc01b4 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 11 Jul 2023 18:47:24 +0800
Subject: [PATCH 032/133] update crypto position

---
 static/app.js | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/static/app.js b/static/app.js
index 1b7ea5e..77bceb8 100755
--- a/static/app.js
+++ b/static/app.js
@@ -2933,3 +2933,37 @@ function updateStockPorftolio() {
     stockValidate();
   }
 }
+
+
+
+// update crypto portfolio position with new values
+function updateCryptoPorftolio() {
+
+  let update_crypto_cost = document.getElementById('cryptocost').value;
+  let update_crypto_shares = document.getElementById('cryptoshares').value;
+  let update_crypto_symbol = document.getElementById('inputText4').value;
+  let update_crypto_days = document.getElementById('cryptodate').value;
+
+  let update_crypto_settings = {
+    shares:update_crypto_shares,
+    cost:update_crypto_cost,
+    symbol:update_crypto_symbol,
+    days:update_crypto_days,
+  };
+
+  if ((update_crypto_shares !== '') && (update_crypto_cost !== '') && (update_crypto_days !== '') && (update_crypto_symbol !== '')) {
+    fetch("/savePortfolioCryptoSettings", {
+    method: "POST",
+    body: JSON.stringify(update_crypto_settings),
+    });
+
+    document.getElementById('updated-crypto-p').style.display = "block";
+    setTimeout(function hideElement() {
+      document.getElementById('updated-crypto-p').style.display = "none";
+    }, 5000);
+
+  } else {
+    cryptoValidate();
+  }
+}
+

From 7d4fa5154f1a16b15c72948116c47398d14abc3c Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 11 Jul 2023 18:57:28 +0800
Subject: [PATCH 033/133] remove stock crypto position btn and msg

---
 templates/index.html | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/templates/index.html b/templates/index.html
index 7446fba..f76ca70 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1747,7 +1747,12 @@
                       aria-describedby="TextHelpInline"
                       placeholder="e.g. YYYY-MM-DD" />
                   </div>
+                  <div class="col-auto">
+                    <button id="remove-stock-port-btn" class="btn set-btn" onclick="removeStockPorftolio()">Remove Position</button>
+                  </div>
+                  
                   <div id="updated-stock-p" style="display:none"><p id="stockupdated-p" style="color: red;">Stock Position Updated!</p></div>
+                  <div id="removed-stock-p" style="display:none"><p id="stockremoved-p" style="color: red;">Stock Position Removed!</p></div>
                 </div>
                 </div>
 
@@ -2257,7 +2262,11 @@
                       aria-describedby="TextHelpInline"
                       placeholder="e.g. YYYY-MM-DD" />
                   </div>
+                  <div class="col-auto">
+                    <button id="remove-crypto-port-btn" class="btn set-btn" onclick="removeCryptoPorftolio()">Remove Position</button>
+                  </div>
                   <div id="updated-crypto-p" style="display:none"><p id="cryptoupdated-p" style="color: red;">Crypto Position Updated!</p></div>
+                  <div id="removed-crypto-p" style="display:none"><p id="cryptoremoved-p" style="color: red;">Crypto Position Removed!</p></div>
                   
                 </div>
                 </div>

From 912bfde7f6c649cac940ac44b37472dbaecc270b Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 11 Jul 2023 19:09:46 +0800
Subject: [PATCH 034/133] remove stock position

---
 static/app.js | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/static/app.js b/static/app.js
index 77bceb8..ba0bef0 100755
--- a/static/app.js
+++ b/static/app.js
@@ -2903,6 +2903,36 @@ function getCryptoSymbol(value) {
 
 
 
+// remove stock portfolio position
+function removeStockPorftolio() {
+  
+  let remove_stock_symbol = document.getElementById('inputText3').value;
+  
+  if (remove_stock_symbol !== '') {
+    document.getElementById('inputText9').value = '';
+    document.getElementById('inputText8').value = '';
+    document.getElementById('inputText10').value = '';
+    fetch("/deletePortfolioSettings", {
+      method: "POST",
+      body: JSON.stringify(remove_stock_symbol),
+    });
+    document.getElementById('removed-stock-p').innerHTML = 'Stock Position Removed!';
+    document.getElementById('removed-stock-p').style.display = "block";
+    setTimeout(function hideElement() {
+      document.getElementById('removed-stock-p').style.display = "none";
+    }, 5000);
+  } else {
+    document.getElementById('removed-stock-p').innerHTML = 'No symbol selected.';
+    document.getElementById('removed-stock-p').style.display = "block";
+    setTimeout(function hideElement() {
+      document.getElementById('removed-stock-p').style.display = "none";
+    }, 5000);
+  }
+  
+}
+
+
+
 // update stock portfolio position with new values
 function updateStockPorftolio() {
 

From e8c6e40059d2725df055f421e42084fad735a76b Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 11 Jul 2023 19:12:04 +0800
Subject: [PATCH 035/133] delete stock portfolio

---
 server.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/server.py b/server.py
index 6982b38..01b3b45 100755
--- a/server.py
+++ b/server.py
@@ -1516,6 +1516,22 @@ def setTop20or10():
 
 
 
+@app.route("/deletePortfolioSettings", methods=["POST"])
+def deletePortfolioSettings():
+    value = request.data.decode('utf-8')
+    value2 = json.loads(value)
+    try:
+        with open("csv/portfolio_settings.json") as f:
+            data = json.load(f)
+    except:
+        data = {"symbols": {}}
+    try:
+	del data["symbols"][value2]
+    except:
+	pass
+    return index()
+
+
 @app.route("/fetchStockPortfolio", methods=["POST"])
 def fetchStockPortfolio():
     value = request.data.decode('utf-8')

From 712094d03d5b70749469bc3522def6d827afdf42 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 11 Jul 2023 19:13:46 +0800
Subject: [PATCH 036/133] fixed indent issues

---
 server.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server.py b/server.py
index 01b3b45..5d8884a 100755
--- a/server.py
+++ b/server.py
@@ -1526,9 +1526,9 @@ def deletePortfolioSettings():
     except:
         data = {"symbols": {}}
     try:
-	del data["symbols"][value2]
+        del data["symbols"][value2]
     except:
-	pass
+        pass
     return index()
 
 

From 49867cd86a4baa16a0ad494075d3408d285963b2 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 11 Jul 2023 19:14:55 +0800
Subject: [PATCH 037/133] renamed function name, overlapping with other func

---
 server.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server.py b/server.py
index 5d8884a..d017c22 100755
--- a/server.py
+++ b/server.py
@@ -1516,8 +1516,8 @@ def setTop20or10():
 
 
 
-@app.route("/deletePortfolioSettings", methods=["POST"])
-def deletePortfolioSettings():
+@app.route("/deletePortfolioPosition", methods=["POST"])
+def deletePortfolioPosition():
     value = request.data.decode('utf-8')
     value2 = json.loads(value)
     try:

From 17a0e0ea0ef07703bbffd735de7c6a80deeeb750 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 11 Jul 2023 19:16:15 +0800
Subject: [PATCH 038/133] renamed function

---
 static/app.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/static/app.js b/static/app.js
index ba0bef0..40b10e9 100755
--- a/static/app.js
+++ b/static/app.js
@@ -2912,16 +2912,20 @@ function removeStockPorftolio() {
     document.getElementById('inputText9').value = '';
     document.getElementById('inputText8').value = '';
     document.getElementById('inputText10').value = '';
-    fetch("/deletePortfolioSettings", {
+    
+    fetch("/deletePortfolioPosition", {
       method: "POST",
       body: JSON.stringify(remove_stock_symbol),
     });
+    
     document.getElementById('removed-stock-p').innerHTML = 'Stock Position Removed!';
     document.getElementById('removed-stock-p').style.display = "block";
     setTimeout(function hideElement() {
       document.getElementById('removed-stock-p').style.display = "none";
     }, 5000);
-  } else {
+  } 
+  
+  else {
     document.getElementById('removed-stock-p').innerHTML = 'No symbol selected.';
     document.getElementById('removed-stock-p').style.display = "block";
     setTimeout(function hideElement() {

From c61623198e2f186c070188b65bdaa0621f8e148d Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 11 Jul 2023 19:21:04 +0800
Subject: [PATCH 039/133] forgot to add with open portfolio_settings for
 deleting symbol

---
 server.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/server.py b/server.py
index d017c22..c38efa9 100755
--- a/server.py
+++ b/server.py
@@ -1527,6 +1527,8 @@ def deletePortfolioPosition():
         data = {"symbols": {}}
     try:
         del data["symbols"][value2]
+        with open('csv/portfolio_settings.json', 'w') as f:
+            json.dump(data, f)
     except:
         pass
     return index()

From 963667033672ae3473e21b802e4012ba446533b1 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 11 Jul 2023 19:26:11 +0800
Subject: [PATCH 040/133] minor fixes

---
 static/app.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/static/app.js b/static/app.js
index 40b10e9..280b76b 100755
--- a/static/app.js
+++ b/static/app.js
@@ -2918,7 +2918,7 @@ function removeStockPorftolio() {
       body: JSON.stringify(remove_stock_symbol),
     });
     
-    document.getElementById('removed-stock-p').innerHTML = 'Stock Position Removed!';
+    document.getElementById('stockremoved-p').innerHTML = 'Stock Position Removed!';
     document.getElementById('removed-stock-p').style.display = "block";
     setTimeout(function hideElement() {
       document.getElementById('removed-stock-p').style.display = "none";
@@ -2926,7 +2926,7 @@ function removeStockPorftolio() {
   } 
   
   else {
-    document.getElementById('removed-stock-p').innerHTML = 'No symbol selected.';
+    document.getElementById('stockremoved-p').innerHTML = 'No symbol selected.';
     document.getElementById('removed-stock-p').style.display = "block";
     setTimeout(function hideElement() {
       document.getElementById('removed-stock-p').style.display = "none";

From 32c0ea4d98c50a2363227f7a012bde5c0df80b21 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 11 Jul 2023 19:29:20 +0800
Subject: [PATCH 041/133] remove crypto position

---
 static/app.js | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/static/app.js b/static/app.js
index 280b76b..5163801 100755
--- a/static/app.js
+++ b/static/app.js
@@ -2936,7 +2936,6 @@ function removeStockPorftolio() {
 }
 
 
-
 // update stock portfolio position with new values
 function updateStockPorftolio() {
 
@@ -2969,6 +2968,38 @@ function updateStockPorftolio() {
 }
 
 
+// remove crypto portfolio position
+function removeCryptoPorftolio() {
+  
+  let remove_crypto_symbol = document.getElementById('inputText4').value;
+  
+  if (remove_crypto_symbol !== '') {
+    document.getElementById('cryptoshares').value = '';
+    document.getElementById('cryptocost').value = '';
+    document.getElementById('cryptodate').value = '';
+    
+    fetch("/deletePortfolioPositionCrypto", {
+      method: "POST",
+      body: JSON.stringify(remove_crypto_symbol),
+    });
+    
+    document.getElementById('cryptoremoved-p').innerHTML = 'Crypto Position Removed!';
+    document.getElementById('removed-crypto-p').style.display = "block";
+    setTimeout(function hideElement() {
+      document.getElementById('removed-crypto-p').style.display = "none";
+    }, 5000);
+  } 
+  
+  else {
+    document.getElementById('cryptoremoved-p').innerHTML = 'No symbol selected.';
+    document.getElementById('removed-crypto-p').style.display = "block";
+    setTimeout(function hideElement() {
+      document.getElementById('removed-crypto-p').style.display = "none";
+    }, 5000);
+  }
+  
+}
+
 
 // update crypto portfolio position with new values
 function updateCryptoPorftolio() {

From 17729b184fc99766b40d3963f6fcfc42a688cf1e Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 11 Jul 2023 19:30:48 +0800
Subject: [PATCH 042/133] delete crypto position func

---
 server.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/server.py b/server.py
index c38efa9..f11f092 100755
--- a/server.py
+++ b/server.py
@@ -1516,6 +1516,24 @@ def setTop20or10():
 
 
 
+@app.route("/deletePortfolioPositionCrypto", methods=["POST"])
+def deletePortfolioPositionCrypto():
+    value = request.data.decode('utf-8')
+    value2 = json.loads(value)
+    try:
+        with open("csv/portfolio_crypto_settings.json") as f:
+            data = json.load(f)
+    except:
+        data = {"symbols": {}}
+    try:
+        del data["symbols"][value2]
+        with open('csv/portfolio_crypto_settings.json', 'w') as f:
+            json.dump(data, f)
+    except:
+        pass
+    return index()
+
+
 @app.route("/deletePortfolioPosition", methods=["POST"])
 def deletePortfolioPosition():
     value = request.data.decode('utf-8')

From d55f2109c3e0143413e40e3e044209f4733678fc Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 11 Jul 2023 22:21:42 +0800
Subject: [PATCH 043/133] update stock and crypto position validation fixed

---
 static/app.js | 81 +++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 72 insertions(+), 9 deletions(-)

diff --git a/static/app.js b/static/app.js
index 5163801..022e8ac 100755
--- a/static/app.js
+++ b/static/app.js
@@ -2951,7 +2951,42 @@ function updateStockPorftolio() {
     days:update_stock_days,
   };
 
-  if ((update_stock_shares !== '') && (update_stock_cost !== '') && (update_stock_days !== '') && (update_symbol !== '')) {
+  if ((update_symbol === '') || (update_symbol === ' ')) {
+    document.getElementById('stockremoved-p').innerHTML = 'No symbol selected.';
+    document.getElementById('removed-stock-p').style.display = "block";
+    setTimeout(function hideElement() {
+      document.getElementById('removed-stock-p').style.display = "none";
+    }, 5000);
+  }
+  else if ((update_stock_cost === ' ') || (update_stock_shares === ' ') || (update_stock_days === ' ')) {
+    document.getElementById('stockremoved-p').innerHTML = 'No spaces.';
+    document.getElementById('removed-stock-p').style.display = "block";
+    setTimeout(function hideElement() {
+      document.getElementById('removed-stock-p').style.display = "none";
+    }, 5000);
+  }
+  else if ((isNaN(update_stock_cost)) || (isNaN(update_stock_shares))) {
+    document.getElementById('stockremoved-p').innerHTML = 'No text characters, only numbers.';
+    document.getElementById('removed-stock-p').style.display = "block";
+    setTimeout(function hideElement() {
+      document.getElementById('removed-stock-p').style.display = "none";
+    }, 5000);
+  }
+  else if ((!update_stock_days.includes('-')) && (update_stock_days !== '')) {
+    document.getElementById('stockremoved-p').innerHTML = 'Incorrect date format, it should be YYYY-MM-DD';
+    document.getElementById('removed-stock-p').style.display = "block";
+    setTimeout(function hideElement() {
+      document.getElementById('removed-stock-p').style.display = "none";
+    }, 5000);
+  }
+  else if (((update_stock_shares !== '') || (update_stock_cost !== '') || (update_stock_days !== '')) && ((update_stock_shares === '') || (update_stock_cost === '') || (update_stock_days === ''))) {
+    document.getElementById('stockremoved-p').innerHTML = 'Some fields are empty.';
+    document.getElementById('removed-stock-p').style.display = "block";
+    setTimeout(function hideElement() {
+      document.getElementById('removed-stock-p').style.display = "none";
+    }, 5000);
+  }
+  else {
     fetch("/savePortfolioSettings", {
     method: "POST",
     body: JSON.stringify(update_stock_settings),
@@ -2961,9 +2996,6 @@ function updateStockPorftolio() {
     setTimeout(function hideElement() {
       document.getElementById('updated-stock-p').style.display = "none";
     }, 5000);
-
-  } else {
-    stockValidate();
   }
 }
 
@@ -3016,7 +3048,42 @@ function updateCryptoPorftolio() {
     days:update_crypto_days,
   };
 
-  if ((update_crypto_shares !== '') && (update_crypto_cost !== '') && (update_crypto_days !== '') && (update_crypto_symbol !== '')) {
+  if ((update_crypto_symbol === '') || (update_crypto_symbol === ' ')) {
+    document.getElementById('cryptoremoved-p').innerHTML = 'No symbol selected.';
+    document.getElementById('removed-crypto-p').style.display = "block";
+    setTimeout(function hideElement() {
+      document.getElementById('removed-crypto-p').style.display = "none";
+    }, 5000);
+  }
+  else if ((update_crypto_cost === ' ') || (update_crypto_shares === ' ') || (update_crypto_days === ' ')) {
+    document.getElementById('cryptoremoved-p').innerHTML = 'No spaces.';
+    document.getElementById('removed-crypto-p').style.display = "block";
+    setTimeout(function hideElement() {
+      document.getElementById('removed-crypto-p').style.display = "none";
+    }, 5000);
+  }
+  else if ((isNaN(update_crypto_cost)) || (isNaN(update_crypto_shares))) {
+    document.getElementById('cryptoremoved-p').innerHTML = 'No text characters, only numbers.';
+    document.getElementById('removed-crypto-p').style.display = "block";
+    setTimeout(function hideElement() {
+      document.getElementById('removed-crypto-p').style.display = "none";
+    }, 5000);
+  }
+  else if ((!update_crypto_days.includes('-')) && (update_crypto_days !== '')) {
+    document.getElementById('cryptoremoved-p').innerHTML = 'Incorrect date format, it should be YYYY-MM-DD';
+    document.getElementById('removed-crypto-p').style.display = "block";
+    setTimeout(function hideElement() {
+      document.getElementById('removed-crypto-p').style.display = "none";
+    }, 5000);
+  }
+  else if (((update_crypto_shares !== '') || (update_crypto_cost !== '') || (update_crypto_days !== '')) && ((update_crypto_shares === '') || (update_crypto_cost === '') || (update_crypto_days === ''))) {
+    document.getElementById('cryptoremoved-p').innerHTML = 'Some fields are empty.';
+    document.getElementById('removed-crypto-p').style.display = "block";
+    setTimeout(function hideElement() {
+      document.getElementById('removed-crypto-p').style.display = "none";
+    }, 5000);
+  }
+  else {
     fetch("/savePortfolioCryptoSettings", {
     method: "POST",
     body: JSON.stringify(update_crypto_settings),
@@ -3026,9 +3093,5 @@ function updateCryptoPorftolio() {
     setTimeout(function hideElement() {
       document.getElementById('updated-crypto-p').style.display = "none";
     }, 5000);
-
-  } else {
-    cryptoValidate();
   }
 }
-

From 48e5db6076b212384732dc8b576a336d724a1bae Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 12 Jul 2023 13:00:07 +0800
Subject: [PATCH 044/133] jokes feature title

---
 feature_titles/jokes.png | Bin 0 -> 467 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 feature_titles/jokes.png

diff --git a/feature_titles/jokes.png b/feature_titles/jokes.png
new file mode 100644
index 0000000000000000000000000000000000000000..e37a42e3e9427b57d6daf348edcd1d2a14a6b633
GIT binary patch
literal 467
zcmV;^0WAKBP)<h;3K|Lk000e1NJLTq003VA001Ba0{{R3h8DTf00001b5ch_0olnc
ze*gdg32;bRa{vGf6951U69E94oEQKA01{A4R7C&)09Ve+8$m(%r0e+~*#H0k@skTb
z00006bW%=J0RR90|NnY<;Qjyr0Z2(iK~#90os`>+#2^esNhJP<R1h3G*i?WhfFJkY
z%J=~!n~ZjxwUigRhl{a=bA|{ZSY$n>!11!mA@s26=RJ~k0ltF`$RyqN9K%vpE3o{O
zlEYT=cl|^vHYlk?J3t0`DS01&ug)PN-S`VRoR<L?1lUWw0{p)+;Hv^C0}5;%hzEeo
zFo0ETJgTt*?D8An|Dsh&#he1KhJbhjsyxu?y6k}OnI8b}Y6EguuK?#caxejHTWMja
zWjFv%{RY$lDA5W{K>7@bLmT9eDKU^55dX+Qh$;X;;<}vyyzf%qsZ=B~fm;E9HkBKN
z>vgyQ6j5GRHE^Rf&XvXvWWK@xB-7D+sLkh5yLFbyp~%K|K#JPi`_!#6PV1&)fUf{O
zhc7Y5c518^wV0^hG`m`W95QADF`*<L0i4P53~>LjcnCO9;0<c*cGi|=x6uFq002ov
JPDHLkV1fdA!Y}{;

literal 0
HcmV?d00001


From 0e2f8db0c92720e33477bba3c45eadd7f8f4146b Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 12 Jul 2023 13:00:39 +0800
Subject: [PATCH 045/133] jokes prof feature title

---
 feature_titles/small_feature_titles/jokes.png | Bin 0 -> 336 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 feature_titles/small_feature_titles/jokes.png

diff --git a/feature_titles/small_feature_titles/jokes.png b/feature_titles/small_feature_titles/jokes.png
new file mode 100644
index 0000000000000000000000000000000000000000..f09a4513caae4eabb83da56a61e7a52415295a9d
GIT binary patch
literal 336
zcmeAS@N?(olHy`uVBq!ia0vp^fk4d9!VDzyRPCC86k~CayA$KhlREW44rhT!WHAE+
zw=f7ZGR&GI0a6~|6XFV_|Ns9lVrck(|JR@LH+W`znhF$REeY}q21)#vxu6Cz{-mdi
zV@SoE+DYBKM-({P>gPI`8(igGCoJ%7{>umAw~xh~|H1G{k)L$}S3ve$rlV04c06X7
zF0Wwl*1zc8&zuwU(~2kVY0*==d~9w?_(n;Uw_AOtOWkvP7W~z5n#G+|<=uVpOT;(2
zzMs^aBON)DH7z#J_(`iy;O_WWUgCdtPgYs6XHxk*p9N2hJr4RUQ=i#$CAs45rkeG2
zaj{%MmMJeTE>gTMz4n}Y$>FxF&8mE2ci!jO#M_+R)#fGF<a%s-hkxnhWvSh>a^=eE
Z7(XmfdR=>@CKl)^22WQ%mvv4FO#q=Wh0Fi|

literal 0
HcmV?d00001


From 5c8fcbd0cb495b1a11b984f7b80e858958a62696 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 12 Jul 2023 13:01:46 +0800
Subject: [PATCH 046/133] added jokes feature to last_updates.json

---
 csv/last_updates.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/csv/last_updates.json b/csv/last_updates.json
index 45420d7..aba9e41 100644
--- a/csv/last_updates.json
+++ b/csv/last_updates.json
@@ -1 +1 @@
-{"scheduler":{"force": false}, "stocks": {"time": "14/06/2022 06:42:06", "force": false}, "crypto": {"time": "14/06/2022 06:58:18", "force": false}, "news": {"time": "14/06/2022 05:29:08", "force": false}, "weather": {"time": "14/06/2022 05:29:08", "force": false}, "forex": {"time": "14/06/2022 05:29:14", "force": false}, "sports_l": {"time": "14/06/2022 04:42:37", "force": false}, "sports_p": {"time": "14/06/2022 06:27:34", "force": false}, "sports_u": {"time": "14/06/2022 06:28:34", "force": false}, "sports_t": {"time": "14/06/2022 06:26:23", "force": false}, "commodities": {"time": "14/06/2022 06:51:07", "force": false}, "indices": {"time": "05/10/2022 04:06:10", "force": false}, "movies": {"time": "05/10/2022 02:31:40", "force": false}, "ipo": {"time": "05/10/2022 02:31:40", "force": false}, "prepost": {"time": "05/10/2022 02:31:40", "force": false}, "economic": {"time": "05/10/2022 02:31:40", "force": false}}
+{"scheduler":{"force": false}, "stocks": {"time": "14/06/2022 06:42:06", "force": false}, "crypto": {"time": "14/06/2022 06:58:18", "force": false}, "news": {"time": "14/06/2022 05:29:08", "force": false}, "weather": {"time": "14/06/2022 05:29:08", "force": false}, "forex": {"time": "14/06/2022 05:29:14", "force": false}, "sports_l": {"time": "14/06/2022 04:42:37", "force": false}, "sports_p": {"time": "14/06/2022 06:27:34", "force": false}, "sports_u": {"time": "14/06/2022 06:28:34", "force": false}, "sports_t": {"time": "14/06/2022 06:26:23", "force": false}, "commodities": {"time": "14/06/2022 06:51:07", "force": false}, "indices": {"time": "05/10/2022 04:06:10", "force": false}, "movies": {"time": "05/10/2022 02:31:40", "force": false}, "ipo": {"time": "05/10/2022 02:31:40", "force": false}, "prepost": {"time": "05/10/2022 02:31:40", "force": false}, "economic": {"time": "05/10/2022 02:31:40", "force": false}, "jokes": {"time": "05/10/2022 02:31:40", "force": false}}

From 4cc8688b084cf9c6a00c14697be81645f051ccdd Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 12 Jul 2023 15:26:45 +0800
Subject: [PATCH 047/133] added joke api in attribution

---
 templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/index.html b/templates/index.html
index f76ca70..64c813e 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -8594,7 +8594,7 @@
 
         <p>&copy; 2020-2023 Fintic Limited., All Rights Reserved. <a href="mailto:info@fintic.io" id="footerlinks">Contact Us.</a></p>
 
-        <p>Data Provided by TradingView, IEX Cloud, Open-Meteo, CoinGecko, Exchangerate-API, TheSportsDB, Google News, Yahoo Finance, ESPN, The Movie DB, Finnhub</p>
+        <p>Data Provided by TradingView, IEX Cloud, Open-Meteo, CoinGecko, Exchangerate-API, TheSportsDB, Google News, Yahoo Finance, ESPN, The Movie DB, Finnhub, Sv443 (JokeAPI)</p>
 
         <p>Useful resources: <a href="https://www.youtube.com/playlist?list=PLf8pW0bNjnebNZh3y0AsY18sxJj6IhAsv" id="footerlinks" target="_blank">YouTube Tutorials</a> , <a href="https://docs.google.com/spreadsheets/d/1IZkEl49j97xvG8jcEdWc5XdOLOUb_-ZLVHle2vezWCc/edit?usp=sharing" id="footerlinks" target="_blank">Formatting Guide & Info</a> , <a href="https://fintic.io" id="footerlinks" target="_blank">Official Website</a></p>
 

From 15d63868f80c55d2eff67f44f10234d11f62c197 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 12 Jul 2023 15:28:32 +0800
Subject: [PATCH 048/133] added br tag

---
 templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/index.html b/templates/index.html
index 64c813e..4879c03 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -8594,7 +8594,7 @@
 
         <p>&copy; 2020-2023 Fintic Limited., All Rights Reserved. <a href="mailto:info@fintic.io" id="footerlinks">Contact Us.</a></p>
 
-        <p>Data Provided by TradingView, IEX Cloud, Open-Meteo, CoinGecko, Exchangerate-API, TheSportsDB, Google News, Yahoo Finance, ESPN, The Movie DB, Finnhub, Sv443 (JokeAPI)</p>
+        <p>Data Provided by TradingView, IEX Cloud, Open-Meteo, CoinGecko, Exchangerate-API, TheSportsDB, Google News, <br>Yahoo Finance, ESPN, The Movie DB, Finnhub, Sv443 (JokeAPI)</p>
 
         <p>Useful resources: <a href="https://www.youtube.com/playlist?list=PLf8pW0bNjnebNZh3y0AsY18sxJj6IhAsv" id="footerlinks" target="_blank">YouTube Tutorials</a> , <a href="https://docs.google.com/spreadsheets/d/1IZkEl49j97xvG8jcEdWc5XdOLOUb_-ZLVHle2vezWCc/edit?usp=sharing" id="footerlinks" target="_blank">Formatting Guide & Info</a> , <a href="https://fintic.io" id="footerlinks" target="_blank">Official Website</a></p>
 

From e245e3734f6180e1a5e67df147ca8239a9a07466 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 12 Jul 2023 16:01:51 +0800
Subject: [PATCH 049/133] jokes html frontend

---
 templates/index.html | 171 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 170 insertions(+), 1 deletion(-)

diff --git a/templates/index.html b/templates/index.html
index 4879c03..496d539 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -1227,6 +1227,7 @@
                 <li>Movies</li>
                 <li>IPO Calendar</li>
                 <li>Economic Calendar</li>
+                <li>Jokes</li>
 
               {%endif%}
                 
@@ -1338,6 +1339,7 @@
               <option value="16">Movies</option>
               <option value="17">IPO Calendar</option>
               <option value="18">Economic Calendar</option>
+              <option value="19">Jokes</option>
             </select>
           </div> 
 
@@ -6962,7 +6964,174 @@
 
           </div>
       
-      
+
+
+    <!-- Jokes -->
+
+          <div class="page" id="Page19" style="display: none">
+            <div class="row">
+
+              <div class="col-lg-6 col-md-6 col-sm-12">
+
+                <div class="row g-3 align-items-center mt-3">
+                  <div class="col-auto">
+                    <label for="inputScrollSpeedZ222" class="col-form-label">Scroll Speed:</label>
+                  </div>
+                  <div class="col-auto">
+                    <select
+                      id="inputScrollSpeed19"
+                      class="form-select speed-select">
+                      <option {%if jokes_settings.speed == 'medium' %} selected {% endif %}>Medium</option>
+                      <option {%if jokes_settings.speed == 'slow' %} selected {% endif %}>Slow</option>
+                      <option {%if jokes_settings.speed == 'fast' %} selected {% endif %}>Fast</option>
+                    </select>
+                  </div>
+                </div>
+
+                <div class="row g-3 align-items-center mt-3 left-div">
+                  <div class="col-auto">
+                    <label for="inputScrollSpeedRowZ222" class="col-form-label">Scroll Speed (Row 2):</label>
+                  </div>
+                  <div class="col-auto">
+                    <select
+                      id="inputScrollSpeedRow19"
+                      class="form-select speed-select">
+                      <option {%if jokes_settings.speed2 == 'medium' %} selected {% endif %}>Medium</option>
+                      <option {%if jokes_settings.speed2 == 'slow' %} selected {% endif %}>Slow</option>
+                      <option {%if jokes_settings.speed2 == 'fast' %} selected {% endif %}>Fast</option>
+                    </select>
+                  </div>
+                </div>
+
+                <div class="row g-3 align-items-center mt-3">
+                  <div class="col-auto">
+                    <label for="inputTransitionZ222" class="col-form-label">Intro Transition:
+                    </label>
+                  </div>
+                  <div class="col-auto">
+                    <select id="inputTransition19" class="form-select animation-select">
+                      <option {%if jokes_settings.animation == 'down' %} selected {% endif %}>Down</option>
+                      <option {%if jokes_settings.animation == 'up' %} selected {% endif %}>Up</option>
+                      <option {%if jokes_settings.animation == 'continuous' %} selected {% endif %}>Continuous</option>
+                    </select>
+                  </div>
+                </div>
+
+                <div class="row g-3 align-items-center left-div" style="padding-top: 25px;">
+                  <div class="col-auto">
+                    <label for="inputTransitionZ222" class="col-form-label">
+                      Display Feature Title
+                    </label>
+                  </div>
+                  <div class="col-auto">
+                    <input
+                      class="form-check-input title-select"
+                      type="checkbox"
+                      value=""
+                      id="jokes_settings_title"
+                      {% if jokes_settings.title%}
+                      checked
+                      {%endif%}/>
+                  </div>
+                </div>
+
+                <div class="row g-3 align-items-center mt-3">
+                  <div class="col-auto">
+                    <label for="jokes-categories" class="col-form-label">Categories: </label>
+                  </div>
+                  <div class="col-auto">
+                    <select id="jokes-categories" class="form-select jokes-categories-select">
+                      <option>Any</option><option>Programming</option><option>Misc</option><option>Dark</option><option>Pun</option>
+                      <option>Spooky</option><option>Christmas</option>
+                    </select>
+                  </div>
+                  <div class="col-auto">
+                    <button id="jokes-categories-btn" class="btn set-btn">Add</button>
+                  </div>
+                </div>
+
+                <div class="row g-3 align-items-center mt-3">
+                  <div class="col-auto">
+                    <label for="inputText" class="col-form-label">Blacklist: </label>
+                  </div>
+                  <div class="col-auto">
+                      <input type="checkbox" id="nsfw-jokes" value="nsfw">
+                      <label for="nsfw-jokes">NSFW</label>
+                      <input type="checkbox" id="religious-jokes" value="religious">
+                      <label for="religious-jokes">Religious</label>
+                      <input type="checkbox" id="political-jokes" value="political">
+                      <label for="political-jokes">Political</label><br>
+                      <input type="checkbox" id="racist-jokes" value="racist">
+                      <label for="racist-jokes">Racist</label>
+                      <input type="checkbox" id="sexist-jokes" value="sexist">
+                      <label for="sexist-jokes">Sexist</label>
+                      <input type="checkbox" id="explicit-jokes" value="explicit">
+                      <label for="explicit-jokes">Explicit</label>
+                  </div>
+                </div>
+
+                <div class="row g-3 align-items-center mt-3">
+                  <div class="col-auto">
+                    <label for="jokes-amount" class="col-form-label">Amount: </label>
+                  </div>
+                  <div class="col-auto">
+                    <select id="jokes-amount" class="form-select jokes-amount-select">
+                      <option>1</option><option>2</option><option>3</option><option>4</option><option>5</option>
+                      <option>6</option><option>7</option><option>8</option><option>9</option><option>10</option>
+                    </select>
+                  </div>
+                </div>
+
+              </div>
+
+
+              <div class="col-lg-4 col-md-4 col-sm-12">
+                <h6 class="mt-3">List:</h6>
+                <div class="features-div-two">
+                  <ul
+                    id="jokes-list"
+                    class="display-features-list text-white symbol-list">
+                  </ul>
+                </div>
+              </div>
+
+              <div class="col-lg-2 col-md-2 col-sm-12">
+                <div class="icons-list">
+                  <i
+                    id="jokes-increase-btn"
+                    class="upbutton fa fa-chevron-up"
+                    aria-hidden="true"
+                  ></i>
+                  <br />
+                  <br />
+                  <i
+                    id="jokes-decrease-btn"
+                    class="downbutton fa fa-chevron-down"
+                    aria-hidden="true"
+                  ></i>
+                  <a style="position: relative; bottom: 30px; left: 10px">Sort Order</a>
+                  <br />
+                  <br />
+                  <i
+                    id="jokes-remove-btn"
+                    class="fa fa-minus"
+                    aria-hidden="true"
+                  ></i>
+                  <span style="position: relative; bottom: 0; left: 10px">Remove</span>
+
+                </div>
+              </div>
+            </div>
+
+            <div class="save-btn-div">
+              <a href="#" class="btn save-btn">Save</a>
+            </div>
+
+          </div> 
+
+            
+
+            
           <!-- Custom Images -->
 
           <div class="page" id="Page11" style="display: none">

From d87e2b556f267afbeaa20d78dd32551a4869eb74 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 12 Jul 2023 16:06:32 +0800
Subject: [PATCH 050/133] basic jokes feature backend

---
 static/app.js | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/static/app.js b/static/app.js
index 022e8ac..afd3fc2 100755
--- a/static/app.js
+++ b/static/app.js
@@ -49,6 +49,7 @@ var indicesFeatures = document.querySelectorAll("#indices-features li");
 var moviesFeatures = document.querySelectorAll("#movies-features li");
 var ipoFeatures = document.querySelectorAll("#ipo-features li");
 var economicFeatures = document.querySelectorAll("#economic-list li");
+var jokesFeatures = document.querySelectorAll("#jokes-list li");
 
 var allFeaturesList = [
   stocksFeatures,
@@ -69,6 +70,7 @@ var allFeaturesList = [
   moviesFeatures,
   ipoFeatures,
   economicFeatures,
+  jokesFeatures,
 ];
 
 // features remove buttons
@@ -96,6 +98,7 @@ var indicesRemoveBtn = document.getElementById("indices-remove-btn");
 var moviesRemoveBtn = document.getElementById("movies-remove-btn");
 var ipoRemoveBtn = document.getElementById("ipo-remove-btn");
 var economicRemoveBtn = document.getElementById("economic-remove-btn");
+var jokesRemoveBtn = document.getElementById("jokes-remove-btn");
 
 var allFeaturesRemoveBtns = [
   stocksRemoveBtn,
@@ -116,6 +119,7 @@ var allFeaturesRemoveBtns = [
   moviesRemoveBtn,
   ipoRemoveBtn,
   economicRemoveBtn,
+  jokesRemoveBtn,
 ];
 // features increase buttons
 var stocksincreaseBtn = document.getElementById("stocks-increase-btn");
@@ -142,6 +146,7 @@ var indicesincreaseBtn = document.getElementById("indices-increase-btn");
 var moviesincreaseBtn = document.getElementById("movies-increase-btn");
 var ipoincreaseBtn = document.getElementById("ipo-increase-btn");
 var economicincreaseBtn = document.getElementById("economic-increase-btn");
+var jokesincreaseBtn = document.getElementById("jokes-increase-btn");
 
 var allFeaturesIncreaseBtns = [
   stocksincreaseBtn,
@@ -162,6 +167,7 @@ var allFeaturesIncreaseBtns = [
   moviesincreaseBtn,
   ipoincreaseBtn,
   economicincreaseBtn,
+  jokesincreaseBtn,
 ];
 
 // features decrease buttons
@@ -189,6 +195,7 @@ var indicesDecreaseBtn = document.getElementById("indices-decrease-btn");
 var moviesDecreaseBtn = document.getElementById("movies-decrease-btn");
 var ipoDecreaseBtn = document.getElementById("ipo-decrease-btn");
 var economicDecreaseBtn = document.getElementById("economic-decrease-btn");
+var jokesDecreaseBtn = document.getElementById("jokes-decrease-btn");
 
 var allFeaturesDecreaseBtns = [
   stocksDecreaseBtn,
@@ -209,6 +216,7 @@ var allFeaturesDecreaseBtns = [
   moviesDecreaseBtn,
   ipoDecreaseBtn,
   economicDecreaseBtn,
+  jokesDecreaseBtn,
 ];
 
 const changeVarValue = () => {
@@ -236,6 +244,7 @@ const changeVarValue = () => {
   moviesFeatures = document.querySelectorAll("#movies-features li");
   ipoFeatures = document.querySelectorAll("#ipo-features li");
   economicFeatures = document.querySelectorAll("#economic-list li");
+  jokesFeatures = document.querySelectorAll("#jokes-list li");
   
   allFeaturesList = [
     stocksFeatures,
@@ -256,6 +265,7 @@ const changeVarValue = () => {
     moviesFeatures,
     ipoFeatures,
     economicFeatures,
+    jokesFeatures,
   ];
 };
 
@@ -621,6 +631,7 @@ var indices = document.getElementById("indices-features");
 var movies = document.getElementById("movies-features");
 var ipos = document.getElementById("ipo-features");
 var economics = document.getElementById("economic-list");
+var jokes = document.getElementById("jokes-list");
 
 var allFeatures = [
   stocks,
@@ -641,6 +652,7 @@ var allFeatures = [
   movies,
   ipos,
   economics,
+  jokes,
 ];
 
 // features select box
@@ -651,6 +663,7 @@ var liveGamesSelect = document.getElementById("inputTransition93");
 var teamStatsSelect = document.getElementById("inputTransition103");
 var moviesSelect = document.getElementById("inputTransition64");
 var economicSelect = document.getElementById("inputTransition2222");
+var jokesSelect = document.getElementById("jokes-categories");
 var allFeaturesSelectBox = [
   null,
   null,
@@ -670,6 +683,7 @@ var allFeaturesSelectBox = [
   moviesSelect,
   null,
   economicSelect,
+  jokesSelect,
 ];
 
 // features select add buttons
@@ -679,6 +693,7 @@ var pastGamesAddBtn = document.getElementById("inputTransitionBtn83");
 var liveGamesAddBtn = document.getElementById("inputTransitionBtn93");
 var teamStatsAddBtn = document.getElementById("inputTransitionBtn103");
 var economicAddBtn = document.getElementById("economic-countries-btn");
+var jokesAddBtn = document.getElementById("jokes-categories-btn");
 
 var allFeaturesSelectAddBtn = [
   null,
@@ -699,6 +714,7 @@ var allFeaturesSelectAddBtn = [
   null,
   null,
   economicAddBtn,
+  jokesAddBtn,
 ];
 
 allFeaturesSelectAddBtn.map((value, index) => {
@@ -736,6 +752,7 @@ var allFeaturesFile = [
   null,
   null,
   null,
+  null,
 ];
 // features file add button
 var imagesFileAddBtn = document.getElementById("inputTextBtn11");
@@ -760,6 +777,7 @@ var allFeaturesFileAddBtn = [
   null,
   null,
   null,
+  null,
 ];
 
 // features input text
@@ -791,6 +809,7 @@ var allFeaturesText = [
   null,
   null,
   null,
+  null,
 ];
 
 // features text add button
@@ -822,6 +841,7 @@ var allFeaturesTextAddBtn = [
   null,
   null,
   null,
+  null,
 ];
 
 
@@ -844,6 +864,7 @@ var allFeaturesLimit = [
   null,
   null,
   null,
+  null,
 ];
 
 
@@ -1115,6 +1136,7 @@ function getFeatureSettings() {
     "Movies",
     "IPO Calendar",
     "Economic Calendar",
+    "Jokes",
   ];
   let pageNum = features.indexOf(feature) + 1;
   let pageSelector = "Page" + pageNum.toString();
@@ -1180,6 +1202,9 @@ function getFeatureSettings() {
     case 18:
       s = getEconomicSettings(page);
       break;
+    case 19:
+      s = getJokesSettings(page);
+      break;
   }
   
   settings = { ...settings, ...s }; // merge both sets of settings
@@ -1372,6 +1397,7 @@ function saveMovieAPIKey(){
     "Movies",
     "IPO Calendar",
     "Economic Calendar",
+    "Jokes",
   ];
   let pageNum = features.indexOf(feature) + 1;
   let pageSelector = "Page" + pageNum.toString();
@@ -1414,6 +1440,7 @@ function saveIpoAPIKey(){
     "Movies",
     "IPO Calendar",
     "Economic Calendar",
+    "Jokes",
   ];
   let pageNum = features.indexOf(feature) + 1;
   let pageSelector = "Page" + pageNum.toString();
@@ -1819,7 +1846,7 @@ inputAnimationBtn.addEventListener("click", () => {
 // scroll speed row two
 let inputScrollSpeedRow = [];
 
-for (let i = 1; i <= 18; i++) {
+for (let i = 1; i <= 19; i++) {
   inputScrollSpeedRow.push(
     document.getElementById(
       i === 1 ? "inputScrollSpeedRow" : `inputScrollSpeedRow${i}`

From 72222ba64fdcf467f5a4ca98e487dada70ea72a6 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 12 Jul 2023 16:15:50 +0800
Subject: [PATCH 051/133] basic jokes backend added

---
 server.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/server.py b/server.py
index f11f092..d2ceebf 100755
--- a/server.py
+++ b/server.py
@@ -122,7 +122,7 @@ def index():
     global command
     all_features = ['Current Weather','Daily Forecast','News', 'Sports (Upcoming Games)','Sports (Past Games)','Sports (Live Games)',
                     'Sports (Team Stats)','Custom Images', 'Custom GIFs', 'Custom Messages', 'Stocks', 'Crypto', 'Forex', 'Commodities', 'Indices', 'Movies',
-		    'IPO Calendar', 'Economic Calendar']
+		    'IPO Calendar', 'Economic Calendar', 'Jokes']
     
     global professional
     
@@ -335,6 +335,13 @@ def index():
     except:
         economic_settings = {"feature": "Economic Calendar", "speed": "medium", "speed2": "medium", "animation": "up", "importance": "Med - High", "title": True, "timezone": "US/Eastern", "countries": ["United States"], "events": []}
 
+    try:
+        f = open('csv/jokes_settings.json', 'r')
+        jokes_settings = json.load(f)
+        f.close()
+    except:
+        jokes_settings = {"feature": "Jokes", "speed": "medium", "speed2": "medium", "animation": "up", "title": True, "categories": ["Any"], "blacklist": [], "amount": "5", "jokes": []}
+	
     try:
         f = open('csv/scheduler.json','r')
         scheduler_settings = json.load(f)
@@ -398,7 +405,8 @@ def index():
         'wifi_SSID':wifi_SSID,
         'wifi_PSK':wifi_PSK,
         'scheduler_settings':scheduler_settings,
-        'economic_settings':economic_settings
+        'economic_settings':economic_settings,
+        'jokes_settings':jokes_settings
       }
       
 
@@ -504,11 +512,11 @@ def save_displaying(input_settings):
     global professional
   
     all_settings = ['Stocks', 'Crypto', 'Forex', 'Commodities', 'Indices', 'Current Weather', 'Daily Forecast', 'News', 'Sports (Upcoming Games)', 'Sports (Past Games)',
-                    'Sports (Live Games)', 'Sports (Team Stats)', 'Custom Images', 'Custom GIFs', 'Custom Messages', 'Movies', 'IPO Calendar', 'Economic Calendar']
+                    'Sports (Live Games)', 'Sports (Team Stats)', 'Custom Images', 'Custom GIFs', 'Custom Messages', 'Movies', 'IPO Calendar', 'Economic Calendar', 'Jokes']
     professional = len(input_settings) == 2
     if professional:
         all_settings = ['Stocks', 'Crypto', 'Forex', 'Commodities', 'Indices', 'Current Weather', 'News', 'Daily Forecast', 'Sports (Upcoming Games)',
-                        'Sports (Past Games)', 'Sports (Team Stats)', 'Sports (Live Games)', 'Custom Messages', 'Custom Images', 'Movies', 'IPO Calendar', 'Economic Calendar']
+                        'Sports (Past Games)', 'Sports (Team Stats)', 'Sports (Live Games)', 'Custom Messages', 'Custom Images', 'Movies', 'IPO Calendar', 'Economic Calendar', 'Jokes']
         
     positions = []
     display_settings = []

From 9b318159a7ed7bef61b07fe463883fc7f113d0d8 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 12 Jul 2023 16:19:15 +0800
Subject: [PATCH 052/133] jokes added to reset

---
 setup_config_files.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/setup_config_files.sh b/setup_config_files.sh
index 19e3c07..e3d6a8c 100755
--- a/setup_config_files.sh
+++ b/setup_config_files.sh
@@ -14,10 +14,10 @@ touch crypto_settings.json last_updates.json system_info.json
 touch league_tables.json
 mkdir sports
 touch current_weather.json stocks_settings.json daily_weather.json live_games.json live_mlb.json live_mls.json live_nba.json live_nfl.json live_nhl.json live_pl.json commodities_settings.json indices_settings.json movie_settings.json ipo_settings.json
-touch display_settings.json  message_settings.json  upcoming_games.json forex_settings.json prepost_settings.json scheduler.json economic_settings.json
+touch display_settings.json  message_settings.json  upcoming_games.json forex_settings.json prepost_settings.json scheduler.json economic_settings.json jokes_settings.json
 touch GIF_settings.json news_settings.json image_settings.json past_games.json general_settings.json portfolio_settings.json portfolio_crypto_settings.json
 
-filenames="crypto_settings.json last_updates.json league_tables.json current_weather.json stocks_settings.json daily_weather.json live_games.json live_mlb.json live_mls.json live_nba.json live_nfl.json live_nhl.json live_pl.json commodities_settings.json indices_settings.json movie_settings.json ipo_settings.json economic_settings.json display_settings.json  message_settings.json  upcoming_games.json forex_settings.json GIF_settings.json news_settings.json image_settings.json past_games.json portfolio_settings.json portfolio_crypto_settings.json prepost_settings.json scheduler.json"
+filenames="crypto_settings.json last_updates.json league_tables.json current_weather.json stocks_settings.json daily_weather.json live_games.json live_mlb.json live_mls.json live_nba.json live_nfl.json live_nhl.json live_pl.json commodities_settings.json indices_settings.json movie_settings.json ipo_settings.json economic_settings.json display_settings.json  message_settings.json  upcoming_games.json forex_settings.json GIF_settings.json news_settings.json image_settings.json past_games.json portfolio_settings.json portfolio_crypto_settings.json prepost_settings.json scheduler.json jokes_settings.json"
 
 echo '{"update_available": false, "first_boot": true}' >> system_info.json
 echo [\"Standard\", [[\"Stocks\", \"Crypto\", \"Forex\"]]] >> display_settings.json
@@ -51,6 +51,7 @@ echo '{"feature": "IPO", "speed": "medium", "speed2": "medium", "animation": "do
 echo '{"symbols": {}}' >> portfolio_settings.json
 echo '{"symbols": {}}' >> portfolio_crypto_settings.json
 echo '{}' >> prepost_settings.json
+echo '{"feature": "Jokes", "speed": "medium", "speed2": "medium", "animation": "up", "title": true, "categories": ["Any"], "blacklist": [], "amount": "5", "jokes": []}' >> jokes_settings.json
 echo '{"shutdown": {"hour": "00", "minute": "00", "enabled": false}, "reboot":{"hour": "00", "minute": "00", "enabled": false}, "timezone": "GMT", "brightness1":{"hour": "00", "minute": "00", "bright": "10", "enabled": false}, "brightness2":{"hour": "00", "minute": "00", "bright": "10", "enabled": false}}, "brightness3":{"hour": "00", "minute": "00", "bright": "10", "enabled": false}}, "brightness4":{"hour": "00", "minute": "00", "bright": "10", "enabled": false}}' >> scheduler.json
 echo '{"feature": "Economic Calendar", "speed": "medium", "speed2": "medium", "animation": "up", "importance": "Med - High", "title": true, "timezone": "US/Eastern", "countries": ["United States"], "events": []}' >> economic_settings.json
 
@@ -105,6 +106,8 @@ touch 'IPO Calendar.ppm'
 touch 'IPO Calendar Prof.ppm'
 touch 'Economic Calendar.ppm'
 touch 'Economic Calendar Prof.ppm'
+touch 'Jokes.ppm'
+touch 'Jokes Prof.ppm'
 chmod 777 *
 
 

From 9473bdaebc977fbd049f65fa4f26f2fae76926f1 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 12 Jul 2023 16:20:16 +0800
Subject: [PATCH 053/133] jokes added again to last_updates reset

---
 setup_config_files.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup_config_files.sh b/setup_config_files.sh
index e3d6a8c..c79d124 100755
--- a/setup_config_files.sh
+++ b/setup_config_files.sh
@@ -21,7 +21,7 @@ filenames="crypto_settings.json last_updates.json league_tables.json current_wea
 
 echo '{"update_available": false, "first_boot": true}' >> system_info.json
 echo [\"Standard\", [[\"Stocks\", \"Crypto\", \"Forex\"]]] >> display_settings.json
-echo '{"scheduler":{"force": false}, "stocks": {"time": "07/03/2022 12:33:06", "force": true}, "crypto": {"time": "07/03/2022 12:28:51", "force": true}, "news": {"time": "07/03/2022 12:28:51", "force": true}, "weather": {"time": "07/03/2022 12:28:51", "force": true}, "forex": {"time": "07/03/2022 12:28:51", "force": true}, "sports_l": {"time": "07/03/2022 12:32:46", "force": true}, "sports_p": {"time": "07/03/2022 12:32:26", "force": true}, "sports_u": {"time": "07/03/2022 12:31:55", "force": true}, "sports_t": {"time": "07/03/2022 12:32:56", "force": true}, "commodities": {"time": "07/03/2022 12:32:56", "force": true}, "indices": {"time": "07/03/2022 12:32:56", "force": true}, "movies": {"time": "07/03/2022 12:32:56", "force": true}, "ipo": {"time": "05/10/2022 02:31:40", "force": false}, "prepost": {"time": "05/10/2022 02:31:40", "force": false}, "economic": {"time": "05/10/2022 02:31:40", "force": false}}' >> last_updates.json
+echo '{"scheduler":{"force": false}, "stocks": {"time": "07/03/2022 12:33:06", "force": true}, "crypto": {"time": "07/03/2022 12:28:51", "force": true}, "news": {"time": "07/03/2022 12:28:51", "force": true}, "weather": {"time": "07/03/2022 12:28:51", "force": true}, "forex": {"time": "07/03/2022 12:28:51", "force": true}, "sports_l": {"time": "07/03/2022 12:32:46", "force": true}, "sports_p": {"time": "07/03/2022 12:32:26", "force": true}, "sports_u": {"time": "07/03/2022 12:31:55", "force": true}, "sports_t": {"time": "07/03/2022 12:32:56", "force": true}, "commodities": {"time": "07/03/2022 12:32:56", "force": true}, "indices": {"time": "07/03/2022 12:32:56", "force": true}, "movies": {"time": "07/03/2022 12:32:56", "force": true}, "ipo": {"time": "05/10/2022 02:31:40", "force": false}, "prepost": {"time": "05/10/2022 02:31:40", "force": false}, "economic": {"time": "05/10/2022 02:31:40", "force": false}, "jokes": {"time": "05/10/2022 02:31:40", "force": false}}' >> last_updates.json
 
 
 echo '{"feature": "Stocks", "speed": "medium","speed2": "medium", "animation": "down", "percent": false, "point": true, "logos": true, "chart": false, "title": true, "symbols": {"ETH,USD": {"current": "2629.32", "24hr_change": "-27.6432", "percent_change": "-1.04"}, "BTC,USD": {"current": "38161.00", "24hr_change": "-50.8386", "percent_change": "-0.13"}, "BNB,USD": {"current": "372.57", "24hr_change": "0.4140", "percent_change": "0.11"}, "ADA,BTC": {"current": "0.0000", "24hr_change": "-0.0000", "percent_change": "-3.74"}}}' >> crypto_settings.json 

From c83b663af0d0d9459916d79e5173602b92c78f7d Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 12 Jul 2023 16:26:31 +0800
Subject: [PATCH 054/133] jokes backend frontend communication

---
 templates/index.html | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index 496d539..514d301 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -7076,8 +7076,16 @@
                   </div>
                   <div class="col-auto">
                     <select id="jokes-amount" class="form-select jokes-amount-select">
-                      <option>1</option><option>2</option><option>3</option><option>4</option><option>5</option>
-                      <option>6</option><option>7</option><option>8</option><option>9</option><option>10</option>
+                      <option {%if jokes_settings.amount == '1' %} selected {% endif %}>1</option>
+                      <option {%if jokes_settings.amount == '2' %} selected {% endif %}>2</option>
+                      <option {%if jokes_settings.amount == '3' %} selected {% endif %}>3</option>
+                      <option {%if jokes_settings.amount == '4' %} selected {% endif %}>4</option>
+                      <option {%if jokes_settings.amount == '5' %} selected {% endif %}>5</option>
+                      <option {%if jokes_settings.amount == '6' %} selected {% endif %}>6</option>
+                      <option {%if jokes_settings.amount == '7' %} selected {% endif %}>7</option>
+                      <option {%if jokes_settings.amount == '8' %} selected {% endif %}>8</option>
+                      <option {%if jokes_settings.amount == '9' %} selected {% endif %}>9</option>
+                      <option {%if jokes_settings.amount == '10' %} selected {% endif %}>10</option>
                     </select>
                   </div>
                 </div>
@@ -7091,6 +7099,9 @@
                   <ul
                     id="jokes-list"
                     class="display-features-list text-white symbol-list">
+                  {% for f in jokes_settings.categories %}
+                      <li>{{f}}</li>
+                    {% endfor%}
                   </ul>
                 </div>
               </div>

From 698b717ed92bead7bc774bee9d4df4579f67bdf1 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 12 Jul 2023 16:30:28 +0800
Subject: [PATCH 055/133] jokes checkboxes backend

---
 templates/index.html | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index 514d301..2e0d044 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -7055,17 +7055,23 @@
                     <label for="inputText" class="col-form-label">Blacklist: </label>
                   </div>
                   <div class="col-auto">
-                      <input type="checkbox" id="nsfw-jokes" value="nsfw">
+                      <input type="checkbox" id="nsfw-jokes" value="nsfw"
+                        {% if "nsfw" in jokes_settings.blacklist %} checked {% endif %}>
                       <label for="nsfw-jokes">NSFW</label>
-                      <input type="checkbox" id="religious-jokes" value="religious">
+                      <input type="checkbox" id="religious-jokes" value="religious" 
+                        {% if "religious" in jokes_settings.blacklist %} checked {% endif %}>
                       <label for="religious-jokes">Religious</label>
-                      <input type="checkbox" id="political-jokes" value="political">
+                      <input type="checkbox" id="political-jokes" value="political"
+                        {% if "political" in jokes_settings.blacklist %} checked {% endif %}>
                       <label for="political-jokes">Political</label><br>
-                      <input type="checkbox" id="racist-jokes" value="racist">
+                      <input type="checkbox" id="racist-jokes" value="racist"
+                        {% if "racist" in jokes_settings.blacklist %} checked {% endif %}>
                       <label for="racist-jokes">Racist</label>
-                      <input type="checkbox" id="sexist-jokes" value="sexist">
+                      <input type="checkbox" id="sexist-jokes" value="sexist"
+                        {% if "sexist" in jokes_settings.blacklist %} checked {% endif %}>
                       <label for="sexist-jokes">Sexist</label>
-                      <input type="checkbox" id="explicit-jokes" value="explicit">
+                      <input type="checkbox" id="explicit-jokes" value="explicit"
+                        {% if "explicit" in jokes_settings.blacklist %} checked {% endif %}>
                       <label for="explicit-jokes">Explicit</label>
                   </div>
                 </div>

From 1b8e5d712e09f055e25704afda702e168b257c68 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 12 Jul 2023 16:49:54 +0800
Subject: [PATCH 056/133] added blacklist-checkboxes class to checkboxes for
 backend purposes

---
 templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/index.html b/templates/index.html
index 2e0d044..bd5a55b 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -7054,7 +7054,7 @@
                   <div class="col-auto">
                     <label for="inputText" class="col-form-label">Blacklist: </label>
                   </div>
-                  <div class="col-auto">
+                  <div class="col-auto blacklist-checkboxes">
                       <input type="checkbox" id="nsfw-jokes" value="nsfw"
                         {% if "nsfw" in jokes_settings.blacklist %} checked {% endif %}>
                       <label for="nsfw-jokes">NSFW</label>

From 739017c1e13bb3122d52b74cc84e87a4dcf5ad0e Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 12 Jul 2023 17:00:17 +0800
Subject: [PATCH 057/133] getJokesSettings

---
 static/app.js | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/static/app.js b/static/app.js
index afd3fc2..4a8d335 100755
--- a/static/app.js
+++ b/static/app.js
@@ -1715,6 +1715,31 @@ function getEconomicSettings(page) {
 }
 
 
+// jokes settings
+function getJokesSettings(page) {
+  
+  let title = page.querySelectorAll(".title-select")[0].checked;
+  let categories = getListItems(page.querySelectorAll(".symbol-list")[0]);
+  let amount = page.querySelectorAll(".jokes-amount-select")[0].value;
+  const jokesdivElement = page.querySelector('.blacklist-checkboxes');
+  const allcheckboxes = jokesdivElement.querySelectorAll('input');
+  const blacklist = [];
+  allcheckboxes.forEach(checkbox => {
+   if (checkbox.checked) {
+      blacklist.push(checkbox.value);
+         }
+  });
+  settings = {
+    title: title,
+    categories: categories,
+    blacklist: blacklist,
+    amount: amount,
+  };
+  console.log(settings);
+  return settings;
+}
+
+
 // Join Network
 
 let wifiSsidInput = document.getElementById("wifi-ssid-input");

From 8947d1f6349f5bf4697c297b7976773d59a4957c Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 12 Jul 2023 17:08:20 +0800
Subject: [PATCH 058/133] save jokes added

---
 server.py | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/server.py b/server.py
index d2ceebf..3fe1e11 100755
--- a/server.py
+++ b/server.py
@@ -661,6 +661,8 @@ def save():
         save_ipo_settings(input_settings)
     elif feature == 'Economic Calendar':
         save_economic_settings(input_settings)
+    elif feature == 'Jokes':
+	save_jokes_settings(input_settings)
     elif 'Sports' in feature:
         save_sports_settings(input_settings)
         
@@ -1335,6 +1337,43 @@ def save_economic_settings(input_settings):
     f.close()
 
 
+def save_jokes_settings(input_settings):
+    filename = 'jokes_settings.json'
+    try:
+        f = open('csv/' + filename, 'r')
+        current_settings = json.load(f)
+        f.close()
+    except:
+        current_settings = {"feature": "Jokes", "speed": "medium", "speed2": "medium", "animation": "up", "title": True, "categories": ["Any"], "blacklist": [], "amount": "5", "jokes": []}
+
+    current_settings['speed'] = input_settings['speed'].lower()
+    current_settings['speed2'] = input_settings['speed2'].lower()
+    current_settings['animation'] = input_settings['animation'].lower()
+    current_settings['title'] = input_settings['title']
+    if input_settings['categories'] == '':
+        current_settings['categories'] = 'Any'
+    else:
+        current_settings['categories'] = input_settings['categories']
+    current_settings['blacklist'] = input_settings['blacklist']
+    current_settings['amount'] = input_settings['amount']
+
+    try:
+        f = open('csv/' + filename, 'w')
+        json.dump(current_settings, f)
+        f.close()
+    except:
+        with open('csv/jokes_settings.json', 'w') as f:
+            json.dump(current_settings, f)
+    
+    f = open('csv/last_updates.json', 'r')
+    last_updates = json.load(f)
+    f.close()
+    last_updates['jokes']['force'] = True
+    f = open('csv/last_updates.json', 'w')
+    json.dump(last_updates, f)
+    f.close()
+
+
 def save_sports_settings(input_settings):
     
     feature = input_settings['feature']

From 7f293508d8144cb3bd34e80fd677019790d08f2a Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 12 Jul 2023 17:09:21 +0800
Subject: [PATCH 059/133] fixed indentation

---
 server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server.py b/server.py
index 3fe1e11..410a194 100755
--- a/server.py
+++ b/server.py
@@ -662,7 +662,7 @@ def save():
     elif feature == 'Economic Calendar':
         save_economic_settings(input_settings)
     elif feature == 'Jokes':
-	save_jokes_settings(input_settings)
+        save_jokes_settings(input_settings)
     elif 'Sports' in feature:
         save_sports_settings(input_settings)
         

From ec7c07d0a12df6bfeb2f18567a931c5a79e04109 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 12 Jul 2023 17:19:37 +0800
Subject: [PATCH 060/133] quick fix

---
 server.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server.py b/server.py
index 410a194..45f6bb1 100755
--- a/server.py
+++ b/server.py
@@ -1350,8 +1350,8 @@ def save_jokes_settings(input_settings):
     current_settings['speed2'] = input_settings['speed2'].lower()
     current_settings['animation'] = input_settings['animation'].lower()
     current_settings['title'] = input_settings['title']
-    if input_settings['categories'] == '':
-        current_settings['categories'] = 'Any'
+    if not input_settings['categories']:
+        current_settings['categories'] = ['Any']
     else:
         current_settings['categories'] = input_settings['categories']
     current_settings['blacklist'] = input_settings['blacklist']

From 6ad88d488faebc0d7d666e44936ce75ef987af39 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 12 Jul 2023 17:27:08 +0800
Subject: [PATCH 061/133] Update server.py

---
 server.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/server.py b/server.py
index 45f6bb1..0787a40 100755
--- a/server.py
+++ b/server.py
@@ -339,6 +339,8 @@ def index():
         f = open('csv/jokes_settings.json', 'r')
         jokes_settings = json.load(f)
         f.close()
+        if not jokes_settings['categories']:
+            jokes_settings['categories'] = ['Any']
     except:
         jokes_settings = {"feature": "Jokes", "speed": "medium", "speed2": "medium", "animation": "up", "title": True, "categories": ["Any"], "blacklist": [], "amount": "5", "jokes": []}
 	

From ea5400c1e2e4d0f2e457f74fa41fac949c4d38aa Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 12 Jul 2023 17:45:58 +0800
Subject: [PATCH 062/133] added basic jokes

---
 database_caller.py | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/database_caller.py b/database_caller.py
index 5984d51..6585882 100755
--- a/database_caller.py
+++ b/database_caller.py
@@ -1496,7 +1496,7 @@ if __name__ == '__main__':
     
     t = time.time()
     
-    update_frequencies = {'stocks':2, 'crypto':7, 'forex':60, 'news':120, 'weather': 120, 'sports': 1440, 'commodities': 15, 'indices': 15, 'movies': 1440, 'ipo': 1440, 'prepost': 15, 'economic': 15} #minutes
+    update_frequencies = {'stocks':2, 'crypto':7, 'forex':60, 'news':120, 'weather': 120, 'sports': 1440, 'commodities': 15, 'indices': 15, 'movies': 1440, 'ipo': 1440, 'prepost': 15, 'economic': 15, 'jokes': 15} #minutes
 
     NY_zone = pytz.timezone('America/New_York')
     CET_zone = pytz.timezone('EST')
@@ -1573,7 +1573,8 @@ if __name__ == '__main__':
                 "news": {"time": "06/03/2022 04:07:09", "force": True}, "weather": {"time": "06/03/2022 04:08:20", "force": True}, 
                 "forex": {"time": "06/03/2022 03:54:02", "force": True}, "sports_l": {"time": "06/03/2022 04:10:09", "force": True}, 
                 "sports_p": {"time": "06/03/2022 04:10:09", "force": True},
-                "sports_u": {"time": "06/03/2022 04:10:09", "force": True},"sports_t": {"time": "06/03/2022 04:10:09", "force": True}, "commodities": {"time": "06/03/2022 04:10:09", "force": True}, "indices": {"time": "06/03/2022 04:10:09", "force": True}, "movies": {"time": "06/03/2022 04:10:09", "force": True}, "ipo": {"time": "06/03/2022 04:10:09", "force": True}, "prepost": {"time": "06/03/2022 04:10:09", "force": True}, "economic": {"time": "06/03/2022 04:10:09", "force": True}}
+                "sports_u": {"time": "06/03/2022 04:10:09", "force": True},"sports_t": {"time": "06/03/2022 04:10:09", "force": True}, "commodities": {"time": "06/03/2022 04:10:09", "force": True}, "indices": {"time": "06/03/2022 04:10:09", "force": True}, "movies": {"time": "06/03/2022 04:10:09", "force": True}, "ipo": {"time": "06/03/2022 04:10:09", "force": True},
+                "prepost": {"time": "06/03/2022 04:10:09", "force": True}, "economic": {"time": "06/03/2022 04:10:09", "force": True}, "jokes": {"time": "06/03/2022 04:10:09", "force": True}}
 
             try:
                 if last_updates['scheduler']['force']:
@@ -1715,7 +1716,22 @@ if __name__ == '__main__':
                 update_process = Process(target = updateEconomic, args = (api_key,logf))
                 update_process.start()
                 update_processes.append(update_process)
-        
+
+
+            # jokes
+            jokes_time = datetime.strptime(last_updates['jokes']['time'], "%d/%m/%Y %H:%M:%S")
+           
+            NY_time = datetime.now(NY_zone).replace(tzinfo=None)
+            diff = (NY_time - jokes_time).total_seconds()/60 #minutes
+           
+            if last_updates['jokes']['force'] or diff >= update_frequencies['jokes']:# or msg == 'c':
+                jokes_time = NY_time.strftime("%d/%m/%Y %H:%M:%S")               
+                last_updates['jokes']['time'] = jokes_time
+                last_updates['jokes']['force'] = False
+                update_process = Process(target = updateJokes, args = (api_key,logf))
+                update_process.start()
+                update_processes.append(update_process)
+            
                 
             # indices
             indices_time = datetime.strptime(last_updates['indices']['time'], "%d/%m/%Y %H:%M:%S")

From 249d3d199264531bf1bf310d1e3ba5c455635190 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 12 Jul 2023 17:51:44 +0800
Subject: [PATCH 063/133] updateJokes function

---
 database_caller.py | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/database_caller.py b/database_caller.py
index 6585882..4b38b98 100755
--- a/database_caller.py
+++ b/database_caller.py
@@ -811,7 +811,34 @@ def updateEconomic(api_key, logf):
     except:
         pass
     
-        
+
+def updateJokes(api_key, logf):
+    try:
+        with open('csv/jokes_settings.json', 'r') as f:
+            jokes_settings = json.load(f)
+    except:
+        jokes_settings = {"feature": "Jokes", "speed": "medium", "speed2": "medium", "animation": "up", "title": true, "categories": ["Any"], "blacklist": [], "amount": "5", "jokes": []}
+    try:
+        categories = ','.join(jokes_settings['categories'])
+        blacklist = ','.join(jokes_settings['blacklist'])
+        amount = jokes_settings['amount']
+        jokes_settings['jokes'] = []
+
+        joke_url = 'https://v2.jokeapi.dev/joke/'+categories+'?amount='+amount
+        if blacklist != '':
+            joke_url = 'https://v2.jokeapi.dev/joke/'+categories+ '?blacklistFlags=' + blacklist + '&amount='+amount
+
+        get_jokes = requests.get(joke_url)
+        all_jokes = get_jokes.json()
+
+        for each_joke in all_jokes['jokes']:
+            jokes_settings['jokes'].append(each_joke)
+
+        with open('csv/jokes_settings.json', 'w') as f:
+            json.dump(jokes_settings,f)
+    except:
+        pass
+
 
 def updateNews(api_key, logf):
     try:

From cbe1a81fa9ee095f18ddb2d9773b2ef3735acc87 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 12 Jul 2023 22:50:06 +0800
Subject: [PATCH 064/133] any jokes regardless of other categories as long as
 any is in list

---
 database_caller.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/database_caller.py b/database_caller.py
index 4b38b98..daa21c1 100755
--- a/database_caller.py
+++ b/database_caller.py
@@ -819,7 +819,10 @@ def updateJokes(api_key, logf):
     except:
         jokes_settings = {"feature": "Jokes", "speed": "medium", "speed2": "medium", "animation": "up", "title": true, "categories": ["Any"], "blacklist": [], "amount": "5", "jokes": []}
     try:
-        categories = ','.join(jokes_settings['categories'])
+        if 'Any' in jokes_settings['categories']:
+            categories = 'Any'
+        else:
+            categories = ','.join(jokes_settings['categories'])
         blacklist = ','.join(jokes_settings['blacklist'])
         amount = jokes_settings['amount']
         jokes_settings['jokes'] = []

From 55f5f90a01edd3545943b93714ac5485aeeb2ed6 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Thu, 13 Jul 2023 17:10:58 +0800
Subject: [PATCH 065/133] jokes added

---
 stockTicker.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/stockTicker.py b/stockTicker.py
index 80b32f5..e387cfa 100755
--- a/stockTicker.py
+++ b/stockTicker.py
@@ -67,23 +67,23 @@ class StockTicker():
         self.points = True # display crypto change in points or percent
      
         self.functions = {'Stocks': self.getStockImage, 'Crypto': self.getCryptoImage, 'Forex': self.getForexImage, 
-                'Daily Forecast':self.getDailyWeatherImage, 'Current Weather': self.getTodayWeatherImage, 
+                'Daily Forecast':self.getDailyWeatherImage, 'Current Weather': self.getTodayWeatherImage, 'Jokes': self.getJokesImage,
                 'Sports (Team Stats)':lambda : self.getLeagueTableImage('premier_league'), 'Sports (Past Games)': lambda:self.getLeagueImage('NBA', 'past'), 
                 'Sports (Upcoming Games)': lambda : self.getLeagueImage('NHL', 'future'), 'Sports (Live Games)': lambda: self.getLeagueImage('NBA', 'live'), 
                 'News':self.getNewsImage, 'Custom Messages': self.getUserMessages, 'Commodities': self.getCommoditiesImage, 'Indices': self.getIndicesImage, 'Movies': self.getMoviesImage,
                 'Economic Calendar': self.getEconomicImage, 'IPO Calendar':self.getIpoImage, 'IPO Calendar Prof':self.getIpoProfessional, 'Economic Calendar Prof': self.getEconomicProfessional,
                 
-                'Stocks Prof': self.getStockProfessional, 'Crypto Prof': self.getCryptoProfessional, 'Forex Prof': self.getForexProfessional, 
+                'Stocks Prof': self.getStockProfessional, 'Crypto Prof': self.getCryptoProfessional, 'Forex Prof': self.getForexProfessional, 'Jokes Prof': self.getJokesProfessional,
                 'Current Weather Prof': self.getTodayWeatherProfessional, 'News Prof':self.getNewsProfessional, 'Commodities Prof':self.getCommoditiesProfessional, 'Indices Prof': self.getIndicesProfessional,
                 'Daily Forecast Prof':self.getDailyWeatherProfessional, 'Sports (Team Stats) Prof':lambda : self.getLeagueTableProfessional('NHL'), 'Sports (Upcoming Games) Prof': lambda : self.getLeagueProfessional('NHL', 'future'),
                 'Sports (Past Games) Prof': lambda : self.getLeagueProfessional('NBA', 'past'), 'Custom Messages Prof': self.getUserMessagesProfessional, 'Custom Images Prof': self.getUserImagesProfessional, 'Movies Prof': self.getMoviesProfessional, 'Sports (Live Games) Prof': lambda : self.getLeagueProfessional('NBA', 'live')} 
                 
-        self.JSONs = {'Stocks': 'csv/stocks_settings.json', 'Crypto': 'csv/crypto_settings.json', 'Forex': 'csv/forex_settings.json', 
+        self.JSONs = {'Stocks': 'csv/stocks_settings.json', 'Crypto': 'csv/crypto_settings.json', 'Forex': 'csv/forex_settings.json', 'Jokes': 'csv/jokes_settings.json',
                 'Daily Forecast':'csv/daily_weather.json', 'Current Weather': 'csv/current_weather.json', 'Commodities':'csv/commodities_settings.json', 'Indices': 'csv/indices_settings.json',
                 'Sports (Team Stats)': 'csv/league_tables.json', 'Sports (Past Games)': 'csv/past_games.json', 'IPO Calendar': 'csv/ipo_settings.json', 'Economic Calendar': 'csv/economic_settings.json',
                 'Sports (Upcoming Games)': 'csv/upcoming_games.json', 'Sports (Live Games)': 'csv/live_games.json', 'Movies': 'csv/movie_settings.json',
                 'News':'csv/news_settings.json', 'Custom Images': 'csv/image_settings.json', 'Custom GIFs': 'csv/GIF_settings.json', 'Custom Messages': 'csv/message_settings.json',
-                'Stocks Prof': 'csv/stocks_settings.json', 'Crypto Prof': 'csv/crypto_settings.json', 'Forex Prof': 'csv/forex_settings.json', 
+                'Stocks Prof': 'csv/stocks_settings.json', 'Crypto Prof': 'csv/crypto_settings.json', 'Forex Prof': 'csv/forex_settings.json', 'Jokes Prof': 'csv/jokes_settings.json',
                 'Current Weather Prof': 'csv/current_weather.json', 'News Prof':'csv/news_settings.json', 'Commodities Prof':'csv/commodities_settings.json', 'Indices Prof': 'csv/indices_settings.json',
                 'Daily Forecast Prof':'csv/daily_weather.json', 'Sports (Team Stats) Prof': 'csv/league_tables.json', 'Sports (Upcoming Games) Prof': 'csv/upcoming_games.json', 'Sports (Past Games) Prof': 'csv/past_games.json', 'Custom Messages Prof': 'csv/message_settings.json', 'Custom Images Prof': 'csv/image_settings.json', 'Movies Prof': 'csv/movie_settings.json', 'Sports (Live Games) Prof': 'csv/live_games.json', 'IPO Calendar Prof': 'csv/ipo_settings.json', 'Economic Calendar Prof': 'csv/economic_settings.json'}
         
@@ -6163,6 +6163,8 @@ class StockTicker():
         x_offset += ipo.size[0]
         news.paste(economic, (x_offset, 16))
         x_offset += economic.size[0]
+        news.paste(jokes, (x_offset, 16))
+        x_offset += jokes.size[0]
         self.double_buffer = self.matrix.CreateFrameCanvas()
         while True:
             kill = stock_ticker.scrollImage(news, offset_x = 128)
@@ -6248,6 +6250,9 @@ class StockTicker():
             
         elif msg == 'EC': #economic calendar
             self.scrollFunctionsAnimated(['economic', 'economic'],animation = 'traditional')
+
+        elif msg == 'JO': #economic calendar
+            self.scrollFunctionsAnimated(['jokes', 'jokes'],animation = 'traditional')
             
         elif msg == 'A': #everything
   

From fc7ec0df4aa60a920980929f413ba1299b660b2b Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Thu, 13 Jul 2023 17:13:31 +0800
Subject: [PATCH 066/133] Update stockTicker.py

---
 stockTicker.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stockTicker.py b/stockTicker.py
index e387cfa..4450ed7 100755
--- a/stockTicker.py
+++ b/stockTicker.py
@@ -6251,7 +6251,7 @@ class StockTicker():
         elif msg == 'EC': #economic calendar
             self.scrollFunctionsAnimated(['economic', 'economic'],animation = 'traditional')
 
-        elif msg == 'JO': #economic calendar
+        elif msg == 'JO': # jokes
             self.scrollFunctionsAnimated(['jokes', 'jokes'],animation = 'traditional')
             
         elif msg == 'A': #everything

From bde0971c3048cb364991e58475c5b72012f40473 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Thu, 13 Jul 2023 21:35:13 +0800
Subject: [PATCH 067/133] emoji icons for jokes feature

---
 logos/emojis/emoji1.png | Bin 0 -> 1559 bytes
 logos/emojis/emoji2.png | Bin 0 -> 1379 bytes
 logos/emojis/emoji3.png | Bin 0 -> 1369 bytes
 logos/emojis/emoji4.png | Bin 0 -> 1343 bytes
 logos/emojis/emoji5.png | Bin 0 -> 1131 bytes
 logos/emojis/emoji6.png | Bin 0 -> 1249 bytes
 logos/emojis/emoji7.png | Bin 0 -> 1380 bytes
 logos/emojis/emoji8.png | Bin 0 -> 1301 bytes
 8 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 logos/emojis/emoji1.png
 create mode 100644 logos/emojis/emoji2.png
 create mode 100644 logos/emojis/emoji3.png
 create mode 100644 logos/emojis/emoji4.png
 create mode 100644 logos/emojis/emoji5.png
 create mode 100644 logos/emojis/emoji6.png
 create mode 100644 logos/emojis/emoji7.png
 create mode 100644 logos/emojis/emoji8.png

diff --git a/logos/emojis/emoji1.png b/logos/emojis/emoji1.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ff10e71dff54b4cdf8a525a51239101a1384ac6
GIT binary patch
literal 1559
zcmV+y2I%>TP)<h;3K|Lk000e1NJLTq000^Q000^Y0ssI2CMesP00001b5ch_0olnc
ze*gdg32;bRa{vG?BLDy{BLR4&KXw2B1-wZ_K~#90m6d61R8<tm&wcB>=`5Y4Z)Um-
z)0Pfx6=*35rBE<HV=OjGfPnZ#V_c#iG)ChGLkx<7CWs~)A;blZ2CaSpTv!#FF4RiF
zmaT=-Qd+u9r?b8{^Ok#kLs7IK%Kh|~dw=hL&ikKp5ZtnC0_C-{%geLwE6*y)<?}?7
zMPM`x@uYfrL^?Z|KGKzJ>6J#Jnuf`=vuN7A+d{9bu-2AkEuWVq`dqBdjRXf`OhABW
zGLa_b$<Woo(B2dA#<uABYl@`cf5rKo>|5)^x`p;^ub0W4k8A<NIe`%X(FV@o5nYCK
z7{>;b!S-{%Up>$fdvjkXnZ~!l6*$<959h3@bJ%9iqZ~nG@dIVLMZEzffKvuh8)zQu
zAKd=k*p8nk|I(P*j!=g6##(V*osBJCKso0C#on6J=~yL>C%UBzo$oY;w*45ARdNI8
zwKJPmiw#SxIVJhDSdHlaX5AoaDQ&2^_w?{b`zJqbiWpHNGe<pGVR`=<ue;Dji*tZ6
z|4-I+9)L2b4t4dOO+NAAa7Vw43f=4r^{yw^*g21vGV+C}yTBO>YdCT-F&KGe*Vvxc
z7+Sx;{@R9|;!1|L<{-v$cdRLiN<<Hbe>x~{+%twgdpd8;3JYIIfa78@>S7O0rLgEh
zC9{}2ASOckm41RTGD7l*8m%frr_t80L#Sm_QB@U7<*O+TwKbEzUNXB9ie`e#eW$2p
ziS(Q|HiIOg+NI$4qGTVldw&!S?Fi-+A>>t0o+MqJP`eCx9ux(56S&>L@zX(?YDfbq
z308Z?7VWK&lF5=<+99)tnq(B+T`J^Z?ACrcO6=Ldu&DO}N+z(0Cj~Q5pa?uZV6Mll
z>kt};{yrGEOr#{TIcdM2<mKb8Q&5nLf_ApOT|vn&%Gg|8b7)cu&JKy&Pp>Yu^v-8m
z%#cVVGAgPTAR~5~f-3{i(nL%quv$S!>^JIT<4N07g^erb4k<}uiL)IY3L4!t%Ml=|
zNDXR%@B5Y=iPf$3eqJvgw9rx_36m3Gu^M><ippGvC&1wXs|_%rHePt?bZkMjscBu=
z;Uea;X;?efl0qF@W)|F=(`;LDiPSM%a5$<2MqZ!K9rk&!U_wUh41L{;Mx_$aHBdE@
zPLXgJe;j*Jw$%qktE>(b;A2ZCe>iyPGTQlkg{`LHf_qiKl~?NEj}FN4uRDE_Rslw7
z9HCK)<B%cE@ITf;RT0o;!Z=fUcB^x}t7yqX<*xpia(-;Y)VH^LUn44i?%kqA^)&(4
zOeg0v)5izmdT*Pbk^KGwpU0CW@Jd?3x<*lmW;jl;P!t`BM9-W%cRZ3M<QA_i%^6RV
zo>1z@rHTGiC(xYtPPkl-O0UId<ro^BzdGvfZp@{nyrR<Fe1EpX&2W51UZyh<tSMSL
z6&fGu>Fzu!TPO1u%_$BT9qU>w-7y@GND2zR-DJsjxU8mZo-rh7;fu4{x0s`Yh7cjk
z&Ix9g7Z{c^x|pu1YFajMDJh;xL?@iVp5hIvSYfy?meymEVl0&V_%_=;iv_ENV=@xz
z><4Q`KN-IiPsaZ=uA%LQI&75H)HA^hGb-(ELc^YkwHZrdtSXA!--UQziLH8-t?B`@
zzy*bo&E+2yX7`Vep)<dsw0!#tGnt`uF7b#k8uPq*=GjwnAf=MTnd8xxZ?AV_hNG>{
zpjX)3z~5g@SP>%ur!fwVqId+fG@8;x)4=k?<^ZP%96=<)B*tO)f%N9XdQ8SzJVZ3*
z<}5H;{K8`M)<-=RvpJKUAiGW&qUs<gLDMpC85YduOnIO*WmstB3U2F`U;c9RN?5%K
znHETykKeG!zPQXhubej-Ma~gm$y7@vIsyfeG>V4tu}<l$rdZoW=~`6#`|;^G<KxE6
z4tlvqYV0+oLV;-fSTu#h8pIR0Z&*3nm27N}^%z4|#pIuZ`ww0@t$zkWcIf~B002ov
JPDHLkV1i<h=Ys$M

literal 0
HcmV?d00001

diff --git a/logos/emojis/emoji2.png b/logos/emojis/emoji2.png
new file mode 100644
index 0000000000000000000000000000000000000000..48a53d13160af18c47fff7b866344fbeda696ba2
GIT binary patch
literal 1379
zcmV-p1)TbcP)<h;3K|Lk000e1NJLTq000^Q000^Y0ssI2CMesP00001b5ch_0olnc
ze*gdg32;bRa{vGf6951U69E94oEQKA1qew*K~#90l~rj_Q&$uYRBXo|*eR&vsFf@v
zZ?P4rFl}uu(}5ptrMQ*Wk)>!wWuOE@3j`RD*h&#JfI^kj*nxmFKoSWd0$P@^7^Mn?
zx}Z?Tk+9g247N&=m)rA_NL8@fH{WDl&N=sc=brQ3a~X_hJT5K_md7h${;w5;F00zJ
zvTBc4e(3Tre-AK%>wi4+Uvl|6U{SA#^RN`NRP!h`Mrlb(yNXidmKq)ydqv)H0gEB*
zIYh25j3CVYVg|=7$EfB&n?ZnvkE5|#boV^E+l<CF@YmKCPc;Wv<QRknVGCbf>ihD7
z#dC1Yb9LFd&ch_ZtXdyi|2{NYgU0LUhEa|T@euaA*mre^c!l3?S68>E^P;&<@~Crb
z(Lfd&sdz4I1ES1KLF6G_P=eBZ3GoCS>=E*!n%+b=Qqgeni(p89^y74mtb2UFY5)u3
zKT&%qgjIu~%bU@y?_LnuMaN?+ua{lFf1+nHIIG@m{sJc*^wBKm+1h<ke+;_1??v#}
zm4q+zwRso*6!%U6;uW{Nd_HmN3p7DB;7Gq7^+e3T+#NBf{``SH;&J2O`fxCsyCaP)
zJ0c|d^tOqDzA16fRBYYtklhDq;eaebO14&@dk<X-cEENqSf1`D3Smj&R$KKOoW@I^
zo=R9F3Sn0yzctdhDYB$<uhy9O>p1`1*iOZ8Oqv*|7~%dNpjFgPpsu%({v)IhLKoJJ
zY5jAyu*6&0IUAXmrEj1vAJnzRAY1dpMka0C%o<d_ACptEQ}M^1`jK7g+uKg|<)%i3
z`Fk?p41w-ZCxJRidKvt75^cw@+)$<}jaL}XR%UYSUP8H_lfRv%O5^5z!D=nUuAKIZ
z&N{p$uX$5;V`94Co}8B-x`F}ck*dcX3ud6n;r=G!!pogAxJ<})7)z5_1C{iLua)z(
zxwLn>4L8<dBXIb1IHkqq(M+K8noVczAZ;Dacbh$5fVq9uOu&qB22MJd6OT4a+;71L
z<Xl@9@l@!XFt-yos<`m$q^rZ|&C;!?vA3d=XfI+1lS`sL<On}oUa)t0Me0gTHnX{a
z1$JE#`@EP{`#rNP`Sl~w%MwGDZePa?CKmOVdDC<qghheTt#~99nr^6yD+~+Ns8!W6
zsjT?$$=r+|MS{ZAnEa%#j(oG@aAK4=Ir?ZOzvNIxx#Xy-`j^DbYbP}JowX7VN^x2!
zb{TuqGKSK&;NmE6aaLmE+4??%VQ^^BIBGPROlGrrdU|@&G-)&%Zw(Ii_VvOi5Aee!
zu`J5IEvgak5pkVk6=osKFVsdmZkFLcM{}~aveUxX7iPqsK9Q%clr|{K8*0kVl$Xeg
zvX2ONrEGiWz*eSgulJbB-a{Q>slwtuSTbt_bP&+c{$ipjg=kD6wBO>j0!+c@R>yM{
z@mwXJrxsvmlW=fBz|B*nqiWWAOrPQH_V{oP#N6+}fNG?_X4MgfVzNm{ubC6)gv8Yn
z(z(qh{GJ34#1=k1K6kw9X_DF*?K$3&lN|?VaR~{1E;*(oZT7r?%Ou5Nq3i5x1BN>|
zAV)~vQOD_4VpKt1`-$v1M&pK*oTw!&I>J#e2!p&}$-Ftp9_0vWLmi<rkS47j$Jywz
z!=4dn0$fmgs22o3i|XG8iVAIl#y>2@tqKg}4hM)v9R^wjeSr%C+@5<eKK?kbZ9h*q
lI&c^P@Uq>{^S`g{e*l=AuPGI@6c+#h002ovPDHLkV1j4%nZy79

literal 0
HcmV?d00001

diff --git a/logos/emojis/emoji3.png b/logos/emojis/emoji3.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4cb5033bf0b54c3caa918396d461c4b7493357a
GIT binary patch
literal 1369
zcmV-f1*ZCmP)<h;3K|Lk000e1NJLTq000^Q000^Y0ssI2CMesP00001b5ch_0olnc
ze*gdg32;bRa{vGf6951U69E94oEQKA1pY}xK~#90l~s9ElvNZT^q`3?CniB)kZoqZ
z_k9Btpt#_2+!9LRkYFH%0kLG^5{j}Vh91BvX^>?k<RI%|8HRviPf(Uw4rH=KZjjb-
zP}J0;B{1LjdfzvL5P{k|zdzo+@7~{g_rCk?W3gr#dU`C2H|P5<HB9j~D-E?M53@-3
z<piyI3m7k$qc@w=Oaobmu3pp~Z!?+?#wD1h8jy7aS#L|$;F=0-v=CfQ;zheIHkdc}
z#ax@f>)r9(u~I;`tfzYS!QV3Ba233J4&H5rck1EIY^whtd13Ro1Y8sHcP=xW^`t1e
zT`SmsW&usz+f;8jRF}g$bu(jF3I`&|=4F59gShuh^ykh*>A&3YNiHCNbb?nC;H}~p
zV<?4eTRU0|j&3uZe#WIs7Ct_Mkxc@4B?jKed|3=8Q|BE=i-4Dd;Uw29`g2sVT#XFC
zpFQFA<Npu+A!HM-76Iee^mTLrE7@Zu7;LwPzl6hqFE2`c%D>rkPZ<ga_9OAXc>L4u
zrmXjy&$u(<eyDWTRAR{=n9*D)k$nj~vK~N{3%ulyFxKraP27;UgI6Bod_(4`RcbNP
zvZLm>%LyM|?x9tWI{kF|t}WC#{JxkldR3q0Xuc5D7j+(os@1S-n-)};M{mKq;*a=Z
zfBqH82Ced5i(B@mc*cj^j<j_emB%w<sM-uWi19Ma+tH8}vWAUn70FPs9ID*tHKhww
zIFHmjWd~yEK3rwC9aOvn6%IFRoYMWcnLgaXvK3Id4yranl`HL{Tm$8VrUoQ$H)RRE
z7o)mIG7W_Tlnc=0_evrofSVP>>o2m?YP7gfWuN;wmg;NMpN}&dd$ci>+oCzyh*x}J
z!O98XkhS2M1A@9%5bkDHlZ-!Yx0|ZhLL;~BI4y|SYOc)2rs}C?yfw;(bvD?Ntos)o
zrLff~W+0jhQeihPx0^=S9*41nUMA#3uut2Gt7Uvj@jRkQMmcd!f*}{3NC#^<aTT4k
zswa=<ZfhK{o*U(5E(+rmMO(;{tXf6Z?HM)*Eh1}Kq7_o6hH(ygn)t7^^sqPW6x-<N
z&{d$)qYI^gDHJ&|QU_voxz@_6DvELo#V2#VjTa{zI2F5FbT~NWVBpCE0V#(<(vIx?
z{zP11mgombNo<h&AC*i7=|TbC4s523kMYR{UA*6YVx4j{qM=UK+uM76a8RvQKX~|H
zlo<~nJsch$9vm9#>+fr9s1?TUN%pg#n6M_wc;3V#D@BitUbvD6&W3Q0d0WT$xunK@
zR(x7mQ<BptEozh&Ru^X%iG`_O?T+?ab9B2kGP|6|9HNuZRDvW=j_%Da(4W)uHJ`p;
zZ3feb<|v{mifD+$t0RDPA78SEU$K`j-G?EuJ`!&_OdDJj5tKG-&G_w8IOmP|lTF15
zHK-iapy=Jm4q_ln&>T(s%!Zyc!8j8Q)q*n(iaou3e(cPCl8e)fo%FV9i9nG&0})c*
zDi`QdhPaAB{8qCWTD%_JklFW9bFT$d8*M$-M%=CxT+R_(N~eJ)NE~C9P@>63@K*sI
zi<<j$ezuJm`g(X{WdK=I7jSJhp@IREb+i*o)_4WDD#Ug!W54*5L>3_~M%_nvPxEOv
zQU=I+oJK9sNWo|!{%aBzwZ+6h|0O=g$=LN+OVGFN#7^<%lmuIqg;=HeED2n>2pAbW
b=S2SiBFMHtr|wGW00000NkvXXu0mjfUA=&o

literal 0
HcmV?d00001

diff --git a/logos/emojis/emoji4.png b/logos/emojis/emoji4.png
new file mode 100644
index 0000000000000000000000000000000000000000..450a730752c8448f92410d564d60e1bb799181b5
GIT binary patch
literal 1343
zcmV-F1;F}=P)<h;3K|Lk000e1NJLTq000^Q000^Y0ssI2CMesP00001b5ch_0olnc
ze*gdg32;bRa{vGf6951U69E94oEQKA1msCXK~#90ot1x7Q)L*(?-)X`>IjUXgs^c3
zd+(hc6BtZE6b6bDQcqbbWd{%>&^!@}8lIR;|4?F@Cm^*na-hhMngYX^0fPY(OH(7m
zQaGi@5QPyq7`t!p9sa-xNWJIt$Me3=eZKd3pZC4b#jx?lOZLn_E^BR&Q)Y}?QL<Of
z7T(#dyb~#&pR90OH{VIjV@-Fk9XHT=*xE42nGOjdF6Xv+cOMZBl?9Bb7ny4pn>A4*
zHQ__$qMoC|#!T;&Ft(SoogI_$9J%!&>^3>xS1hEO*HZ1-@J2rTs~Fxchqo)>t&{L(
z0rhJ()v~(3M0oCF?q&&RLLnOl7AtaT&*2ZNgQ=fVVb@W3M+Ljpu)AgqYI?EjE9z3J
zQRR320RR0^HrmiQa%%%z295!9T`0VvfVYa^t>Q^3f*mqS8}>jcNLlF07%Pb66N2fy
z%$nEWwG7z#`BdrHN!11XevqFQ$$3&oVur(cIX--bfIq*3-U+YonkpT;;FWk&HF-4$
zpX=#JYrSaCj0<+|Qv#}fF1(ro+tdCVzigtk{sX7Lhmo$%j<%S{%ds}Y+kBRQt)cMZ
zyZ;A$7^NZ3XX7D0ENo5C^gD-9YDg{^w#8V8HtD4%{ZiPrWDHTT4XsFF+p-ZodLa7I
z!!c05fNCK73PI8$XKZ^k$5=wZMiRCJLH!b_mkekZTqzD}{nF2<4S+5Fk3e=HY@Ii(
z3u*gWd`UUq*d&4a#ZVswTg9-6G*y6{H8Zfn4YNj60L@|ZtCp}ijd?&3kIUcW>JR(E
zX3~nwN@Dk0yqtCTAE#!+7C-tmC{Rb5D?wE{7pwe;Yd!<e{Bc0dUf+Z7@%OLBHM!%+
zH5UNIYJ7hzeoYC+uA9}MK9h%4rSq)h?$(g?3ZTmJ?W?ucLJZUkE9C;sKG3frt>t#|
zu;a;|^k#KW`HWiOV1w{kt;gO6R$j|ytG95m%-1<Xrz}S?LGYA7NAWG8h@FYW&YRwS
zL_l8@wAw=U)&PWYbUHD^TJl~s=sgQi2%1t_(r_FkhdE=YP1f(gsak^GZ!4J}@17uZ
z+9-0#jO2W_&i&X29u+%1tK?ku9`0$GS5f+`FA`tLj&a*8c8MdM<jdWlUWfvzbHtB(
z@K9eC_VNqNq=hbq6M(9tGrCbCP)I#wBKItR_k$!~H#-Q?Fgs8q6ph+>gfDVs1-Ktr
z?s4&u56X^eAO_0?TbH`BS(X+(%gL^G8`oGtABb5;b|^u4GJYt+TP2COzcK^SvohoF
z6<bH`s)#7$IvMZXRSJe1=|e!hLnrg*yV^hODASmXltt{{6nuKis4h+9pB2P+8-3KP
z-snp$K=h{O-%rgSwZC8WcIgIwXDKi>S*rE}(V6G7L&~wYeY%Mz%x6FNMu0x%hnMDp
z@Md9Lze0^L<W?g_?XJQ^<QlykNNcEAkQTuirynzI7>Ob5jstvCm8Fh4vbQX*zo5>F
z-qQ87Py;c1n$8PpO`GHgv?<*6@;<!(BtU8Qm#i`5stli=enPJ5pORSQ8Y}}%S-kC1
zH^$`uGW4oB9uAu%?3OJ2Zl2g6OT4#U))SYFKn6X{6JL<y=~1qz_SW^9XgE3A2IH)R
z5cX~<zcezuQoIaNCXwuo_Du?9FYsYKyc5rie*sc7)0+gZ{R031002ovPDHLkV1iD$
BgH!+j

literal 0
HcmV?d00001

diff --git a/logos/emojis/emoji5.png b/logos/emojis/emoji5.png
new file mode 100644
index 0000000000000000000000000000000000000000..a20f68b085ecdeb4f0ad318cb55c92415ae6aa3b
GIT binary patch
literal 1131
zcmV-x1eE)UP)<h;3K|Lk000e1NJLTq000^Q000^Y0{{R3o|L@&00001b5ch_0olnc
ze*gdg32;bRa{vGf6951U69E94oEQKA0!C0wR7C&)00992A`=K)HWHFn8?0y_tY{#S
zRvcV569xkTZa@{%gCzK)DEqA^{j@0kxGVj*Ed8`8`>rR_gC%W176JhPMJNu-e<b>=
zDE+`h{?v2-;hF#Gv;XYA|Lnm3>bCyVZ~eeP`>QBKC=LVy0b@H8@ti39xG?_Ja{uVA
z|LV8@=d1tJZ}6QcVmcJ@o+tgiH2>Rz|K_Lv+=KnTHSwM({k$&!+I#=um;c*;{k<<m
zC=dL$DF4q=|J{Z9*n-}?Z^E8hvW-r&j!(v-UF5-Y``Ls4&{q7nD9nE)1p@*4t0(@&
zGXK?T|JQQavRsg9FqUmG#+^;tvRT=%S(<V)lWQ^Dv|j(!YyZVF`>ZH!KNtPFDgVko
z|IuFW!B(?~Ipw!d{m)(g&t2xYQLlqH?!Z?6%Rl|QDba%_{=zB$$~^zfP5sJD`^ZcB
z$4mdpJ^sQf_@gOZHWUBFD*wnh|H?`K%0>UlJO9Ww|Hv}`$T9!OF#pIi|Hw7}$vFSX
zJpai+|H?%F#wz@;C|x!b|Hmr-$1DA{D3Mkj{kJLoxGAe<A={@X$(SYl#47&AD%`0j
z=(8yGz$%YmBZpWb&YdUIq9=q_A&+7r_rWRWw<?)qC!1s^z>g=FVkY~qC|oua@xLmh
zY$>B^Db1WH%bF>qYAK^@Dek>0|H3NwqbdH!D#Da0vV$n_zAEgyDy@4cyNoIQ$14BB
zD*wqU{KzW($SVKDD$0K)@0=+8yeaRTDMTm_@t-L1pDA256k9bE`taz@0005LNkl<Z
zc${NkfC5G)W)@a9b`B;+22{Yw#m&RZ$1fl##3L-ii6kK^CN3c<B`qT>Coip_s3fi|
z3X@S$Ra4i{)Pe$S9d%tj6{sFneFH-yBw%b}st3_0re<btfdVY8bgjWI5Vx_l0|I*o
zM<-_&S2qyb-NVxhD8=RN<Ll?==N}Ll6dV#18Ws-ZL_|hK1O3At6B`#77oU)r1f=4U
zQ&Q7_RC-1xBLfppR(4KKPHt`v6y)UtiGso+CWd0(lG3vBipr|$nwpyG+PeCN#-_5e
z(&m;{1{S`y_L}xK6i`#w-qz8{z}nS@6?FG7utBAI`}#rDgo%^jQtW(S*5oNur-A6{
zGiJ^L3jhr)7AgU;X3v>B4@A$KGk-RSZeFku==eeqbJ5}@OF{Iq<ttW#=vAwk7#M|P
zK+H93*R2Q98#Zp*45C3^W)M-@0%C973bB6Mb`ZG(6i}exZAN!_v&T+Q@G>ax%0QRe
zy=N~ZD)shdpy+Gfy&oEt3@UoNJhmWYc6jW8B><qlz2Zt4g<ze{t1_Z??u92CAn=OL
xENbcK?(SHyIy2e}EhREC9q8=o={$%?q5zhg;7uOcX;J_H002ovPDHLkV1o2ZC$0bh

literal 0
HcmV?d00001

diff --git a/logos/emojis/emoji6.png b/logos/emojis/emoji6.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5b33d509a68b4f7626f12318aed762ead14caf5
GIT binary patch
literal 1249
zcmV<71Rnc|P)<h;3K|Lk000e1NJLTq000^Q000^Y0ssI2CMesP00001b5ch_0olnc
ze*gdg32;bRa{vGf6951U69E94oEQKA1cpgOK~#90l~rp@990xvur>aG-DPKHAHcE?
zW_Iq(LQAWx6;!|g(uTItA5@eYQj<z!pcIV6sKFF#s;!CbpFTn%5tCX$(3TdI(!lPr
zU?pm?q)}?LQ7BeI-CsPG+3}k$VHdiHy?e5mne(0Ro_p@O-&Ltr88I;`JM~DJOLx2^
zsjb4&R$)C>l3eDZ@DZ*D7!N-bQ<ck%G_bQRB=7|<brPxDDRrkwokF0U$H$Qdt}<5-
z*cwE!F{%Qh{;r;#ZzWP+e(-v&eCw3_*9Cd%iagaP-?@a>;7|LdzT7}70W6=WV^`x`
z7aQ|RHsx<53*8yP(HeQOUB1&5-EOza*Y^YV&l$2Oi(Yp>CB7(JO}y0mm^^k+o;bU<
z-E5GqWcr&F#+8IvBl40iZ;*d^OTKmD|Jqo+)VmQm77)#{+M^H)mx%ns^YX8U9?X6$
zS?D6e_1yZUoxwidZsNwjN}uR2pKw=9diVK<E2Yr`@{O9PHaAi|HT2qqXWzKHV!VIP
z`1uW!O^(VOgTjR-LQg!NrepMKqfy6kR*p*%iP^O&rF4gQxHil4N%6F&6gGTr=lch;
zo_m&TOfz$AQfjK1Wi3V{g}^Q8x@!#%r619jXr;O`Q=BHwo@(D#ysfaPFz1;Z*Ap({
zB$S?}7!A)dgkuawEyYj{!I8No^Xa^tf}%ozIo^T5no{FzivTLsZWo1Kz1G6gOuXJ`
zV0kW;XKkF_Vz-(tW}2aa-ue{v@^(EQD4I^Tm@Re-0Du8(G~pLN@+r5_L3X=n70wX)
ze$FlI$fGq{jnQN>B_<{&CE_2?2|68Eyr)yg+LSEt8U`dO0BwR6GX;I3bdek@F{^MM
zr7l4p6u&%TQ)}W3CWG0MVzF7w))d63HR|j~b@0M4A6~(-1W*#w#GiaK1zxFJXx(cA
zoi#)^>lUkDOpH^<X?0pg&rmc4sLi6ean2E<`{O(>a9XuiP3uud0|1%?O>r(W-6MqQ
zpc7bZC}5^f{OpkJg(5@tW~%5(=3qtg?;U)|6|z4ski%8x?RonAET(*?vGE<NzgGyk
z78k2*MLRDKgkz)uan2(KykandXvt8fd5<{LuVBIepBU&MW!Q>PqXgaI01)+^;Ag$g
z`?*3kKj0i{B7lWIy2Y7Lqugs_PWncO3^?_={peon&z}o{fn}s~9_Q#;;iFfr$E$3S
zxl295VjE*X3!z`KXW9JCbzI$6^U-o!@5lW2XUO15()O<7y<OHf3X>aa*|~wV@HAdA
z&_)&y*)j?6MNBx9cC$01<!$GYGWLUAihWqho~{-~S~C^~Be;AbB;abK1Ykf{??Rw@
zgcW6yuBK0WGJgAdGwkpFP4nNTuLN8c?lubfkpdNxPpF{3`5vQBToDu9d<vJpS%@N^
zA#sNTIU@PUIz~6IvPR?;UEG&)MB1n$b_QuG-Q!!C5qbhH)E@N$c-5<CX`rasCTu)3
z2Reav#{p98B0;aBzu*F3{hAkJ<XF76Gie+h97Y%(Udp8Z``Z2&d^I9Ej;;lB00000
LNkvXXu0mjfF0M*V

literal 0
HcmV?d00001

diff --git a/logos/emojis/emoji7.png b/logos/emojis/emoji7.png
new file mode 100644
index 0000000000000000000000000000000000000000..410be4a47a5768f02cb220a213a2f7d7d87741c9
GIT binary patch
literal 1380
zcmV-q1)KVbP)<h;3K|Lk000e1NJLTq000^Q000^Y0ssI2CMesP00001b5ch_0olnc
ze*gdg32;bRa{vGf6951U69E94oEQKA1qn$+K~#90ja6$<Q%4kzRp?Bupw)&XkcgVc
z-kX+6C=TODd8<&+s-t!W>sUHgWJC=ER@+)ADq2RgKb%%TtOJPQ6<#4EG?6#qWef7q
zqEL|v6@wB$9!c)q?(GdaA`j1eKX&)*e*2xXyJs1U+0BWwILeouxW^&qATK9uW%6F`
ziA^k5-n$DH%(3V-TfW#z>TCB$j9?-SGv|p3l`EljC$t`f+Ra?>!Q^$UHBRttfF0Y$
zdLAOQtB1hmR<yvFjS*!&WNQTMNrI1yp#CP*m&1V)`0xtZCM7DoO}SWmoFG7KyYQ`9
zq$0;x>sJgW0<%g&wnxE!IUG>UjQ(8M5lNJ~3||FOU#8W<*BH@2$oduIserioG3-u&
zeK+REgP+L?w}}i<q#tv-Mi2gy!OMWqIKj^EV9zgaiu<u-ne)gsu*GTVE4gp{L0~Qh
zu;p{ubsBb^nFC`TvAuOMJ+(2TZL!oy>pnt-b;b)EmQJ0F)Q4%z0%VN~><EW<q_ctS
zkZLlcGG*74s?rj*COa!#EjwYneHiN2ndIQqR+fdXDVk5H0c>!GEqmvH_C{EFW%Z-J
z$9nyce$dd@H&COiFU^pWjb4NXyMJD|2xU;rdS^ThBP%f2umLs&%?4v#P=20lXlQhF
zbfUbXx=^7U866)ojH*<{daXCC!i_TEBeY>e`m#)N5v;*sof~ZMhYfzF`VEE(SE6n$
z)Hy-jhctSM*WLZAYi!I|RjpeMM2<p%JiiciANKZl6!^nh+*}CaK4UX}4R#<D0P1k4
z6C1Q^WikAS0N&A!yl=Mg6!Cl`+J<uBy~UEw&Th26zM;v--_L8Kk3y+J-A9ie-!1e-
z69^TMg>o6P13aRHq8qu1MQq`o{bE&$bWLg$Kjr9}Q^Ah$`&ZI*L@ll^k)!np_wIM!
zZf&RA<>i{ET4!p)?^ym3E+aG4LPzTG=T#_ViyR7dxJf5|(XC4NzukI=W}(q}@9)Zt
z9kiFE=`IJ`PX#+aT5`PevXdKcHUHV%mY18>l(iYDw#Zk3%!6FUF+Y|$@BgECGe%Rj
z_#dS+N~N*-rEuyfiom(;Y{o~N#S`fmS!s!Gph)yYAsR2k$T>+TE3rYPXh0#dBnMrT
zEU+1~WuRKv9Lpz4F>16PPuy>Rz-jqOU*^T#?4%IR^+OK1k=%mgyn++FyeMww5r?Z^
z+g}Ri#0J=fNtVY3*}(=%BdNt6TohW<rRCTrrYQ%Y9gyRR8l3gAkCt!{E`ileVi$xO
zTvCQf=ynp|)7}_2PJ60=QdfhU^TD|tY|A5KF0pDkEuhY~mWsEx5WBKv)n)Hhau3gE
zfe{E#0;T<dN9nf0(+{~41035^Es>(gx-SSF-+TLIQQ3&u7*YVK!RQR?HF)7+fpX_I
zLwGX6P<Ya_@I<;@x_g&Al>e{Va;3;J?0Kqam&>wO>K%H#hdkdOzb-;qpp$K^6W>eT
zGjgE>VK_mFK)1V+zMP!8jEHMeCi?zU)}q%-JQ_Oe#T-rn=mx=RYW85xo{_|gX?U8m
zkK(GKVnn(Sm-V7qz6-R6zu30ptN_(7^k{~&b_|~{nud|=T_^%mKIlpi?vyN>LDw`x
zKi<he*4>|k6RFOI<I=&9GcSO;lWERf7ld)!*{|e&UPHf$`x=`c13ABa;+i4$%)mXb
mxvz`cYVRkqo#E@6vi|_&iQheMk!{fc0000<MNUMnLSTZ6jGS5k

literal 0
HcmV?d00001

diff --git a/logos/emojis/emoji8.png b/logos/emojis/emoji8.png
new file mode 100644
index 0000000000000000000000000000000000000000..68ad37271ba7740365893d252bb887ea5d08f514
GIT binary patch
literal 1301
zcmV+w1?u{VP)<h;3K|Lk000e1NJLTq000^Q000^Y0ssI2CMesP00001b5ch_0olnc
ze*gdg32;bRa{vGf6951U69E94oEQKA1iDE?K~#90m6dr+R7V`gms<#=QVuznb$8h}
z?=7j8ihvdqqa5W*1uS4wCCDMgltxpPq@`GBiYW*P2nqy{b&H`03IYNP$h8MrXe~{T
zv=nMMN<j|g*xmQ0^H?abTz2yL<Cpo(?>oQu`^}qSFg6)%lN}d5ELuO|JWI!B3y9eQ
zd?*8Jzr;!KwgkKMH;dX}xU!6z&a-E40c9mdHoiqkj!``kRBtpT3nrVKl=r~A0CdE&
zk7BQFBV?$jmE><ZQv{UtPE>CU94v%mA~@c*!avP$FrWH9nrv{IEd`k&*2V_f8*3Ts
zYYQXn<aYqs=>-RJ;pqLX7|5l>K8kO_gO6F}Mmp+RJ9IR!zi%Ti2b9<Y4(7pUx3*{S
zCMEM#+{J`ZOd~z56)g=7#z%+E=7oUjaDjiMz&|rzmHw|Ov75XcOZ2nQ)L52turwIS
z24o`v`y%0Q3IC6uVyR|_$wF{|ZMY<N^*t*^C4gdQ*!SUFPmJ<uEbQAJv<xk#ZRr7J
zH7Gu9OKa(BYyOo9s3siB4#A#~(dK}x^ZPrC-RGVJ!k%C>vyR~TCxPM;_pEcyL!uyh
zru#6}f=}dQCaB9EV5htcz;*&k55jJ5#NQ&H%ou)F6i-~RZ(e!?%2XVMGLHqRhqPdS
zPBbt541YxA2fKaf5UCsNAW)Z2I-4*OeJqt#0Co{jvX72IK8fRW>t12J{gq?vylC#Y
zh!4dylPwN6&e&fGV3%IBpM2y*Z%=RI2_;TYOprC;T8I^+D9o0uMTH~O=q(0mL7a?J
zobjfmnJE!|EsUKS$a!3}dOcrdkPq>@XPJ!h7$#YVt7-ir#F7J8<zMjRQis*^3JJe5
znTK3`0!%H0YQ(GJY#G8xTe5CVc4M_5DTMi*08mo?`m8Al{|6yR3T2KwSQAAyEXt)H
zw?=KIYq#upTxdVhsGhGHlTCPcq5T@UI#6=jh7sm$ikgC2vvvG7bP=eZ7d*@v7Dl?$
zg*er^n2v<#%G}+Y!s;vH4ps7=*MpZLu<!_1v=hn>Lf(eYw%}6@V6+<hRlsdaWwoX4
zMj><s+VD96;9D5bC%Gn$rL0w*6{0%PE*dw91|~6l(+h8!WgN81Jz{;+(<aZ$=7zg<
z)*-7;oy^bfF^dB9n(R|naIwDRL(ugZXXz*Ne`6=oRwbyA5VylwsV=suF3d8=Jrk~e
zh+$XX0T&;YUFGPAT!`!MGN)UYQd=kkVXh`ia=Ka?CE-j(6$U$L_kx&TbB<f+#lGk1
zH5r<W7!OSv3r$klweR>NS4Ax6Mf-BqszG&}oq?|A${odeUGM3a_Vgz&D#|7N-h9vy
z5i}KldlA9ZrBanGiaa69!4@QZl@?hK`mgc`%XP1Zqpd-I8c$iX++`^-T=v0CPV*w7
znQW2D9{DC5x#$I*1loQ$hv&vMRM+}XQI^0}RAT6cKs!%VoS4aLRpWWZN#sI>MsLuM
zUvb~&7;0#2tVWMrMmp$0LD!-3K6qK?HTAhbjoCZis8}ybKtY%d(^z+NrBwqn*S~t)
z`sWnh^kv`GS~Hh@e^2G1S7ooY!7B-=4W_A~>U^l+Ss8EjX$;1{9IVA#6sQud00000
LNkvXXu0mjf#xqy2

literal 0
HcmV?d00001


From 7a9633c97f444fb52c02507bb8ca7b63ca875df2 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Fri, 14 Jul 2023 17:53:43 +0800
Subject: [PATCH 068/133] Add files via upload

---
 logos/emojis/category.png | Bin 0 -> 139 bytes
 logos/emojis/flags.png    | Bin 0 -> 138 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 logos/emojis/category.png
 create mode 100644 logos/emojis/flags.png

diff --git a/logos/emojis/category.png b/logos/emojis/category.png
new file mode 100644
index 0000000000000000000000000000000000000000..641f842aee4c7b299f4596a649028527cae2932f
GIT binary patch
literal 139
zcmeAS@N?(olHy`uVBq!ia0vp^93afd3?%;@)Hwm97>k44ofvPP)Tsw@I14-?i-EL1
z2s0*k{k;xkum$*pxH8Q64`j{~x%?hTF_i@Q1^;Jwy4}DF$P@5%aSW-LlN^u`knrO?
agF2%a1Jiz$Ni0Aq1_n=8KbLh*2~7ZOULtA$

literal 0
HcmV?d00001

diff --git a/logos/emojis/flags.png b/logos/emojis/flags.png
new file mode 100644
index 0000000000000000000000000000000000000000..62ce2fa79fd47b9bb174bf685311ade4abb7a6f0
GIT binary patch
literal 138
zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJx$P6SOaL7~xDaPU;cPGZ1Cw1z99L@rd$YLPv
z55kPeU4O3w8EgSQA+A9BzmdJe%P)CA7E?)(UogY}=!r^OfjoXs7srr_ImreI4UTLA
ZoDAFwjDbCiY`TC_44$rjF6*2UngEs*AJqT=

literal 0
HcmV?d00001


From 8e28fcbdba30c1510cf1e7089d27212aacca4c6c Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 17 Jul 2023 14:35:24 +0800
Subject: [PATCH 069/133] added safe mode in jokes

---
 setup_config_files.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup_config_files.sh b/setup_config_files.sh
index c79d124..32a8610 100755
--- a/setup_config_files.sh
+++ b/setup_config_files.sh
@@ -51,7 +51,7 @@ echo '{"feature": "IPO", "speed": "medium", "speed2": "medium", "animation": "do
 echo '{"symbols": {}}' >> portfolio_settings.json
 echo '{"symbols": {}}' >> portfolio_crypto_settings.json
 echo '{}' >> prepost_settings.json
-echo '{"feature": "Jokes", "speed": "medium", "speed2": "medium", "animation": "up", "title": true, "categories": ["Any"], "blacklist": [], "amount": "5", "jokes": []}' >> jokes_settings.json
+echo '{"feature": "Jokes", "speed": "medium", "speed2": "medium", "animation": "up", "title": true, "safe": true, "categories": ["Any"], "blacklist": [], "amount": "5", "jokes": []}' >> jokes_settings.json
 echo '{"shutdown": {"hour": "00", "minute": "00", "enabled": false}, "reboot":{"hour": "00", "minute": "00", "enabled": false}, "timezone": "GMT", "brightness1":{"hour": "00", "minute": "00", "bright": "10", "enabled": false}, "brightness2":{"hour": "00", "minute": "00", "bright": "10", "enabled": false}}, "brightness3":{"hour": "00", "minute": "00", "bright": "10", "enabled": false}}, "brightness4":{"hour": "00", "minute": "00", "bright": "10", "enabled": false}}' >> scheduler.json
 echo '{"feature": "Economic Calendar", "speed": "medium", "speed2": "medium", "animation": "up", "importance": "Med - High", "title": true, "timezone": "US/Eastern", "countries": ["United States"], "events": []}' >> economic_settings.json
 

From 8e5e1008591ac4e36d6c91824e3c2917e658593e Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 17 Jul 2023 14:37:21 +0800
Subject: [PATCH 070/133] added safe mode to jokes settings

---
 server.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/server.py b/server.py
index 0787a40..95058c6 100755
--- a/server.py
+++ b/server.py
@@ -342,7 +342,7 @@ def index():
         if not jokes_settings['categories']:
             jokes_settings['categories'] = ['Any']
     except:
-        jokes_settings = {"feature": "Jokes", "speed": "medium", "speed2": "medium", "animation": "up", "title": True, "categories": ["Any"], "blacklist": [], "amount": "5", "jokes": []}
+        jokes_settings = {"feature": "Jokes", "speed": "medium", "speed2": "medium", "animation": "up", "title": True, "safe": True, "categories": ["Any"], "blacklist": [], "amount": "5", "jokes": []}
 	
     try:
         f = open('csv/scheduler.json','r')
@@ -1346,12 +1346,13 @@ def save_jokes_settings(input_settings):
         current_settings = json.load(f)
         f.close()
     except:
-        current_settings = {"feature": "Jokes", "speed": "medium", "speed2": "medium", "animation": "up", "title": True, "categories": ["Any"], "blacklist": [], "amount": "5", "jokes": []}
+        current_settings = {"feature": "Jokes", "speed": "medium", "speed2": "medium", "animation": "up", "title": True, "safe": True, "categories": ["Any"], "blacklist": [], "amount": "5", "jokes": []}
 
     current_settings['speed'] = input_settings['speed'].lower()
     current_settings['speed2'] = input_settings['speed2'].lower()
     current_settings['animation'] = input_settings['animation'].lower()
     current_settings['title'] = input_settings['title']
+    current_settings['safe'] = input_settings['safe']
     if not input_settings['categories']:
         current_settings['categories'] = ['Any']
     else:

From 6e68c350f130cc505b324cb7f6b702bf8f43c0a9 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 17 Jul 2023 14:38:58 +0800
Subject: [PATCH 071/133] safe setting added to jokes

---
 database_caller.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/database_caller.py b/database_caller.py
index daa21c1..36e2e22 100755
--- a/database_caller.py
+++ b/database_caller.py
@@ -817,7 +817,7 @@ def updateJokes(api_key, logf):
         with open('csv/jokes_settings.json', 'r') as f:
             jokes_settings = json.load(f)
     except:
-        jokes_settings = {"feature": "Jokes", "speed": "medium", "speed2": "medium", "animation": "up", "title": true, "categories": ["Any"], "blacklist": [], "amount": "5", "jokes": []}
+        jokes_settings = {"feature": "Jokes", "speed": "medium", "speed2": "medium", "animation": "up", "title": True, "safe": True, "categories": ["Any"], "blacklist": [], "amount": "5", "jokes": []}
     try:
         if 'Any' in jokes_settings['categories']:
             categories = 'Any'
@@ -830,6 +830,8 @@ def updateJokes(api_key, logf):
         joke_url = 'https://v2.jokeapi.dev/joke/'+categories+'?amount='+amount
         if blacklist != '':
             joke_url = 'https://v2.jokeapi.dev/joke/'+categories+ '?blacklistFlags=' + blacklist + '&amount='+amount
+        if jokes_settings['safe']:
+            joke_url += '&safe-mode'
 
         get_jokes = requests.get(joke_url)
         all_jokes = get_jokes.json()

From bcdb7a52d535b525231034cf28ddecf792582873 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 17 Jul 2023 14:45:37 +0800
Subject: [PATCH 072/133] safe jokes only checkbox

---
 templates/index.html | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/templates/index.html b/templates/index.html
index bd5a55b..a5014f0 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -7096,6 +7096,25 @@
                   </div>
                 </div>
 
+                <div class="row g-3 align-items-center left-div" style="padding-top: 25px;">
+                  <div class="col-auto">
+                    <label for="inputTransitionZ222" class="col-form-label">
+                      Safe Jokes Only
+                    </label>
+                  </div>
+                  <div class="col-auto">
+                    <input
+                      class="form-check-input title-select"
+                      type="checkbox"
+                      value=""
+                      id="jokes_settings_safe"
+                      {% if jokes_settings.safe%}
+                      checked
+                      {%endif%}/>
+                  </div>
+                </div>
+
+                
               </div>
 
 

From c455e6cd9815a8db286342a2c3b8fb6fef741020 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 17 Jul 2023 14:48:46 +0800
Subject: [PATCH 073/133] added safe jokes

---
 static/app.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/static/app.js b/static/app.js
index 4a8d335..0809fa6 100755
--- a/static/app.js
+++ b/static/app.js
@@ -1721,6 +1721,7 @@ function getJokesSettings(page) {
   let title = page.querySelectorAll(".title-select")[0].checked;
   let categories = getListItems(page.querySelectorAll(".symbol-list")[0]);
   let amount = page.querySelectorAll(".jokes-amount-select")[0].value;
+  let safe = page.querySelectorAll(".title-select")[1].checked;
   const jokesdivElement = page.querySelector('.blacklist-checkboxes');
   const allcheckboxes = jokesdivElement.querySelectorAll('input');
   const blacklist = [];
@@ -1734,6 +1735,7 @@ function getJokesSettings(page) {
     categories: categories,
     blacklist: blacklist,
     amount: amount,
+    safe: safe,
   };
   console.log(settings);
   return settings;

From 341afa233ec71639bf0503e2d39121f14595ecff Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 17 Jul 2023 14:52:19 +0800
Subject: [PATCH 074/133] moved safe positioning

---
 static/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/app.js b/static/app.js
index 0809fa6..2721555 100755
--- a/static/app.js
+++ b/static/app.js
@@ -1732,10 +1732,10 @@ function getJokesSettings(page) {
   });
   settings = {
     title: title,
+    safe: safe,
     categories: categories,
     blacklist: blacklist,
     amount: amount,
-    safe: safe,
   };
   console.log(settings);
   return settings;

From 14c21a8f1d43aa28c18e0440a7220d214dc10004 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 17 Jul 2023 15:03:58 +0800
Subject: [PATCH 075/133] getjokeimage

---
 stockTicker.py | 101 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 100 insertions(+), 1 deletion(-)

diff --git a/stockTicker.py b/stockTicker.py
index 4450ed7..1303a8a 100755
--- a/stockTicker.py
+++ b/stockTicker.py
@@ -5,7 +5,7 @@
 # stockTicker can not be copied and/or distributed without the express
 # permission of Fintic
 
-
+import random
 import sys, select
 import os
 import threading
@@ -6084,6 +6084,105 @@ class StockTicker():
             image_list.append(img)
 
         return self.stitchImage(image_list)
+
+
+    def getJokesImage(self):
+    
+        f = open('csv/jokes_settings.json', 'r')
+        jokes_settings = json.load(f)
+        f.close()
+        
+        if jokes_settings['title']:
+            title_img = self.openImage('feature_titles/jokes.png')
+            image_list = [title_img]
+        else:
+            image_list = []
+
+        font = ImageFont.load("./fonts/BonusCoffee-14.pil")
+        small_font = ImageFont.load("./fonts/5x8.pil")
+
+        colours = { 'White':(255,255,255),
+                    'Red':(255,0,0),
+                    'Green':(0,255,0),
+                    'Dark Green':(0,100,0),
+                    'Blue':(0,0,255),
+                    'Purple':(145,0,255),
+                    'Pink':(255,0,255),
+                    'Yellow':(255,255,0),
+                    'Orange':(255,130,0),
+                    'Gold':(255,190,0),
+                    'Cyan':(0,255,255)}
+
+        if len(jokes_settings['jokes']) > 0:
+            try:
+                for joke in jokes_settings['jokes']:
+                    random_color = random.choice(list(colours.keys()))
+                    r,g,b = colours[random_color]
+                    random_number = str(random.randint(1, 8)) + '.png'
+                    emoji = self.openImage('logos/emojis/emoji' + random_number)
+                    category_icon = self.openImage('logos/emojis/category.png')
+                    category = self.textImage(joke['category'], small_font, r=255, g=255,b=255)
+                    if joke['safe']:
+                        safe = self.textImage('Safe', small_font, r=255, g=255, b=0)
+                    else:
+                        safe = self.textImage('Unsafe', small_font, r=255, g=0, b=0)
+                    if joke['type'] == 'twopart':
+                        joke1 = self.textImage(joke['setup'].replace('\n', ' '), font, int(r),int(g),int(b))
+                        random_color = random.choice(list(colours.keys()))
+                        r,g,b = colours[random_color]
+                        joke2 = self.textImage(joke['delivery'].replace('\n', ' '), font, int(r), int(g), int(b))
+                    else:
+                        joke1 = self.textImage(joke['joke'].replace('\n', ' '), font, int(r), int(g), int(b))
+                        joke2 = None
+                    try:
+                        true_flags = [key for key, value in joke['flags'].items() if value]
+                        flags = ", ".join(true_flags)
+                        flags_final = self.textImage(flags, small_font, r=255, g=145, b=0)
+                    except:
+                        flags_final = None
+                        pass
+                    if flags_final != None:
+                        flags_icon = self.openImage('logos/emojis/flags.png')
+                    else:
+                        flags_icon = None
+                    x_offset = 10
+                    if joke2 != None:
+                        try:
+                            img = Image.new('RGB', (20 + emoji.size[0] + 5 + max(joke1.size[0], category_icon.size[0] + 2 + category.size[0] + 5 + safe.size[0] + 5 + flags_icon.size[0] + 2 + flags_final.size[0] + 5) + joke2.size[0], 32))
+                        except:
+                            img = Image.new('RGB', (20 + emoji.size[0] + 5 + max(joke1.size[0], category_icon.size[0] + 2 + category.size[0] + 5 + safe.size[0] + 5) + joke2.size[0], 32))
+                    else:
+                        try:
+                            img = Image.new('RGB', (20 + emoji.size[0] + 5 + max(joke1.size[0], category_icon.size[0] + 2 + category.size[0] + 5 + safe.size[0] + 5 + flags_icon.size[0] + 2 + flags_final.size[0] + 5), 32))
+                        except:
+                            img = Image.new('RGB', (20 + emoji.size[0] + 5 + max(joke1.size[0], category_icon.size[0] + 2 + category.size[0] + 5 + safe.size[0] + 5), 32))
+                    img.paste(emoji, (x_offset, 3))
+                    x_offset += emoji.size[0] + 5
+                    x_offset2 = x_offset
+                    img.paste(joke1, (x_offset, 2))
+                    x_offset += joke1.size[0]
+                    img.paste(category_icon, (x_offset2, 20))
+                    x_offset2 += category_icon.size[0] + 2
+                    img.paste(category, (x_offset2, 20))
+                    x_offset2 += category.size[0] + 5
+                    img.paste(safe, (x_offset2, 20))
+                    x_offset2 += safe.size[0] + 5
+                    try:
+                        img.paste(flags_icon, (x_offset2, 20))
+                        x_offset2 += flags_icon.size[0] + 2
+                        img.paste(flags_final, (x_offset2, 20))
+                        x_offset2 += flags_final.size[0] + 5
+                    except:
+                        pass
+                    try:
+                        img.paste(joke2, (max(x_offset, x_offset2), 18))
+                    except:
+                        pass
+                    image_list.append(img)
+            except:
+                pass
+
+        return self.stitchImage(image_list)
     
     
     def ip_viewer(self):

From 36a4028340f0d8e24a12b7b818336b9b399a1887 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 17 Jul 2023 15:54:55 +0800
Subject: [PATCH 076/133] font 16 and changed height positioning of jokes 1 and
 2

---
 stockTicker.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/stockTicker.py b/stockTicker.py
index 1303a8a..589d258 100755
--- a/stockTicker.py
+++ b/stockTicker.py
@@ -6098,7 +6098,7 @@ class StockTicker():
         else:
             image_list = []
 
-        font = ImageFont.load("./fonts/BonusCoffee-14.pil")
+        font = ImageFont.load("./fonts/BonusCoffee-16.pil")
         small_font = ImageFont.load("./fonts/5x8.pil")
 
         colours = { 'White':(255,255,255),
@@ -6159,7 +6159,7 @@ class StockTicker():
                     img.paste(emoji, (x_offset, 3))
                     x_offset += emoji.size[0] + 5
                     x_offset2 = x_offset
-                    img.paste(joke1, (x_offset, 2))
+                    img.paste(joke1, (x_offset, 1))
                     x_offset += joke1.size[0]
                     img.paste(category_icon, (x_offset2, 20))
                     x_offset2 += category_icon.size[0] + 2
@@ -6175,7 +6175,7 @@ class StockTicker():
                     except:
                         pass
                     try:
-                        img.paste(joke2, (max(x_offset, x_offset2), 18))
+                        img.paste(joke2, (max(x_offset, x_offset2), 16))
                     except:
                         pass
                     image_list.append(img)

From 8e23669014cd94c2fb39e693b98a3a9c9830694e Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 17 Jul 2023 15:56:15 +0800
Subject: [PATCH 077/133] bonus coffee font for jokes feature

---
 fonts/BonusCoffee-16.bdf | 2030 ++++++++++++++++++++++++++++++++++++++
 fonts/BonusCoffee-16.pbm |  Bin 0 -> 1012 bytes
 fonts/BonusCoffee-16.pil |  Bin 0 -> 5143 bytes
 3 files changed, 2030 insertions(+)
 create mode 100644 fonts/BonusCoffee-16.bdf
 create mode 100644 fonts/BonusCoffee-16.pbm
 create mode 100644 fonts/BonusCoffee-16.pil

diff --git a/fonts/BonusCoffee-16.bdf b/fonts/BonusCoffee-16.bdf
new file mode 100644
index 0000000..7dc0a9a
--- /dev/null
+++ b/fonts/BonusCoffee-16.bdf
@@ -0,0 +1,2030 @@
+STARTFONT 2.1
+FONT -FontForge-Bonus Coffee-Book-R-Normal--16-150-75-75-P-80-ISO10646-1
+SIZE 15 75 75
+FONTBOUNDINGBOX 20 18 -4 -4
+COMMENT "Generated by fontforge, http://fontforge.sourceforge.net"
+COMMENT "Copyright (c) 2023 by Khurasan. All rights reserved."
+STARTPROPERTIES 40
+FOUNDRY "FontForge"
+FAMILY_NAME "Bonus Coffee"
+WEIGHT_NAME "Book"
+SLANT "R"
+SETWIDTH_NAME "Normal"
+ADD_STYLE_NAME ""
+PIXEL_SIZE 16
+POINT_SIZE 150
+RESOLUTION_X 75
+RESOLUTION_Y 75
+SPACING "P"
+AVERAGE_WIDTH 80
+CHARSET_REGISTRY "ISO10646"
+CHARSET_ENCODING "1"
+FONTNAME_REGISTRY ""
+CHARSET_COLLECTIONS "ISO10646-1"
+FONT_NAME "BonusCoffee"
+FACE_NAME "Bonus Coffee"
+COPYRIGHT "Copyright (c) 2023 by Khurasan. All rights reserved."
+FONT_VERSION "1.000"
+FONT_ASCENT 13
+FONT_DESCENT 3
+UNDERLINE_POSITION -2
+UNDERLINE_THICKNESS 1
+X_HEIGHT 9
+CAP_HEIGHT 11
+DEFAULT_CHAR 1
+RAW_ASCENT 800
+RAW_DESCENT 200
+NORM_SPACE 5
+RELATIVE_WEIGHT 40
+RELATIVE_SETWIDTH 50
+SUPERSCRIPT_X 0
+SUPERSCRIPT_Y 7
+SUPERSCRIPT_SIZE 10
+SUBSCRIPT_X 0
+SUBSCRIPT_Y 2
+SUBSCRIPT_SIZE 10
+AVG_LOWERCASE_WIDTH 78
+AVG_UPPERCASE_WIDTH 86
+ENDPROPERTIES
+CHARS 115
+STARTCHAR NULL
+ENCODING 0
+SWIDTH 0 0
+DWIDTH 0 0
+BBX 1 1 0 0
+BITMAP
+00
+ENDCHAR
+STARTCHAR nonmarkingreturn
+ENCODING 13
+SWIDTH 292 0
+DWIDTH 5 0
+BBX 1 1 0 0
+BITMAP
+00
+ENDCHAR
+STARTCHAR space
+ENCODING 32
+SWIDTH 292 0
+DWIDTH 5 0
+BBX 1 1 0 0
+BITMAP
+00
+ENDCHAR
+STARTCHAR exclam
+ENCODING 33
+SWIDTH 238 0
+DWIDTH 4 0
+BBX 4 12 0 0
+BITMAP
+30
+70
+70
+60
+60
+60
+60
+60
+60
+00
+C0
+C0
+ENDCHAR
+STARTCHAR quotedbl
+ENCODING 34
+SWIDTH 411 0
+DWIDTH 7 0
+BBX 5 4 1 8
+BITMAP
+D8
+D8
+D8
+D0
+ENDCHAR
+STARTCHAR numbersign
+ENCODING 35
+SWIDTH 786 0
+DWIDTH 13 0
+BBX 11 13 1 0
+BITMAP
+0C00
+0D80
+1DC0
+1BE0
+FFE0
+FFC0
+3B80
+FFE0
+FFE0
+7700
+6600
+6600
+0C00
+ENDCHAR
+STARTCHAR dollar
+ENCODING 36
+SWIDTH 436 0
+DWIDTH 7 0
+BBX 6 14 1 -1
+BITMAP
+20
+30
+78
+FC
+C0
+F0
+78
+38
+1C
+FC
+F8
+70
+30
+30
+ENDCHAR
+STARTCHAR percent
+ENCODING 37
+SWIDTH 854 0
+DWIDTH 14 0
+BBX 13 12 0 0
+BITMAP
+3800
+7CC0
+EDC0
+CDC0
+FB80
+7300
+0770
+06F8
+0FD8
+1D98
+1DF0
+18E0
+ENDCHAR
+STARTCHAR ampersand
+ENCODING 38
+SWIDTH 633 0
+DWIDTH 10 0
+BBX 8 12 1 0
+BITMAP
+3C
+7E
+6E
+7C
+78
+36
+7E
+7E
+CE
+CF
+FB
+70
+ENDCHAR
+STARTCHAR quotesingle
+ENCODING 39
+SWIDTH 225 0
+DWIDTH 4 0
+BBX 2 4 1 8
+BITMAP
+C0
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR parenleft
+ENCODING 40
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 15 1 -2
+BITMAP
+1C
+3C
+70
+60
+E0
+C0
+C0
+C0
+C0
+C0
+C0
+60
+70
+3C
+1C
+ENDCHAR
+STARTCHAR parenright
+ENCODING 41
+SWIDTH 480 0
+DWIDTH 8 0
+BBX 6 15 1 -2
+BITMAP
+E0
+F0
+38
+18
+0C
+0C
+0C
+0C
+0C
+0C
+1C
+18
+38
+F0
+E0
+ENDCHAR
+STARTCHAR asterisk
+ENCODING 42
+SWIDTH 384 0
+DWIDTH 7 0
+BBX 5 5 1 7
+BITMAP
+20
+78
+F8
+70
+58
+ENDCHAR
+STARTCHAR plus
+ENCODING 43
+SWIDTH 577 0
+DWIDTH 9 0
+BBX 8 8 1 1
+BITMAP
+18
+18
+18
+FF
+FF
+18
+18
+18
+ENDCHAR
+STARTCHAR comma
+ENCODING 44
+SWIDTH 235 0
+DWIDTH 4 0
+BBX 2 3 1 -1
+BITMAP
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR hyphen
+ENCODING 45
+SWIDTH 577 0
+DWIDTH 9 0
+BBX 8 2 1 4
+BITMAP
+FE
+FF
+ENDCHAR
+STARTCHAR period
+ENCODING 46
+SWIDTH 246 0
+DWIDTH 4 0
+BBX 2 2 1 0
+BITMAP
+C0
+C0
+ENDCHAR
+STARTCHAR slash
+ENCODING 47
+SWIDTH 430 0
+DWIDTH 7 0
+BBX 7 13 0 0
+BITMAP
+0C
+0E
+0C
+1C
+18
+38
+38
+30
+70
+60
+60
+E0
+40
+ENDCHAR
+STARTCHAR zero
+ENCODING 48
+SWIDTH 526 0
+DWIDTH 9 0
+BBX 8 12 0 0
+BITMAP
+3E
+7E
+F7
+C3
+C3
+C3
+C3
+C3
+C3
+E3
+7E
+3C
+ENDCHAR
+STARTCHAR one
+ENCODING 49
+SWIDTH 318 0
+DWIDTH 5 0
+BBX 4 12 0 0
+BITMAP
+30
+70
+F0
+F0
+30
+30
+30
+30
+30
+30
+30
+30
+ENDCHAR
+STARTCHAR two
+ENCODING 50
+SWIDTH 488 0
+DWIDTH 8 0
+BBX 7 12 0 0
+BITMAP
+3C
+7E
+66
+66
+EE
+7C
+1C
+38
+70
+70
+7E
+7E
+ENDCHAR
+STARTCHAR three
+ENCODING 51
+SWIDTH 476 0
+DWIDTH 8 0
+BBX 7 12 0 0
+BITMAP
+1C
+7E
+7E
+EE
+7C
+1C
+1E
+06
+66
+66
+7E
+3C
+ENDCHAR
+STARTCHAR four
+ENCODING 52
+SWIDTH 503 0
+DWIDTH 8 0
+BBX 7 12 1 0
+BITMAP
+34
+3C
+7C
+7C
+6C
+EC
+EC
+FE
+FE
+0C
+0C
+0C
+ENDCHAR
+STARTCHAR five
+ENCODING 53
+SWIDTH 445 0
+DWIDTH 7 0
+BBX 6 12 1 0
+BITMAP
+7C
+FC
+C0
+C0
+C0
+F0
+F8
+78
+18
+18
+F0
+E0
+ENDCHAR
+STARTCHAR six
+ENCODING 54
+SWIDTH 525 0
+DWIDTH 9 0
+BBX 8 12 0 0
+BITMAP
+30
+38
+70
+70
+60
+FC
+FE
+C3
+C3
+E7
+7E
+3C
+ENDCHAR
+STARTCHAR seven
+ENCODING 55
+SWIDTH 418 0
+DWIDTH 7 0
+BBX 6 12 0 0
+BITMAP
+7C
+FC
+4C
+0C
+0C
+1C
+1C
+18
+18
+18
+18
+38
+ENDCHAR
+STARTCHAR eight
+ENCODING 56
+SWIDTH 482 0
+DWIDTH 8 0
+BBX 6 12 1 0
+BITMAP
+38
+7C
+CC
+CC
+DC
+F8
+78
+FC
+CC
+CC
+FC
+78
+ENDCHAR
+STARTCHAR nine
+ENCODING 57
+SWIDTH 563 0
+DWIDTH 9 0
+BBX 8 12 1 0
+BITMAP
+3C
+7E
+EE
+C7
+C7
+C7
+FF
+7F
+07
+06
+FE
+7C
+ENDCHAR
+STARTCHAR colon
+ENCODING 58
+SWIDTH 246 0
+DWIDTH 4 0
+BBX 2 8 1 0
+BITMAP
+C0
+C0
+00
+00
+00
+00
+C0
+C0
+ENDCHAR
+STARTCHAR semicolon
+ENCODING 59
+SWIDTH 246 0
+DWIDTH 4 0
+BBX 2 8 1 0
+BITMAP
+C0
+C0
+00
+00
+00
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR less
+ENCODING 60
+SWIDTH 484 0
+DWIDTH 8 0
+BBX 6 8 1 1
+BITMAP
+0C
+1C
+78
+F0
+E0
+F8
+7C
+0C
+ENDCHAR
+STARTCHAR equal
+ENCODING 61
+SWIDTH 577 0
+DWIDTH 9 0
+BBX 8 5 1 2
+BITMAP
+FE
+FF
+00
+FE
+FF
+ENDCHAR
+STARTCHAR greater
+ENCODING 62
+SWIDTH 484 0
+DWIDTH 8 0
+BBX 6 7 1 2
+BITMAP
+40
+F0
+78
+1C
+3C
+F8
+E0
+ENDCHAR
+STARTCHAR question
+ENCODING 63
+SWIDTH 546 0
+DWIDTH 9 0
+BBX 7 12 1 0
+BITMAP
+3C
+7E
+E6
+C6
+CC
+1C
+38
+30
+30
+20
+30
+30
+ENDCHAR
+STARTCHAR at
+ENCODING 64
+SWIDTH 796 0
+DWIDTH 13 0
+BBX 12 12 1 0
+BITMAP
+0F80
+3FC0
+70E0
+6460
+CF60
+DB60
+DFC0
+CF80
+E020
+70F0
+3FC0
+1F00
+ENDCHAR
+STARTCHAR A
+ENCODING 65
+SWIDTH 538 0
+DWIDTH 9 0
+BBX 7 12 1 0
+BITMAP
+38
+7C
+66
+C6
+C6
+C6
+C6
+FE
+FE
+C6
+C6
+C6
+ENDCHAR
+STARTCHAR B
+ENCODING 66
+SWIDTH 587 0
+DWIDTH 10 0
+BBX 9 13 0 0
+BITMAP
+3000
+3F00
+3F80
+3980
+3380
+3F00
+3F00
+3F80
+3180
+3180
+3380
+FF00
+FC00
+ENDCHAR
+STARTCHAR C
+ENCODING 67
+SWIDTH 593 0
+DWIDTH 9 0
+BBX 8 12 1 0
+BITMAP
+1E
+7F
+63
+E3
+C0
+C0
+C0
+C0
+C3
+63
+7F
+3E
+ENDCHAR
+STARTCHAR D
+ENCODING 68
+SWIDTH 604 0
+DWIDTH 10 0
+BBX 8 13 1 0
+BITMAP
+C0
+FC
+FE
+E7
+C3
+C3
+C3
+C3
+C3
+C6
+CE
+FC
+F8
+ENDCHAR
+STARTCHAR E
+ENCODING 69
+SWIDTH 536 0
+DWIDTH 9 0
+BBX 7 12 1 0
+BITMAP
+3E
+7E
+C0
+C0
+F8
+7C
+F8
+C0
+C0
+C0
+7E
+7E
+ENDCHAR
+STARTCHAR F
+ENCODING 70
+SWIDTH 567 0
+DWIDTH 9 0
+BBX 8 12 0 0
+BITMAP
+7F
+7F
+60
+60
+60
+70
+FF
+FF
+30
+30
+30
+30
+ENDCHAR
+STARTCHAR G
+ENCODING 71
+SWIDTH 585 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+1E00
+7F00
+6380
+E180
+C000
+CF80
+CF80
+C180
+C180
+6380
+7F00
+1E00
+ENDCHAR
+STARTCHAR H
+ENCODING 72
+SWIDTH 552 0
+DWIDTH 9 0
+BBX 7 12 1 0
+BITMAP
+C6
+C6
+C6
+C6
+FE
+FE
+C6
+C6
+C6
+C6
+C6
+C6
+ENDCHAR
+STARTCHAR I
+ENCODING 73
+SWIDTH 217 0
+DWIDTH 4 0
+BBX 2 12 1 0
+BITMAP
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR J
+ENCODING 74
+SWIDTH 558 0
+DWIDTH 9 0
+BBX 8 12 0 0
+BITMAP
+1F
+1F
+03
+03
+03
+C3
+C3
+C3
+C3
+E6
+7E
+3C
+ENDCHAR
+STARTCHAR K
+ENCODING 75
+SWIDTH 533 0
+DWIDTH 9 0
+BBX 7 12 1 0
+BITMAP
+C6
+CE
+CE
+DC
+F8
+F0
+F8
+D8
+DC
+CC
+CE
+C6
+ENDCHAR
+STARTCHAR L
+ENCODING 76
+SWIDTH 412 0
+DWIDTH 7 0
+BBX 5 12 1 0
+BITMAP
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+F8
+F8
+ENDCHAR
+STARTCHAR M
+ENCODING 77
+SWIDTH 668 0
+DWIDTH 11 0
+BBX 9 12 1 0
+BITMAP
+E180
+E380
+E380
+F780
+F780
+FF80
+FD80
+FD80
+D980
+C180
+C180
+C180
+ENDCHAR
+STARTCHAR N
+ENCODING 78
+SWIDTH 550 0
+DWIDTH 9 0
+BBX 7 13 1 0
+BITMAP
+06
+C6
+E6
+F6
+F6
+FE
+FE
+DE
+DE
+CE
+CE
+CE
+C4
+ENDCHAR
+STARTCHAR O
+ENCODING 79
+SWIDTH 514 0
+DWIDTH 9 0
+BBX 8 13 0 0
+BITMAP
+1C
+3E
+7E
+67
+E3
+C3
+C3
+C3
+C3
+C3
+E7
+7E
+3C
+ENDCHAR
+STARTCHAR P
+ENCODING 80
+SWIDTH 457 0
+DWIDTH 8 0
+BBX 7 12 0 0
+BITMAP
+FC
+FC
+FE
+C6
+C6
+C6
+C6
+CC
+FC
+F8
+C0
+C0
+ENDCHAR
+STARTCHAR Q
+ENCODING 81
+SWIDTH 579 0
+DWIDTH 10 0
+BBX 9 13 0 -1
+BITMAP
+3E00
+7F00
+7380
+E180
+C180
+C180
+C180
+CD80
+EF80
+7F00
+3E00
+0600
+0600
+ENDCHAR
+STARTCHAR R
+ENCODING 82
+SWIDTH 517 0
+DWIDTH 9 0
+BBX 7 12 1 0
+BITMAP
+1C
+FC
+E6
+E6
+C6
+C6
+FC
+F8
+D8
+DC
+CC
+CC
+ENDCHAR
+STARTCHAR S
+ENCODING 83
+SWIDTH 428 0
+DWIDTH 7 0
+BBX 6 12 0 0
+BITMAP
+38
+7C
+C0
+C0
+E0
+70
+78
+38
+1C
+0C
+FC
+F8
+ENDCHAR
+STARTCHAR T
+ENCODING 84
+SWIDTH 472 0
+DWIDTH 8 0
+BBX 6 12 1 0
+BITMAP
+FC
+FC
+30
+30
+30
+30
+30
+30
+30
+30
+30
+30
+ENDCHAR
+STARTCHAR U
+ENCODING 85
+SWIDTH 498 0
+DWIDTH 8 0
+BBX 6 12 1 0
+BITMAP
+CC
+CC
+CC
+CC
+CC
+CC
+CC
+CC
+CC
+CC
+78
+70
+ENDCHAR
+STARTCHAR V
+ENCODING 86
+SWIDTH 488 0
+DWIDTH 8 0
+BBX 8 12 0 0
+BITMAP
+66
+E7
+66
+66
+7E
+7E
+3C
+3C
+3C
+3C
+18
+18
+ENDCHAR
+STARTCHAR W
+ENCODING 87
+SWIDTH 740 0
+DWIDTH 12 0
+BBX 10 12 1 0
+BITMAP
+C0C0
+C0C0
+C0C0
+CCC0
+CCC0
+CCC0
+DCC0
+DEC0
+DEC0
+FFC0
+7F80
+7380
+ENDCHAR
+STARTCHAR X
+ENCODING 88
+SWIDTH 465 0
+DWIDTH 7 0
+BBX 7 12 0 0
+BITMAP
+66
+EE
+6C
+7C
+3C
+38
+38
+3C
+7C
+7E
+6E
+66
+ENDCHAR
+STARTCHAR Y
+ENCODING 89
+SWIDTH 509 0
+DWIDTH 8 0
+BBX 7 12 1 0
+BITMAP
+C6
+CE
+CC
+EC
+7C
+78
+78
+30
+30
+30
+30
+30
+ENDCHAR
+STARTCHAR Z
+ENCODING 90
+SWIDTH 449 0
+DWIDTH 7 0
+BBX 7 12 0 0
+BITMAP
+7C
+FE
+0C
+1C
+18
+38
+30
+70
+70
+60
+FE
+7E
+ENDCHAR
+STARTCHAR bracketleft
+ENCODING 91
+SWIDTH 352 0
+DWIDTH 6 0
+BBX 4 16 1 -2
+BITMAP
+F0
+F0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+F0
+F0
+ENDCHAR
+STARTCHAR backslash
+ENCODING 92
+SWIDTH 430 0
+DWIDTH 7 0
+BBX 7 13 0 0
+BITMAP
+40
+E0
+60
+70
+30
+30
+38
+18
+18
+1C
+0C
+0C
+0E
+ENDCHAR
+STARTCHAR bracketright
+ENCODING 93
+SWIDTH 352 0
+DWIDTH 6 0
+BBX 4 16 1 -2
+BITMAP
+F0
+F0
+30
+30
+30
+30
+30
+30
+30
+30
+30
+30
+30
+30
+F0
+F0
+ENDCHAR
+STARTCHAR asciicircum
+ENCODING 94
+SWIDTH 471 0
+DWIDTH 8 0
+BBX 7 7 0 5
+BITMAP
+18
+1C
+3C
+7C
+7E
+66
+C6
+ENDCHAR
+STARTCHAR underscore
+ENCODING 95
+SWIDTH 565 0
+DWIDTH 9 0
+BBX 8 2 1 0
+BITMAP
+FE
+FF
+ENDCHAR
+STARTCHAR grave
+ENCODING 96
+SWIDTH 238 0
+DWIDTH 4 0
+BBX 2 3 1 9
+BITMAP
+80
+C0
+40
+ENDCHAR
+STARTCHAR a
+ENCODING 97
+SWIDTH 524 0
+DWIDTH 8 0
+BBX 8 10 0 0
+BITMAP
+3F
+7F
+67
+C7
+C6
+C6
+C6
+CE
+7F
+3E
+ENDCHAR
+STARTCHAR b
+ENCODING 98
+SWIDTH 492 0
+DWIDTH 8 0
+BBX 7 12 0 0
+BITMAP
+C0
+C0
+C0
+F8
+FC
+C6
+C6
+C6
+C6
+CE
+FC
+F0
+ENDCHAR
+STARTCHAR c
+ENCODING 99
+SWIDTH 511 0
+DWIDTH 8 0
+BBX 7 10 1 0
+BITMAP
+38
+7C
+EE
+C6
+C0
+C0
+C6
+EE
+7E
+38
+ENDCHAR
+STARTCHAR d
+ENCODING 100
+SWIDTH 494 0
+DWIDTH 8 0
+BBX 6 12 1 0
+BITMAP
+0C
+0C
+0C
+0C
+7C
+7C
+CC
+CC
+CC
+CC
+7C
+7C
+ENDCHAR
+STARTCHAR e
+ENCODING 101
+SWIDTH 527 0
+DWIDTH 9 0
+BBX 7 10 1 0
+BITMAP
+3C
+7E
+E6
+E6
+FC
+F8
+C6
+E6
+7E
+3C
+ENDCHAR
+STARTCHAR f
+ENCODING 102
+SWIDTH 524 0
+DWIDTH 8 0
+BBX 8 11 0 -1
+BITMAP
+1F
+1F
+30
+30
+30
+FE
+FE
+30
+30
+30
+30
+ENDCHAR
+STARTCHAR g
+ENCODING 103
+SWIDTH 544 0
+DWIDTH 9 0
+BBX 8 12 1 -2
+BITMAP
+3C
+7E
+C6
+C6
+CF
+7F
+3F
+07
+06
+4E
+FC
+78
+ENDCHAR
+STARTCHAR h
+ENCODING 104
+SWIDTH 449 0
+DWIDTH 8 0
+BBX 6 12 1 0
+BITMAP
+C0
+C0
+C0
+C0
+F8
+FC
+CC
+CC
+CC
+CC
+CC
+CC
+ENDCHAR
+STARTCHAR i
+ENCODING 105
+SWIDTH 217 0
+DWIDTH 4 0
+BBX 2 11 1 0
+BITMAP
+C0
+C0
+00
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR j
+ENCODING 106
+SWIDTH 243 0
+DWIDTH 4 0
+BBX 7 14 -4 -4
+BITMAP
+06
+06
+00
+06
+06
+06
+06
+06
+06
+06
+06
+0E
+FC
+F8
+ENDCHAR
+STARTCHAR k
+ENCODING 107
+SWIDTH 443 0
+DWIDTH 7 0
+BBX 6 12 1 0
+BITMAP
+C0
+C0
+C0
+C8
+DC
+F8
+F0
+F0
+F8
+D8
+DC
+CC
+ENDCHAR
+STARTCHAR l
+ENCODING 108
+SWIDTH 217 0
+DWIDTH 3 0
+BBX 2 12 1 0
+BITMAP
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR m
+ENCODING 109
+SWIDTH 712 0
+DWIDTH 11 0
+BBX 11 11 1 0
+BITMAP
+D100
+FBC0
+FFC0
+FFC0
+CCE0
+CCE0
+CCE0
+CCE0
+CCE0
+CCC0
+CCC0
+ENDCHAR
+STARTCHAR n
+ENCODING 110
+SWIDTH 519 0
+DWIDTH 8 0
+BBX 7 10 0 0
+BITMAP
+FC
+FE
+E6
+E6
+E6
+C6
+C6
+C6
+C6
+C6
+ENDCHAR
+STARTCHAR o
+ENCODING 111
+SWIDTH 529 0
+DWIDTH 9 0
+BBX 8 10 0 0
+BITMAP
+18
+7E
+7F
+E3
+C3
+C3
+C3
+67
+7E
+3C
+ENDCHAR
+STARTCHAR p
+ENCODING 112
+SWIDTH 482 0
+DWIDTH 8 0
+BBX 6 13 1 -3
+BITMAP
+C0
+F8
+FC
+CC
+CC
+CC
+FC
+F8
+F0
+C0
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR q
+ENCODING 113
+SWIDTH 521 0
+DWIDTH 8 0
+BBX 8 13 0 -3
+BITMAP
+02
+3F
+7F
+C6
+C6
+C6
+FE
+7E
+3E
+06
+06
+06
+06
+ENDCHAR
+STARTCHAR r
+ENCODING 114
+SWIDTH 432 0
+DWIDTH 7 0
+BBX 6 10 1 0
+BITMAP
+D8
+FC
+F0
+E0
+C0
+C0
+C0
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR s
+ENCODING 115
+SWIDTH 490 0
+DWIDTH 8 0
+BBX 7 10 1 0
+BITMAP
+7C
+FC
+C0
+E0
+78
+3C
+1E
+0E
+FC
+78
+ENDCHAR
+STARTCHAR t
+ENCODING 116
+SWIDTH 505 0
+DWIDTH 8 0
+BBX 7 12 0 0
+BITMAP
+30
+30
+30
+30
+FE
+FE
+30
+30
+30
+30
+1E
+1E
+ENDCHAR
+STARTCHAR u
+ENCODING 117
+SWIDTH 498 0
+DWIDTH 8 0
+BBX 6 10 1 0
+BITMAP
+CC
+CC
+CC
+CC
+CC
+CC
+CC
+CC
+FC
+78
+ENDCHAR
+STARTCHAR v
+ENCODING 118
+SWIDTH 571 0
+DWIDTH 9 0
+BBX 9 10 0 0
+BITMAP
+0180
+E380
+6380
+7300
+7300
+3700
+3E00
+1E00
+1E00
+1C00
+ENDCHAR
+STARTCHAR w
+ENCODING 119
+SWIDTH 794 0
+DWIDTH 13 0
+BBX 11 10 1 0
+BITMAP
+4060
+C060
+C060
+CE60
+CE60
+CF60
+DF60
+FBE0
+FBC0
+71C0
+ENDCHAR
+STARTCHAR x
+ENCODING 120
+SWIDTH 532 0
+DWIDTH 9 0
+BBX 8 10 0 0
+BITMAP
+43
+E7
+7E
+3E
+1C
+3C
+3E
+76
+67
+C3
+ENDCHAR
+STARTCHAR y
+ENCODING 121
+SWIDTH 466 0
+DWIDTH 8 0
+BBX 6 12 1 -2
+BITMAP
+CC
+CC
+CC
+CC
+CC
+CC
+FC
+7C
+0C
+0C
+F8
+78
+ENDCHAR
+STARTCHAR z
+ENCODING 122
+SWIDTH 455 0
+DWIDTH 7 0
+BBX 7 10 0 0
+BITMAP
+7E
+7E
+0C
+1C
+18
+38
+30
+60
+7E
+FE
+ENDCHAR
+STARTCHAR braceleft
+ENCODING 123
+SWIDTH 441 0
+DWIDTH 7 0
+BBX 7 15 0 -2
+BITMAP
+1C
+3C
+30
+30
+30
+30
+70
+E0
+70
+30
+30
+30
+30
+3C
+1E
+ENDCHAR
+STARTCHAR bar
+ENCODING 124
+SWIDTH 225 0
+DWIDTH 4 0
+BBX 2 13 1 -1
+BITMAP
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR braceright
+ENCODING 125
+SWIDTH 441 0
+DWIDTH 7 0
+BBX 7 15 0 -2
+BITMAP
+70
+F8
+18
+18
+18
+18
+1C
+0E
+1C
+18
+18
+18
+18
+78
+70
+ENDCHAR
+STARTCHAR asciitilde
+ENCODING 126
+SWIDTH 622 0
+DWIDTH 10 0
+BBX 8 4 1 3
+BITMAP
+7B
+FF
+CE
+C0
+ENDCHAR
+STARTCHAR cent
+ENCODING 162
+SWIDTH 511 0
+DWIDTH 8 0
+BBX 6 13 1 -1
+BITMAP
+30
+30
+7C
+FC
+CC
+C0
+C0
+C0
+CC
+7C
+7C
+30
+30
+ENDCHAR
+STARTCHAR sterling
+ENCODING 163
+SWIDTH 627 0
+DWIDTH 10 0
+BBX 9 12 1 0
+BITMAP
+1C00
+3E00
+3700
+3300
+3000
+3000
+FE00
+FE00
+3000
+3000
+FF80
+FF80
+ENDCHAR
+STARTCHAR currency
+ENCODING 164
+SWIDTH 654 0
+DWIDTH 10 0
+BBX 9 9 1 1
+BITMAP
+8300
+DF00
+FF00
+7F00
+6300
+6300
+FF00
+FF00
+C180
+ENDCHAR
+STARTCHAR yen
+ENCODING 165
+SWIDTH 593 0
+DWIDTH 9 0
+BBX 8 12 1 0
+BITMAP
+C3
+E7
+76
+7E
+3C
+3F
+FF
+7E
+FF
+FF
+18
+18
+ENDCHAR
+STARTCHAR copyright
+ENCODING 169
+SWIDTH 798 0
+DWIDTH 13 0
+BBX 11 12 1 0
+BITMAP
+1F00
+3F80
+79C0
+E0C0
+CE60
+DE60
+D860
+DE60
+CFE0
+61C0
+7F80
+1F00
+ENDCHAR
+STARTCHAR registered
+ENCODING 174
+SWIDTH 666 0
+DWIDTH 11 0
+BBX 9 9 1 3
+BITMAP
+3E00
+7F00
+DD80
+D580
+D980
+DD80
+C380
+7F00
+3E00
+ENDCHAR
+STARTCHAR plusminus
+ENCODING 177
+SWIDTH 577 0
+DWIDTH 9 0
+BBX 8 11 1 0
+BITMAP
+18
+18
+18
+FF
+FF
+18
+18
+18
+00
+FE
+FF
+ENDCHAR
+STARTCHAR multiply
+ENCODING 215
+SWIDTH 498 0
+DWIDTH 8 0
+BBX 6 6 1 2
+BITMAP
+CC
+FC
+78
+78
+FC
+CC
+ENDCHAR
+STARTCHAR divide
+ENCODING 247
+SWIDTH 577 0
+DWIDTH 9 0
+BBX 8 8 1 1
+BITMAP
+18
+18
+00
+FE
+FF
+00
+18
+18
+ENDCHAR
+STARTCHAR quoteleft
+ENCODING 8216
+SWIDTH 225 0
+DWIDTH 4 0
+BBX 2 4 1 8
+BITMAP
+C0
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR quoteright
+ENCODING 8217
+SWIDTH 225 0
+DWIDTH 4 0
+BBX 2 4 1 8
+BITMAP
+C0
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR quotedblleft
+ENCODING 8220
+SWIDTH 411 0
+DWIDTH 7 0
+BBX 5 4 1 8
+BITMAP
+D0
+D8
+D8
+D8
+ENDCHAR
+STARTCHAR quotedblright
+ENCODING 8221
+SWIDTH 411 0
+DWIDTH 7 0
+BBX 5 4 1 8
+BITMAP
+D8
+D8
+D8
+D0
+ENDCHAR
+STARTCHAR Euro
+ENCODING 8364
+SWIDTH 608 0
+DWIDTH 10 0
+BBX 9 12 0 0
+BITMAP
+0E00
+1F00
+3B80
+3180
+FC00
+FC00
+7C00
+7D80
+3980
+1980
+1F80
+0E00
+ENDCHAR
+STARTCHAR trademark
+ENCODING 8482
+SWIDTH 554 0
+DWIDTH 9 0
+BBX 8 4 1 8
+BITMAP
+FB
+FF
+5F
+59
+ENDCHAR
+STARTCHAR e_e
+ENCODING 57344
+SWIDTH 1040 0
+DWIDTH 17 0
+BBX 16 10 0 0
+BITMAP
+3C00
+7E1E
+E63F
+E673
+FC7F
+F87E
+C060
+E673
+7E3F
+3C1E
+ENDCHAR
+STARTCHAR f_f
+ENCODING 57345
+SWIDTH 991 0
+DWIDTH 16 0
+BBX 16 13 0 -1
+BITMAP
+001E
+001F
+1F30
+1F30
+3030
+3030
+3030
+FEFE
+FEFE
+3030
+3030
+3030
+3030
+ENDCHAR
+STARTCHAR .notdef
+ENCODING -1
+SWIDTH 292 0
+DWIDTH 5 0
+BBX 1 1 0 0
+BITMAP
+00
+ENDCHAR
+ENDFONT
diff --git a/fonts/BonusCoffee-16.pbm b/fonts/BonusCoffee-16.pbm
new file mode 100644
index 0000000000000000000000000000000000000000..a2b8c036799a487d98ba312933f1fbe24ff0602a
GIT binary patch
literal 1012
zcmV<Q0}K3#P)<h;3K|Lk000e1NJLTq00P1Q000mH00000Gyo)d000BKNkl<Zc$|%o
zO>9(E7>1vF=Q?vC)8Up7ohC!MHN;>-ND+dyDdk|Awu>6$#+cX`jK-g6u%IziM(0$j
zj;7FtxbY_xf(up#4U0yx9)!R|Njfnuz!*Fox~Pf5Z99QG?VWpE@FQ#t&*ppHd|%$=
zBXwMDS1UG#{<->xotsYY@7z&4cWBLgYM-8#dszw>nzxPST3;9+-FLujdA;G#qnGxb
zE%bz$<evOOy1BU+ZIt&<jl7f)uMGaUdSY+uuH@-8sZ%3ov0btcKIFacJcDhCuJw<L
zMthy`8;X66-r(>Y2^T#29O3mh;(E5<+afHE(a5mng7vh0e%D{ESZCxaiQhF$abm4s
z^b=rXIiD6IXQeb&VXz>*${R-yRK9VZXy`rWj4gNFwUoei*}D3v&0!FS(--UR&{lFo
z<!-+^i$7~G=QC+wL7%IRP4&%)(e}P__#Ji}Tu$K>!onlC=g9zaspa}Vxq3zZ%2zl6
z<m{n(Q%(Y??H0br->GW=>8!vi9c>$iHJK0>=H*q~mrZ71o3zbN@$pV`p*{;Sy}M7M
zk?3XC?~3wU1KLzIZQ#i;a<Qa|q>@N<VPZXNHRG?MFbkU`L@EYRu9haR9FeXNHpKlW
zufE5T5+1eR{HC@RoqRa+a{~H_J(;&;V37xA0D=lELQSx=MR}G+1EHj7Ie0)75+1wv
zpAt6J?;DOD<OYif$B9x8xO5F=0lT^f9}fkjej=I%q?ZM(V_zBs3V2>c4Km}=9SNJn
zV{K}&uBzSGq`PG#0En=EaKtB(hhH;MpdIiT14WE=ngPJioIy=Vi{)%B`2eQ3N(?IZ
zQIH*|0Thzg2LKx=^{fH}KF$bb%&y8T+_#RgG>b*RjU-7oUjwWgzg_cZOe+xx*l>kr
zm4!<ySB#}tR{CIQZqJ``5xW|`sdgd&LLbh^UeFNFZ1!WBrtZ<L>jqxbd9Xd#;6gZk
zRpu=pgCRdI0y!DIot8qy95?TB@Zysi?5qjG#4k7iUvQb%Hdy0;y>J3=pgH6Z)9PrP
z!C<l@{(2%(%e01C_qP{{_5}E}7g?NJ>MD({o3wyLCr!-?4{R{Oh3DE0ASMY_nC~bn
zAS@@JjV7pv<O5jH^B6QjhX5D}ok7)q=W}io0Gt30%Q+7KwF6Qaz~?SfI-zfBx<^{_
zre|~N)<q%!EZKT1Zye#a1F!=U5%)@#|C;sPtB#I4f(;yo_}-h7iQ8KD?_O2zY;kT3
i<KA=g|4^yi5&i{Z$%#(@358Su0000<MNUMnLSTXoX4jtp

literal 0
HcmV?d00001

diff --git a/fonts/BonusCoffee-16.pil b/fonts/BonusCoffee-16.pil
new file mode 100644
index 0000000000000000000000000000000000000000..12ad3a834631aa006e588128893629189228986c
GIT binary patch
literal 5143
zcmeH~F>F><6vzMfe$d(q*2Q!x3mb7M7)|H`Mg~)fMopB3bTEnuQ4<U?B$$wpFgV}>
zAu<_4h*2kXDHC1Ty204Vbc4at0!qK<?|;vIuU|WnXrc|@Yi{2C|KB<Hob!L@-tYCD
zH{bgB^UuB<pDEY$t25(o9De`sxXRTuN-^W!&MNT?+;+Ogs)4J|&!7hX)oUKqK9fWb
z?RPkt=0Umln2u@}LrQQX&7(5k#nat|Tj8n7n1l(t74Aus@Kbt$KQ4T2KgHOGwL9PI
zjTJ2IhjUzWJ!0%<{tC=<h4XqDEFILuChj2IA-IkF9)qPL+F904%|ngRTSwrI;u$ge
zrOu;pZ!>casreJTCt&FVVr|$NOUK|GLydDWmgcC)zOK!A&M{6<M`#-Qoq#(D=jXPw
z?@7j~E!-)%GnKOjwm-u-2iMl-`#Hu1xWTv=;4W4>#~3MCx-_t!eJ?StR^L|pt8mxg
zqTWZSVJuzmv<mJz+zmMAWlcxX^ak^vVM4#h=+_5JzoEc}T^}snq>8YM+HS%v5I1@#
zdSd}@aUeghvB<asS58W__ZoK?OI7=}jwQI|YL}|rGTi+EJFj=2v07ua?`;)sy^9e&
zxlWlQ)vmq|u+nb0u1^bAn%KM^SZQ*LFMA>Ff%ALtdR}V}V=vtEm7_+m(#xIiigg4l
z9q4*3xC3xAaIUHL6<FzYd_ybOk-$o`n>7F{y^Ec5sr>?0`Vh|RIX|9(m5y)Wj>COa
zxvC#n$vy6Kz`oQ2RyqyS#_)Ql8E30+tLa&|^IPoB!+itiK2FUabW;W^UDS(py|M?v
zN|&i^(C#waci45hG=G7WzQ;5AukSlp>4$Eg`^<R=R{D`05WZ`^gOz?k(QdthmFBxT
z!fqb^R<&#Oy9IX}yNDZhx8WAM^~@!((p^+*?Z&A0F5FTVBi;u+o_>dm{#*541uHG%
z3)ehp*5G!4mF{usTKhJadrW;&dw-j=?+U|vf%gUHnK7ckv>LDmSb3D3ou7!oGqCbR
zSMM6JdSK<3x}LOM53D=|7rEHZSb6V&uh*mR^S(}(QZHC}nyj2lBCdU>8LtiGLQY`i
zLvV4Htho-b^6Y?}W6Uz%t1)7|3|2mdhx2o7j=|ZU=dcT|{PuvAKjC*Kw6}f<to&)M
zEq)g=SosU=ya!X`GjScP{8jOEkl{5{VEZW$d(itb(aXwT)A!Ni4}1qJ`@1B#HH|k7
zSovE{jX2lJ?<!dNig)NgxY}<9@AE4Rf4}_OSDcB|#{RuVjGyB4d#W%|@2WlUQ~tG_
yuutVWG#V<fZ54<!g8vVjK0U8IU%t$?Z8^ilx0wQQ?w0@e={@Cz_=^2MSMfKrLSO*^

literal 0
HcmV?d00001


From 85ad7142b6fbc9519f7d87dfcf824728618a7cf0 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 17 Jul 2023 16:22:39 +0800
Subject: [PATCH 078/133] small emojis logo for prof display

---
 logos/emojis/small_emojis/category.png | Bin 0 -> 137 bytes
 logos/emojis/small_emojis/emoji1.png   | Bin 0 -> 888 bytes
 logos/emojis/small_emojis/emoji2.png   | Bin 0 -> 781 bytes
 logos/emojis/small_emojis/emoji3.png   | Bin 0 -> 860 bytes
 logos/emojis/small_emojis/emoji4.png   | Bin 0 -> 795 bytes
 logos/emojis/small_emojis/emoji5.png   | Bin 0 -> 628 bytes
 logos/emojis/small_emojis/emoji6.png   | Bin 0 -> 694 bytes
 logos/emojis/small_emojis/emoji7.png   | Bin 0 -> 833 bytes
 logos/emojis/small_emojis/emoji8.png   | Bin 0 -> 808 bytes
 logos/emojis/small_emojis/flags.png    | Bin 0 -> 138 bytes
 10 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 logos/emojis/small_emojis/category.png
 create mode 100644 logos/emojis/small_emojis/emoji1.png
 create mode 100644 logos/emojis/small_emojis/emoji2.png
 create mode 100644 logos/emojis/small_emojis/emoji3.png
 create mode 100644 logos/emojis/small_emojis/emoji4.png
 create mode 100644 logos/emojis/small_emojis/emoji5.png
 create mode 100644 logos/emojis/small_emojis/emoji6.png
 create mode 100644 logos/emojis/small_emojis/emoji7.png
 create mode 100644 logos/emojis/small_emojis/emoji8.png
 create mode 100644 logos/emojis/small_emojis/flags.png

diff --git a/logos/emojis/small_emojis/category.png b/logos/emojis/small_emojis/category.png
new file mode 100644
index 0000000000000000000000000000000000000000..62e13c8c72b3a96c93fc32ba720a060b61070a67
GIT binary patch
literal 137
zcmeAS@N?(olHy`uVBq!ia0vp^>>$j@3?%=}IXVGIF%}28J2BoosZ$T+a29w(76WO2
z5N1s7`g<M7U<>dGab=kCAIO{~a``=wVk!yp3;xgWbi08UkjLlg;uumfC%GWu$8m<^
Z4AM`Se_y<~_7zZu!PC{xWt~$(699yzCQbkV

literal 0
HcmV?d00001

diff --git a/logos/emojis/small_emojis/emoji1.png b/logos/emojis/small_emojis/emoji1.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a3eb3357554ddff0a6d61e757ca99b65a0104fa
GIT binary patch
literal 888
zcmV-;1Bd*HP)<h;3K|Lk000e1NJLTq000jF000jN0{{R33<za-00001b5ch_0olnc
ze*gdg32;bRa{vG?BLDy{BLR4&KXw2B0w_>SR7C&)03Z|vgH{*Hi!1N0Lio2!>#IS)
zgei1O6c7pn0s#Oj8V9d>CGERg`__T};h6s8p8nyN`qY5vw^^8G9vTn?0RR9i8wbdT
zA^gy4|KpSY<e2~Eng8OF`N?9ncpn=P1RfIws&yXv#!3F$b^qLU{@Qf+zeAE@84(Ku
zcuy4Qt}Fi1PX5(Y{?Sa`q9;~255t5Y_roaaz%kCFF!9JS{M0k{&N9=eFy6B;@VO?Q
zX&UUMCh@`}u!JGesUhRLA@t26`_&@#&LZW#A>6bfu!SMwt|ZZqBloW-@4+L;rYet#
zPN{$+wu~U$wITV_A>g<nw~ZjGfFgy7Sj(&|;;|#%nk4L~Dd5LLo4AvCs-fw|B<R8+
z<-Q^J(IMx*A?Ls$?Z+WpptFsym)gNd(vl{Xk7Sm<y0X{ogR8Z!mr}r_PRXiE%BxAq
zs!YYHRJWd2ZKb}j)$5MAy>oqLIg!G4z2>FW@Oq`YsidFI%E;Z?*WKFI-`(2V*wwkT
zuxp^bqtfnlyW}*H$0vllI-b`@rrdy$aFJvvlxQ)Ta66rKL7H(qmTEJSWh#M@YCE3S
zGnmsRh`|deI~`z%T8NPB#4gyYBEOC!xrQUSg(KLjBksX0Sb>NfVvG$hMF0T-0|f;+
zCJn%cAMv>)^T8wPxg+MbBkQ^&^S~tTwIr=}948tI0t5y#APJ*v8{(ZL__QbbxF`3r
zC)<}KlVKPh5(QekfN1~#0O?6YK~#90V_;xlU}R!uVP#|I;A8*+E^Z!PK7Ii~Az=|w
zF(6-DLQ+avMn*<jR!&}lfk9D8Sw$5B)YLUJ8ML%@bYVbG-+;l;$k@cx3<S(AEUl~=
zY;5i99UPsUoSa=;-P}DGJiWYqeEs|b0)v7>Lc_utA|j)rV`Agt6B3h>Q&Q6y(lau%
zvU76t@(T)!ic3lv%E~J$tEy{i>*^aCo0?k~THD$?I=i}idi(k(Oq?{CVan8L(`U?_
zHG9^~IdkXDU%;?%(c&dbmn~nha@FcJYu7CV`Dp!yjhi-a*}82zkPQGWR!5FK+C;7Z
O0000<MNUMnLSTaJ@}cqo

literal 0
HcmV?d00001

diff --git a/logos/emojis/small_emojis/emoji2.png b/logos/emojis/small_emojis/emoji2.png
new file mode 100644
index 0000000000000000000000000000000000000000..c0e75e8c6759a7fb578479c39b4bed9cd33c15af
GIT binary patch
literal 781
zcmV+o1M>WdP)<h;3K|Lk000e1NJLTq000jF000jN0{{R33<za-00001b5ch_0olnc
ze*gdg32;bRa{vGf6951U69E94oEQKA0m4vBR7C&)00IF3P%#dSS{T8AAk~m2z<?o)
zTNqF=4-^apf>jvht490FZ~ohk|KFJY+mHLpZsw~+e^VI}9XA673axJ){KQZH<e~rP
zs{iM!%ByKjcCi#8ID%9c{JuK>-G~3*j)$VJpU>?<V}t<$1LdSC|Ik_g)M)<GX!Xlx
z_04H=uGf*$^J$>R940mUx-I|AOaIMI*r!9Nb~NFzME}f6<FZDmbu`SMMQ5nec){yx
zq{>Q1M*hMp|Hw4|$S|yWCYxm>u6!l`$1JaYCaZWTj+c2@mdJvSgspcd)sQ6r!z%yB
zD&Vas_P;6Gs3_K@DC4jx{>CcvzA5^^Db$Z8{=zBlx+uq)CE=|n>9i;BxhU|vDDJr^
z=(8u_tR}^mCG@{3{=zE2fg$_4Dd)2%hHhA>n1ryLf3==^xSx5lnsus{ccPJef@n_f
zx+sfV8RnxV{lqG#dpe_#d$_Kn(8|Ty)X&by!nUiRp^bN}elz^LDfGH3!htHfcq+Da
zD7ADbw{<DQf-3gCDuPuP0RaFL3k0oi9`(E`)|o2AgDSy*D#e5<*_|u)zACM6ANaT_
z_PHwaw<`I#DU4eggd|n)0002wNkl<Zc${NkU|?WmVrF4wW9MLG00T}gZXRAfegQ!t
zVG$5lR7_k#Qc_YvTuNF7s907`UI79Wm6TN&m{ir&H8eGVSW8<+SC4^N-@wqw*u>P#
z+``hz+J=F}*3RC+(aG7x(bdh}!;`_w+sDV(&)+A&FEA)LB$R<IEIcAIDmo@ME<PbK
zDVc#iB{eNQBQq;ICpRxYrGSB>u&B7Cw5+_MvZ^|$kOOFcO>JF$Lt|5Yb4yKY8v{do
zM@?r}cTaC$f6at;ko((P3nxyRJZVZ{Ydge4Z5&gRLz4?QfQlIa5EVGHI5N-#00000
LNkvXXu0mjf^+ac2

literal 0
HcmV?d00001

diff --git a/logos/emojis/small_emojis/emoji3.png b/logos/emojis/small_emojis/emoji3.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2866c4e3fcbeb21d26406d4170895217433e592
GIT binary patch
literal 860
zcmV-i1Ec(jP)<h;3K|Lk000e1NJLTq000jF000jN0{{R33<za-00001b5ch_0olnc
ze*gdg32;bRa{vGf6951U69E94oEQKA0u4}1R7C&)00961O)n0LSr@;5Ak>g0!-64@
zT^Lm~4+8=L5(@-^R2Sr_MEc5Z{@RWI-kAQ|ko(MV=&neOT^bn<1riDat#2Lt!%zR@
zp#SHp|L3d!<f8q_S-g5684m>l0Rewe7X7|B|J{fG-;V#@i~htzkX{)E0|8Gk4&<UJ
z|Ik_T$zrsPMb)ZQ`_X3q)M)+EXWFk;wvI*X!(RW=UG1wZV?Gm-UK#tkE&t3*{>)C;
zs6VT9FVdnv|IA9?uS2SGFVUbr{mW1P%uW5jFr{rAzknb9!7BgAHUG#k%a$ssbSLJr
zEC0tV?YS(hb|}J)EC0wc|HwH0#4FK{BhHN@|HCT($13^5E6128^uH_j!7I(3DDk{1
z|HLZboF~74ApXKB^S&v^nI++^C+M^%@3|=OyD09tDCn~%;H)OcnI`bPDbbH4`?)Fa
zx+sQkS*VzVu$+Ijo_e>Rd9s>ytCn}8l6!+}SL(GW{k|%tY#mQ959FdHr+PS}k9oJP
zqR-02+SJd_$-}s<qoR*`q<A*%swiVU6M<6}{ktjix+=qhD!O<owsk1AbSSoUDY|zm
z!GJ3Axhnp@DUx3r2Lu8V3Iwfg9{jo~_Pr|CnkvMDD)qc7{k|#Wq9*vbDfYQ4^S3Jb
zxhm+UCyiVg7!CzZFAs`Y7{7oa)Q=^?f+CMy8C5h80|5c|D{sL7008JoL_t(|oMT{M
zU|?ioW?^Mx=ip=j11@eJUOs*SK_Oug5LZ-8TtZR`2&83X<ro;`6%>_}AwWe{O`SnQ
zQ%hS%S5M!-(8$=t)QrL0!qUpx#@5c>!O_Xt#g)O$-NVz%+sD_>KOitDID{cIEIcAI
zDm*+qIwm$eE}kJFF)2AEH7z|OGb=kMESJGNFTbF$sJNuGth}PKs+ysuHoUIBp|PpC
zrL`@*y@Nr%v#YzOx37P~#7UE<Or6HSFnz|%S+nO%nlpRuJdpc<0^IW#EL^m3@sg#>
mARb~|zGCI7)oa$S1F``^7ebgh{T^}v0000<MNUMnLSTZyGL;1Y

literal 0
HcmV?d00001

diff --git a/logos/emojis/small_emojis/emoji4.png b/logos/emojis/small_emojis/emoji4.png
new file mode 100644
index 0000000000000000000000000000000000000000..faa2f64009062923af094cbb0cc4bca2aca70e41
GIT binary patch
literal 795
zcmV+$1LXXPP)<h;3K|Lk000e1NJLTq000jF000jN0{{R33<za-00001b5ch_0olnc
ze*gdg32;bRa{vGf6951U69E94oEQKA0n|`TR7C&)01O8MSvL`$XCBLoE!&wi&5bUh
zY93xX5eWqX5efv1TpQr1N%+cj{@RcK-IxB`koe1W;;TuDTNxA#1gvfz`NUcO<DUQK
zssHDz|L3gv#8k6%9u*7(3kL&>TNwGiKL6Z=|KE)N-G=(XLX=_|4hRESHW1&RDgVz|
z|I}#z&|2iBDq}tpon{;NxGn$8O8(4F@xn>^$VmUpNc+i4@xo00%uoN!OZmGlsBav}
zh$8;LEC0wg=(RDMZ6?s3DgVbT|Hm!Vqb!<iDDu5D|HwD~!YkB}BiWQB|H3N&$13Tx
zDW-BI)SoEVq$#9vCG)&0|HCTZnkCDLBL2ZD`NS*z#wz~CD*nPM)sZ8gXdC#rDgVeS
z*PtZZqa@?3ChD{&?YAiFwI}7SCfubZ)SV>yyD6z~9a}gN;h`m(U>tfm7nVdIxl<~;
zSS!0#E1F0leLEPESsLZ0C1yYph*%f-xheF%Dz|baz*JH2UWo2qhrv@)v~DE!zbcVm
z84Csi6AJ{favu7+DetOk^O3spk-6`wZ2!qBw|E{F4Fr*38RMfS@uFPvhp6#|s`8>;
z<)tQ&Ul|Pu17JK7qhcz_Sz6IeXUbSxrerE*KN8B;y*2;<0N_bPK~#90V_;xlU}R!u
zVP#|I;A8*;E^Z!PK7Ii~Az=|PS5!<~LQ+anLR?x#mVrS|UO`a_0+dx$)fm(@G__zr
zTSu2cPv5}M$k@chz|_p#!qSSt+Q!z--oeq)$=Su#&E12+)63h(*U#JA+dm-CJ1CeT
zB-GnGEF8#>2=n%ijADq6iH(a-NK8sjNllAQ&tS;R^3Kl5&C4$+EGmvIDP`a+E3c@m
zs;;T7t*cLOXk=h$YHo>bZEJ7q=uGeG206H?r?;<vLjS}`le-}vnlg3T^cgc}%?2uF
Z004iyJ2Xhj1QGxM002ovPDHLkV1mJza=QQk

literal 0
HcmV?d00001

diff --git a/logos/emojis/small_emojis/emoji5.png b/logos/emojis/small_emojis/emoji5.png
new file mode 100644
index 0000000000000000000000000000000000000000..b539601ed0fd6ca7430bc800a5109a30edb4e7d6
GIT binary patch
literal 628
zcmV-)0*n2LP)<h;3K|Lk000e1NJLTq000jF000jN0{{R33<za-00001b5ch_0olnc
ze*gdg32;bRa{vGf6951U69E94oEQKA0X0xeR7C&)00IF3P%#dSS{T8AAk~m2z<?o)
zTNqF=4-^apf>jvht490FZ~ohk|KFJY+mHLpZsw~+6AJ{bZyo%^Pyghh|L3az=d1k0
zP_1tsf>am$zB>QihyUM>`r3=+!+Y7cbLPc;``e5E-iZ9aJc3mh0RaHzq$&T<S^v~%
z-?dl4mqgsLQtZK8-LX=`m_^>SSO3sj=A<h7x-I|AOaIMI^T0*-#76(jO7_G^@xDj@
z%~1QhE{t0l{=zH&$Ta`RF#pFb|Hmx<$1eZKFaO9h|HwDMfg#n9B>%%I|Hmr!zbWmv
zDD%B3`NAsHk0t)XDZ-B@oopoXyeXV)B*Ks;{=zEzx+%?>DY1Ph^u8+dy(+JID9e~B
zi(47yqbBgXD&nsx{l+TatSRleD*U@Ct#2RmL3(`v007uYL_t(|oMT{MU|?ioW?^Mx
z=U`+215Pe(9$r3v0YNSyFjrVaR7_l4Tuf9#5-7kZB`qT>C$FHWB&)2Vs>Z;iuA!-=
zt)r`_Z=h*t#KFL9Y+`C=Zed|!X=QC<W6Qu|XYb(X1O(15u5Nbj3?80dUfw=lUS7U_
zUS6L53~T{jUV%ZuUcMorUS47D4D8`vUJ;Q|UePhJUS8pG3>@)ZUI~dwUP;L*US9DW
zK>Jg@U?3G}KZB4YOdvH4>|i0)`0y~#u<&?QA&7_6IBebh-QzfbiWvYrt13D!b54N(
O0000<MNUMnLSTYOw<M4N

literal 0
HcmV?d00001

diff --git a/logos/emojis/small_emojis/emoji6.png b/logos/emojis/small_emojis/emoji6.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc97397291d3ff29c30d6e9340332ca3077e7176
GIT binary patch
literal 694
zcmV;n0!jUeP)<h;3K|Lk000e1NJLTq000jF000jN0{{R33<za-00001b5ch_0olnc
ze*gdg32;bRa{vGf6951U69E94oEQKA0dY`FR7C&)00IF3P%#dSS{T8AAk~m2z<?o)
zTNqF=4-^apf>jvht490FZ~ohk|KFJY+mHLpZsw~+6AJ{bZyo%^Pyghh|L3az=d1k0
zP_1tsf>am$zB>QihyUM>|K5oFzdV9f7XbkPk7OKwYBGj&M3jF<t&>jLw_W$mX5G17
zs*p~OdqstFLw;&Ak7ONxT^bo17&bUHF*7YOFeN%P9%NJ|JvJUME+j88EE^pfeq9=j
zTN%ffA{-kL8yy@N85s=_4zY|O7#SEL9umx)Bfx<n)sQ6gyD4N*7!(#185<cE7Zhz+
z8UM#Bd14wD7!(>D8WtE9QbZQ;xG2<*CH}%G`@<@rejspK8mNUJ`NJvt!z!$ZA$4CH
zoqizq!72X2D*L)A{>CcNqbKscDe=51)1)W;#wv?j8RnxVu!be7eI(bVDCMy!(4Hr#
zdLylaB>cN6|Hmupxh%nyE3}9!zL6{DwJiR}E3I!I|HCTvG8Qxd007=eL_t(|oMT{M
zU|?ioW?^Mx=U`+215Pe(9$r3v0YNSyFjrVaR7_l4Tuf9#5-7kZB`qTh0dn#RiVRFj
z$||aA>Kd9_+B&*=91P6*28Kq)CZ=ZQ7KWBq)(k8*wsv;*4vr2^c6QD#t_*JO9-dy_
zKE8hb0f9lmAq;GxVc`*xQNGbJv2pPUt_<vnzDda`zP`SxY3aU+84MhmzP?%6Ik|cH
z1-`zS96<XEeT#}qO3TVCd<%j0GYCl*`a(cqCD_423Ym!sRSAii3PKPMDRNl5hPY;M
c02MO;0KgM16xL_n2><{907*qoM6N<$g2QhQiU0rr

literal 0
HcmV?d00001

diff --git a/logos/emojis/small_emojis/emoji7.png b/logos/emojis/small_emojis/emoji7.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f899ba60d9c69df94d676db6b97bd0d0aeac9b4
GIT binary patch
literal 833
zcmV-H1HSx;P)<h;3K|Lk000e1NJLTq000jF000jN0{{R33<za-00001b5ch_0olnc
ze*gdg32;bRa{vGf6951U69E94oEQKA0r*f%R7C&)00jd9P%#gYUK+-RC)JZK$cQMF
zVH#944+aDR6AJ``RT<^0NBYWe{@aoN;GO>5ll#nY=dDJGSs51&1+Z}*{KZuN<f8xQ
ztN-Mo{l`|fcOHUN7yQ3G|J{fG-;Vj)jPcZq{M?BB!a<B%7zYFbPcaYWqbdK<TL08&
z*1UPg#lO+h*2KWH<G*9-s4H1F5RhFN`noOu%uD~xPW{VE|IAAN%t`vmO2@;u)YaIa
zqNL;G=gq#A_qi~fW*fzXA^yTE_rf%(ekqh{BgmR3{>LlvzAxe7<*>4|IzK((*ueF@
zFwTr3(~l$l!YRd<CCQg2&z&d5l_l`IDgVbR$h(*B?(*j6>hJIK&bM*>!z<U7BgTXw
z{=zBt!Y|CXdDF<M&9Y<u#wz~9D$k7~l3p46x+(w2D%GAO-=`(!t|scTC+xE)>#`^1
zttZ-~C(@iF{JbfiXd6;959g#Nonst>KpC4yAG}W}x=|>-Pbi;AAcaC1kX9P&sV7`H
z5C#JQhF2H;yD9j>Dz$GUzEV%{U5D&lg}_o#vTG#uzA62_DUV(m2n7Na4Ft4x9{s#2
z{l_Znrf2h!y7G{@?4@bDdmkAO1r`kiiCGxvrYG~GTJeUe@rA4Oq+9B#CssBPms=*o
zRaeSJW5iWhn_ebbIS`TP%;*3B0OCnRK~#90V_;xlU}R!uVP#|I;A8*;E^Z!PK7Ii~
zAz=|PS5!<~0t6(bq=5pAGO}{=AfTYAq^zRKpr)>&2?AQ$I=XuL1`LKq#wMm_<`$M#
z);6|w_6!b=PR=f_ZtfnQURK^dz6^f;0f9lmA)#U65s^{RF$}SBp<oc7keHO5lFE>l
zo{^cAos*lFUr?A)RLoFP8d_FfQCU@8Q(Ko&-@wq=)ZEhA*51+H+11_C+sDArKVjme
z$y26InKr3s`V5eRXU>{EXYRbY^B45afOv>=;iAP$mM&WkRLlSX>MTH8R-=Ky00000
LNkvXXu0mjfqcf7#

literal 0
HcmV?d00001

diff --git a/logos/emojis/small_emojis/emoji8.png b/logos/emojis/small_emojis/emoji8.png
new file mode 100644
index 0000000000000000000000000000000000000000..74c123db89e4a48d558ba20d3e7735bf0102c4f8
GIT binary patch
literal 808
zcmV+@1K0eCP)<h;3K|Lk000e1NJLTq000jF000jN0{{R33<za-00001b5ch_0olnc
ze*gdg32;bRa{vGf6951U69E94oEQKA0o_ncR7C&)01gNPbxIYtdLitmIQq6o?x;Gu
zeIa>G6%h&q0RaFd76+tlAoadl{?>#4;-CNJr~l%i{?~){z*(tsAu1XOAQT44g(CjV
zVgKZ#|K+Cs&t=eyA|)3G3kL(5WgGs+MgQG}|K5oI-G=_iNuz8W4+#TaI}z-vEC0|}
z+_hKl#$5i=VgJ%%+q78!&{^=WENDU!on{;Sye<FBNb0&ow23munK|^sLjTJ{^}|HS
znK`qGGwHfV|I11Jzb>e69Lk6y{=zE%$T0uME#a;yoM$A~r78c%D%z(gn`b27tt$V>
zFaO9f|HCTMk0aBMBl^QCtbHTYq$vK!D%GSY`NJyz#46X7Bfx(l{=q8jw<yYqA%s;I
z__itk$STB*A<2*;)tV&Xq9){}C*q?f*PJBFk|Mx~Ao{r}kX;!;Ck)-2B>%=LuXP`K
zF&UOLB*Hy3zd$s@J~Wy(C3`X%p=KT8pe0H!4gvuHYeW<HwJ67jCdFY@@oAOsX_Llb
zSi^)S{KhK!w<&Z>6axYQ2?YX>S{e7VDDkXl^OnE!mA>(;Ynfph3<m;ZKM~QABkP(`
z@`a}Ig{$nFQq+|rX+shV2Lde{32HwW)>vimTzS`6W^F<lG9C){dJJ0t0087kL_t(|
zoMT{MU|?ioW?^Mx=ip=j0WNMHUOs*SK_OugQ7#}~Ok6@z3IrsjWn>u`<m43;l^{S_
zMOBSKT|-k#TSr${S4Ue<-@uT;$k@cx%-q7#%G$=(&fbB+(aG7x)y>_*)63h(*Uz6J
zz|SKvC^*E!BQz+?BRqm3GRh-5%mW0%qCK2q7-Hk%6B3h>Q&Q8?GvYI|7_xJ6^YRM{
zi;7E1%RI^}7%Ho(LuzX4>gyUBo0?l%85r8yJ3KnOy1RNjs(brD9%$>IFmcl4NmHgy
mo6Z0MGiJ`3J!kGb5EB4n$UH%1e*%#J0000<MNUMnLSTZs9cgO-

literal 0
HcmV?d00001

diff --git a/logos/emojis/small_emojis/flags.png b/logos/emojis/small_emojis/flags.png
new file mode 100644
index 0000000000000000000000000000000000000000..62ce2fa79fd47b9bb174bf685311ade4abb7a6f0
GIT binary patch
literal 138
zcmeAS@N?(olHy`uVBq!ia0vp^Y(UJx$P6SOaL7~xDaPU;cPGZ1Cw1z99L@rd$YLPv
z55kPeU4O3w8EgSQA+A9BzmdJe%P)CA7E?)(UogY}=!r^OfjoXs7srr_ImreI4UTLA
ZoDAFwjDbCiY`TC_44$rjF6*2UngEs*AJqT=

literal 0
HcmV?d00001


From 0edd8b453043e67e8ec5cfa2c01525313d0039dd Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 17 Jul 2023 16:43:30 +0800
Subject: [PATCH 079/133] Add files via upload

---
 logos/emojis/small_emojis/category.png | Bin 137 -> 137 bytes
 logos/emojis/small_emojis/flags.png    | Bin 138 -> 138 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/logos/emojis/small_emojis/category.png b/logos/emojis/small_emojis/category.png
index 62e13c8c72b3a96c93fc32ba720a060b61070a67..5197e5661f620c48c5a3104c8b92e2243c0b3ea0 100644
GIT binary patch
delta 43
ycmeBV>|~rE&c({e%)r2~IV5HFM8zPnV+_38nD(|MN16cz89ZJ6T-G@yGywqY^$Vc@

delta 43
ycmeBV>|~rE&c)8i%)r3#Z_d#P6BUERjx$I<Vg7yb;@Ve0K?YA(KbLh*2~7YgR}RSl

diff --git a/logos/emojis/small_emojis/flags.png b/logos/emojis/small_emojis/flags.png
index 62ce2fa79fd47b9bb174bf685311ade4abb7a6f0..d1f030f22f433ce0de8d7d1c8a7cd50c088140c5 100644
GIT binary patch
delta 70
zcmeBT>|#{x4DfU3<&xrJU|`_&^l%9R(kwvC#>fmL?|oluHc`=6#v`G@fvt^&fhULY
U;WGV#E}#^Hr>mdKI;Vst0PesL2><{9

delta 70
zcmeBT>|#{x4DfU3<&xrJU|`_&^l%9R(riG?!N?3GA8^Q2PgL}kF-T}|WE0?I;8tJ^
U>{(>f1(ag&boFyt=akR{0IK*6lmGw#


From 50538251aa1b43dbd0fb509e6bd820eedc8eae7e Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 17 Jul 2023 16:45:22 +0800
Subject: [PATCH 080/133] jokes professional

---
 stockTicker.py | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 99 insertions(+)

diff --git a/stockTicker.py b/stockTicker.py
index 589d258..f4825e9 100755
--- a/stockTicker.py
+++ b/stockTicker.py
@@ -6184,6 +6184,105 @@ class StockTicker():
 
         return self.stitchImage(image_list)
     
+
+    def getJokesProfessional(self):
+    
+        f = open('csv/jokes_settings.json', 'r')
+        jokes_settings = json.load(f)
+        f.close()
+        
+        if jokes_settings['title']:
+            title_img = self.openImage('feature_titles/small_feature_titles/jokes.png')
+            image_list = [title_img]
+        else:
+            image_list = []
+
+        font = ImageFont.load("./fonts/6x10.pil")
+        small_font = ImageFont.load("./fonts/4x6.pil")
+
+        colours = { 'White':(255,255,255),
+                    'Red':(255,0,0),
+                    'Green':(0,255,0),
+                    'Dark Green':(0,100,0),
+                    'Blue':(0,0,255),
+                    'Purple':(145,0,255),
+                    'Pink':(255,0,255),
+                    'Yellow':(255,255,0),
+                    'Orange':(255,130,0),
+                    'Gold':(255,190,0),
+                    'Cyan':(0,255,255)}
+
+        if len(jokes_settings['jokes']) > 0:
+            try:
+                for joke in jokes_settings['jokes']:
+                    random_color = random.choice(list(colours.keys()))
+                    r,g,b = colours[random_color]
+                    random_number = str(random.randint(1, 8)) + '.png'
+                    emoji = self.openImage('logos/emojis/small_emojis/emoji' + random_number)
+                    category_icon = self.openImage('logos/emojis/small_emojis/category.png')
+                    category = self.textImage(joke['category'], small_font, r=255, g=255,b=255)
+                    if joke['safe']:
+                        safe = self.textImage('Safe', small_font, r=255, g=255, b=0)
+                    else:
+                        safe = self.textImage('Unsafe', small_font, r=255, g=0, b=0)
+                    if joke['type'] == 'twopart':
+                        joke1 = self.textImage(joke['setup'].replace('\n', ' '), font, int(r),int(g),int(b))
+                        random_color = random.choice(list(colours.keys()))
+                        r,g,b = colours[random_color]
+                        joke2 = self.textImage(joke['delivery'].replace('\n', ' '), font, int(r), int(g), int(b))
+                    else:
+                        joke1 = self.textImage(joke['joke'].replace('\n', ' '), font, int(r), int(g), int(b))
+                        joke2 = None
+                    try:
+                        true_flags = [key for key, value in joke['flags'].items() if value]
+                        flags = ", ".join(true_flags)
+                        flags_final = self.textImage(flags, small_font, r=255, g=145, b=0)
+                    except:
+                        flags_final = None
+                        pass
+                    if flags_final != None:
+                        flags_icon = self.openImage('logos/emojis/small_emojis/flags.png')
+                    else:
+                        flags_icon = None
+                    x_offset = 10
+                    if joke2 != None:
+                        try:
+                            img = Image.new('RGB', (20 + emoji.size[0] + 5 + max(joke1.size[0], category_icon.size[0] + 2 + category.size[0] + 5 + safe.size[0] + 5 + flags_icon.size[0] + 2 + flags_final.size[0] + 5) + joke2.size[0], 16))
+                        except:
+                            img = Image.new('RGB', (20 + emoji.size[0] + 5 + max(joke1.size[0], category_icon.size[0] + 2 + category.size[0] + 5 + safe.size[0] + 5) + joke2.size[0], 16))
+                    else:
+                        try:
+                            img = Image.new('RGB', (20 + emoji.size[0] + 5 + max(joke1.size[0], category_icon.size[0] + 2 + category.size[0] + 5 + safe.size[0] + 5 + flags_icon.size[0] + 2 + flags_final.size[0] + 5), 16))
+                        except:
+                            img = Image.new('RGB', (20 + emoji.size[0] + 5 + max(joke1.size[0], category_icon.size[0] + 2 + category.size[0] + 5 + safe.size[0] + 5), 16))
+                    img.paste(emoji, (x_offset, 0))
+                    x_offset += emoji.size[0] + 5
+                    x_offset2 = x_offset
+                    img.paste(joke1, (x_offset, 0))
+                    x_offset += joke1.size[0]
+                    img.paste(category_icon, (x_offset2, 10))
+                    x_offset2 += category_icon.size[0] + 2
+                    img.paste(category, (x_offset2, 10))
+                    x_offset2 += category.size[0] + 5
+                    img.paste(safe, (x_offset2, 10))
+                    x_offset2 += safe.size[0] + 5
+                    try:
+                        img.paste(flags_icon, (x_offset2, 10))
+                        x_offset2 += flags_icon.size[0] + 2
+                        img.paste(flags_final, (x_offset2, 10))
+                        x_offset2 += flags_final.size[0] + 5
+                    except:
+                        pass
+                    try:
+                        img.paste(joke2, (max(x_offset, x_offset2), 6))
+                    except:
+                        pass
+                    image_list.append(img)
+            except:
+                pass
+
+        return self.stitchImage(image_list)
+
     
     def ip_viewer(self):
 

From d20890c0851b499bc39a1c252e8919cb8cca7870 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 17 Jul 2023 18:15:09 +0800
Subject: [PATCH 081/133] features to display save prompt

---
 templates/index.html | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/templates/index.html b/templates/index.html
index a5014f0..4173c71 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -176,7 +176,15 @@
 
     <div id="wifi-message" style="display:none"><p id="wifi-p">Joining Wi-Fi, please restart the ticker.</p></div>
       
-     
+
+<!-- SAVE PROMPT MESSAGE -->
+    <div id="save-prompt-message" style="display:none">
+      <button id="save-prompt-close-btn" onclick="closeSavePrompt()">Close</button>
+      <p id="save-prompt-p">Features to Display - Changes detected.</p>
+      <button class="btn set-btn" id="save-prompt-btn" onclick="savePrompt()">Save</button>
+    </div>
+    <div id="saved-msg-feedback" style="display:none">Features to Display -<br> Saved!</div>
+      
 
       <!-- Ticker Form -->
 

From 3396f5a7bdcb21e1d60e3f8eecd2da92c15fc076 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 17 Jul 2023 18:15:46 +0800
Subject: [PATCH 082/133] features to display prompt styling

---
 static/style.css | 66 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/static/style.css b/static/style.css
index eb361f5..8d66d93 100755
--- a/static/style.css
+++ b/static/style.css
@@ -1307,3 +1307,69 @@ input[type=checkbox]:hover {
   margin-bottom:2%;
 }
 
+
+#save-prompt-message {
+  width: 160px;
+  height: 150px;
+  border-radius: 20px;
+  background-color: rgba(5,5,5,0.5);
+  backdrop-filter: blur(6px);
+  border-color: #5D5D5D;
+  border-style: solid;
+  border-width: thin;
+  position: fixed;
+  top: 35%;
+  right: 20px;
+  transform: translateY(-50%);
+  z-index: 99;
+}
+#save-prompt-p {
+  margin: 35px 10px 15px 10px;
+  font-size: 14px;
+  text-align: center;
+  display: flex;
+  color: red;
+  justify-content: center;
+  align-items: center;
+}
+
+#save-prompt-btn {
+  display: block;
+  margin: 0 auto;
+  font-size: 16px;
+}
+#save-prompt-close-btn {
+  background-color: transparent;
+  border: none;
+  color: white;
+  font-size: 16px;
+  text-decoration: underline;
+  position: absolute;
+  top: 0;
+  right: 15px;
+
+}
+#save-prompt-close-btn:hover {
+  background-color: transparent;
+  border: none;
+  color: darkgray;
+  text-decoration: underline;
+}
+#save-prompt-close-btn:active {
+  background-color: transparent;
+  border: none;
+  color: #4B4B4B;
+  text-decoration: underline;
+}
+#saved-msg-feedback{
+  color: red;
+  font-size: 16px;
+  position: fixed;
+  top: 35%;
+  right: 20px;
+  transform: translateY(-50%);
+  z-index: 99;
+  text-align: center;
+}
+
+

From 3580432cd23a8a8e4d732484924c9f00276f6c86 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 17 Jul 2023 18:18:07 +0800
Subject: [PATCH 083/133] backend stuff for features to display save prompt

---
 static/app.js | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/static/app.js b/static/app.js
index 2721555..a259f71 100755
--- a/static/app.js
+++ b/static/app.js
@@ -339,6 +339,7 @@ const addEventonBtns = () => {
         availableFeatures = document.querySelectorAll("#available-features li");
         displayToFormat = document.querySelectorAll("#display-format li");
         addEventOnList();
+        displaySavePrompt();
       }
     }
   });
@@ -353,6 +354,7 @@ const addEventonBtns = () => {
         availableFeatures = document.querySelectorAll("#available-features li");
         displayToFormat = document.querySelectorAll("#display-format li");
         addEventOnList();
+        displaySavePrompt();
       }
     }
   });
@@ -369,6 +371,7 @@ const addEventonBtns = () => {
         );
         displayToFormat2 = document.querySelectorAll("#display-format-2 li");
         addEventOnList();
+        displaySavePrompt();
       }
     }
   });
@@ -385,6 +388,7 @@ const addEventonBtns = () => {
         );
         displayToFormat2 = document.querySelectorAll("#display-format-2 li");
         addEventOnList();
+        displaySavePrompt();
       }
     }
   });
@@ -483,6 +487,7 @@ displayincreaseBtn.addEventListener("click", () => {
       prevElement.innerText = currentText;
       prevElement.setAttribute("class", "active");
       displayItem.setAttribute("class", "");
+      displaySavePrompt();
     }
   }
 });
@@ -500,6 +505,7 @@ displayincreaseBtn2.addEventListener("click", () => {
       prevElement.innerText = currentText;
       prevElement.setAttribute("class", "active");
       displayItem.setAttribute("class", "");
+      displaySavePrompt();
     }
   }
 });
@@ -517,6 +523,7 @@ displayDecreaseBtn.addEventListener("click", () => {
       nextElement.innerText = currentText;
       nextElement.setAttribute("class", "active");
       displayItem.setAttribute("class", "");
+      displaySavePrompt();
       break;
     }
   }
@@ -534,6 +541,7 @@ displayDecreaseBtn2.addEventListener("click", () => {
       nextElement.innerText = currentText;
       nextElement.setAttribute("class", "active");
       displayItem.setAttribute("class", "");
+      displaySavePrompt();
       break;
     }
   }
@@ -3149,3 +3157,30 @@ function updateCryptoPorftolio() {
     }, 5000);
   }
 }
+
+
+
+// SAVE FEATURES TO DISPLAY PROMPT FUNCTIONS
+function displaySavePrompt() {
+  document.getElementById('save-prompt-message').style.display = "block";
+}
+
+function closeSavePrompt() {
+  document.getElementById('save-prompt-message').style.display = "none";
+}
+
+function savePrompt() {
+  saveSettings();
+  document.getElementById('save-prompt-message').style.display = "none";
+  setTimeout(
+      function() {
+        document.getElementById('saved-msg-feedback').style.display = "block";
+      }, 100);
+  setTimeout(
+      function() {
+        document.getElementById('saved-msg-feedback').style.display = "none";
+      }, 3000);
+}
+
+
+

From 225ba94d69bbad71b388baba2186f004a290e3e7 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 17 Jul 2023 18:45:07 +0800
Subject: [PATCH 084/133] auto start stop display after features to display
 save prompt

---
 static/app.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/static/app.js b/static/app.js
index a259f71..20f63bd 100755
--- a/static/app.js
+++ b/static/app.js
@@ -3175,10 +3175,16 @@ function savePrompt() {
   setTimeout(
       function() {
         document.getElementById('saved-msg-feedback').style.display = "block";
+        fetch("/stop", {
+          method: "GET",
+        });
       }, 100);
   setTimeout(
       function() {
         document.getElementById('saved-msg-feedback').style.display = "none";
+        fetch("/start", {
+          method: "PUT",
+        });
       }, 3000);
 }
 

From 15aff9507ab6a91ad761256cde25436ff472fcc2 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 17 Jul 2023 19:10:00 +0800
Subject: [PATCH 085/133] start stop display after features to display save
 prompt

---
 server.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/server.py b/server.py
index 95058c6..9f44295 100755
--- a/server.py
+++ b/server.py
@@ -1697,6 +1697,12 @@ def updateSelectedMsg():
     return index()
 
 
+@app.route("/savePromptStartStop", methods=["PUT", "POST"])
+def savePromptStartStop():
+    stop()
+    time.sleep(0.1)
+    start()
+    return index()
 
 
 if __name__ == "__main__":

From ecbc4b26733e6564f5c8375fd3e2229ffa81d26c Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 17 Jul 2023 19:10:43 +0800
Subject: [PATCH 086/133] backend instead of frontend start stop

---
 static/app.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/static/app.js b/static/app.js
index 20f63bd..f8e7ed5 100755
--- a/static/app.js
+++ b/static/app.js
@@ -3175,16 +3175,13 @@ function savePrompt() {
   setTimeout(
       function() {
         document.getElementById('saved-msg-feedback').style.display = "block";
-        fetch("/stop", {
-          method: "GET",
+        fetch("/savePromptStartStop", {
+          method: "PUT",
         });
       }, 100);
   setTimeout(
       function() {
         document.getElementById('saved-msg-feedback').style.display = "none";
-        fetch("/start", {
-          method: "PUT",
-        });
       }, 3000);
 }
 

From 11e5970955b1802d3c855485a89bededfe8a9976 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 17 Jul 2023 20:00:46 +0800
Subject: [PATCH 087/133] decode special characters in jokes

---
 stockTicker.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/stockTicker.py b/stockTicker.py
index f4825e9..fe530a9 100755
--- a/stockTicker.py
+++ b/stockTicker.py
@@ -6127,11 +6127,17 @@ class StockTicker():
                     else:
                         safe = self.textImage('Unsafe', small_font, r=255, g=0, b=0)
                     if joke['type'] == 'twopart':
+                        decoded = joke['setup'].encode("ascii","ignore")
+                        joke['setup'] = decoded.decode()
                         joke1 = self.textImage(joke['setup'].replace('\n', ' '), font, int(r),int(g),int(b))
                         random_color = random.choice(list(colours.keys()))
                         r,g,b = colours[random_color]
+                        decoded = joke['delivery'].encode("ascii","ignore")
+                        joke['delivery'] = decoded.decode()
                         joke2 = self.textImage(joke['delivery'].replace('\n', ' '), font, int(r), int(g), int(b))
                     else:
+                        decoded = joke['joke'].encode("ascii","ignore")
+                        joke['joke'] = decoded.decode()
                         joke1 = self.textImage(joke['joke'].replace('\n', ' '), font, int(r), int(g), int(b))
                         joke2 = None
                     try:

From a52a9e56e082361acc1650190a8d0b48b328b6fc Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 18 Jul 2023 15:47:33 +0800
Subject: [PATCH 088/133] better UI feedback for prompt msg

---
 static/app.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/static/app.js b/static/app.js
index f8e7ed5..d2f1076 100755
--- a/static/app.js
+++ b/static/app.js
@@ -3161,10 +3161,30 @@ function updateCryptoPorftolio() {
 
 
 // SAVE FEATURES TO DISPLAY PROMPT FUNCTIONS
+var savePromptTimeout;
+var isSavePromptRunning = false;
 function displaySavePrompt() {
+  // Check if the function is already running
+  if (isSavePromptRunning) {
+    return;
+  }
+  isSavePromptRunning = true;
   document.getElementById('save-prompt-message').style.display = "block";
+  var savePrompt = document.getElementById('save-prompt-p');  
+  // Store the original color
+  var originalColor = savePrompt.style.color;
+  // Set the new color for the transition effect
+  savePrompt.style.color = "yellow";
+  // Clear any existing timeout
+  clearTimeout(savePromptTimeout);
+  // Add a delay before reverting back to the original color
+  savePromptTimeout = setTimeout(function() {
+    savePrompt.style.color = originalColor;
+    isSavePromptRunning = false;
+  },300); // 0.3 seconds
 }
 
+
 function closeSavePrompt() {
   document.getElementById('save-prompt-message').style.display = "none";
 }

From 474881c2f1a26d57ccffb011f71fc19e67940033 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 18 Jul 2023 16:11:12 +0800
Subject: [PATCH 089/133] Update style.css

---
 static/style.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/style.css b/static/style.css
index 8d66d93..d87a59c 100755
--- a/static/style.css
+++ b/static/style.css
@@ -1331,6 +1331,7 @@ input[type=checkbox]:hover {
   color: red;
   justify-content: center;
   align-items: center;
+  transition: color 0.3s;
 }
 
 #save-prompt-btn {

From 312489e94e19ed450ad0da6bcf6171fe31cde29c Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 18 Jul 2023 16:50:44 +0800
Subject: [PATCH 090/133] fixed bug where wrong weekday is showing for prof
 weather

---
 stockTicker.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/stockTicker.py b/stockTicker.py
index fe530a9..b46bd58 100755
--- a/stockTicker.py
+++ b/stockTicker.py
@@ -5057,13 +5057,6 @@ class StockTicker():
         f.close()
         locations = list(daily_weathers['locations'].keys())
 
-        weekdays = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
-        months =['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
-        month = months[int(datetime.now().strftime('%m'))-1]
-        date = str(int(datetime.now().strftime('%d')))
-        
-        weekday = weekdays[datetime.today().weekday()]
-        
         for i, location in enumerate(locations):
             
             try:
@@ -5093,7 +5086,12 @@ class StockTicker():
                 
                 img.paste(location_img, (5,3)) 
                 x_offset = location_img.size[0] + 8
-                
+
+                weekdays = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+                months =['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
+                month = months[int(datetime.now().strftime('%m'))-1]
+                date = str(int(datetime.now().strftime('%d')))
+                weekday = weekdays[datetime.today().weekday()]
             
                 date_img = self.textImage((month + ' ' + date + ',' + weekday).upper(), font)
                 

From 30925a505d47fa8aa24afd639f88b2ff3a9bd3c0 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 18 Jul 2023 16:55:34 +0800
Subject: [PATCH 091/133] display prompt after changing display styles

---
 static/app.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/static/app.js b/static/app.js
index d2f1076..6d006ab 100755
--- a/static/app.js
+++ b/static/app.js
@@ -1790,6 +1790,7 @@ displayFormatBtn.addEventListener("click", () => {
     topRowText.style.display = "inline";
     bottomRowText.style.display = "inline";
     secondRow.style.display = "flex";
+    displaySavePrompt();
     inputScrollSpeedRow.forEach((value) => {
       value.parentElement.parentElement.style.display = "flex";
     });
@@ -1797,6 +1798,7 @@ displayFormatBtn.addEventListener("click", () => {
     topRowText.style.display = "none";
     bottomRowText.style.display = "none";
     secondRow.style.display = "none";
+    displaySavePrompt();
     inputScrollSpeedRow.forEach((value) => {
       value.parentElement.parentElement.style.display = "none";
     });

From 1b4e5f930daa747a3d6fe3148bdd1914fd9f6951 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 18 Jul 2023 17:39:23 +0800
Subject: [PATCH 092/133] feature settings prompt

---
 templates/index.html | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/templates/index.html b/templates/index.html
index 4173c71..fbb029e 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -185,7 +185,15 @@
     </div>
     <div id="saved-msg-feedback" style="display:none">Features to Display -<br> Saved!</div>
       
+<!-- SAVE FEATURE SETTINGS PROMPT MESSAGE -->
+    <div id="save-feature-prompt-message" style="display:none">
+      <button id="save-feature-prompt-close-btn" onclick="closeFeatureSavePrompt()">Close</button>
+      <p id="save-feature-prompt-p">Feature Settings - Changes detected.</p>
+      <button class="btn set-btn" id="save-feature-prompt-btn" onclick="featureSavePrompt()">Save</button>
+    </div>
+    <div id="saved-feature-msg-feedback" style="display:none">Feature Settings -<br> Saved!</div>
 
+      
       <!-- Ticker Form -->
 
       <!-- First Row -->

From 44d516012dddcb19dac9e96363a8fe3dd7ad2d9d Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 18 Jul 2023 17:41:44 +0800
Subject: [PATCH 093/133] styling for feature save prompt

---
 static/style.css | 63 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/static/style.css b/static/style.css
index d87a59c..8a1e589 100755
--- a/static/style.css
+++ b/static/style.css
@@ -1374,3 +1374,66 @@ input[type=checkbox]:hover {
 }
 
 
+#save-feature-prompt-message {
+  width: 160px;
+  height: 150px;
+  border-radius: 20px;
+  background-color: rgba(5,5,5,0.5);
+  backdrop-filter: blur(6px);
+  border-color: #5D5D5D;
+  border-style: solid;
+  border-width: thin;
+  position: fixed;
+  top: 65%;
+  right: 20px;
+  transform: translateY(-50%);
+  z-index: 99;
+}
+#save-feature-prompt-p {
+  margin: 35px 10px 15px 10px;
+  font-size: 14px;
+  text-align: center;
+  display: flex;
+  color: cyan;
+  justify-content: center;
+  align-items: center;
+  transition: color 0.3s;
+}
+#save-feature-prompt-btn {
+  display: block;
+  margin: 0 auto;
+  font-size: 16px;
+}
+#save-feature-prompt-close-btn {
+  background-color: transparent;
+  border: none;
+  color: white;
+  font-size: 16px;
+  text-decoration: underline;
+  position: absolute;
+  top: 0;
+  right: 15px;
+}
+#save-feature-prompt-close-btn:hover {
+  background-color: transparent;
+  border: none;
+  color: darkgray;
+  text-decoration: underline;
+}
+#save-feature-prompt-close-btn:active {
+  background-color: transparent;
+  border: none;
+  color: #4B4B4B;
+  text-decoration: underline;
+}
+#saved-feature-msg-feedback {
+  color: cyan;
+  font-size: 16px;
+  position: fixed;
+  top: 65%;
+  right: 20px;
+  transform: translateY(-50%);
+  z-index: 99;
+  text-align: center;
+}
+

From f1c37fa6defc185343d787ee00cd23116b32ee39 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 18 Jul 2023 17:46:50 +0800
Subject: [PATCH 094/133] display feature settings prompt

---
 static/app.js | 47 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 45 insertions(+), 2 deletions(-)

diff --git a/static/app.js b/static/app.js
index 6d006ab..3f8302e 100755
--- a/static/app.js
+++ b/static/app.js
@@ -562,6 +562,7 @@ allFeaturesRemoveBtns.map((value, index) => {
             method: "POST",
             body: JSON.stringify(symbol),
           });  
+          displaySavePrompt2();
       }
       else if ((item.getAttribute("class") == "active") && (index == 1 )){
           let symbol = item.innerText;
@@ -571,12 +572,14 @@ allFeaturesRemoveBtns.map((value, index) => {
           fetch("/deletePortfolioCryptoSettings", {
             method: "POST",
             body: JSON.stringify(symbol),
-          });  
+          });
+          displaySavePrompt2();
       }
       else if (item.getAttribute("class") == "active") {
           item.remove();
           uploaded_images = [];
           uploaded_GIFs = [];
+          displaySavePrompt2();
       }
     }
   });
@@ -595,6 +598,7 @@ allFeaturesIncreaseBtns.map((value, index) => {
         prevElement.innerText = currentText;
         prevElement.setAttribute("class", "active");
         item.setAttribute("class", "");
+        displaySavePrompt2();
       }
     }
   });
@@ -614,6 +618,7 @@ allFeaturesDecreaseBtns.map((value, index) => {
         nextElement.innerText = currentText;
         nextElement.setAttribute("class", "active");
         item.setAttribute("class", "");
+        displaySavePrompt2();
         break;
       }
     }
@@ -3186,7 +3191,6 @@ function displaySavePrompt() {
   },300); // 0.3 seconds
 }
 
-
 function closeSavePrompt() {
   document.getElementById('save-prompt-message').style.display = "none";
 }
@@ -3208,4 +3212,43 @@ function savePrompt() {
 }
 
 
+// SAVE FEATURE SETTINGS PROMPT FUNCTIONS
+var savePromptTimeout2;
+var isSavePromptRunning2 = false;
+function displaySavePrompt2() {
+  // Check if the function is already running
+  if (isSavePromptRunning2) {
+    return;
+  }
+  isSavePromptRunning2 = true;
+  document.getElementById('save-feature-prompt-message').style.display = "block";
+  var savePrompt2 = document.getElementById('save-feature-prompt-p');  
+  // Store the original color
+  var originalColor2 = savePrompt2.style.color;
+  // Set the new color for the transition effect
+  savePrompt2.style.color = "lightgreen";
+  // Clear any existing timeout
+  clearTimeout(savePromptTimeout2);
+  // Add a delay before reverting back to the original color
+  savePromptTimeout2 = setTimeout(function() {
+    savePrompt2.style.color = originalColor2;
+    isSavePromptRunning2 = false;
+  },300); // 0.3 seconds
+}
+
+function closeFeatureSavePrompt() {
+  document.getElementById('save-feature-prompt-message').style.display = "none";
+}
+
+function featureSavePrompt() {
+  document.getElementById('save-feature-prompt-message').style.display = "none";
+  setTimeout(
+      function() {
+        document.getElementById('saved-feature-msg-feedback').style.display = "block";
+      }, 100);
+  setTimeout(
+      function() {
+        document.getElementById('saved-feature-msg-feedback').style.display = "none";
+      }, 3000);
+}
 

From 781383098bb3adb50e839dbb4ac01e52a4cb69aa Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 18 Jul 2023 17:57:13 +0800
Subject: [PATCH 095/133] changed some coloring

---
 static/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/app.js b/static/app.js
index 3f8302e..6ca3019 100755
--- a/static/app.js
+++ b/static/app.js
@@ -3226,7 +3226,7 @@ function displaySavePrompt2() {
   // Store the original color
   var originalColor2 = savePrompt2.style.color;
   // Set the new color for the transition effect
-  savePrompt2.style.color = "lightgreen";
+  savePrompt2.style.color = "yellow";
   // Clear any existing timeout
   clearTimeout(savePromptTimeout2);
   // Add a delay before reverting back to the original color

From a6d0f3f102e8ba5ec741854fc84dea17de2b3302 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 18 Jul 2023 18:26:52 +0800
Subject: [PATCH 096/133] display prompt added to add buttons clicked

---
 static/app.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/static/app.js b/static/app.js
index 6ca3019..e2b5fce 100755
--- a/static/app.js
+++ b/static/app.js
@@ -738,6 +738,7 @@ allFeaturesSelectAddBtn.map((value, index) => {
       allFeatures[index].appendChild(tag);
       changeVarValue();
       addEventOnFeaturesList();
+      displaySavePrompt2();
     });
   }
 });
@@ -975,6 +976,7 @@ allFeaturesTextAddBtn.map((value, index) => {
             allFeatures[index].appendChild(tag);
             changeVarValue();
             addEventOnFeaturesList();
+            displaySavePrompt2();
             createLi = false;
         }
     }
@@ -1630,6 +1632,7 @@ allFeaturesFileAddBtn.map((value, index) => {
       imagesFile.value = "";
       changeVarValue();
       addEventOnFeaturesList();
+      displaySavePrompt2();
     });
   }
 });

From 8f15e8201ced7d27a650442c53fac86cc5d59da4 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 18 Jul 2023 18:56:44 +0800
Subject: [PATCH 097/133] Update app.js

---
 static/app.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/app.js b/static/app.js
index e2b5fce..955f5f2 100755
--- a/static/app.js
+++ b/static/app.js
@@ -949,6 +949,7 @@ allFeaturesTextAddBtn.map((value, index) => {
             allFeatures[index].appendChild(tag);
             changeVarValue();
             addEventOnFeaturesList();
+            displaySavePrompt2();
             createLi = false;
         }}
       } else {

From 0891f85e9412e5df886e7e44518e0ad6ae418114 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 18 Jul 2023 19:50:57 +0800
Subject: [PATCH 098/133] select menus and checkboxes prompts

---
 static/app.js | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/static/app.js b/static/app.js
index 955f5f2..4d686a0 100755
--- a/static/app.js
+++ b/static/app.js
@@ -3256,3 +3256,32 @@ function featureSavePrompt() {
       }, 3000);
 }
 
+
+
+const pageIDs = ['Page1', 'Page2', 'Page3', 'Page4', 'Page5', 'Page6', 'Page7', 'Page8', 'Page9', 'Page10', 'Page11', 'Page12', 'Page13',
+  'Page14', 'Page15', 'Page16', 'Page17', 'Page18', 'Page19'];
+
+for (const pageID of pageIDs) {
+  // Select the parent div
+  const parentDiv = document.getElementById(pageID);
+  // Add event listeners to select menus
+  const excludedIds = ['base-select', 'quote-select', 'commodities-items', 'indices-items', 'inputTransition73', 
+    'inputTransition83', 'inputTransition93', 'inputTransition103', 'inputTransition2222', 'jokes-categories'];
+ 
+  const selectMenus = parentDiv.querySelectorAll('select');
+  selectMenus.forEach(selectMenu => {
+    const id = selectMenu.id;
+    if (!excludedIds.includes(id)) {
+      selectMenu.addEventListener('change', function(event) {
+        displaySavePrompt2();
+      });
+    }
+  });
+  // Add event listeners to input checkboxes
+  const inputForms = parentDiv.querySelectorAll('input[type="checkbox"]');
+  inputForms.forEach(inputForm => {
+    inputForm.addEventListener('input', function(event) {
+      displaySavePrompt2();
+    });
+  }); 
+}

From 53655e84a4a26f7b7b0cba8b7c3599b6b45acac5 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Tue, 18 Jul 2023 23:28:39 +0800
Subject: [PATCH 099/133] added save settings function to featuresave prompt

---
 static/app.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/app.js b/static/app.js
index 4d686a0..3cea7e8 100755
--- a/static/app.js
+++ b/static/app.js
@@ -3245,6 +3245,7 @@ function closeFeatureSavePrompt() {
 }
 
 function featureSavePrompt() {
+  saveSettings();
   document.getElementById('save-feature-prompt-message').style.display = "none";
   setTimeout(
       function() {

From 0163d2002ef3d643bebbf872a87d9c2416f41b2c Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 19 Jul 2023 00:54:06 +0800
Subject: [PATCH 100/133] dropdown menu click disappear prompt msg / update
 text content of prompt msg

---
 static/app.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/static/app.js b/static/app.js
index 3cea7e8..e59ff9d 100755
--- a/static/app.js
+++ b/static/app.js
@@ -3286,3 +3286,19 @@ for (const pageID of pageIDs) {
     });
   }); 
 }
+
+
+
+// for drop down menu, change feature settings prompt text
+
+var selectMenu = document.getElementById("drop");
+var pElement = document.getElementById("save-feature-prompt-p");
+var pElement2 = document.getElementById("saved-feature-msg-feedback");
+// Add an event listener for the "change" event
+selectMenu.addEventListener("change", function() {
+  document.getElementById('save-feature-prompt-message').style.display = "none";
+  var selectedOption = selectMenu.selectedOptions[0];
+  var selectedValue = selectedOption.textContent;
+  pElement.textContent = selectedValue + " Settings - Changes detected.";
+  pElement2.innerHTML = selectedValue + " Settings -" + "<br>" + " Saved!";
+});

From dd94161c928bb8557939d0503ac472e3b06803f9 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 19 Jul 2023 00:55:35 +0800
Subject: [PATCH 101/133] default msg says stocks since stocks is first on
 every page load

---
 templates/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index fbb029e..a98d137 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -188,10 +188,10 @@
 <!-- SAVE FEATURE SETTINGS PROMPT MESSAGE -->
     <div id="save-feature-prompt-message" style="display:none">
       <button id="save-feature-prompt-close-btn" onclick="closeFeatureSavePrompt()">Close</button>
-      <p id="save-feature-prompt-p">Feature Settings - Changes detected.</p>
+      <p id="save-feature-prompt-p">Stocks Settings - Changes detected.</p>
       <button class="btn set-btn" id="save-feature-prompt-btn" onclick="featureSavePrompt()">Save</button>
     </div>
-    <div id="saved-feature-msg-feedback" style="display:none">Feature Settings -<br> Saved!</div>
+    <div id="saved-feature-msg-feedback" style="display:none">Stocks Settings -<br> Saved!</div>
 
       
       <!-- Ticker Form -->

From e32a3adc1d376aba053563327ba17104b2c79914 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 19 Jul 2023 01:17:34 +0800
Subject: [PATCH 102/133] increased height of save feature prompt div

---
 static/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/style.css b/static/style.css
index 8a1e589..ff5939c 100755
--- a/static/style.css
+++ b/static/style.css
@@ -1376,7 +1376,7 @@ input[type=checkbox]:hover {
 
 #save-feature-prompt-message {
   width: 160px;
-  height: 150px;
+  height: 170px;
   border-radius: 20px;
   background-color: rgba(5,5,5,0.5);
   backdrop-filter: blur(6px);

From 3a6d613fd9ec3fa48ccf58eaeb7ddb42db98d5f1 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 19 Jul 2023 12:52:46 +0800
Subject: [PATCH 103/133] added golf ranking select menu to exclude from prompt

---
 static/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/app.js b/static/app.js
index e59ff9d..1ccd803 100755
--- a/static/app.js
+++ b/static/app.js
@@ -3267,7 +3267,7 @@ for (const pageID of pageIDs) {
   const parentDiv = document.getElementById(pageID);
   // Add event listeners to select menus
   const excludedIds = ['base-select', 'quote-select', 'commodities-items', 'indices-items', 'inputTransition73', 
-    'inputTransition83', 'inputTransition93', 'inputTransition103', 'inputTransition2222', 'jokes-categories'];
+    'inputTransition83', 'inputTransition93', 'inputTransition103', 'inputTransition2222', 'jokes-categories', 'golf-ranking-number'];
  
   const selectMenus = parentDiv.querySelectorAll('select');
   selectMenus.forEach(selectMenu => {

From 2c94bf839ee6a5e339dd9b50f44b5c5d1c9b4cb0 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 19 Jul 2023 13:15:06 +0800
Subject: [PATCH 104/133] exclude custom message select menus

---
 static/app.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/static/app.js b/static/app.js
index 1ccd803..a138920 100755
--- a/static/app.js
+++ b/static/app.js
@@ -3267,7 +3267,8 @@ for (const pageID of pageIDs) {
   const parentDiv = document.getElementById(pageID);
   // Add event listeners to select menus
   const excludedIds = ['base-select', 'quote-select', 'commodities-items', 'indices-items', 'inputTransition73', 
-    'inputTransition83', 'inputTransition93', 'inputTransition103', 'inputTransition2222', 'jokes-categories', 'golf-ranking-number'];
+    'inputTransition83', 'inputTransition93', 'inputTransition103', 'inputTransition2222', 'jokes-categories', 'golf-ranking-number', 
+    'inputScrollSpeed16', 'inputScrollSpeed17', 'inputScrollSpeed19'];
  
   const selectMenus = parentDiv.querySelectorAll('select');
   selectMenus.forEach(selectMenu => {

From ccd1e6e4e1cd7e80597cb0aed4842363d8eb347d Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 19 Jul 2023 14:50:59 +0800
Subject: [PATCH 105/133] added restarting display text

---
 templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/index.html b/templates/index.html
index a98d137..7186ba4 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -183,7 +183,7 @@
       <p id="save-prompt-p">Features to Display - Changes detected.</p>
       <button class="btn set-btn" id="save-prompt-btn" onclick="savePrompt()">Save</button>
     </div>
-    <div id="saved-msg-feedback" style="display:none">Features to Display -<br> Saved!</div>
+    <div id="saved-msg-feedback" style="display:none">Features to Display -<br> Saved!<br>Restarting display.</div>
       
 <!-- SAVE FEATURE SETTINGS PROMPT MESSAGE -->
     <div id="save-feature-prompt-message" style="display:none">

From 43f157f6293eed2a7299a0de6c42cb80707113d3 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 19 Jul 2023 15:35:54 +0800
Subject: [PATCH 106/133] cleaning up wifi web panel ui a bit

---
 templates/index.html | 46 +++++++-------------------------------------
 1 file changed, 7 insertions(+), 39 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index 7186ba4..6b40520 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -8569,31 +8569,21 @@
               <div class="col-auto">
 
                 <label
-
                   for="wifi-ssid-inputZ"
-
-                  class="col-form-label text-right w-115-px"
-
+                  class="col-form-label text-left w-115-px"
                   >Wi-Fi SSID:
-
                 </label>
 
               </div>
 
-              <div class="col-auto">
+              <div class="col-auto" style="margin-top: 0;">
 
                 <input
-
                   type="text"
-
                   id="wifi-ssid-input"
-
                   class="form-control"
-                       
                   placeholder="Wi-Fi SSID"
-
                   aria-describedby="TextHelpInline"
-
                   value="{{ wifi_SSID }}"   
                     
                 />
@@ -8607,33 +8597,22 @@
               <div class="col-auto">
 
                 <label
-
                   for="wi-fi-pass-input"
-
-                  class="col-form-label text-right w-115-px"
-
+                  class="col-form-label text-left w-115-px"
                   >Wi-Fi password:
-
                 </label>
 
               </div>
 
-              <div class="col-auto">
+              <div class="col-auto" style="margin-top: 0;">
 
                 <input
-
                   type="password"
-
                   id="wifi-pass-input"
-                       
                   placeholder="Wi-Fi password"
-
                   class="form-control"
-
                   aria-describedby="TextHelpInline"
-                       
                   value="{{ wifi_PSK }}"
-
                 />
 
               </div>
@@ -8647,33 +8626,22 @@
               <div class="col-auto">
 
                 <label
-
                   for="country-code-inputZ"
-
-                  class="col-form-label text-right w-115-px"
-
-                  >Two Letter Country Code:
-
+                  class="col-form-label text-left w-120-px"
+                  >2 Letter Country Code:
                 </label>
 
               </div>
 
-              <div class="col-auto">
+              <div class="col-auto" style="margin-top: 0;">
 
                 <input
-
                   type="text"
-
                   id="country-code-input"
-                       
                   placeholder="2 Letter Country Code"
-
                   class="form-control"
-
                   aria-describedby="TextHelpInline"
-
                   value={{ general_settings.country_code }}
-
                 />
 
               </div>

From ba3ccaf12696d19ce9fa82f6a94af1798eb2ed6b Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 19 Jul 2023 15:41:07 +0800
Subject: [PATCH 107/133] more clean ups

---
 templates/index.html | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index 6b40520..669a63c 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -8566,7 +8566,7 @@
 
             <div class="mx-auto row g-3 align-items-center mb-2">
 
-              <div class="col-auto">
+              <div class="col-auto" style="margin-top: 0;">
 
                 <label
                   for="wifi-ssid-inputZ"
@@ -8594,7 +8594,7 @@
 
             <div class="mx-auto row g-3 align-items-center mt-2">
 
-              <div class="col-auto">
+              <div class="col-auto" style="margin-top: 0;">
 
                 <label
                   for="wi-fi-pass-input"
@@ -8619,11 +8619,12 @@
 
             </div>
 
-            <input type="checkbox" class="form-check-input pass-toggle" onclick="togglePass()"> Show Password
+            <label style="width:180px; margin-top:5%"><input type="checkbox" class="form-check-input pass-toggle" onclick="togglePass()"> 
+            Show Password</label>
             
             <div class="mx-auto row g-3 align-items-center mt-2">
 
-              <div class="col-auto">
+              <div class="col-auto" style="margin-top: 0;">
 
                 <label
                   for="country-code-inputZ"

From 37ff9eba5749a0a5451bbb6d5c86e9f06b2b9db3 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 19 Jul 2023 15:55:50 +0800
Subject: [PATCH 108/133] Update index.html

---
 templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/index.html b/templates/index.html
index 669a63c..3f37b93 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -8628,7 +8628,7 @@
 
                 <label
                   for="country-code-inputZ"
-                  class="col-form-label text-left w-120-px"
+                  class="col-form-label text-left w-115-px"
                   >2 Letter Country Code:
                 </label>
 

From 14c2c516655832c0b4213b87d7e084b9642794b0 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 19 Jul 2023 15:57:54 +0800
Subject: [PATCH 109/133] Update index.html

---
 templates/index.html | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index 3f37b93..bb00bb7 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -8554,15 +8554,12 @@
 
       <section class="stocks-features text-white row-3">
 
-              <div
-
+        <div
           class="mx-auto my-5 d-flex align-items-center position-relative"
-
           style="width: fit-content"
-
         >
 
-          <div class="mr-5">
+          <div class="mr-5" style="width:200px;">
 
             <div class="mx-auto row g-3 align-items-center mb-2">
 

From 628c7e90919b6ccfba2d666a26f675d2567d94f9 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 19 Jul 2023 16:00:02 +0800
Subject: [PATCH 110/133] Update index.html

---
 templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/index.html b/templates/index.html
index bb00bb7..63a3305 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -8625,7 +8625,7 @@
 
                 <label
                   for="country-code-inputZ"
-                  class="col-form-label text-left w-115-px"
+                  class="col-form-label text-left w-120-px"
                   >2 Letter Country Code:
                 </label>
 

From dff99216a3b41c653071a3ac6829470bd21050a6 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 19 Jul 2023 16:10:14 +0800
Subject: [PATCH 111/133] cleaned up join network buttons and connection status

---
 templates/index.html | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index 63a3305..60da11a 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -8645,28 +8645,27 @@
               </div>
 
             </div>
-
+            
             <div>
-
-              
-
             </div>
 
           </div>
 
-          <button class="btn set-btn" id="join-network-btn" onClick=showDivTwo()>
-
-            Join Network
-
-          </button>
-
-          <div id="network-status" style="padding-left:2%;padding-right:2%"></div>
-
-          <div class="status rounded-circle" id="circle-1" style="display:none"></div>
-
-          <div class="status rounded-circle" id="circle-2" style="display:none"></div>
-
-          <div class="status rounded-circle" id="circle-3" style="display:none"></div>
+          <div class="col-auto" >
+            <button class="btn set-btn" id="scan-network-btn" onClick=scanNetworks() style="margin-bottom: 15%;">
+              Scan Networks
+            </button>
+            <br>
+            <button class="btn set-btn" id="join-network-btn" onClick=showDivTwo()>
+              Join Network
+            </button>
+            <div class="col-auto" style="display: flex; flex-direction: row; justify-content: center; align-items: center; padding-top: 10%;">
+              <div id="network-status" style="padding-left:2%;padding-right:2%"> </div>
+              <div class="status rounded-circle" id="circle-1" style="display:none"></div>
+              <div class="status rounded-circle" id="circle-2" style="display:none"></div>
+              <div class="status rounded-circle" id="circle-3" style="display:none"></div>
+            </div>
+          </div>
 
         </div> 
 

From 8002659f41afd8241307b59338b93cc50c94778a Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 19 Jul 2023 17:20:22 +0800
Subject: [PATCH 112/133] networks list added

---
 templates/index.html | 48 ++++++++++++++++----------------------------
 1 file changed, 17 insertions(+), 31 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index 60da11a..a56cd74 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -8554,85 +8554,75 @@
 
       <section class="stocks-features text-white row-3">
 
-        <div
-          class="mx-auto my-5 d-flex align-items-center position-relative"
-          style="width: fit-content"
-        >
+        <div class="mx-auto my-5 d-flex align-items-center position-relative" style="width: fit-content; margin-left:0;">
+          <div class="col-auto">
+            <h6 class="mt-3">Networks List:</h6>
+            <div class="features-div-two" style="height: 280px; width: 200px;">
+              <ul
+                id="networks-list"
+                class="display-features-list text-white symbol-list">
+                  <li onclick="sendNetworkToSSID(this)">psfdunn</li>
+                  <li onclick="sendNetworkToSSID(this)">psfdunn_2</li>
+                  <li onclick="sendNetworkToSSID(this)">psfdunn_xt_5G</li>
+              </ul>
+            </div>
+          </div>
 
-          <div class="mr-5" style="width:200px;">
+          <div class="mr-5" style="width: 200px; margin-left: 20px; margin-bottom:20px;">
 
             <div class="mx-auto row g-3 align-items-center mb-2">
-
               <div class="col-auto" style="margin-top: 0;">
-
                 <label
                   for="wifi-ssid-inputZ"
                   class="col-form-label text-left w-115-px"
                   >Wi-Fi SSID:
                 </label>
-
               </div>
 
               <div class="col-auto" style="margin-top: 0;">
-
                 <input
                   type="text"
                   id="wifi-ssid-input"
                   class="form-control"
                   placeholder="Wi-Fi SSID"
                   aria-describedby="TextHelpInline"
-                  value="{{ wifi_SSID }}"   
-                    
-                />
-
+                  value="{{ wifi_SSID }}"/>
               </div>
-
             </div>
 
             <div class="mx-auto row g-3 align-items-center mt-2">
-
               <div class="col-auto" style="margin-top: 0;">
-
                 <label
                   for="wi-fi-pass-input"
                   class="col-form-label text-left w-115-px"
                   >Wi-Fi password:
                 </label>
-
               </div>
 
               <div class="col-auto" style="margin-top: 0;">
-
                 <input
                   type="password"
                   id="wifi-pass-input"
                   placeholder="Wi-Fi password"
                   class="form-control"
                   aria-describedby="TextHelpInline"
-                  value="{{ wifi_PSK }}"
-                />
-
+                  value="{{ wifi_PSK }}"/>
               </div>
-
             </div>
 
             <label style="width:180px; margin-top:5%"><input type="checkbox" class="form-check-input pass-toggle" onclick="togglePass()"> 
             Show Password</label>
             
             <div class="mx-auto row g-3 align-items-center mt-2">
-
               <div class="col-auto" style="margin-top: 0;">
-
                 <label
                   for="country-code-inputZ"
                   class="col-form-label text-left w-120-px"
                   >2 Letter Country Code:
                 </label>
-
               </div>
 
               <div class="col-auto" style="margin-top: 0;">
-
                 <input
                   type="text"
                   id="country-code-input"
@@ -8641,13 +8631,9 @@
                   aria-describedby="TextHelpInline"
                   value={{ general_settings.country_code }}
                 />
-
               </div>
+            </div>
 
-            </div>
-            
-            <div>
-            </div>
 
           </div>
 

From 22dca4fe664080102ed9452aa86c4b7dc0ea5725 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 19 Jul 2023 17:21:07 +0800
Subject: [PATCH 113/133] selected network

---
 static/app.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/static/app.js b/static/app.js
index a138920..357c985 100755
--- a/static/app.js
+++ b/static/app.js
@@ -3303,3 +3303,17 @@ selectMenu.addEventListener("change", function() {
   pElement.textContent = selectedValue + " Settings - Changes detected.";
   pElement2.innerHTML = selectedValue + " Settings -" + "<br>" + " Saved!";
 });
+
+
+// load selected network item into ssid input
+function sendNetworkToSSID(element) {
+  var networksList = document.getElementById('networks-list');
+  var lis = networksList.querySelectorAll("li");
+  var ssid_input = document.getElementById('wifi-ssid-input');
+  var value = element.innerText;
+  lis.forEach(function(li) {
+    li.classList.remove("active");
+  });
+  ssid_input.value = value;
+  element.classList.add("active");
+}

From b130fa2e2d4d6d3dc71ecbeb8d1555e7dc578cc0 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 19 Jul 2023 17:21:29 +0800
Subject: [PATCH 114/133] auto scaling

---
 static/style.css | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/static/style.css b/static/style.css
index ff5939c..0db9b9d 100755
--- a/static/style.css
+++ b/static/style.css
@@ -1437,3 +1437,13 @@ input[type=checkbox]:hover {
   text-align: center;
 }
 
+@media (max-width: 500px) {
+  .mx-auto {
+    flex-direction: column;
+  }
+  .mr-5 {
+    margin-left: 0;
+    margin-top: 20px;
+  }
+}
+

From 2a902ed4168f012fdad998fe172858f78e788c72 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 19 Jul 2023 19:06:03 +0800
Subject: [PATCH 115/133] scannetworks functions

---
 server.py | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 57 insertions(+), 2 deletions(-)

diff --git a/server.py b/server.py
index 9f44295..12dc617 100755
--- a/server.py
+++ b/server.py
@@ -116,6 +116,29 @@ class DummyProcess():
 #     pass
 
 
+output = subprocess.check_output(['sudo', 'iwlist', 'wlan0', 'scan'])
+output_str = output.decode('utf-8')
+lines = output_str.split('Cell')
+
+networks = {}
+
+for line in lines:
+    if 'ESSID:""\n' not in line and 'Scan completed' not in line:
+        ssid = line.split('ESSID:')[1].split('\n')[0]
+        ssid = ssid.replace('"', '', 1)
+        ssid = ssid[::-1].replace('"', '', 1)[::-1]
+        if 'AES' in ssid:
+            ssid = ssid.replace("AES", "CCMP")
+        try:
+            group_cipher = line.split('Group Cipher : ')[1].split('\n')[0]
+            pair_cipher = line.split('Pairwise Ciphers (1) : ')[1].split('\n')[0]
+        except:
+            group_cipher = ''
+            pair_cipher = ''
+    #    quality = line.split('Quality=')[1].split('Signal level')[0].replace(" ", "")
+        networks[ssid] = {'group_cipher': group_cipher, 'pair_cipher': pair_cipher}
+
+
 app = Flask(__name__)
 @app.route("/", methods=['GET', 'POST'])
 def index():
@@ -375,7 +398,10 @@ def index():
         wifi_PSK = wifiline[6][5:].replace('"','')
     except:
         wifi_PSK = ''
-
+    try:
+        networks_list = networks
+    except:
+        networks_list = ''
 
     templateData = {
         'system_info':system_info,
@@ -408,7 +434,8 @@ def index():
         'wifi_PSK':wifi_PSK,
         'scheduler_settings':scheduler_settings,
         'economic_settings':economic_settings,
-        'jokes_settings':jokes_settings
+        'jokes_settings':jokes_settings,
+        'networks_list': networks_list
       }
       
 
@@ -1705,6 +1732,34 @@ def savePromptStartStop():
     return index()
 
 
+@app.route("/scanNetworks", methods=["PUT", "POST"])
+def scanNetworks2():
+    output = subprocess.check_output(['sudo', 'iwlist', 'wlan0', 'scan'])
+    output_str = output.decode('utf-8')
+    lines = output_str.split('Cell')
+
+    global networks
+    networks = {}
+
+    for line in lines:
+        if 'ESSID:""\n' not in line and 'Scan completed' not in line:
+            ssid = line.split('ESSID:')[1].split('\n')[0]
+            ssid = ssid.replace('"', '', 1)
+            ssid = ssid[::-1].replace('"', '', 1)[::-1]
+            if 'AES' in ssid:
+                ssid = ssid.replace("AES", "CCMP")
+            try:
+                group_cipher = line.split('Group Cipher : ')[1].split('\n')[0]
+                pair_cipher = line.split('Pairwise Ciphers (1) : ')[1].split('\n')[0]
+            except:
+                group_cipher = ''
+                pair_cipher = ''
+    #        quality = line.split('Quality=')[1].split('Signal level')[0].replace(" ", "")
+            networks[ssid] = {'group_cipher': group_cipher, 'pair_cipher': pair_cipher}
+
+    return (networks)
+
+
 if __name__ == "__main__":
     
     app.run(host='0.0.0.0', port=1024, debug=False) # the debuggger causes flickering 

From 70b4195bf05a9c1ed1b242346287be462ce9e487 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 19 Jul 2023 19:07:06 +0800
Subject: [PATCH 116/133] scan networks

---
 static/app.js | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/static/app.js b/static/app.js
index 357c985..dbef308 100755
--- a/static/app.js
+++ b/static/app.js
@@ -3317,3 +3317,31 @@ function sendNetworkToSSID(element) {
   ssid_input.value = value;
   element.classList.add("active");
 }
+
+
+// scan nearby networks
+function scanNetworks() {
+  var networksListReset = document.getElementById("networks-list");
+  networksListReset.innerHTML = "";
+  fetch("/scanNetworks", {
+    method: "PUT",
+  })
+    .then(response => response.text())
+    .then(data => {
+      // Parse the response data as JSON
+      var networks = JSON.parse(data);
+
+      // Iterate over the networks object and create list items
+      for (var ssid in networks) {
+        var listItem = document.createElement("li");
+        listItem.textContent = ssid;
+        listItem.onclick = function() {
+          sendNetworkToSSID(this);
+        };
+        networksListReset.appendChild(listItem);
+      }
+    })
+    .catch(error => console.log(error));
+
+}
+

From 726295a526287f3d4e787ab980b2f7429f668016 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 19 Jul 2023 19:08:19 +0800
Subject: [PATCH 117/133] backend networks items

---
 templates/index.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index a56cd74..734e2ad 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -8561,9 +8561,9 @@
               <ul
                 id="networks-list"
                 class="display-features-list text-white symbol-list">
-                  <li onclick="sendNetworkToSSID(this)">psfdunn</li>
-                  <li onclick="sendNetworkToSSID(this)">psfdunn_2</li>
-                  <li onclick="sendNetworkToSSID(this)">psfdunn_xt_5G</li>
+                  {% for key,value in networks_list.items() %}
+                  <li onclick="sendNetworkToSSID(this)">{{key}}</li>
+                  {% endfor%}
               </ul>
             </div>
           </div>

From b50fac4e7600d3ea4cb2beccc46d10be2ade149a Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 19 Jul 2023 19:17:06 +0800
Subject: [PATCH 118/133] block intiial wifi scan, seems to crash the script

---
 server.py | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/server.py b/server.py
index 12dc617..59124d5 100755
--- a/server.py
+++ b/server.py
@@ -116,27 +116,27 @@ class DummyProcess():
 #     pass
 
 
-output = subprocess.check_output(['sudo', 'iwlist', 'wlan0', 'scan'])
-output_str = output.decode('utf-8')
-lines = output_str.split('Cell')
+# output = subprocess.check_output(['sudo', 'iwlist', 'wlan0', 'scan'])
+# output_str = output.decode('utf-8')
+# lines = output_str.split('Cell')
 
 networks = {}
 
-for line in lines:
-    if 'ESSID:""\n' not in line and 'Scan completed' not in line:
-        ssid = line.split('ESSID:')[1].split('\n')[0]
-        ssid = ssid.replace('"', '', 1)
-        ssid = ssid[::-1].replace('"', '', 1)[::-1]
-        if 'AES' in ssid:
-            ssid = ssid.replace("AES", "CCMP")
-        try:
-            group_cipher = line.split('Group Cipher : ')[1].split('\n')[0]
-            pair_cipher = line.split('Pairwise Ciphers (1) : ')[1].split('\n')[0]
-        except:
-            group_cipher = ''
-            pair_cipher = ''
-    #    quality = line.split('Quality=')[1].split('Signal level')[0].replace(" ", "")
-        networks[ssid] = {'group_cipher': group_cipher, 'pair_cipher': pair_cipher}
+# for line in lines:
+#     if 'ESSID:""\n' not in line and 'Scan completed' not in line:
+#         ssid = line.split('ESSID:')[1].split('\n')[0]
+#         ssid = ssid.replace('"', '', 1)
+#         ssid = ssid[::-1].replace('"', '', 1)[::-1]
+#         if 'AES' in ssid:
+#             ssid = ssid.replace("AES", "CCMP")
+#         try:
+#             group_cipher = line.split('Group Cipher : ')[1].split('\n')[0]
+#             pair_cipher = line.split('Pairwise Ciphers (1) : ')[1].split('\n')[0]
+#         except:
+#             group_cipher = ''
+#             pair_cipher = ''
+#     #    quality = line.split('Quality=')[1].split('Signal level')[0].replace(" ", "")
+#         networks[ssid] = {'group_cipher': group_cipher, 'pair_cipher': pair_cipher}
 
 
 app = Flask(__name__)

From 1a1515f2a1f462b44e7abc59d3ec2c6075f93f3e Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 19 Jul 2023 19:20:37 +0800
Subject: [PATCH 119/133] try and except just in case

---
 server.py | 45 ++++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/server.py b/server.py
index 59124d5..476ef51 100755
--- a/server.py
+++ b/server.py
@@ -1734,29 +1734,32 @@ def savePromptStartStop():
 
 @app.route("/scanNetworks", methods=["PUT", "POST"])
 def scanNetworks2():
-    output = subprocess.check_output(['sudo', 'iwlist', 'wlan0', 'scan'])
-    output_str = output.decode('utf-8')
-    lines = output_str.split('Cell')
+    try:
+        output = subprocess.check_output(['sudo', 'iwlist', 'wlan0', 'scan'])
+        output_str = output.decode('utf-8')
+        lines = output_str.split('Cell')
 
-    global networks
-    networks = {}
-
-    for line in lines:
-        if 'ESSID:""\n' not in line and 'Scan completed' not in line:
-            ssid = line.split('ESSID:')[1].split('\n')[0]
-            ssid = ssid.replace('"', '', 1)
-            ssid = ssid[::-1].replace('"', '', 1)[::-1]
-            if 'AES' in ssid:
-                ssid = ssid.replace("AES", "CCMP")
-            try:
-                group_cipher = line.split('Group Cipher : ')[1].split('\n')[0]
-                pair_cipher = line.split('Pairwise Ciphers (1) : ')[1].split('\n')[0]
-            except:
-                group_cipher = ''
-                pair_cipher = ''
-    #        quality = line.split('Quality=')[1].split('Signal level')[0].replace(" ", "")
-            networks[ssid] = {'group_cipher': group_cipher, 'pair_cipher': pair_cipher}
+        global networks
+        networks = {}
 
+        for line in lines:
+            if 'ESSID:""\n' not in line and 'Scan completed' not in line:
+                ssid = line.split('ESSID:')[1].split('\n')[0]
+                ssid = ssid.replace('"', '', 1)
+                ssid = ssid[::-1].replace('"', '', 1)[::-1]
+                if 'AES' in ssid:
+                    ssid = ssid.replace("AES", "CCMP")
+                try:
+                    group_cipher = line.split('Group Cipher : ')[1].split('\n')[0]
+                    pair_cipher = line.split('Pairwise Ciphers (1) : ')[1].split('\n')[0]
+                except:
+                    group_cipher = ''
+                    pair_cipher = ''
+    #            quality = line.split('Quality=')[1].split('Signal level')[0].replace(" ", "")
+                networks[ssid] = {'group_cipher': group_cipher, 'pair_cipher': pair_cipher}
+    except:
+        global networks
+        networks = {}
     return (networks)
 
 

From 8730b3b4ffd3958468c7423fd6b122a52ef50f41 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 19 Jul 2023 19:23:19 +0800
Subject: [PATCH 120/133] Update server.py

---
 server.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server.py b/server.py
index 476ef51..52a62b2 100755
--- a/server.py
+++ b/server.py
@@ -1758,7 +1758,6 @@ def scanNetworks2():
     #            quality = line.split('Quality=')[1].split('Signal level')[0].replace(" ", "")
                 networks[ssid] = {'group_cipher': group_cipher, 'pair_cipher': pair_cipher}
     except:
-        global networks
         networks = {}
     return (networks)
 

From 883a26e41b81730b7bda1ef5e9efecebc96a294a Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Thu, 20 Jul 2023 00:00:51 +0800
Subject: [PATCH 121/133] messed up some naming of variables

---
 static/app.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/static/app.js b/static/app.js
index dbef308..d9427da 100755
--- a/static/app.js
+++ b/static/app.js
@@ -453,7 +453,7 @@ const addEventOnFeaturesList = () => {
             let inputMsg = document.getElementById("inputText14");
             let inputColor = document.getElementById("inputScrollSpeed16");
             let inputSize = document.getElementById("inputScrollSpeed17");
-            let inputBg = document.getElementById("inputScrollSpeed19");
+            let inputBg = document.getElementById("inputScrollSpeed19BG");
             let displayCheck = document.getElementById("flexCheckChecked29");
 
             if (value.messageName == availableFeature.innerText) {
@@ -902,7 +902,7 @@ allFeaturesTextAddBtn.map((value, index) => {
         let colorInput = document.getElementById("inputScrollSpeed16").value;
         let sizeInput = document.getElementById("inputScrollSpeed17").value;
         let backgroundInput =
-          document.getElementById("inputScrollSpeed19").value;
+          document.getElementById("inputScrollSpeed19BG").value;
         let displayCheck =
           document.getElementById("flexCheckChecked29").checked;
         let messagesWrapper = document.getElementById("messages-features");
@@ -2848,7 +2848,7 @@ function getCustomMsg(value) {
   const the_thing = document.getElementById("inputText13");
   const the_msg = document.getElementById("inputText14");
   const t_color = document.getElementById("inputScrollSpeed16");
-  const b_color = document.getElementById("inputScrollSpeed19");
+  const b_color = document.getElementById("inputScrollSpeed19BG");
   const t_size = document.getElementById("inputScrollSpeed17");
   the_thing.value = messaged;
 
@@ -2879,7 +2879,7 @@ function updateSelectedMsg(){
 
   if ((msg_name !== '') && (msg_text !== '')) {
     const text_color = document.getElementById("inputScrollSpeed16").value;
-    const background_color = document.getElementById("inputScrollSpeed19").value;
+    const background_color = document.getElementById("inputScrollSpeed19BG").value;
     const text_size = document.getElementById("inputScrollSpeed17").value;
     document.getElementById('demo4').style.display = "none";
     document.getElementById('demo5').style.display = "none";
@@ -3268,7 +3268,7 @@ for (const pageID of pageIDs) {
   // Add event listeners to select menus
   const excludedIds = ['base-select', 'quote-select', 'commodities-items', 'indices-items', 'inputTransition73', 
     'inputTransition83', 'inputTransition93', 'inputTransition103', 'inputTransition2222', 'jokes-categories', 'golf-ranking-number', 
-    'inputScrollSpeed16', 'inputScrollSpeed17', 'inputScrollSpeed19'];
+    'inputScrollSpeed16', 'inputScrollSpeed17', 'inputScrollSpeed19BG'];
  
   const selectMenus = parentDiv.querySelectorAll('select');
   selectMenus.forEach(selectMenu => {

From e4a17ec3549a4fed35e27c41aaa9935094fa2b40 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Thu, 20 Jul 2023 00:01:13 +0800
Subject: [PATCH 122/133] Update index.html

---
 templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/index.html b/templates/index.html
index 734e2ad..0715920 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -8358,7 +8358,7 @@
 
                     <select
 
-                      id="inputScrollSpeed19"
+                      id="inputScrollSpeed19BG"
 
                       class="form-select back-colour"
 

From bfb4feae182af577d421cafec160145a185e3371 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Thu, 20 Jul 2023 15:29:45 +0800
Subject: [PATCH 123/133] fixed spacing issues with e-mini items in prof
 display

---
 stockTicker.py | 44 ++++++++++++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/stockTicker.py b/stockTicker.py
index b46bd58..85eabad 100755
--- a/stockTicker.py
+++ b/stockTicker.py
@@ -946,27 +946,47 @@ class StockTicker():
 
         img = img.crop((0,0,max(w1, w2) + 20,32)) 
         return img 
-        
+
+    
     def textToImageProf(self, TICKER, CURRENT, CHANGE, ARROW, font):
         
-        text_width_current, text_height = self.get_text_dimensions(CURRENT, font)
-        
-        img = Image.new('RGB', (text_width_current  +100 , 32))
-        d = ImageDraw.Draw(img)
+        if 'E-MINI' in TICKER:
+            w1, text_height = self.get_text_dimensions(TICKER, font)
+            w2, text_height = self.get_text_dimensions(CURRENT, font)
+            text_width_current = max(w1,w2)
 
-        d.text((4, 0), TICKER, fill=(255, 255, 255), font=font)
-        d.text((4, 8), CURRENT, fill=self.greenORred, font=font)
+            img = Image.new('RGB', (text_width_current  +100 , 32))
+            d = ImageDraw.Draw(img)
 
-        img.paste(ARROW, ((text_width_current + 7),10))
-        d.text(((text_width_current+18), 8), CHANGE, fill=self.greenORred, font=font)
+            d.text((4, 0), TICKER, fill=(255, 255, 255), font=font)
+            d.text((4, 8), CURRENT, fill=self.greenORred, font=font)
 
-        text_width_change, text_height = self.get_text_dimensions(CHANGE, font)
+            img.paste(ARROW, ((w2 + 7),10))
+            d.text(((w2+18), 8), CHANGE, fill=self.greenORred, font=font)
 
-        newWidth = text_width_current + text_width_change +30
+            text_width_change, text_height = self.get_text_dimensions(CHANGE, font)
+            newWidth = max(w2 + text_width_change, text_width_current) +15    
+            img = img.crop((0,0,newWidth,32))
 
-        img = img.crop((0,0,newWidth,32)) 
+        else:
+            text_width_current, text_height = self.get_text_dimensions(CURRENT, font)
+            
+            img = Image.new('RGB', (text_width_current  +100 , 32))
+            d = ImageDraw.Draw(img)
+
+            d.text((4, 0), TICKER, fill=(255, 255, 255), font=font)
+            d.text((4, 8), CURRENT, fill=self.greenORred, font=font)
+
+            img.paste(ARROW, ((text_width_current + 7),10))
+            d.text(((text_width_current+18), 8), CHANGE, fill=self.greenORred, font=font)
+
+            text_width_change, text_height = self.get_text_dimensions(CHANGE, font)
+            newWidth = text_width_current + text_width_change +30
+            img = img.crop((0,0,newWidth,32)) 
+            
         return img 
 
+    
     #Stitch the logo & prices picture into one image
     def stitchImage(self, image_list):
         widths, heights = zip(*(i.size for i in image_list))

From 7ce1c8973b5cf61d7ee80f6e975f31785825bfc3 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 24 Jul 2023 16:48:37 +0800
Subject: [PATCH 124/133] deleted print statement

---
 database_caller.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/database_caller.py b/database_caller.py
index 36e2e22..b4c2c24 100755
--- a/database_caller.py
+++ b/database_caller.py
@@ -753,7 +753,6 @@ def updateEconomic(api_key, logf):
         try:
             for each in data['result']:
                 try:
-                    print(each['actual'], each['previous'], each['forecast'])
                     time = pytz.timezone('GMT').localize(datetime.strptime(each['date'], '%Y-%m-%dT%H:%M:%S.%fZ')).astimezone(timezone).strftime('%a %m/%d %H:%M%p')
                     if datetime.now(timezone).strftime('%a %m/%d %H:%M%p') >= time:
                         happened = True

From 8e7d19b2a0e50f40ca09c399e99668fb615ccb37 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 24 Jul 2023 17:02:58 +0800
Subject: [PATCH 125/133] try replacing brk a brk b for yfinance

---
 database_caller.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/database_caller.py b/database_caller.py
index b4c2c24..aa14f14 100755
--- a/database_caller.py
+++ b/database_caller.py
@@ -183,6 +183,7 @@ def updateStocks(api_key, logf):
                     json.dump(all_stocks_settings, f)
 
         elif 'query1.finance.yahoo.com/v7' in url:
+            url = url.replace('BRK.A', 'BRK-A').replace('BRK.B', 'BRK-B')
             response = requests.get(url, headers=headers)
             data = response.json()
             if "'error': {'code'" in str(data):        
@@ -212,7 +213,7 @@ def updateStocks(api_key, logf):
                 for symbol in symbols:
                     for stock in data['quoteResponse']['result']:
                         if stock['symbol'] == symbol:
-                            stock_info[stock['symbol']] = {'current': stock['regularMarketPrice'], 'change': stock['regularMarketChange'], 'percent_change':stock['regularMarketChangePercent']}
+                            stock_info[stock['symbol'].replace('BRK-A', 'BRK.A').replace('BRK-B', 'BRK.B')] = {'current': stock['regularMarketPrice'], 'change': stock['regularMarketChange'], 'percent_change':stock['regularMarketChangePercent']}
 
                 all_stocks_settings['symbols'] = stock_info
                 with open('csv/stocks_settings.json', 'w+') as f:

From 3b1c5a7d55314369083e1ab8ebc7fdc2f0031de8 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 24 Jul 2023 17:11:04 +0800
Subject: [PATCH 126/133] try and except statements added

---
 database_caller.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/database_caller.py b/database_caller.py
index aa14f14..4fd8519 100755
--- a/database_caller.py
+++ b/database_caller.py
@@ -176,8 +176,10 @@ def updateStocks(api_key, logf):
             data = response.json()
             if len(data) > 0:
                 for symbol in symbols:
-                    stock_info[data[symbol]['quote']['symbol']] = {'current': data[symbol]['quote']['latestPrice'], 'change': data[symbol]['quote']['change'], 'percent_change':data[symbol]['quote']['changePercent'] * 100}
- 
+                    try:
+                        stock_info[data[symbol]['quote']['symbol']] = {'current': data[symbol]['quote']['latestPrice'], 'change': data[symbol]['quote']['change'], 'percent_change':data[symbol]['quote']['changePercent'] * 100}
+                    except:
+                        pass
                 all_stocks_settings['symbols'] = stock_info
                 with open('csv/stocks_settings.json', 'w+') as f:
                     json.dump(all_stocks_settings, f)
@@ -211,10 +213,12 @@ def updateStocks(api_key, logf):
            # stock_info = {}
             if len(data) > 0:
                 for symbol in symbols:
-                    for stock in data['quoteResponse']['result']:
-                        if stock['symbol'] == symbol:
-                            stock_info[stock['symbol'].replace('BRK-A', 'BRK.A').replace('BRK-B', 'BRK.B')] = {'current': stock['regularMarketPrice'], 'change': stock['regularMarketChange'], 'percent_change':stock['regularMarketChangePercent']}
-
+                    try:
+                        for stock in data['quoteResponse']['result']:
+                            if stock['symbol'] == symbol:
+                                stock_info[stock['symbol'].replace('BRK-A', 'BRK.A').replace('BRK-B', 'BRK.B')] = {'current': stock['regularMarketPrice'], 'change': stock['regularMarketChange'], 'percent_change':stock['regularMarketChangePercent']}
+                    except:
+                        pass
                 all_stocks_settings['symbols'] = stock_info
                 with open('csv/stocks_settings.json', 'w+') as f:
                     json.dump(all_stocks_settings, f)

From 0ea3abf9d081cc1132d3b2de0c5304e6bc3426cd Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 24 Jul 2023 17:15:12 +0800
Subject: [PATCH 127/133] replace .replace('BRK-A', 'BRK.A').replace('BRK-B',
 'BRK.B')

---
 database_caller.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/database_caller.py b/database_caller.py
index 4fd8519..d62debf 100755
--- a/database_caller.py
+++ b/database_caller.py
@@ -215,7 +215,7 @@ def updateStocks(api_key, logf):
                 for symbol in symbols:
                     try:
                         for stock in data['quoteResponse']['result']:
-                            if stock['symbol'] == symbol:
+                            if stock['symbol'].replace('BRK-A', 'BRK.A').replace('BRK-B', 'BRK.B') == symbol:
                                 stock_info[stock['symbol'].replace('BRK-A', 'BRK.A').replace('BRK-B', 'BRK.B')] = {'current': stock['regularMarketPrice'], 'change': stock['regularMarketChange'], 'percent_change':stock['regularMarketChangePercent']}
                     except:
                         pass

From e26f27eb3817e5db1250aeca8e8d9ec83ed29a4e Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 24 Jul 2023 17:29:31 +0800
Subject: [PATCH 128/133] .replace('BRK-A', 'BRK.A').replace('BRK-B', 'BRK.B')
 for prepost

---
 database_caller.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/database_caller.py b/database_caller.py
index d62debf..76ae2cb 100755
--- a/database_caller.py
+++ b/database_caller.py
@@ -253,7 +253,7 @@ def updateStocksPrePost(api_key, logf):
         headers = {'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7',
         'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36'}
 
-        prepost = requests.get(prepost_url, headers=headers).json()
+        prepost = requests.get(prepost_url.replace('BRK.A', 'BRK-A').replace('BRK.B', 'BRK-B'), headers=headers).json()
         if "'error': {'code'" in str(prepost):        
             while True:
                 try:
@@ -269,7 +269,7 @@ def updateStocksPrePost(api_key, logf):
                         crumb = f.read()
                 params = {'crumb': crumb}
 
-                prepost = session.get(prepost_url.replace('v6','v7'), headers=headers, params=params).json()
+                prepost = session.get(prepost_url.replace('v6','v7').replace('BRK.A', 'BRK-A').replace('BRK.B', 'BRK-B'), headers=headers, params=params).json()
 
                 if "'error': {'code'" not in str(prepost):
                     break
@@ -286,24 +286,24 @@ def updateStocksPrePost(api_key, logf):
                     if stock['symbol'] == symbol:
                         stock_info[stock['symbol']] = {"time_now":time_now}
                         try:
-                            stock_info[stock['symbol']]['Pre-market'] = {'preprice': '%.2f' % stock['preMarketPrice'],
+                            stock_info[stock['symbol'].replace('BRK-A', 'BRK.A').replace('BRK-B', 'BRK.B')]['Pre-market'] = {'preprice': '%.2f' % stock['preMarketPrice'],
                                                            'prechange': '%.2f' % stock['preMarketChange'],
                                                            'prepercent': '%.2f' % stock['preMarketChangePercent']}
                         except:
                             try:
-                                stock_info[stock['symbol']]['Pre-market'] = {'preprice': '%.2f' % stock['postMarketPrice'],
+                                stock_info[stock['symbol'].replace('BRK-A', 'BRK.A').replace('BRK-B', 'BRK.B')]['Pre-market'] = {'preprice': '%.2f' % stock['postMarketPrice'],
                                                                'prechange': '%.2f' % 0,
                                                                'prepercent': '%.2f' % 0}                                
                             except:
-                                stock_info[stock['symbol']]['Pre-market'] = {'preprice': '%.2f' % stock['regularMarketPrice'],
+                                stock_info[stock['symbol'].replace('BRK-A', 'BRK.A').replace('BRK-B', 'BRK.B')]['Pre-market'] = {'preprice': '%.2f' % stock['regularMarketPrice'],
                                                                'prechange': '%.2f' % 0,
                                                                'prepercent': '%.2f' % 0}
                         try:
-                            stock_info[stock['symbol']]['Post-market'] = {'postprice': '%.2f' % stock['postMarketPrice'],
+                            stock_info[stock['symbol'].replace('BRK-A', 'BRK.A').replace('BRK-B', 'BRK.B')]['Post-market'] = {'postprice': '%.2f' % stock['postMarketPrice'],
                                                                           'postchange': '%.2f' % stock['postMarketChange'],
                                                                           'postpercent': '%.2f' % stock['postMarketChangePercent']}
                         except:
-                            stock_info[stock['symbol']]['Post-market'] = {'postprice': '%.2f' % stock['regularMarketPrice'],
+                            stock_info[stock['symbol'].replace('BRK-A', 'BRK.A').replace('BRK-B', 'BRK.B')]['Post-market'] = {'postprice': '%.2f' % stock['regularMarketPrice'],
                                                                           'postchange': '%.2f' % 0,
                                                                           'postpercent': '%.2f' % 0}
 

From 39f0496b9224ef8c28159bd4a0039e253e6d264c Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 24 Jul 2023 17:32:07 +0800
Subject: [PATCH 129/133] added try and except for prepost

---
 database_caller.py | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/database_caller.py b/database_caller.py
index 76ae2cb..9c359cc 100755
--- a/database_caller.py
+++ b/database_caller.py
@@ -282,31 +282,33 @@ def updateStocksPrePost(api_key, logf):
 
         if len(prepost_data) > 0:
             for symbol in symbols:
-                for stock in prepost_data:
-                    if stock['symbol'] == symbol:
-                        stock_info[stock['symbol']] = {"time_now":time_now}
-                        try:
-                            stock_info[stock['symbol'].replace('BRK-A', 'BRK.A').replace('BRK-B', 'BRK.B')]['Pre-market'] = {'preprice': '%.2f' % stock['preMarketPrice'],
+                try:
+                    for stock in prepost_data:
+                        if stock['symbol'] == symbol:
+                            stock_info[stock['symbol']] = {"time_now":time_now}
+                            try:
+                                stock_info[stock['symbol'].replace('BRK-A', 'BRK.A').replace('BRK-B', 'BRK.B')]['Pre-market'] = {'preprice': '%.2f' % stock['preMarketPrice'],
                                                            'prechange': '%.2f' % stock['preMarketChange'],
                                                            'prepercent': '%.2f' % stock['preMarketChangePercent']}
-                        except:
-                            try:
-                                stock_info[stock['symbol'].replace('BRK-A', 'BRK.A').replace('BRK-B', 'BRK.B')]['Pre-market'] = {'preprice': '%.2f' % stock['postMarketPrice'],
+                            except:
+                                try:
+                                    stock_info[stock['symbol'].replace('BRK-A', 'BRK.A').replace('BRK-B', 'BRK.B')]['Pre-market'] = {'preprice': '%.2f' % stock['postMarketPrice'],
                                                                'prechange': '%.2f' % 0,
                                                                'prepercent': '%.2f' % 0}                                
-                            except:
-                                stock_info[stock['symbol'].replace('BRK-A', 'BRK.A').replace('BRK-B', 'BRK.B')]['Pre-market'] = {'preprice': '%.2f' % stock['regularMarketPrice'],
+                                except:
+                                    stock_info[stock['symbol'].replace('BRK-A', 'BRK.A').replace('BRK-B', 'BRK.B')]['Pre-market'] = {'preprice': '%.2f' % stock['regularMarketPrice'],
                                                                'prechange': '%.2f' % 0,
                                                                'prepercent': '%.2f' % 0}
-                        try:
-                            stock_info[stock['symbol'].replace('BRK-A', 'BRK.A').replace('BRK-B', 'BRK.B')]['Post-market'] = {'postprice': '%.2f' % stock['postMarketPrice'],
+                            try:
+                                stock_info[stock['symbol'].replace('BRK-A', 'BRK.A').replace('BRK-B', 'BRK.B')]['Post-market'] = {'postprice': '%.2f' % stock['postMarketPrice'],
                                                                           'postchange': '%.2f' % stock['postMarketChange'],
                                                                           'postpercent': '%.2f' % stock['postMarketChangePercent']}
-                        except:
-                            stock_info[stock['symbol'].replace('BRK-A', 'BRK.A').replace('BRK-B', 'BRK.B')]['Post-market'] = {'postprice': '%.2f' % stock['regularMarketPrice'],
+                            except:
+                                stock_info[stock['symbol'].replace('BRK-A', 'BRK.A').replace('BRK-B', 'BRK.B')]['Post-market'] = {'postprice': '%.2f' % stock['regularMarketPrice'],
                                                                           'postchange': '%.2f' % 0,
                                                                           'postpercent': '%.2f' % 0}
-
+                except:
+                    pass
                 all_stocks_settings['symbols'] = stock_info
 
             with open('csv/prepost_settings.json', 'w+') as f:

From 96410135c838a31535146cceaf5ba2ccbb1d3409 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 24 Jul 2023 17:40:17 +0800
Subject: [PATCH 130/133] added scanning networks text

---
 static/app.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/static/app.js b/static/app.js
index d9427da..de3037a 100755
--- a/static/app.js
+++ b/static/app.js
@@ -3323,6 +3323,8 @@ function sendNetworkToSSID(element) {
 function scanNetworks() {
   var networksListReset = document.getElementById("networks-list");
   networksListReset.innerHTML = "";
+  var listItem2 = document.createElement("li");
+  listItem2.textContent = "Scanning networks...";
   fetch("/scanNetworks", {
     method: "PUT",
   })
@@ -3330,7 +3332,7 @@ function scanNetworks() {
     .then(data => {
       // Parse the response data as JSON
       var networks = JSON.parse(data);
-
+      networksListReset.innerHTML = "";
       // Iterate over the networks object and create list items
       for (var ssid in networks) {
         var listItem = document.createElement("li");

From eaac62eb67613476d0db82819ae0314bbf79f21e Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Mon, 24 Jul 2023 18:02:00 +0800
Subject: [PATCH 131/133] scanning networks text added

---
 static/app.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/static/app.js b/static/app.js
index de3037a..4ec6dd1 100755
--- a/static/app.js
+++ b/static/app.js
@@ -3325,6 +3325,7 @@ function scanNetworks() {
   networksListReset.innerHTML = "";
   var listItem2 = document.createElement("li");
   listItem2.textContent = "Scanning networks...";
+  networksListReset.appendChild(listItem2);
   fetch("/scanNetworks", {
     method: "PUT",
   })

From cc5ee3055a229202e38982d32a7f4e6893f38a59 Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 26 Jul 2023 12:17:18 +0800
Subject: [PATCH 132/133] removed display wifi password

---
 templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/index.html b/templates/index.html
index 0715920..3749c74 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -8606,7 +8606,7 @@
                   placeholder="Wi-Fi password"
                   class="form-control"
                   aria-describedby="TextHelpInline"
-                  value="{{ wifi_PSK }}"/>
+                  value=""/>
               </div>
             </div>
 

From dc27550ef5588fca9f229a9437396c8f8baed2ef Mon Sep 17 00:00:00 2001
From: Justin <justinodunn@hotmail.com>
Date: Wed, 26 Jul 2023 12:18:26 +0800
Subject: [PATCH 133/133] don't display wifi psk

---
 server.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/server.py b/server.py
index 52a62b2..2a4b808 100755
--- a/server.py
+++ b/server.py
@@ -388,16 +388,10 @@ def index():
         ipo_api_key = ipo_api[0]
     except:
         ipo_api_key = ''
-        
     try:
         wifi_SSID = wifiline[5][6:].replace('"','')
     except:
         wifi_SSID = ''
-        
-    try:
-        wifi_PSK = wifiline[6][5:].replace('"','')
-    except:
-        wifi_PSK = ''
     try:
         networks_list = networks
     except:
@@ -431,7 +425,6 @@ def index():
         'movie_api_key':movie_api_key,
         'ipo_api_key':ipo_api_key,
         'wifi_SSID':wifi_SSID,
-        'wifi_PSK':wifi_PSK,
         'scheduler_settings':scheduler_settings,
         'economic_settings':economic_settings,
         'jokes_settings':jokes_settings,