Skip to content

Commit

Permalink
sharedrop end
Browse files Browse the repository at this point in the history
  • Loading branch information
bkawk committed Feb 7, 2019
1 parent f374ebb commit aa9fa1a
Show file tree
Hide file tree
Showing 16 changed files with 9 additions and 598 deletions.
13 changes: 1 addition & 12 deletions src/components/side-bar/worbli-dashnav.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,47 +61,41 @@ class WorbliDashnav extends PolymerElement {
<a href="/dashboard/review" class="link hidden"><div class="nav">Review</div></a>
<a href="/dashboard/status" class="link hidden"><div class="nav">Status</div></a>
<a href="/dashboard/account" class="link hidden"><div class="nav">Account</div></a>
<a href="/dashboard/sharedrop" class="link hidden"><div class="nav">Sharedrop</div></a>
<a href="/dashboard/editpassword" class="link active"><div class="nav selected">Password</div></a>
</template>
<template is="dom-if" if="{{started}}">
<a href="/dashboard/profile" class="link active"><div class="nav selected">Application</div></a>
<a href="/dashboard/review" class="link active"><div class="nav selected">Review</div></a>
<a href="/dashboard/status" class="link hidden"><div class="nav">Status</div></a>
<a href="/dashboard/account" class="link hidden"><div class="nav">Account</div></a>
<a href="/dashboard/sharedrop" class="link hidden"><div class="nav">Sharedrop</div></a>
<a href="/dashboard/editpassword" class="link active"><div class="nav selected">Password</div></a>
</template>
<template is="dom-if" if="{{review}}">
<a href="/dashboard/profile" class="link hidden"><div class="nav">Application</div></a>
<a href="/dashboard/review" class="link hidden"><div class="nav">Review</div></a>
<a href="/dashboard/status" class="link active"><div class="nav selected">Status</div></a>
<a href="/dashboard/account" class="link hidden"><div class="nav">Account</div></a>
<a href="/dashboard/sharedrop" class="link hidden"><div class="nav">Sharedrop</div></a>
<a href="/dashboard/editpassword" class="link active"><div class="nav selected">Password</div></a>
</template>
<template is="dom-if" if="{{approved}}">
<a href="/dashboard/profile" class="link hidden"><div class="nav">Application</div></a>
<a href="/dashboard/review" class="link hidden"><div class="nav">Review</div></a>
<a href="/dashboard/status" class="link hidden"><div class="nav">Status</div></a>
<a href="/dashboard/account" class="link active"><div class="nav selected">Account</div></a>
<a href="/dashboard/sharedrop" class="link hidden"><div class="nav">Sharedrop</div></a>
<a href="/dashboard/editpassword" class="link active"><div class="nav selected">Password</div></a>
</template>
<template is="dom-if" if="{{named}}">
<a href="/dashboard/profile" class="link hidden"><div class="nav">Application</div></a>
<a href="/dashboard/review" class="link hidden"><div class="nav">Review</div></a>
<a href="/dashboard/status" class="link hidden"><div class="nav">Status</div></a>
<a href="/dashboard/account" class="link active"><div class="nav selected">Account</div></a>
<a href="/dashboard/sharedrop" class="link active"><div class="nav selected">Sharedrop</div></a>
<a href="/dashboard/editpassword" class="link active"><div class="nav selected">Password</div></a>
</template>
<template is="dom-if" if="{{credited}}">
<a href="/dashboard/profile" class="link hidden"><div class="nav">Application</div></a>
<a href="/dashboard/review" class="link hidden"><div class="nav">Review</div></a>
<a href="/dashboard/status" class="link hidden"><div class="nav">Status</div></a>
<a href="/dashboard/account" class="link active"><div class="nav selected">Account</div></a>
<a href="/dashboard/sharedrop" class="link hidden"><div class="nav">Sharedrop</div></a>
<a href="/dashboard/editpassword" class="link active"><div class="nav selected">Password</div></a>
</template>
</div>
Expand Down Expand Up @@ -225,7 +219,7 @@ _statusChanged(){
this.approved = true;
localStorage.setItem("loc", "approved");
};
if(this.onfidoStatus === 'named'){ // the has claimed an acocunt = > Sharedrop
if(this.onfidoStatus === 'named'){ // the has claimed an acocunt
this.named = true;
localStorage.setItem("loc", "named");
};
Expand All @@ -243,24 +237,19 @@ _bounce(){
if(status === 'default' && page === 'review' ) { this._goHome() }
if(status === 'default' && page === 'status' ) { this._goHome() }
if(status === 'default' && page === 'account' ) { this._goHome() }
if(status === 'default' && page === 'sharedrop' ) { this._goHome() }
if(status === 'started' && page === 'status' ) { this._goHome() }
if(status === 'started' && page === 'account' ) { this._goHome() }
if(status === 'started' && page === 'sharedrop' ) { this._goHome() }
if(status === 'review' && page === 'profile' ) { this._goHome() }
if(status === 'review' && page === 'account' ) { this._goHome() }
if(status === 'review' && page === 'sharedrop' ) { this._goHome() }
if(status === 'approved' && page === 'profile' ) { this._goHome() }
if(status === 'approved' && page === 'review' ) { this._goHome() }
if(status === 'approved' && page === 'status' ) { this._goHome() }
if(status === 'approved' && page === 'sharedrop' ) { this._goHome() }
if(status === 'named' && page === 'profile' ) { this._goHome() }
if(status === 'named' && page === 'review' ) { this._goHome() }
if(status === 'named' && page === 'status' ) { this._goHome() }
if(status === 'credited' && page === 'profile' ) { this._goHome() }
if(status === 'credited' && page === 'review' ) { this._goHome() }
if(status === 'credited' && page === 'status' ) { this._goHome() }
if(status === 'credited' && page === 'sharedrop' ) { this._goHome() }
}

_goHome(){
Expand Down
159 changes: 0 additions & 159 deletions src/components/side-bar/worbli-snapshot.js

This file was deleted.

4 changes: 2 additions & 2 deletions src/components/worbli-header.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ class WorbliHeader extends PolymerElement {
<template is="dom-if" if="{{!logedIn}}">
<div class="navigation">
<ul>
<!-- <li on-click="_join" class="join-btn">JOIN WORBLI</a></li> -->
<li on-click="_join" class="join-btn">JOIN WORBLI</a></li>
<li on-click="_signIn" class="blue-bg">SIGN IN</a></li>
</ul>
</div>
Expand Down Expand Up @@ -182,7 +182,7 @@ _dashboard(){
if(loc === 'review') {this.set('route.path', `/dashboard/status`)};
if(loc === 'rejected') {this.set('route.path', `/dashboard/status`)};
if(loc === 'approved') {this.set('route.path', `/dashboard/account`)};
if(loc === 'named') {this.set('route.path', `/dashboard/sharedrop`)};
if(loc === 'named') {this.set('route.path', `/dashboard/account`)};
if(loc === 'credited') {this.set('route.path', `/dashboard/account`)};
}

Expand Down
4 changes: 2 additions & 2 deletions src/components/worbli-signin.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class WorbliSignin extends PolymerElement {
<small class="comment error">[[error]]</small>
<button class="btn-critical" on-click="_reset">Send Email</button>
</template>
<!-- <div class="center">New to Worbli? <span on-click="_join">Join WORBLI</span></div> -->
<div class="center">New to Worbli? <span on-click="_join">Join WORBLI</span></div>
`;
}
static get properties() {
Expand Down Expand Up @@ -185,7 +185,7 @@ _login(){
if (onfido_status === 'review'){this.set('route.path', '/dashboard/status')}
if (onfido_status === 'rejected'){this.set('route.path', '/dashboard/status')}
if (onfido_status === 'approved'){this.set('route.path', '/dashboard/account')}
if (onfido_status === 'named'){this.set('route.path', '/dashboard/sharedrop')}
if (onfido_status === 'named'){this.set('route.path', '/dashboard/account')}
if (onfido_status === 'credited'){this.set('route.path', '/dashboard/account')}
this.dispatchEvent(new CustomEvent('hideOverlay',{bubbles: true, composed: true, detail: {action: 'hide'}}));
} else {
Expand Down
8 changes: 2 additions & 6 deletions src/routes/dashboard-route.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ class DasboardRoute extends PolymerElement {
<editpassword-route name="editpassword"></editpassword-route>
<review-route name="review"></review-route>
<status-route name="status"></status-route>
<account-route name="account"></account-route>
<sharedrop-route name="sharedrop"></sharedrop-route>
<account-route name="account"></account-route>
</iron-pages>
`;
}
Expand All @@ -58,7 +57,7 @@ class DasboardRoute extends PolymerElement {
_routePageChanged(page) {
if (!page) {
this.page = 'editpassword';
} else if (['sharedrop', 'profile', 'account', 'review', 'status', 'editpassword'].indexOf(page) !== -1) {
} else if (['profile', 'account', 'review', 'status', 'editpassword'].indexOf(page) !== -1) {
this.page = page;
} else {
this.page = 'error';
Expand All @@ -79,9 +78,6 @@ class DasboardRoute extends PolymerElement {
case 'account':
import('./dashboard/account-route.js');
break;
case 'sharedrop':
import('./dashboard/sharedrop-route.js');
break;
case 'editpassword':
import('./dashboard/editpassword-route.js');
break;
Expand Down
3 changes: 0 additions & 3 deletions src/routes/dashboard/account-route.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { PolymerElement, html } from '@polymer/polymer/polymer-element.js';
import '@polymer/app-route/app-location.js';
import '../../css/shared-styles.js';
import '../../components/worbli-footer.js';
import '../../components/side-bar/worbli-snapshot.js';
import '../../components/side-bar/worbli-dashnav.js';
import '../../worbli-env.js';

Expand Down Expand Up @@ -215,7 +214,6 @@ class AccountRoute extends PolymerElement {
<p class="info">
Your WORBLI blockchain account has been created. Account name <b>[[worbliAccountName]]</b></br></br>
Check it out at <a href="https://worbli.bloks.io/account/[[worbliAccountName]]" target="_blank">worbli.bloks.io</a></br></br>
If you had an EOS account on September 7th, you can <a href="/dashboard/sharedrop">Claim your Sharedrop</a>
</p>
</template>
<!-- END IF VIEW NAMED-->
Expand All @@ -225,7 +223,6 @@ class AccountRoute extends PolymerElement {
<p class="info">
Your WORBLI blockchain account has been created. Account name <b>[[worbliAccountName]]</b></br></br>
Check it out at <a href="https://worbli.bloks.io/account/[[worbliAccountName]]" target="_blank">worbli.bloks.io</a></br></br>
Congratulations you have successfully claimed your sharedrop!
</p>
</template>
<!-- END IF VIEW CREDITED-->
Expand Down
1 change: 0 additions & 1 deletion src/routes/dashboard/editpassword-route.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { PolymerElement, html } from '@polymer/polymer/polymer-element.js';
import '../../css/shared-styles.js';
import '../../components/worbli-footer.js';
import '../../components/side-bar/worbli-snapshot.js';
import '../../components/side-bar/worbli-dashnav.js';
import '@polymer/app-route/app-location.js';
import '../../worbli-env.js';
Expand Down
1 change: 0 additions & 1 deletion src/routes/dashboard/profile-route.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { PolymerElement, html } from '@polymer/polymer/polymer-element.js';
import '../../css/shared-styles.js';
import '../../components/worbli-footer.js';
import '../../components/side-bar/worbli-snapshot.js';
import '@polymer/app-route/app-location.js';
import '../../components/side-bar/worbli-dashnav.js';
import '../../worbli-env.js';
Expand Down
1 change: 0 additions & 1 deletion src/routes/dashboard/review-route.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { PolymerElement, html } from '@polymer/polymer/polymer-element.js';
import '../../css/shared-styles.js';
import '../../components/worbli-footer.js';
import '../../components/side-bar/worbli-snapshot.js';
import '@polymer/app-route/app-location.js';
import '../../components/side-bar/worbli-dashnav.js';
import '../../worbli-env.js';
Expand Down
Loading

0 comments on commit aa9fa1a

Please sign in to comment.