Skip to content

Commit

Permalink
Merge pull request #2691 from serge-web/2689_Refactoring_strip_out_ma…
Browse files Browse the repository at this point in the history
…pping

2689_Refactoring_strip_out_mapping
  • Loading branch information
IanMayo authored Dec 18, 2023
2 parents 22fef71 + 599f490 commit 5370def
Show file tree
Hide file tree
Showing 714 changed files with 618 additions and 234,347 deletions.
8 changes: 4 additions & 4 deletions client/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<link rel='shortcut icon' href='/static/favicon.ico' />
<link rel='stylesheet' href='/static/leaflet.css' />
<link rel="stylesheet" href="/static/flatpickr/flatpickr.min.css">
<link rel='stylesheet' href='/static/leaflet/select/leaflet.select.css' />
<!-- <link rel='stylesheet' href='/static/leaflet/select/leaflet.select.css' />
<link rel='stylesheet' href='/static/leaflet/ruler/leaflet.ruler.css' />
<link rel='stylesheet' href='/static/leaflet/timeline/leaflet.timeline.css' />
<link rel='stylesheet' href='/static/leaflet/timeline/leaflet.timeline.css' /> -->
<meta name='viewport' content='width=device-width, initial-scale=1, shrink-to-fit=no' />
<meta name='theme-color' content='#000000' />

Expand Down Expand Up @@ -48,7 +48,7 @@
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
<script type="module" src='/static/leaflet/timeline/leaflet.timeline.js'></script>
<!-- <script type="module" src='/static/leaflet/timeline/leaflet.timeline.js'></script>
<script type="module" src='/static/leaflet/select/leaflet.select.js'></script>
<script type="module" src='/static/leaflet/ruler/leaflet.ruler.js'></script>
<script type="module" src='/static/leaflet/ruler/leaflet.ruler.js'></script> -->
</html>
45 changes: 4 additions & 41 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,9 @@
"version": "3.0.0",
"license": "Apache-2.0",
"dependencies": {
"@babel/core": "^7.8.4",
"@babel/helper-string-parser": "^7.18.10",
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
"@babel/preset-env": "^7.10.0",
"@babel/preset-react": "^7.10.0",
"@babel/runtime": "^7.22.5",
"@fortawesome/fontawesome-free": "^6.4.0",
"@fortawesome/fontawesome-svg-core": "^6.4.0",
"@fortawesome/free-solid-svg-icons": "^6.4.0",
Expand All @@ -26,27 +23,19 @@
"@storybook/builder-webpack5": "^6.5.16",
"@storybook/manager-webpack5": "^6.5.16",
"@storybook/react": "^6.5.12",
"@turf/turf": "^6.3.0",
"@types/babel-core": "^6.25.6",
"@types/classnames": "^2.2.10",
"@types/dotenv": "^8.2.0",
"@types/enzyme": "^3.10.5",
"@types/expired-storage": "^1.0.0",
"@types/flat": "^5.0.1",
"@types/jest": "^26.0.10",
"@types/leaflet-polylinedecorator": "^1.6.1",
"@types/leaflet-textpath": "^1.2.1",
"@types/lodash": "^4.14.149",
"@types/node": "^20.3.2",
"@types/numeral": "^2.0.2",
"@types/preval.macro": "^3.0.0",
"@types/react": "^16.9.35",
"@types/react-addons-css-transition-group": "^15.0.7",
"@types/react-color": "^3.0.4",
"@types/react-dom": "^16.9.8",
"@types/react-flatpickr": "^3.8.4",
"@types/react-leaflet": "^2.5.1",
"@types/react-leaflet-markercluster": "3.0.0",
"@types/react-maskedinput": "^4.0.4",
"@types/react-modal": "^3.12.0",
"@types/react-redux": "^7.1.12",
Expand All @@ -57,20 +46,17 @@
"@types/sass": "^1.43.1",
"@types/sortablejs": "^1.10.6",
"@types/uniqid": "^5.2.0",
"@types/vfile-message": "^2.0.0",
"@typescript-eslint/eslint-plugin": "^6.7.0",
"@typescript-eslint/parser": "^6.7.0",
"@vitejs/plugin-react": "^4.0.3",
"babel-loader": "^9.1.2",
"bootstrap": "^4.3.1",
"buildcom": "^3.0.6",
"buildcom": "^3.0.6",
"check-types": "^11.2.2",
"classnames": "^2.2.6",
"copyfiles": "^2.2.0",
"css-loader": "^6.8.1",
"css-modules-typescript-loader": "^4.0.1",
"dayjs": "^1.11.7",
"dotenv": "^8.2.0",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.7",
"eslint-plugin-prettier": "^4.2.1",
Expand All @@ -82,21 +68,13 @@
"flat": "^5.0.2",
"flexlayout-react": "^0.3.4",
"geojson": "^0.5.0",
"h3-js": "^3.7.2",
"identity-obj-proxy": "^3.0.0",
"jest": "26.4.2",
"jest-mock-console": "^1.0.0",
"json-metaschema": "^1.2.0",
"jszip": "^3.10.1",
"just-use-native-fetch": "^1.0.0",
"leaflet": "^1.8.0",
"leaflet-notifications": "^1.0.7",
"leaflet-polylinedecorator": "^1.6.0",
"leaflet-ruler": "^1.0.0",
"leaflet-textpath": "^1.2.3",
"lodash": "^4.17.21",
"lorem-ipsum": "^2.0.3",
"lru-cache": "^7.14.1",
"markdown-loader": "^8.0.0",
"milsymbol": "^2.0.0",
"moment": "^2.24.0",
Expand All @@ -105,38 +83,28 @@
"node-sass-chokidar": "^2.0.0",
"nodemon": "^2.0.4",
"npm-run-all": "^4.1.5",
"numeral": "^2.0.6",
"postcss-less": "^6.0.0",
"postcss-normalize": "^10.0.1",
"preval.macro": "^5.0.0",
"prop-types": "^15.7.2",
"react": "^16.12.0",
"react-ace-editor": "0.0.3",
"react-addons-css-transition-group": "^15.0.7",
"react-bootstrap": "^1.0.0-beta.8",
"react-collapsible": "^2.6.0",
"react-color": "^2.17.3",
"react-data-table-component": "7.4.5",
"react-docgen-typescript-loader": "^3.6.0",
"react-dom": "^16.12.0",
"react-double-scrollbar": "^0.0.15",
"react-dropzone": "^10.1.5",
"react-flatpickr": "^3.10.7",
"react-font-awesome": "^1.0.3",
"react-fontawesome": "^1.7.1",
"react-jsonschema-form": "^1.3.0",
"react-leaflet": "2.8.0",
"react-leaflet-cluster": "1.0.3",
"react-leaflet-geoman-v2": "1.0.1",
"react-leaflet-v4": "npm:[email protected]",
"react-leaflet-vectorgrid": "^2.2.1",
"react-maskedinput": "^4.0.1",
"react-modal": "^3.13.1",
"react-redux": "^7.1.3",
"react-resizable-panels": "^0.0.63",
"react-rnd": "^10.3.7",
"react-scrollbar": "^0.5.6",
"react-select": "^2.4.2",
"react-sortablejs": "^6.0.0",
"react-sortablejs": "^6.1.4",
"react-test-renderer": "^16.12.0",
"reactour": "^1.15.0",
"reactstrap": "^7.1.0",
Expand All @@ -153,7 +121,6 @@
"standard": "^14.3.1",
"storybook-addon-react-docgen": "^1.2.44",
"storybook-readme": "^5.0.9",
"stream": "^0.0.2",
"style-loader": "^3.3.3",
"styled-components": "^6.1.1",
"stylelint-config-css-modules": "^2.2.0",
Expand All @@ -172,18 +139,15 @@
"vite-plugin-sass": "^0.1.0",
"vite-plugin-svgr": "^3.2.0",
"vite-tsconfig-paths": "^4.2.0",
"whatwg-fetch": "^3.6.1",
"xml-js": "^1.6.11"
"whatwg-fetch": "^3.6.1"
},
"resolutions": {
"@types/react": "^16.14.5",
"node-sass": "^9.0.0",
"react-double-scrollbar": "IniterWorker/react-double-scrollbar",
"@storybook/react-docgen-typescript-plugin": "npm:[email protected]",
"@types/react-flatpickr": "^3.8.4"
},
"devDependencies": {
"@babel/preset-typescript": "^7.8.3",
"@storybook/addon-actions": "^6.5.12",
"@storybook/codemod": "^7.5.3",
"@storybook/node-logger": "^6.5.12",
Expand All @@ -197,7 +161,6 @@
"eslint-plugin-node": "^10.0.0",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-standard": "^5.0.0",
"jscodeshift": "^0.11.0",
"prettier": "^2.8.7",
"stylelint": "^13.13.1",
"stylelint-config-prettier": "^8.0.2",
Expand Down
86 changes: 4 additions & 82 deletions client/public/messages.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,25 +43,7 @@ export const messages = [
detail: {
type: 'Orders',
data: {
name: 'Blue2',
assets: [
{
name: 'Frigate',
plannedTurns: {
T01: { state: 'Transitting', speed: 20, route: ['P12', 'O21', 'O20', 'N19'] },
T02: { state: 'Transitting', speed: 20, route: ['019', '018', '017', 'N17'] },
T03: { state: 'Transitting', speed: 20, route: ['M17', 'L16', 'L15', 'L14'] }
}
},
{
name: 'Tanker',
plannedTurns: {
T01: { state: 'Transitting', speed: 10, route: ['S23', 'R22'] },
T02: { state: 'Transitting', speed: 10, route: ['Q22', 'P21'] },
T03: { state: 'Transitting', speed: 10, route: ['O21', 'O20'] }
}
}
]
name: 'Blue2'
}
}
},
Expand All @@ -71,33 +53,7 @@ export const messages = [
detail: {
type: 'Orders',
data: {
name: 'Red2',
assets: [
{
name: 'Dhow-A',
plannedTurns: {
T01: { state: 'Transitting', speed: 10, route: ['M10', 'L10'] },
T02: { state: 'Transitting', speed: 10, route: ['K11', 'J11'] },
T03: { state: 'Transitting', speed: 10, route: ['J12', 'K13'] }
}
},
{
name: 'Dhow-B',
plannedTurns: {
T01: { state: 'Transitting', speed: 10, route: ['N13', 'N14'] },
T02: { state: 'Transitting', speed: 10, route: ['N15', 'N16'] },
T03: { state: 'Transitting', speed: 10, route: ['N17', 'N18'] }
}
},
{
name: 'Dhow-C',
plannedTurns: {
T01: { state: 'Transitting', speed: 10, route: ['N06', 'M06'] },
T02: { state: 'Transitting', speed: 10, route: ['L05', 'K05'] },
T03: { state: 'Transitting', speed: 10, route: ['J05', 'IO5'] }
}
}
]
name: 'Red2'
}
}
},
Expand Down Expand Up @@ -237,21 +193,7 @@ export const messages = [
detail: {
type: 'Orders',
data: {
name: 'Blue2',
assets: [
{
name: 'Frigate',
plannedTurns: {
T04: { state: 'Transitting', speed: 20, route: ['K15', 'L14', 'L14', 'L12'] }
}
},
{
name: 'Tanker',
plannedTurns: {
T04: { state: 'Transitting', speed: 10, route: ['019', '018'] }
}
}
]
name: 'Blue2'
}
}
},
Expand All @@ -261,27 +203,7 @@ export const messages = [
detail: {
type: 'Orders',
data: {
name: 'Red2',
assets: [
{
name: 'Dhow-A',
plannedTurns: {
T04: { state: 'Transitting', speed: 10, route: ['L13', 'L14'] }
}
},
{
name: 'Dhow-B',
plannedTurns: {
T04: { state: 'Transitting', speed: 10, route: ['N19', 'N20'] }
}
},
{
name: 'Dhow-C',
plannedTurns: {
T04: { state: 'Transitting', speed: 10, route: ['H04', 'G04'] }
}
}
]
name: 'Red2'
}
}
},
Expand Down
Loading

0 comments on commit 5370def

Please sign in to comment.