Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
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
4 changes: 3 additions & 1 deletion src/app/AuthenticatedApp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ import {

import Dashboard from 'routes/dashboard';
import Associate from 'routes/associate';
import { PROFILE, ASSOCIATE } from 'constants/routes';
import Tiles from 'routes/tiles';
import { PROFILE, ASSOCIATE, TILES } from 'constants/routes';

const RedirectPath = () => {
const history = useHistory();
Expand All @@ -23,6 +24,7 @@ const AuthenticatedApp: React.FC = () => {
<Router>
<Switch>
<Route exact path={PROFILE} component={Dashboard} />
<Route exact path={TILES} component={Tiles} />
<Route exact path={ASSOCIATE} component={Associate} />
<Route component={RedirectPath} />
</Switch>
Expand Down
3 changes: 3 additions & 0 deletions src/assets/images/tiles/black_blue_btm_left.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/images/tiles/black_blue_btm_right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/images/tiles/black_blue_top_left.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/images/tiles/black_blue_top_right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/images/tiles/black_tile.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/images/tiles/blue_tile.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/images/tiles/grey_tile.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion src/components/navbar/SideBar.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { Link, useHistory } from 'react-router-dom';
import APP_LOGO from 'assets/images/app.png';
import { PROFILE, HOME, ASSOCIATE } from 'constants/routes';
import { PROFILE, HOME, ASSOCIATE, TILES } from 'constants/routes';
import firebase from 'utils/firebase';

import './SideBar.scss';
Expand Down Expand Up @@ -32,6 +32,9 @@ const SideBar: React.FC<SideBarProps> = ({ isOpen, setIsOpen }) => {
<Link to={ASSOCIATE} onClick={() => setIsOpen(false)}>
Associate
</Link>
<Link to={TILES} onClick={() => setIsOpen(false)}>
Tiles
</Link>
<div className="sidenav__divider" />
<button
type="button"
Expand Down
1 change: 1 addition & 0 deletions src/constants/routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ export const HOME = '/';
export const LOGIN = '/login';
export const PROFILE = '/profile';
export const ASSOCIATE = '/cognitive/associate';
export const TILES = '/cognitive/tiles';
46 changes: 0 additions & 46 deletions src/routes/associate/Associate.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,49 +4,3 @@
margin: 15px;
text-align: center;
}

.left {
float: left;
width: 50%;
&-box {
background: #fff;
border: 3px solid #000;
border-radius: 5px;
width: 150px;
height: 150px;
margin: 10px;
padding: 10px;
}
}
.right {
float: right;
width: 50%;
&-box {
background: #fff;
border: 1px solid #999;
border-radius: 5px;
width: 150px;
height: 150px;
margin: 10px;
padding: 10px;
}
}

img {
max-width: 100%;
height: auto;
}

.group:after {
content: '';
display: table;
clear: both;
}

@media screen and (max-width: 480px) {
.left,
.right {
float: none;
width: auto;
}
}
9 changes: 5 additions & 4 deletions src/routes/associate/Associate.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import React from 'react';
import { ToastProvider } from 'react-toast-notifications';
import Game from './Game/Game';

import './Associate.scss';

export const Associate: React.FC = () => {
return (
<div className="associate group">
<div>Associate</div>
<div>Choose the right item associated with the big picture!</div>
<Game />
<div className="associate">
<ToastProvider>
<Game />
</ToastProvider>
</div>
);
};
Expand Down
6 changes: 0 additions & 6 deletions src/routes/associate/Canvas/canvas.scss

This file was deleted.

140 changes: 0 additions & 140 deletions src/routes/associate/Canvas/canvas.tsx

This file was deleted.

32 changes: 0 additions & 32 deletions src/routes/associate/DragContainer/DragContainer.scss

This file was deleted.

29 changes: 0 additions & 29 deletions src/routes/associate/DragContainer/DragContainer.tsx

This file was deleted.

Loading