Skip to content

Commit c960c9f

Browse files
authored
Pop up menu on selected routes (#43)
1 parent 8172647 commit c960c9f

File tree

4 files changed

+6
-2
lines changed

4 files changed

+6
-2
lines changed

src/app/components/Authentication/Login.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { faSpinner } from '@fortawesome/free-solid-svg-icons';
22
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
33
import { API_BASE_URL } from 'app/../config/config';
4+
import PopUpMenu from 'app/components/PopUpMenu';
45
import { Routes } from 'app/routes';
56
import * as styles from 'app/styles/Authentication.module.css';
67
import * as registerStyles from 'app/styles/Register.module.css';
@@ -226,6 +227,7 @@ export class Login extends React.Component<LoginInterfaces.Props, LoginInterface
226227
</div>
227228
</Col>
228229
</Row>
230+
<PopUpMenu />
229231
</div>
230232
);
231233
}

src/app/components/Authentication/Register.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { faChevronCircleLeft, faChevronCircleRight } from '@fortawesome/free-solid-svg-icons';
22
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
33
import { RECAPTCHA_SITE_KEY } from 'app/../config/config';
4+
import PopUpMenu from 'app/components/PopUpMenu';
45
import { Routes } from 'app/routes';
56
import * as authStyles from 'app/styles/Authentication.module.css';
67
import * as registerStyles from 'app/styles/Register.module.css';
@@ -546,6 +547,7 @@ export class Register extends React.Component<RegisterInterfaces.Props, Register
546547
</div>
547548
</Col>
548549
</Row>
550+
<PopUpMenu />
549551
</div>
550552
);
551553
}

src/app/components/UserProfileModal/index.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import PopUpMenu from 'app/components/PopUpMenu';
12
import { EditPassword } from 'app/components/UserProfileModal/EditPassword';
23
import { EditProfile } from 'app/components/UserProfileModal/EditProfile';
34
import * as styles from 'app/styles/UserProfileModal.module.css';
@@ -103,6 +104,7 @@ export class UserProfileModal extends React.Component<
103104
)}
104105
</Row>
105106
) : null}
107+
<PopUpMenu />
106108
</Grid>
107109
);
108110
}

src/app/index.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import PopUpMenu from 'app/components/PopUpMenu';
21
import Login from 'app/containers/Authentication/Login';
32
import Register from 'app/containers/Authentication/Register';
43
import Dashboard from 'app/containers/Dashboard';
@@ -25,7 +24,6 @@ export const App = hot(module)(() => (
2524
<Route exact path={Routes.LEADERBOARD} component={Leaderboard} />
2625
<Route exact path={Routes.USER_PROFILE_MODEL} component={UserProfileModal} />
2726
</Switch>
28-
<PopUpMenu />
2927
<Sugar background="#484848" color="white" />
3028
</BrowserRouter>
3129
));

0 commit comments

Comments
 (0)