Merge branch 'main' into setup-login

.github/workflows/lint.yml

@@ -18,7 +18,7 @@ jobs:
         run: npm install --legacy-peer-deps
 
       - name: Run linting check
-        run: npm run lint:fix
+        run: npm run lint:check
 
       - name: Check formatting
         run: npm run format:fix

src/components/3dcard.tsx

@@ -98,7 +98,6 @@ export const CardBody = ({
 };
 
 export const CardItem = ({
-  as: Tag = 'div',
   children,
   className,
   translateX = 0,
@@ -137,13 +136,13 @@ export const CardItem = ({
   };
 
   return (
-    <Tag
+    <div
       ref={ref}
       className={cn('w-fit transition duration-200 ease-linear', className)}
       {...rest}
     >
       {children}
-    </Tag>
+    </div>
   );
 };
 

src/components/Sidebar.tsx

@@ -115,7 +115,7 @@ export function Sidebar({
   }
 
   return (
-    <div className="overflow-scroll h-full w-[300px] min-w-[133px] overflow-y-auto bg-gray-50 dark:bg-gray-800 cursor-pointer sticky top-[64px] self-start w-84">
+    <div className="overflow-y-scroll h-screen w-[300px] min-w-[133px] bg-gray-50 dark:bg-gray-800 cursor-pointer sticky top-[64px] self-start w-84">
       <div className="flex">
         {/* <ToggleButton
             onClick={() => {

src/components/admin/ContentRendererClient.tsx

@@ -165,8 +165,6 @@ export const ContentRendererClient = ({
             )}
           </div>
         </div>
-        <br />
-        <br /> <br />
         {nextContent ? (
           <div className="flex flex-row-reverse">
             <button
@@ -184,8 +182,6 @@ export const ContentRendererClient = ({
             </button>{' '}
           </div>
         ) : null}
-        <br /> <br />
-        <br /> <br />
       </div>
 
       {showChapters && (

src/components/comment/CommentInputForm.tsx

@@ -43,7 +43,7 @@ const CommentInputForm = ({
       <textarea
         id="content"
         name="content"
-        className="min-h-[50px] rounded-md dark:bg-gray-800 p-2"
+        className="min-h-[50px] border border-slate-350 rounded-md dark:bg-gray-800 p-2"
         placeholder="Add a public comment..."
       />
       <FormErrors id="content" errors={fieldErrors} />

src/db/Cache.ts

@@ -17,6 +17,7 @@ export class Cache {
       }
     >();
   }
+
   static getInstance() {
     if (!this.instance) {
       this.instance = new Cache();
@@ -25,26 +26,27 @@ export class Cache {
     return this.instance;
   }
 
-  set(type: string, args: string[], value: any) {
+  set(type: string, args: string[], value: any, expirySeconds: number = parseInt(process.env.CACHE_EXPIRE_S || '100', 10)) {
     this.inMemoryDb.set(`${type} ${JSON.stringify(args)}`, {
       value,
-      expiry:
-        new Date().getTime() +
-        parseInt(process.env.CACHE_EXPIRE_S || '100', 10) * 1000,
+      expiry: new Date().getTime() + expirySeconds * 1000,
     });
   }
 
   get(type: string, args: string[]) {
-    const value = this.inMemoryDb.get(`${type} ${JSON.stringify(args)}`);
-    if (!value) {
+    const key = `${type} ${JSON.stringify(args)}`;
+    const entry = this.inMemoryDb.get(key);
+    if (!entry) {
       return null;
     }
-    if (new Date().getTime() > value.expiry) {
-      this.inMemoryDb.delete(`${type} ${JSON.stringify(args)}`);
+    if (new Date().getTime() > entry.expiry) {
+      this.inMemoryDb.delete(key);
       return null;
     }
-    return value.value;
+    return entry.value;
   }
 
-  evict() {}
+  evict() {
+
+  }
 }

src/utiles/jsx.d.ts

@@ -0,0 +1,12 @@
+import React from 'react';
+
+declare global {
+  namespace JSX {
+    interface IntrinsicElements {
+      [elemName: string]: React.DetailedHTMLProps<
+        React.HTMLAttributes<HTMLElement>,
+        HTMLElement
+      >;
+    }
+  }
+}