Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

Commit 3dcfbad

Browse files
Merge pull request #5 from u-bahn/develop
Merge and Fixes
2 parents a963775 + ab3732b commit 3dcfbad

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+4140
-1620
lines changed

package-lock.json

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

package.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,22 @@
99
"axios": "^0.19.2",
1010
"core-js": "^3.6.5",
1111
"form-data": "^3.0.0",
12+
"husky": "^4.2.5",
13+
"lint-staged": "^10.2.6",
1214
"node-sass": "^4.14.1",
15+
"prettier": "^2.0.5",
1316
"prop-types": "^15.7.2",
1417
"react": "^16.13.1",
1518
"react-dom": "^16.13.1",
1619
"react-router-dom": "^5.1.2",
1720
"react-scripts": "3.4.1",
1821
"regenerator-runtime": "^0.13.5"
1922
},
23+
"lint-staged": {
24+
"src/**/*.{js,jsx,ts,tsx,json,css,scss,md}": [
25+
"prettier --write"
26+
]
27+
},
2028
"scripts": {
2129
"start": "react-scripts start",
2230
"build": "react-scripts build",
@@ -39,5 +47,10 @@
3947
"last 1 firefox version",
4048
"last 1 safari version"
4149
]
50+
},
51+
"husky": {
52+
"hooks": {
53+
"pre-commit": "lint-staged"
54+
}
4255
}
4356
}

public/sprites.png

8.42 KB
Loading

src/Router.jsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
* Routing of application pages.
33
*/
44

5-
import React from 'react';
6-
import { BrowserRouter, Route, Switch } from 'react-router-dom';
5+
import React from "react";
6+
import { BrowserRouter, Route, Switch } from "react-router-dom";
77

8-
import Error404 from './pages/Error404';
9-
import SearchPage from './pages/Search';
8+
import Error404 from "./pages/Error404";
9+
import SearchPage from "./pages/Search";
1010

1111
export default function Router() {
1212
return (

src/components/AddFiltersModal/Filter/index.jsx

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/components/AddFiltersModal/Filter/style.module.scss

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/components/AddFiltersModal/index.jsx

Lines changed: 0 additions & 114 deletions
This file was deleted.

src/components/AddFiltersModal/style.module.scss

Lines changed: 0 additions & 68 deletions
This file was deleted.
Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,21 @@
1-
import React from 'react';
2-
import PT from 'prop-types';
1+
import React from "react";
2+
import PT from "prop-types";
33

4-
import Switch from '../../Switch';
4+
import Switch from "../../Switch";
55

6-
import style from './style.module.scss';
6+
import style from "./style.module.scss";
77

88
export default function Group({ checked, group, onSwitch }) {
99
return (
10-
<div className={style.container}>
10+
<div className={style.container}>
1111
{group}
12-
<Switch
13-
checked={checked}
14-
className={style.switch}
15-
onChange={onSwitch}
16-
/>
12+
<Switch checked={checked} className={style.switch} onChange={onSwitch} />
1713
</div>
18-
)
14+
);
1915
}
2016

2117
Group.propTypes = {
2218
checked: PT.bool.isRequired,
2319
group: PT.string.isRequired,
2420
onSwitch: PT.func.isRequired,
25-
}
21+
};

0 commit comments

Comments
 (0)