fix the timezone problem, remove the travel restrictions info

koddist · Jul 1, 2024 · fd6c6b4 · fd6c6b4
1 parent ce11277
commit fd6c6b4
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 84 deletions.
diff --git a/src/components/exchange-rate/ExchangeRate.tsx b/src/components/exchange-rate/ExchangeRate.tsx
@@ -32,7 +32,7 @@ export default function ExchangeRate(props: CurrencyData) {
   }, [props]);
 
   useEffect(() => {
-    axios.get(`https://visperto.com/api/exchange-rate/?base=${baseCurrency}&quote=${props.targetCurrency}`)
+    axios.get(`${import.meta.env.PUBLIC_API_HOSTNAME}/exchange/?base=${baseCurrency}&quote=${props.targetCurrency}`)
       .then((response) => {
         const data: ExchangeRate = response.data;
         const fraction = Number(data[props.targetCurrency]) < 1 ? 5 : 2;

diff --git a/src/components/restrictions/Restrictions.tsx b/src/components/restrictions/Restrictions.tsx
diff --git a/src/components/time-and-date/TimeAndDate.tsx b/src/components/time-and-date/TimeAndDate.tsx
@@ -1,5 +1,5 @@
-import {useEffect, useState} from "preact/hooks";
-import {Fragment} from "preact";
+import { useEffect, useState } from "preact/hooks";
+import { Fragment } from "preact";
 import "./TimeAndDate.css";
 import axios from "axios";
 import Loading from "../loading/Loading";
@@ -13,7 +13,7 @@ export default function TimeAndDate(props: { timezone: number }) {
   const [loading, setLoading] = useState(true);
 
   useEffect(() => {
-    axios.get(`${import.meta.env.PUBLIC_API_HOSTNAME}/time?offset=${props.timezone}`)
+    axios.get(`https://visperto-api-time.ayazqv.workers.dev/time?offset=${props.timezone}`)
       .then((response) => {
         const data: { time: Date } = response.data;
         const serverTime = new Date(data.time);
@@ -68,4 +68,4 @@ export default function TimeAndDate(props: { timezone: number }) {
       </div>
     </div>
   </Fragment>);
-}
+}
diff --git a/src/models.interface.ts b/src/models.interface.ts
@@ -53,6 +53,8 @@ export interface Country {
     timezone: {
         timezone_offset: number;
         timezone_offset_with_dst: number;
+        dst_exists: boolean;
+        is_dst: boolean;
     }
 }
 

diff --git a/src/pages/travel/[country].astro b/src/pages/travel/[country].astro
@@ -8,7 +8,6 @@ import ExchangeRate from '../../components/exchange-rate/ExchangeRate';
 import TimeAndDate from '../../components/time-and-date/TimeAndDate';
 import InfoItem from '../../components/info-item/InfoItem';
 import InfoSection from '../../components/info-section/InfoSection';
-import Restrictions from '../../components/restrictions/Restrictions';
 import CountryStats from '../../components/CountryStats.astro';
 import {Country} from '../../models.interface';
 
@@ -29,7 +28,9 @@ export async function getStaticPaths() {
         flags: country.flags,
         timezone: {
             standard: country.timezone.timezone_offset,
-            daylightSaving: country.timezone.timezone_offset_with_dst
+            daylightSaving: country.timezone.timezone_offset_with_dst,
+            dstExists: country.timezone.dst_exists,
+            isDst: country.timezone.is_dst
         },
         capitalCoordinates: {
           latitude: country.capitalInfo.latlng[0],
@@ -99,7 +100,7 @@ const transformItems = (items: string[]) => {
                     targetCurrencySymbol={targetCurrencySymbol}></ExchangeRate>
             <TimeAndDate
                     client:only="preact"
-                    timezone={timezone.standard}></TimeAndDate>
+                    timezone={timezone.isDst ? timezone.daylightSaving : timezone.standard}></TimeAndDate>
         </CountryStats>
     </div>
     <InfoSection title="General information">
@@ -108,7 +109,6 @@ const transformItems = (items: string[]) => {
         <InfoItem icon="capital" title="Capital cities" value={transformItems(capital)}/>
         <InfoItem icon="world" title="Languages" value={transformItems(listOfLanguages)}/>
     </InfoSection>
-    <Restrictions client:load/>
 </Layout>
 
 <style>