@@ -207,14 +122,7 @@ const NoteForm = ({ mode = 'create', file: existingFile }: NoteFormProps) => {
{
const file = e.target.files?.[0] ?? null;
@@ -273,40 +181,28 @@ const NoteForm = ({ mode = 'create', file: existingFile }: NoteFormProps) => {
)}
- {mode === 'create' ? (
-
- {(field) => (
- {
- form.setFieldValue('prefix', entry?.prefix ?? '');
- form.setFieldValue('number', entry?.number ?? '');
- form.setFieldValue(
- 'sectionCode',
- entry?.sectionCode ?? '',
- );
- form.setFieldValue('term', entry?.term ?? '');
- form.setFieldValue('year', entry?.year ?? 0);
- form.setFieldValue('profFirst', entry?.profFirst ?? '');
- form.setFieldValue('profLast', entry?.profLast ?? '');
- }}
- />
- )}
-
- ) : (
-
- {(field) => (
-
- )}
+
+ {(field) => (
+ {
+ form.setFieldValue('prefix', entry?.prefix ?? '');
+ form.setFieldValue('number', entry?.number ?? '');
+ form.setFieldValue(
+ 'sectionCode',
+ entry?.sectionCode ?? '',
+ );
+ form.setFieldValue('term', entry?.term ?? '');
+ form.setFieldValue('year', entry?.year ?? 0);
+ form.setFieldValue('profFirst', entry?.profFirst ?? '');
+ form.setFieldValue('profLast', entry?.profLast ?? '');
+ }}
+ />
+ )}
+
+
{(field) => (
-
);
diff --git a/src/components/form/FormFile.tsx b/src/components/form/FormFile.tsx
index 848aec4..6124d68 100644
--- a/src/components/form/FormFile.tsx
+++ b/src/components/form/FormFile.tsx
@@ -5,6 +5,7 @@ import CloudUploadIcon from '@mui/icons-material/CloudUpload';
import { FormHelperText, Skeleton } from '@mui/material';
import Image from 'next/image';
import { useEffect, useMemo } from 'react';
+import { addVersionToFile } from '@src/utils/fileCacheBust';
import useDebounce from '@src/utils/useDebounce';
interface FormFileProps {
@@ -13,6 +14,7 @@ interface FormFileProps {
existingFile?: {
name: string;
publicUrl: string;
+ updatedAt: Date;
};
onBlur: () => void;
onChange: (e: React.ChangeEvent) => void;
@@ -50,7 +52,15 @@ const FormFile = ({
}
if (existingFile) {
- return [{ file: existingFile.publicUrl, name: existingFile.name }];
+ return [
+ {
+ file: addVersionToFile(
+ existingFile.publicUrl,
+ existingFile.updatedAt.getTime(),
+ ),
+ name: existingFile.name,
+ },
+ ];
}
return [];
diff --git a/src/components/form/FormSectionAutocomplete.tsx b/src/components/form/FormSectionAutocomplete.tsx
index 7a726d4..46a5f07 100644
--- a/src/components/form/FormSectionAutocomplete.tsx
+++ b/src/components/form/FormSectionAutocomplete.tsx
@@ -109,12 +109,13 @@ export function FormSectionAutocomplete({
}
className="w-full"
slotProps={{
+ ...params.slotProps,
input: {
- ...params.InputProps,
+ ...params.slotProps.input,
endAdornment: (
<>
{isLoading ?
{!transparent && (
- <>
+
(null);
const open = Boolean(anchorEl);
@@ -47,22 +46,20 @@ export const ProfileDropDown = ({ shadow = false }: Props) => {
return (
<>
-
- {
- if (session !== null) {
- setAnchorEl(open ? null : e.currentTarget);
- } else {
- setShowRegisterModal(true);
- }
- }}
- component="button"
- className={`cursor-pointer ${shadow ? 'drop-shadow-[0_0_4px_rgb(0_0_0_/_0.4)]' : ''}`}
- />
-
- {session && (
+ {
+ if (session !== null) {
+ setAnchorEl(open ? null : e.currentTarget);
+ } else {
+ setShowRegisterModal(true);
+ }
+ }}
+ component="button"
+ className={`cursor-pointer ${shadow ? 'drop-shadow-[0_0_4px_rgb(0_0_0_/_0.4)]' : ''}`}
+ />
+ {!isPending && session && (
{
+ onHighlightChange={(_, option) => {
setHighlightedOption(option !== null);
}}
getOptionLabel={(option) => {
@@ -400,7 +400,9 @@ export default function SearchBar(props: Props) {
) => {
// Should never happen
if (typeof newValue === 'string') {
- setInputValue(newValue);
+ if (options[0]) {
+ updateValue(options[0]);
+ }
return;
}
if (newValue === null) {
@@ -417,54 +419,55 @@ export default function SearchBar(props: Props) {
setInputValue(newInputValue);
loadNewOptions(newInputValue);
}}
- renderInput={(params) => {
- params.inputProps.onKeyDown = handleKeyDown;
-
- return (
-
- setErrorTooltip(true)}
- onClose={() => setErrorTooltip(false)}
- disableFocusListener
- disableHoverListener
- disableTouchListener
+ renderInput={(params) => (
+
+ setErrorTooltip(true)}
+ onClose={() => setErrorTooltip(false)}
+ disableFocusListener
+ disableHoverListener
+ disableTouchListener
+ >
+ onSelect(value)}
+ className="relative"
>
- onSelect(value)}
- className="relative"
- >
-
-
-
- ),
- className:
- 'rounded-full bg-white dark:bg-neutral-700 ' +
- (props.input_className ?? ''),
- },
- }}
- placeholder="Search for courses or professors"
- autoFocus={props.autoFocus}
- />
- );
- }}
+
+
+ ),
+ className:
+ 'rounded-full bg-white dark:bg-neutral-700 ' +
+ (props.input_className ?? ''),
+ },
+ }}
+ placeholder="Search for courses or professors"
+ autoFocus={props.autoFocus}
+ />
+ )}
// For handling spaces, when options are already loaded
onInput={(event) => {
const rawValue = (event.target as HTMLInputElement).value;
diff --git a/src/components/nav/Slide.tsx b/src/components/nav/Slide.tsx
index 29bdc12..8504cd1 100644
--- a/src/components/nav/Slide.tsx
+++ b/src/components/nav/Slide.tsx
@@ -2,7 +2,7 @@
import CloseIcon from '@mui/icons-material/Close';
import MenuIcon from '@mui/icons-material/Menu';
-import { Drawer, IconButton, Tooltip } from '@mui/material';
+import { Drawer, IconButton } from '@mui/material';
import { useState } from 'react';
import type { ContentComponentColor } from '@src/components/header/BaseHeader';
import { type personalCats } from '@src/constants/categories';
@@ -21,27 +21,25 @@ const NewSidebar = ({
return (
<>
-
- setOpen(true)}
- className={`z-50 ${homepage ? ' drop-shadow-[0_0_4px_rgb(0_0_0_/_0.4)]' : ''}`}
- size="large"
- // title='Menu'
- >
-
-
+ setOpen(true)}
+ className={`z-50 ${homepage ? ' drop-shadow-[0_0_4px_rgb(0_0_0_/_0.4)]' : ''}`}
+ size="large"
+ // title='Menu'
+ >
+
setOpen(false)}
diff --git a/src/components/sections/FileCard.tsx b/src/components/sections/FileCard.tsx
index b7e991d..55ee5ca 100644
--- a/src/components/sections/FileCard.tsx
+++ b/src/components/sections/FileCard.tsx
@@ -10,6 +10,7 @@ import RatingWidget from '@src/components/sections/RatingWidget';
import SaveButton from '@src/components/sections/SaveButton';
import type { SelectFileWithAuthorPreview } from '@src/server/db/models';
import { authClient } from '@src/utils/auth-client';
+import { addVersionToFile } from '@src/utils/fileCacheBust';
import NoteDeleteButton from './NoteDeleteButton';
import NoteEditButton from './NoteEditButton';
import ReportButton from './ReportButton';
@@ -35,7 +36,10 @@ export default function FileCard({ file }: FileCardProps) {
const { data: session } = authClient.useSession();
const isAuthor = session?.user?.id === file.authorId;
- const thumbnailUrl = file.publicUrl;
+ const thumbnailUrl = addVersionToFile(
+ file.publicUrl,
+ file.updatedAt.getTime(),
+ );
const files = useMemo(
() => [{ file: thumbnailUrl, name: file.name }],
diff --git a/src/styles/globals.css b/src/styles/globals.css
index fc89e0a..0c54a40 100644
--- a/src/styles/globals.css
+++ b/src/styles/globals.css
@@ -54,6 +54,7 @@
margin: 0;
height: 100%;
width: 100%;
+ scroll-behavior: smooth;
}
* {
diff --git a/src/utils/fileCacheBust.ts b/src/utils/fileCacheBust.ts
new file mode 100644
index 0000000..cf6aded
--- /dev/null
+++ b/src/utils/fileCacheBust.ts
@@ -0,0 +1,6 @@
+export function addVersionToFile(src: string, version?: number) {
+ if (!version) return src;
+ const url = new URL(src);
+ url.searchParams.set('v', String(version));
+ return url.toString();
+}
diff --git a/tsconfig.json b/tsconfig.json
index 1e7c83c..5e75110 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -10,14 +10,15 @@
"noEmit": true,
"esModuleInterop": true,
"module": "esnext",
- "moduleResolution": "node",
+ "moduleResolution": "bundler",
+ "types": ["node"],
"resolveJsonModule": true,
"isolatedModules": true,
"jsx": "react-jsx",
"incremental": true,
"noUncheckedIndexedAccess": true,
- "baseUrl": ".",
"paths": {
+ "*": ["./*"],
"@src/*": ["./src/*"],
"@components/*": ["./src/components/*"],
"@pages/*": ["./src/pages/*"],
@@ -30,7 +31,6 @@
]
},
"include": [
- ".eslintrc.cjs",
"next-env.d.ts",
"**/*.ts",
"**/*.tsx",