diff --git a/.gitignore b/.gitignore index 5b873a2608..829a17f135 100644 --- a/.gitignore +++ b/.gitignore @@ -38,4 +38,5 @@ bower_components/ .flooignore # Environment -.env \ No newline at end of file +.env +cache.json \ No newline at end of file diff --git a/src/App.jsx b/src/App.jsx index fa303d94ce..fe88a6adc0 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -5,15 +5,11 @@ import TextChat from './components/main/TextChat'; import Nav from './components/Nav'; import MobileNav from './components/Nav/MobileNav'; import useDocumentTitle from '~/hooks/useDocumentTitle'; -import { useDispatch, useSelector } from 'react-redux'; -import { setConvos } from '~/store/convoSlice'; +import { useSelector } from 'react-redux'; const App = () => { const { messages } = useSelector((state) => state.messages); const { title } = useSelector((state) => state.convo); - const dispatch = useDispatch(); - const { data, error, isLoading, mutate } = swr('http://localhost:3050/convos', (res) => dispatch(setConvos(res))); - useDocumentTitle(title); return ( diff --git a/src/components/Conversations/index.jsx b/src/components/Conversations/index.jsx index bc90bb1e19..d14bd654f5 100644 --- a/src/components/Conversations/index.jsx +++ b/src/components/Conversations/index.jsx @@ -1,13 +1,8 @@ import React, { useState } from 'react'; -import { useSelector } from 'react-redux'; import Conversation from './Conversation'; -// import { swr } from '~/utils/fetchers'; -import useDidMountEffect from '~/hooks/useDidMountEffect'; -export default function Conversations() { - const [isHovering, setIsHovering] = useState(false); - const { conversationId } = useSelector((state) => state.convo); - // useDidMountEffect(() => mutate(), [conversationId]); +export default function Conversations({ conversations, conversationId }) { + // const currentRef = useRef(null); // const scrollToTop = () => { @@ -21,31 +16,24 @@ export default function Conversations() { // }, [conversationId]); return ( -
setIsHovering(true)} - onMouseLeave={() => setIsHovering(false)} - > -
- {/*
*/} - {conversations && - conversations.map((convo, i) => ( - - ))} - {conversations && conversations.length >= 12 && ( - - )} -
-
+ <> + {/*
*/} + {conversations && + conversations.length > 0 && + conversations.map((convo, i) => ( + + ))} + {conversations && conversations.length >= 12 && ( + + )} + ); } diff --git a/src/components/Nav/index.jsx b/src/components/Nav/index.jsx index a50bcc0627..b517de335a 100644 --- a/src/components/Nav/index.jsx +++ b/src/components/Nav/index.jsx @@ -1,10 +1,18 @@ -import React from 'react'; +import React, { useState } from 'react'; import NewChat from './NewChat'; +import Spinner from '../svg/Spinner'; import Conversations from '../Conversations'; import NavLinks from './NavLinks'; +import useDidMountEffect from '~/hooks/useDidMountEffect'; +import { swr } from '~/utils/fetchers'; +import { useSelector } from 'react-redux'; export default function Nav() { + const [isHovering, setIsHovering] = useState(false); const { conversationId } = useSelector((state) => state.convo); + const { data, error, isLoading, mutate } = swr('http://localhost:3050/convos'); + + useDidMountEffect(() => mutate(), [conversationId]); return (
@@ -12,7 +20,17 @@ export default function Nav() {
diff --git a/src/components/svg/Spinner.jsx b/src/components/svg/Spinner.jsx new file mode 100644 index 0000000000..56789653c7 --- /dev/null +++ b/src/components/svg/Spinner.jsx @@ -0,0 +1,67 @@ +import React from 'react'; + +export default function Spinner() { + return ( + + + + + + + + + + + ); +} diff --git a/src/store/convoSlice.js b/src/store/convoSlice.js index 43309bb698..89d6b666ec 100644 --- a/src/store/convoSlice.js +++ b/src/store/convoSlice.js @@ -5,7 +5,7 @@ const initialState = { title: 'ChatGPT Clone', conversationId: null, parentMessageId: null, - convos: [], + // convos: [], convosLoading: false, }; @@ -19,7 +19,7 @@ const currentSlice = createSlice({ setError: (state, action) => { state.error = action.payload; }, - setConvos: (state, action) => state.convos = action.payload, + // setConvos: (state, action) => state.convos = action.payload, } }); diff --git a/src/style.css b/src/style.css index 20baed9940..5f062262da 100644 --- a/src/style.css +++ b/src/style.css @@ -247,7 +247,7 @@ button { --tw-border-opacity: 1; /* background-color: rgba(217,217,227,.8); Original */ background-color: rgba(217, 217, 227, 0.26); - border-color: rgba(255,255,255,var(--tw-border-opacity)); + border-color: rgba(255, 255, 255, var(--tw-border-opacity)); border-radius: 9999px; border-width: 1px; } @@ -261,83 +261,96 @@ button { border-radius: 9999px; } -body,html { - height: 100% +body, +html { + height: 100%; } -.dark body,.dark html { +.dark body, +.dark html { --tw-bg-opacity: 1; - background-color: rgba(52,53,65,var(--tw-bg-opacity)) + background-color: rgba(52, 53, 65, var(--tw-bg-opacity)); } -#__next,#root { - height: 100% +#__next, +#root { + height: 100%; } .markdown ol { - counter-reset: item + counter-reset: item; } .markdown ul li { display: block; margin: 0; - position: relative + position: relative; } .markdown ul li:before { - content: "•"; - font-size: .875rem; + content: '•'; + font-size: 0.875rem; line-height: 1.25rem; margin-left: -1rem; - position: absolute + position: absolute; } .markdown { - max-width: none + max-width: none; } -.markdown h1,.markdown h2 { - font-weight: 600 +.markdown h1, +.markdown h2 { + font-weight: 600; } .markdown h2 { margin-bottom: 1rem; - margin-top: 2rem + margin-top: 2rem; } .markdown h3 { - font-weight: 600 + font-weight: 600; } -.markdown h3,.markdown h4 { - margin-bottom: .5rem; - margin-top: 1rem +.markdown h3, +.markdown h4 { + margin-bottom: 0.5rem; + margin-top: 1rem; } .markdown h4 { - font-weight: 400 + font-weight: 400; } .markdown h5 { - font-weight: 600 + font-weight: 600; } .markdown blockquote { --tw-border-opacity: 1; - border-color: rgba(142,142,160,var(--tw-border-opacity)); + border-color: rgba(142, 142, 160, var(--tw-border-opacity)); border-left-width: 2px; line-height: 1rem; - padding-left: 1rem + padding-left: 1rem; } -.markdown ol,.markdown ul { +.markdown ol, +.markdown ul { display: flex; flex-direction: column; - padding-left: 1rem + padding-left: 1rem; } -.markdown ol li,.markdown ol li>p,.markdown ol ol,.markdown ol ul,.markdown ul li,.markdown ul li>p,.markdown ul ol,.markdown ul ul { - margin: 0 +.markdown ol li, +.markdown ol li > p, +.markdown ol ol, +.markdown ol ul, +.markdown ul li, +.markdown ul li > p, +.markdown ul ol, +.markdown ul ul { + margin: 0; } .markdown table { @@ -345,270 +358,273 @@ body,html { --tw-border-spacing-y: 0px; border-collapse: separate; border-spacing: var(--tw-border-spacing-x) var(--tw-border-spacing-y); - width: 100% + width: 100%; } .markdown th { - background-color: rgba(236,236,241,.2); + background-color: rgba(236, 236, 241, 0.2); border-bottom-width: 1px; border-left-width: 1px; border-top-width: 1px; - padding: .25rem .75rem + padding: 0.25rem 0.75rem; } .markdown th:first-child { - border-top-left-radius: .375rem + border-top-left-radius: 0.375rem; } .markdown th:last-child { border-right-width: 1px; - border-top-right-radius: .375rem + border-top-right-radius: 0.375rem; } .markdown td { border-bottom-width: 1px; border-left-width: 1px; - padding: .25rem .75rem + padding: 0.25rem 0.75rem; } .markdown td:last-child { - border-right-width: 1px + border-right-width: 1px; } .markdown tbody tr:last-child td:first-child { - border-bottom-left-radius: .375rem + border-bottom-left-radius: 0.375rem; } .markdown tbody tr:last-child td:last-child { - border-bottom-right-radius: .375rem + border-bottom-right-radius: 0.375rem; } .markdown a { text-decoration-line: underline; - text-underline-offset: 2px + text-underline-offset: 2px; } .animate-flash { - -webkit-animation: flash 2s steps(60,start); - animation: flash 2s steps(60,start) + -webkit-animation: flash 2s steps(60, start); + animation: flash 2s steps(60, start); } @-webkit-keyframes flash { 0% { - background-color: hsla(0,0%,100%,.4) + background-color: hsla(0, 0%, 100%, 0.4); } } @keyframes flash { 0% { - background-color: hsla(0,0%,100%,.4) + background-color: hsla(0, 0%, 100%, 0.4); } } .truncate { overflow: hidden; - white-space: nowrap + white-space: nowrap; } -.text-ellipsis,.truncate { - text-overflow: ellipsis +.text-ellipsis, +.truncate { + text-overflow: ellipsis; } .shadow-\[0_0_10px_rgba\(0\2c 0\2c 0\2c 0\.10\)\], .shadow-lg { - box-shadow:0 0 transparent,0 0 transparent,var(--tw-shadow); - box-shadow:var(--tw-ring-offset-shadow,0 0 transparent),var(--tw-ring-shadow,0 0 transparent),var(--tw-shadow) + box-shadow: 0 0 transparent, 0 0 transparent, var(--tw-shadow); + box-shadow: var(--tw-ring-offset-shadow, 0 0 transparent), + var(--tw-ring-shadow, 0 0 transparent), var(--tw-shadow); } .group:hover .group-hover\:visible { - visibility:visible - } - .group:hover .group-hover\:from-\[\#2A2B32\] { - --tw-gradient-from:#2a2b32; - --tw-gradient-to:rgba(42,43,50,0); - --tw-gradient-stops:var(--tw-gradient-from),var(--tw-gradient-to) - } - .group:hover .group-hover\:text-gray-500 { - --tw-text-opacity:1; - color:rgba(142,142,160,var(--tw-text-opacity)) - } - .group:hover .group-hover\:text-gray-700 { - --tw-text-opacity:1; - color:rgba(64,65,79,var(--tw-text-opacity)) - } - .dark .dark\:prose-invert { - --tw-prose-body:var(--tw-prose-invert-body); - --tw-prose-headings:var(--tw-prose-invert-headings); - --tw-prose-lead:var(--tw-prose-invert-lead); - --tw-prose-links:var(--tw-prose-invert-links); - --tw-prose-bold:var(--tw-prose-invert-bold); - --tw-prose-counters:var(--tw-prose-invert-counters); - --tw-prose-bullets:var(--tw-prose-invert-bullets); - --tw-prose-hr:var(--tw-prose-invert-hr); - --tw-prose-quotes:var(--tw-prose-invert-quotes); - --tw-prose-quote-borders:var(--tw-prose-invert-quote-borders); - --tw-prose-captions:var(--tw-prose-invert-captions); - --tw-prose-code:var(--tw-prose-invert-code); - --tw-prose-pre-code:var(--tw-prose-invert-pre-code); - --tw-prose-pre-bg:var(--tw-prose-invert-pre-bg); - --tw-prose-th-borders:var(--tw-prose-invert-th-borders); - --tw-prose-td-borders:var(--tw-prose-invert-td-borders) - } - .dark .dark\:border-gray-600 { - --tw-border-opacity:1; - border-color:rgba(86,88,105,var(--tw-border-opacity)) - } - .dark .dark\:border-gray-900\/50 { - border-color:rgba(32,33,35,.5) - } - .dark .dark\:border-gray-700 { - --tw-border-opacity:1; - border-color:rgba(64,65,79,var(--tw-border-opacity)) - } - .dark .dark\:border-white\/20 { - border-color:hsla(0,0%,100%,.2) - } - .dark .dark\:border-white\/10 { - border-color:hsla(0,0%,100%,.1) - } - .dark .dark\:border-black\/20 { - border-color:rgba(0,0,0,.2) - } - .dark .dark\:bg-gray-800 { - --tw-bg-opacity:1; - background-color:rgba(52,53,65,var(--tw-bg-opacity)) - } - .dark .dark\:bg-\[\#444654\] { - --tw-bg-opacity:1; - background-color:rgba(68,70,84,var(--tw-bg-opacity)) - } - .dark .dark\:bg-gray-700 { - --tw-bg-opacity:1; - background-color:rgba(64,65,79,var(--tw-bg-opacity)) - } - .dark .dark\:bg-gray-800\/90 { - background-color:rgba(52,53,65,.9) - } - .dark .dark\:bg-gray-900 { - --tw-bg-opacity:1; - background-color:rgba(32,33,35,var(--tw-bg-opacity)) - } - .dark .dark\:bg-transparent { - background-color:transparent - } - .dark .dark\:bg-white\/10 { - background-color:hsla(0,0%,100%,.1) - } - .dark .dark\:bg-white\/5 { - background-color:hsla(0,0%,100%,.05) - } - .dark .dark\:bg-gray-500 { - --tw-bg-opacity:1; - background-color:rgba(142,142,160,var(--tw-bg-opacity)) - } - .dark .dark\:bg-green-700 { - --tw-bg-opacity:1; - background-color:rgba(26,127,100,var(--tw-bg-opacity)) - } - .dark .dark\:text-gray-100 { - --tw-text-opacity:1; - color:rgba(236,236,241,var(--tw-text-opacity)) - } - .dark .dark\:text-gray-200 { - --tw-text-opacity:1; - color:rgba(217,217,227,var(--tw-text-opacity)) - } - .dark .dark\:text-gray-400 { - --tw-text-opacity:1; - color:rgba(172,172,190,var(--tw-text-opacity)) - } - .dark .dark\:text-white { - --tw-text-opacity:1; - color:rgba(255,255,255,var(--tw-text-opacity)) - } - .dark .dark\:text-white\/50 { - color:hsla(0,0%,100%,.5) - } - .dark .dark\:text-gray-600 { - --tw-text-opacity:1; - color:rgba(86,88,105,var(--tw-text-opacity)) - } - .dark .dark\:text-gray-500 { - --tw-text-opacity:1; - color:rgba(142,142,160,var(--tw-text-opacity)) - } - .dark .dark\:text-gray-300 { - --tw-text-opacity:1; - color:rgba(197,197,210,var(--tw-text-opacity)) - } - .dark .dark\:opacity-100 { - opacity:1 - } - .dark .dark\:shadow-\[0_0_15px_rgba\(0\2c 0\2c 0\2c 0\.10\)\] { - --tw-shadow:0 0 15px rgba(0,0,0,.1); - --tw-shadow-colored:0 0 15px var(--tw-shadow-color); - box-shadow:0 0 transparent,0 0 transparent,var(--tw-shadow); - box-shadow:var(--tw-ring-offset-shadow,0 0 transparent),var(--tw-ring-shadow,0 0 transparent),var(--tw-shadow) - } - .dark .dark\:ring-gray-600 { - --tw-ring-opacity:1; - --tw-ring-color:rgba(86,88,105,var(--tw-ring-opacity)) - } - .dark .dark\:ring-white\/20 { - --tw-ring-color:hsla(0,0%,100%,.2) - } - .dark .dark\:last\:border-0:last-child { - border-width:0 - } - .dark .dark\:hover\:bg-black\/10:hover { - background-color:rgba(0,0,0,.1) - } - .dark .dark\:hover\:bg-gray-700:hover { - --tw-bg-opacity:1; - background-color:rgba(64,65,79,var(--tw-bg-opacity)) - } - .dark .dark\:hover\:bg-gray-900:hover { - --tw-bg-opacity:1; - background-color:rgba(32,33,35,var(--tw-bg-opacity)) - } - .dark .dark\:hover\:bg-gray-100:hover { - --tw-bg-opacity:1; - background-color:rgba(236,236,241,var(--tw-bg-opacity)) - } - .dark .dark\:hover\:bg-gray-500\/10:hover { - background-color:hsla(240,9%,59%,.1) - } - .dark .dark\:hover\:text-gray-200:hover { - --tw-text-opacity:1; - color:rgba(217,217,227,var(--tw-text-opacity)) - } - .dark .dark\:hover\:text-white:hover { - --tw-text-opacity:1; - color:rgba(255,255,255,var(--tw-text-opacity)) - } - .dark .dark\:hover\:text-gray-400:hover { - --tw-text-opacity:1; - color:rgba(172,172,190,var(--tw-text-opacity)) - } - .dark .dark\:focus\:border-white:focus { - --tw-border-opacity:1; - border-color:rgba(255,255,255,var(--tw-border-opacity)) - } - .dark .dark\:focus\:ring-white:focus { - --tw-ring-opacity:1; - --tw-ring-color:rgba(255,255,255,var(--tw-ring-opacity)) - } - .dark .dark\:disabled\:text-gray-400:disabled { - --tw-text-opacity:1; - color:rgba(172,172,190,var(--tw-text-opacity)) - } - .dark .dark\:disabled\:hover\:bg-transparent:hover:disabled { - background-color:transparent - } - .dark .disabled\:dark\:hover\:text-gray-400:hover:disabled { - --tw-text-opacity:1; - color:rgba(172,172,190,var(--tw-text-opacity)) - } + visibility: visible; +} +.group:hover .group-hover\:from-\[\#2A2B32\] { + --tw-gradient-from: #2a2b32; + --tw-gradient-to: rgba(42, 43, 50, 0); + --tw-gradient-stops: var(--tw-gradient-from), var(--tw-gradient-to); +} +.group:hover .group-hover\:text-gray-500 { + --tw-text-opacity: 1; + color: rgba(142, 142, 160, var(--tw-text-opacity)); +} +.group:hover .group-hover\:text-gray-700 { + --tw-text-opacity: 1; + color: rgba(64, 65, 79, var(--tw-text-opacity)); +} +.dark .dark\:prose-invert { + --tw-prose-body: var(--tw-prose-invert-body); + --tw-prose-headings: var(--tw-prose-invert-headings); + --tw-prose-lead: var(--tw-prose-invert-lead); + --tw-prose-links: var(--tw-prose-invert-links); + --tw-prose-bold: var(--tw-prose-invert-bold); + --tw-prose-counters: var(--tw-prose-invert-counters); + --tw-prose-bullets: var(--tw-prose-invert-bullets); + --tw-prose-hr: var(--tw-prose-invert-hr); + --tw-prose-quotes: var(--tw-prose-invert-quotes); + --tw-prose-quote-borders: var(--tw-prose-invert-quote-borders); + --tw-prose-captions: var(--tw-prose-invert-captions); + --tw-prose-code: var(--tw-prose-invert-code); + --tw-prose-pre-code: var(--tw-prose-invert-pre-code); + --tw-prose-pre-bg: var(--tw-prose-invert-pre-bg); + --tw-prose-th-borders: var(--tw-prose-invert-th-borders); + --tw-prose-td-borders: var(--tw-prose-invert-td-borders); +} +.dark .dark\:border-gray-600 { + --tw-border-opacity: 1; + border-color: rgba(86, 88, 105, var(--tw-border-opacity)); +} +.dark .dark\:border-gray-900\/50 { + border-color: rgba(32, 33, 35, 0.5); +} +.dark .dark\:border-gray-700 { + --tw-border-opacity: 1; + border-color: rgba(64, 65, 79, var(--tw-border-opacity)); +} +.dark .dark\:border-white\/20 { + border-color: hsla(0, 0%, 100%, 0.2); +} +.dark .dark\:border-white\/10 { + border-color: hsla(0, 0%, 100%, 0.1); +} +.dark .dark\:border-black\/20 { + border-color: rgba(0, 0, 0, 0.2); +} +.dark .dark\:bg-gray-800 { + --tw-bg-opacity: 1; + background-color: rgba(52, 53, 65, var(--tw-bg-opacity)); +} +.dark .dark\:bg-\[\#444654\] { + --tw-bg-opacity: 1; + background-color: rgba(68, 70, 84, var(--tw-bg-opacity)); +} +.dark .dark\:bg-gray-700 { + --tw-bg-opacity: 1; + background-color: rgba(64, 65, 79, var(--tw-bg-opacity)); +} +.dark .dark\:bg-gray-800\/90 { + background-color: rgba(52, 53, 65, 0.9); +} +.dark .dark\:bg-gray-900 { + --tw-bg-opacity: 1; + background-color: rgba(32, 33, 35, var(--tw-bg-opacity)); +} +.dark .dark\:bg-transparent { + background-color: transparent; +} +.dark .dark\:bg-white\/10 { + background-color: hsla(0, 0%, 100%, 0.1); +} +.dark .dark\:bg-white\/5 { + background-color: hsla(0, 0%, 100%, 0.05); +} +.dark .dark\:bg-gray-500 { + --tw-bg-opacity: 1; + background-color: rgba(142, 142, 160, var(--tw-bg-opacity)); +} +.dark .dark\:bg-green-700 { + --tw-bg-opacity: 1; + background-color: rgba(26, 127, 100, var(--tw-bg-opacity)); +} +.dark .dark\:text-gray-100 { + --tw-text-opacity: 1; + color: rgba(236, 236, 241, var(--tw-text-opacity)); +} +.dark .dark\:text-gray-200 { + --tw-text-opacity: 1; + color: rgba(217, 217, 227, var(--tw-text-opacity)); +} +.dark .dark\:text-gray-400 { + --tw-text-opacity: 1; + color: rgba(172, 172, 190, var(--tw-text-opacity)); +} +.dark .dark\:text-white { + --tw-text-opacity: 1; + color: rgba(255, 255, 255, var(--tw-text-opacity)); +} +.dark .dark\:text-white\/50 { + color: hsla(0, 0%, 100%, 0.5); +} +.dark .dark\:text-gray-600 { + --tw-text-opacity: 1; + color: rgba(86, 88, 105, var(--tw-text-opacity)); +} +.dark .dark\:text-gray-500 { + --tw-text-opacity: 1; + color: rgba(142, 142, 160, var(--tw-text-opacity)); +} +.dark .dark\:text-gray-300 { + --tw-text-opacity: 1; + color: rgba(197, 197, 210, var(--tw-text-opacity)); +} +.dark .dark\:opacity-100 { + opacity: 1; +} +.dark .dark\:shadow-\[0_0_15px_rgba\(0\2c 0\2c 0\2c 0\.10\)\] { + --tw-shadow: 0 0 15px rgba(0, 0, 0, 0.1); + --tw-shadow-colored: 0 0 15px var(--tw-shadow-color); + box-shadow: 0 0 transparent, 0 0 transparent, var(--tw-shadow); + box-shadow: var(--tw-ring-offset-shadow, 0 0 transparent), + var(--tw-ring-shadow, 0 0 transparent), var(--tw-shadow); +} +.dark .dark\:ring-gray-600 { + --tw-ring-opacity: 1; + --tw-ring-color: rgba(86, 88, 105, var(--tw-ring-opacity)); +} +.dark .dark\:ring-white\/20 { + --tw-ring-color: hsla(0, 0%, 100%, 0.2); +} +.dark .dark\:last\:border-0:last-child { + border-width: 0; +} +.dark .dark\:hover\:bg-black\/10:hover { + background-color: rgba(0, 0, 0, 0.1); +} +.dark .dark\:hover\:bg-gray-700:hover { + --tw-bg-opacity: 1; + background-color: rgba(64, 65, 79, var(--tw-bg-opacity)); +} +.dark .dark\:hover\:bg-gray-900:hover { + --tw-bg-opacity: 1; + background-color: rgba(32, 33, 35, var(--tw-bg-opacity)); +} +.dark .dark\:hover\:bg-gray-100:hover { + --tw-bg-opacity: 1; + background-color: rgba(236, 236, 241, var(--tw-bg-opacity)); +} +.dark .dark\:hover\:bg-gray-500\/10:hover { + background-color: hsla(240, 9%, 59%, 0.1); +} +.dark .dark\:hover\:text-gray-200:hover { + --tw-text-opacity: 1; + color: rgba(217, 217, 227, var(--tw-text-opacity)); +} +.dark .dark\:hover\:text-white:hover { + --tw-text-opacity: 1; + color: rgba(255, 255, 255, var(--tw-text-opacity)); +} +.dark .dark\:hover\:text-gray-400:hover { + --tw-text-opacity: 1; + color: rgba(172, 172, 190, var(--tw-text-opacity)); +} +.dark .dark\:focus\:border-white:focus { + --tw-border-opacity: 1; + border-color: rgba(255, 255, 255, var(--tw-border-opacity)); +} +.dark .dark\:focus\:ring-white:focus { + --tw-ring-opacity: 1; + --tw-ring-color: rgba(255, 255, 255, var(--tw-ring-opacity)); +} +.dark .dark\:disabled\:text-gray-400:disabled { + --tw-text-opacity: 1; + color: rgba(172, 172, 190, var(--tw-text-opacity)); +} +.dark .dark\:disabled\:hover\:bg-transparent:hover:disabled { + background-color: transparent; +} +.dark .disabled\:dark\:hover\:text-gray-400:hover:disabled { + --tw-text-opacity: 1; + color: rgba(172, 172, 190, var(--tw-text-opacity)); +} /* .result-streaming>:not(ol):not(ul):not(pre):last-child:after, .result-streaming>ol:last-child li:last-child:after, @@ -621,10 +637,27 @@ body,html { vertical-align:baseline } */ +@-webkit-keyframes spin { + to { + -webkit-transform: rotate(1turn); + transform: rotate(1turn); + } +} +@keyframes spin { + to { + -webkit-transform: rotate(1turn); + transform: rotate(1turn); + } +} +.animate-spin { + -webkit-animation: spin 1s linear infinite; + animation: spin 1s linear infinite; +} + .result-streaming { - -webkit-animation:blink 1s steps(5,start) infinite; - animation:blink 1s steps(5,start) infinite; + -webkit-animation: blink 1s steps(5, start) infinite; + animation: blink 1s steps(5, start) infinite; /* content:"▋"; */ - margin-left:.25rem; - vertical-align:baseline - } \ No newline at end of file + margin-left: 0.25rem; + vertical-align: baseline; +} diff --git a/src/utils/index.js b/src/utils/index.js index b41c2151fb..58cc697e85 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -1,6 +1,6 @@ -import { ClassValue, clsx } from "clsx" -import { twMerge } from "tailwind-merge" +import { ClassValue, clsx } from 'clsx'; +import { twMerge } from 'tailwind-merge'; export function cn(...inputs) { - return twMerge(clsx(inputs)) + return twMerge(clsx(inputs)); } \ No newline at end of file