From fd3b57c77e698e4dfb32aaf8e27ce0c2e957e097 Mon Sep 17 00:00:00 2001 From: FEARmeR Date: Sat, 20 May 2023 15:26:24 +0100 Subject: [PATCH 01/17] Better search appearance --- .../Sections/PresentationSearch.vue | 49 ++++++++++++++++--- 1 file changed, 43 insertions(+), 6 deletions(-) diff --git a/src/views/Presentation/Sections/PresentationSearch.vue b/src/views/Presentation/Sections/PresentationSearch.vue index 012ada6..1a3a62a 100644 --- a/src/views/Presentation/Sections/PresentationSearch.vue +++ b/src/views/Presentation/Sections/PresentationSearch.vue @@ -3,6 +3,7 @@ import { onMounted, onUnmounted } from "vue"; import axios from 'axios'; import { ref } from "vue"; + const searchQuery = ref(''); const searchResultProjects = ref([]); const searchResultUsers = ref([]); @@ -27,9 +28,12 @@ const search = async () => { \ No newline at end of file From d1a7e27b0d05764797847150d3ea964ba5df5786 Mon Sep 17 00:00:00 2001 From: FEARmeR Date: Sat, 20 May 2023 15:32:02 +0100 Subject: [PATCH 02/17] Better search bar --- src/views/Presentation/Sections/PresentationSearch.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/Presentation/Sections/PresentationSearch.vue b/src/views/Presentation/Sections/PresentationSearch.vue index 1a3a62a..8c9197d 100644 --- a/src/views/Presentation/Sections/PresentationSearch.vue +++ b/src/views/Presentation/Sections/PresentationSearch.vue @@ -82,7 +82,7 @@ const search = async () => { /* Changes the font size */ font-size: 16px; /* Changes the background color of the button */ - background-color: #007BFF; + background-color: #3d9132; /* Changes the color of the text inside the button */ color: white; /* Makes the border corners rounded */ @@ -95,7 +95,7 @@ const search = async () => { .searchButton:hover { /* Changes the background color of the button when hovering over it */ - background-color: #0056b3; + background-color: #25581e; } \ No newline at end of file From 567b6c460fa870f6a04e6d70ea9714d0303834a4 Mon Sep 17 00:00:00 2001 From: FEARmeR Date: Sat, 20 May 2023 15:42:00 +0100 Subject: [PATCH 03/17] =?UTF-8?q?=D0=9D=D0=BE=D0=B2=D1=8B=D0=B9=20=D0=B2?= =?UTF-8?q?=D0=B8=D0=B4=20=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=8C=D1=82=D0=B0?= =?UTF-8?q?=D1=82=D0=BE=D0=B2=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sections/PresentationSearch.vue | 72 ++++++++++++++----- 1 file changed, 54 insertions(+), 18 deletions(-) diff --git a/src/views/Presentation/Sections/PresentationSearch.vue b/src/views/Presentation/Sections/PresentationSearch.vue index 8c9197d..3baf99d 100644 --- a/src/views/Presentation/Sections/PresentationSearch.vue +++ b/src/views/Presentation/Sections/PresentationSearch.vue @@ -35,25 +35,24 @@ const search = async () => { -
-

Найдено проектов: {{ searchResultProjects.length}}

-
-

{{ project.title }} with ID {{ project.id }}

-

{{ project.description }}

- Страница проекта - -
-

Найдено людей: {{ searchResultUsers.length}}

-
-

{{ user.username }} with id {{ user.id }}

-

{{ user.email }}

- Страница пользователя - - -
- +
+

Найдено проектов: {{ searchResultProjects.length}}

+
+
+

{{ project.title }} with ID {{ project.id }}

+

{{ project.description }}

+ Страница проекта +
- +

Найдено людей: {{ searchResultUsers.length}}

+
+
+

{{ user.username }} with id {{ user.id }}

+

{{ user.email }}

+ Страница пользователя +
+
+
@@ -97,5 +96,42 @@ const search = async () => { /* Changes the background color of the button when hovering over it */ background-color: #25581e; } +.result-header { + color: #fff; + background-color: #333; + padding: 10px; + text-align: center; + margin-top: 20px; +} + +.result-grid { + display: flex; + flex-wrap: wrap; + justify-content: space-between; +} + +.result-card { + display: flex; + flex-direction: column; + background-color: rgba(255, 255, 255, 0.5); + padding: 10px; + margin: 10px; + border-radius: 10px; + width: calc(100% / 3 - 20px); + box-sizing: border-box; +} + +@media screen and (max-width: 992px) { + .result-card { + width: calc(100% / 2 - 20px); + } +} + +@media screen and (max-width: 600px) { + .result-card { + width: 100%; + } +} + \ No newline at end of file From 16a2788b5e27657fd5ceeb9cf0e74d570d2b05b1 Mon Sep 17 00:00:00 2001 From: FEARmeR Date: Sat, 20 May 2023 15:50:04 +0100 Subject: [PATCH 04/17] =?UTF-8?q?=D0=9C=D0=BE=D0=B4=D0=B8=D1=84=D0=B8?= =?UTF-8?q?=D1=86=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=20=D1=84=D1=83=D1=82?= =?UTF-8?q?=D0=B5=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/examples/footers/FooterDefault.vue | 72 ++------------------- src/views/Presentation/PresentationView.vue | 44 +++++-------- 2 files changed, 23 insertions(+), 93 deletions(-) diff --git a/src/examples/footers/FooterDefault.vue b/src/examples/footers/FooterDefault.vue index d60799b..7c3fcbe 100644 --- a/src/examples/footers/FooterDefault.vue +++ b/src/examples/footers/FooterDefault.vue @@ -12,33 +12,7 @@ defineProps({ route: "/" }) }, - socials: { - type: Array, - icon: String, - link: String, - default: () => [ - { - icon: '', - link: "https://www.facebook.com/CreativeTim/" - }, - { - icon: '', - link: "https://twitter.com/creativetim" - }, - { - icon: '', - link: "https://dribbble.com/creativetim" - }, - { - icon: '', - link: "https://github.com/creativetimofficial" - }, - { - icon: '', - link: "https://www.youtube.com/channel/UCVyTG4sCw-rOvB9oHkzZD1w" - } - ] - }, + menus: { type: Array, name: String, @@ -127,51 +101,17 @@ defineProps({
-
- - - -
{{ brand.name }}
-
-
- -
-
-
-
{{ name }}
- + +
+

- All rights reserved. Copyright © + Екатерина Кузнецова, Ирина Комарова. {{ new Date().getFullYear() }} - Material Kit by + . Использованы материалы Creative Tim. diff --git a/src/views/Presentation/PresentationView.vue b/src/views/Presentation/PresentationView.vue index c8c55d4..1f22791 100644 --- a/src/views/Presentation/PresentationView.vue +++ b/src/views/Presentation/PresentationView.vue @@ -22,7 +22,6 @@ import DefaultFooter from "../../examples/footers/FooterDefault.vue"; import Header from "../../examples/Header.vue"; // sections -import PresentationCounter from "./Sections/PresentationCounter.vue"; import PresentationSearch from "./Sections/PresentationSearch.vue"; @@ -46,21 +45,24 @@ onUnmounted(() => { @@ -114,19 +116,7 @@ export default {

- - - -
- -
-
-

{{ project.title }}

-

{{ project.description }}

-
-
-
- + From 89ee3118f659fbcac1b849c416ef7ddac18360ac Mon Sep 17 00:00:00 2001 From: FEARmeR Date: Sat, 20 May 2023 16:32:34 +0100 Subject: [PATCH 05/17] =?UTF-8?q?=D0=9F=D0=B8=D0=BB=D0=B8=D0=BC=20=D1=80?= =?UTF-8?q?=D0=B5=D0=B3=D0=B8=D1=81=D1=82=D1=80=D0=B0=D1=86=D0=B8=D1=8E=20?= =?UTF-8?q?=D0=B8=20=D0=B2=D0=BE=D1=81=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B0=D1=80=D0=BE=D0=BB?= =?UTF-8?q?=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 15 +- .../LandingPages/SignIn/BasicRegister.vue | 176 ++++++++++++++++++ src/views/LandingPages/SignIn/BasicView.vue | 16 +- .../LandingPages/SignIn/ForgotPassword.vue | 33 ++++ 4 files changed, 235 insertions(+), 5 deletions(-) create mode 100644 src/views/LandingPages/SignIn/BasicRegister.vue create mode 100644 src/views/LandingPages/SignIn/ForgotPassword.vue diff --git a/src/router/index.js b/src/router/index.js index 09881e8..d935b72 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -26,7 +26,8 @@ import ElTypography from "../layouts/sections/elements/typography/TypographyView import Project from "../views/LandingPages/Project/Project.vue"; import Profile from "../views/LandingPages/Profile/Profile.vue"; import TopSecretProject from "../views/LandingPages/Project/TopSecretProject.vue"; - +import BasicRegister from "../views/LandingPages/SignIn/BasicRegister.vue"; +import ForgotPassword from "../views/LandingPages/SignIn/ForgotPassword.vue"; const router = createRouter({ history: createWebHistory(import.meta.env.BASE_URL), @@ -55,6 +56,18 @@ const router = createRouter({ component: Profile }, + { + path: "/register", + name: "register", + component: BasicRegister, + }, + + { + path: "/forgot", + name: "forgot", + component: ForgotPassword, + }, + { path: "/pages/landing-pages/about-us", name: "about", diff --git a/src/views/LandingPages/SignIn/BasicRegister.vue b/src/views/LandingPages/SignIn/BasicRegister.vue new file mode 100644 index 0000000..8775585 --- /dev/null +++ b/src/views/LandingPages/SignIn/BasicRegister.vue @@ -0,0 +1,176 @@ + + + + + + diff --git a/src/views/LandingPages/SignIn/BasicView.vue b/src/views/LandingPages/SignIn/BasicView.vue index 9b85c21..a65d826 100644 --- a/src/views/LandingPages/SignIn/BasicView.vue +++ b/src/views/LandingPages/SignIn/BasicView.vue @@ -117,13 +117,13 @@ export default {
-

Опять Ты!

+

Вы вошли в аккаунт

-

Ты с какого района?

+

Пожалуйста, введите логин и пароль

@@ -160,9 +160,17 @@ export default {

Нет аккаунта? Пока что нахер идитеЗарегистироваться +

+

+ + Забыли пароль

diff --git a/src/views/LandingPages/SignIn/ForgotPassword.vue b/src/views/LandingPages/SignIn/ForgotPassword.vue new file mode 100644 index 0000000..6bcf42a --- /dev/null +++ b/src/views/LandingPages/SignIn/ForgotPassword.vue @@ -0,0 +1,33 @@ + + + + + + + + \ No newline at end of file From fdb456fe82025a75480bb019cf8ba7307d9c179d Mon Sep 17 00:00:00 2001 From: FEARmeR Date: Sat, 20 May 2023 16:55:26 +0100 Subject: [PATCH 06/17] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0?= =?UTF-8?q?=D0=B5=D1=82=20=D1=80=D0=B5=D0=B3=D0=B8=D1=81=D1=82=D1=80=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LandingPages/SignIn/BasicRegister.vue | 67 ++++++++++--------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/src/views/LandingPages/SignIn/BasicRegister.vue b/src/views/LandingPages/SignIn/BasicRegister.vue index 8775585..bbd6d93 100644 --- a/src/views/LandingPages/SignIn/BasicRegister.vue +++ b/src/views/LandingPages/SignIn/BasicRegister.vue @@ -13,31 +13,38 @@ import setMaterialInput from "@/assets/js/material-input"; const username = ref(''); const password = ref(''); +const email = ref(''); // Add email const errorMessage = ref(''); const isAuthenticated = computed(() => !!sessionStorage.getItem('access_token')); // Computed property to check if the user is authenticated -const login = async () => { - if (!username.value || !password.value) { - errorMessage.value = "Please fill in both fields."; + + +// New register function +const register = async () => { + if (!username.value || !password.value || !email.value) { + errorMessage.value = "Please fill in all fields."; } else { - const url = 'http://somebodyhire.me/api/token/'; + const url = 'http://somebodyhire.me/api/register/'; const headers = { 'Content-Type': 'application/json', }; const body = { username: username.value, password: password.value, + email: email.value, // include email in the request body + is_staff: false }; try { const response = await axios.post(url, body, { headers }); - errorMessage.value = `Request:\nPOST ${url}\nHeaders: ${JSON.stringify(headers)}\nBody: ${JSON.stringify(body)}\n\nResponse:\nStatus: ${response.status}\nHeaders: ${JSON.stringify(response.headers)}\nBody: ${JSON.stringify(response.data)}`; - sessionStorage.setItem('access_token', response.data.access); // Save the access token in sessionStorage (new line) + errorMessage.value = `Registration successful. Welcome ${response.data.username}!`; // Display success message + sessionStorage.setItem('access_token', response.data.token); // Save the access token in sessionStorage } catch (error) { if (error.response) { - // The request was made and the server responded with a status code that falls out of the range of 2xx + // The request was made and the server responded with a status code + // that falls out of the range of 2xx errorMessage.value = `Request:\nPOST ${url}\nHeaders: ${JSON.stringify(headers)}\nBody: ${JSON.stringify(body)}\n\nResponse:\nStatus: ${error.response.status}\nHeaders: ${JSON.stringify(error.response.headers)}\nBody: ${JSON.stringify(error.response.data)}`; } else if (error.request) { // The request was made but no response was received @@ -50,11 +57,6 @@ const login = async () => { } }; -const logout = () => { // Method to logout the user by clearing the session storage (new function) - sessionStorage.removeItem('access_token'); -}; - - onMounted(() => { setMaterialInput(); }); @@ -66,17 +68,16 @@ export default { return { username: '', password: '', + email: '', errorMessage: '', }; }, methods: { - login() { - if (!this.username || !this.password) { - this.errorMessage = "Please fill in both fields."; - } else { - // Implement login logic here - this.errorMessage = `Can't login now, you are trying to sign in with login: ${this.username} and password: ${this.password}`; - } + register() { + this.username = username.value; + this.password = password.value; + this.email = email.value; + register(); // Call the register function }, }, }; @@ -115,15 +116,10 @@ export default {
-
- -

Опять Ты!

- -
- -
+
-

Ты с какого района?

+

Пожалуйста, зарегистрируйтесь

+

Пароль должен быть не менее 8 символов, и не быть похожим на имя пользователя или адрес почты

@@ -132,6 +128,11 @@ export default {
+
+ +
+ +
@@ -139,12 +140,12 @@ export default {
+ type="button" + class="btn bg-gradient-dark w-100 my-4 mb-2" + @click="register" +> + Зарегистрироваться +
From ea0543c476d72f0ae6a323868cd50ef19f370bae Mon Sep 17 00:00:00 2001 From: FEARmeR Date: Sat, 20 May 2023 17:21:29 +0100 Subject: [PATCH 07/17] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86?= =?UTF-8?q?=D1=8B=20/Profiles=20=D0=B8=20/Projects?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 15 +++ .../LandingPages/Profile/AllProfiles.vue | 124 ++++++++++++++++++ .../LandingPages/Project/AllProjects.vue | 124 ++++++++++++++++++ 3 files changed, 263 insertions(+) create mode 100644 src/views/LandingPages/Profile/AllProfiles.vue create mode 100644 src/views/LandingPages/Project/AllProjects.vue diff --git a/src/router/index.js b/src/router/index.js index d935b72..cfda41a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -28,6 +28,9 @@ import Profile from "../views/LandingPages/Profile/Profile.vue"; import TopSecretProject from "../views/LandingPages/Project/TopSecretProject.vue"; import BasicRegister from "../views/LandingPages/SignIn/BasicRegister.vue"; import ForgotPassword from "../views/LandingPages/SignIn/ForgotPassword.vue"; +import Projects from "../views/LandingPages/Project/AllProjects.vue"; +import Profiles from "../views/LandingPages/Profile/AllProfiles.vue"; + const router = createRouter({ history: createWebHistory(import.meta.env.BASE_URL), @@ -44,6 +47,12 @@ const router = createRouter({ component: Project }, + { + path: '/projects', + name: 'projects', + component: Projects + }, + { path: '/TopSecret', name: 'topsecretproject', @@ -56,6 +65,12 @@ const router = createRouter({ component: Profile }, + { + path: '/profiles', + name: 'profiles', + component: Profiles + }, + { path: "/register", name: "register", diff --git a/src/views/LandingPages/Profile/AllProfiles.vue b/src/views/LandingPages/Profile/AllProfiles.vue new file mode 100644 index 0000000..453b7b0 --- /dev/null +++ b/src/views/LandingPages/Profile/AllProfiles.vue @@ -0,0 +1,124 @@ + + + + + + \ No newline at end of file diff --git a/src/views/LandingPages/Project/AllProjects.vue b/src/views/LandingPages/Project/AllProjects.vue new file mode 100644 index 0000000..a6c6dc5 --- /dev/null +++ b/src/views/LandingPages/Project/AllProjects.vue @@ -0,0 +1,124 @@ + + + + + + \ No newline at end of file From e02d118b77f9cf5afb364928849ee7a671c5776e Mon Sep 17 00:00:00 2001 From: FEARmeR Date: Sat, 20 May 2023 17:58:28 +0100 Subject: [PATCH 08/17] Navbar fixed --- src/examples/navbars/NavbarDefault.vue | 743 ++----------------------- 1 file changed, 38 insertions(+), 705 deletions(-) diff --git a/src/examples/navbars/NavbarDefault.vue b/src/examples/navbars/NavbarDefault.vue index c8ec9cd..ae68e95 100644 --- a/src/examples/navbars/NavbarDefault.vue +++ b/src/examples/navbars/NavbarDefault.vue @@ -17,7 +17,7 @@ const props = defineProps({ default: () => ({ route: "/pages/landing-pages/basic", color: "bg-gradient-success", - label: "Вход/Регистрация" + label: "Вход / Регистрация" }) }, transparent: { @@ -117,7 +117,7 @@ watch( ]" :to="{ name: 'presentation' }" rel="tooltip" - title="Цифровое портфолио и деловые контакты" + title="Designed and Coded by Creative Tim" data-placement="bottom" > LinkedMin @@ -131,15 +131,15 @@ watch( " to="/" rel="tooltip" - title="Цифровое портфолио и деловые контакты" + title="Designed and Coded by Creative Tim" data-placement="bottom" > - Material Design + LinkedMin Buy NowВход/Регистрация
- About Us - - - Contact Us - - - Author - -
- Account -
- - Sign In + Все пользователи +
@@ -237,40 +215,20 @@ watch(
- Landing Pages + Все пользователи
- About Us - - - Contact Us - - - Author - -
- Account -
- - Sign In + Все пользователи +
+ +
  • - Landing Pages + Все проекты
    • - About Us - - - Contact Us - - - Author - -
    - Account -
    - - Sign In + Все проекты +
    @@ -347,523 +283,21 @@ watch(
    - Landing Pages + Все проекты
    - About Us - - - Contact Us - - - Author - -
    - Account -
    - - Sign In + Все проекты + -
  • - -
    -
    - -
    -
    -
    -
    -
    -
    -
    - Page Sections -
    -
    -
    -
    - - Page Headers - - - Features - -
    -
    -
    -
    - Navigation -
    -
    -
    -
    - - Navbars - - - Nav Tabs - - - Pagination - -
    -
    -
    -
    - Input Areas -
    -
    -
    -
    - - Inputs - - - Forms - -
    -
    -
    -
    - Attention Catchers -
    -
    -
    -
    - - Alerts - - - Modals - - - Tooltips & Popovers - -
    -
    -
    -
    - Elements -
    -
    -
    -
    - - Avatars - - - Badges - - - Breadcrumbs - - - Buttons - - - Button Groups - - - Dropdowns - - - Progress Bars - - - Toggles - - - Typography - -
    -
    -
    -
    • + + +
  • article - Мой профиль + Профиль down-arrow
    - Мой профиль + Мой Профиль
    Просмотр и редактирование профиля -     -
    • -
  • - -
    - Мои проекты -
    - Просмотр и редактирование проектов, в которых я принимаю участие -     -
    • -
  • - -
    - Мои сообщения -
    - Просмотр и отправка личных сообщенийРассказ о том, какой я классный
    • + +
    @@ -952,91 +358,18 @@ watch(
    - Getting Started + Мой профиль
    All about overview, quick start, license and - contents - - -
    - Foundation -
    - See our colors, icons and typography -     - -
    - Components -
    - Explore our collection of fully designed components -     - -
    - Plugins -
    - Check how you can integrate our plugins -     - -
    - Utility Classes -
    - For those who want flexibility, use our utility - classesРассказ о том, какой я классный     +
    - +
    • From 3ec29b6788b73244f1803aa57c996c9a1fc79efd Mon Sep 17 00:00:00 2001 From: FEARmeR Date: Sat, 20 May 2023 18:59:57 +0100 Subject: [PATCH 09/17] =?UTF-8?q?=D0=9C=D1=8B=20=D0=B7=D0=BD=D0=B0=D0=B5?= =?UTF-8?q?=D0=BC,=20=D0=BA=D1=82=D0=BE=20=D0=BC=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/LandingPages/SignIn/BasicView.vue | 27 ++++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/views/LandingPages/SignIn/BasicView.vue b/src/views/LandingPages/SignIn/BasicView.vue index a65d826..7dfb09d 100644 --- a/src/views/LandingPages/SignIn/BasicView.vue +++ b/src/views/LandingPages/SignIn/BasicView.vue @@ -16,7 +16,8 @@ const password = ref(''); const errorMessage = ref(''); const isAuthenticated = computed(() => !!sessionStorage.getItem('access_token')); // Computed property to check if the user is authenticated - +const userId = computed(() => sessionStorage.getItem('user_id')); +const loggedUserName = computed(() => sessionStorage.getItem('username')); const login = async () => { if (!username.value || !password.value) { @@ -33,28 +34,30 @@ const login = async () => { try { const response = await axios.post(url, body, { headers }); - errorMessage.value = `Request:\nPOST ${url}\nHeaders: ${JSON.stringify(headers)}\nBody: ${JSON.stringify(body)}\n\nResponse:\nStatus: ${response.status}\nHeaders: ${JSON.stringify(response.headers)}\nBody: ${JSON.stringify(response.data)}`; - sessionStorage.setItem('access_token', response.data.access); // Save the access token in sessionStorage (new line) + // Removed debug information from output + sessionStorage.setItem('access_token', response.data.access); + sessionStorage.setItem('username', username.value); // Save username in sessionStorage + sessionStorage.setItem('user_id', response.data.id); // Save the user id in sessionStorage + location.reload(); // Refresh page } catch (error) { if (error.response) { - // The request was made and the server responded with a status code that falls out of the range of 2xx - errorMessage.value = `Request:\nPOST ${url}\nHeaders: ${JSON.stringify(headers)}\nBody: ${JSON.stringify(body)}\n\nResponse:\nStatus: ${error.response.status}\nHeaders: ${JSON.stringify(error.response.headers)}\nBody: ${JSON.stringify(error.response.data)}`; + errorMessage.value = "Incorrect login or password."; // Simplified error message } else if (error.request) { - // The request was made but no response was received - errorMessage.value = `Request:\nPOST ${url}\nHeaders: ${JSON.stringify(headers)}\nBody: ${JSON.stringify(body)}\n\nError: No response received from server. Please try again later.`; + errorMessage.value = "No response received from server. Please try again later."; } else { - // Something happened in setting up the request that triggered an error - errorMessage.value = `Request:\nPOST ${url}\nHeaders: ${JSON.stringify(headers)}\nBody: ${JSON.stringify(body)}\n\nError: ${error.message}`; + errorMessage.value = error.message; } } } }; -const logout = () => { // Method to logout the user by clearing the session storage (new function) +const logout = () => { sessionStorage.removeItem('access_token'); + sessionStorage.removeItem('username'); // Also clear the username from sessionStorage + sessionStorage.removeItem('user_id'); + location.reload(); // Refresh page after logout }; - onMounted(() => { setMaterialInput(); }); @@ -117,7 +120,7 @@ export default {
      -

      Вы вошли в аккаунт

      +

      Вы вошли в аккаунт {{ loggedUserName }}, ваш ID {{ userId }}

      From 060d5a8b63aadc38f070dd2a4913def9f66cdebc Mon Sep 17 00:00:00 2001 From: FEARmeR Date: Sat, 20 May 2023 19:06:31 +0100 Subject: [PATCH 10/17] =?UTF-8?q?=D0=93=D0=BB=D0=B0=D0=B2=D0=BD=D0=BE?= =?UTF-8?q?=D1=8F=20=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=B7=D0=B4?= =?UTF-8?q?=D0=BE=D1=80=D0=BE=D0=B2=D0=B0=D0=B5=D1=82=D1=81=D1=8F=20=D1=81?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5?= =?UTF-8?q?=D0=BB=D0=B5=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Presentation/PresentationView.vue | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/views/Presentation/PresentationView.vue b/src/views/Presentation/PresentationView.vue index 1f22791..8ab68b9 100644 --- a/src/views/Presentation/PresentationView.vue +++ b/src/views/Presentation/PresentationView.vue @@ -30,6 +30,8 @@ import vueMkHeader from "@/assets/img/space-background.jpg"; //authentification const isAuthenticated = computed(() => !!sessionStorage.getItem('access_token')); +const userId = computed(() => sessionStorage.getItem('user_id')); +const loggedUserName = computed(() => sessionStorage.getItem('username')); //hooks const body = document.getElementsByTagName("body")[0]; @@ -87,16 +89,23 @@ export default {

      LinkedMin

      +

      + + + + + +

      -

      - Тариф Премиум

      + Привет, {{ loggedUserName }}
      From 600c960c3a7e0bc6324dc1cb8ff0be2e625379b8 Mon Sep 17 00:00:00 2001 From: FEARmeR Date: Sat, 20 May 2023 19:10:32 +0100 Subject: [PATCH 11/17] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=D0=B8=20?= =?UTF-8?q?=D0=BD=D1=83=D0=BB=D0=B8=20=D1=81=20=D0=B3=D0=BB=D0=B0=D0=B2?= =?UTF-8?q?=D0=BD=D0=BE=D0=B9=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86?= =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Presentation/Sections/PresentationSearch.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/views/Presentation/Sections/PresentationSearch.vue b/src/views/Presentation/Sections/PresentationSearch.vue index 3baf99d..a1c18f5 100644 --- a/src/views/Presentation/Sections/PresentationSearch.vue +++ b/src/views/Presentation/Sections/PresentationSearch.vue @@ -35,7 +35,7 @@ const search = async () => {
      -
      +

      Найдено проектов: {{ searchResultProjects.length}}

      @@ -53,6 +53,12 @@ const search = async () => {
      +
      +
      +

      Ничего не найдено

      +
      +
      + From 57eb4d1edf11868e191478e5587ce0632001fca4 Mon Sep 17 00:00:00 2001 From: FEARmeR Date: Sat, 20 May 2023 20:41:40 +0100 Subject: [PATCH 12/17] View profile working, search bug fixed --- src/router/index.js | 131 +++--------------- .../LandingPages/Profile/AdmireProfile.vue | 45 ++++++ .../LandingPages/Profile/EditProfile.vue | 0 .../Sections/PresentationSearch.vue | 5 +- 4 files changed, 64 insertions(+), 117 deletions(-) create mode 100644 src/views/LandingPages/Profile/AdmireProfile.vue create mode 100644 src/views/LandingPages/Profile/EditProfile.vue diff --git a/src/router/index.js b/src/router/index.js index cfda41a..fe66f1c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -4,25 +4,6 @@ import AboutView from "../views/LandingPages/AboutUs/AboutView.vue"; import ContactView from "../views/LandingPages/ContactUs/ContactView.vue"; import AuthorView from "../views/LandingPages/Author/AuthorView.vue"; import SignInBasicView from "../views/LandingPages/SignIn/BasicView.vue"; -import PageHeaders from "../layouts/sections/page-sections/page-headers/HeadersView.vue"; -import PageFeatures from "../layouts/sections/page-sections/features/FeaturesView.vue"; -import NavigationNavbars from "../layouts/sections/navigation/navbars/NavbarsView.vue"; -import NavigationNavTabs from "../layouts/sections/navigation/nav-tabs/NavTabsView.vue"; -import NavigationPagination from "../layouts/sections/navigation/pagination/PaginationView.vue"; -import InputAreasInputs from "../layouts/sections/input-areas/inputs/InputsView.vue"; -import InputAreasForms from "../layouts/sections/input-areas/forms/FormsView.vue"; -import ACAlerts from "../layouts/sections/attention-catchers/alerts/AlertsView.vue"; -import ACModals from "../layouts/sections/attention-catchers/modals/ModalsView.vue"; -import ACTooltipsPopovers from "../layouts/sections/attention-catchers/tooltips-popovers/TooltipsPopoversView.vue"; -import ElAvatars from "../layouts/sections/elements/avatars/AvatarsView.vue"; -import ElBadges from "../layouts/sections/elements/badges/BadgesView.vue"; -import ElBreadcrumbs from "../layouts/sections/elements/breadcrumbs/BreadcrumbsView.vue"; -import ElButtons from "../layouts/sections/elements/buttons/ButtonsView.vue"; -import ElButtonGroups from "../layouts/sections/elements/button-groups/ButtonGroupsView.vue"; -import ElDropdowns from "../layouts/sections/elements/dropdowns/DropdownsView.vue"; -import ElProgressBars from "../layouts/sections/elements/progress-bars/ProgressBarsView.vue"; -import ElToggles from "../layouts/sections/elements/toggles/TogglesView.vue"; -import ElTypography from "../layouts/sections/elements/typography/TypographyView.vue"; import Project from "../views/LandingPages/Project/Project.vue"; import Profile from "../views/LandingPages/Profile/Profile.vue"; import TopSecretProject from "../views/LandingPages/Project/TopSecretProject.vue"; @@ -30,7 +11,8 @@ import BasicRegister from "../views/LandingPages/SignIn/BasicRegister.vue"; import ForgotPassword from "../views/LandingPages/SignIn/ForgotPassword.vue"; import Projects from "../views/LandingPages/Project/AllProjects.vue"; import Profiles from "../views/LandingPages/Profile/AllProfiles.vue"; - +import ViewMyProfile from "../views/LandingPages/Profile/AdmireProfile.vue"; +import EditMyProfile from "../views/LandingPages/Profile/EditProfile.vue"; const router = createRouter({ history: createWebHistory(import.meta.env.BASE_URL), @@ -65,6 +47,18 @@ const router = createRouter({ component: Profile }, + { + path: '/ViewMyProfile', + name: 'viewmyprofile', + component: ViewMyProfile + }, + + { + path: '/EditMyProfile', + name: 'editmyprofile', + component: EditMyProfile + }, + { path: '/profiles', name: 'profiles', @@ -103,101 +97,8 @@ const router = createRouter({ name: "signin-basic", component: SignInBasicView, }, - { - path: "/sections/page-sections/page-headers", - name: "page-headers", - component: PageHeaders, - }, - { - path: "/sections/page-sections/features", - name: "page-features", - component: PageFeatures, - }, - { - path: "/sections/navigation/navbars", - name: "navigation-navbars", - component: NavigationNavbars, - }, - { - path: "/sections/navigation/nav-tabs", - name: "navigation-navtabs", - component: NavigationNavTabs, - }, - { - path: "/sections/navigation/pagination", - name: "navigation-pagination", - component: NavigationPagination, - }, - { - path: "/sections/input-areas/inputs", - name: "inputareas-inputs", - component: InputAreasInputs, - }, - { - path: "/sections/input-areas/forms", - name: "inputareas-forms", - component: InputAreasForms, - }, - { - path: "/sections/attention-catchers/alerts", - name: "ac-alerts", - component: ACAlerts, - }, - { - path: "/sections/attention-catchers/modals", - name: "ac-modals", - component: ACModals, - }, - { - path: "/sections/attention-catchers/tooltips-popovers", - name: "ac-tooltips-popovers", - component: ACTooltipsPopovers, - }, - { - path: "/sections/elements/avatars", - name: "el-avatars", - component: ElAvatars, - }, - { - path: "/sections/elements/badges", - name: "el-badges", - component: ElBadges, - }, - { - path: "/sections/elements/breadcrumbs", - name: "el-breadcrumbs", - component: ElBreadcrumbs, - }, - { - path: "/sections/elements/buttons", - name: "el-buttons", - component: ElButtons, - }, - { - path: "/sections/elements/button-groups", - name: "el-button-groups", - component: ElButtonGroups, - }, - { - path: "/sections/elements/dropdowns", - name: "el-dropdowns", - component: ElDropdowns, - }, - { - path: "/sections/elements/progress-bars", - name: "el-progress-bars", - component: ElProgressBars, - }, - { - path: "/sections/elements/toggles", - name: "el-toggles", - component: ElToggles, - }, - { - path: "/sections/elements/typography", - name: "el-typography", - component: ElTypography, - }, + + ], }); diff --git a/src/views/LandingPages/Profile/AdmireProfile.vue b/src/views/LandingPages/Profile/AdmireProfile.vue new file mode 100644 index 0000000..5e42a07 --- /dev/null +++ b/src/views/LandingPages/Profile/AdmireProfile.vue @@ -0,0 +1,45 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/views/LandingPages/Profile/EditProfile.vue b/src/views/LandingPages/Profile/EditProfile.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/Presentation/Sections/PresentationSearch.vue b/src/views/Presentation/Sections/PresentationSearch.vue index a1c18f5..b7b9c24 100644 --- a/src/views/Presentation/Sections/PresentationSearch.vue +++ b/src/views/Presentation/Sections/PresentationSearch.vue @@ -7,7 +7,7 @@ import { ref } from "vue"; const searchQuery = ref(''); const searchResultProjects = ref([]); const searchResultUsers = ref([]); - +const searchButtonIsPressed = ref(false); const search = async () => { try { const projectsResponse = await axios.get(`http://somebodyhire.me/api/search/projects/?search_query=${searchQuery.value}`); @@ -15,6 +15,7 @@ const search = async () => { const usersResponse = await axios.get(`http://somebodyhire.me/api/search/profiles/?search_query=${searchQuery.value}`); searchResultUsers.value = usersResponse.data; + searchButtonIsPressed.value = true; } catch (error) { console.error('There was an error fetching the search results', error); } @@ -54,7 +55,7 @@ const search = async () => {
      -
      +

      Ничего не найдено

      From be2359d05ab0aa4ab1b470b1f161c291749b20ce Mon Sep 17 00:00:00 2001 From: FEARmeR Date: Sat, 20 May 2023 21:08:41 +0100 Subject: [PATCH 13/17] Profile page added --- src/examples/navbars/NavbarDefault.vue | 10 ++-- .../LandingPages/Profile/AdmireProfile.vue | 55 +++++++++++++++++-- 2 files changed, 56 insertions(+), 9 deletions(-) diff --git a/src/examples/navbars/NavbarDefault.vue b/src/examples/navbars/NavbarDefault.vue index ae68e95..e4f428d 100644 --- a/src/examples/navbars/NavbarDefault.vue +++ b/src/examples/navbars/NavbarDefault.vue @@ -1,6 +1,6 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/views/LandingPages/Project/AddProject.vue b/src/views/LandingPages/Project/AddProject.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/LandingPages/Project/EditProject.vue b/src/views/LandingPages/Project/EditProject.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/LandingPages/Project/ViewProject.vue b/src/views/LandingPages/Project/ViewProject.vue new file mode 100644 index 0000000..e69de29 From f8f2e27e87d1a461924187db53a7b05ca0ee82bf Mon Sep 17 00:00:00 2001 From: FEARmeR Date: Sat, 20 May 2023 22:15:32 +0100 Subject: [PATCH 15/17] =?UTF-8?q?=D0=A4=D0=B2=D0=B2=20=D0=B7=D0=BA=D1=89?= =?UTF-8?q?=D0=BE=D1=83=D1=81=D0=B5=20=D1=8B=D1=89=D1=8C=D1=83=D1=82=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 15 +++++++++++++++ src/views/LandingPages/Project/AddProject.vue | 4 ++++ 2 files changed, 19 insertions(+) diff --git a/src/router/index.js b/src/router/index.js index fe66f1c..b72a3dc 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -13,6 +13,9 @@ import Projects from "../views/LandingPages/Project/AllProjects.vue"; import Profiles from "../views/LandingPages/Profile/AllProfiles.vue"; import ViewMyProfile from "../views/LandingPages/Profile/AdmireProfile.vue"; import EditMyProfile from "../views/LandingPages/Profile/EditProfile.vue"; +import CreateProject from "../views/LandingPages/Project/AddProject.vue"; +import EditProject from "../views/LandingPages/Project/EditProject.vue"; + const router = createRouter({ history: createWebHistory(import.meta.env.BASE_URL), @@ -35,6 +38,18 @@ const router = createRouter({ component: Projects }, + { + path: '/CreateProject', + name: 'createproject', + component: CreateProject + }, + + { + path: '/EditProject/:id', + name: 'editproject', + component: EditProject + }, + { path: '/TopSecret', name: 'topsecretproject', diff --git a/src/views/LandingPages/Project/AddProject.vue b/src/views/LandingPages/Project/AddProject.vue index e69de29..f1a16ea 100644 --- a/src/views/LandingPages/Project/AddProject.vue +++ b/src/views/LandingPages/Project/AddProject.vue @@ -0,0 +1,4 @@ + \ No newline at end of file From 17638c259c0a084a0341e7981a714b4b3112cbbf Mon Sep 17 00:00:00 2001 From: FEARmeR Date: Sat, 20 May 2023 22:29:41 +0100 Subject: [PATCH 16/17] CreateProject page added --- src/views/LandingPages/Project/AddProject.vue | 140 +++++++++++++++++- 1 file changed, 137 insertions(+), 3 deletions(-) diff --git a/src/views/LandingPages/Project/AddProject.vue b/src/views/LandingPages/Project/AddProject.vue index f1a16ea..4f5c772 100644 --- a/src/views/LandingPages/Project/AddProject.vue +++ b/src/views/LandingPages/Project/AddProject.vue @@ -1,4 +1,138 @@ -