From 33f5fd8afa3f84c14343f596da1960ae172f0c2b Mon Sep 17 00:00:00 2001
From: anurag singh <140162738+anurag6569201@users.noreply.github.com>
Date: Tue, 11 Jun 2024 08:04:48 +0530
Subject: [PATCH] improved loader updated footer improved ui

---
 .../core/__pycache__/urls.cpython-312.pyc     | Bin 1247 -> 1356 bytes
 .../core/__pycache__/views.cpython-312.pyc    | Bin 11549 -> 12343 bytes
 newsaggregator/db.sqlite3                     | Bin 241664 -> 241664 bytes
 .../static/assets/css/preloader.css           | 137 +++++++-----------
 newsaggregator/static/assets/css/style.css    |  12 +-
 newsaggregator/static/assets/js/preloader.js  |  10 +-
 .../templates/components/footer.html          |  10 +-
 newsaggregator/templates/partials/base.html   | 109 ++++++++------
 8 files changed, 142 insertions(+), 136 deletions(-)

diff --git a/newsaggregator/core/__pycache__/urls.cpython-312.pyc b/newsaggregator/core/__pycache__/urls.cpython-312.pyc
index 8999bbd65967659a9ed8205a34e9195eebbe3b5b..e5cff2f248be73cf506ca72cb0c4542316375935 100644
GIT binary patch
delta 678
zcmcc5d4@~<G%qg~0}%MHNKfNnVPJR+;=lkul=1n&M0Krt<`mW(=3Le&Rz`*twkS3x
zhE&EB_EhF9uzr{p2%W;QhI2JDgbh~51ysj}ss_YM;YL%(15_t~MIG-N&UzFB`G5+A
zuqfn5Gf)7iP6UfOK{RzjKy_kR)Ct4Y)iZ#7A_7z>fkmMxTp>iA7*L%Q7Iori>Lh^b
zWU#1{L{lea2UIABMWHmBLYY*S6j_8=I(L*nrJSbx<Ts3RVxnoOCCM4_iA5!u$vLU<
z$@zIDsd*)v*_m`11FFQZO6nJ}0WI~@6uiZql9ia3p08J0lv7*;irgX&5CKdy3}7`y
z>_FBnj>Lk3_`Jm2)XC}08canZlY5v;rKN!~j6hs`4@i7qW@Kc%%OG=?LF_4m#$-vB
hUD6L(I4*E1UQo8UU>|mcCH#Y`2rpA3cabDeH2~pEX_f#0

delta 496
zcmX@Zb)QrHG%qg~0}xc(CZ{zqGcY^`abSQC%J_U>qPkWjYZNOJLn>nmTPkxF2TTcq
zPGMieu^MOs2!Pdb0@d+A_{d}m7n(ZmiGAXhJZOTvK+OWk+92!{J~Vaw6Yq&z3ZMxJ
z0yT?Z(JX|fPI$5&qqwCAny4sHw*(g5Vrc5bC)Y8GTT7scN&<DuV9_mwP?ydX#a}6{
zDKnXeNp7<<lNO_~pQgYq?v$*=y!3p%(xRN=B2YLMv4aQ}5Wxl{ZgC_Q6vXEx=B5^L
z1G$s;GHXnJ#atvI1>`USaq$@-@qw9<k?}5r%v}bt$>l7&cs?i!^D;GZ7lHf(095ix
AdjJ3c

diff --git a/newsaggregator/core/__pycache__/views.cpython-312.pyc b/newsaggregator/core/__pycache__/views.cpython-312.pyc
index 9c12d80eb786957860e8d2fc959611e4da0b22ba..2ec4b96c9413691941788bcd40d814d62d91294b 100644
GIT binary patch
delta 751
zcmYjP&rcIU6rR~1?Y4!sSSqztXl<*Mwi4ox1Ck(!(SxZGVw7HLv%AG5rL8kVil!9~
zYQPJrd!QE+5<QS$3=Ibp4<>Lj@lrw!*r0y{LJveQ&O#e`$$W3-z3+Yd&1Bz3KRq&k
zYi>3I8h4k+6R-RQvjaLy7a-Fi0f|o<q6V5fliZ{(s)ImszW~wTQ$FBX3o*W~4v2Jg
zQiR%kJ@hoQbRFD=YKzCoOt9);XRA73H~As95Wc~a7>QM&#C_mbnB&?gFaV-gR}C&}
z4zAQS^GuGJFsP+YS2x`p8Eq&W=RA8tQ=g-nD^UIIwW|fAZN>-Cxjc7*zz|DgJjXS@
zL2c;%+Yp&CAb~vhoExp@EX;ywb_`@;K!~7AQ~<rC@XT?4<c>QNNAXFS$jGf=_oRZc
zk{U<z8s{~b0YItIi=Yra2L$v`D+e{uo(*+Ts9I56!E!8-Mlnp{WD29+qw<LSWJ<>5
z=Cmkhh>}iKSxiuXM_08;%|lf{GR~w^SU!@kLK$n1>(&AdX$1RBLMGzlSR4^WOv*7a
zog#9Ipb~8!(uLnpm<2n=mWAMaaG__ur|91@x@T|vFqwBP?ZpS>^ViF+!LQzmB~lh5
zdmPVS+qJbX_80n>*e#oHPS_Ew+k$6P@Kglv&MD_&xDcMx*96eyD4tomRgOABTc&WC
z3m?|>ps97+<l8j)_5q|an*4il+4C+@c7<2Pily(n(D!$brM*A+EcNxVcQ6FjL$)Cg
zyFSo1<YG5YL%QE^@e~80wR_!3$e@z?Ip{Qgp?vLs!NY66f>&VM{$&>04$J^re*)hD
L*90%3VcPx&;cT|1

delta 95
zcmdm<FgJ?tG%qg~0}!;>CZ|nOp2#P`$gokJk%^^}Ra1Vm8<UC#qxR-V-5f^6l?+8L
qKy^h<K;jpNO>TZlX-=wL(RLu05r~V;H^0_1W#sy7!ptZPRtW%Pp%%*k

diff --git a/newsaggregator/db.sqlite3 b/newsaggregator/db.sqlite3
index d78941098cee899187747041637d0df7ea713ec4..caa15bf360b419a2c9a2d050b3f31f85f3fbbd42 100644
GIT binary patch
delta 503
zcmZp8z}N7AZ-O+V>_i!7R#^tUtP2}c7WB*UGT&g}@8TEXo5x$p6T+>}#l`W2eLuS=
zn=;E^<{O(G1-3D3G%4}2`ZfnUnwFL2B~}z=BxjZvrzcyM<z=QPrzGZQ78_)hrDkPR
zOkOxwxZd3&Fe<H7x7;v0Bi+5gJv+m@w8}@fv?{3}uqe$q&%-ax$Jg7)uqe~7%r`j7
z$TQ3<rK~8$)z34lq{2ARBc-s!!ZIYOw7AMM#UwN>CBV5L)YvrDB|fbz-`6|e*s`!7
z)Uztw%(FN*J2E`S%`@07+s`?u%AmlhI5aXcH9I0w*WW2PJGsi+(KW-#A~-11*RQn7
z(lON|z~4F0%COkI$jjNvB0bHw%q_?%!=uQ|ts*epH6t@U&%G+RJjExw(5Wmu%&j8B
z%Q!03#oW`#z{o_`z)aW3RKdW=%Gk)t$V|`7*xba>Wb@xC?A#o@d<qQw+xZkWb1e|z
zQ&nO1Wh4|%yv?rbw!5xl-0vvI%a_N%|A_xE{}TRI{xp7fehq$3zE^yw`PT6D^5tz-
tRPf=O-usV{R|vy$-t9o~hcY5&x`u{G4l^_}H!^5%l4jc8B+Xnm1pvsWpuzwE

delta 166
zcmV;X09pTl;0}P`4v-rG4v`!~1r7i%S4y#DppP631pNRHiVqYHo(*{nR0}T(3JBx}
zzXwSMBLw}kK@i;pv;C9@3kD1hMF0=CvkagV4w0ZIlOV1HgGsKpNv;9AK^zPYjQ|hg
z55o_n4}}kA4@VCu4+#$H4$BU#4vn)RAZ-qpZvFucx0?O|)EpEwEipJCF)=zYFgi6g
UE-^ARG&MMff*S(2f*S*Vl#)a;$N&HU

diff --git a/newsaggregator/static/assets/css/preloader.css b/newsaggregator/static/assets/css/preloader.css
index 207196b..4647203 100644
--- a/newsaggregator/static/assets/css/preloader.css
+++ b/newsaggregator/static/assets/css/preloader.css
@@ -1,101 +1,74 @@
-/* Preloader CSS */
-#preloader {
+@keyframes loader_5191 {
+    from {
+        opacity: 0;
+    }
+
+    to {
+        opacity: 1;
+    }
+}
+.loader{
+    height: 100vh;
+    width: 100%;
     position: fixed;
     top: 0;
     left: 0;
-    width: 100%;
-    height: 100%;
-    background-color: #ffffff;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    z-index: 9999;
 }
-
-#preloader .container {
-    background-color: #0095f6;
-    height: 200px;
-    width: 200px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    box-shadow: inset 0 0 0 0.25rem #b4b1b1;
-    flex-direction: column;
-    animation: spin 5s ease-in-out infinite;
-    border-radius: 50%;
+.square {
+    background: var(--foreground-primary);
+    width: 10px;
+    height: 10px;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    margin-top: -5px;
+    margin-left: -5px;
 }
 
-#preloader .cup {
-    background-color: #b6d5ea;
-    height: 30%;
-    width: 30%;
-    border-radius: 50% 50% 0 0 / 100% 100% 0 0;
-    overflow: hidden;
+#sq1 {
+    margin-top: -25px;
+    margin-left: -25px;
+    animation: loader_5191 675ms ease-in-out 0s infinite alternate;
 }
 
-#preloader .top {
-    transform: rotate(180deg);
+#sq2 {
+    margin-top: -25px;
+    animation: loader_5191 675ms ease-in-out 75ms infinite alternate;
 }
 
-#preloader .sand {
-    background-color: #e9a410;
-    height: 150%;
-    width: 150%;
-    transform-origin: 0% 0%;
-    animation: sandFall 5s linear infinite -2.5s;
+#sq3 {
+    margin-top: -25px;
+    margin-left: 15px;
+    animation: loader_5191 675ms ease-in-out 150ms infinite;
 }
 
-#preloader .bottom {
-    animation-delay: 0s;
+#sq4 {
+    margin-left: -25px;
+    animation: loader_5191 675ms ease-in-out 225ms infinite;
 }
 
-@keyframes spin {
-    0% {
-        transform: rotate(0deg);
-    }
-
-    25%,
-    50% {
-        transform: rotate(180deg);
-    }
+#sq5 {
+    animation: loader_5191 675ms ease-in-out 300ms infinite;
+}
 
-    75% {
-        transform: rotate(360deg);
-    }
+#sq6 {
+    margin-left: 15px;
+    animation: loader_5191 675ms ease-in-out 375ms infinite;
+}
 
-    100% {
-        transform: rotate(360deg);
-    }
+#sq7 {
+    margin-top: 15px;
+    margin-left: -25px;
+    animation: loader_5191 675ms ease-in-out 450ms infinite;
 }
 
-@keyframes sandFall {
-    0%, 100% {
-        border-radius: 5%;
-        transform: translate(35%, 20%) rotate(45deg);
-    }
-    15% {
-        border-radius: 40%;
-        transform: translate(0%, 35%) rotate(-65deg) scale(1.5, 1.5);
-    }
-    25% {
-        border-radius: 20%;
-        transform: translate(-15%, 35%) rotate(-90deg) scale(1.2, 1.2);
-    }
-    50% {
-        border-radius: 5%;
-        transform: translate(0%, 0%) rotate(-90deg) scale(1.1);
-        opacity: 1;
-    }
-    50.01%, 64.99% {
-        opacity: 0;
-    }
-    65% {
-        border-radius: 35%;
-        transform: translate(20%, 50%) rotate(30deg);
-        opacity: 1;
-    }
-    75% {
-        border-radius: 10%;
-        transform: translate(35%, 40%) rotate(45deg);
-    }
+#sq8 {
+    margin-top: 15px;
+    animation: loader_5191 675ms ease-in-out 525ms infinite;
 }
+
+#sq9 {
+    margin-top: 15px;
+    margin-left: 15px;
+    animation: loader_5191 675ms ease-in-out 600ms infinite;
+}
\ No newline at end of file
diff --git a/newsaggregator/static/assets/css/style.css b/newsaggregator/static/assets/css/style.css
index 5dbb5ac..d65e71c 100644
--- a/newsaggregator/static/assets/css/style.css
+++ b/newsaggregator/static/assets/css/style.css
@@ -60,7 +60,15 @@
 }
 
 
-
+.goog-te-combo{
+  border-radius: 5px;
+  padding: 4px;
+  color: var(--foreground-tertiary);
+}
+.VIpgJd-ZVi9od-l4eHX-hSRGPd img{
+  width: 90px;
+  height: 40px;
+}
 
 
 /*-----------------------------------*\ 
@@ -522,7 +530,7 @@ footer .footer-section {
 
 }
 
-footer .wrapper { text-align: center; }
+footer .wrapper { text-align: center;padding: 0; }
 
 .footer-logo { margin-bottom: 10px; }
 
diff --git a/newsaggregator/static/assets/js/preloader.js b/newsaggregator/static/assets/js/preloader.js
index c2a6093..64c94f0 100644
--- a/newsaggregator/static/assets/js/preloader.js
+++ b/newsaggregator/static/assets/js/preloader.js
@@ -1,9 +1,13 @@
 window.addEventListener('load', function() {
-    const preloader = document.getElementById('preloader');
-    const mainContent = document.querySelector('.outer-align');
+    const preloader = document.querySelector('.loader');
+    const mainContentlight = document.querySelector('.light-theme');
+    const mainContentdark = document.querySelector('.dark-theme');
 
     setTimeout(() => {
         preloader.style.display = 'none';
-        mainContent.style.display = 'flex';
+        mainContentlight.style.pointerEvents = 'all';
+        mainContentlight.style.overflow = 'auto';
+        mainContentdark.style.pointerEvents = 'all';
+        mainContentdark.style.overflow = 'auto';
     }, 100);
 });
diff --git a/newsaggregator/templates/components/footer.html b/newsaggregator/templates/components/footer.html
index 9b79382..61e892e 100644
--- a/newsaggregator/templates/components/footer.html
+++ b/newsaggregator/templates/components/footer.html
@@ -1,7 +1,7 @@
 {% load static %}
-<footer>
-    <div class="footer-section">
-        <div class="wrapper">
+<footer class="container">
+    <div class="footer-section row" style="justify-content: space-between;">
+        <div class="wrapper col-md-3 col-12">
             <a href="#" class="footer-logo">
                 <span class="logo-light">
                     <span class="logo-container"><img src="{% static './assets/images/news.png' %}" alt="logo" width="70" />Onion News</span>
@@ -16,7 +16,7 @@
             </p>
         </div>
 
-        <div class="wrapper">
+        <div class="wrapper col-md-3 col-12" style="justify-content: center;display: flex;">
             <div id="google_element"></div>
             <script src="https://translate.google.com/translate_a/element.js?cb=loadGoogleTranslate"></script>
             <script>
@@ -28,7 +28,7 @@
             </script>
         </div>
 
-        <div class="wrapper">
+        <div class="wrapper col-md-3 col-12" style="display: flex;justify-content: space-around;flex-direction: column;">
             <p class="footer-title">Legal Stuff</p>
             <ul>
                 <li>
diff --git a/newsaggregator/templates/partials/base.html b/newsaggregator/templates/partials/base.html
index db9e67f..75f0306 100644
--- a/newsaggregator/templates/partials/base.html
+++ b/newsaggregator/templates/partials/base.html
@@ -11,7 +11,8 @@
     <link rel="shortcut icon" href="{% static './assets/images/news.png' %}" type="image/x-icon">
 
     <!-- bootstrap css -->
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet"
+        integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
 
     <!--- custom css link-->
     <link rel="stylesheet" href="{% static './assets/css/contact.css' %}">
@@ -26,28 +27,32 @@
     <!--- google font link-->
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="https://fonts.googleapis.com/css2?family=Inter:wght@200;300;400;500;600;700;800;900&display=swap" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css2?family=Inter:wght@200;300;400;500;600;700;800;900&display=swap"
+        rel="stylesheet">
 
     <!-- toaster css -->
-    <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/css/toastr.min.css">
+    <link rel="stylesheet" type="text/css"
+        href="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/css/toastr.min.css">
 
 </head>
 
-<body class="light-theme">
+<body class="light-theme" style="pointer-events: none;overflow: hidden;scroll-behavior: smooth;">
 
     <!-- Preloader -->
-    <div id="preloader">
-        <div class="container">
-            <div class="cup top">
-                <div class="sand"></div>
-            </div>
-            <div class="cup">
-                <div class="sand bottom"></div>
-            </div>
-        </div>
+    <div class="loader">
+        <div class="square" id="sq1"></div>
+        <div class="square" id="sq2"></div>
+        <div class="square" id="sq3"></div>
+        <div class="square" id="sq4"></div>
+        <div class="square" id="sq5"></div>
+        <div class="square" id="sq6"></div>
+        <div class="square" id="sq7"></div>
+        <div class="square" id="sq8"></div>
+        <div class="square" id="sq9"></div>
     </div>
 
-    <div class="outer-align" style="display: none; flex-direction: column; justify-content: space-between; min-height: 100vh;">
+    <div class="outer-align"
+        style="display: flex; flex-direction: column; justify-content: space-between; min-height: 100vh;">
         <header>
             <div class="navbar-section">
                 {% include 'components/navbar.html' %}
@@ -55,7 +60,7 @@
             </div>
             {% block category %}
             {% endblock category %}
-            
+
             {% block index %}
 
             <!-- for authentication page -->
@@ -66,8 +71,24 @@
         </header>
         <div class="chat">
             <script src="https://cdn.botpress.cloud/webchat/v1/inject.js"></script>
-            <script src="https://mediafiles.botpress.cloud/6ce5b4e8-0a4b-4b34-9569-6d06fc3c8a1b/webchat/config.js" defer></script>
+            <script src="https://mediafiles.botpress.cloud/6ce5b4e8-0a4b-4b34-9569-6d06fc3c8a1b/webchat/config.js"
+                defer></script>
+                <style>
+                    .bp-widget-widget{
+                        bottom: 0px!important;
+                        right: 20px!important;
+                        scale: .8!important;
+                    }
+                    .bpw-widget-btn{
+                        width: 40px!important;
+                        height: 40px!important;
+                    }
+                    .bpw-floating-button::before{
+                        scale: .8!important;
+                    }
+                </style>
         </div>
+
         {% include 'components/footer.html' %}
     </div>
 
@@ -82,13 +103,13 @@
 
         // Function to apply the theme
         function applyTheme(theme) {
-          document.body.classList.remove('light-theme', 'dark-theme');
-          document.body.classList.add(theme);
+            document.body.classList.remove('light-theme', 'dark-theme');
+            document.body.classList.add(theme);
 
-          for (let i = 0; i < themeBtn.length; i++) {
-            themeBtn[i].classList.remove('light', 'dark');
-            themeBtn[i].classList.add(theme === 'light-theme' ? 'light' : 'dark');
-          }
+            for (let i = 0; i < themeBtn.length; i++) {
+                themeBtn[i].classList.remove('light', 'dark');
+                themeBtn[i].classList.add(theme === 'light-theme' ? 'light' : 'dark');
+            }
         }
 
         // Load theme from localStorage
@@ -96,16 +117,16 @@
         applyTheme(initialTheme);
 
         for (let i = 0; i < themeBtn.length; i++) {
-          themeBtn[i].addEventListener('click', function () {
-            const currentTheme = document.body.classList.contains('light-theme') ? 'light-theme' : 'dark-theme';
-            const newTheme = currentTheme === 'light-theme' ? 'dark-theme' : 'light-theme';
+            themeBtn[i].addEventListener('click', function () {
+                const currentTheme = document.body.classList.contains('light-theme') ? 'light-theme' : 'dark-theme';
+                const newTheme = currentTheme === 'light-theme' ? 'dark-theme' : 'light-theme';
 
-            // Apply the new theme
-            applyTheme(newTheme);
+                // Apply the new theme
+                applyTheme(newTheme);
 
-            // Save the new theme to localStorage
-            localStorage.setItem('theme', newTheme);
-          });
+                // Save the new theme to localStorage
+                localStorage.setItem('theme', newTheme);
+            });
         }
     </script>
     <script src="{% static 'assets/js/preloader.js' %}"></script>
@@ -113,22 +134,22 @@
 </body>
 
 
-    <!--- ionicon link-->
-    <script type="module" src="https://unpkg.com/ionicons@5.5.2/dist/ionicons/ionicons.esm.js"></script>
-    <script nomodule src="https://unpkg.com/ionicons@5.5.2/dist/ionicons/ionicons.js"></script>
+<!--- ionicon link-->
+<script type="module" src="https://unpkg.com/ionicons@5.5.2/dist/ionicons/ionicons.esm.js"></script>
+<script nomodule src="https://unpkg.com/ionicons@5.5.2/dist/ionicons/ionicons.js"></script>
 
-    <!--- custom js link-->
-    <script src="{% static 'assets/js/userauth.js' %}"></script>
-    <script src="{% static 'assets/js/script.js' %}"></script>
+<!--- custom js link-->
+<script src="{% static 'assets/js/userauth.js' %}"></script>
+<script src="{% static 'assets/js/script.js' %}"></script>
 
-    <!-- Bootstrap JS -->
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/2.11.6/umd/popper.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.0/js/bootstrap.min.js"></script>
+<!-- Bootstrap JS -->
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/2.11.6/umd/popper.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.0/js/bootstrap.min.js"></script>
 
-    <!-- toaster js -->
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/js/toastr.min.js"></script>
+<!-- toaster js -->
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/js/toastr.min.js"></script>
 
 
-</html>
+</html>
\ No newline at end of file