YourSelfHosted/memos
1
0
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-06-05 22:09:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: align colors

Browse Source
This commit is contained in:
Steven
2024-11-04 21:30:50 +08:00
parent f310207b9a
commit 04c6e262c3
8 changed files with 235 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

248
proto/gen/apidocs.swagger.yaml
View File

@@ -311,12 +311,16 @@ paths:
type: integer type: integer
format: int32 format: int32
- name: pageToken - name: pageToken
description: "A page token, received from a previous `ListMemos` call.\r\nProvide this to retrieve the subsequent page." description: |-
A page token, received from a previous `ListMemos` call.
Provide this to retrieve the subsequent page.
in: query in: query
required: false required: false
type: string type: string
- name: filter - name: filter
description: "Filter is used to filter memos returned in the list.\r\nFormat: \"creator == 'users/{uid}' && visibilities == ['PUBLIC', 'PROTECTED']\"" description: |-
Filter is used to filter memos returned in the list.
Format: "creator == 'users/{uid}' && visibilities == ['PUBLIC', 'PROTECTED']"
in: query in: query
required: false required: false
type: string type: string
@@ -505,7 +509,9 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: filter - name: filter
description: "Filter is used to filter users returned in the list.\r\nFormat: \"username == 'frank'\"" description: |-
Filter is used to filter users returned in the list.
Format: "username == 'frank'"
in: query in: query
required: false required: false
type: string type: string
@@ -666,7 +672,9 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: name - name: name
description: "The resource name of the workspace setting.\r\nFormat: settings/{setting}" description: |-
The resource name of the workspace setting.
Format: settings/{setting}
in: path in: path
required: true required: true
type: string type: string
@@ -688,7 +696,9 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: setting.name - name: setting.name
description: "name is the name of the setting.\r\nFormat: settings/{setting}" description: |-
name is the name of the setting.
Format: settings/{setting}
in: path in: path
required: true required: true
type: string type: string
@@ -724,7 +734,9 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: identityProvider.name - name: identityProvider.name
description: "The name of the identityProvider.\r\nFormat: identityProviders/{id}" description: |-
The name of the identityProvider.
Format: identityProviders/{id}
in: path in: path
required: true required: true
type: string type: string
@@ -762,7 +774,9 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: inbox.name - name: inbox.name
description: "The name of the inbox.\r\nFormat: inboxes/{id}" description: |-
The name of the inbox.
Format: inboxes/{id}
in: path in: path
required: true required: true
type: string type: string
@@ -806,7 +820,10 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: memo.name - name: memo.name
description: "The name of the memo.\r\nFormat: memos/{id}\r\nid is the system generated id." description: |-
The name of the memo.
Format: memos/{id}
id is the system generated id.
in: path in: path
required: true required: true
type: string type: string
@@ -824,7 +841,9 @@ paths:
$ref: '#/definitions/v1RowStatus' $ref: '#/definitions/v1RowStatus'
creator: creator:
type: string type: string
title: "The name of the creator.\r\nFormat: users/{id}" title: |-
The name of the creator.
Format: users/{id}
createTime: createTime:
type: string type: string
format: date-time format: date-time
@@ -871,7 +890,9 @@ paths:
readOnly: true readOnly: true
parent: parent:
type: string type: string
title: "The name of the parent memo.\r\nFormat: memos/{id}" title: |-
The name of the parent memo.
Format: memos/{id}
readOnly: true readOnly: true
snippet: snippet:
type: string type: string
@@ -897,7 +918,9 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: name_1 - name: name_1
description: "The name of the user.\r\nFormat: users/{id}" description: |-
The name of the user.
Format: users/{id}
in: path in: path
required: true required: true
type: string type: string
@@ -919,7 +942,9 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: name_1 - name: name_1
description: "The name of the identityProvider to delete.\r\nFormat: identityProviders/{id}" description: |-
The name of the identityProvider to delete.
Format: identityProviders/{id}
in: path in: path
required: true required: true
type: string type: string
@@ -941,7 +966,9 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: name_2 - name: name_2
description: "The name of the identityProvider to get.\r\nFormat: identityProviders/{id}" description: |-
The name of the identityProvider to get.
Format: identityProviders/{id}
in: path in: path
required: true required: true
type: string type: string
@@ -963,7 +990,9 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: name_2 - name: name_2
description: "The name of the inbox to delete.\r\nFormat: inboxes/{id}" description: |-
The name of the inbox to delete.
Format: inboxes/{id}
in: path in: path
required: true required: true
type: string type: string
@@ -985,7 +1014,10 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: name_3 - name: name_3
description: "The name of the resource.\r\nFormat: resources/{id}\r\nid is the system generated unique identifier." description: |-
The name of the resource.
Format: resources/{id}
id is the system generated unique identifier.
in: path in: path
required: true required: true
type: string type: string
@@ -1007,7 +1039,10 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: name_3 - name: name_3
description: "The name of the resource.\r\nFormat: resources/{id}\r\nid is the system generated unique identifier." description: |-
The name of the resource.
Format: resources/{id}
id is the system generated unique identifier.
in: path in: path
required: true required: true
type: string type: string
@@ -1029,7 +1064,9 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: name_4 - name: name_4
description: "The name of the memo.\r\nFormat: memos/{id}" description: |-
The name of the memo.
Format: memos/{id}
in: path in: path
required: true required: true
type: string type: string
@@ -1051,7 +1088,9 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: name_4 - name: name_4
description: "The name of the memo.\r\nFormat: memos/{id}" description: |-
The name of the memo.
Format: memos/{id}
in: path in: path
required: true required: true
type: string type: string
@@ -1073,7 +1112,9 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: name - name: name
description: "The name of the activity.\r\nFormat: activities/{id}" description: |-
The name of the activity.
Format: activities/{id}
in: path in: path
required: true required: true
type: string type: string
@@ -1095,7 +1136,9 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: name - name: name
description: "The name of the user.\r\nFormat: users/{id}" description: |-
The name of the user.
Format: users/{id}
in: path in: path
required: true required: true
type: string type: string
@@ -1117,7 +1160,9 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: name - name: name
description: "The name of the user.\r\nFormat: users/{id}" description: |-
The name of the user.
Format: users/{id}
in: path in: path
required: true required: true
type: string type: string
@@ -1138,7 +1183,9 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: name - name: name
description: "The name of the user.\r\nFormat: users/{id}" description: |-
The name of the user.
Format: users/{id}
in: path in: path
required: true required: true
type: string type: string
@@ -1166,7 +1213,9 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: name - name: name
description: "The name of the user.\r\nFormat: users/{id}" description: |-
The name of the user.
Format: users/{id}
in: path in: path
required: true required: true
type: string type: string
@@ -1193,7 +1242,9 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: name - name: name
description: "The name of the memo.\r\nFormat: memos/{id}" description: |-
The name of the memo.
Format: memos/{id}
in: path in: path
required: true required: true
type: string type: string
@@ -1214,7 +1265,9 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: name - name: name
description: "The name of the memo.\r\nFormat: memos/{id}" description: |-
The name of the memo.
Format: memos/{id}
in: path in: path
required: true required: true
type: string type: string
@@ -1241,7 +1294,9 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: name - name: name
description: "The name of the memo.\r\nFormat: memos/{id}" description: |-
The name of the memo.
Format: memos/{id}
in: path in: path
required: true required: true
type: string type: string
@@ -1262,7 +1317,9 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: name - name: name
description: "The name of the memo.\r\nFormat: memos/{id}" description: |-
The name of the memo.
Format: memos/{id}
in: path in: path
required: true required: true
type: string type: string
@@ -1289,7 +1346,9 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: name - name: name
description: "The name of the memo.\r\nFormat: memos/{id}" description: |-
The name of the memo.
Format: memos/{id}
in: path in: path
required: true required: true
type: string type: string
@@ -1311,7 +1370,9 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: name - name: name
description: "The name of the memo.\r\nFormat: memos/{id}" description: |-
The name of the memo.
Format: memos/{id}
in: path in: path
required: true required: true
type: string type: string
@@ -1338,7 +1399,9 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: name - name: name
description: "The name of the memo.\r\nFormat: memos/{id}" description: |-
The name of the memo.
Format: memos/{id}
in: path in: path
required: true required: true
type: string type: string
@@ -1360,7 +1423,9 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: name - name: name
description: "The name of the memo.\r\nFormat: memos/{id}" description: |-
The name of the memo.
Format: memos/{id}
in: path in: path
required: true required: true
type: string type: string
@@ -1387,7 +1452,9 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: name - name: name
description: "The name of the user.\r\nFormat: users/{id}" description: |-
The name of the user.
Format: users/{id}
in: path in: path
required: true required: true
type: string type: string
@@ -1410,7 +1477,9 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: parent - name: parent
description: "The parent, who owns the tags.\r\nFormat: memos/{id}. Use \"memos/-\" to delete all tags." description: |-
The parent, who owns the tags.
Format: memos/{id}. Use "memos/-" to delete all tags.
in: path in: path
required: true required: true
type: string type: string
@@ -1441,7 +1510,9 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: parent - name: parent
description: "The parent, who owns the tags.\r\nFormat: memos/{id}. Use \"memos/-\" to rename all tags." description: |-
The parent, who owns the tags.
Format: memos/{id}. Use "memos/-" to rename all tags.
in: path in: path
required: true required: true
type: string type: string
@@ -1468,7 +1539,10 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: resource.name - name: resource.name
description: "The name of the resource.\r\nFormat: resources/{id}\r\nid is the system generated unique identifier." description: |-
The name of the resource.
Format: resources/{id}
id is the system generated unique identifier.
in: path in: path
required: true required: true
type: string type: string
@@ -1500,7 +1574,9 @@ paths:
format: int64 format: int64
memo: memo:
type: string type: string
title: "The related memo.\r\nFormat: memos/{id}" title: |-
The related memo.
Format: memos/{id}
tags: tags:
- ResourceService - ResourceService
/api/v1/{setting.name}: /api/v1/{setting.name}:
@@ -1518,7 +1594,9 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: setting.name - name: setting.name
description: "The name of the user.\r\nFormat: users/{id}" description: |-
The name of the user.
Format: users/{id}
in: path in: path
required: true required: true
type: string type: string
@@ -1555,7 +1633,9 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: user.name - name: user.name
description: "The name of the user.\r\nFormat: users/{id}" description: |-
The name of the user.
Format: users/{id}
in: path in: path
required: true required: true
type: string type: string
@@ -1609,7 +1689,9 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: name - name: name
description: "The name of the user.\r\nFormat: users/{id}" description: |-
The name of the user.
Format: users/{id}
in: path in: path
required: true required: true
type: string type: string
@@ -1642,7 +1724,10 @@ paths:
$ref: '#/definitions/googlerpcStatus' $ref: '#/definitions/googlerpcStatus'
parameters: parameters:
- name: name - name: name
description: "The name of the resource.\r\nFormat: resources/{id}\r\nid is the system generated unique identifier." description: |-
The name of the resource.
Format: resources/{id}
id is the system generated unique identifier.
in: path in: path
required: true required: true
type: string type: string
@@ -1835,7 +1920,9 @@ definitions:
properties: properties:
name: name:
type: string type: string
title: "The name of the identityProvider.\r\nFormat: identityProviders/{id}" title: |-
The name of the identityProvider.
Format: identityProviders/{id}
type: type:
$ref: '#/definitions/apiv1IdentityProviderType' $ref: '#/definitions/apiv1IdentityProviderType'
title: title:
@@ -1871,7 +1958,10 @@ definitions:
properties: properties:
name: name:
type: string type: string
description: "The name of the memo.\r\nFormat: memos/{id}\r\nid is the system generated id." description: |-
The name of the memo.
Format: memos/{id}
id is the system generated id.
uid: uid:
type: string type: string
description: The user defined id of the memo. description: The user defined id of the memo.
@@ -1879,7 +1969,9 @@ definitions:
$ref: '#/definitions/v1RowStatus' $ref: '#/definitions/v1RowStatus'
creator: creator:
type: string type: string
title: "The name of the creator.\r\nFormat: users/{id}" title: |-
The name of the creator.
Format: users/{id}
createTime: createTime:
type: string type: string
format: date-time format: date-time
@@ -1926,7 +2018,9 @@ definitions:
readOnly: true readOnly: true
parent: parent:
type: string type: string
title: "The name of the parent memo.\r\nFormat: memos/{id}" title: |-
The name of the parent memo.
Format: memos/{id}
readOnly: true readOnly: true
snippet: snippet:
type: string type: string
@@ -1959,7 +2053,9 @@ definitions:
properties: properties:
name: name:
type: string type: string
title: "The name of the user.\r\nFormat: users/{id}" title: |-
The name of the user.
Format: users/{id}
locale: locale:
type: string type: string
description: The preferred locale of the user. description: The preferred locale of the user.
@@ -2003,7 +2099,10 @@ definitions:
weekStartDayOffset: weekStartDayOffset:
type: integer type: integer
format: int32 format: int32
description: "week_start_day_offset is the week start day offset from Sunday.\r\n0: Sunday, 1: Monday, 2: Tuesday, 3: Wednesday, 4: Thursday, 5: Friday, 6: Saturday\r\nDefault is Sunday." description: |-
week_start_day_offset is the week start day offset from Sunday.
0: Sunday, 1: Monday, 2: Tuesday, 3: Wednesday, 4: Thursday, 5: Friday, 6: Saturday
Default is Sunday.
disallowChangeUsername: disallowChangeUsername:
type: boolean type: boolean
description: disallow_change_username disallows changing username. description: disallow_change_username disallows changing username.
@@ -2054,7 +2153,9 @@ definitions:
properties: properties:
name: name:
type: string type: string
title: "name is the name of the setting.\r\nFormat: settings/{setting}" title: |-
name is the name of the setting.
Format: settings/{setting}
generalSetting: generalSetting:
$ref: '#/definitions/apiv1WorkspaceGeneralSetting' $ref: '#/definitions/apiv1WorkspaceGeneralSetting'
storageSetting: storageSetting:
@@ -2069,7 +2170,9 @@ definitions:
description: storage_type is the storage type. description: storage_type is the storage type.
filepathTemplate: filepathTemplate:
type: string type: string
title: "The template of file path.\r\ne.g. assets/{timestamp}_{filename}" title: |-
The template of file path.
e.g. assets/{timestamp}_{filename}
uploadSizeLimitMb: uploadSizeLimitMb:
type: string type: string
format: int64 format: int64
@@ -2228,7 +2331,9 @@ definitions:
properties: properties:
name: name:
type: string type: string
title: "The name of the activity.\r\nFormat: activities/{id}" title: |-
The name of the activity.
Format: activities/{id}
creatorId: creatorId:
type: integer type: integer
format: int32 format: int32
@@ -2371,7 +2476,9 @@ definitions:
properties: properties:
name: name:
type: string type: string
title: "The name of the inbox.\r\nFormat: inboxes/{id}" title: |-
The name of the inbox.
Format: inboxes/{id}
sender: sender:
type: string type: string
title: 'Format: users/{id}' title: 'Format: users/{id}'
@@ -2445,7 +2552,9 @@ definitions:
$ref: '#/definitions/v1Inbox' $ref: '#/definitions/v1Inbox'
nextPageToken: nextPageToken:
type: string type: string
description: "A token, which can be sent as `page_token` to retrieve the next page.\r\nIf this field is omitted, there are no subsequent pages." description: |-
A token, which can be sent as `page_token` to retrieve the next page.
If this field is omitted, there are no subsequent pages.
v1ListMemoCommentsResponse: v1ListMemoCommentsResponse:
type: object type: object
properties: properties:
@@ -2488,7 +2597,9 @@ definitions:
$ref: '#/definitions/apiv1Memo' $ref: '#/definitions/apiv1Memo'
nextPageToken: nextPageToken:
type: string type: string
description: "A token, which can be sent as `page_token` to retrieve the next page.\r\nIf this field is omitted, there are no subsequent pages." description: |-
A token, which can be sent as `page_token` to retrieve the next page.
If this field is omitted, there are no subsequent pages.
v1ListNode: v1ListNode:
type: object type: object
properties: properties:
@@ -2564,10 +2675,14 @@ definitions:
properties: properties:
memo: memo:
$ref: '#/definitions/v1MemoRelationMemo' $ref: '#/definitions/v1MemoRelationMemo'
title: "The name of memo.\r\nFormat: \"memos/{uid}\"" title: |-
The name of memo.
Format: "memos/{uid}"
relatedMemo: relatedMemo:
$ref: '#/definitions/v1MemoRelationMemo' $ref: '#/definitions/v1MemoRelationMemo'
title: "The name of related memo.\r\nFormat: \"memos/{uid}\"" title: |-
The name of related memo.
Format: "memos/{uid}"
type: type:
$ref: '#/definitions/v1MemoRelationType' $ref: '#/definitions/v1MemoRelationType'
v1MemoRelationMemo: v1MemoRelationMemo:
@@ -2575,7 +2690,9 @@ definitions:
properties: properties:
name: name:
type: string type: string
title: "The name of the memo.\r\nFormat: memos/{id}" title: |-
The name of the memo.
Format: memos/{id}
uid: uid:
type: string type: string
snippet: snippet:
@@ -2749,7 +2866,9 @@ definitions:
format: int32 format: int32
creator: creator:
type: string type: string
title: "The name of the creator.\r\nFormat: users/{id}" title: |-
The name of the creator.
Format: users/{id}
contentId: contentId:
type: string type: string
reactionType: reactionType:
@@ -2766,7 +2885,10 @@ definitions:
properties: properties:
name: name:
type: string type: string
description: "The name of the resource.\r\nFormat: resources/{id}\r\nid is the system generated unique identifier." description: |-
The name of the resource.
Format: resources/{id}
id is the system generated unique identifier.
uid: uid:
type: string type: string
description: The user defined id of the resource. description: The user defined id of the resource.
@@ -2788,7 +2910,9 @@ definitions:
format: int64 format: int64
memo: memo:
type: string type: string
title: "The related memo.\r\nFormat: memos/{id}" title: |-
The related memo.
Format: memos/{id}
v1RestoreMarkdownNodesRequest: v1RestoreMarkdownNodesRequest:
type: object type: object
properties: properties:
@@ -2910,7 +3034,9 @@ definitions:
properties: properties:
name: name:
type: string type: string
title: "The name of the user.\r\nFormat: users/{id}" title: |-
The name of the user.
Format: users/{id}
id: id:
type: integer type: integer
format: int32 format: int32
@@ -2984,7 +3110,9 @@ definitions:
properties: properties:
owner: owner:
type: string type: string
title: "The name of instance owner.\r\nFormat: \"users/{id}\"" title: |-
The name of instance owner.
Format: "users/{id}"
version: version:
type: string type: string
title: version is the current version of instance title: version is the current version of instance

2
web/package.json
View File

@@ -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.24", "@usememos/mui": "0.0.1-alpha.25",
"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",

10
web/pnpm-lock.yaml generated
View File

@@ -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.24 specifier: 0.0.1-alpha.25
version: 0.0.1-alpha.24(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.25(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:
'@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.24': '@usememos/mui@0.0.1-alpha.25':
resolution: {integrity: sha512-4UAlapAs7UfgG3OkdvolgNBo1BCcaXhs3TeWw1UvEA7pwj6txzbIjqN8c6IHl+gYeMzoXBO2Ou7gnYD9OOtj5Q==} resolution: {integrity: sha512-TjvhSgKRqXrDBPGJuojwjbBGLysiycvE+05UJlzmJ1OOQLO3UBYFc5F+iPHg5ok+7PEjWrt3tTubU76/kWsgBQ==}
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:
'@ungap/structured-clone@1.2.0': {} '@ungap/structured-clone@1.2.0': {}
'@usememos/mui@0.0.1-alpha.24(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.25(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

6
web/src/components/ActivityCalendar.tsx
View File

@@ -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";
} }
}; };

18
web/src/components/MemoEditor/ActionButton/LocationSelector.tsx
View File

@@ -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) => {
<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) => {
<Button <Button
className="shrink-0" className="shrink-0"
color="primary" color="primary"
size="sm"
onClick={() => { onClick={() => {
props.onChange( props.onChange(
Location.fromPartial({ Location.fromPartial({

6
web/src/components/MemoEditor/ActionButton/TagSelector.tsx
View File

@@ -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>

5
web/src/components/ReactionView.tsx
View File

@@ -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-400">{users.length}</span> <span className="opacity-60">{users.length}</span>
</div> </div>
</Tooltip> </Tooltip>
); );

22
web/tailwind.config.js
View File

@@ -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",
}, },