From 32f5ba806b85558551473b410e7ced5659543189 Mon Sep 17 00:00:00 2001 From: Daria Golova Date: Fri, 30 Sep 2022 18:29:29 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BB=D0=B0?= =?UTF-8?q?=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=8B=D0=B5?= =?UTF-8?q?,=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=D0=B0=20=D0=BB?= =?UTF-8?q?=D0=BE=D0=B3=D0=BE=D1=82=D0=B8=D0=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 18 +++++++++++++--- src/assets/images/logo.svg | 3 +++ src/assets/sass/variables.sass | 5 +++++ .../homePageComponents/HeaderComponent.vue | 21 +++++++++++++++++++ src/vue.config.js | 9 ++++++++ 5 files changed, 53 insertions(+), 3 deletions(-) create mode 100644 src/assets/images/logo.svg create mode 100644 src/assets/sass/variables.sass create mode 100644 src/vue.config.js diff --git a/src/App.vue b/src/App.vue index 75e1f82..893e5e1 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,22 +1,34 @@ diff --git a/src/assets/images/logo.svg b/src/assets/images/logo.svg new file mode 100644 index 0000000..ea74ee9 --- /dev/null +++ b/src/assets/images/logo.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/sass/variables.sass b/src/assets/sass/variables.sass new file mode 100644 index 0000000..d1ac2c6 --- /dev/null +++ b/src/assets/sass/variables.sass @@ -0,0 +1,5 @@ +$bg-lavender-color: #D7D9FF +$bg-white-color: #F8F8FF +$font-dark-blue-color: #252850 +$font-black-color: #090A15 +$btn-blue-color: #4169E1 \ No newline at end of file diff --git a/src/components/homePageComponents/HeaderComponent.vue b/src/components/homePageComponents/HeaderComponent.vue index e69de29..844eaa0 100644 --- a/src/components/homePageComponents/HeaderComponent.vue +++ b/src/components/homePageComponents/HeaderComponent.vue @@ -0,0 +1,21 @@ + + + + + diff --git a/src/vue.config.js b/src/vue.config.js new file mode 100644 index 0000000..5011196 --- /dev/null +++ b/src/vue.config.js @@ -0,0 +1,9 @@ +module.exports = { + css: { + loaderOptions: { + sass: { + additionalData: ' @import "@/assets/sass/styles.sass" ' + } + } + } +} \ No newline at end of file From 548f2f49dcd49d0a7099c5a111883ddf23512a06 Mon Sep 17 00:00:00 2001 From: Daria Golova Date: Mon, 3 Oct 2022 16:36:39 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=D0=B0?= =?UTF-8?q?=20header=20=D1=81=20select/options?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 19 +-- src/assets/icons/bell.svg | 3 + src/assets/icons/down-arrow-1.svg | 3 + src/assets/icons/down-arrow-2.svg | 3 + src/assets/icons/search.svg | 5 + src/assets/images/avatar.png | Bin 2722 -> 0 bytes src/assets/images/avatar.svg | 9 ++ .../homePageComponents/HeaderComponent.vue | 138 +++++++++++++++++- 8 files changed, 164 insertions(+), 16 deletions(-) create mode 100644 src/assets/icons/bell.svg create mode 100644 src/assets/icons/down-arrow-1.svg create mode 100644 src/assets/icons/down-arrow-2.svg create mode 100644 src/assets/icons/search.svg delete mode 100644 src/assets/images/avatar.png create mode 100644 src/assets/images/avatar.svg diff --git a/src/App.vue b/src/App.vue index 893e5e1..4010d63 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,7 +1,6 @@ From c862a6bf04c35d17018d122a4976b52b228e9bfc Mon Sep 17 00:00:00 2001 From: Daria Golova Date: Mon, 3 Oct 2022 17:55:04 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=D0=B0=20=D0=BE=D1=82=D1=81=D1=82=D1=83=D0=BF=D1=8B=20?= =?UTF-8?q?=D0=B2=20=D1=81=D1=82=D0=B8=D0=BB=D1=8F=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../homePageComponents/HeaderComponent.vue | 53 +++++++++---------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/src/components/homePageComponents/HeaderComponent.vue b/src/components/homePageComponents/HeaderComponent.vue index 754fb16..607fb86 100644 --- a/src/components/homePageComponents/HeaderComponent.vue +++ b/src/components/homePageComponents/HeaderComponent.vue @@ -6,7 +6,7 @@ div.inputs-wrapper img.search-icon(src="../../assets/icons/search.svg" alt="Search") select.inputs.select(v-model="selectedFilter") - option(v-for="filter in filters" :value="filter") {{ filter }} + option(v-for="filter in filters" :key="filter" :value="filter") {{ filter }} span.separator input.inputs.search-input(placeholder="Искать ...") button.flex.center.btn-notification @@ -31,8 +31,20 @@ export default { } - From a3c7120777e3a42ea9cfc7ace4512c5a7896e3a2 Mon Sep 17 00:00:00 2001 From: Daria Golova Date: Tue, 4 Oct 2022 11:30:59 +0300 Subject: [PATCH 4/4] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=D0=B0?= =?UTF-8?q?=20css=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=8B?= =?UTF-8?q?=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 3 +-- src/assets/css/variables.css | 7 +++++++ src/assets/sass/variables.sass | 5 ----- .../homePageComponents/HeaderComponent.vue | 13 ++++++------- src/main.js | 1 + src/vue.config.js | 9 --------- 6 files changed, 15 insertions(+), 23 deletions(-) create mode 100644 src/assets/css/variables.css delete mode 100644 src/assets/sass/variables.sass delete mode 100644 src/vue.config.js diff --git a/src/App.vue b/src/App.vue index 4010d63..dfc0a14 100644 --- a/src/App.vue +++ b/src/App.vue @@ -12,7 +12,6 @@ export default {