From 820691b1ecf49cd5663c3ccb1d2de6b12b691b0b Mon Sep 17 00:00:00 2001
From: FEARmeR <fearmer@gmail.com>
Date: Mon, 22 May 2023 10:06:52 +0100
Subject: [PATCH] =?UTF-8?q?Navbar=20=D0=B2=D0=B5=D0=B7=D0=B4=D0=B5=20?=
 =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD,=20=D1=81?=
 =?UTF-8?q?=D1=81=D1=8B=D0=BB=D0=BA=D0=B8=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BD=D0=B0=20=D0=BE=D1=82?=
 =?UTF-8?q?=D0=BD=D0=BE=D1=81=D0=B8=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B?=
 =?UTF-8?q?=D0=B5,=20=D0=BD=D0=B5=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D1=81=D0=BC=D0=B5=D1=82=D0=B8=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LandingPages/Profile/AllProfiles.vue      |  5 +-
 src/views/LandingPages/Profile/Profile.vue    | 46 +++++++++++++++----
 .../LandingPages/Project/AllProjects.vue      |  6 +--
 src/views/LandingPages/Project/Project.vue    |  2 +
 4 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/src/views/LandingPages/Profile/AllProfiles.vue b/src/views/LandingPages/Profile/AllProfiles.vue
index 453b7b0..3b370ad 100644
--- a/src/views/LandingPages/Profile/AllProfiles.vue
+++ b/src/views/LandingPages/Profile/AllProfiles.vue
@@ -2,6 +2,7 @@
 import { onMounted, onUnmounted } from "vue";
 import axios from 'axios';
 import { ref } from "vue";
+import NavbarDefault from "../../../examples/navbars/NavbarDefault.vue";
 
 
 const searchQuery = ref('');
@@ -29,7 +30,7 @@ onMounted(() => {
 
 
 <template>
-
+<NavbarDefault />
   <div>
     
     <h2 class="result-header">Найдено людей: {{ searchResultUsers.length}} </h2>
@@ -37,7 +38,7 @@ onMounted(() => {
       <div class="result-card" v-for="user in searchResultUsers" :key="user.id">
         <h3>{{ user.username }} with id {{ user.id }}</h3>
         <p>{{ user.email }}</p>
-        <a :href="`http://somebodyhire.me/profile/${user.id}`">Страница пользователя</a>
+        <a :href="`/profile/${user.id}`">Страница пользователя</a>
       </div>
     </div>
   </div>
diff --git a/src/views/LandingPages/Profile/Profile.vue b/src/views/LandingPages/Profile/Profile.vue
index bd4abc6..e9f648a 100644
--- a/src/views/LandingPages/Profile/Profile.vue
+++ b/src/views/LandingPages/Profile/Profile.vue
@@ -2,7 +2,7 @@
 import axios from 'axios';
 import { onMounted, ref } from "vue";
 import { useRoute } from "vue-router";
-
+import NavbarDefault from '../../../examples/navbars/NavbarDefault.vue';
 
 const profileId = ref(null);
 const route = useRoute();
@@ -27,17 +27,45 @@ const getProfile = async () => {
 
 
 <template>
-    <div>
-      <h1>Профиль пользователя номер: {{ profileData.id }}</h1>
+  <NavbarDefault />
+  <div class="profile-container">
+    <h1>Профиль пользователя {{ loggedUserName }}</h1>
       <h2>{{ profileData.username }}</h2>
-        <p>{{ profileData.email }}</p>
-         
+      <p>{{ profileData.email }}</p>
+      <P>Имя: {{ profileData.name }}</P>
+      <p>Местоположение: {{ profileData.location }}</p>
+      <p>Краткое описание: {{ profileData.short_intro }}</p>
+      <p>Биография: {{ profileData.bio }}</p>
+      <p>Ссылка на изображение: {{ profileData.profile_image }}</p>
+      <p>Ссылка на GitHub: {{ profileData.social_github }}</p>
+      <p>Ссылка на Twitter: {{ profileData.social_twitter }}</p>
+      <p>Ссылка на VK: {{ profileData.social_vk }}</p>
+      <p>Ссылка на YouTube: {{ profileData.social_youtube }}</p>
+      <p>Ссылка на сайт: {{ profileData.social_website }}</p>
       
-    </div>
-  </template> 
+
+    
+  </div>
+</template> 
 
 
 
 <style scoped>
-</style>
-  
\ No newline at end of file
+.profile-container {
+display: flex;
+flex-direction: column;
+align-items: center;
+width: 80%;
+margin: auto;
+padding: 20px;
+box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.1);
+}
+
+.profile-container img {
+width: 100px;
+height: 100px;
+border-radius: 50%;
+object-fit: cover;
+margin-bottom: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/LandingPages/Project/AllProjects.vue b/src/views/LandingPages/Project/AllProjects.vue
index a6c6dc5..f5c9953 100644
--- a/src/views/LandingPages/Project/AllProjects.vue
+++ b/src/views/LandingPages/Project/AllProjects.vue
@@ -2,7 +2,7 @@
 import { onMounted, onUnmounted } from "vue";
 import axios from 'axios';
 import { ref } from "vue";
-
+import NavbarDefault from "../../../examples/navbars/NavbarDefault.vue";
 
 const searchQuery = ref('');
 const searchResultProjects = ref([]);
@@ -29,14 +29,14 @@ onMounted(() => {
 
 
 <template>
-
+<NavbarDefault  />
   <div>
     <h2 class="result-header">Найдено проектов: {{ searchResultProjects.length}} </h2>
     <div class="result-grid">
       <div class="result-card" v-for="project in searchResultProjects" :key="project.id">
         <h3>{{ project.title }} with ID {{ project.id }}</h3>
         <p>{{ project.description }}</p>
-        <a :href="`http://somebodyhire.me/project/${project.id}`">Страница проекта</a>
+        <a :href="`/project/${project.id}`">Страница проекта</a>
       </div>
     </div>
     
diff --git a/src/views/LandingPages/Project/Project.vue b/src/views/LandingPages/Project/Project.vue
index 72fafcb..fdaaa1e 100644
--- a/src/views/LandingPages/Project/Project.vue
+++ b/src/views/LandingPages/Project/Project.vue
@@ -2,6 +2,7 @@
 import axios from 'axios';
 import { onMounted, ref } from "vue";
 import { useRoute } from "vue-router";
+import NavbarDefault from '../../../examples/navbars/NavbarDefault.vue';
 
 
 const projectId = ref(null);
@@ -30,6 +31,7 @@ const getProject = async () => {
 
 
 <template>
+  <NavbarDefault />
     <div v-if="projectData">
       <h1>Проект номер: {{ projectData.id }}</h1>
       <h2>{{ projectData.title }}</h2>