Added server option "useCdn", use template statement to route resources' source

This commit is contained in:
Wu Cheng-Han 2015-09-22 12:06:13 +08:00
parent 09a1e662f9
commit b6c758f2fc
8 changed files with 71 additions and 16 deletions

View File

@ -77,6 +77,7 @@ Server-side config.js settings
| usessl | `true` or `false` | set to use ssl | | usessl | `true` or `false` | set to use ssl |
| urladdport | `true` or `false` | set to add port on oauth callback url | | urladdport | `true` or `false` | set to add port on oauth callback url |
| debug | `true` or `false` | set debug mode, show more logs | | debug | `true` or `false` | set debug mode, show more logs |
| usecdn | `true` or `false` | set to use CDN resources or not |
| version | `0.3.2` | currnet version, must match same var in client side `index.js` | | version | `0.3.2` | currnet version, must match same var in client side `index.js` |
| alloworigin | `['localhost']` | domain name whitelist | | alloworigin | `['localhost']` | domain name whitelist |
| sslkeypath | `./cert/client.key` | ssl key path | | sslkeypath | `./cert/client.key` | ssl key path |

4
app.js
View File

@ -136,9 +136,7 @@ app.set('views', __dirname + '/public');
//set render engine //set render engine
app.engine('html', ejs.renderFile); app.engine('html', ejs.renderFile);
//get index //get index
app.get("/", function (req, res, next) { app.get("/", response.showIndex);
res.render("index.html");
});
//get status //get status
app.get("/status", function (req, res, next) { app.get("/status", function (req, res, next) {
realtime.getStatus(function (data) { realtime.getStatus(function (data) {

View File

@ -11,6 +11,7 @@ var urladdport = true; //add port on getserverurl
var config = { var config = {
debug: true, debug: true,
usecdn: false,
version: '0.3.2', version: '0.3.2',
domain: domain, domain: domain,
alloworigin: ['add here to allow origin to cross'], alloworigin: ['add here to allow origin to cross'],

View File

@ -34,6 +34,7 @@ var response = {
showFeatures: showFeatures, showFeatures: showFeatures,
showNote: showNote, showNote: showNote,
showPublishNote: showPublishNote, showPublishNote: showPublishNote,
showIndex: showIndex,
noteActions: noteActions, noteActions: noteActions,
publishNoteActions: publishNoteActions publishNoteActions: publishNoteActions
}; };
@ -55,6 +56,18 @@ function responseError(res, code, detail, msg) {
res.end(); res.end();
} }
function showIndex(req, res, next) {
res.writeHead(200, {
'Content-Type': 'text/html'
});
var template = config.indexpath;
var content = ejs.render(fs.readFileSync(template, 'utf8'), {
useCDN: config.usecdn
});
res.write(content);
res.end();
}
function responseHackMD(res, noteId) { function responseHackMD(res, noteId) {
if (noteId != config.featuresnotename) { if (noteId != config.featuresnotename) {
if (!Note.checkNoteIdValid(noteId)) { if (!Note.checkNoteIdValid(noteId)) {

View File

@ -15,13 +15,19 @@
<link rel="apple-touch-icon" href="/apple-touch-icon.png"> <link rel="apple-touch-icon" href="/apple-touch-icon.png">
<!-- Bootstrap core CSS --> <!-- Bootstrap core CSS -->
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css"> <% if(useCDN) { %>
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css"> <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/bootstrap-social/4.9.0/bootstrap-social.min.css">
<% } else { %>
<link rel="stylesheet" href="/vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="/vendor/font-awesome/css/font-awesome.min.css">
<link rel="stylesheet" href="/css/bootstrap-social.css">
<% } %>
<link rel="stylesheet" href="/vendor/select2/select2.css"> <link rel="stylesheet" href="/vendor/select2/select2.css">
<link rel="stylesheet" href="/vendor/select2/select2-bootstrap.css"> <link rel="stylesheet" href="/vendor/select2/select2-bootstrap.css">
<!-- Custom styles for this template --> <!-- Custom styles for this template -->
<link rel="stylesheet" href="/css/cover.css"> <link rel="stylesheet" href="/css/cover.css">
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/bootstrap-social/4.9.0/bootstrap-social.min.css">
<link rel="stylesheet" href="/css/site.css"> <link rel="stylesheet" href="/css/site.css">
</head> </head>
@ -203,18 +209,29 @@
<!-- Bootstrap core JavaScript <!-- Bootstrap core JavaScript
================================================== --> ================================================== -->
<!-- Placed at the end of the document so the pages load faster --> <!-- Placed at the end of the document so the pages load faster -->
<script src="//code.jquery.com/jquery-1.11.3.min.js" defer></script> <% if(useCDN) { %>
<script src="//code.jquery.com/jquery-1.11.2.min.js" defer></script>
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js" defer></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/gsap/1.16.1/TweenMax.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/gsap/1.16.1/TweenMax.min.js" defer></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/gsap/1.16.1/jquery.gsap.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/gsap/1.16.1/jquery.gsap.min.js" defer></script>
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js" defer></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/select2/3.5.2/select2.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/select2/3.5.2/select2.min.js" defer></script>
<script src="/vendor/js.cookie.js" defer></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.9.0/moment-with-locales.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.9.0/moment-with-locales.min.js" defer></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/handlebars.js/3.0.0/handlebars.min.js" defer></script> <script src="//cdnjs.cloudflare.com/ajax/libs/handlebars.js/3.0.0/handlebars.min.js" defer></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/js-url/1.8.6/url.min.js" defer></script>
<% } else { %>
<script src="/vendor/jquery-1.11.2.min.js" defer></script>
<script src="/vendor/bootstrap/js/bootstrap.min.js" defer></script>
<script src="/vendor/greensock-js/TweenMax.min.js" defer></script>
<script src="/vendor/greensock-js/jquery.gsap.min.js" defer></script>
<script src="/vendor/select2/select2.min.js" defer></script>
<script src="/vendor/moment-with-locales.js" defer></script>
<script src="/vendor/handlebars-v3.0.0.js" defer></script>
<script src="/vendor/url.min.js" defer></script>
<% } %>
<script src="/vendor/js.cookie.js" defer></script>
<script src="/vendor/list.min.js" defer></script> <script src="/vendor/list.min.js" defer></script>
<script src="/vendor/FileSaver.min.js" defer></script> <script src="/vendor/FileSaver.min.js" defer></script>
<script src="/vendor/store.min.js" defer></script> <script src="/vendor/store.min.js" defer></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/js-url/1.8.6/url.min.js" defer></script>
<script src="/js/common.js" defer></script> <script src="/js/common.js" defer></script>
<script src="/js/history.js" defer></script> <script src="/js/history.js" defer></script>
<script src="/js/cover.js" defer></script> <script src="/js/cover.js" defer></script>

View File

@ -1,9 +1,18 @@
<% if(useCDN) { %>
<script src="//cdnjs.cloudflare.com/ajax/libs/spin.js/2.3.2/spin.min.js" defer></script>
<script src="//code.jquery.com/jquery-1.11.2.min.js" defer></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery-mousewheel/3.1.13/jquery.mousewheel.min.js" defer></script>
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js" defer></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/gsap/1.16.1/TweenMax.min.js" defer></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/gsap/1.16.1/jquery.gsap.min.js" defer></script>
<% } else { %>
<script src="/vendor/spin.min.js" defer></script> <script src="/vendor/spin.min.js" defer></script>
<script src="/vendor/jquery-1.11.2.min.js" defer></script> <script src="/vendor/jquery-1.11.2.min.js" defer></script>
<script src="/vendor/jquery.mousewheel.min.js" defer></script> <script src="/vendor/jquery.mousewheel.min.js" defer></script>
<script src="/vendor/bootstrap/js/bootstrap.min.js" defer></script> <script src="/vendor/bootstrap/js/bootstrap.min.js" defer></script>
<script src="/vendor/greensock-js/TweenMax.min.js" defer></script> <script src="/vendor/greensock-js/TweenMax.min.js" defer></script>
<script src="/vendor/greensock-js/jquery.gsap.min.js" defer></script> <script src="/vendor/greensock-js/jquery.gsap.min.js" defer></script>
<% } %>
<!--codemirror--> <!--codemirror-->
<script src="/vendor/codemirror/codemirror.min.js" defer></script> <script src="/vendor/codemirror/codemirror.min.js" defer></script>
<script src="/vendor/inlineAttachment/inline-attachment.js" defer></script> <script src="/vendor/inlineAttachment/inline-attachment.js" defer></script>

View File

@ -7,8 +7,15 @@
<title><%- title %></title> <title><%- title %></title>
<link rel="icon" type="image/png" href="/favicon.png"> <link rel="icon" type="image/png" href="/favicon.png">
<link rel="apple-touch-icon" href="/apple-touch-icon.png"> <link rel="apple-touch-icon" href="/apple-touch-icon.png">
<% if(useCDN) { %>
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/bootstrap-social/4.9.0/bootstrap-social.min.css">
<% } else { %>
<link rel="stylesheet" href="/vendor/bootstrap/css/bootstrap.min.css"> <link rel="stylesheet" href="/vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="/vendor/font-awesome/css/font-awesome.min.css"> <link rel="stylesheet" href="/vendor/font-awesome/css/font-awesome.min.css">
<link rel="stylesheet" href="/css/bootstrap-social.css">
<% } %>
<link rel="stylesheet" href="/vendor/codemirror/lib/codemirror.css"> <link rel="stylesheet" href="/vendor/codemirror/lib/codemirror.css">
<link rel="stylesheet" href="/vendor/codemirror/addon/fold/foldgutter.css"> <link rel="stylesheet" href="/vendor/codemirror/addon/fold/foldgutter.css">
<link rel="stylesheet" href="/vendor/codemirror/addon/dialog/dialog.css"> <link rel="stylesheet" href="/vendor/codemirror/addon/dialog/dialog.css">
@ -20,7 +27,6 @@
<link rel="stylesheet" href="/vendor/highlight-js/github-gist.min.css"> <link rel="stylesheet" href="/vendor/highlight-js/github-gist.min.css">
<link rel="stylesheet" href="/vendor/emojify/css/emojify.min.css"> <link rel="stylesheet" href="/vendor/emojify/css/emojify.min.css">
<link rel="stylesheet" href="/vendor/showup/showup.css"> <link rel="stylesheet" href="/vendor/showup/showup.css">
<link rel="stylesheet" href="/css/bootstrap-social.css">
<link rel="stylesheet" href="/css/markdown.css"> <link rel="stylesheet" href="/css/markdown.css">
<link rel="stylesheet" href="/css/index.css"> <link rel="stylesheet" href="/css/index.css">
<link rel="stylesheet" href="/css/extra.css"> <link rel="stylesheet" href="/css/extra.css">

View File

@ -10,9 +10,14 @@
<meta name="mobile-web-app-capable" content="yes"> <meta name="mobile-web-app-capable" content="yes">
<title><%- title %></title> <title><%- title %></title>
<link rel="icon" type="image/png" href="<%- url %>/favicon.png"> <link rel="icon" type="image/png" href="<%- url %>/favicon.png">
<link rel="apple-touch-icon" href="<%- url %>/apple-touch-icon.png"> <link rel="apple-touch-icon" href="<%- url %>/apple-touch-icon.png">
<% if(useCDN) { %>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
<% } else { %>
<link rel="stylesheet" href='<%- url %>/vendor/bootstrap/css/bootstrap.min.css'> <link rel="stylesheet" href='<%- url %>/vendor/bootstrap/css/bootstrap.min.css'>
<link rel="stylesheet" href='<%- url %>/vendor/font-awesome/css/font-awesome.min.css'> <link rel="stylesheet" href='<%- url %>/vendor/font-awesome/css/font-awesome.min.css'>
<% } %>
<link rel="stylesheet" href='<%- url %>/css/github-extract.css'> <link rel="stylesheet" href='<%- url %>/css/github-extract.css'>
<link rel="stylesheet" href='<%- url %>/css/gist.css'> <link rel="stylesheet" href='<%- url %>/css/gist.css'>
<link rel="stylesheet" href='<%- url %>/vendor/highlight-js/github-gist.min.css'> <link rel="stylesheet" href='<%- url %>/vendor/highlight-js/github-gist.min.css'>
@ -45,8 +50,13 @@
</body> </body>
</html> </html>
<% if(useCDN) { %>
<script src="https://code.jquery.com/jquery-1.11.2.min.js" defer></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js" defer></script>
<% } else { %>
<script src="<%- url %>/vendor/jquery-1.11.2.min.js" defer></script> <script src="<%- url %>/vendor/jquery-1.11.2.min.js" defer></script>
<script src="<%- url %>/vendor/bootstrap/js/bootstrap.min.js" defer></script> <script src="<%- url %>/vendor/bootstrap/js/bootstrap.min.js" defer></script>
<% } %>
<script src="<%- url %>/vendor/lz-string.min.js" defer></script> <script src="<%- url %>/vendor/lz-string.min.js" defer></script>
<script src="<%- url %>/vendor/remarkable.min.js" defer></script> <script src="<%- url %>/vendor/remarkable.min.js" defer></script>
<script src="<%- url %>/vendor/remarkable-regex.js" defer></script> <script src="<%- url %>/vendor/remarkable-regex.js" defer></script>