Skip to content

Commit

Permalink
add linter
Browse files Browse the repository at this point in the history
  • Loading branch information
alisa911 committed Jul 14, 2023
1 parent 8a61faf commit ad6f099
Show file tree
Hide file tree
Showing 110 changed files with 9,723 additions and 6,277 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
.DS_Store
.idea
31 changes: 24 additions & 7 deletions map/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,26 @@
{
"extends": [
"react-app",
"react-app/jest"
],
"rules": {
"react-hooks/exhaustive-deps": "off"
}
"extends": ["eslint:recommended", "plugin:react/recommended", "plugin:prettier/recommended"],
"rules": {
"react-hooks/exhaustive-deps": "off",
"react/react-in-jsx-scope": "off",
"react/prop-types": "off"
},
"parser": "@babel/eslint-parser",
"parserOptions": {
"requireConfigFile": false,
"sourceType": "module",
"babelOptions": {
"presets": ["@babel/preset-react"]
}
},
"env": {
"browser": true,
"node": true,
"es6": true
},
"settings": {
"react": {
"version": "detect"
}
}
}
11 changes: 11 additions & 0 deletions map/.prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"semi": true,
"tabWidth": 4,
"printWidth": 120,
"singleQuote": true,
"bracketSpacing": true,
"endOfLine": "auto",
"trailingComma": "es5",
"jsxSingleQuote": false,
"bracketSameLine": false
}
165 changes: 86 additions & 79 deletions map/package.json
Original file line number Diff line number Diff line change
@@ -1,81 +1,88 @@
{
"name": "osmand-map",
"version": "0.1.0",
"private": true,
"homepage": "/map",
"dependencies": {
"@emotion/react": "^11.9.0",
"@emotion/styled": "^11.8.1",
"@hello-pangea/dnd": "^15.0.0",
"@material-ui/core": "^4.12.4",
"@material-ui/utils": "^4.11.3",
"@mui/icons-material": "^5.8.3",
"@mui/material": "^5.8.3",
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "^13.3.0",
"@testing-library/user-event": "^14.2.0",
"@types/leaflet.awesome-markers": "^2.0.25",
"axios": "^0.27.2",
"blueimp-md5": "^2.19.0",
"chart.js": "^4.3.0",
"chartjs-plugin-annotation": "^3.0.1",
"chartjs-plugin-zoom": "^2.0.1",
"clsx": "^1.2.1",
"draft-js": "^0.11.7",
"draftjs-to-html": "^0.9.1",
"env-cmd": "^10.1.0",
"http-proxy-middleware": "^2.0.6",
"ionicons": "^6.0.2",
"leaflet": "^1.9.3",
"leaflet-contextmenu": "^1.4.0",
"leaflet-geometryutil": "^0.10.1",
"leaflet-hash": "^0.2.1",
"leaflet-spin": "^1.1.2",
"leaflet.awesome-markers": "^2.0.5",
"lodash": "^4.17.21",
"pako": "^2.0.4",
"patch-package": "^6.4.7",
"postinstall-postinstall": "^2.1.0",
"prop-types": "^15.8.1",
"react": "^18.1.0",
"react-chartjs-2": "^5.2.0",
"react-dom": "^18.1.0",
"react-draft-wysiwyg": "^1.15.0",
"react-leaflet": "^4.0.0",
"react-leaflet-markercluster": "^3.0.0-rc1",
"react-router-dom": "^6.3.0",
"react-scripts": "^5.0.1",
"react-use-cookie": "^1.4.0",
"react-window": "^1.8.7",
"recharts": "^2.1.10",
"web-vitals": "^2.1.4"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"build:staging": "env-cmd -f .env.staging react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject",
"postinstall": "patch-package",
"generate:poiicons": "ls public/images/poi-icons-svg | jq -R -s -c 'split(\"\\n\")[:-1]'\n\n > src/generated/poiicons.json"
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
},
"devDependencies": {
"@babel/core": "^7.10.1",
"@babel/plugin-proposal-private-property-in-object": "^7.21.10",
"@mui/lab": "^5.0.0-alpha.85",
"yarn-upgrade-all": "^0.7.1"
},
"packageManager": "[email protected]"
"name": "osmand-map",
"version": "0.1.0",
"private": true,
"homepage": "/map",
"dependencies": {
"@emotion/react": "^11.9.0",
"@emotion/styled": "^11.8.1",
"@hello-pangea/dnd": "^15.0.0",
"@material-ui/core": "^4.12.4",
"@material-ui/utils": "^4.11.3",
"@mui/icons-material": "^5.8.3",
"@mui/material": "^5.8.3",
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "^13.3.0",
"@testing-library/user-event": "^14.2.0",
"@types/leaflet.awesome-markers": "^2.0.25",
"axios": "^0.27.2",
"blueimp-md5": "^2.19.0",
"chart.js": "^4.3.0",
"chartjs-plugin-annotation": "^3.0.1",
"chartjs-plugin-zoom": "^2.0.1",
"clsx": "^1.2.1",
"draft-js": "^0.11.7",
"draftjs-to-html": "^0.9.1",
"env-cmd": "^10.1.0",
"http-proxy-middleware": "^2.0.6",
"ionicons": "^6.0.2",
"leaflet": "^1.9.3",
"leaflet-contextmenu": "^1.4.0",
"leaflet-geometryutil": "^0.10.1",
"leaflet-hash": "^0.2.1",
"leaflet-spin": "^1.1.2",
"leaflet.awesome-markers": "^2.0.5",
"lodash": "^4.17.21",
"pako": "^2.0.4",
"patch-package": "^6.4.7",
"postinstall-postinstall": "^2.1.0",
"prop-types": "^15.8.1",
"react": "^18.1.0",
"react-chartjs-2": "^5.2.0",
"react-dom": "^18.1.0",
"react-draft-wysiwyg": "^1.15.0",
"react-leaflet": "^4.0.0",
"react-leaflet-markercluster": "^3.0.0-rc1",
"react-router-dom": "^6.3.0",
"react-scripts": "^5.0.1",
"react-use-cookie": "^1.4.0",
"react-window": "^1.8.7",
"recharts": "^2.1.10",
"web-vitals": "^2.1.4"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"build:staging": "env-cmd -f .env.staging react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject",
"postinstall": "patch-package",
"generate:poiicons": "ls public/images/poi-icons-svg | jq -R -s -c 'split(\"\\n\")[:-1]'\n\n > src/generated/poiicons.json",
"lint": "eslint src/**/*.js src/**/*.jsx src/**/*.mjs",
"format": "prettier --write './**/*.{js,jsx,mjs,ts,tsx,css,md,json}' --config ./.prettierrc"
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
},
"devDependencies": {
"@babel/eslint-parser": "^7.22.9",
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@mui/lab": "^5.0.0-alpha.85",
"eslint": "^8.44.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-react": "^7.32.2",
"prettier": "^3.0.0",
"yarn-upgrade-all": "^0.7.1"
},
"packageManager": "[email protected]"
}
46 changes: 23 additions & 23 deletions map/public/manifest.json
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
{
"short_name": "OsmAnd Map",
"name": "OsmAnd Map",
"icons": [
{
"src": "favicon.ico",
"sizes": "96x96",
"type": "image/png"
},
{
"src": "logo192.png",
"type": "image/png",
"sizes": "192x192"
},
{
"src": "logo512.png",
"type": "image/png",
"sizes": "512x512"
}
],
"start_url": ".",
"display": "standalone",
"theme_color": "#000000",
"background_color": "#ffffff"
"short_name": "OsmAnd Map",
"name": "OsmAnd Map",
"icons": [
{
"src": "favicon.ico",
"sizes": "96x96",
"type": "image/png"
},
{
"src": "logo192.png",
"type": "image/png",
"sizes": "192x192"
},
{
"src": "logo512.png",
"type": "image/png",
"sizes": "512x512"
}
],
"start_url": ".",
"display": "standalone",
"theme_color": "#000000",
"background_color": "#ffffff"
}
33 changes: 16 additions & 17 deletions map/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,28 @@ import { BrowserRouter, Route, Routes, useNavigate } from 'react-router-dom';
// components
import OsmAndMapFrame from './drawer/components/OsmAndMapFrame';
import LoginDialog from './login/LoginDialog';
import { AppContextProvider } from './context/AppContext'
import { AppContextProvider } from './context/AppContext';

export let globalNavigate = () => null;

const NavigateGlobal = () => {
globalNavigate = useNavigate();
return false;
globalNavigate = useNavigate();
return false;
};

const App = () => {
return (
<AppContextProvider>
<BrowserRouter>
<NavigateGlobal />
<Routes>
<Route path="/map" element={<OsmAndMapFrame />}>
<Route path="loginForm" element={<LoginDialog />}>
</Route>
</Route>
</Routes>
</BrowserRouter>
</AppContextProvider>
);
return (
<AppContextProvider>
<BrowserRouter>
<NavigateGlobal />
<Routes>
<Route path="/map" element={<OsmAndMapFrame />}>
<Route path="loginForm" element={<LoginDialog />}></Route>
</Route>
</Routes>
</BrowserRouter>
</AppContextProvider>
);
};

export default App;
export default App;
42 changes: 21 additions & 21 deletions map/src/assets/css/App.css
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
.App {
text-align: center;
text-align: center;
}

.App-logo {
height: 40vmin;
pointer-events: none;
height: 40vmin;
pointer-events: none;
}

@media (prefers-reduced-motion: no-preference) {
.App-logo {
animation: App-logo-spin infinite 20s linear;
}
.App-logo {
animation: App-logo-spin infinite 20s linear;
}
}

.App-header {
background-color: #282c34;
min-height: 100vh;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
font-size: calc(10px + 2vmin);
color: white;
background-color: #282c34;
min-height: 100vh;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
font-size: calc(10px + 2vmin);
color: white;
}

.App-link {
color: #61dafb;
color: #61dafb;
}

@keyframes App-logo-spin {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
}
9 changes: 5 additions & 4 deletions map/src/assets/css/gpx.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@
}
.icon {
position: absolute;
z-index:201;
z-index: 201;
display: block;
width: 20px;
height: 20px;
top: -6px; left: -6px
top: -6px;
left: -6px;
}
.leaflet-div-icon{
.leaflet-div-icon {
background: none !important;
border: 0 !important;
}
}
Loading

0 comments on commit ad6f099

Please sign in to comment.