Merge 1b70cc1 into c6b1e01

squareteam · Dec 7, 2014 · 9e7e26e · 9e7e26e
2 parents c6b1e01 + 1b70cc1
commit 9e7e26e
Show file tree

Hide file tree

Showing 105 changed files with 2,706 additions and 960 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@ dist
 .tmp
 .sass-cache
 coverage/
+coverage-dev/
 app/bower_components
 app/scripts/config.js
 *.css

diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "app/styles"]
 	path = app/styles
-	url = git@bitbucket.org:squareteam/front-styles.git
+	url = git://github.com/squareteam/front-styles.git
diff --git a/.hound.yml b/.hound.yml
@@ -0,0 +1,3 @@
+java_script:
+  enabled: true
+  config_file: .jshintrc
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,11 @@
 language: node_js
+env:
+  - COVERALLS_REPO_TOKEN=EhUh7DvONjBDOXLmWScWh8esPiGjvslaD
 node_js:
-  - '0.8'
   - '0.10'
 before_script:
   - 'npm install -g bower grunt-cli'
   - 'bower install'
+  - cp app/scripts/config_sample.js app/scripts/config.js
+after_script:
+  - 'grunt coveralls'
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -18,6 +18,7 @@ module.exports = function (grunt) {
   grunt.loadNpmTasks('grunt-bump');
   grunt.loadNpmTasks('grunt-version');
   grunt.loadNpmTasks('grunt-contrib-sass');
+  grunt.loadNpmTasks('grunt-karma-coveralls');
 
   // Define the configuration for all the tasks
   grunt.initConfig({
@@ -76,7 +77,8 @@ module.exports = function (grunt) {
       },
       sass: {
         files: ['<%= yeoman.app %>/styles/{,**/}*.{scss,sass}'],
-        tasks: ['sass:server', 'autoprefixer']
+        tasks: ['sass:dist']
+        // tasks: ['sass:server', 'autoprefixer']
       },
       gruntfile: {
         files: ['Gruntfile.js']
@@ -93,6 +95,16 @@ module.exports = function (grunt) {
       }
     },
 
+    coveralls: {
+      options: {
+        debug: false,
+        'coverage_dir': 'coverage/',
+        dryRun: false,
+        force: true,
+        recursive: true
+      }
+    },
+
     // The actual grunt server settings
     connect: {
       options: {
@@ -120,6 +132,17 @@ module.exports = function (grunt) {
           ]
         }
       },
+      ci: {
+        options: {
+          port: 9991,
+          hostname: process.env.OPENSHIFT_JENKINS_IP,
+          base: [
+            '.tmp',
+            'test',
+            '<%= yeoman.app %>'
+          ]
+        }
+      },
       dist: {
         options: {
           base: '<%= yeoman.dist %>'
@@ -284,16 +307,16 @@ module.exports = function (grunt) {
       }
     },
 
-    imagemin: {
-      dist: {
-        files: [{
-          expand: true,
-          cwd: '<%= yeoman.app %>/images',
-          src: '{,*/}*.{png,jpg,jpeg,gif}',
-          dest: '<%= yeoman.dist %>/images'
-        }]
-      }
-    },
+    // imagemin: {
+    //   dist: {
+    //     files: [{
+    //       expand: true,
+    //       cwd: '<%= yeoman.app %>/images',
+    //       src: '{,*/}*.{png,jpg,jpeg,gif}',
+    //       dest: '<%= yeoman.dist %>/images'
+    //     }]
+    //   }
+    // },
 
     svgmin: {
       dist: {
@@ -323,10 +346,10 @@ module.exports = function (grunt) {
       }
     },
 
-    // ngmin tries to make the code safe for minification automatically by
+    // ngAnnotate tries to make the code safe for minification automatically by
     // using the Angular long form for dependency injection. It doesn't work on
     // things like resolve or inject so those have to be done manually.
-    ngmin: {
+    ngAnnotate: {
       dist: {
         files: [{
           expand: true,
@@ -380,7 +403,7 @@ module.exports = function (grunt) {
       ],
       dist: [
         'sass',
-        'imagemin',
+        // 'imagemin',
         'svgmin'
       ]
     },
@@ -413,9 +436,15 @@ module.exports = function (grunt) {
 
     // Test settings
     karma: {
-      unit: {
+      options: {
         configFile: 'karma.conf.js',
-        singleRun: true
+        browsers: ['PhantomJS']
+      },
+      dev: {
+        coverageReporter: {
+          type: 'html',
+          dir: 'coverage-dev/'
+        }
       }
     }
   });
@@ -446,7 +475,7 @@ module.exports = function (grunt) {
     // 'concurrent:test',
     // 'autoprefixer',
     'connect:test',
-    'karma'
+    'karma:dev'
   ]);
 
   grunt.registerTask('patch', [
@@ -473,7 +502,7 @@ module.exports = function (grunt) {
     'useminPrepare',
     'concurrent:dist',
     'concat',
-    'ngmin',
+    'ngAnnotate',
     'copy:dist',
     'cssmin',
     'uglify',

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-## Squareteam front (AngularJS)
+## Squareteam front [![Build Status](https://travis-ci.org/squareteam/front.svg?branch=master)](https://travis-ci.org/squareteam/front)[![Coverage Status](https://coveralls.io/repos/squareteam/front/badge.png)](https://coveralls.io/r/squareteam/front)[![Dependency Status](https://gemnasium.com/squareteam/front.svg)](https://gemnasium.com/squareteam/front)
 
 ## Important !
 

diff --git a/app/i18n/en.json b/app/i18n/en.json
@@ -2,17 +2,38 @@
 
    "public" : {
       "login" : {
-         "wantAnAccount_1"   : "Don't have an account?",
-         "wantAnAccount_2"   : "Discover now",
+         "wantAnAccount_1"   : "Still don't have an account?",
+         "wantAnAccount_2"   : "Discover now"
+      },
+
+      "oauth" : {
+
+         "login" : {
+
+            "authenticating" : "We are checking your identity...",
 
-         "authenticating"  : "We are checking your identity..",
+            "authenticating_error": "Identity checking failed, please contact our support.",
+
+            "github" : {
+               "authenticating"  : "Authenticate with Github",
+               "tooltipBtn"      : "Sign in with Github"
+            },
+
+            "behance" : {
+               "authenticating"  : "Authenticate with Behance",
+               "tooltipBtn"      : "Sign in with Behance"
+            }
 
-         "github" : {
-            "authenticating"  : "Authenticating with Github"
          },
-         "behance" : {
-            "authenticating"  : "Authenticating with Behance"
+
+         "email" : {
+
+            "wrong_provider" : "We do not support login with this service yet.",
+            "title" : "Confirm your email",
+            "confirmBtn" : "Confirm"
+
          }
+
       },
 
       "register" : {
@@ -24,16 +45,16 @@
       "forgotPassword" : {
          "emailInvalid"          : "No account found with this email",
          "oAuthAccountFound"     : "Please try to login with",
-         "tokenInvalid"          : "Your password change request is expired",
+         "tokenInvalid"          : "Your change password request has expired",
          "tokenInvalidClickHere" : "Please make a new request",
          "request": {
             "title" : "Forgot password?",
-            "notice"          : "Enter the email address you used when you joined and we'll send you instructions to reset your password.",
+            "notice"          : "Enter your email address and we'll send you instructions on how to reset your password.",
             "send"            : "Send reset instructions",
             "returnToSignIn"  : "Return to sign in",
 
-            "sent_1" : "A e-mail containing instructions",
-            "sent_2" : "for password changing has been sent !"
+            "sent_1" : "Please check your inbox, you will shortly receive instructions on how to reset your password.",
+            "sent_2" : "You can now close this page"
          },
          "change" : {
             "title" : "Please enter a new password",
@@ -96,10 +117,10 @@
          "projects"     : "projects"
       },
 
-      "myAccount" : {
-         "profile" : {
+      "manage" : {
+         "account" : {
             "title"           : "My Account",
-            "subtitle"        : "Need to update your informations ?",
+            "subtitle"        : "Need to update your personal information?",
             "change_avatar"   : "Change my avatar",
             "name"            : "Pseudo",
             "password"        : "Password",
@@ -112,6 +133,23 @@
             "leave"           : "Leave",
             "no_organizations": "No organization.",
             "create"          : "Create"
+         },
+         "organization" : {
+            "subtitle_singular"  : "team",
+            "subtitle_plural"    : "teams",
+            "team_list_user_singular"  : "user",
+            "team_list_user_plural"    : "users",
+            "manage" : "Manage",
+            "no_team": "No team.",
+            "create_team": "Create team"
+         },
+         "team" : {
+            "edit" : "Edit",
+            "save" : "Save",
+            "remove" : "Remove",
+            "no_users" : "No users",
+            "add_member" : "Add a member",
+            "edit_team" : "Edit team"
          }
       }
 
@@ -122,6 +160,22 @@
          "title"     : "Please confirm your password",
          "subtitle"  : "For your security.",
          "continue"   : "Continue"
+      },
+      "team" : {
+         "title" : "Team",
+         "subtitle_create" : "Let's create a team",
+         "subtitle_update" : "Keep informations up to date",
+         "subtitle_workers" : "Manage workers",
+         "labels" : {
+            "name" : "Name",
+            "color" : "Pick a color",
+            "workers" : "Choose worker(s)"
+         },
+         "buttons" : {
+            "create" : "Create",
+            "update" : "Update",
+            "workers" : "Update workers"
+         }
       }
    },
 
@@ -202,4 +256,4 @@
          }
       }
    }
-}
+}