Merge pull request #1990 from Yidadaa/bugfix-0615

fix: #1982 should not fullscreen on standlone build

.github/workflows/app.yml

@@ -60,6 +60,7 @@ jobs:
  - uses: tauri-apps/tauri-action@v0
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
  with:
  releaseId: ${{ needs.create-release.outputs.release_id }}
 

.gitignore

@@ -41,3 +41,6 @@ dev
 
 # docker-compose env files
 .env
+
+*.key
+*.key.pub

app/client/api.ts

@@ -1,3 +1,4 @@
+import { getClientConfig } from "../config/client";
 import { ACCESS_CODE_PREFIX } from "../constant";
 import { ChatMessage, ModelType, useAccessStore } from "../store";
 import { ChatGPTApi } from "./platforms/openai";
@@ -93,7 +94,11 @@ export class ClientApi {
  // Please do not modify this message
 
  console.log("[Share]", msgs);
- const res = await fetch("/sharegpt", {
+ const clientConfig = getClientConfig();
+ const proxyUrl = "/sharegpt";
+ const rawUrl = "https://sharegpt.com/api/conversations";
+ const shareUrl = clientConfig?.isApp ? rawUrl : proxyUrl;
+ const res = await fetch(shareUrl, {
  body: JSON.stringify({
  avatarUrl,
  items: msgs,

app/components/chat.tsx

@@ -728,7 +728,7 @@ export function Chat() {
 
  return (
  <div className={styles.chat} key={session.id}>
- <div className="window-header">
+ <div className="window-header" data-tauri-drag-region>
  <div className="window-header-title">
  <div
  className={`window-header-main-title " ${styles["chat-body-title"]}`}

app/components/settings.tsx

@@ -291,7 +291,7 @@ export function Settings() {
 
  return (
  <ErrorBoundary>
- <div className="window-header">
+ <div className="window-header" data-tauri-drag-region>
  <div className="window-header-title">
  <div className="window-header-main-title">
  {Locale.Settings.Title}

app/components/sidebar.tsx

@@ -118,8 +118,10 @@ export function SideBar(props: { className?: string }) {
  shouldNarrow && styles["narrow-sidebar"]
  }`}
  >
- <div className={styles["sidebar-header"]}>
- <div className={styles["sidebar-title"]}>ChatGPT Next</div>
+ <div className={styles["sidebar-header"]} data-tauri-drag-region>
+ <div className={styles["sidebar-title"]} data-tauri-drag-region>
+ ChatGPT Next
+ </div>
  <div className={styles["sidebar-sub-title"]}>
  Build your own AI assistant.
  </div>

app/locales/index.ts

@@ -69,7 +69,6 @@ function getLanguage() {
  try {
  return navigator.language.toLowerCase();
  } catch {
- console.log("[Lang] failed to detect user lang.");
  return DEFAULT_LANG;
  }
 }

app/store/config.ts

@@ -1,7 +1,7 @@
 import { create } from "zustand";
 import { persist } from "zustand/middleware";
+import { getClientConfig } from "../config/client";
 import { StoreKey } from "../constant";
-import { getBuildConfig } from "../config/build";
 
 export enum SubmitKey {
  Enter = "Enter",
@@ -22,7 +22,7 @@ export const DEFAULT_CONFIG = {
  avatar: "1f603",
  fontSize: 14,
  theme: Theme.Auto as Theme,
- tightBorder: !getBuildConfig().isApp,
+ tightBorder: !!getClientConfig()?.isApp,
  sendPreviewBubble: true,
  sidebarWidth: 300,
 

app/styles/markdown.scss

@@ -1116,4 +1116,4 @@
 
 .markdown-body ::-webkit-calendar-picker-indicator {
  filter: invert(50%);
-}
+}

next.config.mjs

@@ -12,6 +12,9 @@ const nextConfig = {
  return config;
  },
  output: mode,
+ images: {
+ unoptimized: mode === "export",
+ },
 };
 
 if (mode !== "export") {

package.json

@@ -36,7 +36,6 @@
  "remark-gfm": "^3.0.1",
  "remark-math": "^5.1.1",
  "sass": "^1.59.2",
- "sharp": "^0.32.1",
  "spark-md5": "^3.0.2",
  "use-debounce": "^9.0.3",
  "zustand": "^4.3.6"