From 803d81a160fcbae610a486efa1e483c58a66bb65 Mon Sep 17 00:00:00 2001
From: anastasiiaxfr <anastasiiaberest@gmail.com>
Date: Sat, 21 Dec 2024 11:35:03 +0200
Subject: [PATCH] fix tasks 01 && 04

---
 01-basics/20-weather/WeatherApp.js               | 16 ++++++----------
 .../MeetupDescription.vue                        |  2 +-
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/01-basics/20-weather/WeatherApp.js b/01-basics/20-weather/WeatherApp.js
index aa9e5c8..4dfb262 100644
--- a/01-basics/20-weather/WeatherApp.js
+++ b/01-basics/20-weather/WeatherApp.js
@@ -3,26 +3,22 @@ import { getWeatherData, WeatherConditionIcons } from './weather.service.ts'
 
 export default defineComponent({
   name: 'WeatherApp',
-  
+
   setup() {
     const weatherData = ref(getWeatherData())
 
-    const kelvinToCelsius = (temp) => {
-      return (temp - 273.15).toFixed(1) 
+    const kelvinToCelsius = temp => {
+      return (temp - 273.15).toFixed(1)
     }
 
     const isNightTime = (currentDt, sunrise, sunset) => {
-      const currentTime = new Date(`1970-01-01T${currentDt}:00`).getHours()
-      const sunriseHour = parseInt(sunrise.split(':')[0], 10)
-      const sunsetHour = parseInt(sunset.split(':')[0], 10)
-
-      return currentTime < sunriseHour || currentTime >= sunsetHour
+      return currentDt < sunrise || currentDt >= sunset
     }
 
     return {
       weatherData,
       kelvinToCelsius,
-      WeatherConditionIcons, 
+      WeatherConditionIcons,
       isNightTime,
     }
   },
@@ -34,7 +30,7 @@ export default defineComponent({
       <ul class="weather-list unstyled-list">
         <li class="weather-card" :class="{
             'weather-card--night': isNightTime(region.current.dt, region.current.sunrise, region.current.sunset)
-          }" v-for="(region, index) in weatherData" 
+          }" v-for="(region, index) in weatherData"
         :key="index">
           <div class="weather-alert" v-if="region.alert">
             <span class="weather-alert__icon">⚠️</span>
diff --git a/04-sfc/10-MeetupView-script-setup/MeetupDescription.vue b/04-sfc/10-MeetupView-script-setup/MeetupDescription.vue
index be6a07c..b45cdf7 100644
--- a/04-sfc/10-MeetupView-script-setup/MeetupDescription.vue
+++ b/04-sfc/10-MeetupView-script-setup/MeetupDescription.vue
@@ -21,7 +21,7 @@ defineProps({
 </script>
 
 <template>
-<div class="meetup-description" v-html="description"></div>
+  <div class="meetup-description">{{ description }}</div>
 </template>
 
 <style scoped>