Skip to content

Commit 068015a

Browse files
roryaronsonroryaronson
authored
Merge branch 'staging' into staging
2 parents 62abb2e + db721cc commit 068015a

File tree

91 files changed

+1076
-776
lines changed

Some content is hidden

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

91 files changed

+1076
-776
lines changed

‎Gemfile.lock‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ GEM
7171
base64 (0.3.0)
7272
bcrypt (3.1.20)
7373
benchmark (0.4.1)
74-
bigdecimal (3.2.2)
74+
bigdecimal (3.2.3)
7575
builder (3.3.0)
7676
bunny (2.24.0)
7777
amq-protocol (~> 2.3)
@@ -115,7 +115,7 @@ GEM
115115
erubi (1.13.1)
116116
factory_bot (6.5.5)
117117
activesupport (>= 6.1.0)
118-
factory_bot_rails (6.5.0)
118+
factory_bot_rails (6.5.1)
119119
factory_bot (~> 6.5)
120120
railties (>= 6.1.0)
121121
faker (3.5.2)
@@ -130,7 +130,7 @@ GEM
130130
net-http (>= 0.5.0)
131131
globalid (1.2.1)
132132
activesupport (>= 6.1)
133-
google-apis-core (1.0.1)
133+
google-apis-core (1.0.2)
134134
addressable (~> 2.8, >= 2.8.7)
135135
faraday (~> 2.13)
136136
faraday-follow_redirects (~> 0.3)
@@ -167,11 +167,11 @@ GEM
167167
multi_json (~> 1.11)
168168
os (>= 0.9, < 2.0)
169169
signet (>= 0.16, < 2.a)
170-
hashdiff (1.2.0)
170+
hashdiff (1.2.1)
171171
hashie (4.1.0)
172172
i18n (1.14.7)
173173
concurrent-ruby (~> 1.0)
174-
json (2.13.2)
174+
json (2.15.0)
175175
jsonapi-renderer (0.2.2)
176176
jwt (3.1.2)
177177
base64
@@ -201,7 +201,7 @@ GEM
201201
net-imap
202202
net-pop
203203
net-smtp
204-
marcel (1.0.4)
204+
marcel (1.1.0)
205205
method_source (1.1.0)
206206
mini_mime (1.1.5)
207207
minitest (5.25.5)
@@ -221,14 +221,14 @@ GEM
221221
net-smtp (0.5.1)
222222
net-protocol
223223
nio4r (2.7.4)
224-
nokogiri (1.18.9-aarch64-linux-gnu)
224+
nokogiri (1.18.10-aarch64-linux-gnu)
225225
racc (~> 1.4)
226-
nokogiri (1.18.9-x86_64-linux-gnu)
226+
nokogiri (1.18.10-x86_64-linux-gnu)
227227
racc (~> 1.4)
228228
orm_adapter (0.5.0)
229229
os (1.1.4)
230230
ostruct (0.6.3)
231-
passenger (6.0.27)
231+
passenger (6.1.0)
232232
rack (>= 1.6.13)
233233
rackup (>= 1.0.1)
234234
rake (>= 12.3.3)
@@ -303,7 +303,7 @@ GEM
303303
actionpack (>= 5.2)
304304
railties (>= 5.2)
305305
retriable (3.1.2)
306-
rexml (3.4.2)
306+
rexml (3.4.4)
307307
rollbar (3.6.2)
308308
rspec (3.13.1)
309309
rspec-core (~> 3.13.0)
@@ -325,7 +325,7 @@ GEM
325325
rspec-expectations (~> 3.13)
326326
rspec-mocks (~> 3.13)
327327
rspec-support (~> 3.13)
328-
rspec-support (3.13.5)
328+
rspec-support (3.13.6)
329329
rspec_junit_formatter (0.6.0)
330330
rspec-core (>= 2, < 4, != 2.12.0)
331331
scenic (1.9.0)

‎app/views/dashboard/_common_assets.html.erb‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,3 @@ window.process = {
1818
<%= render "addons" %>
1919
<%= javascript_include_tag *@js_assets %>
2020
<meta content="width=device-width, initial-scale=1" name="viewport">
21-
<link href="https://fonts.googleapis.com/css?family=Cabin:300,300i,400,400i,700,700i" rel="stylesheet">
22-
<link href="https://fonts.googleapis.com/css?family=Inknut+Antiqua:300,300i,400,400i,700,700i" rel="stylesheet">

‎app/views/dashboard/demo.html.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
bottom: 60px;
3939
box-shadow: 0 0 15px rgba(0,0,0,0.4);
4040
color: #fff;
41-
font-family: "Cabin", sans-serif;
41+
font-family: "Cabin", "Cabin Fallback", sans-serif;
4242
font-size: 25px;
4343
font-weight: bold;
4444
padding: 15px 30px;

‎app/views/layouts/dashboard.html.erb‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html>
2+
<html lang="<%= I18n.locale %>">
33
<head>
44
<meta content='text/html; charset=UTF-8' http-equiv='Content-Type'>
55
<meta content="width=device-width, initial-scale=1" name="viewport">
@@ -18,8 +18,6 @@
1818
text-align: center; width: 100%; padding-top: 10%; color: #434343; }
1919
</style>
2020
<%= stylesheet_link_tag *@css_assets %>
21-
<link href="https://fonts.googleapis.com/css?family=Cabin:300,300i,400,400i,700,700i" rel="stylesheet">
22-
<link href="https://fonts.googleapis.com/css?family=Inknut+Antiqua:300,300i,400,400i,700,700i" rel="stylesheet">
2321
<link rel="icon" href="/favicon.ico" type="image/x-icon">
2422
<link rel="apple-touch-icon" href="/images/favicon.png" type="image/png">
2523
<% manifest_file =

‎app/views/layouts/mailer.html.erb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<!DOCTYPE html>
2-
<html>
2+
<html lang="<%= I18n.locale %>">
33
<head>
44
<meta content='text/html; charset=UTF-8' http-equiv='Content-Type' />
55
</head>
66
<body>
77
<%= yield %>
88
</body>
9-
</html>
9+
</html>

‎config/initializers/rack_attack.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class Rack::Attack
2727
end
2828

2929
### Don't allow too many demo account requests ###
30-
throttle("demo_accounts/ip", limit: 10, period: 10.minutes) do |req|
30+
throttle("demo_accounts/ip", limit: 50, period: 1.hour) do |req|
3131
case req.path.downcase
3232
when "/demo", "/try_farmbot"
3333
req.ip

‎frontend/__test_support__/fake_state/app.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { fakeMovementState } from "../fake_bot_data";
33
import {
44
controlsState,
55
curvesPanelState,
6-
jobsState,
76
metricPanelState,
87
plantsPanelState,
98
pointsPanelState,
@@ -25,6 +24,5 @@ export const app: AppState = {
2524
toasts: {},
2625
movement: fakeMovementState(),
2726
controls: controlsState(),
28-
jobs: jobsState(),
2927
popups: popUpsState(),
3028
};

‎frontend/__test_support__/panel_state.ts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import {
66
SequencesPanelState,
77
MetricPanelState,
88
CurvesPanelState,
9-
JobsAndLogsState,
109
ControlsState,
1110
PopupsState,
1211
} from "../interfaces";
@@ -75,11 +74,6 @@ export const controlsState = (): ControlsState => ({
7574
webcams: false,
7675
});
7776

78-
export const jobsState = (): JobsAndLogsState => ({
79-
jobs: true,
80-
logs: false,
81-
});
82-
8377
export const popUpsState = (): PopupsState => ({
8478
timeTravel: false,
8579
controls: false,

‎frontend/__tests__/reducer_test.ts‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { appReducer } from "../reducer";
33
import {
44
ControlsState,
55
CurvesPanelState,
6-
JobsAndLogsState,
76
MetricPanelState,
87
MovementState,
98
PlantsPanelState,
@@ -128,17 +127,6 @@ describe("resource reducer", () => {
128127
expect(newState.controls.webcams).toBeTruthy();
129128
});
130129

131-
it("sets jobs panel options", () => {
132-
const payload: keyof JobsAndLogsState = "logs";
133-
const state = app;
134-
const newState = appReducer(state, {
135-
type: Actions.SET_JOBS_PANEL_OPTION,
136-
payload,
137-
});
138-
expect(newState.jobs.jobs).toBeFalsy();
139-
expect(newState.jobs.logs).toBeTruthy();
140-
});
141-
142130
it("toggles popup", () => {
143131
const payload: keyof PopupsState = "controls";
144132
const state = app;

‎frontend/app.tsx‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -213,12 +213,14 @@ export class RawApp extends React.Component<AppProps, {}> {
213213
appState={this.props.appState}
214214
menuOpen={this.props.menuOpen}
215215
pings={this.props.pings} />}
216-
{syncLoaded && this.props.children}
217-
<ErrorBoundary>
218-
<React.Suspense>
219-
{syncLoaded && <Outlet />}
220-
</React.Suspense>
221-
</ErrorBoundary>
216+
<main id="main-content" tabIndex={-1}>
217+
{syncLoaded && this.props.children}
218+
<ErrorBoundary>
219+
<React.Suspense>
220+
{syncLoaded && <Outlet />}
221+
</React.Suspense>
222+
</ErrorBoundary>
223+
</main>
222224
<div className={"toast-container"}>
223225
<TourStepContainer
224226
key={JSON.stringify(this.props.helpState)}

0 commit comments

Comments
 (0)