Skip to content
This repository was archived by the owner on Sep 3, 2024. It is now read-only.

Commit fab9a6d

Browse files
bringing in linter
1 parent 582faf8 commit fab9a6d

File tree

8 files changed

+39
-35
lines changed

8 files changed

+39
-35
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
"scripts": {
77
"analyze": "source-map-explorer build/static/js/main.*",
88
"start": "react-scripts-ts start",
9-
"build": "prettier --list-different \"src/**/*.js\" \"src/**/*.ts\" \"src/**/*.tsx\" && react-scripts-ts build",
9+
"build": "prettier --list-different \"src/**/*.js\" \"src/**/*.ts\" \"src/**/*.tsx\" && tslint --project ./ && react-scripts-ts build",
1010
"eject": "react-scripts-ts eject",
11-
"format": "prettier --write \"src/**/*.js\" \"src/**/*.ts\" \"src/**/*.tsx\""
11+
"format": "prettier --write \"src/**/*.js\" \"src/**/*.ts\" \"src/**/*.tsx\" && tslint --project ./ --fix"
1212
},
1313
"main": "src/index.tsx",
1414
"private": false,

src/components/HyperMediaControls/Dialog.tsx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
import React, {
2-
FormEventHandler,
3-
PureComponent,
4-
StatelessComponent,
5-
} from 'react';
61
import {
72
Button,
83
Dialog,
9-
DialogTitle,
104
DialogActions,
115
DialogContent,
6+
DialogTitle,
127
Slide,
138
withStyles,
149
WithStyles,
1510
} from '@material-ui/core';
11+
import React, {
12+
FormEventHandler,
13+
PureComponent,
14+
StatelessComponent,
15+
} from 'react';
1616

17-
import RelIcon from '../RelIcon';
18-
import RelButton from './RelButton';
19-
import HelpButton from './HelpButton';
2017
import { SlideProps } from '@material-ui/core/Slide';
2118
import { HalLink } from '../../types';
19+
import RelIcon from '../RelIcon';
20+
import HelpButton from './HelpButton';
21+
import RelButton from './RelButton';
2222
const styles = theme => ({
2323
button: {
2424
margin: theme.spacing.unit,

src/components/HyperMediaControls/HelpButton.tsx

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
import React, { PureComponent, ReactNode } from 'react';
21
import {
32
Button,
43
Drawer,
54
Typography,
65
WithStyles,
76
withStyles,
87
} from '@material-ui/core';
8+
import React, { PureComponent, ReactNode } from 'react';
99
import Remarkable from 'react-remarkable';
1010
import uriTemplate from 'uri-template';
11-
import { Help } from '../Icons';
12-
import { withAuthorization } from '../AuthorizationProvider';
13-
import { http } from '../../utils';
1411
import { HalLink } from '../../types';
12+
import { http } from '../../utils';
13+
import { withAuthorization } from '../AuthorizationProvider';
14+
import { Help } from '../Icons';
1515

1616
const getCurie = (rel: string, curies: HalLink[]): HalLink => {
1717
const [prefix, rest] = rel.split(':', 2);
@@ -80,15 +80,6 @@ interface HelpButtonState extends HalLink {
8080
}
8181

8282
class HelpButton extends PureComponent<HelpButtonProps, HelpButtonState> {
83-
state = {
84-
open: false,
85-
href: '',
86-
type: '',
87-
disabled: true,
88-
documentation: '',
89-
curies: [],
90-
};
91-
9283
static getDerivedStateFromProps = (
9384
{ rel, curies }: HelpButtonProps,
9485
state: HelpButtonState,
@@ -97,6 +88,14 @@ class HelpButton extends PureComponent<HelpButtonProps, HelpButtonState> {
9788
disabled: false,
9889
...getCurie(rel, curies),
9990
});
91+
state = {
92+
open: false,
93+
href: '',
94+
type: '',
95+
disabled: true,
96+
documentation: '',
97+
curies: [],
98+
};
10099

101100
_handleOnClick = async () => {
102101
const { authorization } = this.props;

src/components/HyperMediaControls/LinkButton.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import React, { PureComponent, StatelessComponent } from 'react';
21
import { TextField } from '@material-ui/core';
3-
import { HalLink, NavigatableProps } from '../../types';
2+
import React, { PureComponent, StatelessComponent } from 'react';
43
import uriTemplate from 'uri-template';
4+
import { HalLink, NavigatableProps } from '../../types';
5+
import { preventDefault } from '../../utils';
56
import { withNavigation } from '../NavigationProvider';
67
import Dialog from './Dialog';
78
import RelButton from './RelButton';
8-
import { preventDefault } from '../../utils';
99

1010
interface LinkButtonProps {
1111
readonly rel: string;

src/components/HyperMediaControls/RelButton.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import React, { ReactNode, StatelessComponent } from 'react';
21
import { Button } from '@material-ui/core';
3-
import RelIcon from '../RelIcon';
42
import { ButtonProps } from '@material-ui/core/Button';
53
import { SvgIconProps } from '@material-ui/core/SvgIcon';
4+
import React, { ReactNode, StatelessComponent } from 'react';
5+
import RelIcon from '../RelIcon';
66

77
interface RelButtonProps {
88
rel: string;

src/components/Hyperlink.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import React, { ReactNode, StatelessComponent } from 'react';
21
import { WithStyles, withStyles } from '@material-ui/core';
3-
import { preventDefault } from '../utils';
4-
import { withNavigation } from './NavigationProvider';
2+
import React, { ReactNode, StatelessComponent } from 'react';
53
import theme from '../theme';
64
import { HalLink, NavigatableProps } from '../types';
5+
import { preventDefault } from '../utils';
6+
import { withNavigation } from './NavigationProvider';
77

88
const color = theme.palette.action.active;
99

src/components/NavigationLinks.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1+
import { IconButton } from '@material-ui/core';
12
import React, {
23
FormEventHandler,
34
PureComponent,
45
StatelessComponent,
56
} from 'react';
6-
import { IconButton } from '@material-ui/core';
7+
import { navigation } from '../stream-store';
78
import { HalLink, HalLinks, NavigatableProps } from '../types';
8-
import RelIcon from './RelIcon';
99
import { withNavigation } from './NavigationProvider';
10-
import { navigation } from '../stream-store';
10+
import RelIcon from './RelIcon';
1111

1212
interface FeedNavigationLinkProps {
1313
link: HalLink;

tslint.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
"tslint:latest",
44
"tslint-config-prettier"
55
],
6+
"rules": {
7+
"interface-name": [false, "always-prefix"],
8+
"member-access": false,
9+
"variable-name": [true, "check-format", "allow-leading-underscore"]
10+
},
611
"defaultSeverity": "warning",
712
"linterOptions": {
813
"exclude": [

0 commit comments

Comments
 (0)