fixed merge issues

add folders
bounswe · Nov 27, 2023 · d2a6d16 · d2a6d16
1 parent 81b1b19
commit d2a6d16
Show file tree

Hide file tree

Showing 12 changed files with 116 additions and 135 deletions.
diff --git a/resq/frontend/src/App.js b/resq/frontend/src/App.js
diff --git a/...frontend/src/components/RequestAddress.js → .../src/components/Request/RequestAddress.js b/...frontend/src/components/RequestAddress.js → .../src/components/Request/RequestAddress.js
@@ -6,7 +6,7 @@ import Typography from '@mui/material/Typography';
 import FormControlLabel from '@mui/material/FormControlLabel';
 import Checkbox from '@mui/material/Checkbox';
 import { createTheme, ThemeProvider } from '@mui/material/styles';
-import disasterImage from '../disaster.png';
+import disasterImage from '../../disaster.png';
 import Avatar from '@mui/material/Avatar';
 import CssBaseline from '@mui/material/CssBaseline';
 import Container from '@mui/material/Container';

diff --git a/...rontend/src/components/RequestDetails1.js → ...src/components/Request/RequestDetails1.js b/...rontend/src/components/RequestDetails1.js → ...src/components/Request/RequestDetails1.js
diff --git a/...rontend/src/components/RequestDetails2.js → ...src/components/Request/RequestDetails2.js b/...rontend/src/components/RequestDetails2.js → ...src/components/Request/RequestDetails2.js
diff --git a/...rontend/src/components/RequestDetails3.js → ...src/components/Request/RequestDetails3.js b/...rontend/src/components/RequestDetails3.js → ...src/components/Request/RequestDetails3.js
diff --git a/.../frontend/src/components/RequestReview.js → ...d/src/components/Request/RequestReview.js b/.../frontend/src/components/RequestReview.js → ...d/src/components/Request/RequestReview.js
diff --git a/...rontend/src/components/ResourceAddress.js → ...rc/components/Resource/ResourceAddress.js b/...rontend/src/components/ResourceAddress.js → ...rc/components/Resource/ResourceAddress.js
@@ -6,7 +6,7 @@ import Typography from '@mui/material/Typography';
 import FormControlLabel from '@mui/material/FormControlLabel';
 import Checkbox from '@mui/material/Checkbox';
 import { createTheme, ThemeProvider } from '@mui/material/styles';
-import disasterImage from '../disaster.png';
+import disasterImage from '../../disaster.png';
 import Avatar from '@mui/material/Avatar';
 import CssBaseline from '@mui/material/CssBaseline';
 import Container from '@mui/material/Container';

diff --git a/...rontend/src/components/ResourceContext.js → ...rc/components/Resource/ResourceContext.js b/...rontend/src/components/ResourceContext.js → ...rc/components/Resource/ResourceContext.js
diff --git a/...rontend/src/components/ResourceDetail1.js → ...rc/components/Resource/ResourceDetail1.js b/...rontend/src/components/ResourceDetail1.js → ...rc/components/Resource/ResourceDetail1.js
diff --git a/...rontend/src/components/ResourceDetail2.js → ...rc/components/Resource/ResourceDetail2.js b/...rontend/src/components/ResourceDetail2.js → ...rc/components/Resource/ResourceDetail2.js
diff --git a/resq/frontend/src/pages/RequestCreation.js b/resq/frontend/src/pages/RequestCreation.js
@@ -11,11 +11,11 @@ import StepLabel from '@mui/material/StepLabel';
 import Button from '@mui/material/Button';
 import Link from '@mui/material/Link';
 import Typography from '@mui/material/Typography';
-import RequestAddress from '../components/RequestAddress';
-import RequestDetails1 from '../components/RequestDetails1';
-import RequestDetails2 from '../components/RequestDetails2';
-import RequestDetails3 from '../components/RequestDetails3';
-import RequestReview from '../components/RequestReview';
+import RequestAddress from '../components/Request/RequestAddress';
+import RequestDetails1 from '../components/Request/RequestDetails1';
+import RequestDetails2 from '../components/Request/RequestDetails2';
+import RequestDetails3 from '../components/Request/RequestDetails3';
+import RequestReview from '../components/Request/RequestReview';
 import { createTheme, ThemeProvider } from '@mui/material/styles';
 
 function Copyright(props) {

diff --git a/resq/frontend/src/pages/ResourceCreation.js b/resq/frontend/src/pages/ResourceCreation.js
@@ -11,11 +11,11 @@ import StepLabel from '@mui/material/StepLabel';
 import Button from '@mui/material/Button';
 import Link from '@mui/material/Link';
 import Typography from '@mui/material/Typography';
-import ResourceAddress from '../components/ResourceAddress';
-import ResourceDetail1 from '../components/ResourceDetail1';
-import ResourceDetail2 from '../components/ResourceDetail2';
+import ResourceAddress from '../components/Resource/ResourceAddress';
+import ResourceDetail1 from '../components/Resource/ResourceDetail1';
+import ResourceDetail2 from '../components/Resource/ResourceDetail2';
 import { createTheme, ThemeProvider } from '@mui/material/styles';
-import { ResourceProvider } from '../components/ResourceContext';
+import { ResourceProvider } from '../components/Resource/ResourceContext';
 import { useResource } from './ResourceContext';
 import axios from 'axios';