Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
8a15c07
fix height of main app
skyfrench Nov 12, 2019
79ad9a8
shapes page more shapes
skyfrench Nov 13, 2019
53f02b4
example layout for testing router
skyfrench Nov 13, 2019
2ed36bf
contrived nested example
skyfrench Nov 13, 2019
8dabce4
tidy up
skyfrench Nov 13, 2019
851935d
layout tweaks
skyfrench Nov 13, 2019
b913c9c
Merge branch 'master' of github.com:dls-controls/cs-web-proto into la…
skyfrench Nov 13, 2019
cfca2bf
fix height of main app
skyfrench Nov 12, 2019
1d14423
wip: load page action; needs to use router history
skyfrench Nov 14, 2019
e8bf831
Added DynamicPageWidget
TimGuiteDiamond Nov 14, 2019
29fbdc3
Some linting fixes
TimGuiteDiamond Nov 14, 2019
b123688
wip: make history available to widget
skyfrench Nov 15, 2019
3ffcdd6
wip: demo bug
skyfrench Nov 15, 2019
59be654
Using useHistory hook from latest react-router-dom
TimGuiteDiamond Nov 15, 2019
cd5be9a
empty divs are not displayed
skyfrench Nov 15, 2019
844f044
update package-lock
skyfrench Nov 15, 2019
a901373
Merge branch 'browser-history-fix' into layouts
skyfrench Nov 15, 2019
9d6befe
build fixes
skyfrench Nov 15, 2019
8fe1d4f
linting fix
skyfrench Nov 15, 2019
3f2e0dc
simple demo
skyfrench Nov 15, 2019
5bb922f
temp fix image links
skyfrench Nov 15, 2019
c4beae9
Merge branch 'dynamic-page-component' into layouts
skyfrench Nov 15, 2019
c5b8a54
remove redundant tsx file
skyfrench Nov 15, 2019
fafb9c9
simplify routePath
skyfrench Nov 15, 2019
e22cb3c
simplfy split page example
skyfrench Nov 15, 2019
300c413
remove redundant css
skyfrench Nov 15, 2019
539a40c
Revert "fix height of main app"
skyfrench Nov 26, 2019
c383e27
Merge branch 'master' of github.com:dls-controls/cs-web-proto
skyfrench Nov 26, 2019
7ddedb4
Merge branch 'master' into layouts
skyfrench Nov 26, 2019
5490a00
Flattened JSON
TimGuiteDiamond Nov 26, 2019
102f8b3
Merge branch 'master' of github.com:dls-controls/cs-web-proto
skyfrench Nov 26, 2019
3c1ec82
Merge branch 'master' into layouts
skyfrench Nov 26, 2019
f609289
Bit of simplifying to JSON pages
TimGuiteDiamond Nov 26, 2019
4fd0552
Merge branch 'layouts' into dynamic-close-button
TimGuiteDiamond Nov 26, 2019
94d22a7
bugfix option page action
skyfrench Nov 26, 2019
efc2cf4
bugfix openpage/webpage prop types swap
skyfrench Nov 26, 2019
296de15
Added X label to appear when screen is shown
TimGuiteDiamond Nov 26, 2019
7b8e7a8
Action button now using prop types
TimGuiteDiamond Nov 26, 2019
f7b4ae6
Moved style to better location inside ActionButton
TimGuiteDiamond Nov 26, 2019
0a92c3b
Dynamic page with close button
TimGuiteDiamond Nov 26, 2019
800a1c2
add CLOSE_PAGE action; remove log statements
skyfrench Nov 26, 2019
c145524
Need to add this back in so menu wrapper works with images
TimGuiteDiamond Nov 26, 2019
a24a11f
Merge branch 'layouts' into dynamic-close-button
TimGuiteDiamond Nov 26, 2019
76ce835
Close button now closes!
TimGuiteDiamond Nov 26, 2019
a07dfce
Tiny linting fix
TimGuiteDiamond Nov 26, 2019
421b49f
Added embedded screen which opens in another location dynamically
TimGuiteDiamond Nov 26, 2019
e9145d0
Hardcoded macro fix to deal with actions stored in the action array
TimGuiteDiamond Nov 26, 2019
58804b8
Minor fixes
TimGuiteDiamond Nov 26, 2019
92fc43e
Added some more state to widgetFromJSON to handle repeated renders
TimGuiteDiamond Nov 26, 2019
9f04192
Slight change
TimGuiteDiamond Nov 26, 2019
d6b153d
Merge remote-tracking branch 'origin/macro-fix' into layouts
TimGuiteDiamond Nov 26, 2019
671e252
Changed pages to be more clear, added border and history in menu wrapper
TimGuiteDiamond Nov 26, 2019
f5a8d7b
First steps towards full beamline synoptics
TimGuiteDiamond Nov 26, 2019
90aa2e2
Merge branch 'master' into synoptic
TimGuiteDiamond Nov 28, 2019
dd1dffe
Fleshing out simple demo
TimGuiteDiamond Nov 28, 2019
5e9384f
Added min and max width and work on motor detail screen
TimGuiteDiamond Nov 29, 2019
2eb2b3d
Example with embedded screen
TimGuiteDiamond Nov 29, 2019
cdbd38a
Added embedded motor screen and changed font sizes
TimGuiteDiamond Dec 10, 2019
b18235f
Merge branch 'master' into synoptic
TimGuiteDiamond Dec 10, 2019
c5cc8df
Revert "Added embedded motor screen and changed font sizes"
TimGuiteDiamond Dec 10, 2019
da5e8c7
Merge branch 'master' into synoptic-fix
TimGuiteDiamond Dec 10, 2019
88f3aa6
Fixed sizing issue
TimGuiteDiamond Dec 10, 2019
f5e2fed
Merge branch 'synoptic-fix' into synoptic
TimGuiteDiamond Dec 10, 2019
f2680c7
Changing main app to hold a dynamic page
TimGuiteDiamond Dec 10, 2019
75b56b9
Added RampPV for performance demonstration
TimGuiteDiamond Nov 19, 2019
74ddc3a
Fleshed out demo with mutiple pages and main menu
TimGuiteDiamond Dec 10, 2019
ac9a01a
Tiny change to menu
TimGuiteDiamond Dec 10, 2019
0fc3295
Added motor summary and fromJson to render on change to macroMap
TimGuiteDiamond Dec 10, 2019
077d548
Added motor detail panel
TimGuiteDiamond Dec 10, 2019
c9d412a
First attempt at adding OPI files using Coniql.
willrogers Dec 10, 2019
3be9039
Added state to fromBob to match fromJSON, added temporary fix for Boo…
TimGuiteDiamond Dec 11, 2019
464783a
Fixes in various files
TimGuiteDiamond Dec 12, 2019
11f3064
Fixed rendered on unmounted component
TimGuiteDiamond Dec 12, 2019
3bd7d2a
Example to demonstrate clearly where the unmounted component comes from
TimGuiteDiamond Dec 12, 2019
2d8f8b3
useEffect prevents this
TimGuiteDiamond Dec 12, 2019
e412e07
Added useEffects but this breaks tests
TimGuiteDiamond Dec 12, 2019
fd48bb7
Fixed unit tests using useEffect hook
TimGuiteDiamond Dec 12, 2019
dd2994e
Removed Pages which are no longer needed
TimGuiteDiamond Dec 12, 2019
0db3f6b
Removed unused JSON files
TimGuiteDiamond Dec 12, 2019
3493c10
Improved frontPage layout and added slide control
TimGuiteDiamond Dec 12, 2019
077691f
Ignore circular dependency
TimGuiteDiamond Dec 12, 2019
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
24 changes: 12 additions & 12 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"@types/node": "12.6.2",
"@types/prop-types": "^15.7.3",
"@types/react-dom": "16.8.4",
"@types/react-router-dom": "^4.3.5",
"@types/react-router-dom": "^5.1.2",
"apollo-cache-inmemory": "^1.6.3",
"apollo-client": "^2.6.4",
"apollo-link": "^1.2.13",
Expand Down
94 changes: 94 additions & 0 deletions public/beamline.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
{
"type": "display",
"position": "relative",
"overflow": "auto",
"border": "solid 3px red",
"children": [
{
"type": "flexcontainer",
"position": "relative",
"overflow": "auto",
"border": "solid 3px green",
"children": [
{
"type": "display",
"position": "relative",
"width": "100%",
"border": "solid 3px blue",
"backgroundColor": "#cccccc",
"overflow": "auto",
"children": [
{
"type": "label",
"position": "relative",
"width": "90%",
"height": "20px",
"textAlign": "center",
"fontWeight": "bold",
"backgroundColor": "#eeeeee",
"text": "Synoptic"
},
{
"type": "widgetFromJSON",
"position": "relative",
"file": "http://localhost:3000/synoptic.json"
}
]
},
{
"type": "display",
"position": "relative",
"width": "75%",
"border": "solid 3px pink",
"backgroundColor": "#cccccc",
"overflow": "auto",
"macroMap": {
"motor": "1"
},
"children": [
{
"type": "label",
"position": "relative",
"width": "100%",
"height": "20px",
"textAlign": "center",
"fontWeight": "bold",
"backgroundColor": "#eeeeee",
"text": "Embed"
},
{
"type": "dynamicpage",
"position": "relative",
"routePath": "embed"
}
]
},
{
"type": "display",
"position": "relative",
"width": "25%",
"border": "solid 3px orange",
"backgroundColor": "#cccccc",
"overflow": "auto",
"children": [
{
"type": "label",
"position": "relative",
"width": "100%",
"height": "20px",
"textAlign": "center",
"fontWeight": "bold",
"backgroundColor": "#eeeeee",
"text": "Detail"
},
{
"type": "dynamicpage",
"position": "relative",
"routePath": "detail"
}
]
}
]
}
]
}
64 changes: 0 additions & 64 deletions public/coniqlPage.json

This file was deleted.

Loading