lint

Author: Veikkosuhonen

package.json

@@ -10,7 +10,8 @@
     "dev": "NODE_ENV=development concurrently \"nodemon --exec node --no-warnings --experimental-specifier-resolution=node --loader ts-node/esm src/server/index.ts\" \"vite\"",
     "tsc": "tsc",
     "lint": "eslint 'src/**/*.{ts,tsx}'",
-    "format": "prettier --write '*.{ts,json,css,md}'",
+    "lint:fix": "eslint 'src/**/*.{ts,tsx}' --fix",
+    "format": "prettier --write '**/*.{ts,json,css,md}'",
     "build": "vite build",
     "prepare": "husky install"
   },

src/client/components/Chat/index.tsx

@@ -452,12 +452,8 @@ const Chat = () => {
             maxWidth: '500px',
           }}
         >
-          <Typography>
-            {`File of type "${disallowedFileType}" not supported currently`}
-          </Typography>
-          <Typography>
-            {`Currenlty there is support for formats ".pdf" and plain text such as ".txt", ".csv", and ".md"`}
-          </Typography>
+          <Typography>{`File of type "${disallowedFileType}" not supported currently`}</Typography>
+          <Typography>{`Currenlty there is support for formats ".pdf" and plain text such as ".txt", ".csv", and ".md"`}</Typography>
         </Alert>
       )}
       <TokenUsageWarning

src/client/components/ChatV2/ChatV2.tsx

@@ -136,6 +136,21 @@ export const ChatV2 = () => {
     }
   }
 
+  const handleReset = () => {
+    setMessages([])
+    setMessage({ content: '' })
+    setCompletion('')
+    setStreamController(undefined)
+    setTokenUsageWarning('')
+    setTokenWarningVisible(false)
+    setRetryTimeout(() => {
+      if (streamController) {
+        streamController.abort()
+      }
+    }, 5000)
+    clearRetryTimeout()
+  }
+
   return (
     <Box
       sx={{
@@ -155,24 +170,7 @@ export const ChatV2 = () => {
           content={system.content}
           setContent={(content) => setSystem({ content })}
         />
-        <Button
-          onClick={() => {
-            setMessages([])
-            setMessage({ content: '' })
-            setCompletion('')
-            setStreamController(undefined)
-            setTokenUsageWarning('')
-            setTokenWarningVisible(false)
-            setRetryTimeout(() => {
-              if (streamController) {
-                streamController.abort()
-              }
-            }, 5000)
-            clearRetryTimeout()
-          }}
-        >
-          Reset
-        </Button>
+        <Button onClick={handleReset}>Reset</Button>
       </Box>
       <Conversation messages={messages} completion={completion} />
       <ChatBox

src/client/components/ChatV2/Conversation.tsx

@@ -2,6 +2,7 @@ import { Box, Paper } from '@mui/material'
 import { Message } from '../../types'
 import ReactMarkdown from 'react-markdown'
 import remarkGfm from 'remark-gfm'
+import { Assistant } from '@mui/icons-material'
 
 const MessageItem = ({ message }: { message: Message }) => (
   <Paper
@@ -20,19 +21,41 @@ const MessageItem = ({ message }: { message: Message }) => (
   </Paper>
 )
 
+const PöhinäLogo = () => (
+  <Box
+    sx={{
+      display: 'flex',
+      justifyContent: 'center',
+      alignItems: 'center',
+      height: '40rem',
+      transition: 'opacity 0.6s, transform 0.6s',
+      opacity: 1,
+      transform: 'scale(1)',
+      animation: 'fadeInScale 0.6s ease',
+      '@keyframes fadeInScale': {
+        from: { opacity: 0, transform: 'scale(0.8)' },
+        to: { opacity: 1, transform: 'scale(1)' },
+      },
+    }}
+  >
+    <Assistant sx={{ fontSize: 160, color: 'toskaPrimary.main' }} />
+  </Box>
+)
+
 export const Conversation = ({
   messages,
   completion,
 }: {
   messages: Message[]
   completion: string
 }) => (
-  <Box>
+  <Box sx={{ flex: 1, overflowY: 'auto' }}>
     {messages.map((message, idx) => (
       <MessageItem key={idx} message={message} />
     ))}
     {completion && (
       <MessageItem message={{ role: 'assistant', content: completion }} />
     )}
+    {messages.length === 0 && <PöhinäLogo />}
   </Box>
 )

src/client/components/Courses/Course/Discussion.tsx

@@ -64,7 +64,7 @@ const Message = ({ message }: { message: MessageType }) => {
 const Discussion = () => {
   const { i18n } = useTranslation()
   const { language } = i18n
-  // eslint-disable-next-line @typescript-eslint/naming-convention
+
   const { id, user_id } = useParams()
   const { user, isLoading: isUserLoading } = useCurrentUser()
   const { course, isLoading: courseLoading } = useCourse(id)

src/client/hooks/useRetryTimeout.ts

@@ -4,7 +4,6 @@ const useRetryTimeout = (): [
   (cb: () => Promise<void> | void, time: number) => void,
   () => void,
 ] => {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const [_, setDummyState] = useState(false) // Dummy state to force re-render
   const timeoutRef = useRef<NodeJS.Timeout | null>(null)
 

src/client/styles.css

@@ -5,17 +5,37 @@
 .loader {
   width: 45px;
   aspect-ratio: 2;
-  --_g: no-repeat radial-gradient(circle closest-side,#000 90%,#0000);
-  background: 
-    var(--_g) 0%   50%,
-    var(--_g) 50%  50%,
+  --_g: no-repeat radial-gradient(circle closest-side, #000 90%, #0000);
+  background:
+    var(--_g) 0% 50%,
+    var(--_g) 50% 50%,
     var(--_g) 100% 50%;
-  background-size: calc(100%/3) 50%;
+  background-size: calc(100% / 3) 50%;
   animation: l3 1s infinite linear;
 }
 @keyframes l3 {
-    20%{background-position:0%   0%, 50%  50%,100%  50%}
-    40%{background-position:0% 100%, 50%   0%,100%  50%}
-    60%{background-position:0%  50%, 50% 100%,100%   0%}
-    80%{background-position:0%  50%, 50%  50%,100% 100%}
-}
+  20% {
+    background-position:
+      0% 0%,
+      50% 50%,
+      100% 50%;
+  }
+  40% {
+    background-position:
+      0% 100%,
+      50% 0%,
+      100% 50%;
+  }
+  60% {
+    background-position:
+      0% 50%,
+      50% 100%,
+      100% 0%;
+  }
+  80% {
+    background-position:
+      0% 50%,
+      50% 50%,
+      100% 100%;
+  }
+}

src/server/routes/course.ts

@@ -11,7 +11,7 @@ import {
   Responsibility,
   Discussion,
 } from '../db/models'
-import { getOwnCourses } from '../chatInstances/access'
+import { getOwnCourses } from '../services/chatInstances/access'
 import { encrypt, decrypt } from '../util/util'
 
 const courseRouter = express.Router()
@@ -237,7 +237,6 @@ courseRouter.get('/:id/discussers', checkDiscussionAccess, async (req, res) => {
 
   res.send(
     discussionCounts.map((disc) => {
-      // eslint-disable-next-line @typescript-eslint/naming-convention
       const { user_id, discussion_count } = disc.dataValues
       return {
         user_id: encrypt(user_id).encryptedData,

src/server/routes/openai.ts

@@ -9,7 +9,7 @@ import {
   checkUsage,
   checkCourseUsage,
   incrementCourseUsage,
-} from '../chatInstances/usage'
+} from '../services/chatInstances/usage'
 import { getCompletionEvents, streamCompletion } from '../util/azure'
 import {
   getMessageContext,

src/server/routes/user.ts

@@ -6,9 +6,9 @@ import {
   getEnrolledCourseIds,
   getOwnCourses,
   getEnrolledCourses,
-} from '../chatInstances/access'
+} from '../services/chatInstances/access'
 import { User } from '../db/models'
-import { getUserStatus, getUsage } from '../chatInstances/usage'
+import { getUserStatus, getUsage } from '../services/chatInstances/usage'
 import { DEFAULT_TOKEN_LIMIT } from '../../config'
 import { getLastRestart } from '../util/lastRestart'
 import { accessIams } from '../util/config'