Merge remote-tracking branch 'origin/addAngular'

Conflicts: .gitignore
EgorKluch · Jan 27, 2014 · 2240217 · 2240217
2 parents 477c6e8 + 1069af2
commit 2240217
Show file tree

Hide file tree

Showing 53 changed files with 753 additions and 672 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,8 @@
 .idea
 node_modules
-etc/inspect
+etc
 config/config.js
 public
-.css
+controller/*/js/**/*.js
+controller/*/css/**/*.css
+tmp
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -67,22 +67,24 @@ module.exports = function (grunt) {
   grunt.loadNpmTasks('grunt-contrib-clean');
   grunt.loadNpmTasks('grunt-contrib-uglify');
 
-  grunt.registerTask('build', 'Build controllers', function () {
+  grunt.registerTask('build', 'Build controllers', function (controllerName) {
     var browserify = {};
     var copy = {};
     var controllerPath = 'controller/';
+    var clean = [];
 
     var scanScripts = function (controller, callback) {
       var controllerName = path.basename(controller);
-      if (!path.existsSync(controller + '/src/')) {
+      if (!path.existsSync(controller + '/js/')) {
         callback();
         return;
       }
-      fs.readdir(controller + '/src/', function (err, scripts){
+      fs.readdir(controller + '/js/', function (err, scripts){
         if (err) throw err;
         scripts
-          .map(function (script) { return path.join(controller + '/src/', script); })
+          .map(function (script) { return path.join(controller + '/js/', script); })
           .filter(function (script) { return fs.statSync(script).isFile(); })
+          .filter(function (script) { return path.extname(script) === '.js'; })
           .forEach(function(script) {
             var scriptName = path.basename(script);
             browserify[controllerName + '/' + scriptName] = {
@@ -112,6 +114,7 @@ module.exports = function (grunt) {
           src: '**.css',
           dest: 'public/css/' + controllerName + '/'
         };
+        clean.push('public/css/' + controllerName);
         scanControllers(controllers, callback);
       });
     };
@@ -122,9 +125,14 @@ module.exports = function (grunt) {
       var controllers = dirs
         .map(function (dir) {return path.join(controllerPath, dir); })
         .filter(function (dir) { return fs.statSync(dir).isDirectory(); });
-      scanControllers(controllers, function () {
 
-        grunt.config.set('clean', ['public/js', 'public/css']);
+      if (controllerName) {
+        controllers = controllers
+          .filter(function (dir) { return path.basename(dir) === controllerName; });
+      }
+
+      scanControllers(controllers, function () {
+        grunt.config.set('clean', clean);
         grunt.task.run('clean');
 
         grunt.config.set('browserify', browserify);

diff --git a/app.js b/app.js
@@ -15,18 +15,16 @@ var AppError = require('./core/AppError');
 var config = require('./config/config');
 
 app.configure(function(){
-  // Config twig
   app.set('views', __dirname);
-  app.set('view engine', 'twig');
-  app.set('twig options', {
-    strict_variables: true
-  });
+  app.set('view engine', 'jade');
 });
 
 // Set statics dirs (not handlers)
+app.use('/js/lib', express.static('public/lib'));
 app.use('/js', express.static('public/js'));
 app.use('/css', express.static('public/css'));
 app.use('/img', express.static('public/img'));
+app.use('/tmp/img', express.static('tmp/img'));
 
 app.use(express.cookieParser());
 app.use(express.cookieSession({

diff --git a/config/routes.js b/config/routes.js
@@ -9,12 +9,9 @@ var _ = require('underscore');
 
 var AppError = require('../core/AppError');
 var Core = require('../core/Core');
-
 var MainController = require('../controller/main/mainController');
-var UserController = require('../controller/user/userController');
 var PictureController = require('../controller/picture/pictureController');
-
-
+var UserController = require('../controller/user/userController');
 
 var mainController = new MainController();
 var userController = new UserController();
@@ -58,20 +55,19 @@ module.exports = function (app) {
     mainController.notFound(req.core, next);
   });
 
-  app.get('/', getRouteHandler(mainController, mainController.index));
+  app.get('/',                            getRouteHandler(mainController, mainController.index));
 
-  app.post('/signIn', getRouteHandler(userController, userController.signIn));
-  app.all('/signOut', getRouteHandler(userController, userController.signOut));
-  app.get('/signUp', getRouteHandler(userController, userController.signUpPage));
-  app.post('/signUp', getRouteHandler(userController, userController.signUp));
+  app.post('/signIn',                     getRouteHandler(userController, userController.signIn));
+  app.all('/signOut',                     getRouteHandler(userController, userController.signOut));
+  app.get('/signUp',                      getRouteHandler(userController, userController.signUpPage));
+  app.post('/signUp',                     getRouteHandler(userController, userController.signUp));
 
-  app.get('/picture/add', getRouteHandler(pictureController, pictureController.addPage));
-  app.post('/picture/add', getRouteHandler(pictureController, pictureController.add));
-  app.get('/picture/:pictureId/edit', function (req, res, next) {
-    pictureController.editPage(req.core, next);
-  });
-  app.post('/picture/:pictureId/edit', getRouteHandler(pictureController, pictureController.edit));
-  app.post('/picture/:pictureId/delete', getRouteHandler(pictureController, pictureController.del));
+  app.get ('/picture/add',                getRouteHandler(pictureController, pictureController.addPage));
+  app.post('/picture/add',                getRouteHandler(pictureController, pictureController.add));
+  app.post('/picture/upload',             getRouteHandler(pictureController, pictureController.upload));
+  app.get ('/picture/:pictureId/edit',    getRouteHandler(pictureController, pictureController.editPage));
+  app.post('/picture/:pictureId/edit',    getRouteHandler(pictureController, pictureController.edit));
+  app.post('/picture/:pictureId/delete',  getRouteHandler(pictureController, pictureController.del));
 
   app.use(getRouteHandler(mainController, mainController.notFound));
 };
diff --git a/controller/main/css/main.less b/controller/main/css/main.less
@@ -2,97 +2,177 @@
 @grayColor: #b0b0b0;
 
 body {
-   margin: 0;
-   padding: 0;
-   border: 0;
-   font-family: 'Open Sans';
-   font-size: 15px;
-   font-weight: 400;
-   font-style: normal;
-   font-size-adjust: none;
-   line-height: 21px;
-   vertical-align: baseline;
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font-family: 'Open Sans';
+  font-size: 15px;
+  font-weight: 400;
+  font-style: normal;
+  font-size-adjust: none;
+  line-height: 21px;
+  vertical-align: baseline;
 }
 
 a.button {
-   color: @blueColor;
-   font-weight: bold;
+  color: @blueColor;
+  font-weight: bold;
+  cursor: pointer;
+}
+
+input.validate.ng-invalid {
+  border-color: red;
 }
 
 h1 {
-   text-transform: uppercase;
-   color: @blueColor;
+  text-transform: uppercase;
+  color: @blueColor;
 }
 
 h2 {
-   text-transform: uppercase;
-   font-size: 25px;
-   font-weight: bold;
-   color: @blueColor;
-   margin-top: 5px;
+  text-transform: uppercase;
+  font-size: 25px;
+  font-weight: bold;
+  color: @blueColor;
+  margin-top: 5px;
 }
 
-#leftBar {
-   padding-top: 15px;
-   width: 200px;
-   float: left;
-   min-height: 800px;
-   border-right: 2px solid @grayColor;
+.error {
+  border: 2px solid #6b0400;
+  background-color: #ff8758;
+  color: #c70015;
+  font-size: 12px;
+  width: 230px;
+  margin: 1px 0;
+}
 
-   .menu {
-      a {
-         display: block;
-      }
-   }
+#leftBar {
+  padding-top: 15px;
+  width: 200px;
+  float: left;
+  min-height: 800px;
+  border-right: 2px solid @grayColor;
+
+  .menu {
+    a {
+      display: block;
+    }
+  }
 }
 
 #content {
-   width: 570px;
-   float: right;
-   padding-top: 15px;
+  width: 570px;
+  float: right;
+  padding-top: 15px;
 
-   td.label {
-      text-align: right;
-   }
+  td.label {
+    text-align: right;
+  }
 }
 
 #wrapper {
-   width: 800px;
-   margin: auto;
-   margin-top: 5px;
+  width: 800px;
+  margin: auto;
+  margin-top: 5px;
 }
 
 #header {
-   padding-bottom: 5px;
-   border-bottom: 2px solid @grayColor;
+  padding-bottom: 5px;
+  border-bottom: 2px solid @grayColor;
 
-   a {
-      text-decoration: none;
-      color: @blueColor;
-   }
+  a {
+    text-decoration: none;
+    color: @blueColor;
+  }
 }
 
 #loginForm {
-   display: inline-block;
-   font-size: 13px;
+  display: inline-block;
+  font-size: 13px;
+
+  .title {
+    text-align: center;
+    font-weight: bold;
+  }
+
+  .inputContainer {
+    display: inline-block;
+  }
+
+  a {
+    font-size: 12px;
+  }
+
+  input {
+    width: 100px;
+    padding: 0;
+  }
+
+  input[name="password"] {
+    margin-top: 4px;
+  }
+
+  .signIn {
+    margin-right: 10px;
+  }
+}
 
-   .title {
-      text-align: center;
-      font-weight: bold;
-   }
 
-   .inputContainer {
+.picture {
+  display: inline-block;
+  width: 250px;
+  font-size: 12px;
+  color: #45688e;
+  margin-bottom: 10px;
+  margin-right: 5px;
+  padding: 5px 12px;
+
+  .title {
+    font-weight: bold;
+    font-size: 14px;
+
+    a {
+      color: #45688e;
+      text-decoration: none;
       display: inline-block;
-   }
+      margin-bottom: 5px;
+    }
+  }
+
+  table {
+    width: 100%;
+  }
+
+  img {
+    width: 250px;
+    height: 250px;
+    border: 1px solid #b0b0b0;
+    padding: 3px;
+  }
+}
+
+#signUpForm {
+  font-size: 13px;
+
+  div.last {
+    text-align: right
+  }
+
+  .button.signUp {
+    font-size: 16px;
+    line-height: 25px;
+  }
+}
 
-   a {
-      font-size: 12px;
-   }
+form {
+  .buttons {
+    text-align: right;
+  }
 
-   input {
-      width: 100px;
-      padding: 0;
-   }
+  .button {
+    font-size: 16px;
+    line-height: 25px;
+  }
 }
 
 .picture {