aykhans/slash-e
1
0
Fork 0
mirror of https://github.com/aykhans/slash-e.git synced 2025-04-20 22:07:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: update error message toast

Browse Source
This commit is contained in:
Steven 2022-11-13 10:02:40 +08:00
parent 3a86e1338c
commit ca9590a49b
9 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/components/ChangePasswordDialog.tsx
View File

@ -66,7 +66,7 @@ const ChangePasswordDialog: React.FC<Props> = (props: Props) => {
toastHelper.info("Password changed"); toastHelper.info("Password changed");
} catch (error: any) { } catch (error: any) {
console.error(error); console.error(error);
toastHelper.error(error.response.data.message); toastHelper.error(JSON.stringify(error.response.data));
} }
requestState.setFinish(); requestState.setFinish();
}; };

2
web/src/components/CreateShortcutDialog.tsx
View File

@ -100,7 +100,7 @@ const CreateShortcutDialog: React.FC<Props> = (props: Props) => {
} }
} catch (error: any) { } catch (error: any) {
console.error(error); console.error(error);
toastHelper.error(error.response.data.error || error.response.data.message); toastHelper.error(JSON.stringify(error.response.data));
} }
}; };

2
web/src/components/CreateWorkspaceDialog.tsx
View File

@ -86,7 +86,7 @@ const CreateWorkspaceDialog: React.FC<Props> = (props: Props) => {
} }
} catch (error: any) { } catch (error: any) {
console.error(error); console.error(error);
toastHelper.error(error.response.data.error || error.response.data.message); toastHelper.error(JSON.stringify(error.response.data));
} }
requestState.setFinish(); requestState.setFinish();
}; };

4
web/src/components/Header.tsx
View File

@ -38,12 +38,12 @@ const Header: React.FC = () => {
<div className="w-full max-w-4xl mx-auto px-3 py-5 flex flex-row justify-between items-center"> <div className="w-full max-w-4xl mx-auto px-3 py-5 flex flex-row justify-between items-center">
<div className="flex flex-row justify-start items-center shrink mr-2"> <div className="flex flex-row justify-start items-center shrink mr-2">
<Link to="/" className="text-base font-mono font-medium cursor-pointer flex flex-row justify-start items-center"> <Link to="/" className="text-base font-mono font-medium cursor-pointer flex flex-row justify-start items-center">
<img src="/corgi-logo.png" className="w-8 h-auto mr-1" alt="" /> <img src="/corgi-logo.png" className="w-8 h-auto mr-2" alt="" />
Corgi Corgi
</Link> </Link>
{workspaceList.length > 0 && activedWorkspace !== undefined && ( {workspaceList.length > 0 && activedWorkspace !== undefined && (
<> <>
<span className="font-mono mx-2 text-gray-200">/</span> <span className="font-mono mx-1 text-gray-200">/</span>
<Dropdown <Dropdown
trigger={ trigger={
<button className="flex flex-row justify-end items-center cursor-pointer"> <button className="flex flex-row justify-end items-center cursor-pointer">

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

@ -1,3 +1,4 @@
import { Tooltip } from "@mui/joy";
import copy from "copy-to-clipboard"; import copy from "copy-to-clipboard";
import { useState } from "react"; import { useState } from "react";
import { shortcutService, workspaceService } from "../services"; import { shortcutService, workspaceService } from "../services";
@ -59,6 +60,7 @@ const ShortcutListView: React.FC<Props> = (props: Props) => {
</div> </div>
<div className="flex flex-row justify-end items-center"> <div className="flex flex-row justify-end items-center">
<span className="w-16 truncate mr-2 text-gray-600">{shortcut.creator.name}</span> <span className="w-16 truncate mr-2 text-gray-600">{shortcut.creator.name}</span>
<Tooltip title="Copy link" variant="solid" placement="top">
<button <button
className="cursor-pointer mr-4 hover:opacity-80" className="cursor-pointer mr-4 hover:opacity-80"
onClick={() => { onClick={() => {
@ -67,9 +69,12 @@ const ShortcutListView: React.FC<Props> = (props: Props) => {
> >
<Icon.Copy className="w-5 h-auto" /> <Icon.Copy className="w-5 h-auto" />
</button> </button>
</Tooltip>
<Tooltip title="Go to link" variant="solid" placement="top">
<a className="cursor-pointer mr-4 hover:opacity-80" target="_blank" href={shortcut.link} rel="noreferrer"> <a className="cursor-pointer mr-4 hover:opacity-80" target="_blank" href={shortcut.link} rel="noreferrer">
<Icon.ExternalLink className="w-5 h-auto" /> <Icon.ExternalLink className="w-5 h-auto" />
</a> </a>
</Tooltip>
<Dropdown <Dropdown
actions={ actions={
<> <>

2
web/src/components/UpsertWorkspaceUserDialog.tsx
View File

@ -69,7 +69,7 @@ const UpsertWorkspaceUserDialog: React.FC<Props> = (props: Props) => {
} }
} catch (error: any) { } catch (error: any) {
console.error(error); console.error(error);
toastHelper.error(error.response.data.error || error.response.data.message); toastHelper.error(JSON.stringify(error.response.data));
} }
requestState.setFinish(); requestState.setFinish();
}; };

3
web/src/components/WorkspaceSetting.tsx
View File

@ -9,6 +9,7 @@ import { unknownWorkspace, unknownWorkspaceUser } from "../store/modules/workspa
import { showCommonDialog } from "./Alert"; import { showCommonDialog } from "./Alert";
import toastHelper from "./Toast"; import toastHelper from "./Toast";
import CreateWorkspaceDialog from "./CreateWorkspaceDialog"; import CreateWorkspaceDialog from "./CreateWorkspaceDialog";
import Icon from "./Icon";
interface Props { interface Props {
workspaceId: WorkspaceId; workspaceId: WorkspaceId;
@ -93,9 +94,11 @@ const WorkspaceSetting: React.FC<Props> = (props: Props) => {
{workspaceUser.role === "ADMIN" ? ( {workspaceUser.role === "ADMIN" ? (
<> <>
<Button variant="soft" onClick={handleEditWorkspaceButtonClick}> <Button variant="soft" onClick={handleEditWorkspaceButtonClick}>
<Icon.Edit className="w-4 h-auto mr-1" />
Edit Edit
</Button> </Button>
<Button variant="soft" color="danger" onClick={handleDeleteWorkspaceButtonClick}> <Button variant="soft" color="danger" onClick={handleDeleteWorkspaceButtonClick}>
<Icon.Trash className="w-4 h-auto mr-1" />
Delete Delete
</Button> </Button>
</> </>

4
web/src/pages/Auth.tsx
View File

@ -76,7 +76,7 @@ const Auth: React.FC = () => {
} }
} catch (error: any) { } catch (error: any) {
console.error(error); console.error(error);
toastHelper.error(error.response.data.message); toastHelper.error(JSON.stringify(error.response.data));
} }
actionBtnLoadingState.setFinish(); actionBtnLoadingState.setFinish();
}; };
@ -111,7 +111,7 @@ const Auth: React.FC = () => {
} }
} catch (error: any) { } catch (error: any) {
console.error(error); console.error(error);
toastHelper.error(error.response.data.message); toastHelper.error(JSON.stringify(error.response.data));
} }
actionBtnLoadingState.setFinish(); actionBtnLoadingState.setFinish();
}; };

12
web/src/pages/UserDetail.tsx
View File

@ -1,4 +1,4 @@
import { Button, Input } from "@mui/joy"; import { Button, Input, Tooltip } from "@mui/joy";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import { useAppSelector } from "../store"; import { useAppSelector } from "../store";
@ -69,22 +69,24 @@ const UserDetail: React.FC = () => {
<span className="mr-3 text-gray-500 font-mono">Email: </span> <span className="mr-3 text-gray-500 font-mono">Email: </span>
{user?.email} {user?.email}
</p> </p>
<p className="leading-8 flex flex-row justify-start items-center"> <div className="leading-8 flex flex-row justify-start items-center">
<span className="mr-3 text-gray-500 font-mono">Password: </span> <span className="mr-3 text-gray-500 font-mono">Password: </span>
<Button variant="soft" onClick={handleChangePasswordBtnClick}> <Button variant="soft" onClick={handleChangePasswordBtnClick}>
Change Change
</Button> </Button>
</p> </div>
<p className="leading-8 flex flex-row justify-start items-center"> <div className="leading-8 flex flex-row justify-start items-center">
<span className="mr-3 text-gray-500 font-mono">OpenID:</span> <span className="mr-3 text-gray-500 font-mono">OpenID:</span>
<Input type="text" className="w-48" value={user?.openId} readOnly /> <Input type="text" className="w-48" value={user?.openId} readOnly />
<Tooltip title="Copy OpenID" variant="solid" placement="top">
<button className="-ml-6 z-1 bg-white text-gray-600 hover:text-black" onClick={handleCopyOpenIdBtnClick}> <button className="-ml-6 z-1 bg-white text-gray-600 hover:text-black" onClick={handleCopyOpenIdBtnClick}>
<Icon.Clipboard className="w-4 h-auto" /> <Icon.Clipboard className="w-4 h-auto" />
</button> </button>
</Tooltip>
<Button className="!ml-6" variant="soft" color="warning" onClick={handleResetOpenIdBtnClick}> <Button className="!ml-6" variant="soft" color="warning" onClick={handleResetOpenIdBtnClick}>
Reset Reset
</Button> </Button>
</p> </div>
</div> </div>
</div> </div>
{state.showChangePasswordDialog && ( {state.showChangePasswordDialog && (