Moved to client folder

et · Nov 16, 2012 · 7fb5abc · 7fb5abc
1 parent 8c79791
commit 7fb5abc
Show file tree

Hide file tree

Showing 120 changed files with 1,965 additions and 1,965 deletions.
diff --git a/.gitignore → client/.gitignore b/.gitignore → client/.gitignore
diff --git a/.travis.yml → client/.travis.yml b/.travis.yml → client/.travis.yml
@@ -1,16 +1,16 @@
- language: node_js
- node_js:
-   - "0.8"
-
- before_script:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
-  - npm install --quiet -g [email protected] [email protected]
-  - git clone --quiet git://github.com/angular-app/angular-app-server.git
-  - cd angular-app-server
-  - npm install --quiet
-  - cd ..
-  - node angular-app-server/server.js &
-  - sleep 3 # give server some time to start
-
+ language: node_js
+ node_js:
+   - "0.8"
+
+ before_script:
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+  - npm install --quiet -g [email protected] [email protected]
+  - git clone --quiet git://github.com/angular-app/angular-app-server.git
+  - cd angular-app-server
+  - npm install --quiet
+  - cd ..
+  - node angular-app-server/server.js &
+  - sleep 3 # give server some time to start
+
  script: grunt release
diff --git a/LICENSE → client/LICENSE b/LICENSE → client/LICENSE
diff --git a/build/grunt-html2js.js → client/build/grunt-html2js.js b/build/grunt-html2js.js → client/build/grunt-html2js.js
diff --git a/build/grunt-testacular.js → client/build/grunt-testacular.js b/build/grunt-testacular.js → client/build/grunt-testacular.js
diff --git a/grunt.js → client/grunt.js b/grunt.js → client/grunt.js
@@ -1,139 +1,139 @@
-module.exports = function (grunt) {
-
-  grunt.loadNpmTasks('grunt-recess');
-  grunt.loadNpmTasks('grunt-contrib-clean');
-  grunt.loadNpmTasks('grunt-contrib-copy');
-  grunt.loadTasks('build');
-
-  // Project configuration.
-  grunt.initConfig({
-    distdir: 'dist',
-    pkg:'<json:package.json>',
-    meta:{
-      banner:'/*! <%= pkg.title || pkg.name %> - v<%= pkg.version %> - ' +
-        '<%= grunt.template.today("yyyy-mm-dd") %>\n' +
-        '<%= pkg.homepage ? "* " + pkg.homepage + "\n" : "" %>' +
-        '* Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author %>;\n' +
-        ' Licensed <%= _.pluck(pkg.licenses, "type").join(", ") %> */'
-    },
-    src: {
-      js: ['src/**/*.js', 'dist/tmp/**/*.js'],
-      html: ['src/index.html'],
-      tpl: ['src/app/**/*.tpl.html'],
-      less: ['src/less/stylesheet.less'] // recess:build doesn't accept ** in its file patterns
-    },
-    clean: ['<%= distdir %>/*'],
-    copy: {
-      assets: {
-        files: {'<%= distdir %>/': 'src/assets/**'}
-      }
-    },
-    test: {
-      unit: ['test/unit/**/*Spec.js'],
-      e2e: ['test/e2e/**/*Spec.js']
-    },
-    lint:{
-      files:['grunt.js', '<config:src.js>', '<config:test.unit>', '<config:test.e2e>']
-    },
-    html2js: {
-      src: ['<config:src.tpl>'],
-      base: 'src/app',
-      dest: 'dist/tmp'
-    },
-    concat:{
-      dist:{
-        src:['<banner:meta.banner>', '<config:src.js>'],
-        dest:'<%= distdir %>/<%= pkg.name %>.js'
-      },
-      angular: {
-        src:['vendor/angular/angular.js'],
-        dest: '<%= distdir %>/angular.js'
-      },
-      mongo: {
-        src:['vendor/mongolab/*.js'],
-        dest: '<%= distdir %>/mongolab.js'
-      },
-      bootstrap: {
-        src:['vendor/bootstrap/*.js'],
-        dest: '<%= distdir %>/bootstrap.js'
-      },
-      jquery: {
-        src:['vendor/jquery/*.js'],
-        dest: '<%= distdir %>/jquery.js'
-      }
-    },
-    min: {
-      dist:{
-        src:['<banner:meta.banner>', '<config:src.js>'],
-        dest:'<%= distdir %>/<%= pkg.name %>.js'
-      },
-      angular: {
-        src:['<config:concat.angular.src>'],
-        dest: '<%= distdir %>/angular.js'
-      },
-      mongo: {
-        src:['vendor/mongolab/*.js'],
-        dest: '<%= distdir %>/mongolab.js'
-      },
-      bootstrap: {
-        src:['vendor/bootstrap/*.js'],
-        dest: '<%= distdir %>/bootstrap.js'
-      },
-      jquery: {
-        src:['vendor/jquery/*.js'],
-        dest: '<%= distdir %>/jquery.js'
-      }
-    },
-    recess: {
-      build: {
-        src: ['<config:src.less>'],
-        dest: '<%= distdir %>/<%= pkg.name %>.css',
-        options: {
-          compile: true
-        }
-      },
-      min: {
-        src: ['<config:src.less>'],
-        dest: '<config:recess.build.dest>',
-        options: {
-          compress: true
-        }
-      }
-    },
-    watch:{
-      files:['<config:src.js>', '<config:test.unit>', '<config:src.less>', '<config:src.tpl>', '<config:src.html>'],
-      tasks:'default timestamp'
-    },
-    jshint:{
-      options:{
-        curly:true,
-        eqeqeq:true,
-        immed:true,
-        latedef:true,
-        newcap:true,
-        noarg:true,
-        sub:true,
-        boss:true,
-        eqnull:true
-      },
-      globals:{}
-    },
-    uglify:{}
-  });
-
-  // Default task.
-  grunt.registerTask('default', 'lint build test:unit');
-  grunt.registerTask('build', 'clean html2js concat recess:build index copy');
-  grunt.registerTask('release', 'clean html2js min lint test recess:min index copy e2e');
-
-  // HTML stuff
-  grunt.registerTask('index', 'Process index.html', function(){
-     grunt.file.copy('src/index.html', 'dist/index.html', {process:grunt.template.process});
-  });
-
-  // Print a timestamp (useful for when watching)
-  grunt.registerTask('timestamp', function() {
-    grunt.log.subhead(Date());
-  });
-
+module.exports = function (grunt) {
+
+  grunt.loadNpmTasks('grunt-recess');
+  grunt.loadNpmTasks('grunt-contrib-clean');
+  grunt.loadNpmTasks('grunt-contrib-copy');
+  grunt.loadTasks('build');
+
+  // Project configuration.
+  grunt.initConfig({
+    distdir: 'dist',
+    pkg:'<json:package.json>',
+    meta:{
+      banner:'/*! <%= pkg.title || pkg.name %> - v<%= pkg.version %> - ' +
+        '<%= grunt.template.today("yyyy-mm-dd") %>\n' +
+        '<%= pkg.homepage ? "* " + pkg.homepage + "\n" : "" %>' +
+        '* Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author %>;\n' +
+        ' Licensed <%= _.pluck(pkg.licenses, "type").join(", ") %> */'
+    },
+    src: {
+      js: ['src/**/*.js', 'dist/tmp/**/*.js'],
+      html: ['src/index.html'],
+      tpl: ['src/app/**/*.tpl.html'],
+      less: ['src/less/stylesheet.less'] // recess:build doesn't accept ** in its file patterns
+    },
+    clean: ['<%= distdir %>/*'],
+    copy: {
+      assets: {
+        files: {'<%= distdir %>/': 'src/assets/**'}
+      }
+    },
+    test: {
+      unit: ['test/unit/**/*Spec.js'],
+      e2e: ['test/e2e/**/*Spec.js']
+    },
+    lint:{
+      files:['grunt.js', '<config:src.js>', '<config:test.unit>', '<config:test.e2e>']
+    },
+    html2js: {
+      src: ['<config:src.tpl>'],
+      base: 'src/app',
+      dest: 'dist/tmp'
+    },
+    concat:{
+      dist:{
+        src:['<banner:meta.banner>', '<config:src.js>'],
+        dest:'<%= distdir %>/<%= pkg.name %>.js'
+      },
+      angular: {
+        src:['vendor/angular/angular.js'],
+        dest: '<%= distdir %>/angular.js'
+      },
+      mongo: {
+        src:['vendor/mongolab/*.js'],
+        dest: '<%= distdir %>/mongolab.js'
+      },
+      bootstrap: {
+        src:['vendor/bootstrap/*.js'],
+        dest: '<%= distdir %>/bootstrap.js'
+      },
+      jquery: {
+        src:['vendor/jquery/*.js'],
+        dest: '<%= distdir %>/jquery.js'
+      }
+    },
+    min: {
+      dist:{
+        src:['<banner:meta.banner>', '<config:src.js>'],
+        dest:'<%= distdir %>/<%= pkg.name %>.js'
+      },
+      angular: {
+        src:['<config:concat.angular.src>'],
+        dest: '<%= distdir %>/angular.js'
+      },
+      mongo: {
+        src:['vendor/mongolab/*.js'],
+        dest: '<%= distdir %>/mongolab.js'
+      },
+      bootstrap: {
+        src:['vendor/bootstrap/*.js'],
+        dest: '<%= distdir %>/bootstrap.js'
+      },
+      jquery: {
+        src:['vendor/jquery/*.js'],
+        dest: '<%= distdir %>/jquery.js'
+      }
+    },
+    recess: {
+      build: {
+        src: ['<config:src.less>'],
+        dest: '<%= distdir %>/<%= pkg.name %>.css',
+        options: {
+          compile: true
+        }
+      },
+      min: {
+        src: ['<config:src.less>'],
+        dest: '<config:recess.build.dest>',
+        options: {
+          compress: true
+        }
+      }
+    },
+    watch:{
+      files:['<config:src.js>', '<config:test.unit>', '<config:src.less>', '<config:src.tpl>', '<config:src.html>'],
+      tasks:'default timestamp'
+    },
+    jshint:{
+      options:{
+        curly:true,
+        eqeqeq:true,
+        immed:true,
+        latedef:true,
+        newcap:true,
+        noarg:true,
+        sub:true,
+        boss:true,
+        eqnull:true
+      },
+      globals:{}
+    },
+    uglify:{}
+  });
+
+  // Default task.
+  grunt.registerTask('default', 'lint build test:unit');
+  grunt.registerTask('build', 'clean html2js concat recess:build index copy');
+  grunt.registerTask('release', 'clean html2js min lint test recess:min index copy e2e');
+
+  // HTML stuff
+  grunt.registerTask('index', 'Process index.html', function(){
+     grunt.file.copy('src/index.html', 'dist/index.html', {process:grunt.template.process});
+  });
+
+  // Print a timestamp (useful for when watching)
+  grunt.registerTask('timestamp', function() {
+    grunt.log.subhead(Date());
+  });
+
 };
diff --git a/package.json → client/package.json b/package.json → client/package.json
diff --git a/src/app/admin/admin.js → client/src/app/admin/admin.js b/src/app/admin/admin.js → client/src/app/admin/admin.js
@@ -1 +1 @@
-angular.module('admin', ['admin-projects', 'admin-users']);
+angular.module('admin', ['admin-projects', 'admin-users']);
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		angular.module('admin', ['admin-projects', 'admin-users']);
		angular.module('admin', ['admin-projects', 'admin-users']);