c4patino/qoverflow
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed merge errors

Browse source
This commit is contained in:
Ceferino Patino 2022-08-02 01:01:40 -05:00
commit 818fff5404
3 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/src/containers/Mail.jsx
View file

@ -1,7 +1,5 @@
import { Card, CardContent } from '@mui/material';
import React, { useEffect } from 'react';
import { Inbox, SendMail } from 'controllers';
import { MdPreview } from 'components';
import { useNavigate } from 'react-router-dom';
import { useUser } from 'contexts';

3
client/src/controllers/FormControllers/SendMailController.js
View file

@ -4,7 +4,8 @@ import { composeMailFields } from 'services/fields';
import { postMail } from 'services/mailServices';
import { mailSchema } from 'services/schemas';
import { useEffect } from 'react';
import { useNavigate } from 'react-router-dom';
import { useUser } from 'contexts';
export default function SendMailController() {
const { userData } = useUser();

3
client/src/controllers/FormControllers/index.js
View file

@ -8,7 +8,7 @@ import ResetForm from './ResetFormController';
import SendMail from './SendMailController';
import SearchForm from './SearchFormController';
import UpdateForm from './UpdateFormController';
import AnswerForm from './AnwerFormController';
export {
AnswerForm,
AskForm,
@ -20,5 +20,4 @@ export {
SendMail,
SearchForm,
UpdateForm,
AnswerForm,
};