Skip to content

Commit e531f99

Browse files
JulusianJulusian
committed
wip: tidying
1 parent 2443eb7 commit e531f99

File tree

6 files changed

+12
-28
lines changed

6 files changed

+12
-28
lines changed

‎packages/package.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
"@types/jest": "^29.5.14",
4949
"@types/node": "^22.10.10",
5050
"@types/object-path": "^0.11.4",
51-
"@types/react-router-bootstrap": "^0",
5251
"@types/underscore": "^1.13.0",
5352
"babel-jest": "^29.7.0",
5453
"copyfiles": "^2.4.1",
@@ -72,8 +71,5 @@
7271
"packageManager": "[email protected]",
7372
"resolutions": {
7473
"[email protected]": "patch:timecode@npm%3A0.0.4#./.yarn/patches/timecode-npm-0.0.4-82bde9e6fe.patch"
75-
},
76-
"dependencies": {
77-
"react-router-bootstrap": "^0.25.0"
7874
}
7975
}

‎packages/webui/index.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<head>
33
<title>Sofie</title>
44
<meta charset="utf-8" />
5-
<!-- <link rel="stylesheet" href="/origo-ui/dist/origo.css" /> -->
65
<link rel="stylesheet" href="/src/client/styles/main.scss" />
76

87
<meta name="apple-mobile-web-app-title" content="Sofie" />

‎packages/webui/package.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
"react-intersection-observer": "^9.15.1",
7676
"react-moment": "^0.9.7",
7777
"react-popper": "^2.3.0",
78+
"react-router-bootstrap": "^0.25.0",
7879
"react-router-dom": "^5.3.4",
7980
"react-timer-hoc": "^2.3.0",
8081
"semver": "^7.6.3",
@@ -100,6 +101,7 @@
100101
"@types/react-datepicker": "^3.1.8",
101102
"@types/react-dom": "^18.3.5",
102103
"@types/react-router": "^5.1.20",
104+
"@types/react-router-bootstrap": "^0",
103105
"@types/react-router-dom": "^5.3.3",
104106
"@types/sha.js": "^2.4.4",
105107
"@types/xml2js": "^0.4.14",

‎packages/webui/src/client/lib/ModalDialog.tsx‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ interface IModalDialogAttributes {
2222
secondaryText?: string
2323
acceptText: string
2424
onAccept?: (e: SomeEvent, inputResult: ModalInputResult) => void
25-
onSecondary?: (e: SomeEvent | undefined, inputResult: ModalInputResult) => void
26-
onDiscard?: (e: SomeEvent | undefined, inputResult: ModalInputResult) => void
25+
onSecondary?: (e: SomeEvent, inputResult: ModalInputResult) => void
26+
onDiscard?: (e: SomeEvent, inputResult: ModalInputResult) => void
2727
inputs?: { [attribute: string]: ModalInput }
2828
warning?: boolean
2929
actions?: ModalAction[]
@@ -75,15 +75,15 @@ export function ModalDialog({
7575
onAccept?.(e, inputResult.current)
7676
}
7777

78-
function handleDiscard(e?: SomeEvent) {
78+
function handleDiscard(e: SomeEvent) {
7979
if (onDiscard) {
8080
onDiscard(e, inputResult.current)
8181
return
8282
}
8383
handleSecondary(e)
8484
}
8585

86-
function handleSecondary(e: SomeEvent | undefined) {
86+
function handleSecondary(e: SomeEvent) {
8787
onSecondary?.(e, inputResult.current)
8888
}
8989

@@ -146,14 +146,13 @@ export function ModalDialog({
146146
<div onKeyDown={onDialogKeyDown} onKeyUp={onDialogKeyUp}>
147147
<Modal
148148
show={show}
149-
onHide={handleDiscard}
150149
onEscapeKeyDown={handleDiscard}
151150
backdrop="static"
152151
keyboard
153152
className={className}
154153
scrollable
155154
>
156-
<Modal.Header closeVariant="white" className={warning ? 'modal-header-warn' : 'modal-header-info'}>
155+
<Modal.Header className={warning ? 'modal-header-warn' : 'modal-header-info'}>
157156
<Modal.Title className={'grid-buttons-right w-100'}>
158157
<h2>{title}</h2>
159158

‎packages/webui/src/client/ui/RundownView.tsx‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import Escape from './../lib/Escape'
2222

2323
import * as i18next from 'i18next'
2424
import Tooltip from 'rc-tooltip'
25-
import { NavLink, Route, Prompt, Link } from 'react-router-dom'
25+
import { NavLink, Route, Prompt } from 'react-router-dom'
2626
import {
2727
DBRundownPlaylist,
2828
QuickLoopMarker,
@@ -172,10 +172,7 @@ import * as RundownResolver from '../lib/RundownResolver'
172172
import { MAGIC_TIME_SCALE_FACTOR } from './SegmentTimeline/Constants'
173173
import { SelectedElementProvider, SelectedElementsContext } from './RundownView/SelectedElementsContext'
174174
import { PropertiesPanel } from './UserEditOperations/PropertiesPanel'
175-
import Container from 'react-bootstrap/esm/Container'
176-
import Navbar from 'react-bootstrap/esm/Navbar'
177-
import { LinkContainer } from 'react-router-bootstrap'
178-
import Nav from 'react-bootstrap/esm/Nav'
175+
import Navbar from 'react-bootstrap/Navbar'
179176

180177
const REHEARSAL_MARGIN = 1 * 60 * 1000
181178
const HIDE_NOTIFICATIONS_AFTER_MOUNT: number | undefined = 5000

‎packages/yarn.lock‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6162,6 +6162,7 @@ __metadata:
61626162
"@types/react-datepicker": "npm:^3.1.8"
61636163
"@types/react-dom": "npm:^18.3.5"
61646164
"@types/react-router": "npm:^5.1.20"
6165+
"@types/react-router-bootstrap": "npm:^0"
61656166
"@types/react-router-dom": "npm:^5.3.3"
61666167
"@types/sha.js": "npm:^2.4.4"
61676168
"@types/sinon": "npm:^10.0.20"
@@ -6198,6 +6199,7 @@ __metadata:
61986199
react-intersection-observer: "npm:^9.15.1"
61996200
react-moment: "npm:^0.9.7"
62006201
react-popper: "npm:^2.3.0"
6202+
react-router-bootstrap: "npm:^0.25.0"
62016203
react-router-dom: "npm:^5.3.4"
62026204
react-timer-hoc: "npm:^2.3.0"
62036205
sass: "npm:^1.83.4"
@@ -7816,16 +7818,7 @@ __metadata:
78167818
languageName: node
78177819
linkType: hard
78187820

7819-
"@types/react@npm:*, @types/react@npm:>=16.9.11":
7820-
version: 19.0.10
7821-
resolution: "@types/react@npm:19.0.10"
7822-
dependencies:
7823-
csstype: "npm:^3.0.2"
7824-
checksum: 10/10b592d212ebe4b4e0bd42a95c58af3d8dfcb8b3fa4b412d686c2ff8810d5dd3e3a30ebedb31d7b738e33a39c43503e24fe4e6ca8a21d842870043793f4eda98
7825-
languageName: node
7826-
linkType: hard
7827-
7828-
"@types/react@npm:^18.3.18":
7821+
"@types/react@npm:*, @types/react@npm:>=16.9.11, @types/react@npm:^18.3.18":
78297822
version: 18.3.18
78307823
resolution: "@types/react@npm:18.3.18"
78317824
dependencies:
@@ -22360,7 +22353,6 @@ asn1@evs-broadcast/node-asn1:
2236022353
"@types/jest": "npm:^29.5.14"
2236122354
"@types/node": "npm:^22.10.10"
2236222355
"@types/object-path": "npm:^0.11.4"
22363-
"@types/react-router-bootstrap": "npm:^0"
2236422356
"@types/underscore": "npm:^1.13.0"
2236522357
babel-jest: "npm:^29.7.0"
2236622358
copyfiles: "npm:^2.4.1"
@@ -22373,7 +22365,6 @@ asn1@evs-broadcast/node-asn1:
2237322365
nodemon: "npm:^2.0.22"
2237422366
open-cli: "npm:^8.0.0"
2237522367
pinst: "npm:^3.0.0"
22376-
react-router-bootstrap: "npm:^0.25.0"
2237722368
rimraf: "npm:^6.0.1"
2237822369
semver: "npm:^7.6.3"
2237922370
ts-jest: "npm:^29.2.5"

0 commit comments

Comments
 (0)