aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBob Zeleznik <zzzman@gmail.com>2020-05-15 20:59:35 -0400
committerBob Zeleznik <zzzman@gmail.com>2020-05-15 20:59:35 -0400
commitb9a3c4adb81b38f550f0ab18be5c40a38aea4597 (patch)
tree8aa38aa384b9c96144b9ade2d3aeeabb9c1213c5 /src
parentede1d4c8e687b4dae48de6e11e2c8d3ec7895845 (diff)
cleaned up frame animation buttons. Added server code for https? removed unused devserver from webpack.config
Diffstat (limited to 'src')
-rw-r--r--src/client/views/collections/collectionFreeForm/CollectionFreeFormView.scss18
-rw-r--r--src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx6
-rw-r--r--src/server/server_Initialization.ts17
3 files changed, 38 insertions, 3 deletions
diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.scss b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.scss
index 60c39c825..7a84fcde1 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.scss
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.scss
@@ -41,6 +41,24 @@
// touch action none means that the browser will handle none of the touch actions. this allows us to implement our own actions.
touch-action: none;
+ .fwdKeyframe, .numKeyframe, .backKeyframe{
+ cursor: pointer;
+ position: absolute;
+ width: 20;
+ height:20;
+ bottom:0;
+ background:gray;
+ }
+ .backKeyframe {
+ right:45;
+ }
+ .numKeyframe {
+ right:25;
+ }
+ .fwdKeyframe {
+ right:5;
+ }
+
.collectionfreeformview-placeholder {
background: gray;
width: 100%;
diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
index 751ee03d2..4be671a76 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
@@ -1352,13 +1352,13 @@ export class CollectionFreeFormView extends CollectionSubView<PanZoomDocument, P
<CollectionFreeFormOverlayView elements={this.elementFunc} />
{this.isAnnotationOverlay ? (null) :
<>
- <div key="back" style={{ position: "absolute", width: 20, height: 20, right: 0, bottom: 0, }} onClick={this.nextKeyframe}>
+ <div key="fwd" className="backKeyframe" onClick={this.nextKeyframe}>
<FontAwesomeIcon icon={"caret-right"} size={"lg"} />
</div>
- <div key="fwd" style={{ position: "absolute", width: 20, height: 20, right: 20, bottom: 0, }}>
+ <div key="fwd" className="numKeyframe" >
{NumCast(this.props.Document.timecode)}
</div>
- <div key="fwd" style={{ position: "absolute", width: 20, height: 20, right: 40, bottom: 0, }} onClick={this.prevKeyframe}>
+ <div key="back" className="fwdKeyframe" onClick={this.prevKeyframe}>
<FontAwesomeIcon icon={"caret-left"} size={"lg"} />
</div>
</>}
diff --git a/src/server/server_Initialization.ts b/src/server/server_Initialization.ts
index 4b3094616..14b0dedc3 100644
--- a/src/server/server_Initialization.ts
+++ b/src/server/server_Initialization.ts
@@ -53,6 +53,23 @@ export default async function InitializeServer(routeSetter: RouteSetter) {
logPort("server", serverPort);
console.log();
});
+
+ // var express = require('express')
+ // var fs = require('fs')
+ // var https = require('https')
+ // var app = express()
+
+ // app.get('/', function (req, res) {
+ // res.send('hello world')
+ // })
+
+ // https.createServer({
+ // key: fs.readFileSync('server.key'),
+ // cert: fs.readFileSync('server.cert')
+ // }, app)
+ // .listen(3000, function () {
+ // console.log('Example app listening on port 3000! Go to https://localhost:3000/')
+ // })
disconnect = async () => new Promise<Error>(resolve => server.close(resolve));
return isRelease;