From 6c219bba1770692e066a14c794c9a45c01929bfb Mon Sep 17 00:00:00 2001 From: Vombat Date: Wed, 25 Dec 2024 17:17:37 +0300 Subject: [PATCH 01/13] =?UTF-8?q?4=D0=B5=20=D0=B7=D0=B0=D0=BD=D1=8F=D1=82?= =?UTF-8?q?=D0=B8=D0=B5=20-=201=D1=8F=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 03-components/10-MeetupView/MeetupView.js | 62 +++++++++++++---------- 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/03-components/10-MeetupView/MeetupView.js b/03-components/10-MeetupView/MeetupView.js index c2715d1..aeb2eb3 100644 --- a/03-components/10-MeetupView/MeetupView.js +++ b/03-components/10-MeetupView/MeetupView.js @@ -1,5 +1,5 @@ -import { defineComponent } from 'vue' -import { UiAlert, UiContainer } from '@shgk/vue-course-ui' +import {defineComponent} from 'vue' +import {UiAlert, UiContainer} from '@shgk/vue-course-ui' import MeetupAgenda from './MeetupAgenda.js' import MeetupDescription from './MeetupDescription.js' import MeetupCover from './MeetupCover.js' @@ -7,40 +7,48 @@ import MeetupInfo from './MeetupInfo.js' import './MeetupView.css' export default defineComponent({ - name: 'MeetupView', + name: 'MeetupView', - components: { - UiAlert, - UiContainer, - }, + components: { + UiAlert, + UiContainer, + MeetupCover, + MeetupDescription, + MeetupInfo, + MeetupAgenda + }, - template: ` -
+ props: { + meetup: Object + }, - + template: ` +
+ - -
-
-

Описание

+ +
+
+

Описание

- + -

Программа

+

Программа

- - - + + + + Программа пока пуста... -
-
+
+
- + -
-
+
+
+
+
- -
- `, + `, }) From cb987180f3024762afd5ca4bbaeae6ee3a903d35 Mon Sep 17 00:00:00 2001 From: Vombat Date: Wed, 25 Dec 2024 18:52:08 +0300 Subject: [PATCH 02/13] =?UTF-8?q?4=D0=B5=20=D0=B7=D0=B0=D0=BD=D1=8F=D1=82?= =?UTF-8?q?=D0=B8=D0=B5=20-=202=D1=8F=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 03-components/20-UiClock/UiClock.js | 30 +++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/03-components/20-UiClock/UiClock.js b/03-components/20-UiClock/UiClock.js index 8215f32..7877c20 100644 --- a/03-components/20-UiClock/UiClock.js +++ b/03-components/20-UiClock/UiClock.js @@ -1,9 +1,31 @@ -import { defineComponent } from 'vue' +import {defineComponent, onMounted, onUnmounted, ref} from 'vue' +const INTERVAL = 1000; export default defineComponent({ - name: 'UiClock', + name: 'UiClock', - setup() {}, + setup() { + const currentTime = ref(null); + let timer = 0; - template: `
10:12:02
`, + function setCurrentTime() { + currentTime.value = new Date().toLocaleTimeString(navigator.language, {timeStyle: 'medium'}); + } + + onMounted(() => { + timer = setInterval(() => setCurrentTime(), INTERVAL) + setCurrentTime() + }) + + onUnmounted (() => { + clearInterval(timer) + }) + + return { + currentTime + } + }, + + template: ` +
{{ currentTime }}
`, }) From 2ef4a6897e358ed19824ab58f0f62f2b06cd7da2 Mon Sep 17 00:00:00 2001 From: Vombat Date: Wed, 25 Dec 2024 19:10:07 +0300 Subject: [PATCH 03/13] =?UTF-8?q?4=D0=B5=20=D0=B7=D0=B0=D0=BD=D1=8F=D1=82?= =?UTF-8?q?=D0=B8=D0=B5=20-=203=D1=8F=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../30-removable-emails/EmailList.js | 41 +++--- .../30-removable-emails/EmailListItem.js | 36 +++--- .../30-removable-emails/MarkedEmailsApp.js | 122 +++++++++--------- 3 files changed, 102 insertions(+), 97 deletions(-) diff --git a/03-components/30-removable-emails/EmailList.js b/03-components/30-removable-emails/EmailList.js index 7c8096e..c84a9ab 100644 --- a/03-components/30-removable-emails/EmailList.js +++ b/03-components/30-removable-emails/EmailList.js @@ -2,27 +2,30 @@ import { defineComponent } from 'vue' import EmailListItem from './EmailListItem.js' export default defineComponent({ - name: 'EmailList', + name: 'EmailList', - components: { - EmailListItem, - }, + components: { + EmailListItem, + }, - props: { - emails: { - type: Array, - required: true, + props: { + emails: { + type: Array, + required: true, + }, }, - }, - template: ` -
    - -
- `, + emits: ['remove'], + + template: ` +
    + +
+ `, }) diff --git a/03-components/30-removable-emails/EmailListItem.js b/03-components/30-removable-emails/EmailListItem.js index c88ef26..ed33f49 100644 --- a/03-components/30-removable-emails/EmailListItem.js +++ b/03-components/30-removable-emails/EmailListItem.js @@ -1,24 +1,26 @@ -import { defineComponent } from 'vue' +import {defineComponent} from 'vue' export default defineComponent({ - name: 'EmailListItem', + name: 'EmailListItem', - props: { - email: { - type: String, - required: true, - }, + props: { + email: { + type: String, + required: true, + }, - marked: { - type: Boolean, - default: false, + marked: { + type: Boolean, + default: false, + }, }, - }, - template: ` -
  • - {{ email }} - -
    • - `, + emits: ['click-del'], + + template: ` +
  • + {{ email }} + +
    • + `, }) diff --git a/03-components/30-removable-emails/MarkedEmailsApp.js b/03-components/30-removable-emails/MarkedEmailsApp.js index 5e77151..2ee09e8 100644 --- a/03-components/30-removable-emails/MarkedEmailsApp.js +++ b/03-components/30-removable-emails/MarkedEmailsApp.js @@ -1,75 +1,75 @@ -import { computed, defineComponent, ref } from 'vue' -import { UiFormGroup, UiInput } from '@shgk/vue-course-ui' +import {computed, defineComponent, ref} from 'vue' +import {UiFormGroup, UiInput} from '@shgk/vue-course-ui' import EmailList from './EmailList.js' // Значения взяты из https://jsonplaceholder.typicode.com/comments export function getEmails() { - return [ - 'Eliseo@gardner.biz', - 'Jayne_Kuhic@sydney.com', - 'Nikita@garfield.biz', - 'Lew@alysha.tv', - 'Hayden@althea.biz', - 'Presley.Mueller@myrl.com', - 'Dallas@ole.me', - 'Mallory_Kunze@marie.org', - 'Meghan_Littel@rene.us', - 'Carmen_Keeling@caroline.name', - 'Veronica_Goodwin@timmothy.net', - 'Oswald.Vandervort@leanne.org', - 'Kariane@jadyn.tv', - 'Nathan@solon.io', - 'Maynard.Hodkiewicz@roberta.com', - 'Christine@ayana.info', - 'Preston_Hudson@blaise.tv', - 'Vincenza_Klocko@albertha.name', - 'Madelynn.Gorczany@darion.biz', - 'Mariana_Orn@preston.org', - 'Noemie@marques.me', - 'Khalil@emile.co.uk', - 'Sophia@arianna.co.uk', - 'Jeffery@juwan.us', - 'Isaias_Kuhic@jarrett.net', - ] + return [ + 'Eliseo@gardner.biz', + 'Jayne_Kuhic@sydney.com', + 'Nikita@garfield.biz', + 'Lew@alysha.tv', + 'Hayden@althea.biz', + 'Presley.Mueller@myrl.com', + 'Dallas@ole.me', + 'Mallory_Kunze@marie.org', + 'Meghan_Littel@rene.us', + 'Carmen_Keeling@caroline.name', + 'Veronica_Goodwin@timmothy.net', + 'Oswald.Vandervort@leanne.org', + 'Kariane@jadyn.tv', + 'Nathan@solon.io', + 'Maynard.Hodkiewicz@roberta.com', + 'Christine@ayana.info', + 'Preston_Hudson@blaise.tv', + 'Vincenza_Klocko@albertha.name', + 'Madelynn.Gorczany@darion.biz', + 'Mariana_Orn@preston.org', + 'Noemie@marques.me', + 'Khalil@emile.co.uk', + 'Sophia@arianna.co.uk', + 'Jeffery@juwan.us', + 'Isaias_Kuhic@jarrett.net', + ] } export default defineComponent({ - name: 'MarkedEmailsApp', + name: 'MarkedEmailsApp', - components: { - UiFormGroup, - UiInput, - EmailList, - }, + components: { + UiFormGroup, + UiInput, + EmailList, + }, - setup() { - const emails = ref(getEmails()) - const query = ref('') + setup() { + const emails = ref(getEmails()) + const query = ref('') - const markedEmails = computed(() => { - return emails.value.map(email => ({ - email, - isMarked: !!(query.value && email.toLowerCase().includes(query.value.toLowerCase())), - })) - }) + const markedEmails = computed(() => { + return emails.value.map(email => ({ + email, + isMarked: !!(query.value && email.toLowerCase().includes(query.value.toLowerCase())), + })) + }) - function removeEmailByIndex(index) { - emails.value.splice(index, 1) - } + function removeEmailByIndex(index) { + emails.value.splice(index, 1) + } - return { - query, - markedEmails, - removeEmailByIndex, - } - }, + return { + query, + markedEmails, + removeEmailByIndex, + } + }, - template: ` -
    - - - - -
    - `, + template: ` +
    + + + + +
    + `, }) From a164aa65ec13f440fbf4a56939df5ad8375c5d5c Mon Sep 17 00:00:00 2001 From: Vombat Date: Fri, 27 Dec 2024 01:08:08 +0300 Subject: [PATCH 04/13] =?UTF-8?q?4=D0=B5=20=D0=B7=D0=B0=D0=BD=D1=8F=D1=82?= =?UTF-8?q?=D0=B8=D0=B5=20-=204=D1=8F=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 03-components/40-UiCounter/UiCounter.js | 80 +++++++++++++++++++------ 1 file changed, 61 insertions(+), 19 deletions(-) diff --git a/03-components/40-UiCounter/UiCounter.js b/03-components/40-UiCounter/UiCounter.js index 48ae865..22bdc13 100644 --- a/03-components/40-UiCounter/UiCounter.js +++ b/03-components/40-UiCounter/UiCounter.js @@ -1,23 +1,65 @@ -import { defineComponent } from 'vue' -import { UiButton } from '@shgk/vue-course-ui' +import {defineComponent, toRef} from 'vue' +import {UiButton} from '@shgk/vue-course-ui' import './UiCounter.css' export default defineComponent({ - name: 'UiCounter', - - components: { - UiButton, - }, - - setup() { - // Рекомендуется для практики реализовать обработку событий внутри setup, а не непосредственно в шаблоне - }, - - template: ` -
    - ➖ - 3 - ➕ -
    - `, + name: 'UiCounter', + + components: { + UiButton, + }, + + props: { + count: { + type: Number, + required: true, + }, + + min: { + type: Number, + default: 0 + }, + + max: { + type: Number, + default: Infinity + }, + }, + + setup(props, { emit }) { + // Рекомендуется для практики реализовать обработку событий внутри setup, а не непосредственно в шаблоне + const countTemp = toRef(() => props.count); + + function decrementCount() { + const newValue = countTemp.value - 1; + emit('update:count', newValue) + } + + function incrementCount() { + const newValue = countTemp.value + 1; + emit('update:count', newValue) + } + + return { + countTemp, + decrementCount, + incrementCount + } + }, + + template: ` +
    + ➖ + {{ countTemp }} + ➕ +
    + `, }) From b4e47a4d2c5a9c01605f6c4e5d6e3072a8535228 Mon Sep 17 00:00:00 2001 From: Vombat Date: Fri, 27 Dec 2024 02:01:19 +0300 Subject: [PATCH 05/13] =?UTF-8?q?4=D0=B5=20=D0=B7=D0=B0=D0=BD=D1=8F=D1=82?= =?UTF-8?q?=D0=B8=D0=B5=20-=205=D1=8F=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../50-weather-components/WeatherApp.js | 80 ++++++++----------- .../components/WeatherCard.js | 65 +++++++++++++++ .../components/WeatherCardAlert.js | 20 +++++ .../components/WeatherCardConditions.js | 48 +++++++++++ .../components/WeatherCardDetails.js | 58 ++++++++++++++ 5 files changed, 224 insertions(+), 47 deletions(-) create mode 100644 03-components/50-weather-components/components/WeatherCard.js create mode 100644 03-components/50-weather-components/components/WeatherCardAlert.js create mode 100644 03-components/50-weather-components/components/WeatherCardConditions.js create mode 100644 03-components/50-weather-components/components/WeatherCardDetails.js diff --git a/03-components/50-weather-components/WeatherApp.js b/03-components/50-weather-components/WeatherApp.js index 5fb34c3..e41e051 100644 --- a/03-components/50-weather-components/WeatherApp.js +++ b/03-components/50-weather-components/WeatherApp.js @@ -1,52 +1,38 @@ import { defineComponent } from 'vue' -import { getWeatherData, WeatherConditionIcons } from './weather.service.ts' +import { getWeatherData } from './weather.service.ts' +import WeatherCard from "./components/WeatherCard.js"; import './WeatherApp.css' + + export default defineComponent({ - name: 'WeatherApp', - - template: ` -
    -

    Погода в Средиземье

    - -
      -
    • -
      - ⚠️ - Королевская метеослужба короля Арагорна II: Предвещается наступление сильного шторма. -
      -
      -

      - Гондор -

      -
      - 07:17 -
      -
      -
      -
      ⛈️
      -
      15.0 °C
      -
      -
      -
      -
      Давление, мм рт. ст.
      -
      754
      -
      -
      -
      Влажность, %
      -
      90
      -
      -
      -
      Облачность, %
      -
      100
      -
      -
      -
      Ветер, м/с
      -
      10.5
      -
      -
      -
      • -
    -
    - `, + name: 'WeatherApp', + + components: { + WeatherCard + }, + + setup() { + const weatherData = getWeatherData(); + + return { + weatherData + } + }, + + template: ` +
    +

    Погода в Средиземье

    + +
      + +
    +
    + `, }) + diff --git a/03-components/50-weather-components/components/WeatherCard.js b/03-components/50-weather-components/components/WeatherCard.js new file mode 100644 index 0000000..d1e25bd --- /dev/null +++ b/03-components/50-weather-components/components/WeatherCard.js @@ -0,0 +1,65 @@ +import { defineComponent } from 'vue' +import WeatherCardAlert from "./WeatherCardAlert.js"; +import WeatherCardConditions from "./WeatherCardConditions.js"; +import WeatherCardDetails from "./WeatherCardDetails.js"; + + +function isDayNow(currientTime, sunriseTime, sunsetTime) { + return sunriseTime < currientTime && currientTime < sunsetTime; +} + +function pressureConvert(pressure) { + return Math.round(pressure * 0.75 ); +} + +export default defineComponent({ + name: 'WeatherCard', + + components: { + WeatherCardAlert, + WeatherCardConditions, + WeatherCardDetails + }, + + props: { + data: { + type: Object, + require: true + } + }, + + setup() { + return { + isDayNow, + pressureConvert + } + }, + + template: ` +
  • + + +
    +

    + {{ data.geographic_name }} +

    +
    + {{ data.current.dt }} +
    +
    + + + + +
    • + `, +}) diff --git a/03-components/50-weather-components/components/WeatherCardAlert.js b/03-components/50-weather-components/components/WeatherCardAlert.js new file mode 100644 index 0000000..b717497 --- /dev/null +++ b/03-components/50-weather-components/components/WeatherCardAlert.js @@ -0,0 +1,20 @@ +import { defineComponent } from 'vue' + +export default defineComponent({ + name: 'WeatherCard', + + props: { + alert: { + type: Object, + require: true + } + }, + + template: ` +
    + ⚠️ + {{ alert.sender_name }}: + {{ alert.description }} +
    + `, +}) diff --git a/03-components/50-weather-components/components/WeatherCardConditions.js b/03-components/50-weather-components/components/WeatherCardConditions.js new file mode 100644 index 0000000..40b7858 --- /dev/null +++ b/03-components/50-weather-components/components/WeatherCardConditions.js @@ -0,0 +1,48 @@ +import { defineComponent } from 'vue' +import { WeatherConditionIcons } from '../weather.service.ts' + +function getIconByConditionId(id) { + return WeatherConditionIcons[parseInt(id)] || ''; +} + +function kelvinToCelsius(tempK) { + return (tempK - 273.15).toFixed(1); +} + + +export default defineComponent({ + name: 'WeatherCardConditions', + + props: { + id: { + type: Number, + require: true + }, + + temp: { + type: Number, + require: true + }, + + title: { + type: String, + default: '' + }, + }, + + setup() { + return { + getIconByConditionId, + kelvinToCelsius + } + }, + + template: ` +
    +
    + {{ getIconByConditionId(id) }} +
    +
    {{ kelvinToCelsius(temp) }} °C
    +
    + `, +}) diff --git a/03-components/50-weather-components/components/WeatherCardDetails.js b/03-components/50-weather-components/components/WeatherCardDetails.js new file mode 100644 index 0000000..02d125f --- /dev/null +++ b/03-components/50-weather-components/components/WeatherCardDetails.js @@ -0,0 +1,58 @@ +import { defineComponent } from 'vue' + +function pressureConvert(pressure) { + return Math.round(pressure * 0.75 ); +} + +export default defineComponent({ + name: 'WeatherCard', + + props: { + clouds: { + type: Number || String, + default: '--' + }, + + humidity: { + type: Number || String, + default: '--' + }, + + pressure: { + type: Number, + require: true + }, + + windSpeed: { + type: Number || String, + default: '--' + }, + }, + + setup() { + return { + pressureConvert + } + }, + + template: ` +
    +
    +
    Давление, мм рт. ст.
    +
    {{ pressureConvert(pressure) }}
    +
    +
    +
    Влажность, %
    +
    {{ humidity }}
    +
    +
    +
    Облачность, %
    +
    {{ clouds }}
    +
    +
    +
    Ветер, м/с
    +
    {{ windSpeed }}
    +
    +
    + `, +}) From 2a11b27c27898a64fa17db8f6848c5c9893a3ca3 Mon Sep 17 00:00:00 2001 From: Vombat Date: Fri, 27 Dec 2024 02:03:01 +0300 Subject: [PATCH 06/13] =?UTF-8?q?4=D0=B5=20=D0=B7=D0=B0=D0=BD=D1=8F=D1=82?= =?UTF-8?q?=D0=B8=D0=B5=20-=205=D1=8F=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87?= =?UTF-8?q?=D0=B0=20-=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=B8=D0=BC=D0=B5=D0=BD=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../50-weather-components/components/WeatherCardAlert.js | 2 +- .../50-weather-components/components/WeatherCardDetails.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/03-components/50-weather-components/components/WeatherCardAlert.js b/03-components/50-weather-components/components/WeatherCardAlert.js index b717497..49b4d85 100644 --- a/03-components/50-weather-components/components/WeatherCardAlert.js +++ b/03-components/50-weather-components/components/WeatherCardAlert.js @@ -1,7 +1,7 @@ import { defineComponent } from 'vue' export default defineComponent({ - name: 'WeatherCard', + name: 'WeatherCardAlert', props: { alert: { diff --git a/03-components/50-weather-components/components/WeatherCardDetails.js b/03-components/50-weather-components/components/WeatherCardDetails.js index 02d125f..b111238 100644 --- a/03-components/50-weather-components/components/WeatherCardDetails.js +++ b/03-components/50-weather-components/components/WeatherCardDetails.js @@ -5,7 +5,7 @@ function pressureConvert(pressure) { } export default defineComponent({ - name: 'WeatherCard', + name: 'WeatherCardDetails', props: { clouds: { From 22f8d7e2ace1d21b935e939a7d80b87de51a8c6c Mon Sep 17 00:00:00 2001 From: Vombat Date: Wed, 15 Jan 2025 00:35:07 +0300 Subject: [PATCH 07/13] =?UTF-8?q?4=D0=B5=20=D0=B7=D0=B0=D0=BD=D1=8F=D1=82?= =?UTF-8?q?=D0=B8=D0=B5=20-=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=BF=D0=BE=20=D1=80=D0=B5=D0=B2=D1=8C=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 03-components/30-removable-emails/MarkedEmailsApp.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/03-components/30-removable-emails/MarkedEmailsApp.js b/03-components/30-removable-emails/MarkedEmailsApp.js index 2ee09e8..24ffa50 100644 --- a/03-components/30-removable-emails/MarkedEmailsApp.js +++ b/03-components/30-removable-emails/MarkedEmailsApp.js @@ -69,7 +69,7 @@ export default defineComponent({ - +
    `, }) From 2f7ee6c2901d02de48b13303346303a5f55b191b Mon Sep 17 00:00:00 2001 From: Vombat Date: Wed, 15 Jan 2025 00:38:06 +0300 Subject: [PATCH 08/13] =?UTF-8?q?4=D0=B5=20=D0=B7=D0=B0=D0=BD=D1=8F=D1=82?= =?UTF-8?q?=D0=B8=D0=B5=20-=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=BF=D0=BE=20=D1=80=D0=B5=D0=B2=D1=8C=D1=8E=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 03-components/10-MeetupView/MeetupView.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/03-components/10-MeetupView/MeetupView.js b/03-components/10-MeetupView/MeetupView.js index aeb2eb3..662619c 100644 --- a/03-components/10-MeetupView/MeetupView.js +++ b/03-components/10-MeetupView/MeetupView.js @@ -19,7 +19,10 @@ export default defineComponent({ }, props: { - meetup: Object + meetup: { + type: Object, + require: true + }, }, template: ` From 0c3e31eebf4c01afe345582e85c9dea0ccf919b6 Mon Sep 17 00:00:00 2001 From: Vombat Date: Wed, 15 Jan 2025 00:44:08 +0300 Subject: [PATCH 09/13] =?UTF-8?q?4=D0=B5=20=D0=B7=D0=B0=D0=BD=D1=8F=D1=82?= =?UTF-8?q?=D0=B8=D0=B5=20-=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=BF=D0=BE=20=D1=80=D0=B5=D0=B2=D1=8C=D1=8E=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 03-components/50-weather-components/WeatherApp.js | 2 +- .../50-weather-components/components/WeatherCard.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/03-components/50-weather-components/WeatherApp.js b/03-components/50-weather-components/WeatherApp.js index e41e051..74db91f 100644 --- a/03-components/50-weather-components/WeatherApp.js +++ b/03-components/50-weather-components/WeatherApp.js @@ -25,7 +25,7 @@ export default defineComponent({

    Погода в Средиземье

      - - +

      @@ -48,13 +48,13 @@ export default defineComponent({

      - - Date: Wed, 15 Jan 2025 18:17:13 +0300 Subject: [PATCH 10/13] =?UTF-8?q?5=D0=B5=20=D0=B7=D0=B0=D0=BD=D1=8F=D1=82?= =?UTF-8?q?=D0=B8=D0=B5=20-=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D0=B0=201=20S?= =?UTF-8?q?FC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MeetupAgenda.vue | 17 +-- .../MeetupAgendaItem.vue | 128 ++++++++--------- .../MeetupCover.vue | 71 +++++----- .../MeetupDescription.vue | 12 +- .../10-MeetupView-script-setup/MeetupInfo.vue | 84 +++++------ .../10-MeetupView-script-setup/MeetupView.vue | 130 +++++++++--------- 6 files changed, 198 insertions(+), 244 deletions(-) diff --git a/04-sfc/10-MeetupView-script-setup/MeetupAgenda.vue b/04-sfc/10-MeetupView-script-setup/MeetupAgenda.vue index d5dee66..24f1ec1 100644 --- a/04-sfc/10-MeetupView-script-setup/MeetupAgenda.vue +++ b/04-sfc/10-MeetupView-script-setup/MeetupAgenda.vue @@ -1,20 +1,11 @@ - diff --git a/04-sfc/10-MeetupView-script-setup/MeetupAgendaItem.vue b/04-sfc/10-MeetupView-script-setup/MeetupAgendaItem.vue index 5674dd3..9df1741 100644 --- a/04-sfc/10-MeetupView-script-setup/MeetupAgendaItem.vue +++ b/04-sfc/10-MeetupView-script-setup/MeetupAgendaItem.vue @@ -1,108 +1,94 @@ - diff --git a/04-sfc/10-MeetupView-script-setup/MeetupCover.vue b/04-sfc/10-MeetupView-script-setup/MeetupCover.vue index b53fc38..157afc2 100644 --- a/04-sfc/10-MeetupView-script-setup/MeetupCover.vue +++ b/04-sfc/10-MeetupView-script-setup/MeetupCover.vue @@ -1,62 +1,53 @@ - diff --git a/04-sfc/10-MeetupView-script-setup/MeetupDescription.vue b/04-sfc/10-MeetupView-script-setup/MeetupDescription.vue index c8f4185..2f813cb 100644 --- a/04-sfc/10-MeetupView-script-setup/MeetupDescription.vue +++ b/04-sfc/10-MeetupView-script-setup/MeetupDescription.vue @@ -1,14 +1,8 @@ - diff --git a/04-sfc/10-MeetupView-script-setup/MeetupInfo.vue b/04-sfc/10-MeetupView-script-setup/MeetupInfo.vue index 1daf6c5..4392bc4 100644 --- a/04-sfc/10-MeetupView-script-setup/MeetupInfo.vue +++ b/04-sfc/10-MeetupView-script-setup/MeetupInfo.vue @@ -1,77 +1,63 @@ - diff --git a/04-sfc/10-MeetupView-script-setup/MeetupView.vue b/04-sfc/10-MeetupView-script-setup/MeetupView.vue index 1250e12..d9e068a 100644 --- a/04-sfc/10-MeetupView-script-setup/MeetupView.vue +++ b/04-sfc/10-MeetupView-script-setup/MeetupView.vue @@ -1,89 +1,95 @@ - From 45ed2433e0b4e53d424524401488f6b885fb48ff Mon Sep 17 00:00:00 2001 From: Vombat Date: Wed, 15 Jan 2025 18:51:48 +0300 Subject: [PATCH 11/13] =?UTF-8?q?5=D0=B5=20=D0=B7=D0=B0=D0=BD=D1=8F=D1=82?= =?UTF-8?q?=D0=B8=D0=B5=20-=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D0=B0=202=20M?= =?UTF-8?q?eetupCover=20=D1=81=20v-bind=20=D0=B2=20CSS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MeetupCover.vue | 66 +++++++++---------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/04-sfc/20-MeetupCover-style-v-bind/MeetupCover.vue b/04-sfc/20-MeetupCover-style-v-bind/MeetupCover.vue index fbbc245..758625c 100644 --- a/04-sfc/20-MeetupCover-style-v-bind/MeetupCover.vue +++ b/04-sfc/20-MeetupCover-style-v-bind/MeetupCover.vue @@ -1,54 +1,52 @@ From beee19aab713063a8c579c0eddf7fc498f0c3f98 Mon Sep 17 00:00:00 2001 From: Vombat Date: Wed, 15 Jan 2025 19:29:22 +0300 Subject: [PATCH 12/13] =?UTF-8?q?4=D0=B5=20=D0=B7=D0=B0=D0=BD=D1=8F=D1=82?= =?UTF-8?q?=D0=B8=D0=B5=20SFC=20-=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D0=B0?= =?UTF-8?q?=203UiStretch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 04-sfc/30-UiStretch/UiStretch.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/04-sfc/30-UiStretch/UiStretch.vue b/04-sfc/30-UiStretch/UiStretch.vue index 237c492..5a043c4 100644 --- a/04-sfc/30-UiStretch/UiStretch.vue +++ b/04-sfc/30-UiStretch/UiStretch.vue @@ -12,9 +12,9 @@ height: 100%; } -.stretch-container > img, -.stretch-container > video, -.stretch-container > picture { +.stretch-container > :slotted(img), +.stretch-container > :slotted(video), +.stretch-container > :slotted(picture) { object-fit: scale-down; } From f147d14d2c53493ae12560b7b3ab9c6af4c770e5 Mon Sep 17 00:00:00 2001 From: Vombat Date: Wed, 15 Jan 2025 23:02:58 +0300 Subject: [PATCH 13/13] =?UTF-8?q?4=D0=B5=20=D0=B7=D0=B0=D0=BD=D1=8F=D1=82?= =?UTF-8?q?=D0=B8=D0=B5=20SFC=20-=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 04-sfc/10-MeetupView-script-setup/MeetupView.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/04-sfc/10-MeetupView-script-setup/MeetupView.vue b/04-sfc/10-MeetupView-script-setup/MeetupView.vue index d9e068a..31bfc17 100644 --- a/04-sfc/10-MeetupView-script-setup/MeetupView.vue +++ b/04-sfc/10-MeetupView-script-setup/MeetupView.vue @@ -8,7 +8,7 @@ import MeetupInfo from './MeetupInfo.vue' defineProps({ meetup: { type: Object, - require: true + required: true } })