Skip to content

added redirects #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

added redirects #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
403677a
added redirects
ErikSandvikSEA May 2, 2020
2427d7c
removed dead ends
ErikSandvikSEA May 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .netlify/state.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"siteId": "0cbe7a28-e7c9-4830-adc2-d51d6edefb62"
}
1 change: 1 addition & 0 deletions spotify-song-suggester-app/public/_redirects
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/* /index.html 200
20 changes: 10 additions & 10 deletions spotify-song-suggester-app/src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ export default function App() {
// artist: searchFormValue.artist.replace('/\s/', '%20')
// }
// )
history.push('/home/search')
history.push('/search')
console.log(newSearch)
getSearch(searchFormValue)
setSearchFormValue(initialSearchFormValue)
Expand All @@ -327,29 +327,29 @@ export default function App() {
onInputChange={onInputChange}

/>
</Route>
<Route exact path='/favorites/suggestions'>
</Route>
{/* <Route exact path='/favorites/suggestions'>
<Suggestions />
</Route>
<Route exact path='/favorites'>
</Route> */}
{/* <Route exact path='/favorites'>
<Favorites
values={formValues}
onInputChange={onInputChange}
/>
</Route>
</Route> */}
{/* <Route exact path='/home/search'>
<DisplaySearched />
</Route> */}



<Route path='/home/search' >
<Route path='/search' >
<DisplaySearched
searches={searches}

/>
</Route>
<Route exact path='/home'>
<Route exact path='/'>
<HomePage
searchFormValue={searchFormValue}
onSearch={onSearch}
Expand All @@ -360,12 +360,12 @@ export default function App() {
/>
</Route>

<Route exact path='/'>
{/* <Route exact path='/'>
<Login
values={formValues}
onInputChange={onInputChange}
/>
</Route>
</Route> */}



Expand Down
4 changes: 2 additions & 2 deletions spotify-song-suggester-app/src/components/HomePage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,9 @@ export default function HomePage(props) {

</Grid>
<Grid item>
<Button variant="outlined" color="primary">
{/* <Button variant="outlined" color="primary">
Secondary action
</Button>
</Button> */}
</Grid>
<div className='errors'>
<h3 className={classes.errorMessages} value={errors.song}>{errors.song}</h3>
Expand Down
6 changes: 3 additions & 3 deletions spotify-song-suggester-app/src/components/NavBar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ const NavBar = () => {
<MenuTab/>
<div className={classes.appBar}>
<Button variant='outlined' color='secondary'>
<RouterLink color="secondary" to='/home' className={classes.linkButtons}>
<RouterLink color="secondary" to='/' className={classes.linkButtons}>

<Typography variant="h6" color="secondary" noWrap >
Home
Expand All @@ -96,11 +96,11 @@ const NavBar = () => {
<div className={classes.root}>
<ButtonGroup color="secondary" aria-label="outlined primary button group">
<Button>
<RouterLink color="secondary"to='/' className={classes.linkButtons}>
{/* <RouterLink color="secondary"to='/' className={classes.linkButtons}> */}
<Typography variant="h6" color="secondary" noWrap>
Log In
</Typography>
</RouterLink>
{/* </RouterLink> */}
</Button>

<Button>
Expand Down
10 changes: 5 additions & 5 deletions spotify-song-suggester-app/src/components/menuComponents/MenuTab.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export default function MenuTab() {
<ListItemText primary="Profile" />
</StyledMenuItem>

<NavLink style={{ textDecoration: 'none', color:'#1DB954'}} className={classes.linkButtons} to='/home/'>
<NavLink style={{ textDecoration: 'none', color:'#1DB954'}} className={classes.linkButtons} to='/'>
<StyledMenuItem>
<ListItemIcon>
<Headset fontSize="small" />
Expand All @@ -107,20 +107,20 @@ export default function MenuTab() {
<ListItemText primary="Github" />
</StyledMenuItem>
</Link>
<NavLink style={{ textDecoration: 'none', color:'#1DB954'}} className={classes.linkButtons} to='/favorites'>
{/* <NavLink style={{ textDecoration: 'none', color:'#1DB954'}} className={classes.linkButtons} to='/favorites'>
<StyledMenuItem>
<ListItemIcon>
<DraftsIcon fontSize="small" />
</ListItemIcon>
<ListItemText primary="Favorites" />
</StyledMenuItem>
</NavLink>
<StyledMenuItem style={{ textDecoration: 'none', color:'#1DB954'}}>
</NavLink> */}
{/* <StyledMenuItem style={{ textDecoration: 'none', color:'#1DB954'}}>
<ListItemIcon>
<InboxIcon fontSize="small" />
</ListItemIcon>
<ListItemText primary="Update User" />
</StyledMenuItem>
</StyledMenuItem> */}
</StyledMenu>
</div>
);
Expand Down