Skip to content

Commit 5337938

Browse files
committed
merged with Hernan's edits
1 parent 259434c commit 5337938

File tree

5 files changed

+6
-9
lines changed

5 files changed

+6
-9
lines changed

app/src/components/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export const App = (): JSX.Element => {
3232
// following useEffect runs on first mount
3333
useEffect(() => {
3434
console.log('state.isLoggedIn', state.isLoggedIn)
35-
console.log('cookies.get in App', Cookies.get())
35+
// console.log('cookies.get in App', Cookies.get())
3636
// if user is a guest, see if a project exists in localforage and retrieve it
3737
if (!state.isLoggedIn) {
3838
localforage.getItem('guestProject').then((project) => {

app/src/components/marketplace/MarketplaceCard.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import { red } from '@mui/material/colors';
2020
import axios from 'axios';
2121
import {useDispatch, useSelector} from 'react-redux'
2222
import { RootState } from '../../redux/store';
23-
import { saveProject } from '../../helperFunctions/projectGetSaveDel';
2423

2524
interface Project {
2625
forked: String,

app/src/components/right/LoginButton.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ const { API_BASE_URL, API_BASE_URL2 } = config;
1010
export default function LoginButton() {
1111
const state = useSelector((store:RootState) => store.appState);
1212
const dispatch = useDispatch();
13-
console.log('doc cookie 1', Cookies.get())
13+
// console.log('doc cookie 1', Cookies.get())
1414
const handleLogout = () => {
15-
console.log('doc cookie 2', Cookies.get('ssid'))
16-
// document.cookie = 'ssid' + '=; Max-Age=0';
17-
console.log('doc cookie 3', Cookies.get())
15+
// console.log('doc cookie 2', Cookies.get('ssid'))
16+
// // document.cookie = 'ssid' + '=; Max-Age=0';
17+
// console.log('doc cookie 3', Cookies.get())
1818

1919
window.localStorage.clear();
2020

app/src/components/top/NavBarButtons.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import List from '@mui/material/List';
88
import ListItem from '@mui/material/ListItem';
99
import ListItemText from '@mui/material/ListItemText';
1010
import LoginButton from '../right/LoginButton';
11-
import MarketplaceButton from '../right/MarketplaceButton';
1211
import Menu from '@mui/material/Menu';
1312
import MenuItem from '@mui/material/MenuItem';
1413
import ProjectsFolder from '../right/OpenProjects';
@@ -357,7 +356,7 @@ function navbarDropDown(props) {
357356
></input>
358357
<button onClick={() => joinRoom()}>Join Room</button>
359358
<p>In Room: {joinedRoom}</p>
360-
<Link to="/marketplace" style={{ textDecoration: 'none' }} target="_blank">
359+
<Link to="/marketplace" style={{ textDecoration: 'none' }}>
361360
<button>
362361
Marketplace
363362
<svg

app/src/index.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import { HTML5Backend } from 'react-dnd-html5-backend';
1212
import App from './components/App';
1313
import Cookies from 'js-cookie';
1414
import FBPassWord from './components/login/FBPassWord';
15-
import MarketplaceButton from './components/right/MarketplaceButton';
1615
import MarketplaceContainer from './containers/MarketplaceContainer';
1716
import ProjectDashboard from './Dashboard/ProjectContainer';
1817
import { Provider } from 'react-redux';

0 commit comments

Comments
 (0)