Skip to content

Commit 3a427fb

Browse files
authored
Merge branch 'dev' into dev
2 parents dc3ef1c + 570a51c commit 3a427fb

File tree

7 files changed

+77
-30
lines changed

7 files changed

+77
-30
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,6 @@ dist
102102

103103
# TernJS port file
104104
.tern-port
105+
106+
# VS Code settings
107+
.vscode/

server.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
/* global process */
2-
const express = require("express");
2+
const express = require('express');
33

44
const app = express();
55

66
app.use(
77
"/navbar",
88
express.static("./dist", {
99
setHeaders: function setHeaders(res) {
10-
res.header("Access-Control-Allow-Origin", "*");
11-
res.header("Access-Control-Allow-Methods", "GET");
10+
res.header('Access-Control-Allow-Origin', '*');
11+
res.header('Access-Control-Allow-Methods', 'GET');
1212
res.header(
13-
"Access-Control-Allow-Headers",
14-
"Origin, X-Requested-With, Content-Type, Accept"
13+
'Access-Control-Allow-Headers',
14+
'Origin, X-Requested-With, Content-Type, Accept'
1515
);
1616
},
1717
})
Lines changed: 15 additions & 0 deletions
Loading

src/assets/images/create-team.svg

Lines changed: 15 additions & 0 deletions
Loading

src/assets/images/taas-admin.png

5.85 KB
Loading

src/components/Menu/index.jsx

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
*
44
* General component to show menu with submenu.
55
*/
6-
import React, { Fragment, useCallback, useState } from "react";
7-
import { useLocation } from "@reach/router";
8-
import cn from "classnames";
9-
import { includes, map } from "lodash";
10-
import NavLink from "../NavLink";
11-
import "./styles.css";
6+
import React, { Fragment, useCallback, useState } from 'react';
7+
import { useLocation } from '@reach/router';
8+
import cn from 'classnames';
9+
import { includes, map } from 'lodash';
10+
import NavLink from '../NavLink';
11+
import './styles.css';
1212

1313
const SubMenu = ({ option }) => {
1414
const location = useLocation();
1515

1616
const [isOpen, setIsOpen] = useState(
17-
includes(map(option.children, "path"), location.pathname)
17+
includes(map(option.children, 'path'), location.pathname)
1818
);
1919

2020
const toggleOpen = useCallback(() => {
@@ -24,8 +24,8 @@ const SubMenu = ({ option }) => {
2424
return (
2525
<>
2626
<span
27-
className={cn("menu-link menu-link-toggle", {
28-
"menu-link-toggle-up": isOpen,
27+
className={cn('menu-link menu-link-toggle', {
28+
'menu-link-toggle-up': isOpen,
2929
})}
3030
onClick={toggleOpen}
3131
role="button"
@@ -62,6 +62,7 @@ const Menu = ({ options, sidebarCollapsed }) => (
6262
to={option.path}
6363
activeClassName="menu-link-active"
6464
className="menu-link"
65+
exact={option.isExact}
6566
>
6667
<img
6768
src={option.activeIcon}

0 commit comments

Comments
 (0)