resolved

2024-02-29 14:14:16 +06:00
commit e2db27b56f
@@ -9,6 +9,7 @@ import app_store_btn from "./icons/app-store-btn.svg";
 import play_market_btn from "./icons/play-market-btn.svg";
 import { Link } from "@/shared/config/navigation";
 import { useTranslations } from "next-intl";
+import NetKgTracker from "@/widgets/NetKgTracker/NetKgTracker";

 const Footer = () => {
  const t = useTranslations("general");
@@ -28,13 +29,15 @@ const Footer = () => {
            </li>
          ))}
        </ul>
+        <NetKgTracker />
      </div>

      <div className="footer__contacts">
        <h4>{t("contacts")}</h4>
        <ul>
-          <li>namename@gmail.com</li>
-          <li>+09646895467</li>
+          <li>admin@kgroad.org</li>
+          <li>+9960312394038</li>
+
          <li>
            {[youtube, facebook, instagram].map((net, i) => (
              <Link key={i} href="#">
@@ -43,8 +46,9 @@ const Footer = () => {
            ))}
          </li>
        </ul>
+        <p className="text-white">Photo By ThomasG, CC BY-SA 3.0</p>
      </div>
-
+      {/*
      <div className="footer__apps">
        <h4>{t("download_our_app")}</h4>
        <div className="footer__apps-btns">
@@ -55,6 +59,7 @@ const Footer = () => {
          ))}
        </div>
      </div>
+          */}
    </footer>
  );
 };
@@ -0,0 +1,37 @@
+"use client"
+import React, { useEffect, useState } from 'react';
+
+const NetKgTracker = () => {
+
+  const [imghref, setImghref] = useState('');
+
+  useEffect(() => {
+    var java="1.3";
+    var java1=""+"refer="+escape(document.referrer)+"&page="+escape(window.location.href);
+    document.cookie="astratop=1; path=/";
+    java1+="&c="+(document.cookie?"yes":"now");
+    java1+="&java="+(navigator.javaEnabled()?"yes":"now");
+    java1+="&razresh="+screen.width+'x'+screen.height+"&cvet="+
+    (((navigator.appName.substring(0,3)=="Mic"))?
+    screen.colorDepth:screen.pixelDepth);
+    java1+="&jscript="+java+"&rand="+Math.random();
+    setImghref("https://www.net.kg/img.php?id=7235&"+java1);
+
+  }, []);
+
+  return (
+    /*
+    <div>
+    <a href='https://www.net.kg/stat.php?id=7235&amp;fromsite=7235' target='_blank'>
+      <img src={imghref} alt='WWW.NET.KG' width='88' height='31' />
+      </a>
+    </div>
+    
+    Enable NetKgTracker only in production
+    */
+    <div/>
+)
+
+};
+
+export default NetKgTracker;
@@ -65,8 +65,7 @@ const ReviewSection: React.FC<IReviewsSectionProps> = ({
    const response = await apiInstance.get<IReviewList>(
      `/${endpoint}/${id}/reviews/?page_size=8`
    );
-
-    setReviews(response.data);
+    setReviews(response?.data);
  };

  useEffect(() => {
@@ -87,7 +87,10 @@ const SignInForm = () => {
        <button className="sign-in-form__btns_first" type="submit">
          {loader ? <Loader /> : "Войти"}
        </button>
+
+        {/*
        <GoogleButton />
+  */}
      </div>
    </form>
  );
@@ -119,7 +119,10 @@ const SignUpForm = () => {
        <button className="sign-up-form__btns_first" type="submit">
          {loader ? <Loader /> : "Войти"}
        </button>
+
+        {/*
        <GoogleButton />
+  */}
      </div>
    </form>
  );
@@ -14,8 +14,17 @@ const Header = () => {
        alt="Background Image"
      />
      <div className="header__text">
+<<<<<<< HEAD:src/widgets/home/Header/Header.tsx
        <h1>{t("title")}</h1>
        <p>{t("subtitle")}</p>
+=======
+        <h1>
+        Дороги Кыргызстана
+        </h1>
+        <p>
+        Сделаем дороги безопасными! Актуальная информация о состоянии дорог.
+        </p>
+>>>>>>> d1440f3907ca91b29db2977f043e44f54993aeb1:src/widgets/Header/Header.tsx
      </div>

      <HeaderLink />
@@ -52,6 +52,7 @@ const HomeMap: React.FC<IHomeMapProps> = ({
    const customIcon = new Icon({
      iconUrl: icon.src,
      iconSize: [32, 32],
+      iconAnchor: [16, 32],
    });

    return customIcon;
@@ -1,5 +1,53 @@
-<svg width="38" height="50" viewBox="0 0 38 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M19 0C8.52334 0 0 8.74812 0 19.501C0 32.8456 17.0031 48.5901 17.7271 49.4175C18.407 50.1948 19.5942 50.1935 20.2729 49.4175C20.9969 48.5901 38 32.8456 38 19.501C37.9998 8.74812 29.4766 0 19 0Z" fill="#3998E8" fill-opacity="0.7"/>
-<ellipse cx="18.7867" cy="19" rx="9.88775" ry="10" fill="white"/>
-<circle cx="18.5" cy="18.5" r="7.5" fill="#8FDE6A"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="38"
+   height="50"
+   viewBox="0 0 38 50"
+   fill="none"
+   version="1.1"
+   id="svg1"
+   sodipodi:docname="geo-green.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="5.4942197"
+     inkscape:cx="33.671751"
+     inkscape:cy="42.317201"
+     inkscape:window-width="1920"
+     inkscape:window-height="991"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1" />
+  <path
+     d="M 19,0 C 8.52334,0 0,8.74812 0,19.501 c 0,13.3446 17.0031,29.0891 17.7271,29.9165 0.6799,0.7773 1.8671,0.776 2.5458,0 C 20.9969,48.5901 38,32.8456 38,19.501 37.9998,8.74812 29.4766,0 19,0 Z"
+     fill="#3998e8"
+     fill-opacity="0.7"
+     id="path1" />
+  <ellipse
+     cx="18.786699"
+     cy="19"
+     rx="9.8877497"
+     ry="10"
+     fill="#ffffff"
+     id="ellipse1" />
+  <circle
+     cx="19"
+     cy="19"
+     r="7.5"
+     fill="#8fde6a"
+     id="circle1" />
 </svg>
@@ -1,5 +1,53 @@
-<svg width="38" height="50" viewBox="0 0 38 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M19 0C8.52334 0 0 8.74812 0 19.501C0 32.8456 17.0031 48.5901 17.7271 49.4175C18.407 50.1948 19.5942 50.1935 20.2729 49.4175C20.9969 48.5901 38 32.8456 38 19.501C37.9998 8.74812 29.4766 0 19 0Z" fill="#3998E8" fill-opacity="0.7"/>
-<ellipse cx="18.7867" cy="19" rx="9.88775" ry="10" fill="white"/>
-<circle cx="18.5" cy="18.5" r="7.5" fill="#FFAC33"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="38"
+   height="50"
+   viewBox="0 0 38 50"
+   fill="none"
+   version="1.1"
+   id="svg1"
+   sodipodi:docname="geo-orange.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="7.77"
+     inkscape:cx="17.631918"
+     inkscape:cy="29.79408"
+     inkscape:window-width="1920"
+     inkscape:window-height="991"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1" />
+  <path
+     d="M 19,0 C 8.52334,0 0,8.74812 0,19.501 c 0,13.3446 17.0031,29.0891 17.7271,29.9165 0.6799,0.7773 1.8671,0.776 2.5458,0 C 20.9969,48.5901 38,32.8456 38,19.501 37.9998,8.74812 29.4766,0 19,0 Z"
+     fill="#3998e8"
+     fill-opacity="0.7"
+     id="path1" />
+  <ellipse
+     cx="18.786699"
+     cy="19"
+     rx="9.8877497"
+     ry="10"
+     fill="#ffffff"
+     id="ellipse1" />
+  <circle
+     cx="19"
+     cy="19"
+     r="7.5"
+     fill="#ffac33"
+     id="circle1" />
 </svg>
@@ -1,5 +1,53 @@
-<svg width="38" height="50" viewBox="0 0 38 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M19 0C8.52334 0 0 8.74812 0 19.501C0 32.8456 17.0031 48.5901 17.7271 49.4175C18.407 50.1948 19.5942 50.1935 20.2729 49.4175C20.9969 48.5901 38 32.8456 38 19.501C37.9998 8.74812 29.4766 0 19 0Z" fill="#3998E8" fill-opacity="0.7"/>
-<ellipse cx="18.7867" cy="19" rx="9.88775" ry="10" fill="white"/>
-<circle cx="18.5" cy="18.5" r="7.5" fill="#C288E2"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="38"
+   height="50"
+   viewBox="0 0 38 50"
+   fill="none"
+   version="1.1"
+   id="svg1"
+   sodipodi:docname="geo-pink.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="15.54"
+     inkscape:cx="18.661519"
+     inkscape:cy="22.297297"
+     inkscape:window-width="1920"
+     inkscape:window-height="991"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1" />
+  <path
+     d="M 19,0 C 8.52334,0 0,8.74812 0,19.501 c 0,13.3446 17.0031,29.0891 17.7271,29.9165 0.6799,0.7773 1.8671,0.776 2.5458,0 C 20.9969,48.5901 38,32.8456 38,19.501 37.9998,8.74812 29.4766,0 19,0 Z"
+     fill="#3998e8"
+     fill-opacity="0.7"
+     id="path1" />
+  <ellipse
+     cx="18.786699"
+     cy="19"
+     rx="9.8877497"
+     ry="10"
+     fill="#ffffff"
+     id="ellipse1" />
+  <circle
+     cx="19"
+     cy="19"
+     r="7.5"
+     fill="#c288e2"
+     id="circle1" />
 </svg>
@@ -1,5 +1,53 @@
-<svg width="38" height="50" viewBox="0 0 38 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M19 0C8.52334 0 0 8.74812 0 19.501C0 32.8456 17.0031 48.5901 17.7271 49.4175C18.407 50.1948 19.5942 50.1935 20.2729 49.4175C20.9969 48.5901 38 32.8456 38 19.501C37.9998 8.74812 29.4766 0 19 0Z" fill="#3998E8" fill-opacity="0.7"/>
-<ellipse cx="18.7867" cy="19" rx="9.88775" ry="10" fill="white"/>
-<circle cx="18.5" cy="18.5" r="7.5" fill="#87289D"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="38"
+   height="50"
+   viewBox="0 0 38 50"
+   fill="none"
+   version="1.1"
+   id="svg1"
+   sodipodi:docname="geo-purple.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="15.54"
+     inkscape:cx="18.983269"
+     inkscape:cy="25"
+     inkscape:window-width="1920"
+     inkscape:window-height="991"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1" />
+  <path
+     d="M 19,0 C 8.52334,0 0,8.74812 0,19.501 c 0,13.3446 17.0031,29.0891 17.7271,29.9165 0.6799,0.7773 1.8671,0.776 2.5458,0 C 20.9969,48.5901 38,32.8456 38,19.501 37.9998,8.74812 29.4766,0 19,0 Z"
+     fill="#3998e8"
+     fill-opacity="0.7"
+     id="path1" />
+  <ellipse
+     cx="18.786699"
+     cy="19"
+     rx="9.8877497"
+     ry="10"
+     fill="#ffffff"
+     id="ellipse1" />
+  <circle
+     cx="19"
+     cy="19"
+     r="7.5"
+     fill="#87289d"
+     id="circle1" />
 </svg>
@@ -1,5 +1,53 @@
-<svg width="38" height="50" viewBox="0 0 38 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M19 0C8.52334 0 0 8.74812 0 19.501C0 32.8456 17.0031 48.5901 17.7271 49.4175C18.407 50.1948 19.5942 50.1935 20.2729 49.4175C20.9969 48.5901 38 32.8456 38 19.501C37.9998 8.74812 29.4766 0 19 0Z" fill="#3998E8" fill-opacity="0.7"/>
-<ellipse cx="18.7867" cy="19" rx="9.88775" ry="10" fill="white"/>
-<circle cx="18.5" cy="18.5" r="7.5" fill="#E64452"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="38"
+   height="50"
+   viewBox="0 0 38 50"
+   fill="none"
+   version="1.1"
+   id="svg1"
+   sodipodi:docname="geo-red.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="10.988439"
+     inkscape:cx="27.301421"
+     inkscape:cy="35.264336"
+     inkscape:window-width="1920"
+     inkscape:window-height="991"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1" />
+  <path
+     d="M 19,0 C 8.52334,0 0,8.74812 0,19.501 c 0,13.3446 17.0031,29.0891 17.7271,29.9165 0.6799,0.7773 1.8671,0.776 2.5458,0 C 20.9969,48.5901 38,32.8456 38,19.501 37.9998,8.74812 29.4766,0 19,0 Z"
+     fill="#3998e8"
+     fill-opacity="0.7"
+     id="path1" />
+  <ellipse
+     cx="18.786699"
+     cy="19"
+     rx="9.8877497"
+     ry="10"
+     fill="#ffffff"
+     id="ellipse1" />
+  <circle
+     cx="19"
+     cy="19"
+     r="7.5"
+     fill="#e64452"
+     id="circle1" />
 </svg>
@@ -1,5 +1,53 @@
-<svg width="38" height="50" viewBox="0 0 38 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M19 0C8.52334 0 0 8.74812 0 19.501C0 32.8456 17.0031 48.5901 17.7271 49.4175C18.407 50.1948 19.5942 50.1935 20.2729 49.4175C20.9969 48.5901 38 32.8456 38 19.501C37.9998 8.74812 29.4766 0 19 0Z" fill="#3998E8" fill-opacity="0.7"/>
-<ellipse cx="18.7867" cy="19" rx="9.88775" ry="10" fill="white"/>
-<circle cx="18.5" cy="18.5" r="7.5" fill="#FED363"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="38"
+   height="50"
+   viewBox="0 0 38 50"
+   fill="none"
+   version="1.1"
+   id="svg1"
+   sodipodi:docname="geo-yellow.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="15.54"
+     inkscape:cx="18.983269"
+     inkscape:cy="25"
+     inkscape:window-width="1920"
+     inkscape:window-height="991"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1" />
+  <path
+     d="M 19,0 C 8.52334,0 0,8.74812 0,19.501 c 0,13.3446 17.0031,29.0891 17.7271,29.9165 0.6799,0.7773 1.8671,0.776 2.5458,0 C 20.9969,48.5901 38,32.8456 38,19.501 37.9998,8.74812 29.4766,0 19,0 Z"
+     fill="#3998e8"
+     fill-opacity="0.7"
+     id="path1" />
+  <ellipse
+     cx="18.786699"
+     cy="19"
+     rx="9.8877497"
+     ry="10"
+     fill="#ffffff"
+     id="ellipse1" />
+  <circle
+     cx="19"
+     cy="19"
+     r="7.5"
+     fill="#fed363"
+     id="circle1" />
 </svg>