From 05f0beba7bca995cd9b38dbc78e8981784ec8494 Mon Sep 17 00:00:00 2001 From: Jaime Guajardo Date: Thu, 9 Mar 2017 16:22:50 -0600 Subject: [PATCH 1/8] adding developer page back in --- backend/public/app/src/shared-styles.html | 4 ++-- backend/public/index.html | 2 +- backend/public/stylesheets/common.css | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/public/app/src/shared-styles.html b/backend/public/app/src/shared-styles.html index 701a5b1..a8569d1 100644 --- a/backend/public/app/src/shared-styles.html +++ b/backend/public/app/src/shared-styles.html @@ -264,10 +264,10 @@ border-right: solid 1px white; } - /*.more-links li:nth-of-type(3) { + .more-links li:nth-of-type(3) { border-right: solid 1px white; padding-right: 30px; - }*/ + } @media (max-width: 963px) { p { diff --git a/backend/public/index.html b/backend/public/index.html index ea74df6..d13ba5f 100644 --- a/backend/public/index.html +++ b/backend/public/index.html @@ -123,7 +123,7 @@

Together Stream

  • License
  • Privacy
  • Feedback
    • - +
  • Developers
    • diff --git a/backend/public/stylesheets/common.css b/backend/public/stylesheets/common.css index 5453ca9..3de896a 100644 --- a/backend/public/stylesheets/common.css +++ b/backend/public/stylesheets/common.css @@ -243,10 +243,10 @@ footer .more-links li { border-right: solid 1px white; } -/*.more-links li:nth-of-type(3) { +.more-links li:nth-of-type(3) { border-right: solid 1px white; padding-right: 30px; -}*/ +} @media (max-width: 963px) { p { From 2b0f8c475fd6ab80e2504c49d1685bac9500c2b0 Mon Sep 17 00:00:00 2001 From: Jaime Guajardo Date: Thu, 9 Mar 2017 16:37:45 -0600 Subject: [PATCH 2/8] remvoing dwanswers part of developers page --- backend/public/developers/index.html | 7 ------- 1 file changed, 7 deletions(-) diff --git a/backend/public/developers/index.html b/backend/public/developers/index.html index a1e08f2..a8cb756 100644 --- a/backend/public/developers/index.html +++ b/backend/public/developers/index.html @@ -66,13 +66,6 @@

    Ask Slack

    Join the open Contextual Sync Slack team to ask questions and chat with fellow Together Stream users.

    -
    - -
    -

    Visit the dWAnswers Forum

    -

    Ask questions on IBM dW Answers. Search with the together-stream tag to find answers quickly.

    -
    -

    Contact Us

    From b8320dd005867cf9c70c7b73ab38b6bfc2f26000 Mon Sep 17 00:00:00 2001 From: Jaime Guajardo Date: Mon, 13 Mar 2017 14:09:26 -0500 Subject: [PATCH 3/8] changing collaborative to social --- backend/public/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/public/index.html b/backend/public/index.html index b012e60..03973a1 100644 --- a/backend/public/index.html +++ b/backend/public/index.html @@ -63,7 +63,7 @@

    Together Stream

    -

    —
    A collaborative and synchronized streaming experience. Stream the content you love, together with others.

    +

    —
    A social and synchronized streaming experience. Stream the content you love, together with others.

    @@ -99,7 +99,7 @@

    Stream All Of Your Favorite Videos — Together

    Together Stream

    -

    —
    A collaborative and synchronized streaming experience. Stream the content you love, together with others.

    +

    —
    A social and synchronized streaming experience. Stream the content you love, together with others.

    From 07ecc31122b15132407a68a23f20c5c18607f134 Mon Sep 17 00:00:00 2001 From: Jaime Guajardo Date: Mon, 13 Mar 2017 14:20:04 -0500 Subject: [PATCH 4/8] updating license link to point to github license --- backend/public/app/index.html | 2 +- backend/public/developers/index.html | 2 +- backend/public/index.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/public/app/index.html b/backend/public/app/index.html index 4a7ae20..348ca63 100644 --- a/backend/public/app/index.html +++ b/backend/public/app/index.html @@ -44,7 +44,7 @@
  • © Copyright IBM Corporation 2017. All Rights Reserved.
    • -
    • License
      • +
    • License
    • Privacy
    • Feedback
      • diff --git a/backend/public/developers/index.html b/backend/public/developers/index.html index 49c4cdb..4b2d0a1 100644 --- a/backend/public/developers/index.html +++ b/backend/public/developers/index.html @@ -100,7 +100,7 @@

      Contribute

    • © Copyright IBM Corporation 2017. All Rights Reserved.
      • -
      • License
        • +
      • License
      • Privacy
      • Feedback
      • Developers
        • diff --git a/backend/public/index.html b/backend/public/index.html index 03973a1..9a1caf2 100644 --- a/backend/public/index.html +++ b/backend/public/index.html @@ -125,7 +125,7 @@

        Together Stream

      • © Copyright IBM Corporation 2017. All Rights Reserved.
        • -
        • License
          • +
        • License
        • Privacy
        • Feedback
        • Developers
          • From 8aa06ff92ccdcd636fd66dcfa7e7f21082899923 Mon Sep 17 00:00:00 2001 From: Jaime Guajardo Date: Mon, 13 Mar 2017 15:25:30 -0500 Subject: [PATCH 5/8] changing how we check whether a stream is valid or not by checking csync for valid stream ids --- .../app/src/behaviors/csync-behavior.html | 35 ++++++++++++++++++ .../app/src/behaviors/server-behavior.html | 36 ------------------- backend/public/app/src/ts-app.html | 21 ++++++----- 3 files changed, 47 insertions(+), 45 deletions(-) diff --git a/backend/public/app/src/behaviors/csync-behavior.html b/backend/public/app/src/behaviors/csync-behavior.html index a5cb1bf..a04a0e0 100644 --- a/backend/public/app/src/behaviors/csync-behavior.html +++ b/backend/public/app/src/behaviors/csync-behavior.html @@ -195,5 +195,40 @@ timestamp: (Date.now() - timeOffset) / 1000 // need to save in seconds from 2001 }, {acl: csync.acl.PublicReadWrite}) }, + /** + * Validates with the server whether this stream id is valid. + * @param {string} streamId - Stream id input by the user on portal page. + * @param {function} callback - Function callback + */ + isValidStreamId: function(streamId, callback) { + let listenerKey = this.csyncApp.key("streams.*") + let checkIfInvalid = function () { + if (!this.streamValidated) { + callback(false) + } + } + let listenerCallback = function (error, value) { + if (error) { + console.error(error) + return + } + // If value doesn't exist and is outdated, don't process it. + if (!value.exists) { + return + } + + if (!this.streamValidated && value.key && value.key.indexOf(streamId) >= 0) { + this.set("streamValidated", true) + callback(true) + return + } + + // Checking if invalid once all streams have been checked. + this.debounce("invalidStreamCallback", checkIfInvalid, 200) + // this.processMessageAndInsertIntoArray(value) + }.bind(this) + + listenerKey.listen(listenerCallback) + } }; \ No newline at end of file diff --git a/backend/public/app/src/behaviors/server-behavior.html b/backend/public/app/src/behaviors/server-behavior.html index 557b4db..e4b4c79 100644 --- a/backend/public/app/src/behaviors/server-behavior.html +++ b/backend/public/app/src/behaviors/server-behavior.html @@ -43,42 +43,6 @@ } }.bind(this) xhr.send(null); - }, - /** - * Validates with the server whether this stream id is valid. - * @param {string} streamId - Stream id input by the user on portal page. - */ - isValidStreamId: function(streamId, callback) { - let xhr = new XMLHttpRequest(); - - xhr.open('GET', '/invites', true); - xhr.setRequestHeader('Authorization', this.serverAccessToken) - xhr.onload = function () { - if (xhr.status === 200) { - let invitesArr = JSON.parse(xhr.response) - var streamIdIsValid = false - - if (invitesArr) { - invitesArr.forEach(function(invite) { - let splitStr = invite.csync_path.split('.') - - if (splitStr[1] === streamId) { - streamIdIsValid = true - this.set("streamName", invite.stream_name) - } - }.bind(this)) - } - callback(streamIdIsValid) - } else if (xhr.status === 401) { - // Get new server token when needing authentication expires. - this.getServerAccessToken(function() { - this.isValidStreamId(streamId, callback) - }.bind(this)) - } else { - console.error("Couldn't reach server.", xhr) - } - }.bind(this) - xhr.send(null); } }; \ No newline at end of file diff --git a/backend/public/app/src/ts-app.html b/backend/public/app/src/ts-app.html index 7b63c7a..0ac206d 100644 --- a/backend/public/app/src/ts-app.html +++ b/backend/public/app/src/ts-app.html @@ -102,16 +102,19 @@ * @param {string} streamId - New stream id. */ joinStream: function() { + let that = this let showPortalPage = function () { - this.isValidStreamId(this.streamId, function callback(isValid) { - if (isValid) { - this.set("showingPortalPage", false) - this.authenticateWithFacebookAccessToken(this.facebookAccessToken, this.setupCsyncListeners.bind(this)) - } else { - alert("Please input a valid stream id.") - } - }.bind(this)) - }.bind(this) + that.authenticateWithFacebookAccessToken(that.facebookAccessToken, function () { + that.isValidStreamId(that.streamId, function callback(isValid) { + if (isValid) { + that.setupCsyncListeners() + that.set("showingPortalPage", false) + } else { + alert("Please input a valid stream id.") + } + }) + }) + } if (!this.isLoggedIn) { this.fbLogin(function callback () { From 66e069c0eb04bb365290c76912994f4e157ce915 Mon Sep 17 00:00:00 2001 From: Jaime Guajardo Date: Mon, 13 Mar 2017 15:50:30 -0500 Subject: [PATCH 6/8] fixing bug where chat message sent from web would not appear on ios --- backend/public/app/src/behaviors/csync-behavior.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/public/app/src/behaviors/csync-behavior.html b/backend/public/app/src/behaviors/csync-behavior.html index a04a0e0..dbe0f43 100644 --- a/backend/public/app/src/behaviors/csync-behavior.html +++ b/backend/public/app/src/behaviors/csync-behavior.html @@ -189,11 +189,11 @@ sendChatMessage: function (message) { let writeKey = this.csyncApp.key("streams." + this.streamId + ".chat." + this.generateUUID()) let timeOffset = this.timeOffset - writeKey.write({ + writeKey.write(JSON.stringify({ content: message.detail, id: this.loggedInUserFacebookId, - timestamp: (Date.now() - timeOffset) / 1000 // need to save in seconds from 2001 - }, {acl: csync.acl.PublicReadWrite}) + timestamp: "" + (Date.now() - timeOffset) / 1000 // need to save in seconds from 2001 + }), {acl: csync.acl.PublicReadWrite}) }, /** * Validates with the server whether this stream id is valid. From 7e207fc02828582f8ff632a160a9586e86243a56 Mon Sep 17 00:00:00 2001 From: Jaime Guajardo Date: Mon, 13 Mar 2017 17:04:51 -0500 Subject: [PATCH 7/8] fixing webapp on safari and firefox. and fixing some quirks with sizing --- backend/public/app/bower.json | 16 ++++++---------- backend/public/app/src/ts-chat-message.html | 3 +++ backend/public/app/src/ts-chat.html | 3 ++- backend/public/app/src/ts-video.html | 4 ++++ 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/backend/public/app/bower.json b/backend/public/app/bower.json index d59e7e0..c70b186 100644 --- a/backend/public/app/bower.json +++ b/backend/public/app/bower.json @@ -3,20 +3,16 @@ "description": "Watch videos together with others.", "main": "index.html", "dependencies": { - "polymer": "Polymer/polymer#2.0-preview", + "polymer": "1.8.1", "google-youtube": "^1.2.1", - "iron-input": "2.0-preview" - }, - "devDependencies": { - "iron-component-page": "PolymerElements/iron-component-page#^1.0.0", - "iron-demo-helpers": "PolymerElements/iron-demo-helpers#^1.0.0", - "web-component-tester": "^4.0.0", - "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" + "iron-input": "1.0.10", + "webcomponentsjs": "^0.7.24" }, "resolutions": { "webcomponentsjs": "v1", - "polymer": "2.0-preview", + "polymer": "^2.0.0-rc.1", "iron-validatable-behavior": "2.0-preview", - "iron-meta": "2.0-preview" + "iron-meta": "2.0-preview", + "iron-a11y-announcer": "^1.0.0" } } diff --git a/backend/public/app/src/ts-chat-message.html b/backend/public/app/src/ts-chat-message.html index a7eac53..a41b698 100644 --- a/backend/public/app/src/ts-chat-message.html +++ b/backend/public/app/src/ts-chat-message.html @@ -23,6 +23,9 @@ font-size: small; margin: 2px; } + .right-container p { + margin-top: -4px; + } .inline { display: flex; } diff --git a/backend/public/app/src/ts-chat.html b/backend/public/app/src/ts-chat.html index 4fa5d83..85f3a1d 100644 --- a/backend/public/app/src/ts-chat.html +++ b/backend/public/app/src/ts-chat.html @@ -14,7 +14,8 @@ display: flex; flex-direction: column; justify-content: space-between; - width: 30% + width: 30%; + height: 100%; } .bottom-container { display: flex; diff --git a/backend/public/app/src/ts-video.html b/backend/public/app/src/ts-video.html index 1842160..30712f3 100644 --- a/backend/public/app/src/ts-video.html +++ b/backend/public/app/src/ts-video.html @@ -11,6 +11,10 @@