Johannes Zellner 11 лет назад
Родитель
Сommit
28b83b3d17
6 измененных файлов с 65 добавлено и 1 удалено
  1. 2 0
      app.js
  2. 23 0
      frontend/index.html
  3. 7 0
      frontend/js/core.js
  4. 3 0
      frontend/js/main.js
  5. 10 0
      frontend/js/settings.js
  6. 20 1
      src/routes.js

+ 2 - 0
app.js

@@ -7,6 +7,7 @@ require('supererror')({ splatchError: true });
 var express = require('express'),
     json = require('body-parser').json,
     cors = require('cors'),
+    multer  = require('multer'),
     routes = require('./src/routes.js'),
     things = require('./src/things.js'),
     lastmile = require('connect-lastmile'),
@@ -29,6 +30,7 @@ router.post('/api/settings', routes.auth, routes.settingsSave);
 router.get ('/api/settings', routes.auth, routes.settingsGet);
 
 router.get ('/api/export', routes.auth, routes.exportThings);
+router.post('/api/import', routes.auth, multer().any(), routes.importThings);
 
 router.post('/api/login', routes.login);
 router.get ('/api/logout', routes.logout);

+ 23 - 0
frontend/index.html

@@ -147,11 +147,34 @@
               <h4>Content</h4>
             </div>
           </div>
+          <div class="row">
+            <div class="col-md-offset-1 col-md-10">
+              <div class="form-group">
+                <input id="inputImport" v-el:importfile type="file">
+                <div class="input-group">
+                  <input readonly="" class="form-control" placeholder="things.json ..." type="text">
+                    <span class="input-group-btn input-group-sm">
+                      <button type="button" class="btn btn-fab btn-fab-mini">
+                        <i class="fa fa-paperclip"></i>
+                      </button>
+                    </span>
+                </div>
+              </div>
+              <br/>
+              <button class="btn btn-primary pull-right" v-on:click="importThings">Import</button>
+            </div>
+          </div>
           <div class="row">
             <div class="col-md-offset-1 col-md-10">
               <button class="btn btn-primary pull-right" v-on:click="exportThings">Export</button>
             </div>
           </div>
+          <br/>
+          <div class="row">
+            <div class="col-md-12">
+              <h4>Session</h4>
+            </div>
+          </div>
           <div class="row">
             <div class="col-md-offset-1 col-md-10">
               <button class="btn btn-danger pull-right" v-on:click="logout">Logout</button>

+ 7 - 0
frontend/js/core.js

@@ -112,6 +112,13 @@ ThingsApi.prototype.del = function (thing, callback) {
     }));
 };
 
+ThingsApi.prototype.import = function (formData, callback) {
+    superagent.post(url('/api/import')).send(formData).end(function (error, result) {
+        if (error) return callback(error);
+        callback(null);
+    });
+};
+
 ThingsApi.prototype.onAdded = function (callback) {
     this._addCallbacks.push(callback);
 };

+ 3 - 0
frontend/js/main.js

@@ -50,6 +50,9 @@ var vue = new Vue({
                 main();
             });
         },
+        refresh: function () {
+            refresh();
+        },
         doSearch: function () {
             window.location.href = '/#search?' + encodeURIComponent(this.search);
         },

+ 10 - 0
frontend/js/settings.js

@@ -41,6 +41,16 @@ var vueSettings = new Vue({
             Core.things.export();
             vueSettings.hide();
         },
+        importThings: function () {
+            var data = new FormData();
+            data.append('import', this.$els.importfile.files[0]);
+
+            Core.things.import(data, function (error) {
+                if (error) console.error(error);
+
+                // TODO refresh
+            });
+        },
         logout: function () {
             vueSettings.hide();
             Core.session.logout();

+ 20 - 1
src/routes.js

@@ -26,7 +26,8 @@ exports = module.exports = {
     getTags: getTags,
     settingsSave: settingsSave,
     settingsGet: settingsGet,
-    exportThings: exportThings
+    exportThings: exportThings,
+    importThings: importThings
 };
 
 function init(callback) {
@@ -168,3 +169,21 @@ function exportThings(req, res, next) {
         });
     });
 }
+
+function importThings(req, res, next) {
+    if (!req.files || !req.files[0]) return next(new HttpError('400', 'missing file'));
+
+    var data;
+    try {
+        data = JSON.parse(req.files[0].buffer.toString('utf-8'));
+    } catch (e) {
+        return next(new HttpError(400, 'content is not JSON'));
+    }
+
+    if (!Array.isArray(data.things)) return next(new HttpError(400, 'content must have a "things" array'));
+
+    things.imp(data, function (error) {
+        if (error) return next(new HttpError(500, error));
+        next(new HttpSuccess(200, {}));
+    });
+}