Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
canifa_note
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Vũ Hoàng Anh
canifa_note
Commits
9994b1fa
Commit
9994b1fa
authored
Jul 29, 2022
by
boojack
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: update member setting styles
parent
2d093d5b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
31 additions
and
20 deletions
+31
-20
index.html
web/index.html
+1
-1
MemberSection.tsx
web/src/components/Settings/MemberSection.tsx
+15
-8
memo-card-dialog.less
web/src/less/memo-card-dialog.less
+1
-1
search-bar.less
web/src/less/search-bar.less
+10
-6
member-section.less
web/src/less/settings/member-section.less
+4
-4
No files found.
web/index.html
View file @
9994b1fa
...
...
@@ -4,7 +4,7 @@
<meta
charset=
"UTF-8"
/>
<link
rel=
"icon"
href=
"/logo.png"
type=
"image/*"
/>
<meta
name=
"theme-color"
content=
"#f6f5f4"
/>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1,
maximum-scale=1, minimum-scale=1,
user-scalable=no"
/>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1, user-scalable=no"
/>
<title>
Memos
</title>
<script
src=
"https://kit.fontawesome.com/41e3aaa6af.js"
crossorigin=
"anonymous"
></script>
</head>
...
...
web/src/components/Settings/MemberSection.tsx
View file @
9994b1fa
...
...
@@ -4,8 +4,8 @@ import { userService } from "../../services";
import
{
useAppSelector
}
from
"../../store"
;
import
*
as
api
from
"../../helpers/api"
;
import
toastHelper
from
"../Toast"
;
import
"../../less/settings/member-section.less"
;
import
{
showCommonDialog
}
from
"../Dialog/CommonDialog"
;
import
"../../less/settings/member-section.less"
;
interface
Props
{}
...
...
@@ -70,12 +70,19 @@ const PreferencesSection: React.FC<Props> = () => {
});
};
const
handleArchiveUserClick
=
async
(
user
:
User
)
=>
{
await
userService
.
patchUser
({
id
:
user
.
id
,
rowStatus
:
"ARCHIVED"
,
const
handleArchiveUserClick
=
(
user
:
User
)
=>
{
showCommonDialog
({
title
:
`Archive Member`
,
content
:
`❗️Are you sure to archive
${
user
.
name
}
?`
,
style
:
"warning"
,
onConfirm
:
async
()
=>
{
await
userService
.
patchUser
({
id
:
user
.
id
,
rowStatus
:
"ARCHIVED"
,
});
fetchUserList
();
},
});
fetchUserList
();
};
const
handleRestoreUserClick
=
async
(
user
:
User
)
=>
{
...
...
@@ -88,8 +95,8 @@ const PreferencesSection: React.FC<Props> = () => {
const
handleDeleteUserClick
=
(
user
:
User
)
=>
{
showCommonDialog
({
title
:
`Delete
${
user
.
name
}
`
,
content
:
"❗️Are you sure you want to delete?"
,
title
:
`Delete
Member
`
,
content
:
`Are you sure to delete
${
user
.
name
}
? THIS ACTION IS IRREVERSIABLE.❗️`
,
style
:
"warning"
,
onConfirm
:
async
()
=>
{
await
userService
.
deleteUser
({
...
...
web/src/less/memo-card-dialog.less
View file @
9994b1fa
...
...
@@ -10,7 +10,7 @@
@apply z-10 w-128 max-w-full flex flex-row justify-start items-center mb-2;
> .visibility-selector-container {
@apply bg-white px-2 py-1 rounded-lg flex flex-row justify-start items-center;
@apply bg-white px-2 p
l-3 p
y-1 rounded-lg flex flex-row justify-start items-center;
> .visibility-selector {
@apply w-32;
...
...
web/src/less/search-bar.less
View file @
9994b1fa
@import "./mixin.less";
.search-bar-container {
@apply relative w-
40
;
@apply relative w-
auto
;
> .search-bar-inputer {
.flex(row, flex-start, center);
@apply w-full py-2 px-4 rounded-lg flex flex-row justify-start items-center bg-zinc-200;
@apply h-9 flex flex-row justify-start items-center w-full py-2 px-3 sm:px-4 rounded-full sm:rounded-lg bg-zinc-200;
> .icon-img {
@apply
mr-2
h-auto opacity-30;
@apply h-auto opacity-30;
}
> .text-input {
@apply grow text-sm;
@apply
hidden sm:flex ml-2 w-24
grow text-sm;
}
&:hover {
&:hover,
&:active {
> .text-input {
@apply flex;
}
+ .quickly-action-wrapper {
display: flex;
}
...
...
web/src/less/settings/member-section.less
View file @
9994b1fa
...
...
@@ -35,22 +35,22 @@
@apply w-full grid grid-cols-6 border-b py-2;
> .field-text {
@apply text-base pl-2 mr-4 w-16;
@apply text-base pl-2 mr-4 w-16
truncate
;
&.id-text {
@apply font-mono text-gray-600;
}
&.email-text {
@apply col-span-3;
@apply
w-auto
col-span-3;
}
}
> .buttons-container {
@apply col-span-2;
@apply col-span-2
flex flex-row justify-start items-center flex-wrap
;
> .btn {
@apply px-2
py-1
border rounded shadow hover:opacity-80;
@apply px-2
leading-7
border rounded shadow hover:opacity-80;
&.archive {
@apply bg-yellow-100 text-yellow-600;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment