diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | app.js | 2 | ||||
| -rwxr-xr-x | bin/setup | 6 | ||||
| -rw-r--r-- | public/js/common.js (renamed from public/js/common.js.example) | 10 | ||||
| -rw-r--r-- | public/js/config.js.example | 10 | ||||
| -rw-r--r-- | public/views/foot.ejs | 1 | ||||
| -rw-r--r-- | public/views/index.ejs | 7 | ||||
| -rw-r--r-- | public/views/pretty.ejs | 1 | ||||
| -rw-r--r-- | public/views/slide.ejs | 1 |
10 files changed, 28 insertions, 18 deletions
@@ -19,5 +19,5 @@ backups/ # ignore config files config.json -public/js/common.js +public/js/config.js .sequelizerc @@ -83,10 +83,10 @@ There are some configs you need to change in the files below ``` ./config.json --- for server settings -./public/js/common.js --- for client settings +./public/js/config.js --- for client settings ``` -Client settings `common.js` +Client settings `config.js` --- | variables | example values | description | @@ -148,7 +148,7 @@ Third-party integration api key settings | ------- | --------- | ----------- | | facebook, twitter, github, gitlab, dropbox, google | `config.json` | for signin | | imgur | `config.json` | for image upload | -| google drive, dropbox | `public/js/common.js` | for export and import | +| google drive, dropbox | `public/js/config.js` | for export and import | Third-party integration oauth callback urls --- @@ -94,7 +94,7 @@ app.use(helmet.hsts({ })); i18n.configure({ - locales: ['en', 'zh', 'fr', 'de', 'ja', 'es', 'el', 'pt'], + locales: ['en', 'zh', 'fr', 'de', 'ja', 'es', 'el', 'pt', 'it', 'tr', 'ru', 'nl', 'hr', 'pl'], cookie: 'locale', directory: __dirname + '/locales' }); @@ -25,8 +25,8 @@ if [ ! -f config.json ]; then cp config.json.example config.json fi -if [ ! -f publis/js/common.js ]; then - cp public/js/common.js.example public/js/common.js +if [ ! -f publis/js/config.js ]; then + cp public/js/config.js.example public/js/config.js fi if [ ! -f .sequelizerc ]; then @@ -43,7 +43,7 @@ Edit the following config file to setup hackmd server and client. Read more info at https://github.com/hackmdio/hackmd#configuration-files * config.json -- server config -* public/js/common.js -- client config +* public/js/config.js -- client config * .sequelizerc -- db config EOF diff --git a/public/js/common.js.example b/public/js/common.js index 11c32acc..a14e6fc9 100644 --- a/public/js/common.js.example +++ b/public/js/common.js @@ -1,14 +1,4 @@ //common -var domain = ''; // domain name -var urlpath = ''; // sub url path, like: www.example.com/<urlpath> -//settings -var debug = false; - -var GOOGLE_API_KEY = ''; -var GOOGLE_CLIENT_ID = ''; - -var DROPBOX_APP_KEY = ''; - var port = window.location.port; var serverurl = window.location.protocol + '//' + (domain ? domain : window.location.hostname) + (port ? ':' + port : '') + (urlpath ? '/' + urlpath : ''); var noteid = urlpath ? window.location.pathname.slice(urlpath.length + 1, window.location.pathname.length).split('/')[1] : window.location.pathname.split('/')[1]; diff --git a/public/js/config.js.example b/public/js/config.js.example new file mode 100644 index 00000000..197d18f2 --- /dev/null +++ b/public/js/config.js.example @@ -0,0 +1,10 @@ +//config +var domain = ''; // domain name +var urlpath = ''; // sub url path, like: www.example.com/<urlpath> +//settings +var debug = false; + +var GOOGLE_API_KEY = ''; +var GOOGLE_CLIENT_ID = ''; + +var DROPBOX_APP_KEY = '';
\ No newline at end of file diff --git a/public/views/foot.ejs b/public/views/foot.ejs index 9328ac9c..0397317d 100644 --- a/public/views/foot.ejs +++ b/public/views/foot.ejs @@ -75,6 +75,7 @@ <script src="<%- url %>/vendor/keymaster/keymaster.js" 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/config.js" defer></script> <script src="<%- url %>/js/common.js" defer></script> <script src="<%- url %>/js/extra.js" defer></script> <script src="<%- url %>/js/render.js" defer></script> diff --git a/public/views/index.ejs b/public/views/index.ejs index f5f848e6..561a5987 100644 --- a/public/views/index.ejs +++ b/public/views/index.ejs @@ -154,6 +154,12 @@ <option value="es">Español</option> <option value="el">Ελληνικά</option> <option value="pt">Português</option> + <option value="it">italiano</option> + <option value="tr">Türkçe</option> + <option value="ru">Русский</option> + <option value="nl">Nederlands</option> + <option value="hr">hrvatski jezik</option> + <option value="pl">język polski</option> </select> </div> </div> @@ -205,6 +211,7 @@ <script src="<%- url %>/vendor/file-saver/FileSaver.min.js" defer></script> <script src="<%- url %>/vendor/store-js/store.min.js" defer></script> <script src="<%- url %>/vendor/lz-string/libs/lz-string.min.js" defer></script> + <script src="<%- url %>/js/config.js" defer></script> <script src="<%- url %>/js/common.js" defer></script> <script src="<%- url %>/js/history.js" defer></script> <script src="<%- url %>/js/cover.js" defer></script> diff --git a/public/views/pretty.ejs b/public/views/pretty.ejs index 2546b1ac..7af474a6 100644 --- a/public/views/pretty.ejs +++ b/public/views/pretty.ejs @@ -127,6 +127,7 @@ <script src="<%- url %>/vendor/viz.js/viz.js" defer></script> <script src="<%- url %>/vendor/pdfobject/pdfobject.min.js" defer></script> <script src="<%- url %>/vendor/md-toc.js" defer></script> +<script src="<%- url %>/js/config.js" defer></script> <script src="<%- url %>/js/common.js" defer></script> <script src="<%- url %>/js/extra.js" defer></script> <script src="<%- url %>/js/render.js" defer></script> diff --git a/public/views/slide.ejs b/public/views/slide.ejs index 3c5498c6..a0016375 100644 --- a/public/views/slide.ejs +++ b/public/views/slide.ejs @@ -122,6 +122,7 @@ <script src="<%- url %>/vendor/viz.js/viz.js" defer></script> <script src="<%- url %>/vendor/pdfobject/pdfobject.min.js" defer></script> <script src="<%- url %>/vendor/md-toc.js" defer></script> + <script src="<%- url %>/js/config.js" defer></script> <script src="<%- url %>/js/common.js" defer></script> <script src="<%- url %>/js/extra.js" defer></script> <script src="<%- url %>/js/render.js" defer></script> |