aiden
/
memos
mirror of https://github.com/usememos/memos
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: regenerate pnpm lock file (#2056)

Browse Source 
* chore: regenerate pnpm lock file

* chore: update

* chore: update
pull/2071/head
boojack 2 years ago committed by GitHub
parent d114b630d2
commit b5a6f1f997
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 663 additions and 1880 deletions
Show Stats Download Patch File Download Diff File

13
web/package.json
Unescape Escape View File

@ -8,10 +8,10 @@
}, },
"packageManager": "pnpm@8.6.1", "packageManager": "pnpm@8.6.1",
"dependencies": { "dependencies": {
"@emotion/react": "^11.10.5", "@emotion/react": "^11.11.1",
"@emotion/styled": "^11.10.5", "@emotion/styled": "^11.11.0",
"@microsoft/fetch-event-source": "^2.0.1", "@microsoft/fetch-event-source": "^2.0.1",
"@mui/joy": "^5.0.0-alpha.75", "@mui/joy": "5.0.0-beta.0",
"@mui/material": "^5.14.2", "@mui/material": "^5.14.2",
"@mui/styled-engine-sc": "^5.12.0", "@mui/styled-engine-sc": "^5.12.0",
"@reduxjs/toolkit": "^1.8.1", "@reduxjs/toolkit": "^1.8.1",
@ -32,7 +32,6 @@
"react-router-dom": "^6.8.2", "react-router-dom": "^6.8.2",
"react-use": "^17.4.0", "react-use": "^17.4.0",
"semver": "^7.3.8", "semver": "^7.3.8",
"styled-components": "^6.0.5",
"tailwindcss": "^3.2.4", "tailwindcss": "^3.2.4",
"textarea-caret": "^3.1.0", "textarea-caret": "^3.1.0",
"uuid": "^9.0.0", "uuid": "^9.0.0",
@ -43,8 +42,8 @@
"@types/lodash-es": "^4.17.5", "@types/lodash-es": "^4.17.5",
"@types/node": "^18.0.3", "@types/node": "^18.0.3",
"@types/qs": "^6.9.7", "@types/qs": "^6.9.7",
"@types/react": "^18.0.26", "@types/react": "^18.2.18",
"@types/react-dom": "^18.0.10", "@types/react-dom": "^18.2.7",
"@types/semver": "^7.3.13", "@types/semver": "^7.3.13",
"@types/textarea-caret": "^3.0.1", "@types/textarea-caret": "^3.0.1",
"@types/uuid": "^9.0.2", "@types/uuid": "^9.0.2",
@ -52,7 +51,7 @@
"@typescript-eslint/parser": "^5.6.0", "@typescript-eslint/parser": "^5.6.0",
"@vitejs/plugin-react-swc": "^3.3.0", "@vitejs/plugin-react-swc": "^3.3.0",
"autoprefixer": "^10.4.2", "autoprefixer": "^10.4.2",
"eslint": "^8.4.1", "eslint": "^8.46.0",
"eslint-config-prettier": "^8.6.0", "eslint-config-prettier": "^8.6.0",
"eslint-plugin-prettier": "^4.2.1", "eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.27.1", "eslint-plugin-react": "^7.27.1",

2472
web/pnpm-lock.yaml
View File

File diff suppressed because it is too large Load Diff

26
web/src/components/CreateIdentityProviderDialog.tsx
Unescape Escape View File

@ -244,7 +244,7 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {
<div className="dialog-content-container min-w-[19rem]"> <div className="dialog-content-container min-w-[19rem]">
{isCreating && ( {isCreating && (
<> <>
<Typography className="!mb-1" level="body2"> <Typography className="!mb-1" level="body-md">
{t("common.type")} {t("common.type")}
</Typography> </Typography>
<Select className="w-full mb-4" value={type} onChange={(_, e) => setType(e ?? type)}> <Select className="w-full mb-4" value={type} onChange={(_, e) => setType(e ?? type)}>
@ -254,7 +254,7 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {
</Option> </Option>
))} ))}
</Select> </Select>
<Typography className="mb-2" level="body2"> <Typography className="mb-2" level="body-md">
{t("setting.sso-section.template")} {t("setting.sso-section.template")}
</Typography> </Typography>
<Select className="mb-1 h-auto w-full" value={selectedTemplate} onChange={(_, e) => setSelectedTemplate(e ?? selectedTemplate)}> <Select className="mb-1 h-auto w-full" value={selectedTemplate} onChange={(_, e) => setSelectedTemplate(e ?? selectedTemplate)}>
@ -267,7 +267,7 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {
<Divider className="!my-2" /> <Divider className="!my-2" />
</> </>
)} )}
<Typography className="!mb-1" level="body2"> <Typography className="!mb-1" level="body-md">
{t("common.name")} {t("common.name")}
<span className="text-red-600">*</span> <span className="text-red-600">*</span>
</Typography> </Typography>
@ -283,7 +283,7 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {
} }
fullWidth fullWidth
/> />
<Typography className="!mb-1" level="body2"> <Typography className="!mb-1" level="body-md">
{t("setting.sso-section.identifier-filter")} {t("setting.sso-section.identifier-filter")}
</Typography> </Typography>
<Input <Input
@ -306,7 +306,7 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {
{t("setting.sso-section.redirect-url")}: {absolutifyLink("/auth/callback")} {t("setting.sso-section.redirect-url")}: {absolutifyLink("/auth/callback")}
</p> </p>
)} )}
<Typography className="!mb-1" level="body2"> <Typography className="!mb-1" level="body-md">
{t("setting.sso-section.client-id")} {t("setting.sso-section.client-id")}
<span className="text-red-600">*</span> <span className="text-red-600">*</span>
</Typography> </Typography>
@ -317,7 +317,7 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {
onChange={(e) => setPartialOAuth2Config({ clientId: e.target.value })} onChange={(e) => setPartialOAuth2Config({ clientId: e.target.value })}
fullWidth fullWidth
/> />
<Typography className="!mb-1" level="body2"> <Typography className="!mb-1" level="body-md">
{t("setting.sso-section.client-secret")} {t("setting.sso-section.client-secret")}
<span className="text-red-600">*</span> <span className="text-red-600">*</span>
</Typography> </Typography>
@ -328,7 +328,7 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {
onChange={(e) => setPartialOAuth2Config({ clientSecret: e.target.value })} onChange={(e) => setPartialOAuth2Config({ clientSecret: e.target.value })}
fullWidth fullWidth
/> />
<Typography className="!mb-1" level="body2"> <Typography className="!mb-1" level="body-md">
{t("setting.sso-section.authorization-endpoint")} {t("setting.sso-section.authorization-endpoint")}
<span className="text-red-600">*</span> <span className="text-red-600">*</span>
</Typography> </Typography>
@ -339,7 +339,7 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {
onChange={(e) => setPartialOAuth2Config({ authUrl: e.target.value })} onChange={(e) => setPartialOAuth2Config({ authUrl: e.target.value })}
fullWidth fullWidth
/> />
<Typography className="!mb-1" level="body2"> <Typography className="!mb-1" level="body-md">
{t("setting.sso-section.token-endpoint")} {t("setting.sso-section.token-endpoint")}
<span className="text-red-600">*</span> <span className="text-red-600">*</span>
</Typography> </Typography>
@ -350,7 +350,7 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {
onChange={(e) => setPartialOAuth2Config({ tokenUrl: e.target.value })} onChange={(e) => setPartialOAuth2Config({ tokenUrl: e.target.value })}
fullWidth fullWidth
/> />
<Typography className="!mb-1" level="body2"> <Typography className="!mb-1" level="body-md">
{t("setting.sso-section.user-endpoint")} {t("setting.sso-section.user-endpoint")}
<span className="text-red-600">*</span> <span className="text-red-600">*</span>
</Typography> </Typography>
@ -361,7 +361,7 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {
onChange={(e) => setPartialOAuth2Config({ userInfoUrl: e.target.value })} onChange={(e) => setPartialOAuth2Config({ userInfoUrl: e.target.value })}
fullWidth fullWidth
/> />
<Typography className="!mb-1" level="body2"> <Typography className="!mb-1" level="body-md">
{t("setting.sso-section.scopes")} {t("setting.sso-section.scopes")}
<span className="text-red-600">*</span> <span className="text-red-600">*</span>
</Typography> </Typography>
@ -373,7 +373,7 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {
fullWidth fullWidth
/> />
<Divider className="!my-2" /> <Divider className="!my-2" />
<Typography className="!mb-1" level="body2"> <Typography className="!mb-1" level="body-md">
{t("setting.sso-section.identifier")} {t("setting.sso-section.identifier")}
<span className="text-red-600">*</span> <span className="text-red-600">*</span>
</Typography> </Typography>
@ -384,7 +384,7 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {
onChange={(e) => setPartialOAuth2Config({ fieldMapping: { ...oauth2Config.fieldMapping, identifier: e.target.value } })} onChange={(e) => setPartialOAuth2Config({ fieldMapping: { ...oauth2Config.fieldMapping, identifier: e.target.value } })}
fullWidth fullWidth
/> />
<Typography className="!mb-1" level="body2"> <Typography className="!mb-1" level="body-md">
{t("setting.sso-section.display-name")} {t("setting.sso-section.display-name")}
</Typography> </Typography>
<Input <Input
@ -394,7 +394,7 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {
onChange={(e) => setPartialOAuth2Config({ fieldMapping: { ...oauth2Config.fieldMapping, displayName: e.target.value } })} onChange={(e) => setPartialOAuth2Config({ fieldMapping: { ...oauth2Config.fieldMapping, displayName: e.target.value } })}
fullWidth fullWidth
/> />
<Typography className="!mb-1" level="body2"> <Typography className="!mb-1" level="body-md">
{t("common.email")} {t("common.email")}
</Typography> </Typography>
<Input <Input

10
web/src/components/CreateResourceDialog.tsx
Unescape Escape View File

@ -192,7 +192,7 @@ const CreateResourceDialog: React.FC<Props> = (props: Props) => {
</button> </button>
</div> </div>
<div className="dialog-content-container !w-80"> <div className="dialog-content-container !w-80">
<Typography className="!mb-1" level="body2"> <Typography className="!mb-1" level="body-md">
{t("resource.create-dialog.upload-method")} {t("resource.create-dialog.upload-method")}
</Typography> </Typography>
<Select <Select
@ -254,7 +254,7 @@ const CreateResourceDialog: React.FC<Props> = (props: Props) => {
{state.selectedMode === "external-link" && ( {state.selectedMode === "external-link" && (
<> <>
<Typography className="!mb-1" level="body2"> <Typography className="!mb-1" level="body-md">
{t("resource.create-dialog.external-link.link")} {t("resource.create-dialog.external-link.link")}
</Typography> </Typography>
<Input <Input
@ -264,7 +264,7 @@ const CreateResourceDialog: React.FC<Props> = (props: Props) => {
onChange={handleExternalLinkChanged} onChange={handleExternalLinkChanged}
fullWidth fullWidth
/> />
<Typography className="!mb-1" level="body2"> <Typography className="!mb-1" level="body-md">
{t("resource.create-dialog.external-link.file-name")} {t("resource.create-dialog.external-link.file-name")}
</Typography> </Typography>
<Input <Input
@ -274,7 +274,7 @@ const CreateResourceDialog: React.FC<Props> = (props: Props) => {
onChange={handleFileNameChanged} onChange={handleFileNameChanged}
fullWidth fullWidth
/> />
<Typography className="!mb-1" level="body2"> <Typography className="!mb-1" level="body-md">
{t("resource.create-dialog.external-link.type")} {t("resource.create-dialog.external-link.type")}
</Typography> </Typography>
<Autocomplete <Autocomplete
@ -290,7 +290,7 @@ const CreateResourceDialog: React.FC<Props> = (props: Props) => {
{state.selectedMode === "download-link" && ( {state.selectedMode === "download-link" && (
<> <>
<Typography className="!mb-1" level="body2"> <Typography className="!mb-1" level="body-md">
{t("resource.create-dialog.external-link.link")} {t("resource.create-dialog.external-link.link")}
</Typography> </Typography>
<Input <Input

18
web/src/components/CreateStorageServiceDialog.tsx
Unescape Escape View File

@ -114,7 +114,7 @@ const CreateStorageServiceDialog: React.FC<Props> = (props: Props) => {
</button> </button>
</div> </div>
<div className="dialog-content-container min-w-[19rem]"> <div className="dialog-content-container min-w-[19rem]">
<Typography className="!mb-1" level="body2"> <Typography className="!mb-1" level="body-md">
{t("common.name")} {t("common.name")}
<RequiredBadge /> <RequiredBadge />
</Typography> </Typography>
@ -130,7 +130,7 @@ const CreateStorageServiceDialog: React.FC<Props> = (props: Props) => {
} }
fullWidth fullWidth
/> />
<Typography className="!mb-1" level="body2"> <Typography className="!mb-1" level="body-md">
{t("setting.storage-section.endpoint")} {t("setting.storage-section.endpoint")}
<RequiredBadge /> <RequiredBadge />
</Typography> </Typography>
@ -141,7 +141,7 @@ const CreateStorageServiceDialog: React.FC<Props> = (props: Props) => {
onChange={(e) => setPartialS3Config({ endPoint: e.target.value })} onChange={(e) => setPartialS3Config({ endPoint: e.target.value })}
fullWidth fullWidth
/> />
<Typography className="!mb-1" level="body2"> <Typography className="!mb-1" level="body-md">
{t("setting.storage-section.region")} {t("setting.storage-section.region")}
<RequiredBadge /> <RequiredBadge />
</Typography> </Typography>
@ -152,7 +152,7 @@ const CreateStorageServiceDialog: React.FC<Props> = (props: Props) => {
onChange={(e) => setPartialS3Config({ region: e.target.value })} onChange={(e) => setPartialS3Config({ region: e.target.value })}
fullWidth fullWidth
/> />
<Typography className="!mb-1" level="body2"> <Typography className="!mb-1" level="body-md">
{t("setting.storage-section.accesskey")} {t("setting.storage-section.accesskey")}
<RequiredBadge /> <RequiredBadge />
</Typography> </Typography>
@ -163,7 +163,7 @@ const CreateStorageServiceDialog: React.FC<Props> = (props: Props) => {
onChange={(e) => setPartialS3Config({ accessKey: e.target.value })} onChange={(e) => setPartialS3Config({ accessKey: e.target.value })}
fullWidth fullWidth
/> />
<Typography className="!mb-1" level="body2"> <Typography className="!mb-1" level="body-md">
{t("setting.storage-section.secretkey")} {t("setting.storage-section.secretkey")}
<RequiredBadge /> <RequiredBadge />
</Typography> </Typography>
@ -174,7 +174,7 @@ const CreateStorageServiceDialog: React.FC<Props> = (props: Props) => {
onChange={(e) => setPartialS3Config({ secretKey: e.target.value })} onChange={(e) => setPartialS3Config({ secretKey: e.target.value })}
fullWidth fullWidth
/> />
<Typography className="!mb-1" level="body2"> <Typography className="!mb-1" level="body-md">
{t("setting.storage-section.bucket")} {t("setting.storage-section.bucket")}
<RequiredBadge /> <RequiredBadge />
</Typography> </Typography>
@ -186,7 +186,7 @@ const CreateStorageServiceDialog: React.FC<Props> = (props: Props) => {
fullWidth fullWidth
/> />
<div className="flex flex-row items-center mb-1"> <div className="flex flex-row items-center mb-1">
<Typography level="body2">{t("setting.storage-section.path")}</Typography> <Typography level="body-md">{t("setting.storage-section.path")}</Typography>
<LearnMore className="ml-1" title={t("setting.storage-section.path-description")} url="https://usememos.com/docs/local-storage" /> <LearnMore className="ml-1" title={t("setting.storage-section.path-description")} url="https://usememos.com/docs/local-storage" />
</div> </div>
<Input <Input
@ -196,7 +196,7 @@ const CreateStorageServiceDialog: React.FC<Props> = (props: Props) => {
onChange={(e) => setPartialS3Config({ path: e.target.value })} onChange={(e) => setPartialS3Config({ path: e.target.value })}
fullWidth fullWidth
/> />
<Typography className="!mb-1" level="body2"> <Typography className="!mb-1" level="body-md">
{t("setting.storage-section.url-prefix")} {t("setting.storage-section.url-prefix")}
</Typography> </Typography>
<Input <Input
@ -206,7 +206,7 @@ const CreateStorageServiceDialog: React.FC<Props> = (props: Props) => {
onChange={(e) => setPartialS3Config({ urlPrefix: e.target.value })} onChange={(e) => setPartialS3Config({ urlPrefix: e.target.value })}
fullWidth fullWidth
/> />
<Typography className="!mb-1" level="body2"> <Typography className="!mb-1" level="body-md">
{t("setting.storage-section.url-suffix")} {t("setting.storage-section.url-suffix")}
</Typography> </Typography>
<Input <Input

Write Preview
Loading…
Cancel
Save