Permalink
Browse files

Adapt meanjs folder structure

  • Loading branch information...
1 parent ee36bea commit ddfb92153669333248d997072925809be77804ee @jerolimov jerolimov committed Jul 14, 2014
Showing with 12 additions and 12 deletions.
  1. +1 −1 app/resources/users/index.js
  2. 0 {app → }/config/acl.js
  3. +1 −1 {app → }/config/auth.js
  4. 0 {app → }/config/db.js
  5. +1 −1 {app → }/config/express.js
  6. +3 −3 {app → }/config/routes.js
  7. 0 {app → }/public/api.js
  8. 0 app/public/app.js → public/application.js
  9. 0 {app → }/public/assets/css/bootstrap-theme.css
  10. 0 {app → }/public/assets/css/custom.css
  11. 0 {app → }/public/constants.js
  12. 0 {app → }/public/controllers/AccountController.js
  13. 0 {app → }/public/controllers/AlertController.js
  14. 0 {app → }/public/controllers/ArtifactController.js
  15. 0 {app → }/public/controllers/ChatController.js
  16. 0 {app → }/public/controllers/LoginController.js
  17. 0 {app → }/public/controllers/LogoutController.js
  18. 0 {app → }/public/controllers/MainController.js
  19. 0 {app → }/public/controllers/NavigationController.js
  20. 0 {app → }/public/controllers/SignupController.js
  21. 0 {app → }/public/controllers/UserController.js
  22. 0 {app → }/public/controllers/modules/ModuleDetailController.js
  23. 0 {app → }/public/controllers/modules/ModuleListController.js
  24. 0 {app → }/public/controllers/students/StudentListController.js
  25. 0 {app → }/public/controllers/subjects/SubjectDetailController.js
  26. 0 {app → }/public/controllers/subjects/SubjectListController.js
  27. 0 {app → }/public/controllers/tasks/TaskDetailController.js
  28. 0 {app → }/public/controllers/tasks/TaskListController.js
  29. 0 {app → }/public/controllers/teams/TeamListController.js
  30. 0 {app → }/public/factories/CurrentModuleFactory.js
  31. 0 {app → }/public/factories/CurrentSubjectFactory.js
  32. 0 {app → }/public/favicon.ico
  33. +1 −1 {app → }/public/index.html
  34. 0 {app → }/public/partials/login.html
  35. 0 {app → }/public/partials/messages.html
  36. 0 {app → }/public/partials/navigation.html
  37. 0 {app → }/public/partials/signup.html
  38. 0 {app → }/public/services/AlertService.js
  39. 0 {app → }/public/services/AuthService.js
  40. 0 {app → }/public/services/Session.js
  41. 0 {app → }/public/views/account.html
  42. 0 {app → }/public/views/auth/login-page.html
  43. 0 {app → }/public/views/auth/logout-page.html
  44. 0 {app → }/public/views/auth/signup-page.html
  45. 0 {app → }/public/views/dashboard.html
  46. 0 {app → }/public/views/errors/403.html
  47. 0 {app → }/public/views/errors/404.html
  48. 0 {app → }/public/views/errors/500.html
  49. 0 {app → }/public/views/errors/503.html
  50. 0 {app → }/public/views/main.html
  51. 0 {app → }/public/views/modules/delete.html
  52. 0 {app → }/public/views/modules/edit.html
  53. 0 {app → }/public/views/modules/list.html
  54. 0 {app → }/public/views/modules/show.html
  55. 0 {app → }/public/views/students/delete.html
  56. 0 {app → }/public/views/students/edit.html
  57. 0 {app → }/public/views/students/list.html
  58. 0 {app → }/public/views/subjects/delete.html
  59. 0 {app → }/public/views/subjects/edit.html
  60. 0 {app → }/public/views/subjects/settings.html
  61. 0 {app → }/public/views/subjects/show.html
  62. 0 {app → }/public/views/tasks/edit.html
  63. 0 {app → }/public/views/tasks/list.html
  64. 0 {app → }/public/views/teams/list.html
  65. 0 {app → }/public/views/users.html
  66. +5 −5 server.js
@@ -3,7 +3,7 @@ var express = require('express'),
users = express.Router(),
User = require('../../models/User'),
helpers = require('../_helpers'),
- acl = require('../../config/acl');
+ acl = require('../../../config/acl');
users.param('user', function(req, res, next, username) {
User.findByUsername(username, function(err, user) {
File renamed without changes.
View
@@ -5,7 +5,7 @@ var express = require('express'),
passport = require('passport'),
LocalStrategy = require('passport-local').Strategy,
Imap = require('imap'),
- User = require('../models/User'),
+ User = require('../app/models/User'),
acl = require('./acl').acl;
var checkCredentials = function(username, password, callback) {
File renamed without changes.
@@ -61,7 +61,7 @@ module.exports = function(app) {
// Static resources
//app.use(express.favicon(path.join(__dirname, '../public', 'favicon.ico')));
app.use(express.static(path.join(__dirname, '../public')));
- app.use(express.static(path.join(__dirname, '../../bower_components')));
+ app.use(express.static(path.join(__dirname, '../bower_components')));
// Error handler
if (env === 'development') {
@@ -7,9 +7,9 @@ var express = require('express'),
// API is only available for authenticated users.
api.use(acl.middleware);
-api.use('/modules', require('../resources/modules'));
-api.use('/subjects', require('../resources/Subjects'));
-api.use('/users', require('../resources/users'));
+api.use('/modules', require('../app/resources/modules'));
+api.use('/subjects', require('../app/resources/Subjects'));
+api.use('/users', require('../app/resources/users'));
var routes = express.Router();
routes.use('/api', api);
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -35,7 +35,7 @@
<div class="container" data-ng-view=""></div>
- <script src="app.js"></script>
+ <script src="application.js"></script>
<script src="constants.js"></script>
<script src="api.js"></script>
<script src="services/AlertService.js"></script>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View
@@ -15,19 +15,19 @@ var express = require('express'),
console.info('Will start server on port %d in %s mode...', port, app.get('env'));
// Express settings
-require('./app/config/express')(app);
+require('./config/express')(app);
// Database
-require('./app/config/db');
+require('./config/db');
// Access Control Lists
-require('./app/config/acl');
+require('./config/acl');
// Authentification
-require('./app/config/auth')(app);
+require('./config/auth')(app);
// Routing
-app.use(require('./app/config/routes'));
+app.use(require('./config/routes'));
// @todo
// Socket.io

0 comments on commit ddfb921

Please sign in to comment.