diff --git a/app/auth/components/LoginForm.tsx b/app/auth/components/LoginForm.tsx index 22969b0..f6cdac0 100644 --- a/app/auth/components/LoginForm.tsx +++ b/app/auth/components/LoginForm.tsx @@ -4,7 +4,7 @@ import { Form, FORM_ERROR } from "app/core/components/Form" import login from "app/auth/mutations/login" import { Login } from "app/auth/validations" import { Flex, Heading, Button, useDisclosure, Box } from "@chakra-ui/react" -import ForgotPasswordPage from "app/auth/pages/forgot-password" +import ForgotPasswordPage from "app/auth/components/forgot-password" import { appLogger as log } from "app/lib/logger" type LoginFormProps = { diff --git a/app/components/changePasswordModal.tsx b/app/auth/components/changePasswordModal.tsx similarity index 100% rename from app/components/changePasswordModal.tsx rename to app/auth/components/changePasswordModal.tsx diff --git a/app/auth/pages/forgot-password.tsx b/app/auth/components/forgot-password.tsx similarity index 93% rename from app/auth/pages/forgot-password.tsx rename to app/auth/components/forgot-password.tsx index 3cf86b5..2e9b58b 100644 --- a/app/auth/pages/forgot-password.tsx +++ b/app/auth/components/forgot-password.tsx @@ -1,5 +1,4 @@ import { BlitzPage, useMutation } from "blitz" -import Layout from "app/core/layouts/Layout" import { LabeledTextField } from "app/core/components/LabeledTextField" import { Form, FORM_ERROR } from "app/core/components/Form" import { ForgotPassword } from "app/auth/validations" @@ -64,6 +63,5 @@ const ForgotPasswordPage: BlitzPage = () => { } ForgotPasswordPage.redirectAuthenticatedTo = "/" -ForgotPasswordPage.getLayout = (page) => {page} export default ForgotPasswordPage diff --git a/app/components/chats/adminMessage.tsx b/app/chats/components/adminMessage.tsx similarity index 100% rename from app/components/chats/adminMessage.tsx rename to app/chats/components/adminMessage.tsx diff --git a/app/components/chats/chatPreview.tsx b/app/chats/components/chatPreview.tsx similarity index 96% rename from app/components/chats/chatPreview.tsx rename to app/chats/components/chatPreview.tsx index df3d753..b53fbbc 100644 --- a/app/components/chats/chatPreview.tsx +++ b/app/chats/components/chatPreview.tsx @@ -1,6 +1,6 @@ import { Stack, HStack, Text, Circle } from "@chakra-ui/react" import { InfoIcon } from "@chakra-ui/icons" -import { Message } from "app/queries/getChatsWithLastMessage" +import { Message } from "app/chats/queries/getChatsWithLastMessage" import { Link as BlitzLink } from "blitz" interface ChatPreviewProps { diff --git a/app/components/chats/ownMessage.tsx b/app/chats/components/ownMessage.tsx similarity index 100% rename from app/components/chats/ownMessage.tsx rename to app/chats/components/ownMessage.tsx diff --git a/app/components/chats/strangeMessage.tsx b/app/chats/components/strangeMessage.tsx similarity index 100% rename from app/components/chats/strangeMessage.tsx rename to app/chats/components/strangeMessage.tsx diff --git a/app/mutations/createAdminMessage.tsx b/app/chats/mutations/createAdminMessage.tsx similarity index 100% rename from app/mutations/createAdminMessage.tsx rename to app/chats/mutations/createAdminMessage.tsx diff --git a/app/mutations/createChat.tsx b/app/chats/mutations/createChat.tsx similarity index 100% rename from app/mutations/createChat.tsx rename to app/chats/mutations/createChat.tsx diff --git a/app/mutations/markAdminAsRead.tsx b/app/chats/mutations/markAdminAsRead.tsx similarity index 100% rename from app/mutations/markAdminAsRead.tsx rename to app/chats/mutations/markAdminAsRead.tsx diff --git a/app/mutations/markMessagesAsRead.tsx b/app/chats/mutations/markMessagesAsRead.tsx similarity index 100% rename from app/mutations/markMessagesAsRead.tsx rename to app/chats/mutations/markMessagesAsRead.tsx diff --git a/app/mutations/sendMessage.tsx b/app/chats/mutations/sendMessage.tsx similarity index 100% rename from app/mutations/sendMessage.tsx rename to app/chats/mutations/sendMessage.tsx diff --git a/app/queries/checkIfUnreadMessages.tsx b/app/chats/queries/checkIfUnreadMessages.tsx similarity index 100% rename from app/queries/checkIfUnreadMessages.tsx rename to app/chats/queries/checkIfUnreadMessages.tsx diff --git a/app/queries/getChatByParticipants.tsx b/app/chats/queries/getChatByParticipants.tsx similarity index 100% rename from app/queries/getChatByParticipants.tsx rename to app/chats/queries/getChatByParticipants.tsx diff --git a/app/queries/getChatsWithLastMessage.tsx b/app/chats/queries/getChatsWithLastMessage.tsx similarity index 100% rename from app/queries/getChatsWithLastMessage.tsx rename to app/chats/queries/getChatsWithLastMessage.tsx diff --git a/app/queries/getMessagesByChat.tsx b/app/chats/queries/getMessagesByChat.tsx similarity index 100% rename from app/queries/getMessagesByChat.tsx rename to app/chats/queries/getMessagesByChat.tsx diff --git a/app/queries/getParticipantsByChatId.tsx b/app/chats/queries/getParticipantsByChatId.tsx similarity index 100% rename from app/queries/getParticipantsByChatId.tsx rename to app/chats/queries/getParticipantsByChatId.tsx diff --git a/app/components/loading.tsx b/app/core/components/loading.tsx similarity index 100% rename from app/components/loading.tsx rename to app/core/components/loading.tsx diff --git a/app/core/layouts/Layout.tsx b/app/core/layouts/Layout.tsx deleted file mode 100644 index 2497b2b..0000000 --- a/app/core/layouts/Layout.tsx +++ /dev/null @@ -1,22 +0,0 @@ -import { ReactNode } from "react" -import { Head } from "blitz" - -type LayoutProps = { - title?: string - children: ReactNode -} - -const Layout = ({ title, children }: LayoutProps) => { - return ( - <> - - {title || "testApp"} - - - - {children} - - ) -} - -export default Layout diff --git a/app/components/layout.module.css b/app/core/layouts/layout.module.css similarity index 100% rename from app/components/layout.module.css rename to app/core/layouts/layout.module.css diff --git a/app/components/layout.tsx b/app/core/layouts/layout.tsx similarity index 99% rename from app/components/layout.tsx rename to app/core/layouts/layout.tsx index d9cac37..dbb6f15 100644 --- a/app/components/layout.tsx +++ b/app/core/layouts/layout.tsx @@ -36,7 +36,7 @@ import { AuthenticationError, Head, useMutation, useQuery, useRouter, Image } fr import logout from "app/auth/mutations/logout" import { AiFillGithub } from "react-icons/ai" import { useMediaQuery } from "react-responsive" -import { ChangePassword } from "./changePasswordModal" +import { ChangePassword } from "../../auth/components/changePasswordModal" import { LoginForm } from "app/auth/components/LoginForm" import { SignupForm } from "app/auth/components/SignupForm" import { Link as BlitzLink } from "blitz" diff --git a/app/mutations/updatePoisition.tsx b/app/core/mutations/updatePoisition.tsx similarity index 100% rename from app/mutations/updatePoisition.tsx rename to app/core/mutations/updatePoisition.tsx diff --git a/app/queries/getPositionOfUser.tsx b/app/core/queries/getPositionOfUser.tsx similarity index 100% rename from app/queries/getPositionOfUser.tsx rename to app/core/queries/getPositionOfUser.tsx diff --git a/app/components/LandingPage/frontPage.tsx b/app/landingPage/components/frontPage.tsx similarity index 96% rename from app/components/LandingPage/frontPage.tsx rename to app/landingPage/components/frontPage.tsx index 5949b25..bc3bdbf 100644 --- a/app/components/LandingPage/frontPage.tsx +++ b/app/landingPage/components/frontPage.tsx @@ -32,9 +32,9 @@ import { ListItem, } from "@chakra-ui/react" import { useMediaQuery } from "react-responsive" -import OwnedList from "../LandingPage/frontPageOwnedList" -import PublicList from "../LandingPage/frontPagePublicList" -import Chat from "../LandingPage/frontPageChat" +import OwnedList from "./frontPageOwnedList" +import PublicList from "./frontPagePublicList" +import Chat from "./frontPageChat" import { Image } from "blitz" export default function FrontPage() { const isMobile = useMediaQuery({ query: `(max-width: 850px)` }) diff --git a/app/components/LandingPage/frontPageChat.tsx b/app/landingPage/components/frontPageChat.tsx similarity index 93% rename from app/components/LandingPage/frontPageChat.tsx rename to app/landingPage/components/frontPageChat.tsx index a9eff94..54563ee 100644 --- a/app/components/LandingPage/frontPageChat.tsx +++ b/app/landingPage/components/frontPageChat.tsx @@ -10,10 +10,10 @@ import { useToast, Box, } from "@chakra-ui/react" -import AdminMessage from "app/components/chats/adminMessage" -import OwnMessage from "app/components/chats/ownMessage" -import StrangeMessage from "app/components/chats/strangeMessage" -import Layout from "app/components/layout" +import AdminMessage from "app/chats/components/adminMessage" +import OwnMessage from "app/chats/components/ownMessage" +import StrangeMessage from "app/chats/components/strangeMessage" +import Layout from "app/core/layouts/layout" import { useQuery, useParam, useMutation } from "blitz" import { Form, Field } from "react-final-form" import { FORM_ERROR } from "final-form" diff --git a/app/components/LandingPage/frontPageOwnedList.tsx b/app/landingPage/components/frontPageOwnedList.tsx similarity index 89% rename from app/components/LandingPage/frontPageOwnedList.tsx rename to app/landingPage/components/frontPageOwnedList.tsx index 1e42f5b..f5fb686 100644 --- a/app/components/LandingPage/frontPageOwnedList.tsx +++ b/app/landingPage/components/frontPageOwnedList.tsx @@ -13,13 +13,12 @@ import { } from "@chakra-ui/react" import { EditIcon, ChatIcon, InfoIcon } from "@chakra-ui/icons" import { useMutation, useQuery, useRouter } from "blitz" -import renewList from "../../mutations/renewList" -import EditLists from "../editList" -import RemoveList from "../removeListModal" -import getChatByParticipants from "app/queries/getChatByParticipants" +import renewList from "../../lists/mutations/renewList" +import EditLists from "../../lists/components/editList" +import RemoveList from "../../lists/components/removeListModal" import { BsArchive } from "react-icons/bs" -import archiveList from "../../mutations/archiveList" -import BrandBadge from "../BrandBadge" +import archiveList from "../../lists/mutations/archiveList" +import BrandBadge from "../../lists/components/BrandBadge" interface OwnedListProps { marketName: String diff --git a/app/components/LandingPage/frontPagePublicList.tsx b/app/landingPage/components/frontPagePublicList.tsx similarity index 100% rename from app/components/LandingPage/frontPagePublicList.tsx rename to app/landingPage/components/frontPagePublicList.tsx diff --git a/app/lib/position.tsx b/app/lib/position.tsx index f3a642c..7e42a63 100644 --- a/app/lib/position.tsx +++ b/app/lib/position.tsx @@ -1,5 +1,5 @@ import { useToast } from "@chakra-ui/react" -import updatePosition from "app/mutations/updatePoisition" +import updatePosition from "app/core/mutations/updatePoisition" import { useMutation, useQuery } from "blitz" import { useEffect, useState } from "react" diff --git a/app/components/BrandBadge.tsx b/app/lists/components/BrandBadge.tsx similarity index 100% rename from app/components/BrandBadge.tsx rename to app/lists/components/BrandBadge.tsx diff --git a/app/components/acceptedList.tsx b/app/lists/components/acceptedList.tsx similarity index 97% rename from app/components/acceptedList.tsx rename to app/lists/components/acceptedList.tsx index df4e636..435371c 100644 --- a/app/components/acceptedList.tsx +++ b/app/lists/components/acceptedList.tsx @@ -18,8 +18,8 @@ import { ChatIcon, InfoIcon } from "@chakra-ui/icons" import { useMutation, useQuery, useRouter } from "blitz" import doneList from "../mutations/doneList" import renewList from "../mutations/renewList" -import createAdminMessage from "app/mutations/createAdminMessage" -import getChatByParticipants from "app/queries/getChatByParticipants" +import createAdminMessage from "app/chats/mutations/createAdminMessage" +import getChatByParticipants from "app/chats/queries/getChatByParticipants" import { BiShoppingBag, BiUserCircle, BiStore } from "react-icons/bi" import { Link as BlitzLink } from "blitz" import { getDistanceString, useCurrentPosition } from "app/lib/position" diff --git a/app/components/createLists.tsx b/app/lists/components/createLists.tsx similarity index 100% rename from app/components/createLists.tsx rename to app/lists/components/createLists.tsx diff --git a/app/components/editList.tsx b/app/lists/components/editList.tsx similarity index 100% rename from app/components/editList.tsx rename to app/lists/components/editList.tsx diff --git a/app/components/ownedList.tsx b/app/lists/components/ownedList.tsx similarity index 96% rename from app/components/ownedList.tsx rename to app/lists/components/ownedList.tsx index 5c3b07a..6bd1c5f 100644 --- a/app/components/ownedList.tsx +++ b/app/lists/components/ownedList.tsx @@ -14,9 +14,9 @@ import { import { EditIcon, ChatIcon, InfoIcon } from "@chakra-ui/icons" import { useMutation, useQuery, useRouter } from "blitz" import renewList from "../mutations/renewList" -import EditLists from "../components/editList" -import RemoveList from "../components/removeListModal" -import getChatByParticipants from "app/queries/getChatByParticipants" +import EditLists from "./editList" +import RemoveList from "./removeListModal" +import getChatByParticipants from "app/chats/queries/getChatByParticipants" import { BsArchive } from "react-icons/bs" import archiveList from "../mutations/archiveList" import BrandBadge from "./BrandBadge" diff --git a/app/components/publicList.tsx b/app/lists/components/publicList.tsx similarity index 95% rename from app/components/publicList.tsx rename to app/lists/components/publicList.tsx index 8bca66b..cf7a437 100644 --- a/app/components/publicList.tsx +++ b/app/lists/components/publicList.tsx @@ -19,9 +19,9 @@ import { useMutation, useQuery } from "blitz" import acceptList from "../mutations/acceptList" import { useState } from "react" import { BiShoppingBag, BiUserCircle, BiStore } from "react-icons/bi" -import createChat from "../mutations/createChat" -import createAdminMessage from "../mutations/createAdminMessage" -import getChatByParticipants from "../queries/getChatByParticipants" +import createChat from "../../chats/mutations/createChat" +import createAdminMessage from "../../chats/mutations/createAdminMessage" +import getChatByParticipants from "../../chats/queries/getChatByParticipants" import { getDistanceString } from "app/lib/position" import { appLogger as log } from "app/lib/logger" diff --git a/app/components/removeListModal.tsx b/app/lists/components/removeListModal.tsx similarity index 100% rename from app/components/removeListModal.tsx rename to app/lists/components/removeListModal.tsx diff --git a/app/mutations/acceptList.tsx b/app/lists/mutations/acceptList.tsx similarity index 100% rename from app/mutations/acceptList.tsx rename to app/lists/mutations/acceptList.tsx diff --git a/app/mutations/addItem.tsx b/app/lists/mutations/addItem.tsx similarity index 100% rename from app/mutations/addItem.tsx rename to app/lists/mutations/addItem.tsx diff --git a/app/mutations/archiveList.tsx b/app/lists/mutations/archiveList.tsx similarity index 100% rename from app/mutations/archiveList.tsx rename to app/lists/mutations/archiveList.tsx diff --git a/app/mutations/createList.tsx b/app/lists/mutations/createList.tsx similarity index 100% rename from app/mutations/createList.tsx rename to app/lists/mutations/createList.tsx diff --git a/app/mutations/doneList.tsx b/app/lists/mutations/doneList.tsx similarity index 100% rename from app/mutations/doneList.tsx rename to app/lists/mutations/doneList.tsx diff --git a/app/mutations/removeAllItems.tsx b/app/lists/mutations/removeAllItems.tsx similarity index 100% rename from app/mutations/removeAllItems.tsx rename to app/lists/mutations/removeAllItems.tsx diff --git a/app/mutations/removeShoppinglist.tsx b/app/lists/mutations/removeShoppinglist.tsx similarity index 100% rename from app/mutations/removeShoppinglist.tsx rename to app/lists/mutations/removeShoppinglist.tsx diff --git a/app/mutations/renewList.tsx b/app/lists/mutations/renewList.tsx similarity index 100% rename from app/mutations/renewList.tsx rename to app/lists/mutations/renewList.tsx diff --git a/app/mutations/updateStoreComment.tsx b/app/lists/mutations/updateStoreComment.tsx similarity index 100% rename from app/mutations/updateStoreComment.tsx rename to app/lists/mutations/updateStoreComment.tsx diff --git a/app/queries/getActiveLists.tsx b/app/lists/queries/getActiveLists.tsx similarity index 100% rename from app/queries/getActiveLists.tsx rename to app/lists/queries/getActiveLists.tsx diff --git a/app/queries/getArchivedLists.tsx b/app/lists/queries/getArchivedLists.tsx similarity index 100% rename from app/queries/getArchivedLists.tsx rename to app/lists/queries/getArchivedLists.tsx diff --git a/app/queries/getAvailableLists.tsx b/app/lists/queries/getAvailableLists.tsx similarity index 100% rename from app/queries/getAvailableLists.tsx rename to app/lists/queries/getAvailableLists.tsx diff --git a/app/queries/getMyLists.tsx b/app/lists/queries/getMyLists.tsx similarity index 100% rename from app/queries/getMyLists.tsx rename to app/lists/queries/getMyLists.tsx diff --git a/app/queries/getShoppinglist.tsx b/app/lists/queries/getShoppinglist.tsx similarity index 100% rename from app/queries/getShoppinglist.tsx rename to app/lists/queries/getShoppinglist.tsx diff --git a/app/pages/_app.tsx b/app/pages/_app.tsx index 591a0c2..f2c8bee 100644 --- a/app/pages/_app.tsx +++ b/app/pages/_app.tsx @@ -12,7 +12,7 @@ import { ErrorBoundary } from "react-error-boundary" import { queryCache } from "react-query" import LoginForm from "app/auth/components/LoginForm" import { ChakraProvider, extendTheme, shadow } from "@chakra-ui/react" -import Loading from "../components/loading" +import Loading from "../core/components/loading" const theme = extendTheme({ colors: { diff --git a/app/pages/activeLists.tsx b/app/pages/activeLists.tsx index cb4d9c6..8d26973 100644 --- a/app/pages/activeLists.tsx +++ b/app/pages/activeLists.tsx @@ -1,11 +1,11 @@ import { Flex, Heading, Text, Wrap, WrapItem } from "@chakra-ui/react" import { Head, useQuery } from "blitz" -import Layout from "../components/layout" -import getPosition from "../queries/getPositionOfUser" -import getActiveLists from "../queries/getActiveLists" -import AcceptedList from "../components/acceptedList" +import Layout from "../core/layouts/layout" +import getPosition from "../core/queries/getPositionOfUser" +import getActiveLists from "../lists/queries/getActiveLists" +import AcceptedList from "../lists/components/acceptedList" import { getDistanceByHaversine } from "../lib/position" -import checkIfUnreadMessage from "app/queries/checkIfUnreadMessages" +import checkIfUnreadMessage from "app/chats/queries/checkIfUnreadMessages" export default function ActiveLists() { const [activeList, activeListsExtras] = useQuery(getActiveLists, null, { refetchInterval: 2000 }) diff --git a/app/pages/archivedLists.tsx b/app/pages/archivedLists.tsx index f22bdad..c99754e 100644 --- a/app/pages/archivedLists.tsx +++ b/app/pages/archivedLists.tsx @@ -1,9 +1,9 @@ import { Flex, Heading, Text, Wrap, WrapItem } from "@chakra-ui/react" -import Layout from "../components/layout" -import OwnedList from "../components/ownedList" -import getArchivedLists from "../queries/getArchivedLists" +import Layout from "../core/layouts/layout" +import OwnedList from "../lists/components/ownedList" +import getArchivedLists from "../lists/queries/getArchivedLists" import { Head, useQuery } from "blitz" -import checkIfUnreadMessage from "app/queries/checkIfUnreadMessages" +import checkIfUnreadMessage from "app/chats/queries/checkIfUnreadMessages" export default function ArchivedLists() { const [archivedLists, archivedListsExtras] = useQuery(getArchivedLists, null, { diff --git a/app/pages/chats.tsx b/app/pages/chats.tsx index 9751c22..97253e9 100644 --- a/app/pages/chats.tsx +++ b/app/pages/chats.tsx @@ -1,11 +1,11 @@ import { Flex, Heading, Stack, Text, WrapItem } from "@chakra-ui/react" -import Layout from "../components/layout" -import ChatPreview from "../components/chats/chatPreview" +import Layout from "../core/layouts/layout" +import ChatPreview from "../chats/components/chatPreview" import { Head, useQuery } from "blitz" -import getChatsWithLastMessage from "../queries/getChatsWithLastMessage" +import getChatsWithLastMessage from "../chats/queries/getChatsWithLastMessage" import { useCurrentUser } from "app/core/hooks/useCurrentUser" -import checkIfUnreadMessage from "app/queries/checkIfUnreadMessages" +import checkIfUnreadMessage from "app/chats/queries/checkIfUnreadMessages" import { useLayoutEffect } from "react" export default function Chats() { diff --git a/app/pages/chats/[chatId].tsx b/app/pages/chats/[chatId].tsx index 7e18f8c..9bca4b9 100644 --- a/app/pages/chats/[chatId].tsx +++ b/app/pages/chats/[chatId].tsx @@ -10,23 +10,23 @@ import { useToast, Box, } from "@chakra-ui/react" -import AdminMessage from "app/components/chats/adminMessage" -import OwnMessage from "app/components/chats/ownMessage" -import StrangeMessage from "app/components/chats/strangeMessage" -import Layout from "app/components/layout" +import AdminMessage from "app/chats/components/adminMessage" +import OwnMessage from "app/chats/components/ownMessage" +import StrangeMessage from "app/chats/components/strangeMessage" +import Layout from "app/core/layouts/layout" import { useCurrentUser } from "app/core/hooks/useCurrentUser" -import getMessagesByChat from "app/queries/getMessagesByChat" +import getMessagesByChat from "app/chats/queries/getMessagesByChat" import { useQuery, useParam, useMutation, Head, AuthorizationError } from "blitz" import { Form, Field } from "react-final-form" import { FORM_ERROR } from "final-form" -import getParticipantsByChatId from "../../queries/getParticipantsByChatId" -import sendMessage from "../../mutations/sendMessage" -import markMessagesAsRead from "../../mutations/markMessagesAsRead" +import getParticipantsByChatId from "../../chats/queries/getParticipantsByChatId" +import sendMessage from "../../chats/mutations/sendMessage" +import markMessagesAsRead from "../../chats/mutations/markMessagesAsRead" import { useEffect, useLayoutEffect } from "react" import { RiMailSendLine } from "react-icons/ri" import { BiUserCircle } from "react-icons/bi" -import markAdminMessagesAsRead from "app/mutations/markAdminAsRead" -import checkIfUnreadMessage from "app/queries/checkIfUnreadMessages" +import markAdminMessagesAsRead from "app/chats/mutations/markAdminAsRead" +import checkIfUnreadMessage from "app/chats/queries/checkIfUnreadMessages" import { appLogger as log } from "app/lib/logger" export default function Chat() { diff --git a/app/pages/datenschutz.tsx b/app/pages/datenschutz.tsx index afcbb7e..8aa98de 100644 --- a/app/pages/datenschutz.tsx +++ b/app/pages/datenschutz.tsx @@ -8,9 +8,9 @@ import { Wrap, WrapItem, } from "@chakra-ui/react" -import Layout from "../components/layout" +import Layout from "../core/layouts/layout" import { Head, useQuery } from "blitz" -import checkIfUnreadMessage from "app/queries/checkIfUnreadMessages" +import checkIfUnreadMessage from "app/chats/queries/checkIfUnreadMessages" import { useCurrentUser } from "app/core/hooks/useCurrentUser" function DatenschutzLoggedOut() { diff --git a/app/pages/impressum.tsx b/app/pages/impressum.tsx index 81bc217..270a1c1 100644 --- a/app/pages/impressum.tsx +++ b/app/pages/impressum.tsx @@ -1,9 +1,9 @@ import { Flex, Heading, Link, Text, Wrap, WrapItem } from "@chakra-ui/react" -import Layout from "../components/layout" -import OwnedList from "../components/ownedList" -import getArchivedLists from "../queries/getArchivedLists" +import Layout from "../core/layouts/layout" +import OwnedList from "../lists/components/ownedList" +import getArchivedLists from "../lists/queries/getArchivedLists" import { Head, useQuery } from "blitz" -import checkIfUnreadMessage from "app/queries/checkIfUnreadMessages" +import checkIfUnreadMessage from "app/chats/queries/checkIfUnreadMessages" import { useCurrentUser } from "app/core/hooks/useCurrentUser" function ImpressumLoggedIn() { diff --git a/app/pages/index.tsx b/app/pages/index.tsx index 49892ac..b6f3590 100644 --- a/app/pages/index.tsx +++ b/app/pages/index.tsx @@ -2,21 +2,21 @@ import { BlitzPage, Head, useMutation } from "blitz" import { useCurrentUser } from "app/core/hooks/useCurrentUser" import { Flex, Wrap, WrapItem, Heading, Text, Button, HStack } from "@chakra-ui/react" -import Layout from "../components/layout" +import Layout from "../core/layouts/layout" import { useQuery } from "blitz" -import getOwnListByStatus from "../queries/getMyLists" -import OwnedList from "../components/ownedList" -import PublicList from "../components/publicList" -import getAvailableLists from "../queries/getAvailableLists" -import getPosition from "../queries/getPositionOfUser" +import getOwnListByStatus from "../lists/queries/getMyLists" +import OwnedList from "../lists/components/ownedList" +import PublicList from "../lists/components/publicList" +import getAvailableLists from "../lists/queries/getAvailableLists" +import getPosition from "../core/queries/getPositionOfUser" import { useEffect, useState } from "react" import { LoginForm } from "app/auth/components/LoginForm" import { SignupForm } from "app/auth/components/SignupForm" import { useRouter } from "blitz" import { getDistanceByHaversine, useCurrentPosition } from "../lib/position" -import CreateLists from "../components/createLists" -import FrontPage from "../components/LandingPage/frontPage" -import checkIfUnreadMessage from "app/queries/checkIfUnreadMessages" +import CreateLists from "../lists/components/createLists" +import FrontPage from "../landingPage/components/frontPage" +import checkIfUnreadMessage from "app/chats/queries/checkIfUnreadMessages" /* * This file is just for a pleasant getting started page for your new app. * You can delete everything in here and start from scratch if you like. diff --git a/app/auth/pages/reset-password.tsx b/app/pages/reset-password.tsx similarity index 93% rename from app/auth/pages/reset-password.tsx rename to app/pages/reset-password.tsx index 861e720..c6b064d 100644 --- a/app/auth/pages/reset-password.tsx +++ b/app/pages/reset-password.tsx @@ -1,5 +1,4 @@ import { BlitzPage, useRouterQuery, Link, useMutation } from "blitz" -import Layout from "app/core/layouts/Layout" import { LabeledTextField } from "app/core/components/LabeledTextField" import { ResetPasswordForm, FORM_ERROR } from "app/core/components/resetPasswordForm" import { ResetPassword } from "app/auth/validations" @@ -63,6 +62,5 @@ const ResetPasswordPage: BlitzPage = () => { } ResetPasswordPage.redirectAuthenticatedTo = "/" -ResetPasswordPage.getLayout = (page) => {page} export default ResetPasswordPage diff --git a/db/migrations/20210409123617_entel/migration.sql b/db/migrations/20210415090510_enteldb/migration.sql similarity index 100% rename from db/migrations/20210409123617_entel/migration.sql rename to db/migrations/20210415090510_enteldb/migration.sql