Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
boco-frontend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
idatt2106_2022_02
boco-frontend
Commits
44fb7c93
Commit
44fb7c93
authored
2 years ago
by
Haakon Tideman Kanter
Browse files
Options
Downloads
Plain Diff
Merge branch 'delete_user' into 'main'
Delete user See merge request
!129
parents
c4037e5c
e275d106
No related branches found
No related tags found
1 merge request
!129
Delete user
Pipeline
#181647
canceled
2 years ago
Stage: test
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/components/UserAuthComponents/DeleteUserModal.vue
+59
-0
59 additions, 0 deletions
src/components/UserAuthComponents/DeleteUserModal.vue
src/components/UserProfileComponents/UserProfile.vue
+17
-9
17 additions, 9 deletions
src/components/UserProfileComponents/UserProfile.vue
with
76 additions
and
9 deletions
src/components/UserAuthComponents/DeleteUserModal.vue
0 → 100644
+
59
−
0
View file @
44fb7c93
<
template
>
<!-- Main modal -->
<div
v-if=
"visible"
class=
"fixed grid place-items-center bg-gray-600 bg-opacity-50 top-0 left-0 right-0 z-50 w-full overflow-x-hidden overflow-y-auto inset-0 h-full"
>
<div
class=
"relative w-full h-full max-w-2xl p-4 md:h-auto"
>
<!-- Modal content -->
<div
class=
"relative bg-white rounded-lg shadow dark:bg-gray-700"
>
<!-- Modal header -->
<div
class=
"flex items-start justify-between p-4 border-b rounded-t dark:border-gray-600"
>
<h3
class=
"text-xl font-semibold text-gray-900 dark:text-white"
>
Er du helt sikker?
</h3>
<button
@
click=
"close()"
class=
"text-gray-400 bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm p-1.5 ml-auto inline-flex items-center dark:hover:bg-gray-600 dark:hover:text-white"
>
<svg
class=
"w-5 h-5"
fill=
"currentColor"
viewBox=
"0 0 20 20"
xmlns=
"http://www.w3.org/2000/svg"
>
<path
fill-rule=
"evenodd"
d=
"M4.293 4.293a1 1 0 011.414 0L10 8.586l4.293-4.293a1 1 0 111.414 1.414L11.414 10l4.293 4.293a1 1 0 01-1.414 1.414L10 11.414l-4.293 4.293a1 1 0 01-1.414-1.414L8.586 10 4.293 5.707a1 1 0 010-1.414z"
clip-rule=
"evenodd"
></path>
</svg>
</button>
</div>
<!-- Modal body -->
<div
class=
"p-6 space-y-6"
>
<div
@
click=
"deleteUser"
class=
"flex justify-center text-xl text-error-dark cursor-pointer"
>
Slett bruker
</div>
</div>
</div>
</div>
</div>
</
template
>
<
script
>
export
default
{
name
:
"
DeleteUserModal
"
,
props
:
{
visible
:
Boolean
,
},
methods
:
{
close
()
{
this
.
$emit
(
"
close
"
);
},
deleteUser
(){
this
.
$emit
(
"
deleteUser
"
);
},
},
};
</
script
>
This diff is collapsed.
Click to expand it.
src/components/UserProfileComponents/UserProfile.vue
+
17
−
9
View file @
44fb7c93
...
@@ -2,6 +2,8 @@
...
@@ -2,6 +2,8 @@
<div
<div
class=
"w-full max-w-xl m-auto md:ring-1 ring-gray-300 overflow-hidden rounded-xl p-4"
class=
"w-full max-w-xl m-auto md:ring-1 ring-gray-300 overflow-hidden rounded-xl p-4"
>
>
<DeleteUserModal
:visible=
"show"
@
close=
"this.show = false"
@
deleteUser=
"deleteUser"
/>
<div
v-show=
"isCurrentUser"
class=
"float-right px-4 pt-4"
>
<div
v-show=
"isCurrentUser"
class=
"float-right px-4 pt-4"
>
<button
<button
id=
"dropdownDefault"
id=
"dropdownDefault"
...
@@ -68,11 +70,11 @@
...
@@ -68,11 +70,11 @@
>
>
</li>
</li>
<li>
<li>
<
button
<
div
class=
"block py-2 px-4 text-sm text-error-dark cursor-pointer"
@
click=
"
deleteUser
"
@
click=
"
toggleModal
"
class=
"block py-2 px-4 text-sm text-error-dark hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white"
>
>
Slett bruker
</button
Slett bruker
>
</div
>
</li>
</li>
</ul>
</ul>
</div>
</div>
...
@@ -108,6 +110,7 @@ import RatingComponent from "@/components/UserProfileComponents/RatingComponents
...
@@ -108,6 +110,7 @@ import RatingComponent from "@/components/UserProfileComponents/RatingComponents
import
{
parseCurrentUser
}
from
"
@/utils/token-utils
"
;
import
{
parseCurrentUser
}
from
"
@/utils/token-utils
"
;
import
{
getUser
}
from
"
@/utils/apiutil
"
;
import
{
getUser
}
from
"
@/utils/apiutil
"
;
import
UserService
from
"
@/services/user.service
"
;
import
UserService
from
"
@/services/user.service
"
;
import
DeleteUserModal
from
"
@/components/UserAuthComponents/DeleteUserModal
"
;
export
default
{
export
default
{
name
:
"
LargeProfileCard
"
,
name
:
"
LargeProfileCard
"
,
...
@@ -123,10 +126,12 @@ export default {
...
@@ -123,10 +126,12 @@ export default {
profileImage
:
{
profileImage
:
{
src
:
require
(
"
../../assets/defaultUserProfileImage.jpg
"
),
src
:
require
(
"
../../assets/defaultUserProfileImage.jpg
"
),
},
},
show
:
false
,
};
};
},
},
components
:
{
components
:
{
RatingComponent
,
RatingComponent
,
DeleteUserModal
,
},
},
computed
:
{
computed
:
{
getProfilePicture
()
{
getProfilePicture
()
{
...
@@ -158,14 +163,17 @@ export default {
...
@@ -158,14 +163,17 @@ export default {
this
.
renterRating
=
ratingAsRenter
;
this
.
renterRating
=
ratingAsRenter
;
}
}
},
},
async
deleteUser
(){
await
UserService
.
deleteUser
();
this
.
logout
();
},
logout
()
{
logout
()
{
this
.
$store
.
commit
(
"
logout
"
);
this
.
$store
.
commit
(
"
logout
"
);
this
.
$router
.
push
(
"
/
"
);
this
.
$router
.
push
(
"
/
"
);
},
},
toggleModal
()
{
this
.
show
=
!
this
.
show
;
},
async
deleteUser
(){
await
UserService
.
deleteUser
();
this
.
$store
.
commit
(
"
logout
"
);
},
},
},
beforeMount
()
{
beforeMount
()
{
this
.
getUser
();
this
.
getUser
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment