Skip to content

Commit bd564f5

Browse files
authored
Merge pull request #75 from webdoc-labs/design/app-bar
Design: App bar + explorer + page-content + members-explorer design
2 parents 45691d7 + 6246994 commit bd564f5

File tree

32 files changed

+7859
-4164
lines changed

32 files changed

+7859
-4164
lines changed

common/config/rush/pnpm-lock.yaml

Lines changed: 54 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/webdoc-default-template/package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@
4141
"dependencies": {
4242
"@babel/core": "^7.9.0",
4343
"@babel/preset-react": "^7.10.1",
44-
"@material-ui/icons": "^4.9.1",
45-
"@material-ui/lab": "^4.0.0-alpha.56",
4644
"@webdoc/model": "^1.1.5",
4745
"@webdoc/template-library": "^1.1.5",
4846
"code-prettify": "^0.1.0",
@@ -60,6 +58,8 @@
6058
"@babel/preset-react": "^7.10.1",
6159
"@babel/register": "^7.9.0",
6260
"@material-ui/core": "^4.10.2",
61+
"@material-ui/icons": "^4.9.1",
62+
"@material-ui/lab": "^4.0.0-alpha.56",
6363
"@webdoc/babel-preset": "^1.0.0",
6464
"@webdoc/eslint-config": "^1.0.0",
6565
"babel-loader": "^8.1.0",
@@ -80,6 +80,8 @@
8080
"sass": "^1.26.10",
8181
"sass-loader": "^9.0.3",
8282
"webpack": "^4.43.0",
83-
"webpack-stream": "^5.2.1"
83+
"webpack-stream": "^5.2.1",
84+
"redux": "~4.0.5",
85+
"react-redux": "~7.2.2"
8486
}
8587
}

packages/webdoc-default-template/publish.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,6 @@ function outReference(
210210

211211
page = linker.processInternalURI(page, {outputRelative: true});
212212

213-
console.log(page);
214-
215213
let doc;
216214

217215
try {

packages/webdoc-default-template/src/app/components/Explorer/ExplorerCategoryItem.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import ExplorerItem from "./ExplorerItem";
22
import TreeItem from "@material-ui/lab/TreeItem";
33
import cuid from "cuid";
4-
import {useExplorerStyles} from "./useExplorerStyles";
5-
4+
import {useExplorerCategoryStyles} from "./useExplorerStyles";
65

76
export default function ExplorerCategoryItem(props) {
8-
const classes = useExplorerStyles();
7+
const classes = useExplorerCategoryStyles();
98

109
if (!props.data.nodeId) {
1110
props.data.nodeId = cuid();
@@ -16,6 +15,7 @@ export default function ExplorerCategoryItem(props) {
1615
className="explorer-tree__group"
1716
classes={{
1817
label: classes.label,
18+
labelContainer: classes.labelContainer,
1919
iconContainer: classes.iconContainer,
2020
selected: classes.selected,
2121
}}
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
import IconButton from "@material-ui/core/IconButton";
2+
import MenuIcon from "@material-ui/icons/Menu";
3+
import {makeStyles} from "@material-ui/core/styles";
4+
5+
const useToggleButtonStyles = makeStyles({
6+
root: {
7+
margin: "0 0 0 12px",
8+
},
9+
});
10+
11+
export default function ExplorerHeader({
12+
isOpen,
13+
toggleOpen,
14+
}) {
15+
const {root} = useToggleButtonStyles();
16+
17+
return (
18+
<section className={"explorer__header" + (
19+
isOpen ? " explorer__header-opened" : " explorer__header-closed"
20+
)}>
21+
<IconButton
22+
aria-label="Toggle Explorer"
23+
classes={{
24+
root,
25+
}}
26+
onClick={toggleOpen}
27+
>
28+
<MenuIcon />
29+
</IconButton>
30+
<span className="explorer__header__title">{"{ "}<i>webdoc</i>{" }"}</span>
31+
</section>
32+
);
33+
}

packages/webdoc-default-template/src/app/components/Explorer/ExplorerItem.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1+
import {useExplorerCategoryStyles, useExplorerStyles} from "./useExplorerStyles";
12
import ExplorerTargetGroup from "./ExplorerCategoryItem";
23
import Link from "@material-ui/core/Link";
34
//import React from "react";
45
import TreeItem from "@material-ui/lab/TreeItem";
56
import cuid from "cuid";
6-
import {useExplorerStyles} from "./useExplorerStyles";
7-
87

98
export default function ExplorerItem(props) {
109
if (!props.data.nodeId) {
1110
props.data.nodeId = cuid();
1211
}
1312

14-
const classes = useExplorerStyles();
13+
const classesItem = useExplorerStyles();
14+
const classesCategory = useExplorerCategoryStyles();
1515
const targetChildren = [];
1616

1717
let i = 0;
@@ -23,6 +23,8 @@ export default function ExplorerItem(props) {
2323
i++;
2424
}
2525

26+
const classes = i > 0 ? classesCategory : classesItem;
27+
2628
return (
2729
<TreeItem
2830
className="explorer-tree__target"

0 commit comments

Comments
 (0)