From 2d3a52a63e4efeddc906f0f983e2c816df09b1ac Mon Sep 17 00:00:00 2001
From: Cameron Leverett <camrbo@gmail.com>
Date: Wed, 31 Mar 2021 21:20:18 -0700
Subject: [PATCH 01/11] added convention to links as spec in next docs

---
 components/Goups/group-head.js | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/components/Goups/group-head.js b/components/Goups/group-head.js
index 30ff4f5..be23f1f 100644
--- a/components/Goups/group-head.js
+++ b/components/Goups/group-head.js
@@ -1,10 +1,12 @@
 import React from 'react';
 import Link from 'next/link';
+import Button from '../UI/Button'
 import CardHeader from '@material-ui/core/CardHeader';
 import IconButton from '@material-ui/core/IconButton';
 import MoreVertIcon from '@material-ui/icons/MoreVert';
 
 const GroupHead = (props) => {
+	const explore = `groups/${props._id}`
 	return (
 		<React.Fragment>
 			<CardHeader
@@ -13,16 +15,11 @@ const GroupHead = (props) => {
 						<MoreVertIcon />
 					</IconButton>
 				}
-				title={
-					<Link
-						href={{
-							pathname: `groups/[id]`,
-							query: { id: props._id },
-						}}>
-						{props.name}
-					</Link>
-				}
+				title={props.name}
 			/>
+			<Button link={explore}>
+				{"See more..."}
+			</Button>
 		</React.Fragment>
 	);
 };

From ac0983d776c324daac1eb188641a93b6345c85ee Mon Sep 17 00:00:00 2001
From: Cameron Leverett <camrbo@gmail.com>
Date: Wed, 31 Mar 2021 21:20:33 -0700
Subject: [PATCH 02/11] changed secondary theme color

---
 components/MUI/theme.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/MUI/theme.js b/components/MUI/theme.js
index 4a0f51d..dbb37a4 100644
--- a/components/MUI/theme.js
+++ b/components/MUI/theme.js
@@ -12,7 +12,7 @@ const theme = createMuiTheme({
 			dark  : '#005662',
 		},
 		secondary  : {
-			main : '#19857b',
+			main : '#368ff5',
 		},
 		error      : {
 			main : '#913029',

From bfd1905b75b83dc3377418fa2a2a44870733745e Mon Sep 17 00:00:00 2001
From: Cameron Leverett <camrbo@gmail.com>
Date: Wed, 31 Mar 2021 21:21:00 -0700
Subject: [PATCH 03/11] removed and added style to navBar

---
 components/layout/NavBar.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/components/layout/NavBar.js b/components/layout/NavBar.js
index 43bfab0..b74c82c 100644
--- a/components/layout/NavBar.js
+++ b/components/layout/NavBar.js
@@ -9,13 +9,11 @@ const useStyles = makeStyles((theme) => ({
 	main: {
 		backgroundColor: theme.palette.primary.dark,
 		display: 'flex',
-		flexDirection: 'column',
 		position: 'fixed',
 	},
 	tabs: {
 		flex: 1,
 		bottom: 0,
-		paddingLeft: theme.spacing(0),
 	},
   div:{
     marginBottom: theme.spacing(9)
@@ -28,7 +26,6 @@ const NavBar = () => {
 		<Fragment>
 			<AppBar position='static' color='primary' className={classes.main}>
 				<Tabs className={classes.tabs}>
-					<NavTab name={''} pathname='' bool={true} />
 					<LogoLink />
 					<NavTab name={'Groups'} pathname={'/groups'} bool={false} />
 				</Tabs>

From 753fb40fed5bb4b24763a2bfb6b417f2cb461f58 Mon Sep 17 00:00:00 2001
From: Cameron Leverett <camrbo@gmail.com>
Date: Wed, 31 Mar 2021 21:21:33 -0700
Subject: [PATCH 04/11] added button for any use case uses MUI button

---
 components/UI/Button.js | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 components/UI/Button.js

diff --git a/components/UI/Button.js b/components/UI/Button.js
new file mode 100644
index 0000000..ca7a761
--- /dev/null
+++ b/components/UI/Button.js
@@ -0,0 +1,28 @@
+import {default as MuiButton} from '@material-ui/core/Button';
+import { makeStyles } from '@material-ui/core/styles';
+import Link from 'next/link'
+
+const useStyles = makeStyles((theme) => ({
+	btn: {
+    textDecoration: 'none',
+    fontSize: '30px',
+  },
+}));
+
+const Button = (props) => {
+  const classes = useStyles()
+	if (props.link) {
+		return (
+				<Link href={props.link}>
+					<a className={classes.btn}>{props.children}</a>
+				</Link>
+		);
+	}
+
+	return (
+		<MuiButton className={classes.btn}>
+			{props.children}
+		</MuiButton>
+	);
+};
+export default Button;

From aada538984c23e70f0238a19b8a9230b309f3b5a Mon Sep 17 00:00:00 2001
From: Cameron Leverett <camrbo@gmail.com>
Date: Wed, 31 Mar 2021 21:21:55 -0700
Subject: [PATCH 05/11] added some flexiblity to Logo Link

---
 components/UI/LogoLink.js | 43 ++++++++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/components/UI/LogoLink.js b/components/UI/LogoLink.js
index 5cfcd10..eab8d3a 100644
--- a/components/UI/LogoLink.js
+++ b/components/UI/LogoLink.js
@@ -1,21 +1,32 @@
-import React from 'react'
-import Link from 'next/link'
-import Image from 'next/image'
-import {makeStyles} from '@material-ui/core/styles'
+import React from 'react';
+import Link from 'next/link';
+import Image from 'next/image';
+import { makeStyles } from '@material-ui/core/styles';
 
 const useStyles = makeStyles((theme) => ({
-  img: {
-    cursor: 'pointer',
-  }
-}))
+	img: {
+		cursor: 'pointer',
+    marginTop: theme.spacing(1),
+    marginLeft: theme.spacing(40),
+    marginRight: theme.spacing(5)
+	},
+}));
 
 const LogoLink = () => {
-  const classess = useStyles()
-  return (
-    <Link href="/">
-        <Image className={classess.img} src='/images/IMGLINK2.jpg' height={0} width={200} />
-    </Link>
-  )
-}
+	const classess = useStyles();
+	return (
+		<Link href='/'>
+			<a className={classess.img}>
+				<Image
+					className={classess.img}
+					src='/images/IMGLINK2.jpg'
+					height={'60vw'}
+					width={'200vw'}
+          alt={'Home'}
+				/>
+			</a>
+		</Link>
+	);
+};
 
-export default LogoLink
+export default LogoLink;

From 22dbbcfe5835345292825fc347f49353ae3b5305 Mon Sep 17 00:00:00 2001
From: Cameron Leverett <camrbo@gmail.com>
Date: Wed, 31 Mar 2021 21:22:16 -0700
Subject: [PATCH 06/11] added style to nav tab

---
 components/UI/NavTab.js | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/components/UI/NavTab.js b/components/UI/NavTab.js
index bdbad2f..7e0108d 100644
--- a/components/UI/NavTab.js
+++ b/components/UI/NavTab.js
@@ -6,9 +6,11 @@ import Smooth from './Smooth';
 import Link from 'next/link';
 
 const useStyles = makeStyles((theme) => ({
-	tab : {
-		color  : theme.palette.primary,
-		height : 70,
+	tab: {
+		color: theme.palette.primary.light,
+		fontSize: 20,
+		height: 70,
+		
 	},
 }));
 
@@ -19,14 +21,18 @@ const NavTab = (props) => {
 	return (
 		<Fragment>
 			<Smooth style={router.pathname === pathname}>
-				<Link href={pathname}>
-					<Tab
-						variant='outlined'
-						label={name}
-						className={classes.tab}
-						disabled={bool}
-					/>
-				</Link>
+				<a>
+					<Link href={pathname}>
+						<Tab
+							variant='outlined'
+							size="sm"
+							label={name}
+							className={classes.tab}
+							disabled={bool}
+							value={100}
+						/>
+					</Link>
+				</a>
 			</Smooth>
 		</Fragment>
 	);

From e35ab702312ea07ca79be7f71ab42bebf22a73b7 Mon Sep 17 00:00:00 2001
From: Cameron Leverett <camrbo@gmail.com>
Date: Wed, 31 Mar 2021 21:22:38 -0700
Subject: [PATCH 07/11] added new Ui component for progress

---
 components/UI/progress.js | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 components/UI/progress.js

diff --git a/components/UI/progress.js b/components/UI/progress.js
new file mode 100644
index 0000000..dd76b6b
--- /dev/null
+++ b/components/UI/progress.js
@@ -0,0 +1,24 @@
+import React from 'react';
+import { makeStyles } from '@material-ui/core/styles';
+import LinearProgress from '@material-ui/core/LinearProgress';
+
+const useStyles = makeStyles((theme) => ({
+  root: {
+    width: '100%',
+    height: '10px',
+    '& > * + *': {
+      height: 10,
+    },
+  },
+}));
+
+const Progress = () => {
+  const classes = useStyles()
+  return (
+    <div className={classes.root}>
+      <LinearProgress color="secondary" />
+    </div>
+  );
+}
+
+export default Progress
\ No newline at end of file

From b31e262db8f193cfcfe962549f82fa11d2462b2c Mon Sep 17 00:00:00 2001
From: Cameron Leverett <camrbo@gmail.com>
Date: Wed, 31 Mar 2021 21:22:51 -0700
Subject: [PATCH 08/11] changed the smooth color

---
 components/UI/Smooth.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/components/UI/Smooth.js b/components/UI/Smooth.js
index 1447a39..6c2934d 100644
--- a/components/UI/Smooth.js
+++ b/components/UI/Smooth.js
@@ -2,8 +2,9 @@ import { makeStyles } from '@material-ui/core/styles';
 
 const useStyles = makeStyles((theme) => ({
 	active   : {
-		backgroundColor : theme.palette.primary.dark,
-		height          : '2px',
+		backgroundColor : 'grey',
+		height          : '3px',
+		textDecoration: 'none',
 	},
 	inactive : {
 		backgroundColor : 'transparent',
@@ -17,7 +18,7 @@ const Smooth = (props) => {
 	return (
 		<div>
 			{children}
-			<li
+			<div
 				className={style ? classes.active:classes.inactive}
 			/>
 		</div>

From 0c5d285c849dd80f41289dfa1646f00a4f725c12 Mon Sep 17 00:00:00 2001
From: Cameron Leverett <camrbo@gmail.com>
Date: Wed, 31 Mar 2021 21:23:03 -0700
Subject: [PATCH 09/11] removed unused fragment

---
 Containers/group-list.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Containers/group-list.js b/Containers/group-list.js
index 13e6df1..bfc11ec 100644
--- a/Containers/group-list.js
+++ b/Containers/group-list.js
@@ -1,4 +1,3 @@
-import { Fragment } from 'react';
 import { makeStyles } from '@material-ui/core/styles';
 import GroupCard from '../components/Goups/group-card';
 

From a82af6df800e9f4ecf6a20999cfbd2bc41048936 Mon Sep 17 00:00:00 2001
From: Cameron Leverett <camrbo@gmail.com>
Date: Wed, 31 Mar 2021 21:23:24 -0700
Subject: [PATCH 10/11] changed prop name back to group after  solving bug

---
 Containers/group.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Containers/group.js b/Containers/group.js
index 4c6fc00..5bcfeeb 100644
--- a/Containers/group.js
+++ b/Containers/group.js
@@ -16,9 +16,8 @@ const useStyles = makeStyles((theme) => ({
 	},
 }));
 
-const Group = ({id}) => {
+const Group = ({group}) => {
 	const classes = useStyles();
-	const group = getGroupById(id)
 	return (
 		<div className={classes.div}>
 			<GroupHead props={group} />

From f004b747bd32dfc93587fd1632522b955f718751 Mon Sep 17 00:00:00 2001
From: Cameron Leverett <camrbo@gmail.com>
Date: Wed, 31 Mar 2021 21:26:52 -0700
Subject: [PATCH 11/11] adden progres comp so page no longer throws error

---
 pages/groups/[id].js | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pages/groups/[id].js b/pages/groups/[id].js
index 6b31369..7489381 100644
--- a/pages/groups/[id].js
+++ b/pages/groups/[id].js
@@ -1,17 +1,17 @@
-import Group from '../../Containers/group'
-import {useRouter} from 'next/router'
-import Image from 'next/image'
-import {getGroupById} from '../../dummy'
+import Group from '../../Containers/group';
+import { useRouter } from 'next/router';
+import { getGroupById } from '../../dummy';
+import Progress from '../../components/UI/progress'
 
 const GroupPage = () => {
-  const router = useRouter()
-  const id = router.query.id
-  
-  return (
-    <div>
-      <Group id={id}/>
-    </div>
-  )
-}
+	const router = useRouter();
+	const group = getGroupById(router.query.id);
+	console.log(group, router.query);
+	if (group) {
+		return <Group group={group} />;
+	} else {
+		return <Progress />;
+	}
+};
 
-export default GroupPage
+export default GroupPage;