diff --git a/frontend/raw/addingAdv.html b/frontend/raw/addingAdv.html index c49bc02..7ebb984 100644 --- a/frontend/raw/addingAdv.html +++ b/frontend/raw/addingAdv.html @@ -7,7 +7,7 @@ - + Metr diff --git a/frontend/raw/assets/css/addingAdv.css b/frontend/src/assets/css/addingAdv.css similarity index 97% rename from frontend/raw/assets/css/addingAdv.css rename to frontend/src/assets/css/addingAdv.css index ccd4421..1156ff8 100644 --- a/frontend/raw/assets/css/addingAdv.css +++ b/frontend/src/assets/css/addingAdv.css @@ -66,7 +66,7 @@ h1, h2, h3, h4, h5, h6 { height: 96px; margin: 0 auto; - background: url("../images/metr.svg") center + background: url("../../../raw/assets/images/metr.svg") center no-repeat; background-size: cover; border-right: 2px solid white; @@ -189,7 +189,7 @@ h1, h2, h3, h4, h5, h6 { padding-top: 250px; background-image: linear-gradient(to top, rgb(124, 173, 201, 1), rgb(94, 196, 242, 0.6)), url( - "../images/intro.jpg"); + "../../../raw/assets/images/intro.jpg"); background-size: cover; } diff --git a/frontend/src/assets/css/profile.css b/frontend/src/assets/css/profile.css index 4c563d3..4dbbb05 100644 --- a/frontend/src/assets/css/profile.css +++ b/frontend/src/assets/css/profile.css @@ -203,18 +203,29 @@ h1, h2, h3, h4, h5, h6 { .user__info { display: flex; flex-direction: column; - justify-content: space-between; + /*justify-content: space-between;*/ margin-right: 5%; } .user__logo { - display: flex; - flex-direction: row; - justify-content: center; - border-radius: 20px; + border-radius: 50%; width: 200px; height: 200px; padding-left: 20%; + margin: 0 auto; + + background: url("@/assets/images/1.1.jpg") center + no-repeat; + background-size: cover; +} + +.user__logo > img{ + display: flex; + flex-direction: row; + justify-content: center; + border-radius: 50%; + width: 120%; + height: 100%; } .username { @@ -223,18 +234,18 @@ h1, h2, h3, h4, h5, h6 { justify-content: center; } -.user__stat { - display: flex; - flex-direction: row; - margin: 2% 0 2% 5%; -} +/*.user__stat {*/ +/* display: flex;*/ +/* flex-direction: row;*/ +/* margin: 2% 0 2% 5%;*/ +/*}*/ -.stars { - display: flex; - flex-direction: row; - margin-left: 5%; - padding-bottom: 1%; -} +/*.stars {*/ +/* display: flex;*/ +/* flex-direction: row;*/ +/* margin-left: 5%;*/ +/* padding-bottom: 1%;*/ +/*}*/ .user__hrefs { display: flex; diff --git a/frontend/src/assets/images/1.1.jpg b/frontend/src/assets/images/1.1.jpg new file mode 100644 index 0000000..aa281cb Binary files /dev/null and b/frontend/src/assets/images/1.1.jpg differ diff --git a/frontend/src/assets/images/delete_log.svg b/frontend/src/assets/images/delete_log.svg new file mode 100644 index 0000000..0e6cc58 --- /dev/null +++ b/frontend/src/assets/images/delete_log.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/src/assets/images/image_load.png b/frontend/src/assets/images/image_load.png new file mode 100644 index 0000000..4077e37 Binary files /dev/null and b/frontend/src/assets/images/image_load.png differ diff --git a/frontend/src/assets/images/location.svg b/frontend/src/assets/images/location.svg new file mode 100644 index 0000000..30df2b5 --- /dev/null +++ b/frontend/src/assets/images/location.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/src/assets/images/metr_header.svg b/frontend/src/assets/images/metr_header.svg new file mode 100644 index 0000000..6690b48 --- /dev/null +++ b/frontend/src/assets/images/metr_header.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/src/assets/images/upload_log.svg b/frontend/src/assets/images/upload_log.svg new file mode 100644 index 0000000..7c0c19a --- /dev/null +++ b/frontend/src/assets/images/upload_log.svg @@ -0,0 +1,4 @@ + + + + diff --git a/frontend/src/components/ProfileAbout.vue b/frontend/src/components/ProfileAbout.vue index 84b4ee0..449fee0 100644 --- a/frontend/src/components/ProfileAbout.vue +++ b/frontend/src/components/ProfileAbout.vue @@ -2,9 +2,9 @@

Обо мне

- - - + + +

Занимаюсь продажей квартир более 10 лет.

@@ -32,6 +32,15 @@ export default { margin-top: 1%; } +.about__images > img { + width: 296px; + height: 204px; + display: flex; + flex-direction: row; + justify-content: space-between; + margin-top: 1%; +} + .about_describtions { margin-top: 5%; } diff --git a/frontend/src/components/ProfileAddOffer.vue b/frontend/src/components/ProfileAddOffer.vue index a77e8b5..dbc07c8 100644 --- a/frontend/src/components/ProfileAddOffer.vue +++ b/frontend/src/components/ProfileAddOffer.vue @@ -1,13 +1,54 @@ @@ -19,6 +60,57 @@ export default { \ No newline at end of file diff --git a/frontend/src/components/RatingStars.vue b/frontend/src/components/RatingStars.vue new file mode 100644 index 0000000..11d1276 --- /dev/null +++ b/frontend/src/components/RatingStars.vue @@ -0,0 +1,33 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/components/TheFooter.vue b/frontend/src/components/TheFooter.vue new file mode 100644 index 0000000..6c2c382 --- /dev/null +++ b/frontend/src/components/TheFooter.vue @@ -0,0 +1,163 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/views/CatalogView.vue b/frontend/src/views/CatalogView.vue index d29a121..b0ab646 100644 --- a/frontend/src/views/CatalogView.vue +++ b/frontend/src/views/CatalogView.vue @@ -89,44 +89,51 @@
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-

2-к. Квартира, 34 м кв

2 900 000₽

- -
-
- -
-

3-к. Квартира, 34 м кв

4 900 000₽

- -
-
- -
-

1-к. Квартира, 34 м кв

1 900 000₽

- > -
-
- -
-

5-к. Квартира, 34 м кв

10 900 000₽

- -
-
- -
-

6-к. Квартира, 34 м кв

15 900 000₽

- -
-
- -
-

3-к. Квартира, 34 м кв

5 900 000₽

+

{{offer.name}}}

{{ offer.price }}₽
+ diff --git a/frontend/src/views/ProfileView.vue b/frontend/src/views/ProfileView.vue index a46c93b..7d7df13 100644 --- a/frontend/src/views/ProfileView.vue +++ b/frontend/src/views/ProfileView.vue @@ -60,21 +60,12 @@

Виктория

-
-

5

-
- - - - - -
-
+
@@ -93,25 +84,62 @@ +
+ +

Выйти из аккаунта

+ +
+ > \ No newline at end of file