From cc6fa5b21a39b2cf84f9344c04a4241aae36db1b Mon Sep 17 00:00:00 2001 From: FEARmeR Date: Thu, 18 May 2023 11:30:15 +0100 Subject: [PATCH 1/8] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=B5?= =?UTF-8?q?=D1=82=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA=20=D0=BF=D0=BE=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Presentation/PresentationView.vue | 46 +++++++++++++++++---- 1 file changed, 37 insertions(+), 9 deletions(-) diff --git a/src/views/Presentation/PresentationView.vue b/src/views/Presentation/PresentationView.vue index 60c1913..4b416e7 100644 --- a/src/views/Presentation/PresentationView.vue +++ b/src/views/Presentation/PresentationView.vue @@ -57,6 +57,8 @@ export default { data() { return { projects: [], + searchQuery: '', + searchResult: [], }; }, async created() { @@ -67,6 +69,16 @@ export default { console.error('There was an error fetching the projects', error); } }, + methods: { + async search() { + try { + const response = await axios.get(`http://somebodyhire.me/api/search/projects/?search_query=${this.searchQuery}`); + this.searchResult = response.data; + } catch (error) { + console.error('There was an error performing the search', error); + } + } + }, }; @@ -101,22 +113,38 @@ export default {

+
+ + + + + +
+

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

+
+

{{ project.title }}

+

{{ project.description }}

+
+
+
+

No results found

+
+
-
- -
+
+
+ +
+ +
+ @@ -129,9 +157,9 @@ export default {

{{ project.title }}

{{ project.description }}

+ - -
+ + + +
+

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

+
+
+

{{ project.title }}

+

{{ project.description }}

+
+
+
+

Не найдено проектов

+
+
+ +
+

Найдено пользователей: {{ searchResultUsers.length }}

+
+
+

{{ user.username }}

+

{{ user.email }}

+
+
+
+

Не найдено пользователей

+
+
+ + + +
From 494a6a0ddbf28631cc0a760506f014589f55c676 Mon Sep 17 00:00:00 2001 From: FEARmeR Date: Thu, 18 May 2023 13:03:27 +0100 Subject: [PATCH 3/8] Code cleanup --- src/views/Presentation/PresentationView.vue | 310 +------------------- 1 file changed, 5 insertions(+), 305 deletions(-) diff --git a/src/views/Presentation/PresentationView.vue b/src/views/Presentation/PresentationView.vue index 325bfe4..8f83cfa 100644 --- a/src/views/Presentation/PresentationView.vue +++ b/src/views/Presentation/PresentationView.vue @@ -21,19 +21,9 @@ import NavbarDefault from "../..//examples/navbars/NavbarDefault.vue"; import DefaultFooter from "../../examples/footers/FooterDefault.vue"; import Header from "../../examples/Header.vue"; - - -//Vue Material Kit 2 components -import MaterialInput from "@/components/MaterialInput.vue"; - // sections import PresentationCounter from "./Sections/PresentationCounter.vue"; -import PresentationPages from "./Sections/PresentationPages.vue"; -import PresentationExample from "./Sections/PresentationExample.vue"; -import data from "./Sections/Data/designBlocksData"; -import BuiltByDevelopers from "./Components/BuiltByDevelopers.vue"; -import PresentationTestimonials from "./Sections/PresentationTestimonials.vue"; -import PresentationInformation from "./Sections/PresentationInformation.vue"; + //images import vueMkHeader from "@/assets/img/space-background.jpg"; @@ -57,9 +47,6 @@ export default { data() { return { projects: [], - searchQuery: '', - searchResult: [], - searchResultUsers: [], }; }, async created() { @@ -70,18 +57,6 @@ export default { console.error('There was an error fetching the projects', error); } }, - methods: { - async search() { - try { - const response = await axios.get(`http://somebodyhire.me/api/search/projects/?search_query=${this.searchQuery}`); - this.searchResult = response.data; - const responseUsers = await axios.get(`http://somebodyhire.me/api/search/profiles/?search_query=${this.searchQuery}`); - this.searchResultUsers = responseUsers.data; - } catch (error) { - console.error('There was an error performing the search', error); - } - } - }, }; @@ -120,75 +95,16 @@ export default { - - - - -
-

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

-
-
-

{{ project.title }}

-

{{ project.description }}

-
-
-
-

Не найдено проектов

-
-
- -
-

Найдено пользователей: {{ searchResultUsers.length }}

-
-
-

{{ user.username }}

-

{{ user.email }}

-
-
-
-

Не найдено пользователей

-
-
- - - +
- -
-
-
-
- -
-
-
-
- - - - - + + - -
+
@@ -198,222 +114,6 @@ export default {
- From 0c59ffddf449daac059159e5d67fdcb5f27d9b89 Mon Sep 17 00:00:00 2001 From: FEARmeR Date: Thu, 18 May 2023 14:02:32 +0100 Subject: [PATCH 4/8] =?UTF-8?q?=D0=A3=D0=BD=D1=91=D1=81=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=B8=D1=81=D0=BA=20=D0=B2=20=D0=BE=D1=82=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D1=8C=D0=BD=D1=8B=D0=B9=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D1=82,=20=D0=B7=D0=B0=D0=B4=D0=BE=D0=BB=D0=B1?= =?UTF-8?q?=D0=B0=D0=BB=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Presentation/PresentationView.vue | 8 +++----- src/views/Presentation/Sections/PresentationSearch.vue | 10 ++++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 src/views/Presentation/Sections/PresentationSearch.vue diff --git a/src/views/Presentation/PresentationView.vue b/src/views/Presentation/PresentationView.vue index 8f83cfa..fdaca58 100644 --- a/src/views/Presentation/PresentationView.vue +++ b/src/views/Presentation/PresentationView.vue @@ -23,6 +23,7 @@ import Header from "../../examples/Header.vue"; // sections import PresentationCounter from "./Sections/PresentationCounter.vue"; +import PresentationSearch from "./Sections/PresentationSearch.vue"; //images @@ -92,11 +93,8 @@ export default {
- - - - - + +
diff --git a/src/views/Presentation/Sections/PresentationSearch.vue b/src/views/Presentation/Sections/PresentationSearch.vue new file mode 100644 index 0000000..cab831a --- /dev/null +++ b/src/views/Presentation/Sections/PresentationSearch.vue @@ -0,0 +1,10 @@ + + + + \ No newline at end of file From c094a72973545970ff75effae536bf99b7c24a0f Mon Sep 17 00:00:00 2001 From: FEARmeR Date: Thu, 18 May 2023 14:47:10 +0100 Subject: [PATCH 5/8] =?UTF-8?q?=D0=9F=D0=BE=D0=BA=D0=B0=D0=B7=D1=8B=D0=B2?= =?UTF-8?q?=D0=B0=D0=B5=D1=82,=20=D0=BD=D0=BE=20=D0=BD=D0=B5=20=D1=80?= =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=B5=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sections/PresentationSearch.vue | 63 ++++++++++++++++--- 1 file changed, 55 insertions(+), 8 deletions(-) diff --git a/src/views/Presentation/Sections/PresentationSearch.vue b/src/views/Presentation/Sections/PresentationSearch.vue index cab831a..78d402a 100644 --- a/src/views/Presentation/Sections/PresentationSearch.vue +++ b/src/views/Presentation/Sections/PresentationSearch.vue @@ -1,10 +1,57 @@ - - - +}; + + + + + + + + + + \ No newline at end of file From 8ac10bf7a96732fe1654a003f3b84f64ba7540fb Mon Sep 17 00:00:00 2001 From: FEARmeR Date: Thu, 18 May 2023 15:05:18 +0100 Subject: [PATCH 6/8] =?UTF-8?q?=D0=9F=D0=BE=D0=B8=D1=81=D0=BA=20=D1=80?= =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=B5=D1=82=20=D0=BB=D0=BE=D0=BA?= =?UTF-8?q?=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE,=20=D0=BD=D0=B0=D0=B4=D0=BE=20?= =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=B8=D1=82=D1=8C=20=D0=BD?= =?UTF-8?q?=D0=B0=20=D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Presentation/Sections/PresentationSearch.vue | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/views/Presentation/Sections/PresentationSearch.vue b/src/views/Presentation/Sections/PresentationSearch.vue index 78d402a..a442194 100644 --- a/src/views/Presentation/Sections/PresentationSearch.vue +++ b/src/views/Presentation/Sections/PresentationSearch.vue @@ -9,10 +9,10 @@ const searchResultUsers = ref([]); const search = async () => { try { - const projectsResponse = await axios.get(`http://somebodyhire.me/api/projects/?search=${searchQuery.value}`); + const projectsResponse = await axios.get(`http://somebodyhire.me/api/search/projects/?search_query=${searchQuery.value}`); searchResultProjects.value = projectsResponse.data; - const usersResponse = await axios.get(`http://somebodyhire.me/api/profiles/?search=${searchQuery.value}`); + const usersResponse = await axios.get(`http://somebodyhire.me/api/search/profiles/?search_query=${searchQuery.value}`); searchResultUsers.value = usersResponse.data; } catch (error) { console.error('There was an error fetching the search results', error); @@ -30,16 +30,10 @@ const search = async () => { -
-
-

Projects Results

-

Number of results: {{ searchResultProjects.value.length }}

-
-
-

User Profile Results

-

Number of results: {{ searchResultUsers.value.length }}

-
+
+

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

+

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

From 4445a4c0e7c5fa857c386b21acdb9a92880c3ae1 Mon Sep 17 00:00:00 2001 From: FEARmeR Date: Thu, 18 May 2023 15:30:18 +0100 Subject: [PATCH 7/8] =?UTF-8?q?=D0=9F=D0=BE=D0=B8=D1=81=D0=BA=20=D1=81=20?= =?UTF-8?q?=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=8C=D1=82=D0=B0=D1=82=D0=B0?= =?UTF-8?q?=D0=BC=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Presentation/Sections/PresentationSearch.vue | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/views/Presentation/Sections/PresentationSearch.vue b/src/views/Presentation/Sections/PresentationSearch.vue index a442194..e31b42c 100644 --- a/src/views/Presentation/Sections/PresentationSearch.vue +++ b/src/views/Presentation/Sections/PresentationSearch.vue @@ -33,8 +33,18 @@ const search = async () => {

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

+
+

{{ project.title }}

+

{{ project.description }}

+

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

- +
+

{{ user.username }}

+

{{ user.email }}

+ + +
+
From c1e16406bca98dd076ef98c0951cf186e5f41601 Mon Sep 17 00:00:00 2001 From: FEARmeR Date: Thu, 18 May 2023 16:37:22 +0100 Subject: [PATCH 8/8] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D1=8E?= =?UTF-8?q?=D1=82=20=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D0=B8=20/project/1=20?= =?UTF-8?q?=D0=B8=20/project/2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 9 ++++ src/views/LandingPages/Project/Project.vue | 56 ++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 src/views/LandingPages/Project/Project.vue diff --git a/src/router/index.js b/src/router/index.js index 6257f01..51cb27e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -23,6 +23,9 @@ import ElDropdowns from "../layouts/sections/elements/dropdowns/DropdownsView.vu 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"; + + const router = createRouter({ history: createWebHistory(import.meta.env.BASE_URL), routes: [ @@ -31,6 +34,12 @@ const router = createRouter({ name: "presentation", component: PresentationView, }, + { + path: '/project/:id', + name: 'project', + component: Project + }, + { path: "/pages/landing-pages/about-us", name: "about", diff --git a/src/views/LandingPages/Project/Project.vue b/src/views/LandingPages/Project/Project.vue new file mode 100644 index 0000000..72fafcb --- /dev/null +++ b/src/views/LandingPages/Project/Project.vue @@ -0,0 +1,56 @@ + + + + + + + + + \ No newline at end of file