Skip to content

Commit d7f6cdb

Browse files
Andrew RossAndrew Ross
Andrew Ross
authored and
Andrew Ross
committed
close page
1 parent 1406381 commit d7f6cdb

File tree

7 files changed

+94
-16
lines changed

7 files changed

+94
-16
lines changed

Diff for: _dev/js/modules/save.js

+6-5
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ class Save {
1818

1919
setup() {
2020

21+
console.log(window.location.origin);
22+
2123
const saveBtn = $('#download-file');
2224
const shareBtn = $('#share-on-twitter');
2325
const shareModal = $('#share-modal');
@@ -201,6 +203,8 @@ class Save {
201203
function postToTwitter() {
202204
console.log('start tweet process');
203205

206+
$('#tweet-preview').addClass('is-working');
207+
204208
let tp = $('#tweet-preview');
205209

206210
tp.removeClass('d-none');
@@ -275,13 +279,8 @@ class Save {
275279

276280

277281
function callback(auth, veri, text) {
278-
279282
//exportModal.classList.remove('previewing');
280-
281283
var postUrl = 'https://create-dotnet-bot.azurewebsites.net/api/tweet';
282-
// if( window.location.hostname === '127.0.0.1' ) {
283-
// postUrl = 'http://localhost:4000/auth';
284-
// }
285284
window.fetch(postUrl, {
286285
method:'POST',
287286
headers: {
@@ -302,6 +301,8 @@ class Save {
302301
setTimeout(function(){
303302
// exportModal.classList.remove('posting');
304303
// exportModal.classList.add('completed');
304+
$('#tweet-preview').removeClass('is-working');
305+
$('#tweet-preview').addClass('success');
305306
sendToAws(false);
306307
//TweenMax.to(svgMaskLoad, 1, { scaleY: 1}).delay(1);
307308
var url = data.url,

Diff for: _dev/scss/modules/_share.scss

+42-2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,33 @@
2727
}
2828

2929
#tweet-preview {
30+
position: relative;
31+
32+
&.is-working {
33+
34+
&:before {
35+
content: '';
36+
position: absolute;
37+
top: calc(50% - 22px);
38+
left: calc(50% - 22px);
39+
width: 44px;
40+
height: 44px;
41+
z-index: 3;
42+
background: url('../images/svgs/loader.svg') center / cover no-repeat;
43+
animation: rotation 2s infinite ease-in-out;
44+
}
45+
46+
&:after {
47+
content: '';
48+
position: absolute;
49+
top: 0;
50+
left: 0;
51+
width: 100%;
52+
height: 100%;
53+
background: rgba($white, 0.7);
54+
backdrop-filter: blur(1px);
55+
}
56+
}
3057

3158
textarea {
3259
padding: 12px;
@@ -46,8 +73,6 @@
4673
text-align: right;
4774
font-size: 12px;
4875
color: $gray-dark;
49-
// margin-top: -36px;
50-
// padding-right: 12px;
5176
z-index: 3;
5277
position: relative;
5378
}
@@ -62,6 +87,21 @@
6287
display: block;
6388
text-align: center;
6489
}
90+
91+
.tweet-success {
92+
display: none;
93+
text-align: center;
94+
padding: 16px 0;
95+
}
96+
97+
&.success {
98+
.tweet-content {
99+
display: none;
100+
}
101+
.tweet-success {
102+
display: block;
103+
}
104+
}
65105
}
66106

67107
// ----------------------------------------

Diff for: assets/css/main.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: assets/images/svgs/loader.svg

+1
Loading

Diff for: assets/js/main.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: close.html

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
---
2+
layout: default
3+
title: Getting Twitter Permissions
4+
id: close-window
5+
permalink: /close/
6+
---
7+
8+
9+
<script>
10+
function getUrlParameter(name) {
11+
name = name.replace(/[\[]/, '\\[').replace(/[\]]/, '\\]');
12+
var regex = new RegExp('[\\?&]' + name + '=([^&#]*)');
13+
var results = regex.exec(location.search);
14+
return results === null ? '' : decodeURIComponent(results[1].replace(/\+/g, ' '));
15+
};
16+
17+
var response = [getUrlParameter('oauth_token'), getUrlParameter('oauth_verifier')];
18+
19+
//console.log('URL Reponse = ' + response);
20+
21+
window.addEventListener('message', function(event) {
22+
if( response[0] === undefined || response[0] === '' || response.length == 0 ) {
23+
event.source.postMessage('nothing', event.origin);
24+
} else {
25+
event.source.postMessage(response, event.origin);
26+
}
27+
},false);
28+
</script>

Diff for: generator.html

+15-7
Original file line numberDiff line numberDiff line change
@@ -217,19 +217,27 @@ <h4 class="h3">Share your dotnet-bot</h4>
217217

218218

219219
<div class="mt-4 d-none" id="tweet-preview">
220-
<img id="tweetPreviewImg" src=""/>
221-
<input id="twitter-image" type="hidden" value="" />
222-
<textarea id="tweet-text" class="d-block" maxlength="280">I created my own #dotnet-bot mod. Create your own at mod-dotnet-bot.net. #dotnetlovesme</textarea>
223-
224-
<div class="d-flex flex-items-start flex-justify-between mt-3">
225-
<button class="btn btn--sm btn--alt btn--wide" type="submit" id="tweet">Post to twitter</button>
226-
<span class="tweet-char-count"><span id="tweet-text-count"></span>/280</span>
220+
<div class="tweet-content">
221+
<img id="tweetPreviewImg" src=""/>
222+
<input id="twitter-image" type="hidden" value="" />
223+
<textarea id="tweet-text" class="d-block" maxlength="280">I created my own #dotnet-bot mod. Create your own at mod-dotnet-bot.net. #dotnetlovesme</textarea>
224+
225+
<div class="d-flex flex-items-start flex-justify-between mt-3">
226+
<button class="btn btn--sm btn--alt btn--wide" type="submit" id="tweet">Post to twitter</button>
227+
<span class="tweet-char-count"><span id="tweet-text-count"></span>/280</span>
228+
</div>
227229
</div>
228230

231+
229232
<!-- <a class="ui-icon ui-icon--sm keep-editing" href="">
230233
<img src="/assets/images/svgs/close.svg" alt="Mail icon" />
231234
<span class="sr-only">Keep Editing</span>
232235
</a> -->
236+
237+
<div class="tweet-success">
238+
<p class="h4 text-brand mb-2">Success!</p>
239+
<p class="m-0">Your dotnet-bot mod has been posted.</p>
240+
</div>
233241
</div>
234242

235243
<div class="checkbox mt-6">

0 commit comments

Comments
 (0)