diff --git a/frontend/raw/index.html b/frontend/index.html similarity index 100% rename from frontend/raw/index.html rename to frontend/index.html diff --git a/frontend/raw/Catalog.html b/frontend/raw/Catalog.html index 5810b2a..c5fc7ad 100644 --- a/frontend/raw/Catalog.html +++ b/frontend/raw/Catalog.html @@ -7,7 +7,7 @@ - + Metr @@ -74,25 +74,25 @@

Квартира

- +

Купить

- +

Комнаты

- +

Цена

- +
diff --git a/frontend/raw/profile.html b/frontend/raw/profile.html index 17aa8b4..58a3079 100644 --- a/frontend/raw/profile.html +++ b/frontend/raw/profile.html @@ -7,7 +7,7 @@ - + Metr @@ -69,7 +69,7 @@

Виктория

@@ -77,11 +77,11 @@

4,5

- - - - - + + + + +
diff --git a/frontend/raw/assets/css/catalog.css b/frontend/src/assets/css/catalog.css similarity index 98% rename from frontend/raw/assets/css/catalog.css rename to frontend/src/assets/css/catalog.css index 28d8f21..2a435a2 100644 --- a/frontend/raw/assets/css/catalog.css +++ b/frontend/src/assets/css/catalog.css @@ -1,6 +1,6 @@ /* Fonts */ -@import url("../../fonts/StapelS/style.css"); +@import url("@/assets/fonts/StapelS/style.css"); body { margin: 0; @@ -66,7 +66,7 @@ h1, h2, h3, h4, h5, h6 { height: 96px; margin: 0 auto; - background: url("../images/metr.svg") center + background: url("@/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.3)), url( - "../images/intro.jpg"); + "@/assets/images/intro.jpg"); background-size: cover; } @@ -314,7 +314,7 @@ h1, h2, h3, h4, h5, h6 { height: 590px; border: 1px solid black; background-image: linear-gradient(to top, rgb(124, 173, 201, 0.6), rgb(94, 196, 242, 0.2)), url( - "../images/video.jpg"); + "@/assets/images/video.jpg"); background-size: cover; } diff --git a/frontend/raw/assets/css/profile.css b/frontend/src/assets/css/profile.css similarity index 91% rename from frontend/raw/assets/css/profile.css rename to frontend/src/assets/css/profile.css index 88ee14e..d9e8f0d 100644 --- a/frontend/raw/assets/css/profile.css +++ b/frontend/src/assets/css/profile.css @@ -1,6 +1,6 @@ /* Fonts */ -@import url("../../fonts/StapelS/style.css"); +@import url("@/assets/fonts/StapelS/style.css"); body { margin: 0; @@ -66,7 +66,7 @@ h1, h2, h3, h4, h5, h6 { height: 96px; margin: 0 auto; - background: url("../images/metr.svg") center + background: url("@/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"); + "@/assets/images/intro.jpg"); background-size: cover; } @@ -252,19 +252,3 @@ h1, h2, h3, h4, h5, h6 { font-weight: 600; } -.about__user { - display: flex; - flex-direction: column; -} - -.about__images { - width: 105%; - display: flex; - flex-direction: row; - justify-content: space-between; - margin-top: 1%; -} - -.about_describtions { - margin-top: 5%; -} \ No newline at end of file diff --git a/frontend/src/assets/css/style.css b/frontend/src/assets/css/style.css index 8eaa5ca..bffd3ed 100644 --- a/frontend/src/assets/css/style.css +++ b/frontend/src/assets/css/style.css @@ -1,6 +1,6 @@ /* Fonts */ - @import url("../../fonts/StapelS/style.css"); + @import url("@/assets/fonts/StapelS/style.css"); body { margin: 0; diff --git a/frontend/src/assets/images/adv1.png b/frontend/src/assets/images/adv1.png new file mode 100644 index 0000000..f110a3c Binary files /dev/null and b/frontend/src/assets/images/adv1.png differ diff --git a/frontend/src/assets/images/adv2.png b/frontend/src/assets/images/adv2.png new file mode 100644 index 0000000..50f4a20 Binary files /dev/null and b/frontend/src/assets/images/adv2.png differ diff --git a/frontend/src/assets/images/adv3.png b/frontend/src/assets/images/adv3.png new file mode 100644 index 0000000..592a0dc Binary files /dev/null and b/frontend/src/assets/images/adv3.png differ diff --git a/frontend/src/assets/images/adv4.png b/frontend/src/assets/images/adv4.png new file mode 100644 index 0000000..aaffe0d Binary files /dev/null and b/frontend/src/assets/images/adv4.png differ diff --git a/frontend/raw/assets/images/arrow.png b/frontend/src/assets/images/arrow.png similarity index 100% rename from frontend/raw/assets/images/arrow.png rename to frontend/src/assets/images/arrow.png diff --git a/frontend/src/assets/images/forcomment.png b/frontend/src/assets/images/forcomment.png new file mode 100644 index 0000000..7b8d9cb Binary files /dev/null and b/frontend/src/assets/images/forcomment.png differ diff --git a/frontend/src/assets/images/heart.png b/frontend/src/assets/images/heart.png new file mode 100644 index 0000000..2bd0535 Binary files /dev/null and b/frontend/src/assets/images/heart.png differ diff --git a/frontend/raw/assets/images/star.png b/frontend/src/assets/images/star.png similarity index 100% rename from frontend/raw/assets/images/star.png rename to frontend/src/assets/images/star.png diff --git a/frontend/src/assets/images/star1.png b/frontend/src/assets/images/star1.png new file mode 100644 index 0000000..e4d9cf4 Binary files /dev/null and b/frontend/src/assets/images/star1.png differ diff --git a/frontend/src/assets/images/starsmall.png b/frontend/src/assets/images/starsmall.png new file mode 100644 index 0000000..1cf2978 Binary files /dev/null and b/frontend/src/assets/images/starsmall.png differ diff --git a/frontend/raw/assets/images/userlogo.png b/frontend/src/assets/images/userlogo.png similarity index 100% rename from frontend/raw/assets/images/userlogo.png rename to frontend/src/assets/images/userlogo.png diff --git a/frontend/src/assets/images/userlogosmall.png b/frontend/src/assets/images/userlogosmall.png new file mode 100644 index 0000000..3db5cc2 Binary files /dev/null and b/frontend/src/assets/images/userlogosmall.png differ diff --git a/frontend/src/components/ProfileAbout.vue b/frontend/src/components/ProfileAbout.vue new file mode 100644 index 0000000..84b4ee0 --- /dev/null +++ b/frontend/src/components/ProfileAbout.vue @@ -0,0 +1,38 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js index fdc45a2..fa41fc1 100644 --- a/frontend/src/router/index.js +++ b/frontend/src/router/index.js @@ -1,6 +1,8 @@ import { createRouter, createWebHistory } from 'vue-router' import MainView from '@/views/MainView.vue' import AuthView from '@/views/AuthView.vue' +import CatalogView from "@/views/CatalogView.vue"; +import ProfileView from "@/views/ProfileView.vue"; const router = createRouter({ history: createWebHistory(import.meta.env.BASE_URL), @@ -15,6 +17,16 @@ const router = createRouter({ name: 'auth', component: AuthView }, + { + path: '/catalog', + name: 'catalog', + component: CatalogView + }, + { + path: '/profile', + name: 'profile', + component: ProfileView + }, ] }) diff --git a/frontend/src/views/CatalogView.vue b/frontend/src/views/CatalogView.vue new file mode 100644 index 0000000..0fc8eda --- /dev/null +++ b/frontend/src/views/CatalogView.vue @@ -0,0 +1,125 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/views/MainView.vue b/frontend/src/views/MainView.vue index feb8cfa..4fc9d4c 100644 --- a/frontend/src/views/MainView.vue +++ b/frontend/src/views/MainView.vue @@ -11,8 +11,11 @@
- каталог + + каталог +
+
блог
@@ -27,9 +30,7 @@
-
- -
+
@@ -93,30 +94,12 @@

Интересные предложения

-
+ +
-

Студия на Кирова, 12

1298000₽

-
-
-
-

Студия на Кирова, 12

1298000₽

-
-
-
-

Студия на Кирова, 12

1298000₽

-
-
-
-

Студия на Кирова, 12

1298000₽

-
-
-
-

Студия на Кирова, 12

1298000₽

-
-
-
-

Студия на Кирова, 12

1298000₽

+

{{offer.name}}}

{{ offer.price }}₽

+

Это подборка лучших вариантов, найденных

@@ -167,6 +150,21 @@ + + diff --git a/frontend/src/views/ProfileView.vue b/frontend/src/views/ProfileView.vue new file mode 100644 index 0000000..1f3b193 --- /dev/null +++ b/frontend/src/views/ProfileView.vue @@ -0,0 +1,107 @@ + + +> + + \ No newline at end of file