Skip to content

Commit 545187e

Browse files
Bogdan-LyashenkoBogdan-Lyashenko
committed
Add hjs
1 parent 9a6eda1 commit 545187e

7 files changed

Lines changed: 51470 additions & 22147 deletions

File tree

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"react": "^16.3.2",
3030
"react-dom": "^16.3.2",
3131
"react-redux": "^5.0.7",
32+
"react-syntax-highlighter": "^7.0.4",
3233
"redux": "^4.0.0",
3334
"redux-thunk": "^2.2.0",
3435
"style-loader": "^0.21.0",

‎src/public/dist/bundle.js‎

Lines changed: 51299 additions & 22129 deletions
Large diffs are not rendered by default.

‎src/public/dist/bundle.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/public/js/components/side-bar/component/Code/Code.js‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import React from 'react';
2+
import SyntaxHighlighter from 'react-syntax-highlighter';
3+
import { atomOneLight } from 'react-syntax-highlighter/styles/hljs';
4+
5+
//TODO: scrool to/highlight crumbed lines
6+
//https://github.com/conorhastings/react-syntax-highlighter/blob/master/README.md
7+
export default ({ code, crumbedLines = [] }) => (
8+
<SyntaxHighlighter
9+
language="javascript"
10+
style={atomOneLight}
11+
customStyle={{ fontSize: '13px' }}
12+
>
13+
{code}
14+
</SyntaxHighlighter>
15+
);

‎src/public/js/components/side-bar/component/SideBar.css‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,17 @@
11
.SideBar-container {
22
position: absolute;
3-
right: 0;
4-
top: 0;
5-
height: 100%;
6-
width: 450px;
3+
right: 0px;
4+
top: 60px;
5+
height: calc(100% - 70px);
6+
width: 500px;
77
z-index: 2;
8-
}
8+
background-color: white;
9+
border-left: 1px solid #bfbfbf;
10+
padding: 0 16px;
11+
}
12+
13+
.SideBar-header {
14+
width: 100%;
15+
display: flex;
16+
justify-content: space-between;
17+
}

‎src/public/js/components/side-bar/component/SideBar.js‎

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,42 @@
11
import React from 'react';
2+
import { Tabs } from 'antd';
3+
const TabPane = Tabs.TabPane;
24
import './SideBar.css';
3-
import { Card } from 'antd';
5+
import Code from './Code/Code';
46

57
//TODO: Add slide from right animation
68
export default ({ file, codeCrumb, onClose }) => {
9+
const crumbedLines = !codeCrumb
10+
? []
11+
: codeCrumb.crumbedLineNode.loc.start.line;
12+
713
return (
814
<div className="SideBar-container">
9-
<Card
10-
title={file.path}
11-
extra={
12-
<a href="#" onClick={onClose}>
13-
[X]
14-
</a>
15-
}
16-
>
17-
<p>file: {file.name}</p>
18-
{codeCrumb && <p>crumb: {codeCrumb.name}</p>}
19-
</Card>
15+
<div className="SideBar-header">
16+
<div>{file.path}</div>
17+
<a href="#" onClick={onClose}>
18+
X
19+
</a>
20+
</div>
21+
22+
<div className="SideBar-body">
23+
{file.fileCode && (
24+
<Tabs defaultActiveKey="1" onChange={() => {}}>
25+
<TabPane tab="Code" key="1">
26+
<Code
27+
code={file.fileCode}
28+
crumbedLines={crumbedLines}
29+
/>
30+
</TabPane>
31+
<TabPane tab="FlowChart" key="2">
32+
Content of Tab Pane 2
33+
</TabPane>
34+
<TabPane tab="Crumbs" key="3">
35+
Content of Tab Pane 3
36+
</TabPane>
37+
</Tabs>
38+
)}
39+
</div>
2040
</div>
2141
);
2242
};

‎yarn.lock‎

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1154,6 +1154,10 @@ call-me-maybe@^1.0.1:
11541154
version "1.0.1"
11551155
resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
11561156

1157+
camelcase@^3.0.0:
1158+
version "3.0.0"
1159+
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
1160+
11571161
camelcase@^4.0.0, camelcase@^4.1.0:
11581162
version "4.1.0"
11591163
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
@@ -1302,6 +1306,14 @@ cli-width@^2.0.0:
13021306
version "2.2.0"
13031307
resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
13041308

1309+
clipboard@^2.0.0:
1310+
version "2.0.1"
1311+
resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.1.tgz#a12481e1c13d8a50f5f036b0560fe5d16d74e46a"
1312+
dependencies:
1313+
good-listener "^1.2.2"
1314+
select "^1.1.2"
1315+
tiny-emitter "^2.0.0"
1316+
13051317
cliui@^4.0.0:
13061318
version "4.1.0"
13071319
resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
@@ -1405,6 +1417,12 @@ colors@~1.1.2:
14051417
version "1.1.2"
14061418
resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
14071419

1420+
comma-separated-tokens@^1.0.0:
1421+
version "1.0.5"
1422+
resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.5.tgz#b13793131d9ea2d2431cf5b507ddec258f0ce0db"
1423+
dependencies:
1424+
trim "0.0.1"
1425+
14081426
commander@2.13.0, commander@~2.13.0:
14091427
version "2.13.0"
14101428
resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
@@ -1763,6 +1781,10 @@ defined@^1.0.0:
17631781
version "1.0.0"
17641782
resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
17651783

1784+
delegate@^3.1.2:
1785+
version "3.2.0"
1786+
resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166"
1787+
17661788
delegates@^1.0.0:
17671789
version "1.0.0"
17681790
resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
@@ -2215,6 +2237,12 @@ fastparse@^1.1.1:
22152237
version "1.1.1"
22162238
resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
22172239

2240+
fault@^1.0.2:
2241+
version "1.0.2"
2242+
resolved "https://registry.yarnpkg.com/fault/-/fault-1.0.2.tgz#c3d0fec202f172a3a4d414042ad2bb5e2a3ffbaa"
2243+
dependencies:
2244+
format "^0.2.2"
2245+
22182246
fbjs@^0.8.15, fbjs@^0.8.16, fbjs@^0.8.9:
22192247
version "0.8.16"
22202248
resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
@@ -2335,6 +2363,10 @@ for-own@^0.1.4:
23352363
dependencies:
23362364
for-in "^1.0.1"
23372365

2366+
format@^0.2.2:
2367+
version "0.2.2"
2368+
resolved "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b"
2369+
23382370
fragment-cache@^0.2.1:
23392371
version "0.2.1"
23402372
resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
@@ -2537,6 +2569,12 @@ gonzales-pe@^3.4.4:
25372569
dependencies:
25382570
minimist "1.1.x"
25392571

2572+
good-listener@^1.2.2:
2573+
version "1.2.2"
2574+
resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50"
2575+
dependencies:
2576+
delegate "^3.1.2"
2577+
25402578
got@^6.7.1:
25412579
version "6.7.1"
25422580
resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
@@ -2697,6 +2735,24 @@ hash.js@^1.0.0, hash.js@^1.0.3:
26972735
inherits "^2.0.3"
26982736
minimalistic-assert "^1.0.0"
26992737

2738+
hast-util-parse-selector@^2.0.0:
2739+
version "2.1.0"
2740+
resolved "https://registry.yarnpkg.com/hast-util-parse-selector/-/hast-util-parse-selector-2.1.0.tgz#b55c0f4bb7bb2040c889c325ef87ab29c38102b4"
2741+
2742+
hastscript@^3.1.0:
2743+
version "3.1.0"
2744+
resolved "https://registry.yarnpkg.com/hastscript/-/hastscript-3.1.0.tgz#66628ba6d7f1ad07d9277dd09028aba7f4934599"
2745+
dependencies:
2746+
camelcase "^3.0.0"
2747+
comma-separated-tokens "^1.0.0"
2748+
hast-util-parse-selector "^2.0.0"
2749+
property-information "^3.0.0"
2750+
space-separated-tokens "^1.0.0"
2751+
2752+
highlight.js@~9.12.0:
2753+
version "9.12.0"
2754+
resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.12.0.tgz#e6d9dbe57cbefe60751f02af336195870c90c01e"
2755+
27002756
hmac-drbg@^1.0.0:
27012757
version "1.0.1"
27022758
resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
@@ -3504,6 +3560,13 @@ lowercase-keys@^1.0.0:
35043560
version "1.0.1"
35053561
resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
35063562

3563+
lowlight@~1.9.1:
3564+
version "1.9.2"
3565+
resolved "https://registry.yarnpkg.com/lowlight/-/lowlight-1.9.2.tgz#0b9127e3cec2c3021b7795dd81005c709a42fdd1"
3566+
dependencies:
3567+
fault "^1.0.2"
3568+
highlight.js "~9.12.0"
3569+
35073570
lru-cache@^4.0.1, lru-cache@^4.1.1:
35083571
version "4.1.2"
35093572
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.2.tgz#45234b2e6e2f2b33da125624c4664929a0224c3f"
@@ -4631,6 +4694,12 @@ pretty-ms@^3.0.1:
46314694
parse-ms "^1.0.0"
46324695
plur "^2.1.2"
46334696

4697+
prismjs@^1.8.4, prismjs@~1.14.0:
4698+
version "1.14.0"
4699+
resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.14.0.tgz#bbccfdb8be5d850d26453933cb50122ca0362ae0"
4700+
optionalDependencies:
4701+
clipboard "^2.0.0"
4702+
46344703
private@^0.1.6, private@^0.1.8, private@~0.1.5:
46354704
version "0.1.8"
46364705
resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
@@ -4661,6 +4730,10 @@ prop-types@15.x, prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, pr
46614730
loose-envify "^1.3.1"
46624731
object-assign "^4.1.1"
46634732

4733+
property-information@^3.0.0:
4734+
version "3.2.0"
4735+
resolved "https://registry.yarnpkg.com/property-information/-/property-information-3.2.0.tgz#fd1483c8fbac61808f5fe359e7693a1f48a58331"
4736+
46644737
prr@~1.0.1:
46654738
version "1.0.1"
46664739
resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
@@ -5153,6 +5226,16 @@ react-slick@~0.23.1:
51535226
lodash.debounce "^4.0.8"
51545227
resize-observer-polyfill "^1.5.0"
51555228

5229+
react-syntax-highlighter@^7.0.4:
5230+
version "7.0.4"
5231+
resolved "https://registry.yarnpkg.com/react-syntax-highlighter/-/react-syntax-highlighter-7.0.4.tgz#38d0cabada32fd4a7d08db4b7fbdb33565c9420d"
5232+
dependencies:
5233+
babel-runtime "^6.18.0"
5234+
highlight.js "~9.12.0"
5235+
lowlight "~1.9.1"
5236+
prismjs "^1.8.4"
5237+
refractor "^2.4.1"
5238+
51565239
react@^16.3.2:
51575240
version "16.3.2"
51585241
resolved "https://registry.yarnpkg.com/react/-/react-16.3.2.tgz#fdc8420398533a1e58872f59091b272ce2f91ea9"
@@ -5255,6 +5338,13 @@ redux@^4.0.0:
52555338
loose-envify "^1.1.0"
52565339
symbol-observable "^1.2.0"
52575340

5341+
refractor@^2.4.1:
5342+
version "2.4.1"
5343+
resolved "https://registry.yarnpkg.com/refractor/-/refractor-2.4.1.tgz#067654311ed1618fc2dd76e9263c8cf05ab6298b"
5344+
dependencies:
5345+
hastscript "^3.1.0"
5346+
prismjs "~1.14.0"
5347+
52585348
regenerate@^1.2.1:
52595349
version "1.3.3"
52605350
resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.3.tgz#0c336d3980553d755c39b586ae3b20aa49c82b7f"
@@ -5516,6 +5606,10 @@ scoped-regex@^1.0.0:
55165606
version "1.0.0"
55175607
resolved "https://registry.yarnpkg.com/scoped-regex/-/scoped-regex-1.0.0.tgz#a346bb1acd4207ae70bd7c0c7ca9e566b6baddb8"
55185608

5609+
select@^1.1.2:
5610+
version "1.1.2"
5611+
resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
5612+
55195613
semver-diff@^2.0.0:
55205614
version "2.1.0"
55215615
resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
@@ -5690,6 +5784,12 @@ source-map@^0.6.1, source-map@~0.6.1:
56905784
version "0.6.1"
56915785
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
56925786

5787+
space-separated-tokens@^1.0.0:
5788+
version "1.1.2"
5789+
resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-1.1.2.tgz#e95ab9d19ae841e200808cd96bc7bd0adbbb3412"
5790+
dependencies:
5791+
trim "0.0.1"
5792+
56935793
spdx-correct@^3.0.0:
56945794
version "3.0.0"
56955795
resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82"
@@ -6000,6 +6100,10 @@ timers-browserify@^2.0.4:
60006100
dependencies:
60016101
setimmediate "^1.0.4"
60026102

6103+
tiny-emitter@^2.0.0:
6104+
version "2.0.2"
6105+
resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.0.2.tgz#82d27468aca5ade8e5fd1e6d22b57dd43ebdfb7c"
6106+
60036107
tmp@^0.0.33:
60046108
version "0.0.33"
60056109
resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
@@ -6054,6 +6158,10 @@ trim-right@^1.0.1:
60546158
version "1.0.1"
60556159
resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
60566160

6161+
trim@0.0.1:
6162+
version "0.0.1"
6163+
resolved "https://registry.yarnpkg.com/trim/-/trim-0.0.1.tgz#5858547f6b290757ee95cccc666fb50084c460dd"
6164+
60576165
tty-browserify@0.0.0:
60586166
version "0.0.0"
60596167
resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"

0 commit comments

Comments
 (0)