Skip to content
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

Quickbugfix #34

Merged
merged 2 commits into from
Feb 16, 2023
Merged

Quickbugfix #34

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
2f1183c
quick bug fixes for main
andrew-bierman Feb 16, 2023
d08da0c
quick bug fixes for main
andrew-bierman Feb 16, 2023
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
6 changes: 5 additions & 1 deletion react-app/public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,14 @@
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300;0,400;0,500;0,600;0,700;0,800;1,300;1,400;1,500;1,600;1,700;1,800&family=Sen:wght@400;700;800&display=swap" rel="stylesheet">
<!-- <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/css/bulma.min.css"> -->
<!-- <script src="https://cdn.tailwindcss.com"></script> -->

<meta name="viewport" content="width=device-width, initial-scale=1.0" />

<title>Archer</title>
</head>
<body>
<div id="root"></div>
</body>
</html>
</html>
122 changes: 52 additions & 70 deletions react-app/src/components/NavBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

import React, { useState } from 'react';
import { NavLink } from 'react-router-dom';
import { useSelector } from 'react-redux';
Expand All @@ -8,88 +7,71 @@ import LogoIconComp from './LogoIconComp/LogoIconComp';
import ArcherLogoCrop from '../images/Logo/ArcherLogoCrop.png';
import path200 from '../images/Logo/path200.svg';
import DarkModeToggle from './DarkModeToggle';
// import { isDark } from './DarkModeToggle/index.js';

const NavBar = () => {
const user = useSelector(state => state.session.user);
const dark_mode_pref = useSelector(state => state.session.user?.dark_mode_pref);
const [isOpen, setIsOpen] = useState(false);

const user = useSelector((state) => state.session.user);
const dark_mode_pref = useSelector(
(state) => state.session.user?.dark_mode_pref
);

return (
<nav>
<ul>
<div className={`navbar-logo-and-name ${ dark_mode_pref ? 'logo-color-light' : 'logo-color-dark' }`}>
<li>
<NavLink to='/' exact={true} activeClassName='active'>
{/* <img src={ArcherLogoCrop}/> */}
{/* <LogoIconComp /> */}
{/* <i className='archer-logo'>&#xe900;&#xe901;&#xe902;&#xe903;&#xe904;&#xe905;&#xe906;&#xe907;&#xe908;&#xe909;&#xe90a;&#xe90b;&#xe90c;&#xe90d;&#xe90e;&#xe90f;&#xe910;&#xe911;&#xe912;&#xe913;&#xe914;&#xe915;&#xe916;&#xe917;&#xe918;&#xe919;&#xe91a;&#xe91b;&#xe91c;&#xe91d;&#xe91e;&#xe91f;&#xe920;&#xe921;&#xe922;&#xe923;&#xe924;&#xe925;&#xe926;&#xe927;&#xe928;&#xe929;&#xe92a;&#xe92b;&#xe92c;&#xe92d;&#xe92e;&#xe92f;&#xe930;&#xe931;&#xe932;&#xe933;&#xe934;&#xe935;&#xe936;&#xe937;&#xe938;&#xe939;</i> */}
{/* <svg src={path200}></svg>
*/}
{/* <path200></path200> */}
<img src={path200} className={`navbar-logo-img`}/>

Archer
</NavLink>
</li>
<>
<nav>
<div className={`navbar-logo-and-name ${dark_mode_pref ? 'logo-color-light' : 'logo-color-dark'
}`}>
<NavLink to="/" exact={true} activeClassName="active">
<img src={path200} className="navbar-logo-img" />
Archer
</NavLink>
</div>
{
!user
?
<div className='navbar-right-side '>
{/* <li>
<DarkModeToggle />
</li> */}
<li>
<NavLink to='/login' exact={true} activeClassName='active'>
Login
</NavLink>
</li>
<li>
<NavLink to='/sign-up' exact={true} activeClassName='active'>
Sign Up
</NavLink>
</li>
{/* <li>
<NavLink to='/users' exact={true} activeClassName='active'>
Users
</NavLink>
</li> */}
</div>
:
<div className="navbar-menu-toggle" onClick={() => setIsOpen(!isOpen)}>
<div className={`navbar-menu-toggle-line ${isOpen ? 'open' : ''}`} />
<div className={`navbar-menu-toggle-line ${isOpen ? 'open' : ''}`} />
<div className={`navbar-menu-toggle-line ${isOpen ? 'open' : ''}`} />
</div>
<ul className={`navbar-menu ${isOpen ? 'open' : 'closed'}`}>
{!user ? (
<>
<div className='navbar-right-side-container'>
<li className='navbar-right-side-item'>
<NavLink to="/login" exact={true} activeClassName="active">
Login
</NavLink>
</li>
<li className='navbar-right-side-item'>
<NavLink to="/sign-up" exact={true} activeClassName="active">
Sign Up
</NavLink>
</li>
</div>
</>
) : (
<>
{/* <div className='navbar-middle-section'>
<li> */}
<SearchBar />
{/* </li>
</div> */}
<div className='navbar-right-side '>
<li>
{/* <button onClick={(e) => e.preventDefault() }> */}
<li className='navbar-search-container'>
<SearchBar />
</li>
<div className='navbar-right-side-container'>
<li className='navbar-right-side'>
<DarkModeToggle />
{/* </button> */}
{/* <button>
<i className="fa-solid fa-moon"></i>
<i className="fa-solid fa-sun"></i>
</button> */}
</li>
<li>
<NavLink to='/profile' exact={true} activeClassName='active'>
<button>
Profile
</button>
<li className='navbar-right-side'>
<NavLink to="/profile" exact={true} activeClassName="active">
<button>Profile</button>
</NavLink>
</li>
<li>
<li className='navbar-right-side'>
<LogoutButton />
</li>
</div>
</>

}

</ul>
</nav>
)}
</ul>
</nav>
{/* <div className='navbar-space-filler'></div> */}
</>
);
}
};

export default NavBar;
export default NavBar;
5 changes: 4 additions & 1 deletion react-app/src/components/WatchLists/CreateWatchListModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ const CreateWatchListModal = () => {
if (newWatchlistName.length < 1) {
setErrors(['Watchlist name cannot be empty'])
return;
} else if (newWatchlistName.length >= 10) {
setErrors(['Watchlist name cannot be longer than 10 characters'])
return;
}

await dispatch(createNewWatchlist(newWatchlistName))
Expand Down Expand Up @@ -55,7 +58,7 @@ const CreateWatchListModal = () => {
value={newWatchlistName}
onChange={event => setNewWatchlistName(event.target.value)}
minLength="1"
maxLength="255"
maxLength="10"
placeholder="Create Watchlist"
/>
<button type="submit">
Expand Down
5 changes: 3 additions & 2 deletions react-app/src/components/WatchLists/DeleteWatchListModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { useState } from 'react';
import { useDispatch } from 'react-redux';
import { deleteWatchlist, fetchWatchlists } from '../../store/watchlists';
import { handleFormSubmit } from '../utility';
import { useModal } from '../../context/Modal';
import { Modal } from '../../context/Modal';

Expand All @@ -17,7 +18,7 @@ const DeleteWatchListModal = ({ watchlist }) => {
const handleWatchlistDelete = async (watchlistId) => {
setLoading(true);
await dispatch(deleteWatchlist(watchlistId));
await dispatch(fetchWatchlists());
// await dispatch(fetchWatchlists());
setLoading(false);
closeModal();
};
Expand All @@ -27,7 +28,7 @@ const DeleteWatchListModal = ({ watchlist }) => {
<div className='create-watchlist-modal-content'>
<h3>Confirm Deletion</h3>
{/* <div className='watchlist-individual-header'> */}
<form>
<form onSubmit={handleFormSubmit}>
<button className='watchlist-modal-cancel-button' onClick={() => closeModal()}>
Cancel
</button>
Expand Down
Loading