Merge branch 'janniklorenz-master'

README.md

@@ -124,7 +124,8 @@ Third-party integration api key settings
 | facebook, twitter, github, dropbox | `config.json` | for signin |
 | imgur | `config.json` | for image upload |
 | dropbox | `public/views/foot.ejs` | for chooser and saver |
-| google drive | `public/js/common.js` | for export and import |
+| google drive | `public/js/common.js`/ `config.json` (enable) | for export and import |
+
 
 Operational Transformation
 ---

lib/config.js

@@ -25,7 +25,7 @@ var db = config.db || {
 };
 
 // ssl path
-var sslkeypath = config.sslkeypath || ''
+var sslkeypath = config.sslkeypath || '';
 var sslcertpath = config.sslcertpath || '';
 var sslcapath = config.sslcapath || '';
 var dhparampath = config.dhparampath || '';
@@ -61,6 +61,7 @@ var twitter = config.twitter || false;
 var github = config.github || false;
 var dropbox = config.dropbox || false;
 var imgur = config.imgur || false;
+var googleDrive = config.googleDrive || false;
 
 function getserverurl() {
     var url = '';
@@ -111,5 +112,6 @@ module.exports = {
     twitter: twitter,
     github: github,
     dropbox: dropbox,
-    imgur: imgur
+    imgur: imgur,
+    googleDrive: googleDrive,
 };

lib/response.js

@@ -72,7 +72,8 @@ function responseError(res, code, detail, msg) {
         code: code,
         detail: detail,
         msg: msg,
-		useCDN: config.usecdn
+        useCDN: config.usecdn,
+        googleDrive: config.googleDrive,
     });
     res.write(content);
     res.end();
@@ -95,6 +96,7 @@ function showIndex(req, res, next) {
         twitter: config.twitter,
         github: config.github,
         dropbox: config.dropbox,
+        googleDrive: config.googleDrive,
     });
     res.write(content);
     res.end();
@@ -125,6 +127,7 @@ function responseHackMD(res, note) {
         twitter: config.twitter,
         github: config.github,
         dropbox: config.dropbox,
+        googleDrive: config.googleDrive,
     });
     var buf = html;
     res.writeHead(200, {

public/views/foot.ejs

@@ -71,8 +71,12 @@
 <script src="<%- url %>/vendor/md-toc.js" defer></script>
 <script src="<%- url %>/vendor/showup/showup.js" defer></script>
 <script src="<%- url %>/vendor/randomColor.js" defer></script>
+<% if(dropbox) { %>
 <script type="text/javascript" src="https://www.dropbox.com/static/api/2/dropins.js" id="dropboxjs" data-app-key="change this" async defer></script>
+<% } %>
+<% if(googleDrive) { %>
 <script src="https://www.google.com/jsapi" defer></script>
+<% } %>
 <script src="<%- url %>/js/google-drive-upload.js" defer></script>
 <script src="<%- url %>/js/google-drive-picker.js" defer></script>
 <script src="<%- url %>/js/common.js" defer></script>
@@ -81,4 +85,6 @@
 <script src="<%- url %>/js/history.js" defer></script>
 <script src="<%- url %>/js/index.js" defer></script>
 <script src="<%- url %>/js/syncscroll.js" defer></script>
+<% if(googleDrive) { %>
 <script src="https://apis.google.com/js/client:plusone.js?onload=onGoogleClientLoaded" defer></script>
+<% } %>

public/views/header.ejs

@@ -33,21 +33,31 @@
                 <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>
                 </li>
                 <li class="divider"></li>
+                <% if((googleDrive == "true") || (typeof dropbox !== 'undefined' && dropbox) || (typeof github !== 'undefined' && github)) { %>
                 <li class="dropdown-header">Export</li>
+                <% if(typeof dropbox !== 'undefined' && dropbox) { %>
                 <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>
                 </li>
+                <% } %>
+                <% if(googleDrive == "true") { %>
                 <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>
                 </li>
+                <% } %>
                 <% if(typeof github !== 'undefined' && github) { %>
                 <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>
                 </li>
                 <% } %>
                 <li class="divider"></li>
+                <% } %>
                 <li class="dropdown-header">Import</li>
+                <% if(typeof dropbox !== 'undefined' && dropbox) { %>
                 <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>
                 </li>
+                <% } %>
+                <% if(googleDrive == "true") { %>
                 <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>
                 </li>
+                <% } %>
                 <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>
                 </li>
                 <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 @@
                     <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>
                     </li>
                     <li class="divider"></li>
+                    <% if((googleDrive == "true") || (typeof dropbox !== 'undefined' && dropbox) || (typeof github !== 'undefined' && github)) { %>
                     <li class="dropdown-header">Export</li>
+                    <% if(typeof dropbox !== 'undefined' && dropbox) { %>
                     <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>
                     </li>
+                    <% } %>
+                    <% if(googleDrive == "true") { %>
                     <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>
                     </li>
+                    <% } %>
                     <% if(typeof github !== 'undefined' && github) { %>
                     <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>
                     </li>
                     <% } %>
                     <li class="divider"></li>
+                    <% } %>
                     <li class="dropdown-header">Import</li>
+                    <% if(typeof dropbox !== 'undefined' && dropbox) { %>
                     <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>
                     </li>
+                    <% } %>
+                    <% if(googleDrive == "true") { %>
                     <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>
                     </li>
+                    <% } %>
                     <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>
                     </li>
                     <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>

public/views/index.ejs

@@ -58,8 +58,10 @@
                         <p class="lead">
                             Realtime collaborative markdown notes on all platforms.
                         </p>
+                        <% if(facebook || twitter || github || dropbox) { %>
                         <a type="button" class="btn btn-lg btn-success ui-signin" data-toggle="modal" data-target=".signin-modal" style="display:none;">Sign In</a>
                         <div class="ui-or" style="display:none;">Or</div>
+                        <% }%>
                         <p class="lead">
                             <a href="<%- url %>/new" class="btn btn-lg btn-default">New note</a>
                         </p>
@@ -70,6 +72,7 @@
                 </div>
 
                 <div id="history" class="section" style="display:none;">
+                    <% if(facebook || twitter || github || dropbox) { %>
                     <div class="ui-signin">
                         <h4>
                             <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 @@
                         <a href="<%- url %>/new" class="btn btn-default">New note</a> Or
                         <a href="#" class="btn btn-danger ui-logout">Sign Out</a>
                     </div>
+                    <% }%>
                     <hr>
                     <form class="form-inline">
                         <div class="form-group" style="vertical-align: bottom;">