Skip to content

Commit 3dfb2f7

Browse files
authored
Merge pull request #89 from paustint/logo
Logo update
2 parents d8df0a5 + f851175 commit 3dfb2f7

13 files changed

+107
-85
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## 2.2.3
4+
5+
Jan 4, 2020
6+
7+
1. Added logo to README and updated docs.
8+
39
## 2.2.2
410

511
Dec 2, 2019

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SOQL Parser JS
1+
<img src="./assets/soql-parser-js-logo.svg">
22

33
[![build](https://api.travis-ci.com/paustint/soql-parser-js.png?branch=master)](https://travis-ci.com/paustint/soql-parser-js)
44
[![npm version](https://badge.fury.io/js/soql-parser-js.svg)](https://badge.fury.io/js/soql-parser-js)

assets/soql-parser-js-logo.svg

Lines changed: 1 addition & 0 deletions
Loading

docs/package-lock.json

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

docs/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
"homepage": "http://paustint.github.io/soql-parser-js",
66
"dependencies": {
77
"@types/jest": "24.0.18",
8-
"@types/lodash": "^4.14.136",
8+
"@types/lodash": "^4.14.149",
99
"@types/node": "12.7.8",
1010
"@types/react": "16.9.3",
1111
"@types/react-copy-to-clipboard": "^4.3.0",
1212
"@types/react-dom": "16.9.1",
1313
"@types/react-syntax-highlighter": "0.0.7",
1414
"gh-pages": "^2.0.1",
1515
"lodash": "^4.17.14",
16-
"office-ui-fabric-react": "^6.84.0",
17-
"react": "^16.10.1",
18-
"react-copy-to-clipboard": "^5.0.1",
19-
"react-dom": "^16.10.1",
16+
"office-ui-fabric-react": "^6.211.0",
17+
"react": "^16.12.0",
18+
"react-copy-to-clipboard": "^5.0.2",
19+
"react-dom": "^16.12.0",
2020
"react-scripts": "3.1.2",
2121
"react-syntax-highlighter": "^9.0.0",
2222
"soql-parser-js": "^2.2.2",

docs/src/App.tsx

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,23 @@ import SampleQueries from './components/sample-queries';
88

99
initializeIcons();
1010

11-
interface IAppstate {
12-
soql: string;
13-
}
11+
class App extends React.Component<any, any> {
12+
parseSoqlRef: React.RefObject<ParseSoql>;
1413

15-
class App extends React.Component<any, IAppstate> {
1614
constructor(props: any) {
1715
super(props);
16+
17+
this.parseSoqlRef = React.createRef<ParseSoql>();
18+
1819
this.state = {
1920
soql: 'SELECT Id, Name FROM Account',
2021
};
2122
}
23+
2224
public onQuerySelected = (soql: string) => {
23-
this.setState({ soql });
25+
if (this.parseSoqlRef.current) {
26+
this.parseSoqlRef.current.soqlQueryExternalChange(soql);
27+
}
2428
};
2529

2630
public render() {
@@ -33,7 +37,7 @@ class App extends React.Component<any, IAppstate> {
3337
<div className="ms-Grid">
3438
<div className="ms-Grid-row">
3539
<div className="ms-Grid-col ms-sm6">
36-
<ParseSoql soql={this.state.soql} />
40+
<ParseSoql ref={this.parseSoqlRef} />
3741
</div>
3842
<div className="ms-Grid-col ms-sm6 queries-col">
3943
<SampleQueries onQuerySelected={this.onQuerySelected} />

docs/src/components/navbar.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
import * as React from 'react';
22
import './navbar.css';
33
import * as ghImage from '../images/GitHub-Mark-Light-32px.png';
4+
import { ReactComponent as Logo } from '../images/soql-parser-js-logo.svg';
45

56
export function Navbar(props: any) {
67
return (
78
<div className="NavBar">
8-
<div className="logo ms-font-xl">
9-
<strong>SOQL Parser JS</strong>
9+
<div style={{ width: 350, paddingTop: 5 }}>
10+
<Logo style={{ backgroundColor: '#fff' }} />
1011
</div>
1112
<div className="logos">
12-
<a href="https://github.com/paustint/soql-parser-js" target="_blank">
13-
<img src={ghImage.default} />
13+
<a href="https://github.com/paustint/soql-parser-js" target="_blank" rel="noopener noreferrer">
14+
<img src={ghImage.default} alt="github logo" />
1415
</a>
1516
</div>
1617
</div>

docs/src/components/parse-soql-code-output.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ export interface CodeOutputProps {
1616
}
1717

1818
export default class CodeOutput extends React.Component<CodeOutputProps, any> {
19-
constructor(props: CodeOutputProps) {
20-
super(props);
21-
}
22-
2319
public render() {
2420
return (
2521
<div className="ms-Grid-row">

0 commit comments

Comments
 (0)