Skip to content

C
canifa_note
Unverified Commit b5a6f1f9 authored by boojack's avatar boojack Committed by GitHub
Browse files
Options

chore: regenerate pnpm lock file (#2056) 

* chore: regenerate pnpm lock file

* chore: update

* chore: update
parent d114b630
Hide whitespace changes
Inline Side-by-side
Showing with 663 additions and 1880 deletions
web/package.json
View file @ b5a6f1f9
......@@ -8,10 +8,10 @@
},
"packageManager": "pnpm@8.6.1",
"dependencies": {
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@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/styled-engine-sc": "^5.12.0",
"@reduxjs/toolkit": "^1.8.1",
......@@ -32,7 +32,6 @@
"react-router-dom": "^6.8.2",
"react-use": "^17.4.0",
"semver": "^7.3.8",
"styled-components": "^6.0.5",
"tailwindcss": "^3.2.4",
"textarea-caret": "^3.1.0",
"uuid": "^9.0.0",
......@@ -43,8 +42,8 @@
"@types/lodash-es": "^4.17.5",
"@types/node": "^18.0.3",
"@types/qs": "^6.9.7",
"@types/react": "^18.0.26",
"@types/react-dom": "^18.0.10",
"@types/react": "^18.2.18",
"@types/react-dom": "^18.2.7",
"@types/semver": "^7.3.13",
"@types/textarea-caret": "^3.0.1",
"@types/uuid": "^9.0.2",
......@@ -52,7 +51,7 @@
"@typescript-eslint/parser": "^5.6.0",
"@vitejs/plugin-react-swc": "^3.3.0",
"autoprefixer": "^10.4.2",
"eslint": "^8.4.1",
"eslint": "^8.46.0",
"eslint-config-prettier": "^8.6.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.27.1",
......
web/pnpm-lock.yaml
View file @ b5a6f1f9
This source diff could not be displayed because it is too large. You can view the blob instead.
web/src/components/CreateIdentityProviderDialog.tsx
View file @ b5a6f1f9
......@@ -244,7 +244,7 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {
<div className="dialog-content-container min-w-[19rem]">
{isCreating && (
<>
<Typography className="!mb-1" level="body2">
<Typography className="!mb-1" level="body-md">
{t("common.type")}
</Typography>
<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>
))}
</Select>
<Typography className="mb-2" level="body2">
<Typography className="mb-2" level="body-md">
{t("setting.sso-section.template")}
</Typography>
<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" />
</>
)}
<Typography className="!mb-1" level="body2">
<Typography className="!mb-1" level="body-md">
{t("common.name")}
<span className="text-red-600">*</span>
</Typography>
......@@ -283,7 +283,7 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {
}
fullWidth
/>
<Typography className="!mb-1" level="body2">
<Typography className="!mb-1" level="body-md">
{t("setting.sso-section.identifier-filter")}
</Typography>
<Input
......@@ -306,7 +306,7 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {
{t("setting.sso-section.redirect-url")}: {absolutifyLink("/auth/callback")}
</p>
)}
<Typography className="!mb-1" level="body2">
<Typography className="!mb-1" level="body-md">
{t("setting.sso-section.client-id")}
<span className="text-red-600">*</span>
</Typography>
......@@ -317,7 +317,7 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {
onChange={(e) => setPartialOAuth2Config({ clientId: e.target.value })}
fullWidth
/>
<Typography className="!mb-1" level="body2">
<Typography className="!mb-1" level="body-md">
{t("setting.sso-section.client-secret")}
<span className="text-red-600">*</span>
</Typography>
......@@ -328,7 +328,7 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {
onChange={(e) => setPartialOAuth2Config({ clientSecret: e.target.value })}
fullWidth
/>
<Typography className="!mb-1" level="body2">
<Typography className="!mb-1" level="body-md">
{t("setting.sso-section.authorization-endpoint")}
<span className="text-red-600">*</span>
</Typography>
......@@ -339,7 +339,7 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {
onChange={(e) => setPartialOAuth2Config({ authUrl: e.target.value })}
fullWidth
/>
<Typography className="!mb-1" level="body2">
<Typography className="!mb-1" level="body-md">
{t("setting.sso-section.token-endpoint")}
<span className="text-red-600">*</span>
</Typography>
......@@ -350,7 +350,7 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {
onChange={(e) => setPartialOAuth2Config({ tokenUrl: e.target.value })}
fullWidth
/>
<Typography className="!mb-1" level="body2">
<Typography className="!mb-1" level="body-md">
{t("setting.sso-section.user-endpoint")}
<span className="text-red-600">*</span>
</Typography>
......@@ -361,7 +361,7 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {
onChange={(e) => setPartialOAuth2Config({ userInfoUrl: e.target.value })}
fullWidth
/>
<Typography className="!mb-1" level="body2">
<Typography className="!mb-1" level="body-md">
{t("setting.sso-section.scopes")}
<span className="text-red-600">*</span>
</Typography>
......@@ -373,7 +373,7 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {
fullWidth
/>
<Divider className="!my-2" />
<Typography className="!mb-1" level="body2">
<Typography className="!mb-1" level="body-md">
{t("setting.sso-section.identifier")}
<span className="text-red-600">*</span>
</Typography>
......@@ -384,7 +384,7 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {
onChange={(e) => setPartialOAuth2Config({ fieldMapping: { ...oauth2Config.fieldMapping, identifier: e.target.value } })}
fullWidth
/>
<Typography className="!mb-1" level="body2">
<Typography className="!mb-1" level="body-md">
{t("setting.sso-section.display-name")}
</Typography>
<Input
......@@ -394,7 +394,7 @@ const CreateIdentityProviderDialog: React.FC<Props> = (props: Props) => {
onChange={(e) => setPartialOAuth2Config({ fieldMapping: { ...oauth2Config.fieldMapping, displayName: e.target.value } })}
fullWidth
/>
<Typography className="!mb-1" level="body2">
<Typography className="!mb-1" level="body-md">
{t("common.email")}
</Typography>
<Input
......
web/src/components/CreateResourceDialog.tsx
View file @ b5a6f1f9
......@@ -192,7 +192,7 @@ const CreateResourceDialog: React.FC<Props> = (props: Props) => {
</button>
</div>
<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")}
</Typography>
<Select
......@@ -254,7 +254,7 @@ const CreateResourceDialog: React.FC<Props> = (props: Props) => {
{state.selectedMode === "external-link" && (
<>
<Typography className="!mb-1" level="body2">
<Typography className="!mb-1" level="body-md">
{t("resource.create-dialog.external-link.link")}
</Typography>
<Input
......@@ -264,7 +264,7 @@ const CreateResourceDialog: React.FC<Props> = (props: Props) => {
onChange={handleExternalLinkChanged}
fullWidth
/>
<Typography className="!mb-1" level="body2">
<Typography className="!mb-1" level="body-md">
{t("resource.create-dialog.external-link.file-name")}
</Typography>
<Input
......@@ -274,7 +274,7 @@ const CreateResourceDialog: React.FC<Props> = (props: Props) => {
onChange={handleFileNameChanged}
fullWidth
/>
<Typography className="!mb-1" level="body2">
<Typography className="!mb-1" level="body-md">
{t("resource.create-dialog.external-link.type")}
</Typography>
<Autocomplete
......@@ -290,7 +290,7 @@ const CreateResourceDialog: React.FC<Props> = (props: Props) => {
{state.selectedMode === "download-link" && (
<>
<Typography className="!mb-1" level="body2">
<Typography className="!mb-1" level="body-md">
{t("resource.create-dialog.external-link.link")}
</Typography>
<Input
......
web/src/components/CreateStorageServiceDialog.tsx
View file @ b5a6f1f9
......@@ -114,7 +114,7 @@ const CreateStorageServiceDialog: React.FC<Props> = (props: Props) => {
</button>
</div>
<div className="dialog-content-container min-w-[19rem]">
<Typography className="!mb-1" level="body2">
<Typography className="!mb-1" level="body-md">
{t("common.name")}
<RequiredBadge />
</Typography>
......@@ -130,7 +130,7 @@ const CreateStorageServiceDialog: React.FC<Props> = (props: Props) => {
}
fullWidth
/>
<Typography className="!mb-1" level="body2">
<Typography className="!mb-1" level="body-md">
{t("setting.storage-section.endpoint")}
<RequiredBadge />
</Typography>
......@@ -141,7 +141,7 @@ const CreateStorageServiceDialog: React.FC<Props> = (props: Props) => {
onChange={(e) => setPartialS3Config({ endPoint: e.target.value })}
fullWidth
/>
<Typography className="!mb-1" level="body2">
<Typography className="!mb-1" level="body-md">
{t("setting.storage-section.region")}
<RequiredBadge />
</Typography>
......@@ -152,7 +152,7 @@ const CreateStorageServiceDialog: React.FC<Props> = (props: Props) => {
onChange={(e) => setPartialS3Config({ region: e.target.value })}
fullWidth
/>
<Typography className="!mb-1" level="body2">
<Typography className="!mb-1" level="body-md">
{t("setting.storage-section.accesskey")}
<RequiredBadge />
</Typography>
......@@ -163,7 +163,7 @@ const CreateStorageServiceDialog: React.FC<Props> = (props: Props) => {
onChange={(e) => setPartialS3Config({ accessKey: e.target.value })}
fullWidth
/>
<Typography className="!mb-1" level="body2">
<Typography className="!mb-1" level="body-md">
{t("setting.storage-section.secretkey")}
<RequiredBadge />
</Typography>
......@@ -174,7 +174,7 @@ const CreateStorageServiceDialog: React.FC<Props> = (props: Props) => {
onChange={(e) => setPartialS3Config({ secretKey: e.target.value })}
fullWidth
/>
<Typography className="!mb-1" level="body2">
<Typography className="!mb-1" level="body-md">
{t("setting.storage-section.bucket")}
<RequiredBadge />
</Typography>
......@@ -186,7 +186,7 @@ const CreateStorageServiceDialog: React.FC<Props> = (props: Props) => {
fullWidth
/>
<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" />
</div>
<Input
......@@ -196,7 +196,7 @@ const CreateStorageServiceDialog: React.FC<Props> = (props: Props) => {
onChange={(e) => setPartialS3Config({ path: e.target.value })}
fullWidth
/>
<Typography className="!mb-1" level="body2">
<Typography className="!mb-1" level="body-md">
{t("setting.storage-section.url-prefix")}
</Typography>
<Input
......@@ -206,7 +206,7 @@ const CreateStorageServiceDialog: React.FC<Props> = (props: Props) => {
onChange={(e) => setPartialS3Config({ urlPrefix: e.target.value })}
fullWidth
/>
<Typography className="!mb-1" level="body2">
<Typography className="!mb-1" level="body-md">
{t("setting.storage-section.url-suffix")}
</Typography>
<Input
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment