Skip to content

Commit a816420

Browse files
jackycutejackycute
committed
Merge branch 'janniklorenz-master'
2 parents 4aa4e3e + 217e683 commit a816420

6 files changed

Lines changed: 65 additions & 29 deletions

File tree

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ Third-party integration api key settings
124124
| facebook, twitter, github, dropbox | `config.json` | for signin |
125125
| imgur | `config.json` | for image upload |
126126
| dropbox | `public/views/foot.ejs` | for chooser and saver |
127-
| google drive | `public/js/common.js` | for export and import |
127+
| google drive | `public/js/common.js`/ `config.json` (enable) | for export and import |
128+
128129

129130
Operational Transformation
130131
---

‎lib/config.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ var db = config.db || {
2525
};
2626

2727
// ssl path
28-
var sslkeypath = config.sslkeypath || ''
28+
var sslkeypath = config.sslkeypath || '';
2929
var sslcertpath = config.sslcertpath || '';
3030
var sslcapath = config.sslcapath || '';
3131
var dhparampath = config.dhparampath || '';
@@ -61,6 +61,7 @@ var twitter = config.twitter || false;
6161
var github = config.github || false;
6262
var dropbox = config.dropbox || false;
6363
var imgur = config.imgur || false;
64+
var googleDrive = config.googleDrive || false;
6465

6566
function getserverurl() {
6667
var url = '';
@@ -111,5 +112,6 @@ module.exports = {
111112
twitter: twitter,
112113
github: github,
113114
dropbox: dropbox,
114-
imgur: imgur
115-
};
115+
imgur: imgur,
116+
googleDrive: googleDrive,
117+
};

‎lib/response.js‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ var response = {
4848
showNote: showNote,
4949
showPublishNote: showPublishNote,
5050
showPublishSlide: showPublishSlide,
51-
showIndex: showIndex,
51+
showIndex: showIndex,
5252
noteActions: noteActions,
5353
publishNoteActions: publishNoteActions,
5454
githubActions: githubActions
@@ -72,7 +72,8 @@ function responseError(res, code, detail, msg) {
7272
code: code,
7373
detail: detail,
7474
msg: msg,
75-
useCDN: config.usecdn
75+
useCDN: config.usecdn,
76+
googleDrive: config.googleDrive,
7677
});
7778
res.write(content);
7879
res.end();
@@ -95,6 +96,7 @@ function showIndex(req, res, next) {
9596
twitter: config.twitter,
9697
github: config.github,
9798
dropbox: config.dropbox,
99+
googleDrive: config.googleDrive,
98100
});
99101
res.write(content);
100102
res.end();
@@ -125,6 +127,7 @@ function responseHackMD(res, note) {
125127
twitter: config.twitter,
126128
github: config.github,
127129
dropbox: config.dropbox,
130+
googleDrive: config.googleDrive,
128131
});
129132
var buf = html;
130133
res.writeHead(200, {
@@ -355,7 +358,7 @@ function publishNoteActions(req, res, next) {
355358
res.redirect(config.serverurl + '/' + (note.alias ? note.alias : LZString.compressToBase64(note.id)));
356359
break;
357360
default:
358-
res.redirect(config.serverurl + '/s/' + note.shortid);
361+
res.redirect(config.serverurl + '/s/' + note.shortid);
359362
break;
360363
}
361364
});
@@ -370,7 +373,7 @@ function githubActions(req, res, next) {
370373
githubActionGist(req, res, note);
371374
break;
372375
default:
373-
res.redirect(config.serverurl + '/' + noteId);
376+
res.redirect(config.serverurl + '/' + noteId);
374377
break;
375378
}
376379
});
@@ -470,4 +473,4 @@ var render = function (res, title, markdown) {
470473
}));
471474
};
472475

473-
module.exports = response;
476+
module.exports = response;

‎public/views/foot.ejs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,12 @@
7171
<script src="<%- url %>/vendor/md-toc.js" defer></script>
7272
<script src="<%- url %>/vendor/showup/showup.js" defer></script>
7373
<script src="<%- url %>/vendor/randomColor.js" defer></script>
74+
<% if(dropbox) { %>
7475
<script type="text/javascript" src="https://www.dropbox.com/static/api/2/dropins.js" id="dropboxjs" data-app-key="change this" async defer></script>
76+
<% } %>
77+
<% if(googleDrive) { %>
7578
<script src="https://www.google.com/jsapi" defer></script>
79+
<% } %>
7680
<script src="<%- url %>/js/google-drive-upload.js" defer></script>
7781
<script src="<%- url %>/js/google-drive-picker.js" defer></script>
7882
<script src="<%- url %>/js/common.js" defer></script>
@@ -81,4 +85,6 @@
8185
<script src="<%- url %>/js/history.js" defer></script>
8286
<script src="<%- url %>/js/index.js" defer></script>
8387
<script src="<%- url %>/js/syncscroll.js" defer></script>
84-
<script src="https://apis.google.com/js/client:plusone.js?onload=onGoogleClientLoaded" defer></script>
88+
<% if(googleDrive) { %>
89+
<script src="https://apis.google.com/js/client:plusone.js?onload=onGoogleClientLoaded" defer></script>
90+
<% } %>

‎public/views/header.ejs‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<nav class="navbar navbar-default navbar-fixed-top unselectable hidden-print">
22
<!-- Brand and toggle get grouped for better mobile display -->
33
<div class="navbar-header">
4-
<span class="pull-right" style="margin-top: 17px; color: #777;">
4+
<span class="pull-right" style="margin-top: 17px; color: #777;">
55
<div class="visible-xs">&nbsp;</div>
66
<div class="visible-sm">&nbsp;</div>
77
<div class="visible-md">&nbsp;</div>
@@ -33,21 +33,31 @@
3333
<li role="presentation"><a role="menuitem" class="ui-beta-slide" tabindex="-1" href="#" target="_blank"><i class="fa fa-tv fa-fw"></i> Slide Mode</a>
3434
</li>
3535
<li class="divider"></li>
36+
<% if((googleDrive == "true") || (typeof dropbox !== 'undefined' && dropbox) || (typeof github !== 'undefined' && github)) { %>
3637
<li class="dropdown-header">Export</li>
38+
<% if(typeof dropbox !== 'undefined' && dropbox) { %>
3739
<li role="presentation"><a role="menuitem" class="ui-save-dropbox" tabindex="-1" href="#" target="_self"><i class="fa fa-dropbox fa-fw"></i> Dropbox</a>
3840
</li>
41+
<% } %>
42+
<% if(googleDrive == "true") { %>
3943
<li role="presentation"><a role="menuitem" class="ui-save-google-drive" tabindex="-1" href="#" target="_self"><i class="fa fa-cloud-upload fa-fw"></i> Google Drive</a>
4044
</li>
45+
<% } %>
4146
<% if(typeof github !== 'undefined' && github) { %>
4247
<li role="presentation"><a role="menuitem" class="ui-save-gist" tabindex="-1" href="#" target="_blank"><i class="fa fa-github fa-fw"></i> Gist</a>
4348
</li>
4449
<% } %>
4550
<li class="divider"></li>
51+
<% } %>
4652
<li class="dropdown-header">Import</li>
53+
<% if(typeof dropbox !== 'undefined' && dropbox) { %>
4754
<li role="presentation"><a role="menuitem" class="ui-import-dropbox" tabindex="-1" href="#" target="_self"><i class="fa fa-dropbox fa-fw"></i> Dropbox</a>
4855
</li>
56+
<% } %>
57+
<% if(googleDrive == "true") { %>
4958
<li role="presentation"><a role="menuitem" class="ui-import-google-drive" tabindex="-1" href="#" target="_self"><i class="fa fa-cloud-download fa-fw"></i> Google Drive</a>
5059
</li>
60+
<% } %>
5161
<li role="presentation"><a role="menuitem" class="ui-import-gist" href="#" data-toggle="modal" data-target="#gistImportModal"><i class="fa fa-github fa-fw"></i> Gist</a>
5262
</li>
5363
<li role="presentation"><a role="menuitem" class="ui-import-clipboard" href="#" data-toggle="modal" data-target="#clipboardModal"><i class="fa fa-clipboard fa-fw"></i> Clipboard</a>
@@ -118,21 +128,31 @@
118128
<li role="presentation"><a role="menuitem" class="ui-beta-slide" tabindex="-1" href="#" target="_blank"><i class="fa fa-tv fa-fw"></i> Slide Mode</a>
119129
</li>
120130
<li class="divider"></li>
131+
<% if((googleDrive == "true") || (typeof dropbox !== 'undefined' && dropbox) || (typeof github !== 'undefined' && github)) { %>
121132
<li class="dropdown-header">Export</li>
133+
<% if(typeof dropbox !== 'undefined' && dropbox) { %>
122134
<li role="presentation"><a role="menuitem" class="ui-save-dropbox" tabindex="-1" href="#" target="_self"><i class="fa fa-dropbox fa-fw"></i> Dropbox</a>
123135
</li>
136+
<% } %>
137+
<% if(googleDrive == "true") { %>
124138
<li role="presentation"><a role="menuitem" class="ui-save-google-drive" tabindex="-1" href="#" target="_self"><i class="fa fa-cloud-upload fa-fw"></i> Google Drive</a>
125139
</li>
140+
<% } %>
126141
<% if(typeof github !== 'undefined' && github) { %>
127142
<li role="presentation"><a role="menuitem" class="ui-save-gist" tabindex="-1" href="#" target="_blank"><i class="fa fa-github fa-fw"></i> Gist</a>
128143
</li>
129144
<% } %>
130145
<li class="divider"></li>
146+
<% } %>
131147
<li class="dropdown-header">Import</li>
148+
<% if(typeof dropbox !== 'undefined' && dropbox) { %>
132149
<li role="presentation"><a role="menuitem" class="ui-import-dropbox" tabindex="-1" href="#" target="_self"><i class="fa fa-dropbox fa-fw"></i> Dropbox</a>
133150
</li>
151+
<% } %>
152+
<% if(googleDrive == "true") { %>
134153
<li role="presentation"><a role="menuitem" class="ui-import-google-drive" tabindex="-1" href="#" target="_self"><i class="fa fa-cloud-download fa-fw"></i> Google Drive</a>
135154
</li>
155+
<% } %>
136156
<li role="presentation"><a role="menuitem" class="ui-import-gist" href="#" data-toggle="modal" data-target="#gistImportModal"><i class="fa fa-github fa-fw"></i> Gist</a>
137157
</li>
138158
<li role="presentation"><a role="menuitem" class="ui-import-clipboard" href="#" data-toggle="modal" data-target="#clipboardModal"><i class="fa fa-clipboard fa-fw"></i> Clipboard</a>
@@ -148,4 +168,4 @@
148168
</ul>
149169
</div>
150170
</nav>
151-
<div class="ui-spinner unselectable hidden-print"></div>
171+
<div class="ui-spinner unselectable hidden-print"></div>

‎public/views/index.ejs‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<link rel="apple-touch-icon" href="<%- url %>/apple-touch-icon.png">
1616

1717
<!-- Bootstrap core CSS -->
18-
<% if(useCDN) { %>
18+
<% if(useCDN) { %>
1919
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
2020
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.6.2/css/font-awesome.min.css">
2121
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/bootstrap-social/4.9.0/bootstrap-social.min.css">
@@ -58,8 +58,10 @@
5858
<p class="lead">
5959
Realtime collaborative markdown notes on all platforms.
6060
</p>
61+
<% if(facebook || twitter || github || dropbox) { %>
6162
<a type="button" class="btn btn-lg btn-success ui-signin" data-toggle="modal" data-target=".signin-modal" style="display:none;">Sign In</a>
6263
<div class="ui-or" style="display:none;">Or</div>
64+
<% }%>
6365
<p class="lead">
6466
<a href="<%- url %>/new" class="btn btn-lg btn-default">New note</a>
6567
</p>
@@ -70,6 +72,7 @@
7072
</div>
7173

7274
<div id="history" class="section" style="display:none;">
75+
<% if(facebook || twitter || github || dropbox) { %>
7376
<div class="ui-signin">
7477
<h4>
7578
<a type="button" class="btn btn-success" data-toggle="modal" data-target=".signin-modal">Sign In</a> to get own history!
@@ -81,6 +84,7 @@
8184
<a href="<%- url %>/new" class="btn btn-default">New note</a> Or
8285
<a href="#" class="btn btn-danger ui-logout">Sign Out</a>
8386
</div>
87+
<% }%>
8488
<hr>
8589
<form class="form-inline">
8690
<div class="form-group" style="vertical-align: bottom;">
@@ -179,25 +183,25 @@
179183
<!-- Bootstrap core JavaScript
180184
================================================== -->
181185
<!-- Placed at the end of the document so the pages load faster -->
182-
<% if(useCDN) { %>
183-
<script src="//code.jquery.com/jquery-1.11.3.min.js" defer></script>
184-
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" defer></script>
185-
<script src="//cdnjs.cloudflare.com/ajax/libs/gsap/1.18.0/TweenMax.min.js" defer></script>
186+
<% if(useCDN) { %>
187+
<script src="//code.jquery.com/jquery-1.11.3.min.js" defer></script>
188+
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" defer></script>
189+
<script src="//cdnjs.cloudflare.com/ajax/libs/gsap/1.18.0/TweenMax.min.js" defer></script>
186190
<script src="//cdnjs.cloudflare.com/ajax/libs/gsap/1.18.0/jquery.gsap.min.js" defer></script>
187-
<script src="//cdnjs.cloudflare.com/ajax/libs/select2/3.5.2/select2.min.js" defer></script>
188-
<script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.12.0/moment-with-locales.min.js" defer></script>
189-
<script src="//cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.0.5/handlebars.min.js" defer></script>
190-
<script src="//cdnjs.cloudflare.com/ajax/libs/js-url/2.0.2/url.min.js" defer></script>
191-
<% } else { %>
192-
<script src="<%- url %>/vendor/jquery/dist/jquery.min.js" defer></script>
193-
<script src="<%- url %>/vendor/bootstrap/dist/js/bootstrap.min.js" defer></script>
191+
<script src="//cdnjs.cloudflare.com/ajax/libs/select2/3.5.2/select2.min.js" defer></script>
192+
<script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.12.0/moment-with-locales.min.js" defer></script>
193+
<script src="//cdnjs.cloudflare.com/ajax/libs/handlebars.js/4.0.5/handlebars.min.js" defer></script>
194+
<script src="//cdnjs.cloudflare.com/ajax/libs/js-url/2.0.2/url.min.js" defer></script>
195+
<% } else { %>
196+
<script src="<%- url %>/vendor/jquery/dist/jquery.min.js" defer></script>
197+
<script src="<%- url %>/vendor/bootstrap/dist/js/bootstrap.min.js" defer></script>
194198
<script src="<%- url %>/vendor/gsap/src/minified/TweenMax.min.js" defer></script>
195199
<script src="<%- url %>/vendor/gsap/src/minified/jquery.gsap.min.js" defer></script>
196-
<script src="<%- url %>/vendor/select2/select2.min.js" defer></script>
197-
<script src="<%- url %>/vendor/moment/min/moment-with-locales.min.js" defer></script>
200+
<script src="<%- url %>/vendor/select2/select2.min.js" defer></script>
201+
<script src="<%- url %>/vendor/moment/min/moment-with-locales.min.js" defer></script>
198202
<script src="<%- url %>/vendor/handlebars/handlebars.min.js" defer></script>
199-
<script src="<%- url %>/vendor/js-url/url.min.js" defer></script>
200-
<% } %>
203+
<script src="<%- url %>/vendor/js-url/url.min.js" defer></script>
204+
<% } %>
201205
<script src="<%- url %>/vendor/js.cookie.js" defer></script>
202206
<script src="<%- url %>/vendor/list.min.js" defer></script>
203207
<script src="<%- url %>/vendor/FileSaver.min.js" defer></script>
@@ -208,4 +212,4 @@
208212
<script src="<%- url %>/js/cover.js" defer></script>
209213
</body>
210214

211-
</html>
215+
</html>

0 commit comments

Comments
 (0)