From 3d1a7619db20a7a2e40a8aee64b5e274b3ccc1a6 Mon Sep 17 00:00:00 2001
From: irchen4 <81490453+irchen4@users.noreply.github.com>
Date: Mon, 22 May 2023 21:33:45 +0300
Subject: [PATCH 1/3] =?UTF-8?q?=D0=BA=D0=B0=D0=BA=D0=BE=D0=B9=20=D1=82?=
 =?UTF-8?q?=D0=BE=20=D0=B4=D0=B5=D0=B7=D0=B8=D0=B3=D0=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LandingPages/Profile/AdmireProfile.vue    | 38 ++++++++-----
 .../LandingPages/Profile/AllProfiles.vue      | 38 +++++++++++--
 src/views/LandingPages/Profile/Profile.vue    | 54 +++++++++++++++----
 .../LandingPages/Project/AllProjects.vue      | 36 +++++++++++--
 .../Sections/PresentationSearch.vue           |  6 +++
 5 files changed, 140 insertions(+), 32 deletions(-)

diff --git a/src/views/LandingPages/Profile/AdmireProfile.vue b/src/views/LandingPages/Profile/AdmireProfile.vue
index 8b9de44..a169408 100644
--- a/src/views/LandingPages/Profile/AdmireProfile.vue
+++ b/src/views/LandingPages/Profile/AdmireProfile.vue
@@ -36,19 +36,13 @@ onMounted(async() => {
 });
 
 
-</script>
-
-<script>
-
-
-
 </script>
 
 
 <template>
     <NavbarDefault />
     <div class="profile-container">
-      <h1>Профиль пользователя {{ loggedUserName }}</h1>
+      <h2>Профиль пользователя {{ loggedUserName }}</h2>
         <h2>{{ profileData.username }}</h2>
         <p>{{ profileData.email }}</p>
         <P>Имя: {{ profileData.name }}</P>
@@ -71,13 +65,12 @@ onMounted(async() => {
 
 <style scoped>
 .profile-container {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  width: 80%;
-  margin: auto;
+  width: 50%;
   padding: 20px;
   box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.1);
+  margin: 5% auto;
+  background-color: #3d913257;
+  border-radius: 10px;
 }
 
 .profile-container img {
@@ -87,4 +80,25 @@ onMounted(async() => {
   object-fit: cover;
   margin-bottom: 20px;
 }
+
+h1,h2{
+  /*font-family: 'PressStart2P';*/
+  color:rgb(70, 104, 105);
+}
+p{
+  font-family: 'SpaceMono' monospace;
+}
+button{
+  background-color: #3d9132;
+  border-radius: 10px;
+  text-align: center;
+  color: rgb(255, 255, 255);
+  font-weight: 500;
+  width: 50%;
+  margin-bottom: 10px;
+}
+button:hover{
+  background-color: #6ac55e;
+  color: rgb(61, 61, 61);
+}
 </style>
\ No newline at end of file
diff --git a/src/views/LandingPages/Profile/AllProfiles.vue b/src/views/LandingPages/Profile/AllProfiles.vue
index 3b370ad..cc9970d 100644
--- a/src/views/LandingPages/Profile/AllProfiles.vue
+++ b/src/views/LandingPages/Profile/AllProfiles.vue
@@ -36,9 +36,10 @@ onMounted(() => {
     <h2 class="result-header">Найдено людей: {{ searchResultUsers.length}} </h2>
     <div class="result-grid">
       <div class="result-card" v-for="user in searchResultUsers" :key="user.id">
-        <h3>{{ user.username }} with id {{ user.id }}</h3>
+        <div class="profile-name"> <h3>{{ user.username }} with id {{ user.id }}</h3></div>
         <p>{{ user.email }}</p>
-        <a :href="`/profile/${user.id}`">Страница пользователя</a>
+        <a :href="`/profile/${user.id}`">Открыть профиль</a>
+        <a :href="`/profile/${user.id}`">Отправить сообщение</a>
       </div>
     </div>
   </div>
@@ -87,10 +88,13 @@ onMounted(() => {
 }
 .result-header {
   color: #fff;
-  background-color: #333;
+  background-color:#3d9132;
   padding: 10px;
   text-align: center;
-  margin-top: 20px;
+  margin-top: 25px;
+  margin-left: 10%;
+  width: 80%;
+border-radius: 15px;
 }
 
 .result-grid {
@@ -102,12 +106,36 @@ onMounted(() => {
 .result-card {
   display: flex;
   flex-direction: column;
-  background-color: rgba(255, 255, 255, 0.5);
+  background-color: #3d913248;
   padding: 10px;
   margin: 10px;
   border-radius: 10px;
   width: calc(100% / 3 - 20px);
   box-sizing: border-box;
+  box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.1);
+  align-items: center;
+}
+.profile-name{
+  padding-bottom: 15px;
+}
+h3{
+  color:rgb(87, 87, 87);
+}
+a{
+  background-color: #3d9132;
+  border-radius: 10px;
+  text-align: center;
+  color: rgb(255, 255, 255);
+  font-weight: 500;
+  width: 50%;
+  margin-bottom: 10px;
+}
+a:hover{
+  background-color: #6ac55e;
+  color: rgb(61, 61, 61);
+}
+p{
+  font-weight: 500;
 }
 
 @media screen and (max-width: 992px) {
diff --git a/src/views/LandingPages/Profile/Profile.vue b/src/views/LandingPages/Profile/Profile.vue
index e9f648a..0ae6379 100644
--- a/src/views/LandingPages/Profile/Profile.vue
+++ b/src/views/LandingPages/Profile/Profile.vue
@@ -16,11 +16,24 @@ onMounted(async() => {
 
 const getProfile = async () => {
     const profileDataRecieved = await axios.get(`http://somebodyhire.me/api/profile/${profileId.value}/`);
-    profileData.value = profileDataRecieved.data;
+    profileData.value = processProfileData(profileDataRecieved.data);
 
 };
-
-
+const processProfileData = (data) => {
+    return {
+        ...data,
+        name: data.name || '🤷 No Name Provided',
+        location: data.location || '🌍 No Location Provided',
+        short_intro: data.short_intro || '📝 No Short Intro Provided',
+        bio: data.bio || '📘 No Bio Provided',
+        profile_image: data.profile_image || '📷 No Image Provided',
+        social_github: data.social_github || '👨‍💻 No Github Provided',
+        social_twitter: data.social_twitter || '🐦 No Twitter Provided',
+        social_vk: data.social_vk || '🔵 No VK Provided',
+        social_youtube: data.social_youtube || '▶️ No YouTube Provided',
+        social_website: data.social_website || '🌐 No Website Provided',
+    };
+};
 
 
 </script>
@@ -29,7 +42,7 @@ const getProfile = async () => {
 <template>
   <NavbarDefault />
   <div class="profile-container">
-    <h1>Профиль пользователя {{ loggedUserName }}</h1>
+    <h1>Профиль пользователя</h1>
       <h2>{{ profileData.username }}</h2>
       <p>{{ profileData.email }}</p>
       <P>Имя: {{ profileData.name }}</P>
@@ -42,23 +55,20 @@ const getProfile = async () => {
       <p>Ссылка на VK: {{ profileData.social_vk }}</p>
       <p>Ссылка на YouTube: {{ profileData.social_youtube }}</p>
       <p>Ссылка на сайт: {{ profileData.social_website }}</p>
-      
-
-    
+      <button>Message</button>
   </div>
 </template> 
 
-
-
 <style scoped>
 .profile-container {
 display: flex;
 flex-direction: column;
-align-items: center;
 width: 80%;
-margin: auto;
+margin: 10% auto;
 padding: 20px;
 box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.1);
+background-color: #3d913257;
+border-radius: 10px;
 }
 
 .profile-container img {
@@ -67,5 +77,27 @@ height: 100px;
 border-radius: 50%;
 object-fit: cover;
 margin-bottom: 20px;
+
+}
+
+h1,h2{
+  /*font-family: 'PressStart2P';*/
+  color:rgb(70, 104, 105);
+}
+p{
+  font-family: 'SpaceMono' monospace;
+}
+button{
+  background-color: #3d9132;
+  border-radius: 10px;
+  text-align: center;
+  color: rgb(255, 255, 255);
+  font-weight: 500;
+  width: 50%;
+  margin-bottom: 10px;
+}
+button:hover{
+  background-color: #6ac55e;
+  color: rgb(61, 61, 61);
 }
 </style>
\ No newline at end of file
diff --git a/src/views/LandingPages/Project/AllProjects.vue b/src/views/LandingPages/Project/AllProjects.vue
index f5c9953..0562f2e 100644
--- a/src/views/LandingPages/Project/AllProjects.vue
+++ b/src/views/LandingPages/Project/AllProjects.vue
@@ -34,7 +34,7 @@ onMounted(() => {
     <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>
+       <div class="project-title"> <h3>{{ project.title }} with ID {{ project.id }}</h3></div>
         <p>{{ project.description }}</p>
         <a :href="`/project/${project.id}`">Страница проекта</a>
       </div>
@@ -86,10 +86,13 @@ onMounted(() => {
 }
 .result-header {
   color: #fff;
-  background-color: #333;
+  background-color:#3d9132;
   padding: 10px;
   text-align: center;
-  margin-top: 20px;
+  margin-top: 25px;
+  margin-left: 10%;
+  width: 80%;
+border-radius: 15px;
 }
 
 .result-grid {
@@ -101,12 +104,37 @@ onMounted(() => {
 .result-card {
   display: flex;
   flex-direction: column;
-  background-color: rgba(255, 255, 255, 0.5);
+  background-color: #3d913248;
   padding: 10px;
   margin: 10px;
   border-radius: 10px;
   width: calc(100% / 3 - 20px);
   box-sizing: border-box;
+  box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.1);
+  align-items: center;
+}
+.project-title{
+  padding-bottom: 25px;
+}
+
+h3{
+  color:rgb(87, 87, 87);
+}
+a{
+  background-color: #3d9132;
+  border-radius: 10px;
+  text-align: center;
+  color: rgb(255, 255, 255);
+  font-weight: 500;
+  width: 50%;
+  margin-bottom: 10px;
+}
+a:hover{
+  background-color: #6ac55e;
+  color: rgb(61, 61, 61);
+}
+p{
+  font-weight: 500;
 }
 
 @media screen and (max-width: 992px) {
diff --git a/src/views/Presentation/Sections/PresentationSearch.vue b/src/views/Presentation/Sections/PresentationSearch.vue
index f958c15..0313bfc 100644
--- a/src/views/Presentation/Sections/PresentationSearch.vue
+++ b/src/views/Presentation/Sections/PresentationSearch.vue
@@ -149,12 +149,18 @@ const search = async () => {
   .result-card {
     width: calc(100% / 2 - 20px);
   }
+  .searchButton{
+    width: 20%;
+  }
 }
 
 @media screen and (max-width: 600px) {
   .result-card {
     width: 100%;
   }
+  .searchButton{
+    width: 20%;
+  }
 }
 
 </style>

From 46fcf68f246be72fcd393747543456eb1a005f11 Mon Sep 17 00:00:00 2001
From: irchen4 <81490453+irchen4@users.noreply.github.com>
Date: Mon, 22 May 2023 21:43:38 +0300
Subject: [PATCH 2/3] =?UTF-8?q?=D0=BD=D0=B0=D0=B2=D0=B1=D0=B0=D1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/examples/navbars/NavbarDefault.vue | 43 ++++++++++++++++++--------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/src/examples/navbars/NavbarDefault.vue b/src/examples/navbars/NavbarDefault.vue
index 38403b5..e0c616c 100644
--- a/src/examples/navbars/NavbarDefault.vue
+++ b/src/examples/navbars/NavbarDefault.vue
@@ -170,15 +170,15 @@ watch(
               data-bs-toggle="dropdown"
               aria-expanded="false"
             >
-             <!-- <i
+             <i
                 class="material-icons opacity-6 me-2 text-md"
                 :class="getTextColor()"
                 >dashboard</i
-              >-->
+              >
 
               Пользователи          
 
-              <!--<img
+              <img
                 :src="getArrowColor()"
                 alt="down-arrow"
                 class="arrow ms-2 d-lg-block d-none"
@@ -187,7 +187,7 @@ watch(
                 :src="getArrowColor()"
                 alt="down-arrow"
                 class="arrow ms-1 d-lg-none d-block ms-auto"
-              />-->
+              />
             </a>
             <div
               class="dropdown-menu dropdown-menu-animation ms-n3 dropdown-md p-3 border-radius-xl mt-0 mt-lg-3"
@@ -197,6 +197,11 @@ watch(
                 <div class="col-12 px-4 py-2">
                   <div class="row">
                     <div class="position-relative">
+                      <div
+                        class="dropdown-header text-dark font-weight-bolder d-flex align-items-center px-1"
+                      >
+                        Все пользователи
+                      </div>
                       <RouterLink
                         :to="{ name: 'profiles' }"
                         class="dropdown-item border-radius-md">
@@ -227,13 +232,13 @@ watch(
               data-bs-toggle="dropdown"
               aria-expanded="false"
             >
-              <!--<i
+              <i
                 class="material-icons opacity-6 me-2 text-md"
                 :class="getTextColor()"
                 >dashboard</i
-              >-->
+              >
               Проекты
-              <!--<img
+              <img
                 :src="getArrowColor()"
                 alt="down-arrow"
                 class="arrow ms-2 d-lg-block d-none"
@@ -242,7 +247,7 @@ watch(
                 :src="getArrowColor()"
                 alt="down-arrow"
                 class="arrow ms-1 d-lg-none d-block ms-auto"
-              />-->
+              />
             </a>
             <div
               class="dropdown-menu dropdown-menu-animation ms-n3 dropdown-md p-3 border-radius-xl mt-0 mt-lg-3"
@@ -252,6 +257,11 @@ watch(
                 <div class="col-12 px-4 py-2">
                   <div class="row">
                     <div class="position-relative">
+                      <div
+                        class="dropdown-header text-dark font-weight-bolder d-flex align-items-center px-1"
+                      >
+                        Все проекты
+                      </div>
                       <RouterLink
                         :to="{ name: 'projects' }"
                         class="dropdown-item border-radius-md"
@@ -300,13 +310,13 @@ watch(
               id="dropdownMenuDocs"
               data-bs-toggle="dropdown"
               aria-expanded="false">
-             <!-- <i
+             <i
                 class="material-icons opacity-6 me-2 text-md"
                 :class="getTextColor()"
                 >article</i
-              >-->
+              >
               Профиль
-              <!--<img
+              <img
                 :src="getArrowColor()"
                 alt="down-arrow"
                 class="arrow ms-2 d-lg-block d-none"
@@ -315,7 +325,7 @@ watch(
                 :src="getArrowColor()"
                 alt="down-arrow"
                 class="arrow ms-1 d-lg-none d-block ms-auto"
-              />-->
+              />
             </a>
             <div
               class="dropdown-menu dropdown-menu-end dropdown-menu-animation dropdown-md mt-0 mt-lg-3 p-3 border-radius-lg"
@@ -328,7 +338,14 @@ watch(
                       class="dropdown-item py-2 ps-3 border-radius-md"
                       href="/ViewMyProfile"
                     >
-
+                    <h6
+                    class="dropdown-header text-dark font-weight-bolder d-flex justify-content-cente align-items-center p-0"
+                  >
+                    Мой профиль
+                  </h6>
+                  <span class="text-sm"
+                    >Перейти в мой профиль</span
+                  >
                     </a>
 
                     <a

From 23607473b29e8bacc426498e9613df147f5dc424 Mon Sep 17 00:00:00 2001
From: lazyseal <49525095+lazyseal@users.noreply.github.com>
Date: Mon, 22 May 2023 19:59:14 +0100
Subject: [PATCH 3/3] Update NavbarDefault.vue

Old NavBar restored
---
 src/examples/navbars/NavbarDefault.vue | 114 +++++++++++++++++++------
 1 file changed, 88 insertions(+), 26 deletions(-)

diff --git a/src/examples/navbars/NavbarDefault.vue b/src/examples/navbars/NavbarDefault.vue
index e0c616c..2974dc1 100644
--- a/src/examples/navbars/NavbarDefault.vue
+++ b/src/examples/navbars/NavbarDefault.vue
@@ -119,6 +119,7 @@ watch(
         ]"
         :to="{ name: 'presentation' }"
         rel="tooltip"
+        title="Designed and Coded by Creative Tim"
         data-placement="bottom"
       >
         LinkedMin
@@ -132,6 +133,7 @@ watch(
         "
         to="/"
         rel="tooltip"
+        title="Designed and Coded by Creative Tim"
         data-placement="bottom"
       >
       LinkedMin
@@ -170,14 +172,12 @@ watch(
               data-bs-toggle="dropdown"
               aria-expanded="false"
             >
-             <i
+              <i
                 class="material-icons opacity-6 me-2 text-md"
                 :class="getTextColor()"
                 >dashboard</i
               >
-
-              Пользователи          
-
+              Пользователи
               <img
                 :src="getArrowColor()"
                 alt="down-arrow"
@@ -191,8 +191,8 @@ watch(
             </a>
             <div
               class="dropdown-menu dropdown-menu-animation ms-n3 dropdown-md p-3 border-radius-xl mt-0 mt-lg-3"
-              aria-labelledby="dropdownMenuPages">
-
+              aria-labelledby="dropdownMenuPages"
+            >
               <div class="row d-none d-lg-block">
                 <div class="col-12 px-4 py-2">
                   <div class="row">
@@ -204,20 +204,28 @@ watch(
                       </div>
                       <RouterLink
                         :to="{ name: 'profiles' }"
-                        class="dropdown-item border-radius-md">
+                        class="dropdown-item border-radius-md"
+                      >
                         <span>Все пользователи</span>
                       </RouterLink>
+
                     </div>
                   </div>
                 </div>
               </div>
-
               <div class="d-lg-none">
+                <div
+                  class="dropdown-header text-dark font-weight-bolder d-flex align-items-center px-0"
+                >
+                 Все пользователи
+                </div>
                 <RouterLink
                   :to="{ name: 'profiles' }"
-                  class="dropdown-item border-radius-md">
+                  class="dropdown-item border-radius-md"
+                >
                   <span>Все пользователи</span>
                 </RouterLink>
+              
               </div>
             </div>
           </li>
@@ -290,9 +298,15 @@ watch(
                 </div>
               </div>
               <div class="d-lg-none">
+                <div
+                  class="dropdown-header text-dark font-weight-bolder d-flex align-items-center px-0"
+                >
+                 Все проекты
+                </div>
                 <RouterLink
                   :to="{ name: 'projects' }"
-                  class="dropdown-item border-radius-md">
+                  class="dropdown-item border-radius-md"
+                >
                   <span>Все проекты</span>
                 </RouterLink>
               
@@ -309,8 +323,9 @@ watch(
               :class="getTextColor()"
               id="dropdownMenuDocs"
               data-bs-toggle="dropdown"
-              aria-expanded="false">
-             <i
+              aria-expanded="false"
+            >
+              <i
                 class="material-icons opacity-6 me-2 text-md"
                 :class="getTextColor()"
                 >article</i
@@ -338,14 +353,27 @@ watch(
                       class="dropdown-item py-2 ps-3 border-radius-md"
                       href="/ViewMyProfile"
                     >
-                    <h6
-                    class="dropdown-header text-dark font-weight-bolder d-flex justify-content-cente align-items-center p-0"
-                  >
-                    Мой профиль
-                  </h6>
-                  <span class="text-sm"
-                    >Перейти в мой профиль</span
-                  >
+                      <h6
+                        class="dropdown-header text-dark font-weight-bolder d-flex justify-content-cente align-items-center p-0"
+                      >
+                        Мой Профиль
+                      </h6>
+                      <span class="text-sm"
+                        >Просмотр</span
+                      >
+                    </a>
+                    <a
+                      class="dropdown-item py-2 ps-3 border-radius-md"
+                      href="/EditMyProfile"
+                    >
+                      <h6
+                        class="dropdown-header text-dark font-weight-bolder d-flex justify-content-cente align-items-center p-0"
+                      >
+                        Мой Профиль
+                      </h6>
+                      <span class="text-sm"
+                        >Редактирование</span
+                      >
                     </a>
 
                     <a
@@ -362,22 +390,56 @@ watch(
                       >
                     </a>
                   </li>
+
+
                 </ul>
               </div>
-
               <div class="row d-lg-none">
                 <div class="col-md-12 g-0">
-                  <a class="dropdown-item py-2 ps-3 border-radius-md"
-                    href="/ViewMyProfile">
-                    <h6 class="dropdown-header text-dark font-weight-bolder d-flex justify-content-cente align-items-center p-0">
+                  <a
+                    class="dropdown-item py-2 ps-3 border-radius-md"
+                    href="/ViewMyProfile"
+                  >
+                    <h6
+                      class="dropdown-header text-dark font-weight-bolder d-flex justify-content-cente align-items-center p-0"
+                    >
                       Мой профиль
                     </h6>
-
+                    <span class="text-sm"
+                      >Просмотр</span
+                    >
                   </a>
+                  <a
+                    class="dropdown-item py-2 ps-3 border-radius-md"
+                    href="/ViewMyProfile"
+                  >
+                    <h6
+                      class="dropdown-header text-dark font-weight-bolder d-flex justify-content-cente align-items-center p-0"
+                    >
+                      Мой профиль
+                    </h6>
+                    <span class="text-sm"
+                      >Редактирование</span
+                    >
+                  </a>
+
+                  <a
+                    class="dropdown-item py-2 ps-3 border-radius-md"
+                    href="/CreateProject"
+                  >
+                    <h6
+                      class="dropdown-header text-dark font-weight-bolder d-flex justify-content-cente align-items-center p-0"
+                    >
+                    Создать проект
+                    </h6>
+                    <span class="text-sm"
+                      >Страница добавления проекта</span
+                    >
+                  </a>
+
                 </div>
                 
               </div>
-              
             </div>
           </li>