Skip to content

Commit 956e8db

Browse files
authored
Merge pull request #5 from Jgarnes/main
Added DB Finder
2 parents 33fe0f7 + 2849cf7 commit 956e8db

File tree

6 files changed

+32
-2
lines changed

6 files changed

+32
-2
lines changed

src/App/App.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import AdminPage from '../pages/AdminPage/AdminPage';
77
import HomePage from '../pages/HomePage/HomePage';
88
import WordShuffleWorldPage from '../pages/WordShuffleWorldPage/WordShuffleWorldPage';
99
import AboutPage from '../pages/AboutPage/AboutPage';
10-
10+
import DbFinder from '../pages/DbFinder/DbFinder';
1111
function App() {
1212
return (
1313
<Router>
@@ -21,6 +21,7 @@ function App() {
2121
path="/games/word-shuffle-world"
2222
element={<WordShuffleWorldPage />}
2323
/>
24+
<Route path="/dbfinder" element={<DbFinder />}/>
2425
</Routes>
2526
</Router>
2627
);

src/components/dbfinder/display.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
const DbDisplay = () => {
2+
return <div> This is where the path instruction and page image is located</div>;
3+
};
4+
5+
export default DbDisplay;

src/components/dbfinder/search.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
const DbSearch = () => {
2+
return <div> This is where the DB search bar goes</div>;
3+
};
4+
5+
export default DbSearch;

src/components/navigation/Navigation.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ const Navigation = () => {
2727
>
2828
Word Shuffle World
2929
</Button>
30+
<Button component={Link} to="/dbfinder" variant="contained" color="primary">
31+
Db Finder
32+
</Button>
3033
</div>
3134
);
3235
};

src/pages/AdminPage/AdminPage.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1+
2+
3+
14
const AdminPage = () => {
2-
return <div> Welcome to the admin page</div>;
5+
return <div> Welcome to the Database Finder</div>;
36
};
47

58
export default AdminPage;

src/pages/DbFinder/DbFinder.tsx

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import DbDisplay from '../../components/dbfinder/display';
2+
import DbSearch from '../../components/dbfinder/search';
3+
4+
const DbFinder = () => {
5+
return (
6+
<div>
7+
<DbSearch />
8+
<DbDisplay />
9+
</div>
10+
)
11+
};
12+
13+
export default DbFinder;

0 commit comments

Comments
 (0)