Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Master and Devel #14

Merged
merged 92 commits into from
Sep 21, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
3b97edf
Iniciado projetos da aplicação mobile e server
vitornere Sep 6, 2016
5deb82b
Initial commit
gustavo2795 Sep 7, 2016
175fae0
Added Rack Cors
luizguilherme5 Sep 7, 2016
370e009
Generated user model and rake migrate
luizguilherme5 Sep 7, 2016
1a4d484
Creating sign in html
gustavo2795 Sep 7, 2016
66ec405
sign in improved and created validation in model
caue96 Sep 7, 2016
377ea87
Created users_controller
gustavo2795 Sep 7, 2016
6d8dce8
update model fix errors
pablodiegoss Sep 7, 2016
3f3ab51
Register and bug corrections
gustavo2795 Sep 9, 2016
b220620
Create .travis.yml
flaviocostap Sep 10, 2016
7ff7228
add controller files
pablodiegoss Sep 13, 2016
4de7051
Add signIn screen
pablodiegoss Sep 13, 2016
41075e5
Signin fix signup
gustavo2795 Sep 13, 2016
d64cb6b
Fixed home and signout button
gustavo2795 Sep 13, 2016
3395dd0
create validations on view
pablodiegoss Sep 13, 2016
9e15572
add validation for repeated email
pablodiegoss Sep 14, 2016
d2db2c9
fix user Controller
pablodiegoss Sep 14, 2016
767ea11
Added validation for password
caue96 Sep 14, 2016
43e8df3
Fixed sign up and added iOS transation left-right
luizguilherme5 Sep 14, 2016
3ee85e1
Small bug in password messenger correct
caue96 Sep 14, 2016
8d5b4a1
Merge pull request #1 from fga-gpp-mds/ambient_config
vitornere Sep 14, 2016
fb8c0c4
New style and structure on Signup and Signin
luizguilherme5 Sep 15, 2016
6f3f226
Fix signup button
pablodiegoss Sep 15, 2016
da2df9f
Fix confirm password bug messenger
caue96 Sep 16, 2016
2a30984
corrections on controller
Jefersonalves Sep 16, 2016
ea2f7e3
add menu structure
Jefersonalves Sep 16, 2016
cb34bd6
Create Sessions Controller
Jefersonalves Sep 18, 2016
35dd763
Initialize login
Jefersonalves Sep 18, 2016
b1b3c9e
Fix merge conflicts
Jefersonalves Sep 18, 2016
edb595c
Added menu layout, pages and examples
luizguilherme5 Sep 18, 2016
5e6edcb
Removed unused comments and code reorganize
luizguilherme5 Sep 18, 2016
53e1e46
Create Karma configuration file
LucasAmoedo Sep 19, 2016
0e354d5
Implement signupCtrl unit tests
LucasAmoedo Sep 19, 2016
83eee9b
Update .gitignore and moved Karma configuration file
LucasAmoedo Sep 19, 2016
d375595
Add angular-mocks library
LucasAmoedo Sep 19, 2016
1d7e022
substitute window for state
pablodiegoss Sep 19, 2016
160b094
fix Login fields
pablodiegoss Sep 19, 2016
6571aa6
add Login uc
pablodiegoss Sep 19, 2016
cf09a4b
Establish integration with CodeClimate
LucasAmoedo Sep 19, 2016
87b85a8
Update .codeclimate.yml
LucasAmoedo Sep 19, 2016
d9ddfb3
Correct some messenger bugs in signup and signin.
caue96 Sep 19, 2016
c3a1802
add verifyEmailMethod
pablodiegoss Sep 20, 2016
deec1a0
add Facebook Signup
pablodiegoss Sep 20, 2016
0a739ea
Solving travis error #23 and #24
vitornere Sep 20, 2016
bc30188
Merge branch 'devel' into uc_cadastro
vitornere Sep 20, 2016
d624e8e
Merge pull request #2 from fga-gpp-mds/uc_cadastro
vitornere Sep 20, 2016
66107d3
Add signup Google
pablodiegoss Sep 20, 2016
f30c6d5
Added ngMap and removed placeholder background image
luizguilherme5 Sep 20, 2016
8d9eb32
Modify sigin page and buttons.
caue96 Sep 20, 2016
bb43882
Merge branch 'devel' into unit_tests_jasmine
LucasAmoedo Sep 20, 2016
0277cee
Started uc_cadastro tests
vitornere Sep 20, 2016
ecbfae9
Merge pull request #3 from fga-gpp-mds/uc_login
LucasAmoedo Sep 20, 2016
a0747e8
Updated ngMap lib
luizguilherme5 Sep 20, 2016
bce587d
User creation tested
vitornere Sep 20, 2016
13a96a5
Added Google API Key
luizguilherme5 Sep 20, 2016
c4e2770
Simplecov configured
vitornere Sep 20, 2016
d1ad3eb
Refactor signin and signup controllers
pablodiegoss Sep 20, 2016
316f5b4
Merge pull request #4 from fga-gpp-mds/unitTestsRspec_ucCadastro
LucasAmoedo Sep 20, 2016
e6cf06c
modify signin layout
caue96 Sep 20, 2016
d9711c7
remove social signup buttons
pablodiegoss Sep 20, 2016
c818dcb
add social signin buttons
pablodiegoss Sep 20, 2016
a75aff3
Fix verifyEmail routes
pablodiegoss Sep 20, 2016
4fa6400
add Google and Facebook signIn functions
pablodiegoss Sep 20, 2016
a2edc2c
refactor social login
pablodiegoss Sep 20, 2016
7583598
Update .codeclimate.yml
LucasAmoedo Sep 21, 2016
b195911
Update karma.conf.js
LucasAmoedo Sep 21, 2016
9c76ee8
fix signin email problem
pablodiegoss Sep 21, 2016
8111eb7
remove unused routes and controllers
pablodiegoss Sep 21, 2016
6b6363d
Fix signin and signup forms
pablodiegoss Sep 21, 2016
352e1ad
Menu side bar buttons and menu layout change
caue96 Sep 21, 2016
18ac17d
Change images and add new backgrounds
caue96 Sep 21, 2016
d76e6db
Update tests for user creation
LucasAmoedo Sep 21, 2016
a373a04
Merge pull request #5 from fga-gpp-mds/unit_tests_jasmine
vitornere Sep 21, 2016
5c320a1
Merge pull request #6 from fga-gpp-mds/uc_loginSocial
vitornere Sep 21, 2016
8fa7fd8
Update .travis.yml
flaviocostap Sep 21, 2016
43451c2
Update signupCtrl spec tests
LucasAmoedo Sep 21, 2016
812efb8
Merge branch 'unit_tests_jasmine_uc_loginSocial' of https://github.co…
flaviocostap Sep 21, 2016
d1ffaa7
refactor folders and files organization
pablodiegoss Sep 21, 2016
a2cb278
Updating travis.yml
flaviocostap Sep 21, 2016
4759abe
switch cdn Firebase for local lib
pablodiegoss Sep 21, 2016
310793a
Tested users controller
vitornere Sep 21, 2016
5e0a9b9
Merge pull request #7 from fga-gpp-mds/unitTestsRspec_ucSocial
LucasAmoedo Sep 21, 2016
edbf604
Refactor rails controllers
Jefersonalves Sep 21, 2016
5815189
Modified layout and merge with previosly commit
luizguilherme5 Sep 21, 2016
c345337
Merge pull request #8 from fga-gpp-mds/application_refactor
vitornere Sep 21, 2016
baef56b
Fixed logo position
luizguilherme5 Sep 21, 2016
9bd3668
remove Session
pablodiegoss Sep 21, 2016
ab5d3a6
Merge pull request #10 from fga-gpp-mds/application_refactor
LucasAmoedo Sep 21, 2016
bf01198
Merge branch 'uc_layout' into devel
LucasAmoedo Sep 21, 2016
248c7d7
Merge branch 'uc_mapas' into devel
LucasAmoedo Sep 21, 2016
c2123f5
Merge pull request #13 from fga-gpp-mds/config_travis_coverage
vitornere Sep 21, 2016
f6f1daa
upate .travis.yml
LucasAmoedo Sep 21, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
26 changes: 26 additions & 0 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
engines:
csslint:
enabled: true
duplication:
enabled: true
config:
languages:
- ruby
- javascript
eslint:
enabled: true
fixme:
enabled: true
rubocop:
enabled: true
ratings:
paths:
- "observatorio-app/www/js/controllers.js"
- "observatorio-app/www/js/app.js"
- "observatorio-app/www/js/Login/*.js"
- "observatorio-app/www/templates/*.html"
- "observatorio-server/app/controllers/*.rb"
- "observatorio-server/app/models/*.rb"
exclude_paths:
- "observatorio-app/www/lib"
2 changes: 2 additions & 0 deletions .csslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
--exclude-exts=.min.css
--ignore=adjoining-classes,box-model,ids,order-alphabetical,unqualified-attributes
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
**/*{.,-}min.js
213 changes: 213 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,213 @@
ecmaFeatures:
modules: true
jsx: true

env:
amd: true
browser: true
es6: true
jquery: true
node: true

# http://eslint.org/docs/rules/
rules:
# Possible Errors
comma-dangle: [2, never]
no-cond-assign: 2
no-console: 0
no-constant-condition: 2
no-control-regex: 2
no-debugger: 2
no-dupe-args: 2
no-dupe-keys: 2
no-duplicate-case: 2
no-empty: 2
no-empty-character-class: 2
no-ex-assign: 2
no-extra-boolean-cast: 2
no-extra-parens: 0
no-extra-semi: 2
no-func-assign: 2
no-inner-declarations: [2, functions]
no-invalid-regexp: 2
no-irregular-whitespace: 2
no-negated-in-lhs: 2
no-obj-calls: 2
no-regex-spaces: 2
no-sparse-arrays: 2
no-unexpected-multiline: 2
no-unreachable: 2
use-isnan: 2
valid-jsdoc: 0
valid-typeof: 2

# Best Practices
accessor-pairs: 2
block-scoped-var: 0
complexity: [2, 6]
consistent-return: 0
curly: 0
default-case: 0
dot-location: 0
dot-notation: 0
eqeqeq: 2
guard-for-in: 2
no-alert: 2
no-caller: 2
no-case-declarations: 2
no-div-regex: 2
no-else-return: 0
no-empty-label: 2
no-empty-pattern: 2
no-eq-null: 2
no-eval: 2
no-extend-native: 2
no-extra-bind: 2
no-fallthrough: 2
no-floating-decimal: 0
no-implicit-coercion: 0
no-implied-eval: 2
no-invalid-this: 0
no-iterator: 2
no-labels: 0
no-lone-blocks: 2
no-loop-func: 2
no-magic-number: 0
no-multi-spaces: 0
no-multi-str: 0
no-native-reassign: 2
no-new-func: 2
no-new-wrappers: 2
no-new: 2
no-octal-escape: 2
no-octal: 2
no-proto: 2
no-redeclare: 2
no-return-assign: 2
no-script-url: 2
no-self-compare: 2
no-sequences: 0
no-throw-literal: 0
no-unused-expressions: 2
no-useless-call: 2
no-useless-concat: 2
no-void: 2
no-warning-comments: 0
no-with: 2
radix: 2
vars-on-top: 0
wrap-iife: 2
yoda: 0

# Strict
strict: 0

# Variables
init-declarations: 0
no-catch-shadow: 2
no-delete-var: 2
no-label-var: 2
no-shadow-restricted-names: 2
no-shadow: 0
no-undef-init: 2
no-undef: 0
no-undefined: 0
no-unused-vars: 0
no-use-before-define: 0

# Node.js and CommonJS
callback-return: 2
global-require: 2
handle-callback-err: 2
no-mixed-requires: 0
no-new-require: 0
no-path-concat: 2
no-process-exit: 2
no-restricted-modules: 0
no-sync: 0

# Stylistic Issues
array-bracket-spacing: 0
block-spacing: 0
brace-style: 0
camelcase: 0
comma-spacing: 0
comma-style: 0
computed-property-spacing: 0
consistent-this: 0
eol-last: 0
func-names: 0
func-style: 0
id-length: 0
id-match: 0
indent: 0
jsx-quotes: 0
key-spacing: 0
linebreak-style: 0
lines-around-comment: 0
max-depth: 0
max-len: 0
max-nested-callbacks: 0
max-params: 0
max-statements: [2, 30]
new-cap: 0
new-parens: 0
newline-after-var: 0
no-array-constructor: 0
no-bitwise: 0
no-continue: 0
no-inline-comments: 0
no-lonely-if: 0
no-mixed-spaces-and-tabs: 0
no-multiple-empty-lines: 0
no-negated-condition: 0
no-nested-ternary: 0
no-new-object: 0
no-plusplus: 0
no-restricted-syntax: 0
no-spaced-func: 0
no-ternary: 0
no-trailing-spaces: 0
no-underscore-dangle: 0
no-unneeded-ternary: 0
object-curly-spacing: 0
one-var: 0
operator-assignment: 0
operator-linebreak: 0
padded-blocks: 0
quote-props: 0
quotes: 0
require-jsdoc: 0
semi-spacing: 0
semi: 0
sort-vars: 0
space-after-keywords: 0
space-before-blocks: 0
space-before-function-paren: 0
space-before-keywords: 0
space-in-parens: 0
space-infix-ops: 0
space-return-throw-case: 0
space-unary-ops: 0
spaced-comment: 0
wrap-regex: 0

# ECMAScript 6
arrow-body-style: 0
arrow-parens: 0
arrow-spacing: 0
constructor-super: 0
generator-star-spacing: 0
no-arrow-condition: 0
no-class-assign: 0
no-const-assign: 0
no-dupe-class-members: 0
no-this-before-super: 0
no-var: 0
object-shorthand: 0
prefer-arrow-callback: 0
prefer-const: 0
prefer-reflect: 0
prefer-spread: 0
prefer-template: 0
require-yield: 0
50 changes: 50 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
########## Rails
*.rbc
capybara-*.html
.rspec
/log
/tmp
/db/*.sqlite3
/db/*.sqlite3-journal
/db/schema.rb
/public/system
/coverage/
/spec/tmp
**.orig
rerun.txt
pickle-email-*.html


# TODO Comment out these rules if you are OK with secrets being uploaded to the repo
config/initializers/secret_token.rb
config/secrets.yml

## Environment normalization:
/.bundle
/vendor/bundle

# these should all be checked in to normalize the environment:
# Gemfile.lock, .ruby-version, .ruby-gemset

# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
.rvmrc

# if using bower-rails ignore default bower_components path bower.json files
/vendor/assets/bower_components
*.bowerrc
bower.json

# Ignore pow environment settings
.powenv


########## Ionic
# Specifies intentionally untracked files to ignore when using Git
# http://git-scm.com/docs/gitignore

node_modules/
platforms/
plugins/

########## Webstorm
/.idea
Loading