diff --git a/app/core/components/Comments.tsx b/app/core/components/Comments.tsx index 21fe5795..edd83696 100644 --- a/app/core/components/Comments.tsx +++ b/app/core/components/Comments.tsx @@ -11,7 +11,6 @@ import { import Edit from "@mui/icons-material/Edit"; import Delete from "@mui/icons-material/Delete"; import { z } from "zod"; - import type { getComments } from "~/models/comment.server"; import { zfd } from "zod-form-data"; import { withZod } from "@remix-validated-form/with-zod"; diff --git a/app/core/components/DisciplinesSelect/index.tsx b/app/core/components/DisciplinesSelect/index.tsx index 8619304f..af23f50f 100644 --- a/app/core/components/DisciplinesSelect/index.tsx +++ b/app/core/components/DisciplinesSelect/index.tsx @@ -1,5 +1,4 @@ import { useEffect } from "react"; - import { CircularProgress, TextField, diff --git a/app/core/components/DropDownButton/index.tsx b/app/core/components/DropDownButton/index.tsx index 21e1b3bc..66d64992 100644 --- a/app/core/components/DropDownButton/index.tsx +++ b/app/core/components/DropDownButton/index.tsx @@ -8,7 +8,6 @@ import { MenuList, } from "@mui/material"; import ExpandMoreIcon from "@mui/icons-material/ExpandMore"; - import { DropdownPlaceholderContainer } from "./DropDownButton.styles"; import Link from "../Link"; @@ -54,7 +53,6 @@ export const DropDownButton = ({ } } - // return focus to the button when we transitioned from !openActionsUser -> openActionsUser const prevOpen = useRef(openActionsUser); useEffect(() => { if (prevOpen.current === true && openActionsUser === false) { diff --git a/app/core/components/JoinProjectModal/index.tsx b/app/core/components/JoinProjectModal/index.tsx index 5ce75674..ebb42f72 100644 --- a/app/core/components/JoinProjectModal/index.tsx +++ b/app/core/components/JoinProjectModal/index.tsx @@ -3,7 +3,6 @@ import DisciplinesSelect from "app/core/components/DisciplinesSelect"; import SkillsSelect from "app/core/components/SkillsSelect"; import ModalBox from "app/core/components/ModalBox"; import Button from "@mui/material/Button"; - import { Grid, FormDivContainer, diff --git a/app/core/components/JoinProjectModal/joinProjectModal.styles.tsx b/app/core/components/JoinProjectModal/joinProjectModal.styles.tsx index 13b17023..54ddff65 100644 --- a/app/core/components/JoinProjectModal/joinProjectModal.styles.tsx +++ b/app/core/components/JoinProjectModal/joinProjectModal.styles.tsx @@ -14,6 +14,7 @@ export const Grid = styled.div` overflow: scroll; } `; + export const FormDivContainer = styled.div` h1 { margin: 0.5rem 0 1rem 0; diff --git a/app/core/components/LabeledTextField/index.tsx b/app/core/components/LabeledTextField/index.tsx index c7a30407..dc5a99fb 100644 --- a/app/core/components/LabeledTextField/index.tsx +++ b/app/core/components/LabeledTextField/index.tsx @@ -5,7 +5,6 @@ import { useControlField, useField } from "remix-validated-form"; interface LabeledTextFieldProps { name: string; label: string; - /** Field type. Doesn't include radio buttons and checkboxes */ type?: "text" | "password" | "email" | "number"; helperText?: string; placeholder?: string; diff --git a/app/core/components/LabeledTextFieldArea/index.tsx b/app/core/components/LabeledTextFieldArea/index.tsx index 54d1998e..623678ec 100644 --- a/app/core/components/LabeledTextFieldArea/index.tsx +++ b/app/core/components/LabeledTextFieldArea/index.tsx @@ -5,7 +5,6 @@ import { useField } from "remix-validated-form"; interface LabeledTextFieldAreaProps { name: string; label: string; - /** Field type. Doesn't include radio buttons and checkboxes */ type?: "text" | "password" | "email" | "number"; helperText?: string; placeholder?: string; diff --git a/app/core/components/LabelsSelect/index.tsx b/app/core/components/LabelsSelect/index.tsx index 720d294b..6bd205e8 100644 --- a/app/core/components/LabelsSelect/index.tsx +++ b/app/core/components/LabelsSelect/index.tsx @@ -1,5 +1,4 @@ import { Fragment, useEffect } from "react"; - import { CircularProgress, TextField, diff --git a/app/core/components/MembershipStatusModal.tsx b/app/core/components/MembershipStatusModal.tsx index 71c1c5f3..4cdbcb64 100644 --- a/app/core/components/MembershipStatusModal.tsx +++ b/app/core/components/MembershipStatusModal.tsx @@ -1,11 +1,9 @@ import { useState } from "react"; - import FormControl from "@mui/material/FormControl"; import InputLabel from "@mui/material/InputLabel"; import MenuItem from "@mui/material/MenuItem"; import Select from "@mui/material/Select"; import type { SelectChangeEvent } from "@mui/material/Select"; - import type { ProjectComplete } from "~/models/project.server"; import type { ProjectMembers } from "@prisma/client"; import { withZod } from "@remix-validated-form/with-zod"; diff --git a/app/core/components/MultiUrl/index.tsx b/app/core/components/MultiUrl/index.tsx index e68afaa6..d228bcf9 100644 --- a/app/core/components/MultiUrl/index.tsx +++ b/app/core/components/MultiUrl/index.tsx @@ -1,4 +1,4 @@ -import React, { useState } from "react"; +import { useState } from "react"; import { Chip, Grid, TextField } from "@mui/material"; import styled from "@emotion/styled"; import { useField, FieldArray, useFormContext } from "remix-validated-form"; diff --git a/app/core/components/ProposalCard/index.tsx b/app/core/components/ProposalCard/index.tsx index 1c79b9e4..bdd1b5d7 100644 --- a/app/core/components/ProposalCard/index.tsx +++ b/app/core/components/ProposalCard/index.tsx @@ -10,7 +10,6 @@ import EllipsisText from "app/core/components/EllipsisText"; import ThumbUpIcon from "@mui/icons-material/ThumbUp"; import PersonIcon from "@mui/icons-material/Person"; import HelpIcon from "@mui/icons-material/Help"; - import { ProposalCardWrap } from "./ProposalCard.styles"; interface IProps { diff --git a/app/core/components/RelatedProjectsSelect/index.tsx b/app/core/components/RelatedProjectsSelect/index.tsx index e3a751fa..f6a27462 100644 --- a/app/core/components/RelatedProjectsSelect/index.tsx +++ b/app/core/components/RelatedProjectsSelect/index.tsx @@ -1,5 +1,4 @@ import type { PropsWithoutRef } from "react"; - import { TextField, Autocomplete } from "@mui/material"; import { useField, useControlField } from "remix-validated-form"; @@ -17,8 +16,6 @@ interface RelatedProjectsSelectProps { } export const RelatedProjectsSelect = ({ - customOnChange, - defaultValue = [], fullWidth, name, label, @@ -26,7 +23,6 @@ export const RelatedProjectsSelect = ({ outerProps, size, style, - thisProject, }: RelatedProjectsSelectProps) => { const { error, getInputProps } = useField(name); const [values, setValue] = useControlField(name); diff --git a/app/core/components/Search/index.tsx b/app/core/components/Search/index.tsx index 9f212741..dc2c4124 100644 --- a/app/core/components/Search/index.tsx +++ b/app/core/components/Search/index.tsx @@ -12,7 +12,6 @@ export const Search = () => { : ""; const [searchValue, setSearchValue] = useState(searchQuery); const projectsSearch = "/projects"; - const handleEnterKeyPress = (e: React.KeyboardEvent) => { if (e.key === "Enter") { navigate(`${projectsSearch}?q=${searchValue}`); diff --git a/app/core/components/SkillsSelect/index.tsx b/app/core/components/SkillsSelect/index.tsx index 80493aed..fbd303c3 100644 --- a/app/core/components/SkillsSelect/index.tsx +++ b/app/core/components/SkillsSelect/index.tsx @@ -1,5 +1,4 @@ import { useEffect } from "react"; - import { CircularProgress, TextField, diff --git a/app/core/components/SortInput/index.tsx b/app/core/components/SortInput/index.tsx index a4161f0d..13e868c2 100644 --- a/app/core/components/SortInput/index.tsx +++ b/app/core/components/SortInput/index.tsx @@ -12,7 +12,6 @@ interface SortOption { } export const SortInput = ({ setSortQuery, sortBy }: iProps) => { - //sorting options const sortOptions: { [key: string]: SortOption } = { hotness: { label: "Hotness", diff --git a/app/core/layouts/Header.tsx b/app/core/layouts/Header.tsx index 5718a8cf..1f9b232d 100644 --- a/app/core/layouts/Header.tsx +++ b/app/core/layouts/Header.tsx @@ -29,7 +29,6 @@ const StyledHeaderButton = styled(Button)(({ theme }) => ({ const Header = ({ title }: IProps) => { const currentUser = useUser(); const submit = useSubmit(); - const options: MenuItemArgs[] = [ { onClick: async () => { diff --git a/app/models/note.server.ts b/app/models/note.server.ts index ba56b532..50d87d2f 100644 --- a/app/models/note.server.ts +++ b/app/models/note.server.ts @@ -1,5 +1,4 @@ import type { User, Note } from "@prisma/client"; - import { prisma } from "~/db.server"; export type { Note } from "@prisma/client"; diff --git a/app/models/profile.server.ts b/app/models/profile.server.ts index 3afba0ee..9b072810 100644 --- a/app/models/profile.server.ts +++ b/app/models/profile.server.ts @@ -1,6 +1,5 @@ import type { User, Profiles, PrismaClient } from "@prisma/client"; import { Prisma } from "@prisma/client"; - import { prisma } from "../db.server"; interface UserProfile extends Profiles { diff --git a/app/models/project.server.ts b/app/models/project.server.ts index d3da5307..b4d4e48a 100644 --- a/app/models/project.server.ts +++ b/app/models/project.server.ts @@ -1,7 +1,6 @@ import type { Profiles, Projects } from "@prisma/client"; import { Prisma } from "@prisma/client"; import { defaultStatus } from "~/constants"; - import { joinCondition, prisma as db } from "~/db.server"; interface SearchProjectsInput { @@ -754,4 +753,4 @@ export async function updateProjectResources(projectId: string, resources: Array await db.resource.deleteMany({ where: { projectId } }); const data = resources.map(resource => ({ ...resource, projectId })) return db.resource.createMany({ data }) -} \ No newline at end of file +} diff --git a/app/models/user.server.ts b/app/models/user.server.ts index a2caf200..4baa28a2 100644 --- a/app/models/user.server.ts +++ b/app/models/user.server.ts @@ -1,5 +1,4 @@ import type { User } from "@prisma/client"; - import { prisma } from "~/db.server"; export type { User } from "@prisma/client"; diff --git a/app/root.tsx b/app/root.tsx index 4660f384..04b86473 100644 --- a/app/root.tsx +++ b/app/root.tsx @@ -11,9 +11,7 @@ import { Scripts, ScrollRestoration, } from "@remix-run/react"; - import StylesheetUrl from "./styles/style.css"; - import { getUser } from "./session.server"; import { CssBaseline, useMediaQuery } from "@mui/material"; import { createTheme } from "./theme"; @@ -53,7 +51,6 @@ export default function App() { [prefersDarkMode] ); - // TODO: https://mui.com/material-ui/customization/dark-mode/#dark-mode-by-default return ( diff --git a/app/routes/auth/auth0/callback.tsx b/app/routes/auth/auth0/callback.tsx index a15b5470..d4ea414c 100644 --- a/app/routes/auth/auth0/callback.tsx +++ b/app/routes/auth/auth0/callback.tsx @@ -1,6 +1,5 @@ import type { LoaderFunction } from "@remix-run/node"; import { createUserSession } from "~/session.server"; - import { authenticator } from "~/auth.server"; export let loader: LoaderFunction = async ({ request }) => { diff --git a/app/routes/healthcheck.tsx b/app/routes/healthcheck.tsx index 657c5c4c..362dbace 100644 --- a/app/routes/healthcheck.tsx +++ b/app/routes/healthcheck.tsx @@ -1,6 +1,5 @@ // learn more: https://fly.io/docs/reference/configuration/#services-http_checks import type { LoaderFunction } from "@remix-run/node"; - import { prisma } from "~/db.server"; export const loader: LoaderFunction = async ({ request }) => { diff --git a/app/routes/index.tsx b/app/routes/index.tsx index 1aa6d846..afd48aba 100644 --- a/app/routes/index.tsx +++ b/app/routes/index.tsx @@ -6,7 +6,6 @@ import { Footer, LoginPageContainer, } from "./login.styles"; - import { useOptionalUser } from "~/utils"; import { Grid } from "@mui/material"; diff --git a/app/routes/login.tsx b/app/routes/login.tsx index 157a53f4..1fa683c7 100644 --- a/app/routes/login.tsx +++ b/app/routes/login.tsx @@ -9,7 +9,6 @@ import { Footer, LoginPageContainer, } from "./login.styles"; - import { getUserId } from "~/session.server"; export const loader: LoaderFunction = async ({ request }) => { diff --git a/app/routes/logout.tsx b/app/routes/logout.tsx index 04ceac2b..a68e4e37 100644 --- a/app/routes/logout.tsx +++ b/app/routes/logout.tsx @@ -1,6 +1,5 @@ import type { ActionFunction, LoaderFunction } from "@remix-run/node"; import { redirect } from "@remix-run/node"; - import { logout } from "~/session.server"; export const action: ActionFunction = async ({ request }) => { diff --git a/app/routes/manager.tsx b/app/routes/manager.tsx index 9bc78568..6256536a 100644 --- a/app/routes/manager.tsx +++ b/app/routes/manager.tsx @@ -9,7 +9,6 @@ import { NavBarTabsStyles, LinkStyles, } from "./manager/manager.styles"; - import { adminRoleName } from "app/constants"; import { requireUser } from "~/session.server"; import { Container, Paper } from "@mui/material"; diff --git a/app/routes/manager/admins.tsx b/app/routes/manager/admins.tsx index 1e06390d..fa3ebbee 100644 --- a/app/routes/manager/admins.tsx +++ b/app/routes/manager/admins.tsx @@ -14,7 +14,6 @@ import DeleteIcon from "@mui/icons-material/DeleteOutlined"; import SaveIcon from "@mui/icons-material/Save"; import CancelIcon from "@mui/icons-material/Close"; import invariant from "tiny-invariant"; - import ConfirmationModal from "../../core/components/ConfirmationModal"; import { getAdminUsers, diff --git a/app/routes/manager/filter-tags.tsx b/app/routes/manager/filter-tags.tsx index 60f86838..64b327ff 100644 --- a/app/routes/manager/filter-tags.tsx +++ b/app/routes/manager/filter-tags.tsx @@ -3,7 +3,6 @@ import type { MetaFunction, LoaderFunction } from "@remix-run/node" import { useLoaderData, Outlet } from "@remix-run/react" import { redirect } from "@remix-run/node" import { json } from "@remix-run/node" - import { LinkTabStyles, EditPanelsStyles, BoxStyles } from "./manager.styles" export const loader: LoaderFunction = async ({ request }) => { diff --git a/app/routes/manager/filter-tags/labels.tsx b/app/routes/manager/filter-tags/labels.tsx index e787132b..425c100d 100644 --- a/app/routes/manager/filter-tags/labels.tsx +++ b/app/routes/manager/filter-tags/labels.tsx @@ -11,7 +11,6 @@ import DeleteIcon from "@mui/icons-material/DeleteOutlined"; import SaveIcon from "@mui/icons-material/Save"; import CancelIcon from "@mui/icons-material/Close"; import invariant from "tiny-invariant"; - import ConfirmationModal from "../../../core/components/ConfirmationModal"; import { getLabels, diff --git a/app/routes/notes.tsx b/app/routes/notes.tsx index 0860147a..01167846 100644 --- a/app/routes/notes.tsx +++ b/app/routes/notes.tsx @@ -1,7 +1,6 @@ import type { LoaderFunction } from "@remix-run/node"; import { json } from "@remix-run/node"; import { Form, Link, NavLink, Outlet, useLoaderData } from "@remix-run/react"; - import { requireUserId } from "~/session.server"; import { useUser } from "~/utils"; import { getNoteListItems } from "~/models/note.server"; diff --git a/app/routes/notes/$noteId.tsx b/app/routes/notes/$noteId.tsx index 4af4f2db..f9af1654 100644 --- a/app/routes/notes/$noteId.tsx +++ b/app/routes/notes/$noteId.tsx @@ -3,7 +3,6 @@ import { redirect } from "@remix-run/node"; import { Form, useCatch } from "@remix-run/react"; import { typedjson, useTypedLoaderData } from "remix-typedjson"; import invariant from "tiny-invariant"; - import { deleteNote } from "~/models/note.server"; import { getNote } from "~/models/note.server"; import { requireUserId } from "~/session.server"; diff --git a/app/routes/notes/new.tsx b/app/routes/notes/new.tsx index 723b04f4..ab5afc94 100644 --- a/app/routes/notes/new.tsx +++ b/app/routes/notes/new.tsx @@ -2,7 +2,6 @@ import type { ActionFunction } from "@remix-run/node"; import { json, redirect } from "@remix-run/node"; import { Form, useActionData } from "@remix-run/react"; import * as React from "react"; - import { createNote } from "~/models/note.server"; import { requireUserId } from "~/session.server"; diff --git a/app/routes/projects/$projectId.members.tsx b/app/routes/projects/$projectId.members.tsx index d3db4e25..56dfd710 100644 --- a/app/routes/projects/$projectId.members.tsx +++ b/app/routes/projects/$projectId.members.tsx @@ -28,7 +28,6 @@ import { PrismaClientKnownRequestError, PrismaClientValidationError, } from "@prisma/client/runtime"; - import type { ActionFunction, LoaderFunction } from "@remix-run/node"; import type { SubmitOptions } from "@remix-run/react"; import { json, redirect } from "@remix-run/node"; diff --git a/app/routes/projects/$projectId/edit.tsx b/app/routes/projects/$projectId/edit.tsx index 2fa60517..59e946d4 100644 --- a/app/routes/projects/$projectId/edit.tsx +++ b/app/routes/projects/$projectId/edit.tsx @@ -11,7 +11,6 @@ import { updateProjects, } from "~/models/project.server"; import { adminRoleName } from "app/constants"; - import { Box, Button, @@ -35,7 +34,6 @@ import { TabStyles } from "../components/Styles/TabStyles.component"; import TabPanel from "~/core/components/TabPanel"; import { getProjectStatuses } from "~/models/status.server"; import { getInnovationTiers } from "~/models/innovationTier.server"; - import MDEditorStyles from "@uiw/react-md-editor/markdown-editor.css"; import MarkdownStyles from "@uiw/react-markdown-preview/markdown.css"; import { isProjectMemberOrOwner } from "~/utils"; @@ -57,13 +55,12 @@ export const loader = async ({ request, params }: LoaderArgs) => { const statuses = await getProjectStatuses(); const tiers = await getInnovationTiers(); - const user = await requireUser(request); const profile = await requireProfile(request); const isTeamMember = isProjectTeamMember(profile.id, project); - const isAdmin = user.role == adminRoleName; const profileId = profile.id; + return typedjson({ isAdmin, isTeamMember, @@ -79,7 +76,6 @@ export const loader = async ({ request, params }: LoaderArgs) => { export const action: ActionFunction = async ({ request, params }) => { invariant(params.projectId, "projectId could not be found"); const projectId = params.projectId; - // Validate permissions const user = await requireUser(request); const isAdmin = user.role == adminRoleName; @@ -92,7 +88,7 @@ export const action: ActionFunction = async ({ request, params }) => { } = currentProject; isProjectMemberOrOwner(profile.id, currentMembers, currentOwnerId); } - + const result = await validator.validate(await request.formData()); if (result.error) return validationError(result.error); const project = await updateProjects(projectId, result.data); @@ -183,7 +179,6 @@ export default function EditProjectPage() { skills: project.skills, labels: project.labels, projectBoard: project.projectBoard || "", - //projectMembers: project.projectMembers, }} method="post" > diff --git a/app/routes/projects/$projectId/index.tsx b/app/routes/projects/$projectId/index.tsx index bce7f3fc..83bf337c 100644 --- a/app/routes/projects/$projectId/index.tsx +++ b/app/routes/projects/$projectId/index.tsx @@ -15,7 +15,6 @@ import { getProjectResources, } from "~/models/project.server"; import { getDistinctResources } from "~/models/resource.server"; - import { Card, CardContent, @@ -49,7 +48,6 @@ import Header from "~/core/layouts/Header"; import MembershipStatusModal from "~/core/components/MembershipStatusModal"; import { getComments } from "~/models/comment.server"; import Comments from "~/core/components/Comments"; - import MDEditorStyles from "@uiw/react-md-editor/markdown-editor.css"; import MarkdownStyles from "@uiw/react-markdown-preview/markdown.css"; import Resources from "../components/resources"; @@ -81,11 +79,9 @@ export const loader = async ({ request, params }: LoaderArgs) => { const profile = await requireProfile(request); const isTeamMember = isProjectTeamMember(profile.id, project); const projectsList = await getProjects({}); - const membership = getProjectTeamMember(profile.id, project); const isAdmin = user.role == adminRoleName; const profileId = profile.id; - const comments = await getComments(params.projectId); // Resources data @@ -117,7 +113,6 @@ export const action: ActionFunction = async ({ request, params }) => { case "POST_VOTE": const profileId = form.get("profileId") as string; const isVote = await checkUserVote(projectId, profileId); - const haveIVoted = isVote > 0 ? true : false; if (!haveIVoted) { await upvoteProject(projectId, profileId); @@ -210,7 +205,7 @@ export default function ProjectDetailsPage() { ...values, subaction: "POST_VOTE", }; - await fetcher.submit(body, { method: "post" }); + fetcher.submit(body, { method: "post" }); } catch (error: any) { console.error(error); } diff --git a/app/routes/projects/$projectId/joinProject.ts b/app/routes/projects/$projectId/joinProject.ts index 0785161e..45952852 100644 --- a/app/routes/projects/$projectId/joinProject.ts +++ b/app/routes/projects/$projectId/joinProject.ts @@ -18,7 +18,6 @@ export const action: ActionFunction = async ({ request, params }) => { await joinProject(projectId, profile.id, result.data); return redirect(`/projects/${projectId}`); } catch (e) { - // console.log(e); return validationError({ fieldErrors: { formError: "Server failed", diff --git a/app/routes/projects/components/ProjectForm.tsx b/app/routes/projects/components/ProjectForm.tsx index ea9634ec..4c26de6d 100644 --- a/app/routes/projects/components/ProjectForm.tsx +++ b/app/routes/projects/components/ProjectForm.tsx @@ -17,7 +17,7 @@ import LabelsSelect from "~/core/components/LabelsSelect"; import ProjectOwnerField from "~/core/components/ProjectOwnerField"; import { useControlField } from "remix-validated-form"; import { Box } from "@mui/material"; -import { useFormContext, useIsSubmitting } from "remix-validated-form"; +import { useIsSubmitting } from "remix-validated-form"; import type { ProjectStatus } from "@prisma/client"; import type { getInnovationTiers } from "~/models/innovationTier.server"; @@ -35,12 +35,7 @@ export function ProjectForm({ ); const [helpWanted, setHelpWanted] = useControlField("helpWanted"); const isSubmitting = useIsSubmitting(); - const { isValid } = useFormContext(); const disabled = isSubmitting; - if (!isValid) { - // console.log(fieldErrors); - // console.log(getValues()); - } return ( @@ -59,7 +54,7 @@ export function ProjectForm({ placeholder={"Explain us your proposal..."} /> - @@ -79,7 +74,7 @@ export function ProjectForm({ /> )} - {projectformType !== "create" && ( //this still uses constant values instead of values taken from the db + {projectformType !== "create" && ( )} - {projectformType !== "create" && ( //this still uses constant values instead of values taken from the db + {projectformType !== "create" && ( - @@ -148,7 +143,7 @@ export function ProjectForm({ /> - diff --git a/app/routes/projects/create.tsx b/app/routes/projects/create.tsx index d0c42cff..ed5782a1 100644 --- a/app/routes/projects/create.tsx +++ b/app/routes/projects/create.tsx @@ -11,7 +11,6 @@ import { requireProfile } from "~/session.server"; import { createProject } from "~/models/project.server"; import { PrismaClientKnownRequestError } from "@prisma/client/runtime"; import { Container, Paper } from "@mui/material"; - import MDEditorStyles from "@uiw/react-md-editor/markdown-editor.css"; import MarkdownStyles from "@uiw/react-markdown-preview/markdown.css"; @@ -67,10 +66,8 @@ export const validator = withZod( ) .optional(), projectBoard: zfd.text(z.string().url().optional()), - // relatedProjectsA: zfd.repeatable(z.array(z.string()).optional()), }) .transform((val) => { - // val.relatedProjectsA = val.relatedProjectsA?.filter((el) => el != ""); return val; }) ); diff --git a/app/routes/projects/index.tsx b/app/routes/projects/index.tsx index 6e28b7d8..2c4f657b 100644 --- a/app/routes/projects/index.tsx +++ b/app/routes/projects/index.tsx @@ -95,7 +95,6 @@ export const loader: LoaderFunction = async ({ request }) => { skip: ITEMS_PER_PAGE * page, take: ITEMS_PER_PAGE, }); - // return json({ data, ongoingStatuses, ideaStatuses }); return new Response( JSON.stringify( { data, ongoingStatuses, ideaStatuses }, diff --git a/app/session.server.ts b/app/session.server.ts index e39a9461..a7616551 100644 --- a/app/session.server.ts +++ b/app/session.server.ts @@ -1,6 +1,5 @@ import { createCookieSessionStorage, redirect } from "@remix-run/node"; import invariant from "tiny-invariant"; - import type { User } from "~/models/user.server"; import { getUserById } from "~/models/user.server"; import { getProfileByUserId } from "~/models/profile.server"; @@ -11,8 +10,6 @@ export const sessionStorage = createCookieSessionStorage({ cookie: { name: "__session", httpOnly: true, - // maxAge: 1000 * 60 * 60 * 24 * 7, // 1 week - // maxAge: undefined, // default, expires with the browser session path: "/", sameSite: "lax", secrets: [process.env.SESSION_SECRET], diff --git a/app/utils.ts b/app/utils.ts index c1f27523..96530bfa 100644 --- a/app/utils.ts +++ b/app/utils.ts @@ -1,6 +1,5 @@ import { useMatches } from "@remix-run/react"; import { useMemo } from "react"; - import type { User } from "~/models/user.server"; const DEFAULT_REDIRECT = "/";