-
Notifications
You must be signed in to change notification settings - Fork 95
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update setup_script to fetch landing page #101
Merged
Merged
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
2261887
Update setup_script to fetch landing page
siddhanth339 05bd6cc
update setup_script
siddhanth339 39348d8
Update README.md
siddhanth339 b3d441a
removed redundant lines from setup_script
siddhanth339 76c4ac9
Merge branch 'backup-dev' of https://github.com/siddhanth339/Caracal …
siddhanth339 ea2b00c
Merge branch 'backup-dev' into backup-dev
birm File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| [ | ||
| { | ||
| "displayName":"Bug Report", | ||
| "url":"https://goo.gl/forms/mgyhx4ADH0UuEQJ53", | ||
| "icon": "bug_report", | ||
| "openInNewTab": true | ||
| } | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,77 +1,159 @@ | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <meta name="google-signin-client_id" content="XXX.apps.googleusercontent.com"> | ||
| <script src="https://apis.google.com/js/platform.js" async defer></script> | ||
| <div class="g-signin2" data-onsuccess="onSignIn"></div> | ||
| <a href="#" onclick="signOut();">Sign out</a> | ||
| <script> | ||
| function signOut() { | ||
| var auth2 = gapi.auth2.getAuthInstance(); | ||
| auth2.signOut().then(function () { | ||
| console.log('User signed out.'); | ||
| }); | ||
| } | ||
| </script> | ||
| <script> | ||
| // google's jwk is here: https://www.googleapis.com/oauth2/v3/certs | ||
| function randomString(length) { | ||
| var bytes = new Uint8Array(length); | ||
| var random = window.crypto.getRandomValues(bytes); | ||
| var result = []; | ||
| var charset = '0123456789ABCDEFGHIJKLMNOPQRSTUVXYZabcdefghijklmnopqrstuvwxyz-._~' | ||
| random.forEach(function (c) { | ||
| result.push(charset[c % charset.length]); | ||
| }); | ||
| return result.join(''); | ||
| } | ||
| <head> | ||
| <title>CaMicroscope</title> | ||
| <meta charset="utf-8" /> | ||
| <meta name="google-signin-client_id" content="539699277901-buh78f048405grejogqbrskj233rt0d0.apps.googleusercontent.com"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1" /> | ||
| <link rel="stylesheet" href="./apps/landing/main.css" /> | ||
| <script type="text/javascript" src="./common/util.js"></script> | ||
| </head> | ||
| <body> | ||
| <header id="header"> | ||
| <label style="color:white;padding:0 15px;font-size:20px;position:relative;">CaMicroscope<a target="_blank" style="position:absolute;right:2vw;" href="https://docs.google.com/forms/d/e/1FAIpQLScL91LxrpAZjU88GBZP9gmcdgdf8__uNUwhws2lzU6Lr4qNwA/viewform">Feedback</a></label> | ||
| <nav id="nav"> | ||
| <ul> | ||
| <!-- <li><a target="_blank" href="https://docs.google.com/forms/d/e/1FAIpQLScL91LxrpAZjU88GBZP9gmcdgdf8__uNUwhws2lzU6Lr4qNwA/viewform">Feedback</a></li> --> | ||
| <!-- <li><a href="./login.html?logout=true">Sign Out</a></li> --> | ||
| </ul> | ||
| </nav> | ||
| </header> | ||
| <section id="main" class="wrapper" style="padding:3em;"> | ||
| <div class="inner"> | ||
| <header class="major"> | ||
| <h2 style="margin:0;">caMicroscope</h2> | ||
| </header> | ||
| <!-- Content --> | ||
|
|
||
| function getUrlParam(name, url) { | ||
| if (!url) url = window.location.href; | ||
| name = name.replace(/[\[\]]/g, '\\$&'); | ||
| var regex = new RegExp('[?&#]' + name + '(=([^&#]*)|&|#|$)'), | ||
| results = regex.exec(url); | ||
| if (!results) return null; | ||
| if (!results[2]) return ''; | ||
| return decodeURIComponent(results[2].replace(/\+/g, ' ')); | ||
| } | ||
| <div class="content"> | ||
| <p><strong>caMicroscope</strong> is a tool to view, label, and annotate biomedical images.</p> | ||
| <a href="#" class="image fit"><img src="./apps/landing/banner1.jpg" alt="" /></a> | ||
|
|
||
| function onSignIn(googleUser) { | ||
| var id_token = googleUser.getAuthResponse().id_token; | ||
| console.info(id_token) | ||
| // trade for camic token | ||
| var cookie_name = "token" // "token" is expected by elevate router | ||
| var base_deployment_url = window.location.toString().split("/").slice(0,-1).join("/") | ||
| var redirect_uri = base_deployment_url + "/login.html" | ||
| var default_redirect = base_deployment_url + "/apps/table.html" | ||
| var state | ||
| if (getUrlParam("state")) | ||
| { | ||
| state = decodeURIComponent(getUrlParam("state")) | ||
| } | ||
| if (!state){ | ||
| state = default_redirect | ||
| } | ||
| </div> | ||
|
|
||
| if (id_token){ | ||
| document.cookie = cookie_name + "=" + id_token; | ||
| fetch("./auth/Token/check", | ||
| {headers: { | ||
| 'Authorization': "Bearer " + id_token | ||
| }} | ||
| ).then(x=>x.json()).then(x=>{ | ||
| console.log("{id provider", id_token) | ||
| console.log("{auth service}", x) | ||
| if (x.hasOwnProperty('token')){ | ||
| document.cookie = cookie_name + "=" + x.token; | ||
| window.location = state | ||
| <div class="posts" style="justify-content: center;"> | ||
| <!-- Organizer --> | ||
| <section class="post"> | ||
| <a href="#" class="image"><img src="./apps/landing/camic.jpg" alt=""/></a> | ||
| <div class="content"> | ||
| <h3>Please Sign In With Your Google Account</h3> | ||
| <div id="google-signin2"></div> | ||
| </div> | ||
| </section> | ||
| </div> | ||
| </section> | ||
|
|
||
| <script> | ||
| function onSuccess(googleUser) { | ||
| // don't if we're logging out | ||
| if (getUrlParam("logout")) { | ||
| removeUserConsentAcceptance(getUserId()); | ||
| signOut(); | ||
| deleteCookies(); | ||
| console.log("logging out"); | ||
| window.location.href = "./login.html"; | ||
| } else { | ||
| window.alert("User not added") | ||
| window.location = "./apps/signup/signup" | ||
| var id_token = googleUser.getAuthResponse().id_token; | ||
| // console.info(id_token); | ||
| // trade for camic token | ||
| var cookie_name = "token"; // "token" is expected by elevate router | ||
| var base_deployment_url = window.location | ||
| .toString() | ||
| .split("/") | ||
| .slice(0, -1) | ||
| .join("/"); | ||
| var redirect_uri = base_deployment_url + "/login.html"; | ||
| var default_redirect = base_deployment_url + "/apps/table.html"; | ||
| var state; | ||
| if (getUrlParam("state")) { | ||
| state = decodeURIComponent(getUrlParam("state")); | ||
| } | ||
| if (!state) { | ||
| state = default_redirect; | ||
| } | ||
| if (id_token) { | ||
| document.cookie = cookie_name + "=" + id_token; | ||
| fetch("./auth/Token/check", { | ||
| headers: { | ||
| Authorization: "Bearer " + id_token | ||
| } | ||
| }) | ||
| .then(x => x.json()) | ||
| .then(x => { | ||
| if (x.hasOwnProperty("token")) { | ||
| document.cookie = cookie_name + "=" + x.token; | ||
| let token_data = parseJwt(x.token); | ||
| window.location = "./apps/landing/landing.html"; | ||
| } else { | ||
| window.alert("User not added"); | ||
| window.location = "./apps/signup/signup.html"; | ||
| } | ||
| }); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| }) | ||
| } | ||
| } | ||
| function onFailure(error) { | ||
| console.error(error); | ||
| } | ||
|
|
||
| function renderButton() { | ||
| gapi.signin2.render('google-signin2', { | ||
| 'scope': 'profile email', | ||
| 'width': 240, | ||
| 'height': 50, | ||
| 'longtitle': true, | ||
| 'theme': 'dark', | ||
| 'onsuccess': onSuccess, | ||
| 'onfailure': onFailure | ||
| }); | ||
| } | ||
|
|
||
| </script> | ||
| <html> | ||
| function signOut() { | ||
| var auth2 = gapi.auth2.getAuthInstance(); | ||
| auth2.signOut().then(function() { | ||
| console.log("User signed out."); | ||
| }); | ||
| } | ||
|
|
||
| function deleteCookies() { | ||
| var allcookies = document.cookie.split(";"); | ||
| for (var i = 0; i < allcookies.length; i++) { | ||
| var cookie = allcookies[i]; | ||
| var eqPos = cookie.indexOf("="); | ||
| var name = eqPos > -1 ? cookie.substr(0, eqPos) : cookie; | ||
| document.cookie = name + "=;expires=Thu, 01 Jan 1970 00:00:00 GMT;"; | ||
| } | ||
| } | ||
|
|
||
| // google's jwk is here: https://www.googleapis.com/oauth2/v3/certs | ||
| function randomString(length) { | ||
| var bytes = new Uint8Array(length); | ||
| var random = window.crypto.getRandomValues(bytes); | ||
| var result = []; | ||
| var charset = | ||
| "0123456789ABCDEFGHIJKLMNOPQRSTUVXYZabcdefghijklmnopqrstuvwxyz-._~"; | ||
| random.forEach(function(c) { | ||
| result.push(charset[c % charset.length]); | ||
| }); | ||
| return result.join(""); | ||
| } | ||
|
|
||
| function getUrlParam(name, url) { | ||
| if (!url) url = window.location.href; | ||
| name = name.replace(/[\[\]]/g, "\\$&"); | ||
| var regex = new RegExp("[?&#]" + name + "(=([^&#]*)|&|#|$)"), | ||
| results = regex.exec(url); | ||
| if (!results) return null; | ||
| if (!results[2]) return ""; | ||
| return decodeURIComponent(results[2].replace(/\+/g, " ")); | ||
| } | ||
| </script> | ||
|
|
||
| <script src="https://apis.google.com/js/platform.js?onload=renderButton" async defer></script> | ||
|
|
||
| <script> | ||
|
|
||
| </script> | ||
| </body> | ||
| </html> |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I do not think these lines are needed anymore as this is being done in caracal.js
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, you are right! They have been commented out.