Skip to content
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

Quickstart PR with corrected redirect #1308

Merged
merged 32 commits into from
Jun 4, 2018
Merged
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
fb250de
Quickstart: Images needed for quickstart page
SaptakS Apr 30, 2018
50f48e5
Quickstart: Frontend and routing implementation done
SaptakS Apr 30, 2018
a7b6d7d
Quckstart: JS actions on various links added
SaptakS May 3, 2018
ba72b82
Quickstart: Dont show implementation done
SaptakS May 4, 2018
ce710e6
Funder Flow: Clean forms and put labels
SaptakS May 5, 2018
7c2dd8b
Merge branch 'master' into feature/quickstart-screen
SaptakS May 8, 2018
a9f1a83
Funder Flow: Increase width of the funder form
SaptakS May 10, 2018
11b2efa
Quickstart: Add video play icon
SaptakS May 10, 2018
42beea2
Merge branch 'master' into feature/quickstart-screen
SaptakS May 10, 2018
729a05d
Merge branch 'master' into feature/quickstart-screen
SaptakS May 16, 2018
03f38dd
Funder flow: Correct bulb color and improve content
SaptakS May 23, 2018
30c913c
Quickstart: i18nize the page
SaptakS May 23, 2018
547bf91
Merge branch 'master' into feature/quickstart-screen
SaptakS May 23, 2018
17c6e20
Updates per my comments
mbeacom May 23, 2018
94fceb8
Fix trans block
mbeacom May 23, 2018
b28e8bc
Quickstart updates in styling
SaptakS May 28, 2018
0133bd3
Adds gas settings to the funder form
SaptakS May 28, 2018
44fb824
Merge branch 'master' into pr/1029
mbeacom May 29, 2018
86bc240
Adjust urls to use new methods
mbeacom May 29, 2018
b76dda2
Quickstart: Modify redirect check
SaptakS May 29, 2018
123959c
Fix SVG img references
mbeacom May 29, 2018
86637df
CSS fix
SaptakS May 29, 2018
87ee446
Remove staff decorators from quickstart views
mbeacom May 29, 2018
65a0af3
Corrects the redirection function
SaptakS May 29, 2018
dff1a4d
Merge branch 'feature/quickstart-screen' of github.com:SaptakS/web-1 …
SaptakS May 29, 2018
7d80e74
Fix JS for fund issue button
SaptakS May 29, 2018
f80908e
Mark's suggestions
SaptakS May 29, 2018
4db3a81
Merge branch 'master' into pr/1308
mbeacom May 30, 2018
e3cade7
updated styles for submit bounty banners
SaptakS May 30, 2018
3891bc5
Merge branch 'feature/quickstart-screen' of github.com:SaptakS/web-1 …
SaptakS May 30, 2018
0c25ca4
Update the CSS for form to use full width
SaptakS Jun 4, 2018
2de1f76
Merge branch 'master' into feature/quickstart-screen
SaptakS Jun 4, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Quickstart: Dont show implementation done
SaptakS committed May 5, 2018
commit ba72b8240eb2333196fc5532dd8fdfe8b7d86e99
2 changes: 1 addition & 1 deletion app/assets/v2/css/quickstart.css
Original file line number Diff line number Diff line change
@@ -74,7 +74,7 @@ body.quickstart {
width: 30%;
}

.action-footer button {
.action-footer .btn {
border-radius: 2px;
background-color: #0c0763;
border-color: #0c0763;
14 changes: 14 additions & 0 deletions app/assets/v2/js/pages/new_bounty.js
Original file line number Diff line number Diff line change
@@ -2,6 +2,20 @@
/* eslint-disable nonblock-statement-body-position */
load_tokens();

/* Check if quickstart page is to be shown */
var localStorage;
var quickstartURL = document.location.origin + '/bounty/quickstart';

try {
localStorage = window.localStorage;
} catch (e) {
localStorage = {};
}

if (localStorage['quickstart_dontshow'] !== 'true' && document.referrer !== quickstartURL) {
window.location = quickstartURL;
}

// Wait until page is loaded, then run the function
$(document).ready(function() {
// Load sidebar radio buttons from localStorage
2 changes: 1 addition & 1 deletion app/assets/v2/js/pages/quickstart.js
Original file line number Diff line number Diff line change
@@ -26,4 +26,4 @@ $(document).ready(function() {
localStorage['quickstart_dontshow'] = false;
}
});
});
});
2 changes: 1 addition & 1 deletion app/dashboard/templates/quickstart.html
Original file line number Diff line number Diff line change
@@ -63,7 +63,7 @@ <h4 class="title">{% trans "Quickstart Guide" %}</h4>
<div class="video-link">
<a href="#" class="show_video">Watch 90 second video</a>
</div>
<button class="btn btn-primary">Ok, I'm ready</button>
<a href="{% url 'new_funding' %}"><button class="btn btn-primary">Ok, I'm ready</button></a>
</div>
</div>
<div class="col-md-3 col-sm-12 p-5 tips-list">