From c9bc3498f3b7ec7b82a3ddabc83b65bc2d7fb8d3 Mon Sep 17 00:00:00 2001 From: Yashu Mittal Date: Sat, 4 Sep 2021 11:35:24 +0530 Subject: [PATCH 1/5] rename Users to users/Index page --- src/pages/dashboard/{Users.vue => users/Index.vue} | 14 +++++++------- src/routes.js | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) rename src/pages/dashboard/{Users.vue => users/Index.vue} (89%) diff --git a/src/pages/dashboard/Users.vue b/src/pages/dashboard/users/Index.vue similarity index 89% rename from src/pages/dashboard/Users.vue rename to src/pages/dashboard/users/Index.vue index 3a50d83..7b384ce 100644 --- a/src/pages/dashboard/Users.vue +++ b/src/pages/dashboard/users/Index.vue @@ -85,15 +85,15 @@ import { import InfiniteLoading from "vue-infinite-loading"; // modules -import { getAllUsers } from "../../modules/users"; +import { getAllUsers } from "../../../modules/users"; // components -import Table from "../../components/Table"; -import Avatar from "../../components/Avatar"; -import Loader from "../../components/Loader"; -import DropdownWrapper from "../../components/dropdown/DropdownWrapper"; -import Dropdown from "../../components/dropdown/Dropdown"; -import DropdownItem from "../../components/dropdown/DropdownItem"; +import Table from "../../../components/Table"; +import Avatar from "../../../components/Avatar"; +import Loader from "../../../components/Loader"; +import DropdownWrapper from "../../../components/dropdown/DropdownWrapper"; +import Dropdown from "../../../components/dropdown/Dropdown"; +import DropdownItem from "../../../components/dropdown/DropdownItem"; export default { name: "DashboardUsers", diff --git a/src/routes.js b/src/routes.js index 787887b..06251c9 100644 --- a/src/routes.js +++ b/src/routes.js @@ -155,7 +155,7 @@ const routes = [ { path: "users", name: "Dashbord users", - component: require("./pages/dashboard/Users").default + component: require("./pages/dashboard/users/Index").default }, { path: "settings/general", From 0fbadc6a69bb6dabbde0786eacec48fb173dda2d Mon Sep 17 00:00:00 2001 From: Yashu Mittal Date: Sun, 17 Oct 2021 10:51:40 +0530 Subject: [PATCH 2/5] link to "Dashboard user edit" page --- src/pages/dashboard/users/Index.vue | 5 +++-- src/routes.js | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/pages/dashboard/users/Index.vue b/src/pages/dashboard/users/Index.vue index 7b384ce..e51a3a3 100644 --- a/src/pages/dashboard/users/Index.vue +++ b/src/pages/dashboard/users/Index.vue @@ -21,10 +21,11 @@
-
@@ -63,7 +64,7 @@
-
+
diff --git a/src/routes.js b/src/routes.js index 06251c9..aa5ff83 100644 --- a/src/routes.js +++ b/src/routes.js @@ -157,6 +157,11 @@ const routes = [ name: "Dashbord users", component: require("./pages/dashboard/users/Index").default }, + { + path: "users/:id/edit", + name: "Dashbord users edit", + component: require("./pages/dashboard/users/Edit").default + }, { path: "settings/general", name: "Dashboard settings", From 73968d9f744fe09ddf8e9e0fce8db3a70016f5de Mon Sep 17 00:00:00 2001 From: Yashu Mittal Date: Sun, 17 Oct 2021 12:03:09 +0530 Subject: [PATCH 3/5] create "DashboardUsersEdit" page --- src/pages/dashboard/users/Edit.vue | 185 +++++++++++++++++++++++++++++ 1 file changed, 185 insertions(+) create mode 100644 src/pages/dashboard/users/Edit.vue diff --git a/src/pages/dashboard/users/Edit.vue b/src/pages/dashboard/users/Edit.vue new file mode 100644 index 0000000..7c3d12e --- /dev/null +++ b/src/pages/dashboard/users/Edit.vue @@ -0,0 +1,185 @@ + + + From cabd4332be838c17ca960f3d2b94a8d0b6e378c2 Mon Sep 17 00:00:00 2001 From: Yashu Mittal Date: Sun, 17 Oct 2021 12:03:50 +0530 Subject: [PATCH 4/5] add getUserData function --- src/modules/users.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/modules/users.js b/src/modules/users.js index 9873673..c6d3e68 100644 --- a/src/modules/users.js +++ b/src/modules/users.js @@ -96,3 +96,20 @@ export const checkUserDashboardAccess = async () => { } }); }; + +/** + * DASHBOARD: Get users data + * + * @param {string} userId user of which you want to access data of + */ +export const getUserData = async ({ userId }) => { + const token = store.getters["user/getAuthToken"]; + + return await axios({ + method: "GET", + url: `/api/v1/users/${userId}/get`, + headers: { + Authorization: `Bearer ${token}` + } + }); +}; From ede19ae0b3d8879a818e31998267df1e60ce11b1 Mon Sep 17 00:00:00 2001 From: Yashu Mittal Date: Sun, 17 Oct 2021 12:04:15 +0530 Subject: [PATCH 5/5] add styles for user edit page --- src/styles/pages/dashboard/users.sass | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/styles/pages/dashboard/users.sass b/src/styles/pages/dashboard/users.sass index 73eee7d..4c3ee38 100644 --- a/src/styles/pages/dashboard/users.sass +++ b/src/styles/pages/dashboard/users.sass @@ -15,3 +15,27 @@ .users-table-votes flex: 1 + +// user edit page +.user-profile + display: flex + align-items: flex-start + margin-bottom: 1rem + + .avatar + border-radius: 50% + display: flex + + .info + margin-left: 1rem + + h3 + margin-bottom: 0 + + p + font-weight: 500 + margin-bottom: 0.25rem + + span + font-size: 0.875rem + color: $gray-40