From d7cd59266e5b0f0a4c4ac6bac32c282effeca473 Mon Sep 17 00:00:00 2001 From: Curt Grimes Date: Tue, 10 Apr 2018 22:33:52 -0500 Subject: [PATCH] Start working on Chromecast integration. Split navbar into its own component and reorganize views. Make modals respond to route changes. Fix scrolling/positioning during captioning. --- app/package-lock.json | 5 + app/package.json | 1 + app/public/cast-icon-connected.svg | 18 ++ app/public/cast-icon.svg | 18 ++ app/server.js | 1 - app/src/App.vue | 243 +++++++++++++++----- app/src/components/ClearTranscriptModal.vue | 34 ++- app/src/components/Navbar.vue | 69 ++++++ app/src/components/SaveToFileModal.vue | 40 +++- app/src/components/Transcript.vue | 27 +-- app/src/router/index.js | 9 +- app/src/scss/app.scss | 9 +- app/src/views/CaptionerCaptionView.vue | 16 -- app/src/views/CaptionerView.vue | 12 + app/static/receiver.html | 102 ++++++++ 15 files changed, 507 insertions(+), 97 deletions(-) create mode 100644 app/public/cast-icon-connected.svg create mode 100644 app/public/cast-icon.svg create mode 100644 app/src/components/Navbar.vue delete mode 100755 app/src/views/CaptionerCaptionView.vue create mode 100644 app/static/receiver.html diff --git a/app/package-lock.json b/app/package-lock.json index a2a5680..b5cb65c 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -7195,6 +7195,11 @@ } } }, + "load-script": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/load-script/-/load-script-1.0.0.tgz", + "integrity": "sha1-BJGTngvuVkPuSUp+PaPSuscMbKQ=" + }, "loader-runner": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz", diff --git a/app/package.json b/app/package.json index cf519e3..e073dd5 100644 --- a/app/package.json +++ b/app/package.json @@ -40,6 +40,7 @@ "gulp-uglify": "^3.0.0", "intersection-observer": "^0.5.0", "jquery": "^3.2.1", + "load-script": "^1.0.0", "locale2": "^2.2.0", "lru-cache": "^4.1.2", "moment": "^2.18.1", diff --git a/app/public/cast-icon-connected.svg b/app/public/cast-icon-connected.svg new file mode 100644 index 0000000..7ad0bf3 --- /dev/null +++ b/app/public/cast-icon-connected.svg @@ -0,0 +1,18 @@ + + + + ic_cast_connected_black_24dp + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/public/cast-icon.svg b/app/public/cast-icon.svg new file mode 100644 index 0000000..44b6752 --- /dev/null +++ b/app/public/cast-icon.svg @@ -0,0 +1,18 @@ + + + + ic_cast_black_24dp + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/server.js b/app/server.js index 83f8863..54d3f27 100644 --- a/app/server.js +++ b/app/server.js @@ -79,7 +79,6 @@ app.use('/privacy-policy', express.static(path.join(__dirname, '../static-site/p app.use('/community', express.static(path.join(__dirname, '../static-site/public/community'))); app.use('/feedback', express.static(path.join(__dirname, '../static-site/public/feedback'))); app.use('/vmix', express.static(path.join(__dirname, '../static-site/public/vmix'))); - app.use('/static/img', express.static(path.join(__dirname, 'static/img'))); // app.use('/captioner', captioner); diff --git a/app/src/App.vue b/app/src/App.vue index 2999d24..b80a09d 100755 --- a/app/src/App.vue +++ b/app/src/App.vue @@ -1,35 +1,6 @@ @@ -42,16 +13,15 @@ \ No newline at end of file diff --git a/app/src/components/ClearTranscriptModal.vue b/app/src/components/ClearTranscriptModal.vue index 6a251b7..35283e6 100644 --- a/app/src/components/ClearTranscriptModal.vue +++ b/app/src/components/ClearTranscriptModal.vue @@ -1,7 +1,7 @@