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

New main #5678

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 11 additions & 12 deletions app/client/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,17 @@ export class ClientApi {
masks() {}

async share(messages: ChatMessage[], avatarUrl: string | null = null) {
const msgs = messages
.map((m) => ({
from: m.role === "user" ? "human" : "gpt",
value: m.content,
}))
.concat([
{
from: "human",
value:
"Share from [ChatGPT Next Web]: https://github.com/Yidadaa/ChatGPT-Next-Web",
},
]);
const msgs = messages.map((m) => ({
from: m.role === "user" ? "human" : "gpt",
value: m.content,
}));
// .concat([
// {
// from: "human",
// value:
// "Share from [ChatGPT Next Web]: https://github.com/Yidadaa/ChatGPT-Next-Web",
// },
// ]);
// 敬告二开开发者们,为了开源大模型的发展,请不要修改上述消息,此消息用于后续数据清洗使用
// Please do not modify this message

Expand Down
2 changes: 1 addition & 1 deletion app/components/exporter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ export function ImagePreviewer(props: {
</div>

<div>
<div className={styles["main-title"]}>ChatGPT Next Web</div>
<div className={styles["main-title"]}>ChatGPT GLM</div>
<div className={styles["sub-title"]}>
github.com/Yidadaa/ChatGPT-Next-Web
</div>
Expand Down
21 changes: 21 additions & 0 deletions app/components/home.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -566,3 +566,24 @@
height: 100%;
width: 100%;
}


//公告栏
.sidebar-notice {
background-color: rgb(0, 0, 0, 0.05);
font-size: 12px;
color: blueviolet;
margin: 20px 0;
// width: 100px;
// height: 50px;
.notice-title{
color: red;
font-weight: bold;
font-size: 16px;
}
.notice-ps{
font-size: 9px;
margin-top: 5px;
color: #333;
}
}
25 changes: 0 additions & 25 deletions app/components/settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -355,31 +355,6 @@ export function Settings() {
</Popover>
</ListItem>

<ListItem
title={Locale.Settings.Update.Version(currentVersion ?? "unknown")}
subTitle={
checkingUpdate
? Locale.Settings.Update.IsChecking
: hasNewVersion
? Locale.Settings.Update.FoundUpdate(remoteId ?? "ERROR")
: Locale.Settings.Update.IsLatest
}
>
{checkingUpdate ? (
<LoadingIcon />
) : hasNewVersion ? (
<Link href={UPDATE_URL} target="_blank" className="link">
{Locale.Settings.Update.GoToUpdate}
</Link>
) : (
<IconButton
icon={<ResetIcon></ResetIcon>}
text={Locale.Settings.Update.CheckUpdate}
onClick={() => checkUpdate(true)}
/>
)}
</ListItem>

<ListItem title={Locale.Settings.SendKey}>
<Select
value={config.submitKey}
Expand Down
15 changes: 8 additions & 7 deletions app/components/sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@ export function SideBar(props: { className?: string }) {
}`}
>
<div className={styles["sidebar-header"]}>
<div className={styles["sidebar-title"]}>ChatGPT Next</div>
<div className={styles["sidebar-title"]}>ChatGPT GLM</div>
<div className={styles["sidebar-sub-title"]}>
Build your own AI assistant.
ChatGPT GLM AI assistant.
</div>
<div className={styles["sidebar-logo"] + " no-dark"}>
<ChatGptIcon />
Expand Down Expand Up @@ -173,11 +173,6 @@ export function SideBar(props: { className?: string }) {
<IconButton icon={<SettingsIcon />} shadow />
</Link>
</div>
<div className={styles["sidebar-action"]}>
<a href={REPO_URL} target="_blank">
<IconButton icon={<GithubIcon />} shadow />
</a>
</div>
</div>
<div>
<IconButton
Expand All @@ -200,6 +195,12 @@ export function SideBar(props: { className?: string }) {
className={styles["sidebar-drag"]}
onMouseDown={(e) => onDragMouseDown(e as any)}
></div>

<div className={styles["sidebar-notice"]}>
<span className={styles["notice-title"]}>重要公告:</span>
由于底层API成本原因,免费无法持续。密码到期时间8月15日,如需继续使用,请加微信:rc7_777,备注:gpt
<div className={styles["notice-ps"]}>ps:已开通不受影响</div>
</div>
</div>
);
}
4 changes: 2 additions & 2 deletions app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { getBuildConfig } from "./config/build";
const buildConfig = getBuildConfig();

export const metadata = {
title: "ChatGPT Next Web",
title: "ChatGPT GLM",
description: "Your personal ChatGPT Chat Bot.",
viewport: {
width: "device-width",
Expand All @@ -19,7 +19,7 @@ export const metadata = {
{ media: "(prefers-color-scheme: dark)", color: "#151515" },
],
appleWebApp: {
title: "ChatGPT Next Web",
title: "ChatGPT GLM",
statusBarStyle: "default",
},
};
Expand Down
Loading
Loading