From 3628c5b324b1c9afb052bb73bd53026d51116545 Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Tue, 4 Oct 2016 17:42:17 -0700 Subject: Implemented scroll-to-bottom functionality for button activation. --- ui/app/first-time/disclaimer.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'ui/app/first-time') diff --git a/ui/app/first-time/disclaimer.js b/ui/app/first-time/disclaimer.js index c6174a220..244b7bc97 100644 --- a/ui/app/first-time/disclaimer.js +++ b/ui/app/first-time/disclaimer.js @@ -50,6 +50,14 @@ DisclaimerScreen.prototype.render = function () { `), h('div.markdown', { + onScroll: (e) => { + var object = e.currentTarget + if (object.offsetHeight + object.scrollTop + 100 >= object.scrollHeight) { + var button = document.getElementById('agree') + button.disabled = false + button.addEventListener('click', () => this.props.dispatch(actions.agreeToDisclaimer())) + } + }, style: { // whiteSpace: 'pre-line', background: 'rgb(235, 235, 235)', @@ -67,11 +75,11 @@ DisclaimerScreen.prototype.render = function () { ]), - h('button', { + h('button#agree', { style: { marginTop: '18px' }, + disabled: true, onClick: () => this.props.dispatch(actions.agreeToDisclaimer()), }, 'I Agree'), ]) ) } - -- cgit From 991c06e5421406ab352bbc59d3a6a343ee78b383 Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Tue, 4 Oct 2016 18:39:54 -0700 Subject: Add CSS rules for proper formatting. --- ui/app/first-time/disclaimer.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'ui/app/first-time') diff --git a/ui/app/first-time/disclaimer.js b/ui/app/first-time/disclaimer.js index 244b7bc97..84c9e6a56 100644 --- a/ui/app/first-time/disclaimer.js +++ b/ui/app/first-time/disclaimer.js @@ -43,10 +43,16 @@ DisclaimerScreen.prototype.render = function () { } .markdown h1, .markdown h2, .markdown h3 { margin: 10px 0; - font-family: arial sans-serif; font-weight: bold; } + .markdown strong { + font-weight: bold; + } + .markdown em { + font-style: italic; + } + `), h('div.markdown', { -- cgit From 1158855a15c6b14a5d9fde0a6007feabcc05ea85 Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Tue, 4 Oct 2016 18:45:01 -0700 Subject: Add padding to markdown paragraphs. --- ui/app/first-time/disclaimer.js | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'ui/app/first-time') diff --git a/ui/app/first-time/disclaimer.js b/ui/app/first-time/disclaimer.js index 84c9e6a56..423d327ca 100644 --- a/ui/app/first-time/disclaimer.js +++ b/ui/app/first-time/disclaimer.js @@ -53,6 +53,10 @@ DisclaimerScreen.prototype.render = function () { font-style: italic; } + .markdown p { + margin: 10px 0; + } + `), h('div.markdown', { -- cgit From 64d8f91371ad6253e694c472a681e69474a3df94 Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Tue, 4 Oct 2016 20:49:06 -0700 Subject: Add conditional logic for adding listener. --- ui/app/first-time/disclaimer.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'ui/app/first-time') diff --git a/ui/app/first-time/disclaimer.js b/ui/app/first-time/disclaimer.js index 423d327ca..1c01718eb 100644 --- a/ui/app/first-time/disclaimer.js +++ b/ui/app/first-time/disclaimer.js @@ -62,9 +62,11 @@ DisclaimerScreen.prototype.render = function () { h('div.markdown', { onScroll: (e) => { var object = e.currentTarget - if (object.offsetHeight + object.scrollTop + 100 >= object.scrollHeight) { - var button = document.getElementById('agree') + var button = document.getElementById('agree') + if ((object.offsetHeight + object.scrollTop + 100 >= object.scrollHeight) && button.disabled) { button.disabled = false + button.innerHTML = 'I Agree' + console.log("YAHALLO") button.addEventListener('click', () => this.props.dispatch(actions.agreeToDisclaimer())) } }, @@ -89,7 +91,7 @@ DisclaimerScreen.prototype.render = function () { style: { marginTop: '18px' }, disabled: true, onClick: () => this.props.dispatch(actions.agreeToDisclaimer()), - }, 'I Agree'), + }, 'Scroll to Enable'), ]) ) } -- cgit From 94bfb5410b8548440436215d68769963725adb59 Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Tue, 4 Oct 2016 21:03:14 -0700 Subject: Add links to relevant legal pages on user agreement page. --- ui/app/first-time/disclaimer.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'ui/app/first-time') diff --git a/ui/app/first-time/disclaimer.js b/ui/app/first-time/disclaimer.js index 1c01718eb..312c864d7 100644 --- a/ui/app/first-time/disclaimer.js +++ b/ui/app/first-time/disclaimer.js @@ -40,6 +40,7 @@ DisclaimerScreen.prototype.render = function () { .markdown { font-family: Times New Roman; + overflow-x: hidden; } .markdown h1, .markdown h2, .markdown h3 { margin: 10px 0; @@ -57,6 +58,10 @@ DisclaimerScreen.prototype.render = function () { margin: 10px 0; } + .markdown a { + color: blue; + } + `), h('div.markdown', { @@ -66,7 +71,6 @@ DisclaimerScreen.prototype.render = function () { if ((object.offsetHeight + object.scrollTop + 100 >= object.scrollHeight) && button.disabled) { button.disabled = false button.innerHTML = 'I Agree' - console.log("YAHALLO") button.addEventListener('click', () => this.props.dispatch(actions.agreeToDisclaimer())) } }, @@ -91,7 +95,7 @@ DisclaimerScreen.prototype.render = function () { style: { marginTop: '18px' }, disabled: true, onClick: () => this.props.dispatch(actions.agreeToDisclaimer()), - }, 'Scroll to Enable'), + }, 'Scroll Down to Enable'), ]) ) } -- cgit From c0d6dcff00b36e89242695a4a29c5f52f4d3a5be Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Wed, 5 Oct 2016 02:42:19 -0700 Subject: Rewritten to react standards. Way easier. --- ui/app/first-time/disclaimer.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'ui/app/first-time') diff --git a/ui/app/first-time/disclaimer.js b/ui/app/first-time/disclaimer.js index 312c864d7..3ec0b37c3 100644 --- a/ui/app/first-time/disclaimer.js +++ b/ui/app/first-time/disclaimer.js @@ -19,6 +19,9 @@ function DisclaimerScreen () { } DisclaimerScreen.prototype.render = function () { + const state = this.state || {disclaimerDisabled: true} + const disabled = state.disclaimerDisabled + return ( h('.flex-column.flex-center.flex-grow', [ @@ -67,15 +70,11 @@ DisclaimerScreen.prototype.render = function () { h('div.markdown', { onScroll: (e) => { var object = e.currentTarget - var button = document.getElementById('agree') - if ((object.offsetHeight + object.scrollTop + 100 >= object.scrollHeight) && button.disabled) { - button.disabled = false - button.innerHTML = 'I Agree' - button.addEventListener('click', () => this.props.dispatch(actions.agreeToDisclaimer())) + if (object.offsetHeight + object.scrollTop + 100 >= object.scrollHeight) { + this.setState({disclaimerDisabled: false}) } }, style: { - // whiteSpace: 'pre-line', background: 'rgb(235, 235, 235)', height: '310px', padding: '6px', @@ -91,11 +90,11 @@ DisclaimerScreen.prototype.render = function () { ]), - h('button#agree', { + h('button', { style: { marginTop: '18px' }, - disabled: true, + disabled: disabled, onClick: () => this.props.dispatch(actions.agreeToDisclaimer()), - }, 'Scroll Down to Enable'), + }, disabled ? 'Scroll Down to Enable' : 'I Agree'), ]) ) } -- cgit From 5e9bc31c58aff4b9d1d0d1bd54416ffb0a1b14d3 Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Tue, 11 Oct 2016 15:50:02 -0700 Subject: Cleanup. --- ui/app/first-time/disclaimer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ui/app/first-time') diff --git a/ui/app/first-time/disclaimer.js b/ui/app/first-time/disclaimer.js index 3ec0b37c3..819d4a110 100644 --- a/ui/app/first-time/disclaimer.js +++ b/ui/app/first-time/disclaimer.js @@ -92,7 +92,7 @@ DisclaimerScreen.prototype.render = function () { h('button', { style: { marginTop: '18px' }, - disabled: disabled, + disabled, onClick: () => this.props.dispatch(actions.agreeToDisclaimer()), }, disabled ? 'Scroll Down to Enable' : 'I Agree'), ]) -- cgit