From: himetani_cafe <fumifumi@yasunaga-lab.bio.kyutech.ac.jp>
Date: Mon, 10 Aug 2015 01:28:29 +0000 (+0900)
Subject: create directory
X-Git-Tag: v0.3.0p0003~3
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b5f5176dc28c567112cc454e20feb6ad27c80f14;p=eos%2Fzephyr.git

create directory
---

diff --git a/client/app/components/createDirModal/createDirModal.controller.js b/client/app/components/createDirModal/createDirModal.controller.js
new file mode 100644
index 0000000..2da6ac4
--- /dev/null
+++ b/client/app/components/createDirModal/createDirModal.controller.js
@@ -0,0 +1,27 @@
+'use strict'
+
+angular.module('zephyrApp')
+.controller('CreateDirModalController', function($scope, $modalInstance, Restangular, user, $timeout) {
+    // To send multipart request from angular, we should set below
+    var baseDirCreation = Restangular.all('/api/dirCreation')    
+    $scope.create = function() {
+        var params = {
+            dir: $scope.path,
+            email: user.getEmail(),
+            createdDirName: $scope.createdDirName
+        }
+        baseDirCreation.post(params).then(function(status) {
+            console.log(status)
+            $modalInstance.close()
+        })
+    }
+
+    $scope.$on('conflict', function() {
+        $scope.alert = true
+    })
+
+    $scope.close = function() {
+        $modalInstance.close()
+    }
+
+})
diff --git a/client/app/components/createDirModal/createDirModal.html b/client/app/components/createDirModal/createDirModal.html
new file mode 100644
index 0000000..5e2d32b
--- /dev/null
+++ b/client/app/components/createDirModal/createDirModal.html
@@ -0,0 +1,23 @@
+<div class="modal-header">
+<h3>Save Notes</h3>
+</div>
+
+<div class="modal-body">
+    <div class="container">
+        <input type="text"
+               ng-model="createdDirName" />
+    </div>
+    <p class="text-danger" ng-show="alert">already exists</p>
+</div>
+
+<div class="modal-footer">
+    <ul class="list-inline">
+        <li>
+            <button class="btn btn-default" ng-click="create()" type="button">create</button>
+        </li>
+        <li>
+            <button class="btn btn-default" ng-click="close()" type="button">cancel</button>
+        </li>
+    </ul>
+</div>
+
diff --git a/client/app/components/uploadFileModal/uploadFileModal.controller.js b/client/app/components/uploadFileModal/uploadFileModal.controller.js
index e6bcad9..f6387d2 100644
--- a/client/app/components/uploadFileModal/uploadFileModal.controller.js
+++ b/client/app/components/uploadFileModal/uploadFileModal.controller.js
@@ -1,9 +1,7 @@
 'use strict'
 
 angular.module('zephyrApp')
-.controller('UploadFileModalController', function($scope, $modalInstance, Restangular, socket) {
-    // To send multipart request from angular, we should set below
-    var baseUpload = Restangular.all('/api/upload').withHttpConfig({transformRequest: angular.identity})    
+.controller('UploadFileModalController', function($scope, $modalInstance, socket) {
     $scope.upload = function() {
         var array = []
         angular.forEach($scope.uploadFiles, function(file) {
diff --git a/client/index.html b/client/index.html
index 9079a64..e20c34a 100644
--- a/client/index.html
+++ b/client/index.html
@@ -48,6 +48,7 @@
         <script src="/client/app/components/board/board.controller.js"></script>
         <script src="/client/app/components/board/board.js"></script>
         <script src="/client/app/components/commandModal/commandModal.controller.js"></script>
+        <script src="/client/app/components/createDirModal/createDirModal.controller.js"></script>
         <script src="/client/app/components/login/login.controller.js"></script>
         <script src="/client/app/components/login/login.js"></script>
         <script src="/client/app/components/notes/notes.controller.js"></script>
diff --git a/server/api/dirCreation/index.js b/server/api/dirCreation/index.js
index 52891f6..011c4b1 100644
--- a/server/api/dirCreation/index.js
+++ b/server/api/dirCreation/index.js
@@ -1,9 +1,31 @@
 'use strict';
 
-var express = require('express');
-var router  = express.Router();
+var express = require('express'),
+    router  = express.Router(),
+    path = require('path'),
+    fs = require('fs'),
+    jb = require('../../jb.js')
+
+router.post('/', function(req, res) {
+    var dir = req.body.dir,
+        email = req.body.email,
+        name = req.body.createdDirName,
+        createdDirPath = path.normalize(__dirname+'/../../../'+dir+'/'+name)
+    
+    try {
+        fs.mkdirSync(createdDirPath)
+        res.send('dirCreation success')
+    } catch(e) {
+        res.sendStatus(409)
+    }
+
+    if(dir === 'workspace') {
+        jb.update('user',
+                { email: email ,
+                $addToSet: { workspaces: name }
+                })
+    }
 
-router.get('/', function() {
 
 });
 
diff --git a/server/api/upload/index.js b/server/api/upload/index.js
deleted file mode 100644
index 48f80fb..0000000
--- a/server/api/upload/index.js
+++ /dev/null
@@ -1,30 +0,0 @@
-'use strict';
-
-var express = require('express'),
-    router  = express.Router(),
-    path = require('path'),
-    formidable = require('formidable')
-
-
-router.post('/', function(req, res) {
-    var form = new formidable.IncomingForm()
-    form.maxFieldsSize = 10 * 1024 * 1024
-
-    form.on('field', function(name, value) {
-        if(name === 'dir') 
-            form.uploadDir = path.normalize(__dirname+'/../../../'+value+'/')
-        console.log(form.uploadDir)
-    })
-
-    form.on('fileBegin', function(field, file) {
-        file.path = form.uploadDir + file.name
-    })
-    
-    form.parse(req, function(err, fields, files) {
-    })
-
-    res.send('success')
-    
-});
-
-module.exports = router;
diff --git a/server/app.js b/server/app.js
index b8cfbb4..fb311c6 100644
--- a/server/app.js
+++ b/server/app.js
@@ -15,8 +15,6 @@ var server = app.listen(config.port, config.ip, function () {
     console.log(config.root);
     console.log('iEos listening at http://%s:%s', config.ip, config.port);
     console.log(app.get('env'))
-
-    
 });
 
 var io = require('socket.io').listen(server)
diff --git a/server/routes.js b/server/routes.js
index 78a8801..b9df3eb 100644
--- a/server/routes.js
+++ b/server/routes.js
@@ -13,7 +13,7 @@ module.exports = function(app) {
     app.use('/api/commandExecution', require('./api/commandExecution'))
     app.use('/api/noteCreation', require('./api/noteCreation'))
     app.use('/api/noteInfo', require('./api/noteInfo'))
-    app.use('/api/upload', require('./api/upload'))
+    app.use('/api/dirCreation', require('./api/dirCreation'))
     app.use('/auth/login', require('./auth/login'))
     app.use('/auth/signup', require('./auth/signup'))