Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

0 #5628

Closed
wants to merge 35 commits into from
Closed

0 #5628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
cf1e775
Update sidebar.tsx
wlibin Aug 6, 2024
5f9a88c
Merge branch 'ChatGPTNextWeb:main' into main
wlibin Aug 6, 2024
57ab31a
Update cn.ts
wlibin Aug 6, 2024
9efef52
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Aug 7, 2024
a5d38ff
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Aug 8, 2024
1617b71
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Aug 9, 2024
83c1a76
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Aug 14, 2024
678055b
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Aug 16, 2024
27a68e7
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Aug 17, 2024
401f4ed
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Aug 20, 2024
030e186
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Aug 21, 2024
f337e19
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Aug 22, 2024
61f6b79
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Aug 25, 2024
6d2d405
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Aug 28, 2024
5feca2e
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Aug 30, 2024
8dd287f
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Sep 5, 2024
282c788
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Sep 7, 2024
8222001
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Sep 8, 2024
cc7f954
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Sep 9, 2024
9fcda2c
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Sep 10, 2024
2ba3706
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Sep 13, 2024
d6bb7db
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Sep 14, 2024
ea5a022
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Sep 15, 2024
09c89a8
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Sep 16, 2024
4c0d56b
Update sidebar.tsx
wlibin Sep 19, 2024
813459f
Update sidebar.tsx
wlibin Sep 19, 2024
47cde5c
Merge branch 'ChatGPTNextWeb:main' into main
wlibin Sep 19, 2024
8631be1
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Sep 20, 2024
d7837db
Update sidebar.tsx
wlibin Sep 20, 2024
c8e1691
Update chat.tsx
wlibin Sep 20, 2024
42f4ded
Update chat.tsx
wlibin Sep 20, 2024
4e0a37c
Update exporter.tsx
wlibin Sep 20, 2024
1d07197
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Sep 23, 2024
ce57633
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Sep 24, 2024
b925cdd
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Sep 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 0 additions & 30 deletions app/components/chat.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -743,36 +743,6 @@ export function ChatActions(props: {
/>
)}

{showPlugins(currentProviderName, currentModel) && (
<ChatAction
onClick={() => {
if (pluginStore.getAll().length == 0) {
navigate(Path.Plugins);
} else {
setShowPluginSelector(true);
}
}}
text={Locale.Plugin.Name}
icon={<PluginIcon />}
/>
)}
{showPluginSelector && (
<Selector
multiple
defaultSelectedValue={chatStore.currentSession().mask?.plugin}
items={pluginStore.getAll().map((item) => ({
title: `${item?.title}@${item?.version}`,
value: item?.id,
}))}
onClose={() => setShowPluginSelector(false)}
onSelection={(s) => {
chatStore.updateCurrentSession((session) => {
session.mask.plugin = s as string[];
});
}}
/>
)}

{!isMobileScreen && (
<ChatAction
onClick={() => props.setShowShortcutKeyModal(true)}
Expand Down
4 changes: 2 additions & 2 deletions app/components/exporter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -539,9 +539,9 @@ export function ImagePreviewer(props: {
</div>

<div>
<div className={styles["main-title"]}>NextChat</div>
<div className={styles["main-title"]}>ChatGPT-4.0</div>
<div className={styles["sub-title"]}>
github.com/ChatGPTNextWeb/ChatGPT-Next-Web
来这里问问ChatGPT你想知道的所有事!
</div>
<div className={styles["icons"]}>
<ExportAvatar avatar={config.avatar} />
Expand Down
17 changes: 4 additions & 13 deletions app/components/sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -224,11 +224,11 @@ export function SideBar(props: { className?: string }) {
{...props}
>
<SideBarHeader
title="NextChat"
subTitle="Build your own AI assistant."
title="ChatGPT-4.0"
subTitle="欢迎使用ChatGPT-4.0."
logo={<ChatGptIcon />}
>
<div className={styles["sidebar-header-bar"]}>
<!-- <div className={styles["sidebar-header-bar"]}>
<IconButton
icon={<MaskIcon />}
text={shouldNarrow ? undefined : Locale.Mask.Name}
Expand All @@ -249,7 +249,7 @@ export function SideBar(props: { className?: string }) {
onClick={() => setShowPluginSelector(true)}
shadow
/>
</div>
</div>-->
{showPluginSelector && (
<Selector
items={[
Expand Down Expand Up @@ -298,15 +298,6 @@ export function SideBar(props: { className?: string }) {
/>
</Link>
</div>
<div className={styles["sidebar-action"]}>
<a href={REPO_URL} target="_blank" rel="noopener noreferrer">
<IconButton
aria={Locale.Export.MessageFromChatGPT}
icon={<GithubIcon />}
shadow
/>
</a>
</div>
</>
}
secondaryAction={
Expand Down
2 changes: 1 addition & 1 deletion app/locales/cn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const cn = {
Error: {
Unauthorized: isApp
? "检测到无效 API Key,请前往[设置](/#/settings)页检查 API Key 是否配置正确。"
: "访问密码不正确或为空,请前往[登录](/#/auth)页输入正确的访问密码,或者在[设置](/#/settings)页填入你自己的 OpenAI API Key。",
: "访问密码不正确或为空,请点击[登录](/#/auth)输入正确的访问密码。",
},
Auth: {
Title: "需要密码",
Expand Down
Loading