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
04c6e262
Commit
04c6e262
authored
Nov 04, 2024
by
Steven
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: align colors
parent
f310207b
Changes
8
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
235 additions
and
82 deletions
+235
-82
apidocs.swagger.yaml
proto/gen/apidocs.swagger.yaml
+188
-60
package.json
web/package.json
+1
-1
pnpm-lock.yaml
web/pnpm-lock.yaml
+5
-5
ActivityCalendar.tsx
web/src/components/ActivityCalendar.tsx
+3
-3
LocationSelector.tsx
...c/components/MemoEditor/ActionButton/LocationSelector.tsx
+10
-8
TagSelector.tsx
web/src/components/MemoEditor/ActionButton/TagSelector.tsx
+3
-3
ReactionView.tsx
web/src/components/ReactionView.tsx
+3
-2
tailwind.config.js
web/tailwind.config.js
+22
-0
No files found.
proto/gen/apidocs.swagger.yaml
View file @
04c6e262
This diff is collapsed.
Click to expand it.
web/package.json
View file @
04c6e262
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
"@mui/joy"
:
"5.0.0-beta.48"
,
"@mui/joy"
:
"5.0.0-beta.48"
,
"@radix-ui/react-popover"
:
"^1.1.2"
,
"@radix-ui/react-popover"
:
"^1.1.2"
,
"@reduxjs/toolkit"
:
"^2.3.0"
,
"@reduxjs/toolkit"
:
"^2.3.0"
,
"@usememos/mui"
:
"0.0.1-alpha.2
4
"
,
"@usememos/mui"
:
"0.0.1-alpha.2
5
"
,
"class-variance-authority"
:
"^0.7.0"
,
"class-variance-authority"
:
"^0.7.0"
,
"clsx"
:
"^2.1.1"
,
"clsx"
:
"^2.1.1"
,
"copy-to-clipboard"
:
"^3.3.3"
,
"copy-to-clipboard"
:
"^3.3.3"
,
...
...
web/pnpm-lock.yaml
View file @
04c6e262
...
@@ -39,8 +39,8 @@ importers:
...
@@ -39,8 +39,8 @@ importers:
specifier
:
^2.3.0
specifier
:
^2.3.0
version
:
2.3.0(react-redux@9.1.2(@types/react@18.3.12)(react@18.3.1)(redux@5.0.1))(react@18.3.1)
version
:
2.3.0(react-redux@9.1.2(@types/react@18.3.12)(react@18.3.1)(redux@5.0.1))(react@18.3.1)
'
@usememos/mui'
:
'
@usememos/mui'
:
specifier
:
0.0.1-alpha.2
4
specifier
:
0.0.1-alpha.2
5
version
:
0.0.1-alpha.2
4
(lucide-react@0.453.0(react@18.3.1))(postcss@8.4.47)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(tailwind-merge@2.5.4)(tailwindcss@3.4.14)
version
:
0.0.1-alpha.2
5
(lucide-react@0.453.0(react@18.3.1))(postcss@8.4.47)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(tailwind-merge@2.5.4)(tailwindcss@3.4.14)
class-variance-authority
:
class-variance-authority
:
specifier
:
^0.7.0
specifier
:
^0.7.0
version
:
0.7.0
version
:
0.7.0
...
@@ -1409,8 +1409,8 @@ packages:
...
@@ -1409,8 +1409,8 @@ packages:
'
@ungap/structured-clone@1.2.0'
:
'
@ungap/structured-clone@1.2.0'
:
resolution
:
{
integrity
:
sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
}
resolution
:
{
integrity
:
sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
}
'
@usememos/mui@0.0.1-alpha.2
4
'
:
'
@usememos/mui@0.0.1-alpha.2
5
'
:
resolution
:
{
integrity
:
sha512-
4UAlapAs7UfgG3OkdvolgNBo1BCcaXhs3TeWw1UvEA7pwj6txzbIjqN8c6IHl+gYeMzoXBO2Ou7gnYD9OOtj5
Q==
}
resolution
:
{
integrity
:
sha512-
TjvhSgKRqXrDBPGJuojwjbBGLysiycvE+05UJlzmJ1OOQLO3UBYFc5F+iPHg5ok+7PEjWrt3tTubU76/kWsgB
Q==
}
peerDependencies
:
peerDependencies
:
lucide-react
:
^0.453.0
lucide-react
:
^0.453.0
postcss
:
^8.4.47
postcss
:
^8.4.47
...
@@ -4645,7 +4645,7 @@ snapshots:
...
@@ -4645,7 +4645,7 @@ snapshots:
'
@ungap/structured-clone@1.2.0'
:
{}
'
@ungap/structured-clone@1.2.0'
:
{}
'
@usememos/mui@0.0.1-alpha.2
4
(lucide-react@0.453.0(react@18.3.1))(postcss@8.4.47)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(tailwind-merge@2.5.4)(tailwindcss@3.4.14)'
:
'
@usememos/mui@0.0.1-alpha.2
5
(lucide-react@0.453.0(react@18.3.1))(postcss@8.4.47)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(tailwind-merge@2.5.4)(tailwindcss@3.4.14)'
:
dependencies
:
dependencies
:
lucide-react
:
0.453.0(react@18.3.1)
lucide-react
:
0.453.0(react@18.3.1)
postcss
:
8.4.47
postcss
:
8.4.47
...
...
web/src/components/ActivityCalendar.tsx
View file @
04c6e262
...
@@ -21,11 +21,11 @@ const getCellAdditionalStyles = (count: number, maxCount: number) => {
...
@@ -21,11 +21,11 @@ const getCellAdditionalStyles = (count: number, maxCount: number) => {
const
ratio
=
count
/
maxCount
;
const
ratio
=
count
/
maxCount
;
if
(
ratio
>
0.7
)
{
if
(
ratio
>
0.7
)
{
return
"bg-
teal-700
text-gray-100 dark:opacity-80"
;
return
"bg-
primary-darker
text-gray-100 dark:opacity-80"
;
}
else
if
(
ratio
>
0.4
)
{
}
else
if
(
ratio
>
0.4
)
{
return
"bg-
teal-600
text-gray-100 dark:opacity-80"
;
return
"bg-
primary-dark
text-gray-100 dark:opacity-80"
;
}
else
{
}
else
{
return
"bg-
teal-500
text-gray-100 dark:opacity-70"
;
return
"bg-
primary
text-gray-100 dark:opacity-70"
;
}
}
};
};
...
...
web/src/components/MemoEditor/ActionButton/LocationSelector.tsx
View file @
04c6e262
...
@@ -98,9 +98,7 @@ const LocationSelector = (props: Props) => {
...
@@ -98,9 +98,7 @@ const LocationSelector = (props: Props) => {
<
MapPinIcon
className=
"w-5 h-5 mx-auto shrink-0"
/>
<
MapPinIcon
className=
"w-5 h-5 mx-auto shrink-0"
/>
{
props
.
location
&&
(
{
props
.
location
&&
(
<>
<>
<
span
className=
"font-normal ml-0.5 text-ellipsis whitespace-nowrap overflow-hidden max-w-32"
>
<
span
className=
"ml-0.5 text-sm text-ellipsis whitespace-nowrap overflow-hidden max-w-32"
>
{
props
.
location
.
placeholder
}
</
span
>
{
props
.
location
.
placeholder
}
</
span
>
<
XIcon
className=
"w-5 h-5 mx-auto shrink-0 hidden group-hover:block opacity-60 hover:opacity-80"
onClick=
{
removeLocation
}
/>
<
XIcon
className=
"w-5 h-5 mx-auto shrink-0 hidden group-hover:block opacity-60 hover:opacity-80"
onClick=
{
removeLocation
}
/>
</>
</>
)
}
)
}
...
@@ -111,14 +109,17 @@ const LocationSelector = (props: Props) => {
...
@@ -111,14 +109,17 @@ const LocationSelector = (props: Props) => {
<
LeafletMap
key=
{
JSON
.
stringify
(
state
.
initilized
)
}
latlng=
{
state
.
position
}
onChange=
{
onPositionChanged
}
/>
<
LeafletMap
key=
{
JSON
.
stringify
(
state
.
initilized
)
}
latlng=
{
state
.
position
}
onChange=
{
onPositionChanged
}
/>
<
div
className=
"mt-2 w-full flex flex-row justify-between items-center gap-2"
>
<
div
className=
"mt-2 w-full flex flex-row justify-between items-center gap-2"
>
<
div
className=
"flex flex-row items-center justify-start gap-2"
>
<
div
className=
"flex flex-row items-center justify-start gap-2"
>
{
state
.
position
&&
(
<
span
className=
"text-sm"
>
[
{
state
.
position
.
lat
.
toFixed
(
2
)
}
,
{
state
.
position
.
lng
.
toFixed
(
2
)
}
]
</
span
>
)
}
<
Input
<
Input
placeholder=
"Choose a position first."
placeholder=
"Choose a position first."
value=
{
state
.
placeholder
}
value=
{
state
.
placeholder
}
size=
"sm"
startDecorator=
{
state
.
position
&&
(
<
span
className=
"text-xs opacity-60"
>
[
{
state
.
position
.
lat
.
toFixed
(
2
)
}
,
{
state
.
position
.
lng
.
toFixed
(
2
)
}
]
</
span
>
)
}
disabled=
{
!
state
.
position
}
disabled=
{
!
state
.
position
}
onChange=
{
(
e
)
=>
setState
((
state
)
=>
({
...
state
,
placeholder
:
e
.
target
.
value
}))
}
onChange=
{
(
e
)
=>
setState
((
state
)
=>
({
...
state
,
placeholder
:
e
.
target
.
value
}))
}
/>
/>
...
@@ -126,6 +127,7 @@ const LocationSelector = (props: Props) => {
...
@@ -126,6 +127,7 @@ const LocationSelector = (props: Props) => {
<
Button
<
Button
className=
"shrink-0"
className=
"shrink-0"
color=
"primary"
color=
"primary"
size=
"sm"
onClick=
{
()
=>
{
onClick=
{
()
=>
{
props
.
onChange
(
props
.
onChange
(
Location
.
fromPartial
({
Location
.
fromPartial
({
...
...
web/src/components/MemoEditor/ActionButton/TagSelector.tsx
View file @
04c6e262
...
@@ -46,15 +46,15 @@ const TagSelector = (props: Props) => {
...
@@ -46,15 +46,15 @@ const TagSelector = (props: Props) => {
<
HashIcon
className=
"w-5 h-5 mx-auto"
/>
<
HashIcon
className=
"w-5 h-5 mx-auto"
/>
</
Button
>
</
Button
>
</
MenuButton
>
</
MenuButton
>
<
Menu
className=
"relative
text-sm
"
component=
"div"
size=
"sm"
placement=
"bottom-start"
>
<
Menu
className=
"relative"
component=
"div"
size=
"sm"
placement=
"bottom-start"
>
<
div
ref=
{
containerRef
}
>
<
div
ref=
{
containerRef
}
>
{
tags
.
length
>
0
?
(
{
tags
.
length
>
0
?
(
<
div
className=
"flex
-row justify-start items-start flex-wrap px-1 max-w-[12rem] h-auto max-h-48 overflow-y-auto font-mono
"
>
<
div
className=
"flex
flex-row justify-start items-start flex-wrap px-3 py-1 max-w-[12rem] h-auto max-h-48 overflow-y-auto gap-x-2 gap-y-1
"
>
{
tags
.
map
((
tag
)
=>
{
{
tags
.
map
((
tag
)
=>
{
return
(
return
(
<
div
<
div
key=
{
tag
}
key=
{
tag
}
className=
"inline-flex w-auto max-w-full cursor-pointer
rounded text-sm leading-5 px-1 text-gray-500 dark:text-gray-400 hover:bg-zinc-100 dark:hover:bg-zinc-800
"
className=
"inline-flex w-auto max-w-full cursor-pointer
text-base leading-6 text-gray-500 dark:text-gray-400 hover:text-primary dark:hover:text-primary-dark
"
onClick=
{
()
=>
handleTagClick
(
tag
)
}
onClick=
{
()
=>
handleTagClick
(
tag
)
}
>
>
<
OverflowTip
>
#
{
tag
}
</
OverflowTip
>
<
OverflowTip
>
#
{
tag
}
</
OverflowTip
>
...
...
web/src/components/ReactionView.tsx
View file @
04c6e262
...
@@ -66,14 +66,15 @@ const ReactionView = (props: Props) => {
...
@@ -66,14 +66,15 @@ const ReactionView = (props: Props) => {
<
Tooltip
title=
{
stringifyUsers
(
users
,
reactionType
)
}
placement=
"top"
>
<
Tooltip
title=
{
stringifyUsers
(
users
,
reactionType
)
}
placement=
"top"
>
<
div
<
div
className=
{
clsx
(
className=
{
clsx
(
"h-7 border px-2 py-0.5 rounded-full font-memo flex flex-row justify-center items-center gap-1 dark:border-zinc-700"
,
"h-7 border px-2 py-0.5 rounded-full flex flex-row justify-center items-center gap-1 dark:border-zinc-700"
,
"text-sm text-gray-600 dark:text-gray-400"
,
currentUser
&&
"cursor-pointer"
,
currentUser
&&
"cursor-pointer"
,
hasReaction
&&
"bg-blue-100 border-blue-200 dark:bg-zinc-900"
,
hasReaction
&&
"bg-blue-100 border-blue-200 dark:bg-zinc-900"
,
)
}
)
}
onClick=
{
handleReactionClick
}
onClick=
{
handleReactionClick
}
>
>
<
span
>
{
reactionType
}
</
span
>
<
span
>
{
reactionType
}
</
span
>
<
span
className=
"
text-sm text-gray-500 dark:text-gray-40
0"
>
{
users
.
length
}
</
span
>
<
span
className=
"
opacity-6
0"
>
{
users
.
length
}
</
span
>
</
div
>
</
div
>
</
Tooltip
>
</
Tooltip
>
);
);
...
...
web/tailwind.config.js
View file @
04c6e262
...
@@ -6,6 +6,28 @@ module.exports = {
...
@@ -6,6 +6,28 @@ module.exports = {
prefix
:
""
,
prefix
:
""
,
theme
:
{
theme
:
{
extend
:
{
extend
:
{
colors
:
{
primary
:
{
DEFAULT
:
"#0d9488"
,
// Teal 600
dark
:
"#0f766e"
,
// Teal 700
darker
:
"#0d5a56"
,
// Teal 800
},
success
:
{
DEFAULT
:
"#16a34a"
,
// Green 600
dark
:
"#047857"
,
// Green 700
darker
:
"#03664a"
,
// Green 800
},
danger
:
{
DEFAULT
:
"#dc2626"
,
// Red 600
dark
:
"#b91c1c"
,
// Red 700
darker
:
"#991b1b"
,
// Red 800
},
warning
:
{
DEFAULT
:
"#ca8a04"
,
// Yellow 600
dark
:
"#b45309"
,
// Yellow 700
darker
:
"#92400e"
,
// Yellow 800
},
},
spacing
:
{
spacing
:
{
128
:
"32rem"
,
128
:
"32rem"
,
},
},
...
...
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