mirror of
https://github.com/coaidev/coai.git
synced 2025-05-21 14:00:13 +09:00
add clean feature and fix browser compatibility in safari 17
This commit is contained in:
Zhang Minghan
parent
6a4d3f0ef0
commit
8f7866fe94
@ -11,34 +11,33 @@
|
||||
"preview": "vite preview"
|
||||
},
|
||||
"dependencies": {
|
||||
"@radix-ui/react-alert-dialog": "^1.0.5",
|
||||
"@radix-ui/react-context-menu": "^2.1.5",
|
||||
"@radix-ui/react-dialog": "^1.0.5",
|
||||
"@radix-ui/react-dropdown-menu": "^2.0.6",
|
||||
"@radix-ui/react-alert-dialog": "^1.0.4",
|
||||
"@radix-ui/react-context-menu": "^2.1.4",
|
||||
"@radix-ui/react-dialog": "^1.0.4",
|
||||
"@radix-ui/react-dropdown-menu": "^2.0.5",
|
||||
"@radix-ui/react-label": "^2.0.2",
|
||||
"@radix-ui/react-scroll-area": "^1.0.5",
|
||||
"@radix-ui/react-select": "^2.0.0",
|
||||
"@radix-ui/react-separator": "^1.0.3",
|
||||
"@radix-ui/react-slot": "^1.0.2",
|
||||
"@radix-ui/react-switch": "^1.0.3",
|
||||
"@radix-ui/react-toast": "^1.1.5",
|
||||
"@radix-ui/react-toast": "^1.1.4",
|
||||
"@radix-ui/react-toggle": "^1.0.3",
|
||||
"@radix-ui/react-tooltip": "^1.0.7",
|
||||
"@reduxjs/toolkit": "^1.9.7",
|
||||
"axios": "^1.5.1",
|
||||
"@radix-ui/react-tooltip": "^1.0.6",
|
||||
"@reduxjs/toolkit": "^1.9.5",
|
||||
"axios": "^1.5.0",
|
||||
"chart.js": "^4.4.0",
|
||||
"class-variance-authority": "^0.7.0",
|
||||
"clsx": "^2.0.0",
|
||||
"i18next": "^23.6.0",
|
||||
"i18next": "^23.4.6",
|
||||
"localforage": "^1.10.0",
|
||||
"lucide-react": "^0.289.0",
|
||||
"match-sorter": "^6.3.1",
|
||||
"react": "^18.2.0",
|
||||
"react-chartjs-2": "^5.2.0",
|
||||
"react-dom": "^18.2.0",
|
||||
"react-i18next": "^13.3.1",
|
||||
"react-i18next": "^13.2.2",
|
||||
"react-markdown": "^8.0.7",
|
||||
"react-redux": "^8.1.3",
|
||||
"react-redux": "^8.1.2",
|
||||
"react-router-dom": "^6.17.0",
|
||||
"react-syntax-highlighter": "^15.5.0",
|
||||
"rehype-katex": "^6.0.3",
|
||||
@ -50,25 +49,25 @@
|
||||
"workbox-window": "^7.0.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/node": "^20.8.9",
|
||||
"@types/react": "^18.2.33",
|
||||
"@types/react-dom": "^18.2.14",
|
||||
"@types/react-syntax-highlighter": "^15.5.9",
|
||||
"@typescript-eslint/eslint-plugin": "^6.9.0",
|
||||
"@typescript-eslint/parser": "^6.9.0",
|
||||
"@vitejs/plugin-react-swc": "^3.4.0",
|
||||
"autoprefixer": "^10.4.16",
|
||||
"eslint": "^8.52.0",
|
||||
"@types/node": "^20.5.9",
|
||||
"@types/react": "^18.2.15",
|
||||
"@types/react-dom": "^18.2.7",
|
||||
"@types/react-syntax-highlighter": "^15.5.7",
|
||||
"@typescript-eslint/eslint-plugin": "^6.0.0",
|
||||
"@typescript-eslint/parser": "^6.0.0",
|
||||
"@vitejs/plugin-react-swc": "^3.3.2",
|
||||
"autoprefixer": "^10.4.15",
|
||||
"eslint": "^8.45.0",
|
||||
"eslint-plugin-react-hooks": "^4.6.0",
|
||||
"eslint-plugin-react-refresh": "^0.4.3",
|
||||
"less": "^4.2.0",
|
||||
"less-loader": "^11.1.3",
|
||||
"postcss": "^8.4.31",
|
||||
"postcss": "^8.4.29",
|
||||
"prettier": "^3.0.3",
|
||||
"tailwindcss": "^3.3.5",
|
||||
"typescript": "^5.2.2",
|
||||
"vite": "^4.5.0",
|
||||
"tailwindcss": "^3.3.3",
|
||||
"typescript": "^5.0.2",
|
||||
"vite": "^4.4.5",
|
||||
"vite-plugin-html": "^3.2.0",
|
||||
"vite-plugin-pwa": "^0.16.5"
|
||||
"vite-plugin-pwa": "^0.16.4"
|
||||
}
|
||||
}
|
||||
|
||||
82
app/pnpm-lock.yaml
generated
82
app/pnpm-lock.yaml
generated
@ -6,23 +6,20 @@ settings:
|
||||
|
||||
dependencies:
|
||||
'@radix-ui/react-alert-dialog':
|
||||
specifier: ^1.0.5
|
||||
specifier: ^1.0.4
|
||||
version: 1.0.5(@types/react-dom@18.2.14)(@types/react@18.2.33)(react-dom@18.2.0)(react@18.2.0)
|
||||
'@radix-ui/react-context-menu':
|
||||
specifier: ^2.1.5
|
||||
specifier: ^2.1.4
|
||||
version: 2.1.5(@types/react-dom@18.2.14)(@types/react@18.2.33)(react-dom@18.2.0)(react@18.2.0)
|
||||
'@radix-ui/react-dialog':
|
||||
specifier: ^1.0.5
|
||||
specifier: ^1.0.4
|
||||
version: 1.0.5(@types/react-dom@18.2.14)(@types/react@18.2.33)(react-dom@18.2.0)(react@18.2.0)
|
||||
'@radix-ui/react-dropdown-menu':
|
||||
specifier: ^2.0.6
|
||||
specifier: ^2.0.5
|
||||
version: 2.0.6(@types/react-dom@18.2.14)(@types/react@18.2.33)(react-dom@18.2.0)(react@18.2.0)
|
||||
'@radix-ui/react-label':
|
||||
specifier: ^2.0.2
|
||||
version: 2.0.2(@types/react-dom@18.2.14)(@types/react@18.2.33)(react-dom@18.2.0)(react@18.2.0)
|
||||
'@radix-ui/react-scroll-area':
|
||||
specifier: ^1.0.5
|
||||
version: 1.0.5(@types/react-dom@18.2.14)(@types/react@18.2.33)(react-dom@18.2.0)(react@18.2.0)
|
||||
'@radix-ui/react-select':
|
||||
specifier: ^2.0.0
|
||||
version: 2.0.0(@types/react-dom@18.2.14)(@types/react@18.2.33)(react-dom@18.2.0)(react@18.2.0)
|
||||
@ -36,19 +33,19 @@ dependencies:
|
||||
specifier: ^1.0.3
|
||||
version: 1.0.3(@types/react-dom@18.2.14)(@types/react@18.2.33)(react-dom@18.2.0)(react@18.2.0)
|
||||
'@radix-ui/react-toast':
|
||||
specifier: ^1.1.5
|
||||
specifier: ^1.1.4
|
||||
version: 1.1.5(@types/react-dom@18.2.14)(@types/react@18.2.33)(react-dom@18.2.0)(react@18.2.0)
|
||||
'@radix-ui/react-toggle':
|
||||
specifier: ^1.0.3
|
||||
version: 1.0.3(@types/react-dom@18.2.14)(@types/react@18.2.33)(react-dom@18.2.0)(react@18.2.0)
|
||||
'@radix-ui/react-tooltip':
|
||||
specifier: ^1.0.7
|
||||
specifier: ^1.0.6
|
||||
version: 1.0.7(@types/react-dom@18.2.14)(@types/react@18.2.33)(react-dom@18.2.0)(react@18.2.0)
|
||||
'@reduxjs/toolkit':
|
||||
specifier: ^1.9.7
|
||||
specifier: ^1.9.5
|
||||
version: 1.9.7(react-redux@8.1.3)(react@18.2.0)
|
||||
axios:
|
||||
specifier: ^1.5.1
|
||||
specifier: ^1.5.0
|
||||
version: 1.5.1
|
||||
chart.js:
|
||||
specifier: ^4.4.0
|
||||
@ -60,7 +57,7 @@ dependencies:
|
||||
specifier: ^2.0.0
|
||||
version: 2.0.0
|
||||
i18next:
|
||||
specifier: ^23.6.0
|
||||
specifier: ^23.4.6
|
||||
version: 23.6.0
|
||||
localforage:
|
||||
specifier: ^1.10.0
|
||||
@ -81,13 +78,13 @@ dependencies:
|
||||
specifier: ^18.2.0
|
||||
version: 18.2.0(react@18.2.0)
|
||||
react-i18next:
|
||||
specifier: ^13.3.1
|
||||
specifier: ^13.2.2
|
||||
version: 13.3.1(i18next@23.6.0)(react-dom@18.2.0)(react@18.2.0)
|
||||
react-markdown:
|
||||
specifier: ^8.0.7
|
||||
version: 8.0.7(@types/react@18.2.33)(react@18.2.0)
|
||||
react-redux:
|
||||
specifier: ^8.1.3
|
||||
specifier: ^8.1.2
|
||||
version: 8.1.3(@types/react-dom@18.2.14)(@types/react@18.2.33)(react-dom@18.2.0)(react@18.2.0)(redux@4.2.1)
|
||||
react-router-dom:
|
||||
specifier: ^6.17.0
|
||||
@ -119,31 +116,31 @@ dependencies:
|
||||
|
||||
devDependencies:
|
||||
'@types/node':
|
||||
specifier: ^20.8.9
|
||||
specifier: ^20.5.9
|
||||
version: 20.8.9
|
||||
'@types/react':
|
||||
specifier: ^18.2.33
|
||||
specifier: ^18.2.15
|
||||
version: 18.2.33
|
||||
'@types/react-dom':
|
||||
specifier: ^18.2.14
|
||||
specifier: ^18.2.7
|
||||
version: 18.2.14
|
||||
'@types/react-syntax-highlighter':
|
||||
specifier: ^15.5.9
|
||||
specifier: ^15.5.7
|
||||
version: 15.5.9
|
||||
'@typescript-eslint/eslint-plugin':
|
||||
specifier: ^6.9.0
|
||||
specifier: ^6.0.0
|
||||
version: 6.9.0(@typescript-eslint/parser@6.9.0)(eslint@8.52.0)(typescript@5.2.2)
|
||||
'@typescript-eslint/parser':
|
||||
specifier: ^6.9.0
|
||||
specifier: ^6.0.0
|
||||
version: 6.9.0(eslint@8.52.0)(typescript@5.2.2)
|
||||
'@vitejs/plugin-react-swc':
|
||||
specifier: ^3.4.0
|
||||
specifier: ^3.3.2
|
||||
version: 3.4.0(vite@4.5.0)
|
||||
autoprefixer:
|
||||
specifier: ^10.4.16
|
||||
specifier: ^10.4.15
|
||||
version: 10.4.16(postcss@8.4.31)
|
||||
eslint:
|
||||
specifier: ^8.52.0
|
||||
specifier: ^8.45.0
|
||||
version: 8.52.0
|
||||
eslint-plugin-react-hooks:
|
||||
specifier: ^4.6.0
|
||||
@ -158,25 +155,25 @@ devDependencies:
|
||||
specifier: ^11.1.3
|
||||
version: 11.1.3(less@4.2.0)(webpack@5.89.0)
|
||||
postcss:
|
||||
specifier: ^8.4.31
|
||||
specifier: ^8.4.29
|
||||
version: 8.4.31
|
||||
prettier:
|
||||
specifier: ^3.0.3
|
||||
version: 3.0.3
|
||||
tailwindcss:
|
||||
specifier: ^3.3.5
|
||||
specifier: ^3.3.3
|
||||
version: 3.3.5
|
||||
typescript:
|
||||
specifier: ^5.2.2
|
||||
specifier: ^5.0.2
|
||||
version: 5.2.2
|
||||
vite:
|
||||
specifier: ^4.5.0
|
||||
specifier: ^4.4.5
|
||||
version: 4.5.0(@types/node@20.8.9)(less@4.2.0)
|
||||
vite-plugin-html:
|
||||
specifier: ^3.2.0
|
||||
version: 3.2.0(vite@4.5.0)
|
||||
vite-plugin-pwa:
|
||||
specifier: ^0.16.5
|
||||
specifier: ^0.16.4
|
||||
version: 0.16.5(vite@4.5.0)(workbox-build@7.0.0)(workbox-window@7.0.0)
|
||||
|
||||
packages:
|
||||
@ -2171,35 +2168,6 @@ packages:
|
||||
react-dom: 18.2.0(react@18.2.0)
|
||||
dev: false
|
||||
|
||||
/@radix-ui/react-scroll-area@1.0.5(@types/react-dom@18.2.14)(@types/react@18.2.33)(react-dom@18.2.0)(react@18.2.0):
|
||||
resolution: {integrity: sha512-b6PAgH4GQf9QEn8zbT2XUHpW5z8BzqEc7Kl11TwDrvuTrxlkcjTD5qa/bxgKr+nmuXKu4L/W5UZ4mlP/VG/5Gw==}
|
||||
peerDependencies:
|
||||
'@types/react': '*'
|
||||
'@types/react-dom': '*'
|
||||
react: ^16.8 || ^17.0 || ^18.0
|
||||
react-dom: ^16.8 || ^17.0 || ^18.0
|
||||
peerDependenciesMeta:
|
||||
'@types/react':
|
||||
optional: true
|
||||
'@types/react-dom':
|
||||
optional: true
|
||||
dependencies:
|
||||
'@babel/runtime': 7.23.2
|
||||
'@radix-ui/number': 1.0.1
|
||||
'@radix-ui/primitive': 1.0.1
|
||||
'@radix-ui/react-compose-refs': 1.0.1(@types/react@18.2.33)(react@18.2.0)
|
||||
'@radix-ui/react-context': 1.0.1(@types/react@18.2.33)(react@18.2.0)
|
||||
'@radix-ui/react-direction': 1.0.1(@types/react@18.2.33)(react@18.2.0)
|
||||
'@radix-ui/react-presence': 1.0.1(@types/react-dom@18.2.14)(@types/react@18.2.33)(react-dom@18.2.0)(react@18.2.0)
|
||||
'@radix-ui/react-primitive': 1.0.3(@types/react-dom@18.2.14)(@types/react@18.2.33)(react-dom@18.2.0)(react@18.2.0)
|
||||
'@radix-ui/react-use-callback-ref': 1.0.1(@types/react@18.2.33)(react@18.2.0)
|
||||
'@radix-ui/react-use-layout-effect': 1.0.1(@types/react@18.2.33)(react@18.2.0)
|
||||
'@types/react': 18.2.33
|
||||
'@types/react-dom': 18.2.14
|
||||
react: 18.2.0
|
||||
react-dom: 18.2.0(react@18.2.0)
|
||||
dev: false
|
||||
|
||||
/@radix-ui/react-select@2.0.0(@types/react-dom@18.2.14)(@types/react@18.2.33)(react-dom@18.2.0)(react@18.2.0):
|
||||
resolution: {integrity: sha512-RH5b7af4oHtkcHS7pG6Sgv5rk5Wxa7XI8W5gvB1N/yiuDGZxko1ynvOiVhFM7Cis2A8zxF9bTOUVbRDzPepe6w==}
|
||||
peerDependencies:
|
||||
|
||||
@ -50,12 +50,17 @@ function Markdown({ children, className }: MarkdownProps) {
|
||||
const url: string = href?.toString() || "";
|
||||
|
||||
return (
|
||||
<a href={url} target={`_blank`} rel={`noopener noreferrer`} onClick={(e) => {
|
||||
<a
|
||||
href={url}
|
||||
target={`_blank`}
|
||||
rel={`noopener noreferrer`}
|
||||
onClick={(e) => {
|
||||
if (doAction(dispatch, url)) e.preventDefault();
|
||||
}}>
|
||||
}}
|
||||
>
|
||||
{children}
|
||||
</a>
|
||||
)
|
||||
);
|
||||
},
|
||||
code({ inline, className, children, ...props }) {
|
||||
const match = /language-(\w+)/.exec(className || "");
|
||||
|
||||
@ -1,7 +1,22 @@
|
||||
import { Button } from "./ui/button.tsx";
|
||||
import { selectMessages } from "../store/chat.ts";
|
||||
import { useDispatch, useSelector } from "react-redux";
|
||||
import { MessageSquarePlus } from "lucide-react";
|
||||
import { toggleConversation } from "../conversation/history.ts";
|
||||
|
||||
function ProjectLink() {
|
||||
return (
|
||||
const dispatch = useDispatch();
|
||||
const messages = useSelector(selectMessages);
|
||||
|
||||
return messages.length > 0 ? (
|
||||
<Button
|
||||
variant="outline"
|
||||
size="icon"
|
||||
onClick={async () => await toggleConversation(dispatch, -1)}
|
||||
>
|
||||
<MessageSquarePlus className={`h-4 w-4`} />
|
||||
</Button>
|
||||
) : (
|
||||
<Button
|
||||
variant="outline"
|
||||
size="icon"
|
||||
|
||||
@ -84,7 +84,9 @@ function SelectGroupDesktop(props: SelectGroupProps) {
|
||||
</span>
|
||||
</SelectValue>
|
||||
</SelectTrigger>
|
||||
<SelectContent className={`${props.className} ${props.classNameDesktop}`}>
|
||||
<SelectContent
|
||||
className={`${props.className} ${props.classNameDesktop}`}
|
||||
>
|
||||
{hidden.map((select: SelectItemProps, idx: number) => (
|
||||
<SelectItem key={idx} value={select.name}>
|
||||
<GroupSelectItem {...select} />
|
||||
@ -109,7 +111,11 @@ function SelectGroupMobile(props: SelectGroupProps) {
|
||||
<SelectTrigger className="select-group mobile">
|
||||
<SelectValue placeholder={props.current.value} />
|
||||
</SelectTrigger>
|
||||
<SelectContent position={`item-aligned`} side={props.side} className={`${props.className} ${props.classNameMobile}`}>
|
||||
<SelectContent
|
||||
position={`item-aligned`}
|
||||
side={props.side}
|
||||
className={`${props.className} ${props.classNameMobile}`}
|
||||
>
|
||||
{props.list.map((select: SelectItemProps, idx: number) => (
|
||||
<SelectItem key={idx} value={select.name}>
|
||||
<GroupSelectItem {...select} />
|
||||
|
||||
@ -50,10 +50,7 @@ function ChatSpace() {
|
||||
{t("contact.title")}
|
||||
<ChevronRight className={`h-4 w-4 ml-2`} />
|
||||
</Button>
|
||||
<Button
|
||||
variant={`outline`}
|
||||
onClick={() => router.navigate("/generate")}
|
||||
>
|
||||
<Button variant={`outline`} onClick={() => router.navigate("/generate")}>
|
||||
<FolderKanban className={`h-4 w-4 mr-1.5`} />
|
||||
{t("generate.title")}
|
||||
<ChevronRight className={`h-4 w-4 ml-2`} />
|
||||
@ -68,7 +65,9 @@ function ChatSpace() {
|
||||
<Button
|
||||
className={`mx-auto`}
|
||||
variant={`outline`}
|
||||
onClick={() => window.open("https://docs.chatnio.net", "_blank")}
|
||||
onClick={() =>
|
||||
window.open("https://docs.chatnio.net", "_blank")
|
||||
}
|
||||
>
|
||||
<BookMarked className={`h-4 w-4 mr-1.5`} />
|
||||
{t("docs.title")}
|
||||
@ -230,12 +229,40 @@ function ChatWrapper() {
|
||||
<ModelSelector side={`bottom`} />
|
||||
</div>
|
||||
<div className={`version`}>
|
||||
<svg className={`app`} onClick={triggerInstallApp} xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" strokeWidth="2" stroke="currentColor" fill="none" strokeLinecap="round" strokeLinejoin="round">
|
||||
<svg
|
||||
className={`app`}
|
||||
onClick={triggerInstallApp}
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
width="24"
|
||||
height="24"
|
||||
viewBox="0 0 24 24"
|
||||
strokeWidth="2"
|
||||
stroke="currentColor"
|
||||
fill="none"
|
||||
strokeLinecap="round"
|
||||
strokeLinejoin="round"
|
||||
>
|
||||
<path stroke="none" d="M0 0h24v24H0z" fill="none" />
|
||||
<path d="M9 3h-4a2 2 0 0 0 -2 2v4a2 2 0 0 0 2 2h4a2 2 0 0 0 2 -2v-4a2 2 0 0 0 -2 -2z" strokeWidth="0" fill="currentColor" />
|
||||
<path d="M9 13h-4a2 2 0 0 0 -2 2v4a2 2 0 0 0 2 2h4a2 2 0 0 0 2 -2v-4a2 2 0 0 0 -2 -2z" strokeWidth="0" fill="currentColor" />
|
||||
<path d="M19 13h-4a2 2 0 0 0 -2 2v4a2 2 0 0 0 2 2h4a2 2 0 0 0 2 -2v-4a2 2 0 0 0 -2 -2z" strokeWidth="0" fill="currentColor" />
|
||||
<path d="M17 3a1 1 0 0 1 .993 .883l.007 .117v2h2a1 1 0 0 1 .117 1.993l-.117 .007h-2v2a1 1 0 0 1 -1.993 .117l-.007 -.117v-2h-2a1 1 0 0 1 -.117 -1.993l.117 -.007h2v-2a1 1 0 0 1 1 -1z" strokeWidth="0" fill="currentColor" />
|
||||
<path
|
||||
d="M9 3h-4a2 2 0 0 0 -2 2v4a2 2 0 0 0 2 2h4a2 2 0 0 0 2 -2v-4a2 2 0 0 0 -2 -2z"
|
||||
strokeWidth="0"
|
||||
fill="currentColor"
|
||||
/>
|
||||
<path
|
||||
d="M9 13h-4a2 2 0 0 0 -2 2v4a2 2 0 0 0 2 2h4a2 2 0 0 0 2 -2v-4a2 2 0 0 0 -2 -2z"
|
||||
strokeWidth="0"
|
||||
fill="currentColor"
|
||||
/>
|
||||
<path
|
||||
d="M19 13h-4a2 2 0 0 0 -2 2v4a2 2 0 0 0 2 2h4a2 2 0 0 0 2 -2v-4a2 2 0 0 0 -2 -2z"
|
||||
strokeWidth="0"
|
||||
fill="currentColor"
|
||||
/>
|
||||
<path
|
||||
d="M17 3a1 1 0 0 1 .993 .883l.007 .117v2h2a1 1 0 0 1 .117 1.993l-.117 .007h-2v2a1 1 0 0 1 -1.993 .117l-.007 -.117v-2h-2a1 1 0 0 1 -.117 -1.993l.117 -.007h2v-2a1 1 0 0 1 1 -1z"
|
||||
strokeWidth="0"
|
||||
fill="currentColor"
|
||||
/>
|
||||
</svg>
|
||||
chatnio v{version}
|
||||
</div>
|
||||
|
||||
@ -16,8 +16,7 @@ function GetModel(name: string): Model {
|
||||
|
||||
type ModelSelectorProps = {
|
||||
side?: "left" | "right" | "top" | "bottom";
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
function ModelSelector(props: ModelSelectorProps) {
|
||||
const { t } = useTranslation();
|
||||
|
||||
@ -8,9 +8,7 @@ const Dialog = DialogPrimitive.Root;
|
||||
|
||||
const DialogTrigger = DialogPrimitive.Trigger;
|
||||
|
||||
const DialogPortal = ({
|
||||
...props
|
||||
}: DialogPrimitive.DialogPortalProps) => (
|
||||
const DialogPortal = ({ ...props }: DialogPrimitive.DialogPortalProps) => (
|
||||
<DialogPrimitive.Portal {...props} />
|
||||
);
|
||||
DialogPortal.displayName = DialogPrimitive.Portal.displayName;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
import * as React from "react"
|
||||
import * as ScrollAreaPrimitive from "@radix-ui/react-scroll-area"
|
||||
import * as React from "react";
|
||||
import * as ScrollAreaPrimitive from "@radix-ui/react-scroll-area";
|
||||
|
||||
import { cn } from "./lib/utils"
|
||||
import { cn } from "./lib/utils";
|
||||
|
||||
const ScrollArea = React.forwardRef<
|
||||
React.ElementRef<typeof ScrollAreaPrimitive.Root>,
|
||||
@ -18,8 +18,8 @@ const ScrollArea = React.forwardRef<
|
||||
<ScrollBar />
|
||||
<ScrollAreaPrimitive.Corner />
|
||||
</ScrollAreaPrimitive.Root>
|
||||
))
|
||||
ScrollArea.displayName = ScrollAreaPrimitive.Root.displayName
|
||||
));
|
||||
ScrollArea.displayName = ScrollAreaPrimitive.Root.displayName;
|
||||
|
||||
const ScrollBar = React.forwardRef<
|
||||
React.ElementRef<typeof ScrollAreaPrimitive.ScrollAreaScrollbar>,
|
||||
@ -34,18 +34,18 @@ const ScrollBar = React.forwardRef<
|
||||
"h-full w-2.5 border-l border-l-transparent p-[1px]",
|
||||
orientation === "horizontal" &&
|
||||
"h-2.5 flex-col border-t border-t-transparent p-[1px]",
|
||||
className
|
||||
className,
|
||||
)}
|
||||
{...props}
|
||||
>
|
||||
<ScrollAreaPrimitive.ScrollAreaThumb
|
||||
className={cn(
|
||||
"relative rounded-full bg-border",
|
||||
orientation === "vertical" && "flex-1"
|
||||
orientation === "vertical" && "flex-1",
|
||||
)}
|
||||
/>
|
||||
</ScrollAreaPrimitive.ScrollAreaScrollbar>
|
||||
))
|
||||
ScrollBar.displayName = ScrollAreaPrimitive.ScrollAreaScrollbar.displayName
|
||||
));
|
||||
ScrollBar.displayName = ScrollAreaPrimitive.ScrollAreaScrollbar.displayName;
|
||||
|
||||
export { ScrollArea, ScrollBar }
|
||||
export { ScrollArea, ScrollBar };
|
||||
|
||||
@ -38,23 +38,25 @@ const SelectContent = React.forwardRef<
|
||||
<SelectPrimitive.Content
|
||||
avoidCollisions={true}
|
||||
ref={(ref) => {
|
||||
if (!ref) return
|
||||
if (!ref) return;
|
||||
ref.ontouchend = (e) => {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
}
|
||||
};
|
||||
}}
|
||||
className={cn(
|
||||
"relative z-50 min-w-[8rem] overflow-hidden rounded-md border bg-popover text-popover-foreground shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
|
||||
position === "popper" ?
|
||||
"data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1":
|
||||
"w-[80vw] max-w-[30rem] max-h-[80vh]",
|
||||
position === "popper"
|
||||
? "data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1"
|
||||
: "w-[80vw] max-w-[30rem] max-h-[80vh]",
|
||||
className,
|
||||
)}
|
||||
position={position}
|
||||
{...props}
|
||||
>
|
||||
<SelectPrimitive.ScrollUpButton className={`flex items-center justify-center h-[25px] cursor-pointer`}>
|
||||
<SelectPrimitive.ScrollUpButton
|
||||
className={`flex items-center justify-center h-[25px] cursor-pointer`}
|
||||
>
|
||||
<ChevronUp />
|
||||
</SelectPrimitive.ScrollUpButton>
|
||||
<SelectPrimitive.Viewport
|
||||
@ -66,7 +68,9 @@ const SelectContent = React.forwardRef<
|
||||
>
|
||||
{children}
|
||||
</SelectPrimitive.Viewport>
|
||||
<SelectPrimitive.ScrollDownButton className={`flex items-center justify-center h-[25px] cursor-pointer`}>
|
||||
<SelectPrimitive.ScrollDownButton
|
||||
className={`flex items-center justify-center h-[25px] cursor-pointer`}
|
||||
>
|
||||
<ChevronDown />
|
||||
</SelectPrimitive.ScrollDownButton>
|
||||
</SelectPrimitive.Content>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
import axios from "axios";
|
||||
import { Model } from "./conversation/types.ts";
|
||||
|
||||
export const version = "3.5.16";
|
||||
export const version = "3.5.17";
|
||||
export const dev: boolean = window.location.hostname === "localhost";
|
||||
export const deploy: boolean = true;
|
||||
export let rest_api: string = "http://localhost:8094";
|
||||
|
||||
@ -18,7 +18,7 @@ type SubscriptionResponse = {
|
||||
usage: {
|
||||
gpt4: number;
|
||||
dalle: number;
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
type BuySubscriptionResponse = {
|
||||
@ -62,12 +62,22 @@ export async function getSubscription(): Promise<SubscriptionResponse> {
|
||||
try {
|
||||
const resp = await axios.get(`/subscription`);
|
||||
if (resp.data.status === false) {
|
||||
return { status: false, is_subscribed: false, expired: 0, usage: { gpt4: 0, dalle: 0 } };
|
||||
return {
|
||||
status: false,
|
||||
is_subscribed: false,
|
||||
expired: 0,
|
||||
usage: { gpt4: 0, dalle: 0 },
|
||||
};
|
||||
}
|
||||
return resp.data as SubscriptionResponse;
|
||||
} catch (e) {
|
||||
console.debug(e);
|
||||
return { status: false, is_subscribed: false, expired: 0 , usage: { gpt4: 0, dalle: 0 } };
|
||||
return {
|
||||
status: false,
|
||||
is_subscribed: false,
|
||||
expired: 0,
|
||||
usage: { gpt4: 0, dalle: 0 },
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -4,7 +4,8 @@ import {
|
||||
isSubscribedSelector,
|
||||
refreshSubscription,
|
||||
refreshSubscriptionTask,
|
||||
setDialog, usageSelector,
|
||||
setDialog,
|
||||
usageSelector,
|
||||
} from "../store/subscription.ts";
|
||||
import {
|
||||
Dialog,
|
||||
|
||||
@ -11,7 +11,7 @@ export const subscriptionSlice = createSlice({
|
||||
usage: {
|
||||
gpt4: 0,
|
||||
dalle: 0,
|
||||
}
|
||||
},
|
||||
},
|
||||
reducers: {
|
||||
toggleDialog: (state) => {
|
||||
@ -49,8 +49,7 @@ export const isSubscribedSelector = (state: any): boolean =>
|
||||
state.subscription.is_subscribed;
|
||||
export const expiredSelector = (state: any): number =>
|
||||
state.subscription.expired;
|
||||
export const usageSelector = (state: any): any =>
|
||||
state.subscription.usage;
|
||||
export const usageSelector = (state: any): any => state.subscription.usage;
|
||||
|
||||
export const refreshSubscription = async (dispatch: AppDispatch) => {
|
||||
const current = new Date().getTime(); //@ts-ignore
|
||||
|
||||
2
app/src/types/ui.d.ts
vendored
2
app/src/types/ui.d.ts
vendored
@ -1 +1 @@
|
||||
declare module '@radix-ui/react-select-area';
|
||||
declare module "@radix-ui/react-select-area";
|
||||
|
||||
@ -8,10 +8,9 @@ window.addEventListener("resize", () => {
|
||||
mobile = isMobile();
|
||||
});
|
||||
|
||||
|
||||
window.addEventListener('beforeinstallprompt', (e: Event) => {
|
||||
window.addEventListener("beforeinstallprompt", (e: Event) => {
|
||||
// e.preventDefault();
|
||||
event = (e as BeforeInstallPromptEvent);
|
||||
event = e as BeforeInstallPromptEvent;
|
||||
});
|
||||
|
||||
export function triggerInstallApp() {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user