1
0
mirror of https://github.com/lencx/ChatGPT.git synced 2024-10-01 01:06:13 -04:00

chore: add pretty

This commit is contained in:
lencx 2023-01-22 18:18:36 +08:00
parent 1ba356a91f
commit bc39dcdd72
56 changed files with 776 additions and 535 deletions

View File

@ -1,12 +1,12 @@
name: "🕷️ Bug report"
description: "report bugs"
title: "[Bug]"
name: '🕷️ Bug report'
description: 'report bugs'
title: '[Bug]'
labels:
- "bug"
- 'bug'
body:
- type: markdown
attributes:
value: "Please make sure to [search for existing issues](https://github.com/lencx/ChatGPT/issues) before filing a new one!"
value: 'Please make sure to [search for existing issues](https://github.com/lencx/ChatGPT/issues) before filing a new one!'
- type: markdown
attributes:
value: |
@ -16,8 +16,8 @@ body:
id: version
attributes:
label: Version
description: "Please specify the version of ChatGPT you are using, a newer version may have fixed the bug you encountered.Check the [UPDATE_LOG](https://github.com/lencx/ChatGPT/blob/main/UPDATE_LOG.md) for more information."
placeholder: "e.g. v0.1.0"
description: 'Please specify the version of ChatGPT you are using, a newer version may have fixed the bug you encountered.Check the [UPDATE_LOG](https://github.com/lencx/ChatGPT/blob/main/UPDATE_LOG.md) for more information.'
placeholder: 'e.g. v0.1.0'
validations:
required: true
- type: textarea
@ -32,12 +32,12 @@ body:
id: OS
attributes:
label: OS
description: "Please specify the OS you are using."
placeholder: "e.g. Ubuntu 22.04"
description: 'Please specify the OS you are using.'
placeholder: 'e.g. Ubuntu 22.04'
validations:
required: true
- type: textarea
id: environment
attributes:
label: Environment
description: "If you think your environment may be related to the problem, please describe it here."
description: 'If you think your environment may be related to the problem, please describe it here.'

View File

@ -1,15 +1,15 @@
name: "❌ Build error report"
description: "report errors when building by yourself"
title: "[Build Error]"
name: '❌ Build error report'
description: 'report errors when building by yourself'
title: '[Build Error]'
labels:
- "build error"
- 'build error'
body:
- type: markdown
attributes:
value: "Please make sure to [search for existing issues](https://github.com/lencx/ChatGPT/issues) before filing a new one!"
value: 'Please make sure to [search for existing issues](https://github.com/lencx/ChatGPT/issues) before filing a new one!'
- type: markdown
attributes:
value: "Please make sure to build from the source code with the latest version of ChatGPT."
value: 'Please make sure to build from the source code with the latest version of ChatGPT.'
- type: markdown
attributes:
value: |
@ -19,19 +19,19 @@ body:
id: error
attributes:
label: Error message
description: "Please paste the error message here."
description: 'Please paste the error message here.'
validations:
required: true
- type: input
id: OS
attributes:
label: OS
description: "Please specify the OS you are using."
placeholder: "e.g. Ubuntu 22.04"
description: 'Please specify the OS you are using.'
placeholder: 'e.g. Ubuntu 22.04'
validations:
required: true
- type: textarea
id: environment
attributes:
label: Environment
description: "If you think your environment may be related to the problem, please describe it here."
description: 'If you think your environment may be related to the problem, please describe it here.'

View File

@ -1,17 +1,17 @@
name: "📚 Documentation Issue"
description: "report documentation issues, typos welcome!"
title: "[Doc]"
name: '📚 Documentation Issue'
description: 'report documentation issues, typos welcome!'
title: '[Doc]'
labels:
- "documentation"
- 'documentation'
body:
- type: markdown
attributes:
value: "Please make sure to [search for existing issues](https://github.com/lencx/ChatGPT/issues) before creating a new one."
value: 'Please make sure to [search for existing issues](https://github.com/lencx/ChatGPT/issues) before creating a new one.'
- type: textarea
id: doc-description
attributes:
label: "Provide a description of requested docs changes"
description: "Briefly describe the requested docs changes."
label: 'Provide a description of requested docs changes'
description: 'Briefly describe the requested docs changes.'
validations:
required: true
- type: markdown

View File

@ -1,34 +1,34 @@
name: "⭐ Feature or enhancement request"
description: "suggest new features or enhancements"
title: "[Feature]"
name: '⭐ Feature or enhancement request'
description: 'suggest new features or enhancements'
title: '[Feature]'
labels:
- "enhancement"
- 'enhancement'
body:
- type: markdown
attributes:
value: "Please make sure to [search for existing issues](https://github.com/lencx/ChatGPT/issues) before creating a new one."
value: 'Please make sure to [search for existing issues](https://github.com/lencx/ChatGPT/issues) before creating a new one.'
- type: textarea
id: feature-description
attributes:
label: "Feature description"
label: 'Feature description'
description: "Describe the feature or enhancements you'd like to see."
validations:
required: true
- type: textarea
id: motivation
attributes:
label: "Motivation"
description: "Describe the motivation for this feature or enhancement."
label: 'Motivation'
description: 'Describe the motivation for this feature or enhancement.'
- type: textarea
id: alternatives
attributes:
label: "Alternatives"
label: 'Alternatives'
description: "Describe any alternatives you've considered."
- type: textarea
id: additional-context
attributes:
label: "Additional context"
description: "Add any other context or screenshots about the feature request here."
label: 'Additional context'
description: 'Add any other context or screenshots about the feature request here.'
- type: markdown
attributes:
value: Please limit one request per issue.

View File

@ -1,34 +1,34 @@
name: "⚠️ Security&Privacy issue"
description: "Report security or privacy issues"
title: "[Security]"
name: '⚠️ Security&Privacy issue'
description: 'Report security or privacy issues'
title: '[Security]'
labels:
- "security"
- 'security'
body:
- type: markdown
attributes:
value: "Please make sure to [search for existing issues](https://github.com/lencx/ChatGPT/issues) before creating a new one."
value: 'Please make sure to [search for existing issues](https://github.com/lencx/ChatGPT/issues) before creating a new one.'
- type: textarea
id: security-description
attributes:
label: "Description"
description: "Describe the security or privacy issue."
label: 'Description'
description: 'Describe the security or privacy issue.'
validations:
required: true
- type: textarea
id: motivation
attributes:
label: "Motivation"
description: "Describe the motivation for this security or privacy issue."
label: 'Motivation'
description: 'Describe the motivation for this security or privacy issue.'
- type: textarea
id: alternatives
attributes:
label: "Alternatives"
label: 'Alternatives'
description: "Describe any alternatives you've considered."
- type: textarea
id: additional-context
attributes:
label: "Additional context"
description: "Add any other context or screenshots about the security or privacy issue here."
label: 'Additional context'
description: 'Add any other context or screenshots about the security or privacy issue here.'
- type: markdown
attributes:
value: Please limit one request per issue.

45
.prettierignore Normal file
View File

@ -0,0 +1,45 @@
package-lock.json
node_modules/
yarn.lock
*.lock
casks/
# rust
src-tauri/
target/
Cargo.lock
*.toml
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*
dist
dist-ssr
*.local
# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
assets/**
public/**
.gitattributes
.gitignore
.prettierignore
LICENSE

7
.prettierrc Normal file
View File

@ -0,0 +1,7 @@
{
"trailingComma": "all",
"singleQuote": true,
"semi": true,
"tabWidth": 2,
"printWidth": 100
}

View File

@ -10,6 +10,7 @@
[![ChatGPT downloads](https://img.shields.io/github/downloads/lencx/ChatGPT/total.svg?style=flat-square)](https://github.com/lencx/ChatGPT/releases)
[![chat](https://img.shields.io/badge/chat-discord-blue?style=flat&logo=discord)](https://discord.gg/aPhCRf4zZr)
[![lencx](https://img.shields.io/badge/follow-lencx__-blue?style=flat&logo=Twitter)](https://twitter.com/lencx_)
<!-- [![lencx](https://img.shields.io/twitter/follow/lencx_.svg?style=social)](https://twitter.com/lencx_) -->
<a href="https://www.buymeacoffee.com/lencx" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-blue.png" alt="Buy Me A Coffee" style="height: 40px !important;width: 145px !important;" ></a>
@ -25,6 +26,7 @@
- [ChatGPT_0.9.2_x64_en-US.msi](https://github.com/lencx/ChatGPT/releases/download/v0.9.2/ChatGPT_0.9.2_x64_en-US.msi):
- 使用 [winget](https://winstall.app/apps/lencx.ChatGPT):
```bash
# install the latest version
winget install --id=lencx.ChatGPT -e

View File

@ -10,6 +10,7 @@
[![ChatGPT downloads](https://img.shields.io/github/downloads/lencx/ChatGPT/total.svg?style=flat-square)](https://github.com/lencx/ChatGPT/releases)
[![chat](https://img.shields.io/badge/chat-discord-blue?style=flat&logo=discord)](https://discord.gg/aPhCRf4zZr)
[![lencx](https://img.shields.io/badge/follow-lencx__-blue?style=flat&logo=Twitter)](https://twitter.com/lencx_)
<!-- [![lencx](https://img.shields.io/twitter/follow/lencx_.svg?style=social)](https://twitter.com/lencx_) -->
<!-- [![中文版 badge](https://img.shields.io/badge/%E4%B8%AD%E6%96%87-Traditional%20Chinese-blue)](./README-ZH.md) -->
@ -27,6 +28,7 @@
- [ChatGPT_0.9.2_x64_en-US.msi](https://github.com/lencx/ChatGPT/releases/download/v0.9.2/ChatGPT_0.9.2_x64_en-US.msi): Direct download installer
- Use [winget](https://winstall.app/apps/lencx.ChatGPT):
```bash
# install the latest version
winget install --id=lencx.ChatGPT -e
@ -174,6 +176,7 @@ Currently, only json and csv are supported for synchronizing custom files, and t
## 📌 TODO
<!-- - Web access capability ([#20](https://github.com/lencx/ChatGPT/issues/20)) -->
- `Control Center` enhancement
- `Pop-up Search` enhancement
- ...

View File

@ -11,15 +11,18 @@ fix: slash command does not work
## v0.9.0
fix:
- export button does not work
feat:
- add an export markdown button
- `Control Center` adds `Notes` and `Download` menus for managing exported chat files (Markdown, PNG, PDF). `Notes` supports markdown previews.
## v0.8.1
fix:
- export button keeps blinking
- export button in the old chat does not work
- disable export sharing links because it is a security risk
@ -27,22 +30,26 @@ fix:
## v0.8.0
feat:
- theme enhancement (Light, Dark, System)
- automatic updates support `silent` settings
- pop-up search: select the ChatGPT content with the mouse, the `DALL·E 2` button appears, and click to jump (note: because the search content filled by the script cannot trigger the event directly, you need to enter a space in the input box to make the button clickable).
fix:
- close the main window and hide it in the tray (windows systems)
## v0.7.4
fix:
- trying to resolve linux errors: `error while loading shared libraries`
- customize global shortcuts (`Menu -> Preferences -> Control Center -> General -> Global Shortcut`)
## v0.7.3
chore:
- optimize slash command style
- optimize tray menu icon and button icons
- global shortcuts to the chatgpt app (mac: `Command + Shift + O`, windows: `Ctrl + Shift + O`)
@ -54,6 +61,7 @@ fix: some windows systems cannot start the application
## v0.7.1
fix:
- some windows systems cannot start the application
- windows and linux add about menu (show version information)
- the tray icon is indistinguishable from the background in dark mode on window and linux
@ -61,10 +69,12 @@ fix:
## v0.7.0
fix:
- mac m1 copy/paste does not work on some system versions
- optimize the save chat log button to a small icon, the tray window no longer provides a save chat log button (the buttons causes the input area to become larger and the content area to become smaller)
feat:
- use the keyboard `⇧` (arrow up) and `⇩` (arrow down) keys to select the slash command
<!-- - global shortcuts to the chatgpt app (mac: command+shift+o, windows: ctrl+shift+o) -->
@ -77,6 +87,7 @@ fix: sync failure on windows
fix: path not allowed on the configured scope
feat:
- optimize the generated pdf file size
- menu added `Sync Prompts`
- `Control Center` added `Sync Custom`
@ -86,6 +97,7 @@ feat:
## v0.6.0
fix:
- windows show Chinese when upgrading
## v0.5.1
@ -103,11 +115,13 @@ add chatgpt log (path: `~/.chatgpt/chatgpt.log`)
## v0.4.1
fix:
- tray window style optimization
## v0.4.0
feat:
- customize the ChatGPT prompts command (https://github.com/lencx/ChatGPT#-announcement)
- menu enhancement: hide application icons from the Dock (support macOS only)
@ -116,12 +130,14 @@ feat:
fix: can't open ChatGPT
feat: menu enhancement
- the control center of ChatGPT application
- open the configuration file directory
## v0.2.2
feat:
- menu: go to config
## v0.2.1
@ -131,12 +147,14 @@ feat: menu optimization
## v0.2.0
feat: menu enhancement
- customize user-agent to prevent security detection interception
- clear all chatgpt configuration files
## v0.1.8
feat:
- menu enhancement: theme, titlebar
- modify website address
@ -147,6 +165,7 @@ feat: tray window
## v0.1.6
feat:
- stay on top
- export ChatGPT history
@ -157,6 +176,7 @@ fix: mac can't use shortcut keys
## v0.1.4
feat:
- beautify icons
- add system tray menu

View File

@ -12,8 +12,11 @@
"fix:tray": "tr override --json.tauri_systemTray_iconPath=\"icons/tray-icon-light.png\" --json.tauri_systemTray_iconAsTemplate=false",
"fix:tray:mac": "tr override --json.tauri_systemTray_iconPath=\"icons/tray-icon.png\" --json.tauri_systemTray_iconAsTemplate=true",
"download": "node ./scripts/download.js",
"fmt:rs": "cargo fmt",
"tr": "tr",
"tauri": "tauri"
"tauri": "tauri",
"prettier": "prettier -c --write '**/*'",
"pretty-quick": "pretty-quick"
},
"license": "MIT",
"author": "lencx <cxin1314@gmail.com>",
@ -32,6 +35,11 @@
"type": "git",
"url": "https://github.com/lencx/ChatGPT"
},
"husky": {
"hooks": {
"pre-commit": "pretty-quick --staged"
}
},
"dependencies": {
"@ant-design/icons": "^4.8.0",
"@monaco-editor/react": "^4.4.6",
@ -59,6 +67,9 @@
"@types/react-syntax-highlighter": "^15.5.6",
"@types/uuid": "^9.0.0",
"@vitejs/plugin-react": "^3.0.0",
"husky": "^8.0.3",
"prettier": "^2.8.3",
"pretty-quick": "^3.1.3",
"sass": "^1.56.2",
"typescript": "^4.9.4",
"vite": "^4.0.0",

View File

@ -22,15 +22,20 @@ const FilePath: FC<FilePathProps> = ({ className, label = 'PATH', paths = '', ur
setPath(url);
return;
}
setPath(await path.join(await chatRoot(), ...paths.split('/').filter(i => !!i)));
})()
}, [url, paths])
setPath(await path.join(await chatRoot(), ...paths.split('/').filter((i) => !!i)));
})();
}, [url, paths]);
return (
<div className={clsx(className, 'chat-file-path')}>
<div>{label}: <a onClick={() => shell.open(filePath)} title={filePath}>{content ? content : filePath}</a></div>
<div>
{label}:{' '}
<a onClick={() => shell.open(filePath)} title={filePath}>
{content ? content : filePath}
</a>
</div>
</div>
);
}
};
export default FilePath;

View File

@ -1,5 +1,5 @@
import { FC, useEffect, useState } from 'react';
import Editor from "@monaco-editor/react";
import Editor from '@monaco-editor/react';
import { Panel, PanelGroup, PanelResizeHandle } from 'react-resizable-panels';
import Markdown from '@/components/Markdown';
@ -17,12 +17,12 @@ const MarkdownEditor: FC<MarkdownEditorProps> = ({ value = '', onChange, mode =
useEffect(() => {
setContent(value);
onChange && onChange(value);
}, [value])
}, [value]);
const handleEdit = (e: any) => {
setContent(e);
onChange && onChange(e);
}
};
const isSplit = mode === 'split';
@ -31,11 +31,7 @@ const MarkdownEditor: FC<MarkdownEditorProps> = ({ value = '', onChange, mode =
<PanelGroup direction="horizontal">
{['md', 'split'].includes(mode) && (
<Panel>
<Editor
language="markdown"
value={content}
onChange={handleEdit}
/>
<Editor language="markdown" value={content} onChange={handleEdit} />
</Panel>
)}
{isSplit && <PanelResizeHandle className="resize-handle" />}
@ -46,7 +42,7 @@ const MarkdownEditor: FC<MarkdownEditorProps> = ({ value = '', onChange, mode =
)}
</PanelGroup>
</div>
)
);
};
export default MarkdownEditor;

View File

@ -1,15 +1,16 @@
.markdown-body {
height: 100%;
overflow: auto;
font-family: -apple-system,BlinkMacSystemFont,"Segoe UI","Noto Sans",Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji";
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Noto Sans', Helvetica, Arial,
sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji';
&.edit-preview {
padding: 10px;
font-size: 14px;
}
pre, code {
pre,
code {
font-family: monospace, monospace;
}
}

View File

@ -13,7 +13,6 @@ interface MarkdownProps {
}
const Markdown: FC<MarkdownProps> = ({ children, className }) => {
return (
<div className={clsx(className, 'markdown-body')}>
<div>
@ -23,7 +22,7 @@ const Markdown: FC<MarkdownProps> = ({ children, className }) => {
remarkPlugins={[remarkGfm]}
components={{
code({ node, inline, className, children, ...props }) {
const match = /language-(\w+)/.exec(className || '')
const match = /language-(\w+)/.exec(className || '');
return !inline && match ? (
<SyntaxHighlighter
children={String(children).replace(/\n$/, '')}
@ -38,13 +37,13 @@ const Markdown: FC<MarkdownProps> = ({ children, className }) => {
<code className={className} {...props}>
{children}
</code>
)
}
);
},
}}
/>
</div>
</div>
)
}
);
};
export default Markdown;

View File

@ -20,7 +20,7 @@ const Tags: FC<TagsProps> = ({ max = 99, value = [], onChange, addTxt = 'New Tag
useEffect(() => {
setTags(value);
}, [value])
}, [value]);
useEffect(() => {
if (inputVisible) {

View File

@ -20,7 +20,7 @@ export default function useChatModel(key: string, file = CHAT_MODEL_JSON) {
oData[key] = data;
await writeJSON(file, oData);
setModelJson(oData);
}
};
return { modelJson, modelSet, modelData: modelJson?.[key] || [] };
}
@ -40,12 +40,16 @@ export function useCacheModel(file = '') {
await writeJSON(newFile ? newFile : file, data, { isRoot: true });
setModelCacheJson(data);
await modelCacheCmd();
}
};
const modelCacheCmd = async () => {
// Generate the `chat.model.cmd.json` file and refresh the page for the slash command to take effect.
const list = await invoke('cmd_list');
await writeJSON(CHAT_MODEL_CMD_JSON, { name: 'ChatGPT CMD', last_updated: Date.now(), data: list });
await writeJSON(CHAT_MODEL_CMD_JSON, {
name: 'ChatGPT CMD',
last_updated: Date.now(),
data: list,
});
await invoke('window_reload', { label: 'core' });
await invoke('window_reload', { label: 'tray' });
};

View File

@ -58,17 +58,16 @@ export const EditRow: FC<EditRowProps> = ({ rowKey, row, actions }) => {
setEdit(true);
};
const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
setVal(e.target.value)
setVal(e.target.value);
};
const handleSave = () => {
setEdit(false);
row[rowKey] = val?.trim();
actions?.setRecord(row, 'rowedit')
actions?.setRecord(row, 'rowedit');
};
return isEdit
? (
return isEdit ? (
<Input
value={val}
autoFocus
@ -76,8 +75,9 @@ export const EditRow: FC<EditRowProps> = ({ rowKey, row, actions }) => {
{...DISABLE_AUTO_COMPLETE}
onPressEnter={handleSave}
/>
)
: (
<div className='rowedit' onClick={handleEdit}>{val}</div>
) : (
<div className="rowedit" onClick={handleEdit}>
{val}
</div>
);
};

View File

@ -8,7 +8,7 @@ export default function useData(oData: any[]) {
useEffect(() => {
opInit(oData);
}, [])
}, []);
const opAdd = (val: any) => {
const v = [val, ...opData];
@ -18,19 +18,19 @@ export default function useData(oData: any[]) {
const opInit = (val: any[] = []) => {
if (!val || !Array.isArray(val)) return;
const nData = val.map(i => ({ [safeKey]: v4(), ...i }));
const nData = val.map((i) => ({ [safeKey]: v4(), ...i }));
setData(nData);
};
const opRemove = (id: string) => {
const nData = opData.filter(i => i[safeKey] !== id);
const nData = opData.filter((i) => i[safeKey] !== id);
setData(nData);
return nData;
};
const opReplace = (id: string, data: any) => {
const nData = [...opData];
const idx = opData.findIndex(v => v[safeKey] === id);
const idx = opData.findIndex((v) => v[safeKey] === id);
nData[idx] = data;
setData(nData);
return nData;

View File

@ -8,5 +8,5 @@ export default function useInit(callback: () => void) {
callback();
isInit.current = false;
}
})
});
}

View File

@ -7,14 +7,17 @@ import { safeKey } from '@/hooks/useData';
type rowSelectionOptions = {
key: 'id' | string;
rowType: 'id' | 'row' | 'all';
}
};
export function useTableRowSelection(options: Partial<rowSelectionOptions> = {}) {
const { key = 'id', rowType = 'id' } = options;
const [selectedRowKeys, setSelectedRowKeys] = useState<React.Key[]>([]);
const [selectedRowIDs, setSelectedRowIDs] = useState<string[]>([]);
const [selectedRows, setSelectedRows] = useState<Record<string | symbol, any>[]>([]);
const onSelectChange = (newSelectedRowKeys: React.Key[], newSelectedRows: Record<string|symbol, any>[]) => {
const onSelectChange = (
newSelectedRowKeys: React.Key[],
newSelectedRows: Record<string | symbol, any>[],
) => {
const keys = newSelectedRows.map((i: any) => i[safeKey] || i[key]);
setSelectedRowKeys(newSelectedRowKeys);
if (rowType === 'id') {
@ -38,11 +41,7 @@ export function useTableRowSelection(options: Partial<rowSelectionOptions> = {})
const rowSelection: TableRowSelection<Record<string, any>> = {
selectedRowKeys,
onChange: onSelectChange,
selections: [
Table.SELECTION_ALL,
Table.SELECTION_INVERT,
Table.SELECTION_NONE,
],
selections: [Table.SELECTION_ALL, Table.SELECTION_INVERT, Table.SELECTION_NONE],
};
return { rowSelection, selectedRowIDs, selectedRows, rowReset };

View File

@ -1,4 +1,4 @@
import Icon from "@ant-design/icons";
import Icon from '@ant-design/icons';
import type { CustomIconComponentProps } from '@ant-design/icons/lib/components/Icon';
interface IconProps {
@ -6,12 +6,20 @@ interface IconProps {
}
export default function SplitIcon(props: Partial<CustomIconComponentProps & IconProps>) {
return <Icon
return (
<Icon
{...props}
component={() => (
<svg className="chatico" viewBox="0 0 1024 1024" width="1em" height="1em" fill="currentColor">
<svg
className="chatico"
viewBox="0 0 1024 1024"
width="1em"
height="1em"
fill="currentColor"
>
<path d="M252.068571 906.496h520.283429c89.581714 0 134.144-44.562286 134.144-132.845714V250.331429c0-88.283429-44.562286-132.845714-134.144-132.845715H252.068571c-89.142857 0-134.582857 44.141714-134.582857 132.845715V773.668571c0 88.704 45.44 132.845714 134.582857 132.845715z m1.28-68.992c-42.843429 0-66.852571-22.710857-66.852571-67.291429V253.805714c0-44.580571 24.009143-67.291429 66.852571-67.291428h222.866286v651.008z m517.723429-651.008c42.422857 0 66.432 22.710857 66.432 67.291429V770.194286c0 44.580571-24.009143 67.291429-66.432 67.291428H548.205714V186.496z" />
</svg>
)}
/>
);
}

34
src/layout/index.tsx vendored
View File

@ -21,21 +21,21 @@ export default function ChatLayout() {
setAppInfo({
appName: await getName(),
appVersion: await getVersion(),
appTheme: await invoke("get_theme"),
appTheme: await invoke('get_theme'),
});
});
})
const checkAppUpdate = async () => {
await invoke('run_check_update', { silent: false, hasMsg: true });
}
};
const isDark = appInfo.appTheme === "dark";
const isDark = appInfo.appTheme === 'dark';
return (
<ConfigProvider theme={{ algorithm: isDark ? theme.darkAlgorithm : theme.defaultAlgorithm }}>
<Layout style={{ minHeight: '100vh' }} hasSider>
<Sider
theme={isDark ? "dark" : "light"}
theme={isDark ? 'dark' : 'light'}
collapsible
collapsed={collapsed}
onCollapse={(value) => setCollapsed(value)}
@ -49,13 +49,17 @@ export default function ChatLayout() {
zIndex: 999,
}}
>
<div className="chat-logo"><img src="/logo.png" /></div>
<div className="chat-logo">
<img src="/logo.png" />
</div>
<div className="chat-info">
<Tag>{appInfo.appName}</Tag>
<Tag>
<span style={{ marginRight: 5 }}>{appInfo.appVersion}</span>
<Tooltip title="click to check update">
<a onClick={checkAppUpdate}><SyncOutlined /></a>
<a onClick={checkAppUpdate}>
<SyncOutlined />
</a>
</Tooltip>
</Tag>
</div>
@ -63,27 +67,33 @@ export default function ChatLayout() {
<Menu
defaultSelectedKeys={[location.pathname]}
mode="inline"
theme={ appInfo.appTheme === "dark" ? "dark" : "light" }
theme={appInfo.appTheme === 'dark' ? 'dark' : 'light'}
inlineIndent={12}
items={menuItems}
// defaultOpenKeys={['/model']}
onClick={(i) => go(i.key)}
/>
</Sider>
<Layout className="chat-layout" style={{ marginLeft: collapsed ? 80 : 200, transition: 'margin-left 300ms ease-out' }}>
<Layout
className="chat-layout"
style={{ marginLeft: collapsed ? 80 : 200, transition: 'margin-left 300ms ease-out' }}
>
<Content
className="chat-container"
style={{
overflow: 'inherit'
overflow: 'inherit',
}}
>
<Routes />
</Content>
<Footer style={{ textAlign: 'center' }}>
<a href="https://github.com/lencx/chatgpt" target="_blank">ChatGPT Desktop Application</a> ©2022 Created by lencx
<a href="https://github.com/lencx/chatgpt" target="_blank">
ChatGPT Desktop Application
</a>{' '}
©2022 Created by lencx
</Footer>
</Layout>
</Layout>
</ConfigProvider>
);
};
}

3
src/main.scss vendored
View File

@ -14,7 +14,8 @@
-webkit-text-size-adjust: 100%;
}
html, body {
html,
body {
padding: 0;
margin: 0;
}

2
src/main.tsx vendored
View File

@ -12,5 +12,5 @@ ReactDOM.createRoot(document.getElementById('root') as HTMLElement).render(
<Layout />
</BrowserRouter>
</Suspense>
</StrictMode>
</StrictMode>,
);

6
src/routes.tsx vendored
View File

@ -23,7 +23,7 @@ import Markdown from '@/view/markdown';
export type ChatRouteMetaObject = {
label: string;
icon?: React.ReactNode,
icon?: React.ReactNode;
};
type ChatRouteObject = {
@ -32,7 +32,7 @@ type ChatRouteObject = {
hideMenu?: boolean;
meta?: ChatRouteMetaObject;
children?: ChatRouteObject[];
}
};
export const routes: Array<ChatRouteObject> = [
{
@ -116,7 +116,7 @@ export const routes: Array<ChatRouteObject> = [
type MenuItem = Required<MenuProps>['items'][number];
export const menuItems: MenuItem[] = routes
.filter((j) => !j.hideMenu)
.map(i => ({
.map((i) => ({
...i.meta,
key: i.path || '',
children: i?.children

52
src/utils.ts vendored
View File

@ -9,27 +9,28 @@ export const CHAT_DOWNLOAD_JSON = 'chat.download.json';
export const CHAT_AWESOME_JSON = 'chat.awesome.json';
export const CHAT_NOTES_JSON = 'chat.notes.json';
export const CHAT_PROMPTS_CSV = 'chat.prompts.csv';
export const GITHUB_PROMPTS_CSV_URL = 'https://raw.githubusercontent.com/f/awesome-chatgpt-prompts/main/prompts.csv';
export const GITHUB_PROMPTS_CSV_URL =
'https://raw.githubusercontent.com/f/awesome-chatgpt-prompts/main/prompts.csv';
export const DISABLE_AUTO_COMPLETE = {
autoCapitalize: 'off',
autoComplete: 'off',
spellCheck: false
spellCheck: false,
};
export const chatRoot = async () => {
return join(await homeDir(), '.chatgpt')
}
return join(await homeDir(), '.chatgpt');
};
export const chatModelPath = async (): Promise<string> => {
return join(await chatRoot(), CHAT_MODEL_JSON);
}
};
export const chatPromptsPath = async (): Promise<string> => {
return join(await chatRoot(), CHAT_PROMPTS_CSV);
}
};
type readJSONOpts = { defaultVal?: Record<string, any>, isRoot?: boolean, isList?: boolean };
type readJSONOpts = { defaultVal?: Record<string, any>; isRoot?: boolean; isList?: boolean };
export const readJSON = async (path: string, opts: readJSONOpts = {}) => {
const { defaultVal = {}, isRoot = false, isList = false } = opts;
const root = await chatRoot();
@ -39,15 +40,24 @@ export const readJSON = async (path: string, opts: readJSONOpts = {}) => {
file = await join(root, path);
}
if (!await exists(file)) {
if (await dirname(file) !== root) {
if (!(await exists(file))) {
if ((await dirname(file)) !== root) {
await createDir(await dirname(file), { recursive: true });
}
await writeTextFile(file, isList ? '[]' : JSON.stringify({
await writeTextFile(
file,
isList
? '[]'
: JSON.stringify(
{
name: 'ChatGPT',
link: 'https://github.com/lencx/ChatGPT',
...defaultVal,
}, null, 2))
},
null,
2,
),
);
}
try {
@ -55,10 +65,14 @@ export const readJSON = async (path: string, opts: readJSONOpts = {}) => {
} catch (e) {
return {};
}
}
};
type writeJSONOpts = { dir?: string, isRoot?: boolean };
export const writeJSON = async (path: string, data: Record<string, any>, opts: writeJSONOpts = {}) => {
type writeJSONOpts = { dir?: string; isRoot?: boolean };
export const writeJSON = async (
path: string,
data: Record<string, any>,
opts: writeJSONOpts = {},
) => {
const { isRoot = false } = opts;
const root = await chatRoot();
let file = path;
@ -67,13 +81,17 @@ export const writeJSON = async (path: string, data: Record<string, any>, opts: w
file = await join(root, path);
}
if (isRoot && !await exists(await dirname(file))) {
if (isRoot && !(await exists(await dirname(file)))) {
await createDir(await dirname(file), { recursive: true });
}
await writeTextFile(file, JSON.stringify(data, null, 2));
}
};
export const fmtDate = (date: any) => dayjs(date).format('YYYY-MM-DD HH:mm:ss');
export const genCmd = (act: string) => act.replace(/\s+|\/+/g, '_').replace(/[^\d\w]/g, '').toLocaleLowerCase();
export const genCmd = (act: string) =>
act
.replace(/\s+|\/+/g, '_')
.replace(/[^\d\w]/g, '')
.toLocaleLowerCase();

View File

@ -28,11 +28,7 @@ const AwesomeForm: ForwardRefRenderFunction<FormProps, AwesomeFormProps> = ({ re
}, [record]);
return (
<Form
form={form}
labelCol={{ span: 4 }}
initialValues={initFormValue}
>
<Form form={form} labelCol={{ span: 4 }} initialValues={initFormValue}>
<Form.Item
label="Title"
name="title"
@ -57,7 +53,7 @@ const AwesomeForm: ForwardRefRenderFunction<FormProps, AwesomeFormProps> = ({ re
<Switch />
</Form.Item>
</Form>
)
}
);
};
export default forwardRef(AwesomeForm);

View File

@ -34,7 +34,7 @@ export const awesomeColumns = () => [
dataIndex: 'category',
key: 'category',
width: 120,
render: (v: string) => <Tag color="geekblue">{v}</Tag>
render: (v: string) => <Tag color="geekblue">{v}</Tag>,
},
{
title: 'Tags',
@ -42,7 +42,11 @@ export const awesomeColumns = () => [
key: 'tags',
width: 150,
render: (v: string[]) => (
<span className="chat-tags">{v?.map(i => <Tag key={i}>{i}</Tag>)}</span>
<span className="chat-tags">
{v?.map((i) => (
<Tag key={i}>{i}</Tag>
))}
</span>
),
},
{
@ -62,7 +66,7 @@ export const awesomeColumns = () => [
<a>Delete</a>
</Popconfirm>
</Space>
)
}
}
);
},
},
];

View File

@ -34,7 +34,8 @@ export default function Awesome() {
updateJson(data);
opInfo.resetRecord();
}
}, [opInfo.opType, formRef]);
}, [opInfo.opType,
formRef]);
const hide = () => {
setVisible(false);
@ -46,15 +47,12 @@ export default function Awesome() {
const data = opReplace(opInfo?.opRecord?.[opSafeKey], opInfo?.opRecord);
updateJson(data);
}
}, [opInfo.opTime])
}, [opInfo.opTime]);
const handleDelete = () => {
};
const handleDelete = () => {};
const handleOk = () => {
formRef.current?.form?.validateFields()
.then(async (vals: Record<string, any>) => {
formRef.current?.form?.validateFields().then(async (vals: Record<string, any>) => {
if (opInfo.opType === 'new') {
const data = opAdd(vals);
await updateJson(data);
@ -67,24 +65,28 @@ export default function Awesome() {
message.success('Data updated successfully');
}
hide();
})
});
};
const handleEnable = (isEnable: boolean) => {
const data = opReplaceItems(selectedRowIDs, { enable: isEnable })
const data = opReplaceItems(selectedRowIDs, { enable: isEnable });
updateJson(data);
};
const modalTitle = `${({ new: 'Create', edit: 'Edit' })[opInfo.opType]} URL`;
const modalTitle = `${{ new: 'Create', edit: 'Edit' }[opInfo.opType]} URL`;
return (
<div>
<div className="chat-table-btns">
<Button className="chat-add-btn" type="primary" onClick={opInfo.opNew}>Add URL</Button>
<Button className="chat-add-btn" type="primary" onClick={opInfo.opNew}>
Add URL
</Button>
<div>
{selectedItems.length > 0 && (
<>
<Button type="primary" onClick={() => handleEnable(true)}>Enable</Button>
<Button type="primary" onClick={() => handleEnable(true)}>
Enable
</Button>
<Button onClick={() => handleEnable(false)}>Disable</Button>
<Popconfirm
overlayStyle={{ width: 250 }}
@ -121,5 +123,5 @@ export default function Awesome() {
<AwesomeForm ref={formRef} record={opInfo?.opRecord} />
</Modal>
</div>
)
);
}

View File

@ -10,7 +10,7 @@ import { fmtDate, chatRoot } from '@/utils';
const colorMap: any = {
pdf: 'blue',
png: 'orange',
}
};
export const downloadColumns = () => [
{
@ -61,20 +61,22 @@ export const downloadColumns = () => [
<a>Delete</a>
</Popconfirm>
</Space>
)
}
}
);
},
},
];
const RenderPath = ({ row }: any) => {
const [filePath, setFilePath] = useState('');
useInit(async () => {
setFilePath(await getPath(row));
})
});
return <a onClick={() => shell.open(filePath)}>{filePath}</a>;
};
export const getPath = async (row: any) => {
const isImg = ['png'].includes(row?.ext);
return await path.join(await chatRoot(), 'download', isImg ? 'img' : row.ext, row.id) + `.${row.ext}`;
}
return (
(await path.join(await chatRoot(), 'download', isImg ? 'img' : row.ext, row.id)) + `.${row.ext}`
);
};

View File

@ -37,7 +37,12 @@ export default function Download() {
(async () => {
const record = opInfo?.opRecord;
const isImg = ['png'].includes(record?.ext);
const file = await path.join(await chatRoot(), 'download', isImg ? 'img' : record?.ext, `${record?.id}.${record?.ext}`);
const file = await path.join(
await chatRoot(),
'download',
isImg ? 'img' : record?.ext,
`${record?.id}.${record?.ext}`,
);
if (opInfo.opType === 'preview') {
const data = await fs.readBinaryFile(file);
const sourceData = renderFile(data, record?.ext);
@ -55,8 +60,8 @@ export default function Download() {
message.success('Name has been changed!');
}
opInfo.resetRecord();
})()
}, [opInfo.opType])
})();
}, [opInfo.opType]);
const handleDelete = async () => {
if (opData?.length === selectedRows.length) {
@ -69,10 +74,15 @@ export default function Download() {
const rows = selectedRows.map(async (i) => {
const isImg = ['png'].includes(i?.ext);
const file = await path.join(await chatRoot(), 'download', isImg ? 'img' : i?.ext, `${i?.id}.${i?.ext}`);
const file = await path.join(
await chatRoot(),
'download',
isImg ? 'img' : i?.ext,
`${i?.id}.${i?.ext}`,
);
await fs.removeFile(file);
return file;
})
});
Promise.all(rows).then(async () => {
await handleRefresh();
message.success('All files selected are cleared!');
@ -131,5 +141,5 @@ export default function Download() {
<img style={{ maxWidth: '100%' }} src={source} />
</Modal>
</div>
)
);
}

View File

@ -1,4 +1,3 @@
.md-task {
margin-bottom: 5px;
display: flex;

View File

@ -14,7 +14,7 @@ const modeMap: any = {
0: 'split',
1: 'md',
2: 'doc',
}
};
export default function Markdown() {
const [filePath, setFilePath] = useState('');
@ -26,8 +26,8 @@ export default function Markdown() {
useInit(async () => {
const file = await getPath(state);
setFilePath(file);
setSource(await fs.readTextFile(file))
})
setSource(await fs.readTextFile(file));
});
const handleChange = async (v: string) => {
await fs.writeTextFile(filePath, v);
@ -46,9 +46,7 @@ export default function Markdown() {
<Breadcrumb.Item onClick={() => history.go(-1)}>
<ArrowLeftOutlined />
</Breadcrumb.Item>
<Breadcrumb.Item onClick={() => shell.open(filePath)}>
{filePath}
</Breadcrumb.Item>
<Breadcrumb.Item onClick={() => shell.open(filePath)}>{filePath}</Breadcrumb.Item>
</Breadcrumb>
<div>
<SplitIcon onClick={handlePreview} style={{ fontSize: 18, color: 'rgba(0,0,0,0.5)' }} />

View File

@ -1,4 +1,10 @@
import { useEffect, useState, ForwardRefRenderFunction, useImperativeHandle, forwardRef } from 'react';
import {
useEffect,
useState,
ForwardRefRenderFunction,
useImperativeHandle,
forwardRef,
} from 'react';
import { Form, Input, Select, Tooltip } from 'antd';
import { v4 } from 'uuid';
import type { FormProps } from 'antd';
@ -54,10 +60,18 @@ const SyncForm: ForwardRefRenderFunction<FormProps, SyncFormProps> = ({ record,
const jsonTip = (
<Tooltip
title={<pre>{JSON.stringify([
title={
<pre>
{JSON.stringify(
[
{ cmd: '', act: '', prompt: '' },
{ cmd: '', act: '', prompt: '' },
], null, 2)}</pre>}
],
null,
2,
)}
</pre>
}
>
<a>JSON</a>
</Tooltip>
@ -65,10 +79,12 @@ const SyncForm: ForwardRefRenderFunction<FormProps, SyncFormProps> = ({ record,
const csvTip = (
<Tooltip
title={<pre>{`"cmd","act","prompt"
title={
<pre>{`"cmd","act","prompt"
"cmd","act","prompt"
"cmd","act","prompt"
"cmd","act","prompt"`}</pre>}
"cmd","act","prompt"`}</pre>
}
>
<a>CSV</a>
</Tooltip>
@ -76,11 +92,7 @@ const SyncForm: ForwardRefRenderFunction<FormProps, SyncFormProps> = ({ record,
return (
<>
<Form
form={form}
labelCol={{ span: 4 }}
initialValues={initFormValue}
>
<Form form={form} labelCol={{ span: 4 }} initialValues={initFormValue}>
<Form.Item
label="Name"
name="name"
@ -100,13 +112,17 @@ const SyncForm: ForwardRefRenderFunction<FormProps, SyncFormProps> = ({ record,
{...DISABLE_AUTO_COMPLETE}
/>
</Form.Item>
<Form.Item style={{ display: 'none' }} name="id" initialValue={v4().replace(/-/g, '')}><input /></Form.Item>
<Form.Item style={{ display: 'none' }} name="id" initialValue={v4().replace(/-/g, '')}>
<input />
</Form.Item>
</Form>
<div className="tip">
<p>The file supports only {csvTip} and {jsonTip} formats.</p>
<p>
The file supports only {csvTip} and {jsonTip} formats.
</p>
</div>
</>
)
}
);
};
export default forwardRef(SyncForm);

View File

@ -26,7 +26,7 @@ export const syncColumns = () => [
dataIndex: 'path',
key: 'path',
width: 180,
render: (_: string, row: any) => <RenderPath row={row} />
render: (_: string, row: any) => <RenderPath row={row} />,
},
{
title: 'Last updated',
@ -56,7 +56,11 @@ export const syncColumns = () => [
>
<a>Sync</a>
</Popconfirm>
{row.last_updated && <Link to={`${row.id}`} state={row}>View</Link>}
{row.last_updated && (
<Link to={`${row.id}`} state={row}>
View
</Link>
)}
<a onClick={() => actions.setRecord(row, 'edit')}>Edit</a>
<Popconfirm
title="Are you sure to delete this path?"
@ -67,23 +71,23 @@ export const syncColumns = () => [
<a>Delete</a>
</Popconfirm>
</Space>
)
}
}
);
},
},
];
const RenderPath = ({ row }: any) => {
const [filePath, setFilePath] = useState('');
useInit(async () => {
setFilePath(await getPath(row));
})
return <a onClick={() => shell.open(filePath)}>{filePath}</a>
});
return <a onClick={() => shell.open(filePath)}>{filePath}</a>;
};
export const getPath = async (row: any) => {
if (!/^http/.test(row.protocol)) {
return await path.join(await chatRoot(), row.path) + `.${row.ext}`;
return (await path.join(await chatRoot(), row.path)) + `.${row.ext}`;
} else {
return `${row.protocol}://${row.path}.${row.ext}`;
}
}
};

View File

@ -10,7 +10,13 @@ import { CHAT_MODEL_JSON, chatRoot, readJSON, genCmd } from '@/utils';
import { syncColumns, getPath } from './config';
import SyncForm from './Form';
const fmtData = (data: Record<string, any>[] = []) => (Array.isArray(data) ? data : []).map((i) => ({ ...i, cmd: i.cmd ? i.cmd : genCmd(i.act), tags: ['user-sync'], enable: true }));
const fmtData = (data: Record<string, any>[] = []) =>
(Array.isArray(data) ? data : []).map((i) => ({
...i,
cmd: i.cmd ? i.cmd : genCmd(i.act),
tags: ['user-sync'],
enable: true,
}));
export default function SyncCustom() {
const [isVisible, setVisible] = useState(false);
@ -37,7 +43,10 @@ export default function SyncCustom() {
handleSync(filename).then((isOk: boolean) => {
opInfo.resetRecord();
if (!isOk) return;
const data = opReplace(opInfo?.opRecord?.[opSafeKey], { ...opInfo?.opRecord, last_updated: Date.now() });
const data = opReplace(opInfo?.opRecord?.[opSafeKey], {
...opInfo?.opRecord,
last_updated: Date.now(),
});
modelSet(data);
opInfo.resetRecord();
});
@ -48,7 +57,11 @@ export default function SyncCustom() {
if (['delete'].includes(opInfo.opType)) {
(async () => {
try {
const file = await path.join(await chatRoot(), 'cache_model', `${opInfo?.opRecord?.id}.json`);
const file = await path.join(
await chatRoot(),
'cache_model',
`${opInfo?.opRecord?.id}.json`,
);
await fs.removeFile(file);
} catch (e) {}
const data = opRemove(opInfo?.opRecord?.[opSafeKey]);
@ -94,8 +107,7 @@ export default function SyncCustom() {
};
const handleOk = () => {
formRef.current?.form?.validateFields()
.then((vals: Record<string, any>) => {
formRef.current?.form?.validateFields().then((vals: Record<string, any>) => {
if (opInfo.opType === 'new') {
const data = opAdd(vals);
modelSet(data);
@ -107,16 +119,12 @@ export default function SyncCustom() {
message.success('Data updated successfully');
}
hide();
})
});
};
return (
<div>
<Button
className="chat-add-btn"
type="primary"
onClick={opInfo.opNew}
>
<Button className="chat-add-btn" type="primary" onClick={opInfo.opNew}>
Add PATH
</Button>
<Table
@ -138,5 +146,5 @@ export default function SyncCustom() {
<SyncForm ref={formRef} record={opInfo?.opRecord} type={opInfo.opType} />
</Modal>
</div>
)
);
}

View File

@ -41,8 +41,6 @@ export const syncColumns = () => [
dataIndex: 'prompt',
key: 'prompt',
// width: 300,
render: (v: string) => (
<span className="chat-prompts-val">{v}</span>
),
render: (v: string) => <span className="chat-prompts-val">{v}</span>,
},
];

View File

@ -1,4 +1,5 @@
.chat-table-tip, .chat-table-btns {
.chat-table-tip,
.chat-table-btns {
display: flex;
justify-content: space-between;
}

View File

@ -52,7 +52,7 @@ export default function SyncPrompts() {
}, [opInfo.opTime]);
const handleEnable = (isEnable: boolean) => {
const data = opReplaceItems(selectedRowIDs, { enable: isEnable })
const data = opReplaceItems(selectedRowIDs, { enable: isEnable });
modelCacheSet(data);
};
@ -72,7 +72,9 @@ export default function SyncPrompts() {
<div>
{selectedItems.length > 0 && (
<>
<Button type="primary" onClick={() => handleEnable(true)}>Enable</Button>
<Button type="primary" onClick={() => handleEnable(true)}>
Enable
</Button>
<Button onClick={() => handleEnable(false)}>Disable</Button>
<span className="num">Selected {selectedItems.length} items</span>
</>
@ -84,7 +86,11 @@ export default function SyncPrompts() {
<FilePath url={promptsURL} content="f/awesome-chatgpt-prompts/prompts.csv" />
<FilePath label="CACHE" paths="cache_model/chatgpt_prompts.json" />
</div>
{lastUpdated && <span style={{ marginLeft: 10, color: '#888', fontSize: 12 }}>Last updated on {fmtDate(lastUpdated)}</span>}
{lastUpdated && (
<span style={{ marginLeft: 10, color: '#888', fontSize: 12 }}>
Last updated on {fmtDate(lastUpdated)}
</span>
)}
</div>
<Table
key={lastUpdated}
@ -94,8 +100,10 @@ export default function SyncPrompts() {
dataSource={opData}
rowSelection={rowSelection}
pagination={TABLE_PAGINATION}
expandable={{expandedRowRender: (record) => <div style={{ padding: 10 }}>{record.prompt}</div>}}
expandable={{
expandedRowRender: (record) => <div style={{ padding: 10 }}>{record.prompt}</div>,
}}
/>
</div>
)
);
}

View File

@ -25,7 +25,11 @@ export const syncColumns = () => [
key: 'tags',
// width: 150,
render: (v: string[]) => (
<span className="chat-prompts-tags">{v?.map(i => <Tag key={i}>{i}</Tag>)}</span>
<span className="chat-prompts-tags">
{v?.map((i) => (
<Tag key={i}>{i}</Tag>
))}
</span>
),
},
{
@ -43,8 +47,6 @@ export const syncColumns = () => [
dataIndex: 'prompt',
key: 'prompt',
// width: 300,
render: (v: string) => (
<span className="chat-prompts-val">{v}</span>
),
render: (v: string) => <span className="chat-prompts-val">{v}</span>,
},
];

View File

@ -30,7 +30,7 @@ export default function SyncRecord() {
useInit(async () => {
setFilePath(await getPath(state));
setJsonPath(await path.join(await chatRoot(), 'cache_model', `${state?.id}.json`));
})
});
useEffect(() => {
if (modelCacheJson.length <= 0) return;
@ -45,7 +45,7 @@ export default function SyncRecord() {
}, [opInfo.opTime]);
const handleEnable = (isEnable: boolean) => {
const data = opReplaceItems(selectedRowIDs, { enable: isEnable })
const data = opReplaceItems(selectedRowIDs, { enable: isEnable });
modelCacheSet(data);
};
@ -58,7 +58,9 @@ export default function SyncRecord() {
<div>
{selectedItems.length > 0 && (
<>
<Button type="primary" onClick={() => handleEnable(true)}>Enable</Button>
<Button type="primary" onClick={() => handleEnable(true)}>
Enable
</Button>
<Button onClick={() => handleEnable(false)}>Disable</Button>
<span className="num">Selected {selectedItems.length} items</span>
</>
@ -70,7 +72,11 @@ export default function SyncRecord() {
<FilePath url={filePath} />
<FilePath label="CACHE" paths={`cache_model/${state?.id}.json`} />
</div>
{state?.last_updated && <span style={{ marginLeft: 10, color: '#888', fontSize: 12 }}>Last updated on {fmtDate(state?.last_updated)}</span>}
{state?.last_updated && (
<span style={{ marginLeft: 10, color: '#888', fontSize: 12 }}>
Last updated on {fmtDate(state?.last_updated)}
</span>
)}
</div>
<Table
key="prompt"
@ -80,8 +86,10 @@ export default function SyncRecord() {
dataSource={opData}
rowSelection={rowSelection}
pagination={TABLE_PAGINATION}
expandable={{expandedRowRender: (record) => <div style={{ padding: 10 }}>{record.prompt}</div>}}
expandable={{
expandedRowRender: (record) => <div style={{ padding: 10 }}>{record.prompt}</div>,
}}
/>
</div>
)
);
}

View File

@ -16,7 +16,10 @@ const initFormValue = {
prompt: '',
};
const UserCustomForm: ForwardRefRenderFunction<FormProps, UserCustomFormProps> = ({ record }, ref) => {
const UserCustomForm: ForwardRefRenderFunction<FormProps, UserCustomFormProps> = (
{ record },
ref,
) => {
const [form] = Form.useForm();
useImperativeHandle(ref, () => ({ form }));
@ -27,11 +30,7 @@ const UserCustomForm: ForwardRefRenderFunction<FormProps, UserCustomFormProps> =
}, [record]);
return (
<Form
form={form}
labelCol={{ span: 4 }}
initialValues={initFormValue}
>
<Form form={form} labelCol={{ span: 4 }} initialValues={initFormValue}>
<Form.Item
label="/{cmd}"
name="cmd"
@ -60,7 +59,7 @@ const UserCustomForm: ForwardRefRenderFunction<FormProps, UserCustomFormProps> =
<Input.TextArea rows={4} placeholder="Please enter a prompt" {...DISABLE_AUTO_COMPLETE} />
</Form.Item>
</Form>
)
}
);
};
export default forwardRef(UserCustomForm);

View File

@ -7,7 +7,7 @@ export const modelColumns = () => [
fixed: 'left',
width: 120,
key: 'cmd',
render: (v: string) => <Tag color="#2a2a2a">/{v}</Tag>
render: (v: string) => <Tag color="#2a2a2a">/{v}</Tag>,
},
{
title: 'Act',
@ -21,7 +21,11 @@ export const modelColumns = () => [
key: 'tags',
width: 150,
render: (v: string[]) => (
<span className="chat-prompts-tags">{v?.map(i => <Tag key={i}>{i}</Tag>)}</span>
<span className="chat-prompts-tags">
{v?.map((i) => (
<Tag key={i}>{i}</Tag>
))}
</span>
),
},
{
@ -39,9 +43,7 @@ export const modelColumns = () => [
dataIndex: 'prompt',
key: 'prompt',
width: 300,
render: (v: string) => (
<span className="chat-prompts-val">{v}</span>
),
render: (v: string) => <span className="chat-prompts-val">{v}</span>,
},
{
title: 'Action',
@ -61,5 +63,5 @@ export const modelColumns = () => [
</Popconfirm>
</Space>
),
}
},
];

View File

@ -50,10 +50,10 @@ export default function LanguageModel() {
const data = opReplace(opInfo?.opRecord?.[opSafeKey], opInfo?.opRecord);
modelCacheSet(data);
}
}, [opInfo.opTime])
}, [opInfo.opTime]);
const handleEnable = (isEnable: boolean) => {
const data = opReplaceItems(selectedRowIDs, { enable: isEnable })
const data = opReplaceItems(selectedRowIDs, { enable: isEnable });
modelCacheSet(data);
};
@ -63,17 +63,26 @@ export default function LanguageModel() {
};
const handleOk = () => {
formRef.current?.form?.validateFields()
.then(async (vals: Record<string, any>) => {
if (modelCacheJson.map((i: any) => i.cmd).includes(vals.cmd) && opInfo?.opRecord?.cmd !== vals.cmd) {
message.warning(`"cmd: /${vals.cmd}" already exists, please change the "${vals.cmd}" name and resubmit.`);
formRef.current?.form?.validateFields().then(async (vals: Record<string, any>) => {
if (
modelCacheJson.map((i: any) => i.cmd).includes(vals.cmd) &&
opInfo?.opRecord?.cmd !== vals.cmd
) {
message.warning(
`"cmd: /${vals.cmd}" already exists, please change the "${vals.cmd}" name and resubmit.`,
);
return;
}
let data = [];
switch (opInfo.opType) {
case 'new': data = opAdd(vals); break;
case 'edit': data = opReplace(opInfo?.opRecord?.[opSafeKey], vals); break;
default: break;
case 'new':
data = opAdd(vals);
break;
case 'edit':
data = opReplace(opInfo?.opRecord?.[opSafeKey], vals);
break;
default:
break;
}
await modelCacheSet(data);
opInit(data);
@ -82,19 +91,23 @@ export default function LanguageModel() {
last_updated: Date.now(),
});
hide();
})
});
};
const modalTitle = `${({ new: 'Create', edit: 'Edit' })[opInfo.opType]} Model`;
const modalTitle = `${{ new: 'Create', edit: 'Edit' }[opInfo.opType]} Model`;
return (
<div>
<div className="chat-table-btns">
<Button className="chat-add-btn" type="primary" onClick={opInfo.opNew}>Add Model</Button>
<Button className="chat-add-btn" type="primary" onClick={opInfo.opNew}>
Add Model
</Button>
<div>
{selectedItems.length > 0 && (
<>
<Button type="primary" onClick={() => handleEnable(true)}>Enable</Button>
<Button type="primary" onClick={() => handleEnable(true)}>
Enable
</Button>
<Button onClick={() => handleEnable(false)}>Disable</Button>
<span className="num">Selected {selectedItems.length} items</span>
</>
@ -103,7 +116,11 @@ export default function LanguageModel() {
</div>
<div className="chat-table-tip">
<FilePath label="CACHE" paths="cache_model/user_custom.json" />
{lastUpdated && <span style={{ marginLeft: 10, color: '#888', fontSize: 12 }}>Last updated on {fmtDate(lastUpdated)}</span>}
{lastUpdated && (
<span style={{ marginLeft: 10, color: '#888', fontSize: 12 }}>
Last updated on {fmtDate(lastUpdated)}
</span>
)}
</div>
<Table
key={lastUpdated}
@ -113,7 +130,9 @@ export default function LanguageModel() {
dataSource={opData}
rowSelection={rowSelection}
pagination={TABLE_PAGINATION}
expandable={{expandedRowRender: (record) => <div style={{ padding: 10 }}>{record.prompt}</div>}}
expandable={{
expandedRowRender: (record) => <div style={{ padding: 10 }}>{record.prompt}</div>,
}}
/>
<Modal
open={isVisible}
@ -126,5 +145,5 @@ export default function LanguageModel() {
<UserCustomForm record={opInfo?.opRecord} ref={formRef} />
</Modal>
</div>
)
);
}

View File

@ -41,7 +41,9 @@ export const notesColumns = () => [
return (
<Space>
<a onClick={() => actions.setRecord(row, 'preview')}>Preview</a>
<Link to={`/md/${row.id}`} state={row}>Edit</Link>
<Link to={`/md/${row.id}`} state={row}>
Edit
</Link>
<Popconfirm
title="Are you sure to delete this file?"
onConfirm={() => actions.setRecord(row, 'delete')}
@ -51,20 +53,20 @@ export const notesColumns = () => [
<a>Delete</a>
</Popconfirm>
</Space>
)
}
}
);
},
},
];
const RenderPath = ({ row }: any) => {
const [filePath, setFilePath] = useState('');
useInit(async () => {
setFilePath(await getPath(row));
})
});
return <a onClick={() => shell.open(filePath)}>{filePath}</a>;
};
export const getPath = async (row: any) => {
const isImg = ['png'].includes(row?.ext);
return await path.join(await chatRoot(), 'notes', row.id) + `.${row.ext}`;
}
return (await path.join(await chatRoot(), 'notes', row.id)) + `.${row.ext}`;
};

View File

@ -46,8 +46,8 @@ export default function Notes() {
message.success('Name has been changed!');
}
opInfo.resetRecord();
})()
}, [opInfo.opType])
})();
}, [opInfo.opType]);
const handleDelete = async () => {
if (opData?.length === selectedRows.length) {
@ -62,7 +62,7 @@ export default function Notes() {
const file = await path.join(await chatRoot(), 'notes', `${i?.id}.${i?.ext}`);
await fs.removeFile(file);
return file;
})
});
Promise.all(rows).then(async () => {
await handleRefresh();
message.success('All files selected are cleared!');
@ -122,5 +122,5 @@ export default function Notes() {
<Markdown children={source} />
</Modal>
</div>
)
);
}

View File

@ -9,37 +9,47 @@ import { DISABLE_AUTO_COMPLETE } from '@/utils';
const AutoUpdateLabel = () => {
return (
<span>
Auto Update
{' '}
<Tooltip title={(
Auto Update{' '}
<Tooltip
title={
<div>
<div>Auto Update Policy</div>
<div><strong>Prompt</strong>: prompt to install</div>
<div><strong>Silent</strong>: install silently</div>
<div>
<strong>Prompt</strong>: prompt to install
</div>
<div>
<strong>Silent</strong>: install silently
</div>
{/* <div><strong>Disable</strong>: disable auto update</div> */}
</div>
)}><QuestionCircleOutlined style={{ color: '#1677ff' }} /></Tooltip>
</span>
)
}
>
<QuestionCircleOutlined style={{ color: '#1677ff' }} />
</Tooltip>
</span>
);
};
const GlobalShortcutLabel = () => {
return (
<div>
Global Shortcut
{' '}
<Tooltip title={(
Global Shortcut{' '}
<Tooltip
title={
<div>
<div>Shortcut definition, modifiers and key separated by "+" e.g. CmdOrControl+Q</div>
<div style={{ margin: '10px 0' }}>If empty, the shortcut is disabled.</div>
<a href="https://tauri.app/v1/api/js/globalshortcut" target="_blank">https://tauri.app/v1/api/js/globalshortcut</a>
<a href="https://tauri.app/v1/api/js/globalshortcut" target="_blank">
https://tauri.app/v1/api/js/globalshortcut
</a>
</div>
)}>
}
>
<QuestionCircleOutlined style={{ color: '#1677ff' }} />
</Tooltip>
</div>
)
}
);
};
export default function General() {
const [platformInfo, setPlatform] = useState('');
@ -62,9 +72,7 @@ export default function General() {
<Radio.Group>
<Radio value="Light">Light</Radio>
<Radio value="Dark">Dark</Radio>
{["darwin", "windows"].includes(platformInfo) && (
<Radio value="System">System</Radio>
)}
{['darwin', 'windows'].includes(platformInfo) && <Radio value="System">System</Radio>}
</Radio.Group>
</Form.Item>
<Form.Item label={<AutoUpdateLabel />} name="auto_update">
@ -78,5 +86,5 @@ export default function General() {
<Input placeholder="CmdOrCtrl+Shift+O" {...DISABLE_AUTO_COMPLETE} />
</Form.Item>
</>
)
);
}

View File

@ -9,25 +9,39 @@ import { DISABLE_AUTO_COMPLETE } from '@/utils';
const OriginLabel = ({ url }: { url: string }) => {
return (
<span>
Switch Origin <Tooltip title={`Default: ${url}`}><QuestionCircleOutlined style={{ color: '#1677ff' }} /></Tooltip>
Switch Origin{' '}
<Tooltip title={`Default: ${url}`}>
<QuestionCircleOutlined style={{ color: '#1677ff' }} />
</Tooltip>
</span>
)
}
);
};
const PopupSearchLabel = () => {
return (
<span>
Pop-up Search
{' '}
<Tooltip title={(
Pop-up Search{' '}
<Tooltip
title={
<div>
<div style={{ marginBottom: 10 }}>Generate images according to the content: Select the ChatGPT content with the mouse, no more than 400 characters. the <b>DALL·E 2</b> button appears, and click to jump (Note: because the search content filled by the script cannot trigger the event directly, you need to enter a space in the input box to make the button clickable).</div>
<div>The application is built using Tauri, and due to its security restrictions, some of the action buttons will not work, so we recommend going to your browser.</div>
<div style={{ marginBottom: 10 }}>
Generate images according to the content: Select the ChatGPT content with the mouse,
no more than 400 characters. the <b>DALL·E 2</b> button appears, and click to jump
(Note: because the search content filled by the script cannot trigger the event
directly, you need to enter a space in the input box to make the button clickable).
</div>
<div>
The application is built using Tauri, and due to its security restrictions, some of
the action buttons will not work, so we recommend going to your browser.
</div>
</div>
)}><QuestionCircleOutlined style={{ color: '#1677ff' }} /></Tooltip>
</span>
)
}
>
<QuestionCircleOutlined style={{ color: '#1677ff' }} />
</Tooltip>
</span>
);
};
export default function General() {
const [chatConf, setChatConf] = useState<any>(null);
@ -46,8 +60,12 @@ export default function General() {
<Input placeholder="https://chat.openai.com" {...DISABLE_AUTO_COMPLETE} />
</Form.Item>
<Form.Item label="User Agent (Main)" name="ua_window">
<Input.TextArea autoSize={{ minRows: 4, maxRows: 4 }} {...DISABLE_AUTO_COMPLETE} placeholder="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36" />
<Input.TextArea
autoSize={{ minRows: 4, maxRows: 4 }}
{...DISABLE_AUTO_COMPLETE}
placeholder="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36"
/>
</Form.Item>
</>
)
);
}

View File

@ -9,8 +9,12 @@ export default function General() {
<Switch />
</Form.Item>
<Form.Item label="User Agent (SystemTray)" name="ua_tray">
<Input.TextArea autoSize={{ minRows: 4, maxRows: 4 }} {...DISABLE_AUTO_COMPLETE} placeholder="Mozilla/5.0 (iPhone; CPU iPhone OS 16_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.0 Mobile/15E148 Safari/604.1" />
<Input.TextArea
autoSize={{ minRows: 4, maxRows: 4 }}
{...DISABLE_AUTO_COMPLETE}
placeholder="Mozilla/5.0 (iPhone; CPU iPhone OS 16_0 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.0 Mobile/15E148 Safari/604.1"
/>
</Form.Item>
</>
)
);
}

View File

@ -21,7 +21,7 @@ export default function Settings() {
useEffect(() => {
form.setFieldsValue(clone(chatConf));
}, [chatConf])
}, [chatConf]);
const onCancel = () => {
form.setFieldsValue(chatConf);
@ -31,7 +31,7 @@ export default function Settings() {
const chatData = await invoke('reset_chat_conf');
setChatConf(chatData);
const isOk = await dialog.ask(`Configuration reset successfully, whether to restart?`, {
title: 'ChatGPT Preferences'
title: 'ChatGPT Preferences',
});
if (isOk) {
process.relaunch();
@ -44,7 +44,7 @@ export default function Settings() {
if (!isEqual(omit(chatConf, ['default_origin']), values)) {
await invoke('form_confirm', { data: values, label: 'main' });
const isOk = await dialog.ask(`Configuration saved successfully, whether to restart?`, {
title: 'ChatGPT Preferences'
title: 'ChatGPT Preferences',
});
if (isOk) {
process.relaunch();
@ -75,11 +75,15 @@ export default function Settings() {
<Form.Item>
<Space size={20}>
<Button onClick={onCancel}>Cancel</Button>
<Button type="primary" htmlType="submit">Submit</Button>
<Button type="dashed" onClick={onReset}>Reset to defaults</Button>
<Button type="primary" htmlType="submit">
Submit
</Button>
<Button type="dashed" onClick={onReset}>
Reset to defaults
</Button>
</Space>
</Form.Item>
</Form>
</div>
)
);
}

View File

@ -20,7 +20,7 @@
"@/*": ["src/*"],
"@view/*": ["src/view/*"],
"@comps/*": ["src/components/*"],
"@layout/*": ["src/layout/*"],
"@layout/*": ["src/layout/*"]
}
},
"include": ["src"],

View File

@ -1,6 +1,6 @@
import { defineConfig } from "vite";
import react from "@vitejs/plugin-react";
import tsconfigPaths from "vite-tsconfig-paths";
import { defineConfig } from 'vite';
import react from '@vitejs/plugin-react';
import tsconfigPaths from 'vite-tsconfig-paths';
// https://vitejs.dev/config/
export default defineConfig({
@ -16,12 +16,12 @@ export default defineConfig({
},
// to make use of `TAURI_DEBUG` and other env variables
// https://tauri.studio/v1/api/config#buildconfig.beforedevcommand
envPrefix: ["VITE_", "TAURI_"],
envPrefix: ['VITE_', 'TAURI_'],
build: {
// Tauri supports es2021
target: ["es2021", "chrome100", "safari13"],
target: ['es2021', 'chrome100', 'safari13'],
// don't minify for debug builds
minify: !process.env.TAURI_DEBUG ? "esbuild" : false,
minify: !process.env.TAURI_DEBUG ? 'esbuild' : false,
// produce sourcemaps for debug builds
sourcemap: !!process.env.TAURI_DEBUG,
},