Merge branch 'development' into feature/893/filter_url_param

next-i18next.config.js

@@ -1,9 +1,6 @@
-const path = require("path");
-
 module.exports = {
   i18n: {
     defaultLocale: "tr",
     locales: ["en", "tr"],
-    localePath: path.resolve("./public/locales"),
   },
 };

next.config.js

@@ -27,7 +27,7 @@ module.exports = withPWA({
 module.exports = {
   images: {
     loader: "akamai",
-    path: "",
+    path: ".",
   },
   i18n,
 };

package.json

@@ -57,6 +57,8 @@
   },
   "devDependencies": {
     "@capacitor/cli": "4.6.3",
+    "@commitlint/cli": "^17.4.3",
+    "@commitlint/config-conventional": "^17.4.3",
     "@emotion/cache": "11.10.5",
     "@emotion/react": "11.10.5",
     "@emotion/server": "11.10.0",

src/pages/newlayout/index.tsx

@@ -0,0 +1,43 @@
+import Map from "@/components/UI/Map/Map";
+import useDefaultZoom from "@/hooks/useDefaultZoom";
+import useDefaultCenter from "@/hooks/useDefaultCenter";
+import { useDevice } from "@/stores/mapStore";
+import {
+  DEFAULT_MIN_ZOOM_DESKTOP,
+  DEFAULT_MIN_ZOOM_MOBILE,
+} from "@/components/UI/Map/utils";
+import { TileLayer } from "react-leaflet";
+
+const NHome = () => {
+  const { defaultZoom } = useDefaultZoom();
+  const { defaultCenter } = useDefaultCenter();
+  const device = useDevice();
+  return (
+    <>
+      <Map
+        center={defaultCenter}
+        zoom={defaultZoom}
+        minZoom={
+          device === "desktop"
+            ? DEFAULT_MIN_ZOOM_DESKTOP
+            : DEFAULT_MIN_ZOOM_MOBILE
+        }
+        zoomSnap={1}
+        zoomDelta={1}
+        preferCanvas
+        maxBoundsViscosity={1}
+        maxZoom={18}
+        whenReady={(map: any) => {
+          setTimeout(() => {
+            map.target.invalidateSize();
+          }, 100);
+        }}
+      >
+        <TileLayer
+          url={`https://mt0.google.com/vt/lyrs=m&hl=en&x={x}&y={y}&z={z}&apistyle=s.e%3Al.i%7Cp.v%3Aoff%2Cs.t%3A3%7Cs.e%3Ag%7C`}
+        />
+      </Map>
+    </>
+  );
+};
+export default NHome;

src/utils/date.ts

@@ -6,7 +6,7 @@ const MINUTES_IN_SEC = 60;
 
 export const getTimeAgo = (value: string, locale: string = "tr") => {
   const now = new Date().getTime();
-  const valueZtoGMT3 = value.replace("Z", "+03:00");
+  const valueZtoGMT3 = value?.replace("Z", "+03:00");
   const valueTime = new Date(valueZtoGMT3).getTime();
 
   if (!valueTime) return null;