Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UT-210: Rebuilding of the code structure for Cliptool. #81

Merged
merged 114 commits into from
Jul 14, 2023
Merged
Show file tree
Hide file tree
Changes from 112 commits
Commits
Show all changes
114 commits
Select commit Hold shift + click to select a range
a371ad3
UT-210: splits Thumbnail.tsx into multiple files.
andr9528 Mar 7, 2023
3768d71
UT-210: splits Header.tsx into multiple files.
andr9528 Mar 7, 2023
bc469b5
Merge branch 'UT-211/reimplementTabs' into UT-210/refactorStructure
andr9528 Mar 8, 2023
03ba501
UT-210: refactor: startes on splitting Settings.tsx into multiple files.
andr9528 Mar 9, 2023
d478cfd
Merge branch 'UT-211/reimplementTabs' into UT-210/refactorStructure
andr9528 Mar 9, 2023
8979edd
UT-210: continues work on splitting Settings into multiple files.
andr9528 Mar 9, 2023
17dbde7
UT-210: WIP: rework structure of saved settings. Opening Settings wil…
andr9528 Mar 9, 2023
8bd7272
Merge branch 'develop' into UT-210/refactorStructure
andr9528 Mar 10, 2023
ecd3750
UT-210: WIP: almost finishes moving and merging where settings are sa…
andr9528 Mar 13, 2023
ec86a3d
UT-210: WIP: continues moving attributes over to settings.
andr9528 Mar 15, 2023
f5f07e7
UT-210: WIP: extracts settings related models to new file to prevent …
andr9528 Mar 15, 2023
e291515
UT-210: continues on reworking settings.
andr9528 Mar 15, 2023
0890dd4
UT-210: completes rewrite of settings to new structure.
andr9528 Mar 16, 2023
65b597d
UT-210: WIP: Adjusts settings so discard button changes test dependin…
andr9528 Mar 16, 2023
982c6d0
UT-210: fix: fixes incorrect structure of saved settings. fix: fixes …
andr9528 Mar 16, 2023
216dd81
UT-210: Updates signature of functions to function definitions and el…
andr9528 Mar 17, 2023
547aa5c
UT-210: WIP: makes attempts to figure out why OSC messages aren't rec…
andr9528 Mar 17, 2023
cbcfc32
UT-210: refactor: out-comments temp logs. Will be removed ones the is…
andr9528 Mar 17, 2023
1e69ed3
UT-210: refactor: renames files, except css and components for now, t…
andr9528 Mar 17, 2023
cb11042
UT-210: refactor: updates inport that was missed for previous commit.
andr9528 Mar 17, 2023
e5d9f3b
UT-210: refactor: updates another few inports that was missed for pre…
andr9528 Mar 17, 2023
623091c
UT-210: fix: fixes not receiving messages from CCG. Fixes 2 values un…
andr9528 Mar 20, 2023
4fa367f
UT-210: refactor: renames remaining files/folders to use camelCase.
andr9528 Mar 20, 2023
457aa0d
UT-210: removes the need to apply indexing when accessing redux state…
andr9528 Mar 20, 2023
177dfcf
UT-210: WIP: makes tsconfig's way more strict.
andr9528 Mar 20, 2023
ee6bcb3
UT-210: fixes more compile errors from strictness of tsconfigs.
andr9528 Mar 21, 2023
c0b6131
UT-210: refactor: changes code that loads files into service classes.
andr9528 Mar 21, 2023
f4e892d
UT-210: fix: fixes more compile errors from the more strict tsconfigs.
andr9528 Mar 21, 2023
bb89259
UT-210: fixes more errors in atempt to being able to start Cliptool a…
andr9528 Mar 22, 2023
6d5ed12
UT-210: WIP: implements changes for PR comments and fixes a number of…
andr9528 Mar 23, 2023
f5b36e1
UT-210: applies changes for PR comments, and continues to try and fix…
andr9528 Mar 23, 2023
ebc9778
UT-210: solves circular dependency.
andr9528 Mar 24, 2023
5a9fbf6
UT-210: WIP: starts on finguring out why the redux state is mutating.
andr9528 Mar 24, 2023
60ab564
UT-210: fix: fixes doing mutations on redux state object, which is di…
andr9528 Mar 27, 2023
463ea9a
UT-210: fix: fixes(?) a redux serialization error and mutation issue.
andr9528 Mar 27, 2023
00ddfa6
UT-210: eradicated settingsInput.tsx
andr9528 Mar 28, 2023
bb9b9e4
UT-210: renames a few components and extract swipe logic to its own c…
andr9528 Mar 29, 2023
2911e3a
UT-210: does some cleanup of duplicate files and unsed imports.
andr9528 Mar 29, 2023
8e3e320
UT-210: renames a few service files to use kebab-case.
andr9528 Mar 29, 2023
3f26b81
UT-210: reworks tab system to murder tabContent.
andr9528 Mar 29, 2023
b7e716e
UT-210: refactor: removes redundant boolean flag
andr9528 Mar 29, 2023
092b934
UT-210: refactor: renames files to use kebab-case. refactor: renames …
andr9528 Mar 29, 2023
3b30b08
UT-210: refactor: cleans up dependencies.
andr9528 Mar 29, 2023
a48517b
UT-210: Starts om converting css to scss. Joins logic for figureing o…
andr9528 Mar 30, 2023
83fca71
UT-210: applies changes for a number of comments by Lindved and Anders.
andr9528 Mar 30, 2023
a689c39
UT-210: applies changes for PR comments by Anders.
andr9528 Mar 30, 2023
2f84be2
UT-210: applies changes in response to a number of PR comments by And…
andr9528 Mar 31, 2023
0c63522
UT-210: moves most css to scss files beside the files that make use o…
andr9528 Mar 31, 2023
c5dca7c
UT-210, UT-215: extracts remaining css to scss, fixing the red border…
andr9528 Apr 3, 2023
5de294d
UT-210: fixes a number of smaller errors.
andr9528 Apr 3, 2023
cee5bac
UT-210: feature: adds loaded indicator.
andr9528 Apr 3, 2023
91e9913
UT-210: re-added ability to close settings via 'settings' button.
andr9528 Apr 5, 2023
d315cb1
UT-210: extracts socket emits performed in components to service clas…
andr9528 Apr 5, 2023
2f1e70f
UT-210: adds saving of settings when states from header controls are …
andr9528 Apr 5, 2023
f013b07
UT-210: fixes playing image files displaying a time, if a video is lo…
andr9528 Apr 11, 2023
cd6775f
UT-210: finalizes the loaded indicator.
andr9528 Apr 11, 2023
c45d24b
UT-210: refactor: renames and cleans up some css.
andr9528 Apr 11, 2023
bc0b448
UT-210: refactor: eliminates tabData from the redux state, as it can …
andr9528 Apr 12, 2023
8bbba23
UT-210: refactor: lowers duplicate css and improves naming.
andr9528 Apr 12, 2023
978e3d1
UT-210: WIP: reduces amount of times redux state is updated.
andr9528 Apr 12, 2023
f04a6ba
UT-210: renames a few attributes to better fit their content, and fix…
andr9528 Apr 13, 2023
f1dcd1c
UT-210: refactor: renames some scss classes, and attributes. reduces …
andr9528 Apr 13, 2023
39090d9
UT-210: refactor: fixes some todo comments and from my own list of to…
andr9528 Apr 13, 2023
8637cd1
UT-210: adds types to a number of functions and variables.
andr9528 Apr 14, 2023
4a43b0a
UT-210: splits 'startTimerControlledServices' into two different func…
andr9528 Apr 14, 2023
a44fc8e
UT-210: refactor: reworks socketClientHandlers into client-handler-se…
andr9528 Apr 14, 2023
e490351
UT-210: refactor: reduces duplicate CSS, and moves it to a more prope…
andr9528 Apr 17, 2023
9874d9f
UT-210: refactor: updates name of some css classs in response to PR c…
andr9528 Apr 17, 2023
c83ae54
UT-210: refactor: removes more duplicate css and fixes borders not sh…
andr9528 Apr 17, 2023
e89871c
UT-210: fixes some styling isues.
andr9528 Apr 19, 2023
bc5d0d4
UT-210: addresses a few PR comments.
andr9528 Apr 24, 2023
60a078f
UT-210: addresses some more PR comments.
andr9528 Apr 24, 2023
75df749
UT-210: refactor: renames folders that i forgot to rename together wi…
andr9528 Apr 24, 2023
10aefbd
UT-210: creates new switch component to encapsulate switch styling.
andr9528 Apr 24, 2023
e22d683
UT-210: refactor: improves footer in response to PR comments.
andr9528 Apr 24, 2023
20afcc7
UT-210: refactor: changes usage of jsx-service into a new component i…
andr9528 Apr 24, 2023
775eea4
UT-210: refactor: changes default indexing of channel in browser-serv…
andr9528 Apr 24, 2023
bf1ff27
UT-210: refactor: fixes wrong text in label.
andr9528 Apr 25, 2023
61e3216
UT-210: refactor: fixes mixup of default values in fallback and no de…
andr9528 Apr 26, 2023
b22c44a
UT-210: refactor: adds missing margin and trims ends of string interp…
andr9528 Apr 26, 2023
7ae2d08
UT-210: refactor: adds logging of Unhandles Rejections and handling o…
andr9528 Apr 27, 2023
8c6f8b7
UT-210: refactor: adds changes that should fix rare/sporadic reading …
andr9528 Apr 27, 2023
38d128a
UT-210: feature: adds usage of 'transitionTime' for mix duration, as …
andr9528 Apr 28, 2023
8d211c5
UT-210: addresses a number of comment by Lindved.
andr9528 May 22, 2023
1118a0d
UT-210: changes in reponse to PR comments by Lindved.
andr9528 May 22, 2023
ed8f564
UT-210: fix: fixes overlay playing state not updating if changed from…
andr9528 May 24, 2023
a8cea34
UT-210: fix: fixes Cliptool ordering CasparCG to stop overlay playing…
andr9528 May 25, 2023
b36c3f2
UT-210: fix: removes old settings example as it shows the old setting…
andr9528 May 26, 2023
33ca811
UT-210: refactor: updates prompt on clicking Restart Cliptool
andr9528 May 30, 2023
d3b3d0b
UT-210: applies a large number of changes in response to PR. See expa…
andr9528 Jun 1, 2023
1cf582c
UT-210: applies changes for a handful of PR Comments.
andr9528 Jun 6, 2023
7ae008b
UT-210: applies changes for a number of PR comments.
andr9528 Jun 6, 2023
eb04a4b
UT-210: applies changes for a number of PR comments. See extended det…
andr9528 Jun 8, 2023
668cc84
UT-210: last big chunk of changes for PR comments. See extended commi…
andr9528 Jun 12, 2023
7efd77f
UT-210: fix: fixes inability to have channel and textview enabled at …
andr9528 Jun 14, 2023
f27d5b9
UT-210: fix: fixes incorrect import and being able to hide cued files.
andr9528 Jun 14, 2023
f729200
UT-210: refactor: removes redundant useSelected().
andr9528 Jun 14, 2023
9429a7b
UT-210: refactor: improves readability of browser-service, and also l…
andr9528 Jun 14, 2023
98ce64c
UT-210: fix: fixes incorrect import
andr9528 Jun 14, 2023
7f5f477
UT-210: refactor: applies changes from talk with Anders and folder th…
andr9528 Jun 14, 2023
b1b3f39
UT-210: reworkes how settings are display eliminating changing-settin…
andr9528 Jun 15, 2023
9ae0da3
UT-210: refactor: moves css applied from constant to inside the compo…
andr9528 Jun 15, 2023
a38a292
UT-210: refactor: moves Singleton instance of all services to an stat…
andr9528 Jun 15, 2023
910a07b
UT-210: refactor: changes targeting local css to be done via Enum val…
andr9528 Jun 15, 2023
e7326e8
UT-210: improves persisting of data and checking for settings layout …
andr9528 Jun 16, 2023
a6c3880
UT-210: refactor: removes redundant useSelectors.
andr9528 Jun 16, 2023
b303ecd
UT-210: applies changes for comments by Lindved
andr9528 Jul 3, 2023
0a5fda6
UT-210: refactor: reworks client file structure to match structure su…
andr9528 Jul 4, 2023
ccac2b0
UT-210: applies a few more changes for comments by Lindved
andr9528 Jul 4, 2023
82022e2
UT-210: refactor: fixes operation mode change via clicking button on …
andr9528 Jul 5, 2023
88e63ea
UT-210: applies changes for comments by Anders
andr9528 Jul 12, 2023
db51914
UT-210: refactor: moves gitignore definition to personal global file
andr9528 Jul 12, 2023
b0e99bb
UT-210: applies more changes for comments on PR by Anders.
andr9528 Jul 13, 2023
008db18
UT-210: solves a half-dozen circular dependencies that had hit critic…
andr9528 Jul 14, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Settings #
settings.json
/storage/

# Build folder and files #
##########################
Expand Down Expand Up @@ -56,4 +56,3 @@ ehthumbs.db
# Windows shortcuts #
#####################
*.lnk
/storage/hiddenFiles.json
17 changes: 9 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,29 +61,28 @@
]
},
"dependencies": {
"@tv2media/logger": "^1.2.4",
"@reduxjs/toolkit": "^1.9.3",
"@tv2media/logger": "^2.0.0",
"casparcg-connection": "^5.1.0",
"chokidar": "^3.5.1",
"express": "^4.17.1",
"filehound": "^1.17.4",
"http": "^0.0.0",
"lodash": "^4.17.21",
"osc": "https://github.com/olzzon/tv2-osc.js-no-serialport.git",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-redux": "^7.2.3",
"react-sortablejs": "^6.0.0",
"redux": "^4.0.5",
"rmc-tabs": "^1.2.29",
"serialport": "^9.0.7",
"socket.io": "^4.0.0",
"socket.io-client": "^4.0.0",
"sortablejs": "^1.13.0",
"xml-js": "^1.6.11"
"zod": "^3.21.4"
},
"devDependencies": {
"@babel/core": "^7.13.10",
"@babel/preset-typescript": "^7.13.0",
"@types/lodash": "^4.14.191",
"@types/node": "^14.14.36",
"@types/react-dom": "^18.0.11",
"@types/react-redux": "^7.1.16",
"@types/socket.io-client": "^1.4.36",
"copyfiles": "^2.4.1",
Expand All @@ -94,12 +93,14 @@
"node-license-validator": "^1.3.0",
"pkg": "^5.8.0",
"prettier": "^2.2.1",
"sass": "^1.60.0",
"sass-loader": "^13.2.2",
"simple-git-hooks": "^2.0.3",
"standard-version": "^9.1.1",
"style-loader": "^2.0.0",
"ts-loader": "^8.0.18",
"typescript": "^4.2.3",
"webpack": "^5.28.0",
"webpack": "^5.77.0",
"webpack-cli": "^4.5.0"
}
}
5 changes: 0 additions & 5 deletions settings.example.json

This file was deleted.

9 changes: 9 additions & 0 deletions src/client/app/app.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.app {
display: flex;
flex-direction: column;
height: 100%;
overflow: hidden;
position: relative;
text-align: center;
background-color: #aaa;
}
22 changes: 22 additions & 0 deletions src/client/app/app.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import React from 'react'
import { reduxStore } from '../../shared/store'
import { setActiveTabIndex } from '../../shared/actions/app-navigation-action'
import './app.scss'
import ApplicationRouter from '../shared/components/application-router/application-router'
import { BrowserService } from '../shared/services/browser-service'


export function App(): JSX.Element {
if (new BrowserService().isChannelView()) {
setOutput(new BrowserService().getChannel())
}
return (
<div className="app">
<ApplicationRouter/>
</div>
)
}

function setOutput(tabIndex: number): void {
reduxStore.dispatch(setActiveTabIndex(tabIndex))
}
43 changes: 0 additions & 43 deletions src/client/components/App.tsx

This file was deleted.

33 changes: 0 additions & 33 deletions src/client/components/Footer/OperationModeEditVisibilityFooter.tsx

This file was deleted.

20 changes: 0 additions & 20 deletions src/client/components/Footer/OperationModeFooter.tsx

This file was deleted.

Loading