Merge pull request #52 from Till-B/Folder-Structure

Folder Structure
entel-me · Apr 15, 2021 · f13d282 · f13d282
2 parents 6068bdf + cf0e014
commit f13d282
Show file tree

Hide file tree

Showing 59 changed files with 63 additions and 90 deletions.
diff --git 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 → app/auth/components/changePasswordModal.tsx b/app/components/changePasswordModal.tsx → app/auth/components/changePasswordModal.tsx
diff --git a/app/auth/pages/forgot-password.tsx → app/auth/components/forgot-password.tsx b/app/auth/pages/forgot-password.tsx → 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) => <Layout title="Forgot Your Password?">{page}</Layout>
 
 export default ForgotPasswordPage
diff --git a/app/components/chats/adminMessage.tsx → app/chats/components/adminMessage.tsx b/app/components/chats/adminMessage.tsx → app/chats/components/adminMessage.tsx
diff --git a/app/components/chats/chatPreview.tsx → app/chats/components/chatPreview.tsx b/app/components/chats/chatPreview.tsx → 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 → app/chats/components/ownMessage.tsx b/app/components/chats/ownMessage.tsx → app/chats/components/ownMessage.tsx
diff --git a/app/components/chats/strangeMessage.tsx → app/chats/components/strangeMessage.tsx b/app/components/chats/strangeMessage.tsx → app/chats/components/strangeMessage.tsx
diff --git a/app/mutations/createAdminMessage.tsx → app/chats/mutations/createAdminMessage.tsx b/app/mutations/createAdminMessage.tsx → app/chats/mutations/createAdminMessage.tsx
diff --git a/app/mutations/createChat.tsx → app/chats/mutations/createChat.tsx b/app/mutations/createChat.tsx → app/chats/mutations/createChat.tsx
diff --git a/app/mutations/markAdminAsRead.tsx → app/chats/mutations/markAdminAsRead.tsx b/app/mutations/markAdminAsRead.tsx → app/chats/mutations/markAdminAsRead.tsx
diff --git a/app/mutations/markMessagesAsRead.tsx → app/chats/mutations/markMessagesAsRead.tsx b/app/mutations/markMessagesAsRead.tsx → app/chats/mutations/markMessagesAsRead.tsx
diff --git a/app/mutations/sendMessage.tsx → app/chats/mutations/sendMessage.tsx b/app/mutations/sendMessage.tsx → app/chats/mutations/sendMessage.tsx
diff --git a/app/queries/checkIfUnreadMessages.tsx → app/chats/queries/checkIfUnreadMessages.tsx b/app/queries/checkIfUnreadMessages.tsx → app/chats/queries/checkIfUnreadMessages.tsx
diff --git a/app/queries/getChatByParticipants.tsx → app/chats/queries/getChatByParticipants.tsx b/app/queries/getChatByParticipants.tsx → app/chats/queries/getChatByParticipants.tsx
diff --git a/app/queries/getChatsWithLastMessage.tsx → ...chats/queries/getChatsWithLastMessage.tsx b/app/queries/getChatsWithLastMessage.tsx → ...chats/queries/getChatsWithLastMessage.tsx
diff --git a/app/queries/getMessagesByChat.tsx → app/chats/queries/getMessagesByChat.tsx b/app/queries/getMessagesByChat.tsx → app/chats/queries/getMessagesByChat.tsx
diff --git a/app/queries/getParticipantsByChatId.tsx → ...chats/queries/getParticipantsByChatId.tsx b/app/queries/getParticipantsByChatId.tsx → ...chats/queries/getParticipantsByChatId.tsx
diff --git a/app/components/loading.tsx → app/core/components/loading.tsx b/app/components/loading.tsx → app/core/components/loading.tsx
diff --git a/app/core/layouts/Layout.tsx b/app/core/layouts/Layout.tsx
diff --git a/app/components/layout.module.css → app/core/layouts/layout.module.css b/app/components/layout.module.css → app/core/layouts/layout.module.css
diff --git a/app/components/layout.tsx → app/core/layouts/layout.tsx b/app/components/layout.tsx → 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 → app/core/mutations/updatePoisition.tsx b/app/mutations/updatePoisition.tsx → app/core/mutations/updatePoisition.tsx
diff --git a/app/queries/getPositionOfUser.tsx → app/core/queries/getPositionOfUser.tsx b/app/queries/getPositionOfUser.tsx → app/core/queries/getPositionOfUser.tsx
diff --git a/app/components/LandingPage/frontPage.tsx → app/landingPage/components/frontPage.tsx b/app/components/LandingPage/frontPage.tsx → 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 → app/landingPage/components/frontPageChat.tsx b/app/components/LandingPage/frontPageChat.tsx → 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/...onents/LandingPage/frontPageOwnedList.tsx → ...ingPage/components/frontPageOwnedList.tsx b/...onents/LandingPage/frontPageOwnedList.tsx → ...ingPage/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/...nents/LandingPage/frontPagePublicList.tsx → ...ngPage/components/frontPagePublicList.tsx b/...nents/LandingPage/frontPagePublicList.tsx → ...ngPage/components/frontPagePublicList.tsx
diff --git 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 → app/lists/components/BrandBadge.tsx b/app/components/BrandBadge.tsx → app/lists/components/BrandBadge.tsx
diff --git a/app/components/acceptedList.tsx → app/lists/components/acceptedList.tsx b/app/components/acceptedList.tsx → 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 → app/lists/components/createLists.tsx b/app/components/createLists.tsx → app/lists/components/createLists.tsx
diff --git a/app/components/editList.tsx → app/lists/components/editList.tsx b/app/components/editList.tsx → app/lists/components/editList.tsx
diff --git a/app/components/ownedList.tsx → app/lists/components/ownedList.tsx b/app/components/ownedList.tsx → 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 → app/lists/components/publicList.tsx b/app/components/publicList.tsx → 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 → app/lists/components/removeListModal.tsx b/app/components/removeListModal.tsx → app/lists/components/removeListModal.tsx
diff --git a/app/mutations/acceptList.tsx → app/lists/mutations/acceptList.tsx b/app/mutations/acceptList.tsx → app/lists/mutations/acceptList.tsx
diff --git a/app/mutations/addItem.tsx → app/lists/mutations/addItem.tsx b/app/mutations/addItem.tsx → app/lists/mutations/addItem.tsx
diff --git a/app/mutations/archiveList.tsx → app/lists/mutations/archiveList.tsx b/app/mutations/archiveList.tsx → app/lists/mutations/archiveList.tsx
diff --git a/app/mutations/createList.tsx → app/lists/mutations/createList.tsx b/app/mutations/createList.tsx → app/lists/mutations/createList.tsx
diff --git a/app/mutations/doneList.tsx → app/lists/mutations/doneList.tsx b/app/mutations/doneList.tsx → app/lists/mutations/doneList.tsx
diff --git a/app/mutations/removeAllItems.tsx → app/lists/mutations/removeAllItems.tsx b/app/mutations/removeAllItems.tsx → app/lists/mutations/removeAllItems.tsx
diff --git a/app/mutations/removeShoppinglist.tsx → app/lists/mutations/removeShoppinglist.tsx b/app/mutations/removeShoppinglist.tsx → app/lists/mutations/removeShoppinglist.tsx
diff --git a/app/mutations/renewList.tsx → app/lists/mutations/renewList.tsx b/app/mutations/renewList.tsx → app/lists/mutations/renewList.tsx
diff --git a/app/mutations/updateStoreComment.tsx → app/lists/mutations/updateStoreComment.tsx b/app/mutations/updateStoreComment.tsx → app/lists/mutations/updateStoreComment.tsx
diff --git a/app/queries/getActiveLists.tsx → app/lists/queries/getActiveLists.tsx b/app/queries/getActiveLists.tsx → app/lists/queries/getActiveLists.tsx
diff --git a/app/queries/getArchivedLists.tsx → app/lists/queries/getArchivedLists.tsx b/app/queries/getArchivedLists.tsx → app/lists/queries/getArchivedLists.tsx
diff --git a/app/queries/getAvailableLists.tsx → app/lists/queries/getAvailableLists.tsx b/app/queries/getAvailableLists.tsx → app/lists/queries/getAvailableLists.tsx
diff --git a/app/queries/getMyLists.tsx → app/lists/queries/getMyLists.tsx b/app/queries/getMyLists.tsx → app/lists/queries/getMyLists.tsx
diff --git a/app/queries/getShoppinglist.tsx → app/lists/queries/getShoppinglist.tsx b/app/queries/getShoppinglist.tsx → app/lists/queries/getShoppinglist.tsx
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → app/pages/reset-password.tsx b/app/auth/pages/reset-password.tsx → 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) => <Layout title="Reset Your Password">{page}</Layout>
 
 export default ResetPasswordPage
diff --git a/...ations/20210409123617_entel/migration.sql → ...ions/20210415090510_enteldb/migration.sql b/...ations/20210409123617_entel/migration.sql → ...ions/20210415090510_enteldb/migration.sql