Skip to content
This repository has been archived by the owner on Jul 7, 2024. It is now read-only.
/ Orion Public archive

Add welcome window (with Terms and Conditions) #106

Merged
merged 4 commits into from
May 15, 2018

Conversation

kernelwhisperer
Copy link
Contributor

What changed?

Instead of the loading window, now we show the welcome window (which ToS) until you have accepted them.

Fixes: https://dev.siderus.team/issues/115

@@ -0,0 +1,88 @@
import React from 'react'

function ToS () {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should probably fetch this content from an URL to be always sure to have the latest content.
https://siderus.io/tos.html

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refused to display 'https://siderus.io/tos.html' in a frame because it set 'X-Frame-Options' to 'deny'

We need to allow CORS.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will a download work? You don’t need to use an iFrame, but we could download the content and then display it. What do you say?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated. We should keep in mind though that it relies on an internet connection, but I guess that shouldn't be a problem.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it already relies on it due to the Siderus Network

<ToS />
</TermsSection>
<CheckBox
label="I accept terms and conditions"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change to "I have read and I agree to Siderus Terms and Conditions and Privacy policy"

Can in case change the Terms and Conditions and Privacy Policy to links that will open in the browser? :S

Copy link
Member

@koalalorenzo koalalorenzo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well done 👍

@kernelwhisperer kernelwhisperer merged commit ffa2b12 into master May 15, 2018
@koalalorenzo koalalorenzo deleted the feature/115-user-agreement-window branch May 26, 2018 21:45
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants