+
+
+ {' '}
+
+
+
+
+ {/*{localStorage.getItem('PomodoroBreakLength')}{localStorage.getItem('pomdoroWorkLength')}*/}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {localStorage.getItem('pomdoroWorkLength')}:00
+
+
+ );
+}
diff --git a/src/components/widgets/time/clock.scss b/src/components/widgets/time/clock.scss
index 25faf326..2a402336 100644
--- a/src/components/widgets/time/clock.scss
+++ b/src/components/widgets/time/clock.scss
@@ -38,3 +38,38 @@
@extend %basic;
padding: 1rem;
}
+
+.pomodoro {
+ margin-top: -20px;
+ @extend %basic;
+ padding: 5px 15px 5px 15px;
+ font-size: 12px;
+ display: flex;
+ flex-flow: row;
+ gap: 10px;
+ align-items: center;
+ .pomodoroTime {
+ display: flex;
+ flex-flow: row;
+ align-items: center;
+ gap: 5px;
+ .timeRemaining {
+
+ }
+ .type {
+ color: #ccc;
+ font-weight: bold;
+ text-transform: uppercase;
+ display: grid;
+ }
+ }
+ .pomodoroControls {
+ display: flex;
+ flex-flow: row;
+ justify-content: space-evenly;
+ gap: 5px;
+ }
+ button {
+ @include basicIconButton(5px, 11px, ui);
+ }
+}
\ No newline at end of file
diff --git a/src/components/widgets/weather/Weather.jsx b/src/components/widgets/weather/Weather.jsx
index e9799216..14fc56d9 100644
--- a/src/components/widgets/weather/Weather.jsx
+++ b/src/components/widgets/weather/Weather.jsx
@@ -203,6 +203,8 @@ export default class Weather extends PureComponent {
{enabled('showlocation') ?
+ {enabled('upcomingForecast') ? (
+ <>
Upcoming Forecast
@@ -221,6 +223,9 @@ export default class Weather extends PureComponent {
{minmax()}
+ >
+ ) : null}
+
Extra Information
{enabled('cloudiness') ? (
diff --git a/src/modules/helpers/settings/modals.js b/src/modules/helpers/settings/modals.js
index 442d50ea..77e2cbfb 100644
--- a/src/modules/helpers/settings/modals.js
+++ b/src/modules/helpers/settings/modals.js
@@ -65,6 +65,18 @@ export function values(type) {
{ value: 200, label: '2x' },
{ value: 400, label: '4x' },
],
+ pomodoroWork: [
+ { value: 5, label: '5m' },
+ { value: 25, label: '25m' },
+ { value: 45, label: '45m' },
+ { value: 60, label: '60m' },
+ ],
+ pomodoroBreak: [
+ { value: 1, label: '1s' },
+ { value: 5, label: '5m' },
+ { value: 25, label: '25m' },
+ { value: 45, label: '45m' },
+ ],
toast: [
{ value: 500, label: '0.5s' },
{ value: 1000, label: '1s' },
diff --git a/src/translations/en_GB.json b/src/translations/en_GB.json
index 57c27f89..1f4b1e3d 100644
--- a/src/translations/en_GB.json
+++ b/src/translations/en_GB.json
@@ -47,7 +47,7 @@
"modals": {
"main": {
"title": "Options",
- "loading": "Loading...",
+ "loading": "Loading..",
"file_upload_error": "File is over 2MB",
"navbar": {
"settings": "Settings",
diff --git a/src/translations/en_US.json b/src/translations/en_US.json
index 9ba33a35..bb212a23 100644
--- a/src/translations/en_US.json
+++ b/src/translations/en_US.json
@@ -47,7 +47,7 @@
"modals": {
"main": {
"title": "Options",
- "loading": "Loading...",
+ "loading": "Loading..",
"file_upload_error": "File is over 2MB",
"navbar": {
"settings": "Settings",