Skip to content

Commit b2aab85

Browse files
tbkoaytbkoay
authored
Merge pull request #44 from org-arl/feature/mission-def
Updated mission definitions
2 parents a4d2a5a + 2177c79 commit b2aab85

39 files changed

+7305
-4212
lines changed

‎experiments/WebUI/package-lock.json

+2,896-804
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎experiments/WebUI/package.json

+18-15
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,30 @@
44
"private": true,
55
"homepage": ".",
66
"dependencies": {
7-
"@fortawesome/fontawesome-svg-core": "^1.2.27",
8-
"@fortawesome/free-solid-svg-icons": "^5.12.1",
9-
"@fortawesome/react-fontawesome": "^0.1.8",
7+
"@fortawesome/fontawesome-svg-core": "^1.2.30",
8+
"@fortawesome/free-solid-svg-icons": "^5.14.0",
9+
"@fortawesome/react-fontawesome": "^0.1.11",
10+
"ace-builds": "^1.4.12",
1011
"aphrodite": "^2.4.0",
11-
"bootstrap": "^4.4.1",
12-
"d3": "^5.15.0",
12+
"bootstrap": "^4.5.0",
13+
"d3": "^5.16.0",
1314
"leaflet": "^1.6.0",
14-
"react": "^16.12.0",
15-
"react-bootstrap": "^1.0.0-beta.16",
16-
"react-dom": "^16.12.0",
15+
"pts": "^0.9.4",
16+
"react": "^16.13.1",
17+
"react-ace": "^9.1.2",
18+
"react-bootstrap": "^1.3.0",
19+
"react-collapse-pane": "^1.4.2",
20+
"react-dom": "^16.13.1",
1721
"react-hotkeys": "^2.0.0",
18-
"react-leaflet": "^2.6.1",
19-
"react-redux": "^7.2.0",
20-
"react-router-dom": "^5.1.2",
21-
"react-scripts": "^3.4.1",
22-
"react-select": "^3.0.8",
23-
"react-toastify": "^5.5.0"
22+
"react-leaflet": "^2.7.0",
23+
"react-resize-detector": "^5.0.6",
24+
"react-router-dom": "^5.2.0",
25+
"react-select": "^3.1.0",
26+
"react-toastify": "^6.0.8"
2427
},
2528
"devDependencies": {
2629
"env-cmd": "^10.1.0",
27-
"redux": "^4.0.5"
30+
"react-scripts": "^3.4.1"
2831
},
2932
"scripts": {
3033
"start": "react-scripts start",

‎experiments/WebUI/src/assets/App.css

+35-148
Original file line numberDiff line numberDiff line change
@@ -1,178 +1,65 @@
1-
.App {
2-
text-align: center;
3-
}
4-
5-
.App-logo {
6-
height: 40vmin;
7-
pointer-events: none;
8-
}
9-
10-
@media (prefers-reduced-motion: no-preference) {
11-
.App-logo {
12-
animation: App-logo-spin infinite 20s linear;
13-
}
14-
}
15-
16-
.App-header {
17-
background-color: #282c34;
18-
min-height: 100vh;
19-
display: flex;
20-
flex-direction: column;
21-
align-items: center;
22-
justify-content: center;
23-
font-size: calc(10px + 2vmin);
24-
color: white;
1+
.leaflet-container {
2+
position: absolute;
3+
top: 0;
4+
bottom: 0;
5+
width: 100%;
6+
height: 100%;
257
}
268

27-
.App-link {
28-
color: #61dafb;
29-
}
9+
/* SidebarComponent */
3010

31-
.leaflet-container{
32-
position: absolute;
33-
top: 0;
34-
bottom: 0;
35-
width: 100%;
36-
height: 100%;
37-
}
38-
39-
.mainBlock_custom{
40-
width: 100%;
41-
padding-left: 15px;
42-
}
43-
44-
.toggleBtn{
45-
display: none !important;
11+
.toggleBtn {
12+
display: none !important;
4613
}
4714

48-
/* .menu_custom{
49-
margin-top: 52px;
50-
} */
51-
52-
.sidebarContainer_custom{
53-
background-color: #363740;
54-
width: 100%;
55-
padding: 7px;
15+
.sidebarContainer_custom {
16+
background-color: #363740;
17+
width: 100%;
18+
padding: 7px;
5619
}
5720

58-
59-
60-
/* @media screen and (max-width: 992px) { */
61-
.sidebar_custom {
62-
top: 0;
63-
left: 0;
64-
/* width: 0px; */
65-
overflow-x: hidden;
66-
position: fixed;
67-
z-index: 10000;
68-
/* -webkit-transition: all 500ms ease;
69-
transition: all 500ms ease; */
70-
}
71-
72-
.sidebarContainer_custom{
21+
.sidebarContainer_custom {
7322
padding-left: 4px !important;
7423
padding-right: 4px !important;
75-
border-radius: 5px;
24+
border-radius: 5px;
7625
margin: auto;
77-
}
78-
79-
.mainBlock_custom{
80-
}
26+
}
8127

82-
.toggleBtn{
28+
.toggleBtn {
8329
display: inline !important;
84-
}
30+
}
8531

86-
.menu_custom{
32+
.menu_custom {
8733
display: none !important;
88-
}
34+
}
8935

90-
.sidebarActive{
36+
.sidebarActive {
9137
top: 0;
9238
left: 0;
9339
/* width: 300px; */
9440
overflow-x: auto;
9541
position: fixed;
96-
}
97-
98-
.mainBlockPushRight{
99-
}
100-
101-
/************ Sentuator styles ***********8*/
102-
103-
.select_styles{
104-
width: 100%;
10542
}
10643

107-
.sentuator_list{
108-
font-size: 0.8em;
109-
z-index: 0;
110-
width: 90%;
111-
height: 250px;
112-
overflow-y: scroll;
113-
}
114-
115-
.sentuator_container{
116-
padding-top: 20px;
117-
padding-left: 0 !important;
118-
width: 50%;
119-
}
120-
121-
122-
/************** Map styles *************/
123-
.dropdown_styles{
124-
position: relative;
125-
display: inline-block;
126-
margin-left: 15px;
44+
.mainBlockPushRight {
12745
}
12846

129-
.dropdown_content{
130-
display: none;
131-
position: absolute;
132-
background-color: #f1f1f1;
133-
min-width: 160px;
134-
box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
135-
z-index: 1001;
136-
}
137-
138-
.dropdown_content div {
139-
color: black;
140-
padding: 12px 16px;
141-
text-decoration: none;
142-
display: block;
143-
}
144-
145-
.dropdown_content div Button{
146-
font-size: 0.75em;
147-
}
148-
149-
.dropdown_content div:hover {background-color: #ddd;}
150-
151-
.dropdown_styles:hover .dropdown_content {display: block;}
152-
153-
.mission_options{
154-
margin-left: 15px;
155-
}
156-
/******* DrawGeoFence styles *******/
157-
.drawGeoFence_styles{
158-
position: relative;
159-
display: inline-block;
160-
margin-left: 15px;
161-
}
47+
/* SentuatorsComponent */
16248

163-
.drawGeoFence_content{
164-
position: absolute;
165-
background-color: #f1f1f1;
166-
/* min-width: 160px; */
167-
box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
168-
z-index: 1001;
49+
.select_styles {
50+
width: 100%;
16951
}
17052

171-
.drawGeoFence_content Button {
172-
margin: 3px;
53+
.sentuator_list {
54+
font-size: 0.8em;
55+
z-index: 0;
56+
width: 90%;
57+
height: 250px;
58+
overflow-y: scroll;
17359
}
17460

175-
/******* Script Control ********/
176-
.subroutine_select_styles{
177-
width: 150px;
61+
.sentuator_container {
62+
padding-top: 20px;
63+
padding-left: 0 !important;
64+
width: 50%;
17865
}

0 commit comments

Comments
 (0)