Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
376 commits
Select commit Hold shift + click to select a range
35d93b5
Fix sidebar and navbar shadow and display width
arthurbdiniz Oct 9, 2018
8f7c03a
Remove avatar from sidebar and improve style
arthurbdiniz Oct 9, 2018
73555b5
Gives padding to dashboard and remove welcome message
arthurbdiniz Oct 9, 2018
5454e64
Dropdown navigation
arthurbdiniz Oct 9, 2018
3421e75
Update keys with kairon
arthurbdiniz Oct 9, 2018
80b3d5d
Adding profile image
sconetto Oct 9, 2018
e444267
Fixing CI errors
sconetto Oct 9, 2018
1fc69a7
Fix #70
sconetto Oct 10, 2018
cc353a2
Merge pull request #71 from GCES-2018-2/hotfix/70-sshpass-error
arthurbdiniz Oct 10, 2018
5b2a8f4
Add zxcvbn dependency
ferk6a Oct 10, 2018
19ce68c
Add password strength meter based on zxcvbn
ferk6a Oct 10, 2018
7247ae7
Fix Chrome's meter not working and now grayer
ferk6a Oct 10, 2018
12b1341
Merge pull request #74 from fer22f/password-strength
arthurbdiniz Oct 10, 2018
a7f6a7f
Fix password strength size on screen greater than 1000 px
arthurbdiniz Oct 10, 2018
3058ef5
Merge pull request #75 from GCES-2018-2/hotfix/password-strength
arthurbdiniz Oct 10, 2018
7120244
Merge pull request #69 from GCES-2018-2/feature/34-profile-image
arthurbdiniz Oct 10, 2018
86b5b39
Fix misprint PullRequest Template
Oct 10, 2018
77742cb
Merge pull request #79 from GCES-2018-2/hotfix/PullRequest
arthurbdiniz Oct 10, 2018
dda5cff
Update README.md
trevlewis Oct 10, 2018
63e8d37
Merge pull request #1 from trevlewis/update-readme
trevlewis Oct 10, 2018
40921b4
Update README.md
trevlewis Oct 10, 2018
d5e885c
Merge pull request #80 from trevlewis/develop
arthurbdiniz Oct 11, 2018
a7d7a1a
Improved class categories
hugomartins013 Oct 11, 2018
07e74cf
Put event on hover of notification to hide it
arthurbdiniz Oct 11, 2018
69dfb71
Merge pull request #81 from GCES-2018-2/feature/remove-popup-notifica…
arthurbdiniz Oct 11, 2018
4902f48
Update README.md
sconetto Oct 13, 2018
e7c31aa
Merge pull request #83 from GCES-2018-2/82-readme-update
kairon-v Oct 14, 2018
01a1e27
Updating README.md
sconetto Oct 14, 2018
94511ba
Fixing #84
sconetto Oct 14, 2018
69c65e9
Merge pull request #87 from GCES-2018-2/feature/84-user-edit-dialog
sconetto Oct 16, 2018
ff4f6d3
Merge pull request #88 from GCES-2018-2/3-improved-class-categories
victorcmoura Oct 16, 2018
b1180cb
improve editing form: class and capacity
hugomartins013 Oct 16, 2018
6154c5e
Adds ICC AT rooms
victorcmoura Oct 16, 2018
cf29ec4
Adds ICC BT rooms
victorcmoura Oct 16, 2018
da04066
Adds ICC B1 rooms
victorcmoura Oct 16, 2018
c03d5bc
Adds ICC ANFITEATRO rooms
victorcmoura Oct 16, 2018
08b1699
Adds BSAS rooms
victorcmoura Oct 16, 2018
7c7b2c0
Adds BSAN rooms
victorcmoura Oct 16, 2018
73f4ac7
Restructure routes and views of athentication
arthurbdiniz Oct 16, 2018
0b8046a
improving form position
hugomartins013 Oct 17, 2018
2ae9d3a
Fix bug on user register solicitation
arthurbdiniz Oct 17, 2018
19468ee
Fix cucumber test for session
arthurbdiniz Oct 17, 2018
8eb78f4
Fix session rspec tests
arthurbdiniz Oct 17, 2018
0a6bcbd
Fix rubocop session erros
arthurbdiniz Oct 17, 2018
f0353f3
Merge pull request #93 from GCES-2018-2/feature/92-restructure-routes
arthurbdiniz Oct 17, 2018
e73b13a
Merge pull request #94 from GCES-2018-2/feature/feature/89-improve-cl…
hugomartins013 Oct 18, 2018
120511b
Adds PAT rooms
victorcmoura Oct 18, 2018
a0de5b4
Adds PJC rooms
victorcmoura Oct 18, 2018
c8d38f5
Adds BAES rooms
victorcmoura Oct 18, 2018
4f6cf64
Merge pull request #96 from GCES-2018-2/feature/90-seed-rooms
arthurbdiniz Oct 18, 2018
fdcf8ff
Merge branch 'develop' of https://github.com/GCES-2018-2/SIGS-GCES in…
arthurbdiniz Oct 24, 2018
2c6f116
Adding password visibility toggle
sconetto Oct 25, 2018
6aff07a
Clean migrations
arthurbdiniz Oct 27, 2018
51ecf35
Changing password toggle type
sconetto Oct 29, 2018
dafc03e
Merge pull request #101 from GCES-2018-2/feature/72-password-visibility
arthurbdiniz Oct 29, 2018
7543cc3
Merge pull request #104 from GCES-2018-2/feature/102-clean-migrations
arthurbdiniz Oct 29, 2018
788a211
Makes menu dynamic on clicks
arthurbdiniz Oct 30, 2018
82ca10b
Ajust top menu rules and create rule to permission level 2 on sidemenu
arthurbdiniz Oct 30, 2018
47e8e37
Add rules to level 1 and 0 on sidemenu
arthurbdiniz Oct 30, 2018
215b34b
Ajust permissions != 0 on side menu and change icons
arthurbdiniz Oct 30, 2018
e81c103
Turns subList dynamic with jquery on sidebar
arthurbdiniz Oct 30, 2018
d0f0fc8
Link buttons to correct pages on sidebar
arthurbdiniz Oct 30, 2018
67ad35f
Arrow animation on sidemenu dropdown
arthurbdiniz Oct 30, 2018
1f45fb4
Remove top navigation
arthurbdiniz Oct 30, 2018
dd56438
Adds hamburguer menu to navigation
arthurbdiniz Oct 30, 2018
5a663a2
Fix cucumber test on feature 07
Oct 30, 2018
bf65998
Fix cucumber test on feature 12
Oct 30, 2018
72cc8cf
Fix cucumber test on feature 17
arthurbdiniz Oct 30, 2018
c39780e
Fix cucumber test on feature 14
Oct 30, 2018
cf2300b
Merge branch 'hotfix/homepage' of https://github.com/GCES-2018-2/SIGS…
Oct 30, 2018
878c532
Merge pull request #51 from GCES-2018-2/hotfix/homepage
victorcmoura Oct 30, 2018
a4416d0
Divides seeds.rb into many files
victorcmoura Nov 5, 2018
0d69b79
Merge branch 'develop' of https://github.com/GCES-2018-2/SIGS-GCES in…
victorcmoura Nov 5, 2018
e180147
Creates components for css
arthurbdiniz Nov 5, 2018
ed7f74f
Adds margin and padding components templates and fix dashboard padding
arthurbdiniz Nov 5, 2018
6daea34
Adds home button on sidebar
arthurbdiniz Nov 5, 2018
1e20714
Fixes wrong building id's in seeds.rb
victorcmoura Nov 6, 2018
f474d1e
Fixes wrong id's in create_rooms.rb
victorcmoura Nov 6, 2018
6f56e75
Restructures rooms seeds to avoid code duplication
victorcmoura Nov 6, 2018
656ba19
Merge pull request #115 from GCES-2018-2/bugfix/108-seeds
arthurbdiniz Nov 6, 2018
490a46c
Merge pull request #114 from GCES-2018-2/feature/113-home-button-sidebar
arthurbdiniz Nov 6, 2018
bf815ab
Merge pull request #112 from GCES-2018-2/feature/111-css-components
arthurbdiniz Nov 6, 2018
a214852
Removing duplicated code on allocations
sconetto Nov 6, 2018
22c3ecc
Fixing rubocop warnings
sconetto Nov 6, 2018
746d7fd
Minor update on Code Climate configuration
sconetto Nov 6, 2018
822393a
Fixing allocation_helper functions
sconetto Nov 6, 2018
0b3363b
Fixing rubocop issue
sconetto Nov 6, 2018
7492560
Clean code
Nov 6, 2018
7fa1c40
Merge pull request #121 from GCES-2018-2/bugfix/106-code-duplicity
sconetto Nov 6, 2018
35ef302
Separates sidebar in multiples view and call it using render
arthurbdiniz Nov 8, 2018
522b31a
Creates file for sidebar js
arthurbdiniz Nov 8, 2018
d66cc84
Merge pull request #122 from GCES-2018-2/feature/refactor-sidebar
arthurbdiniz Nov 9, 2018
159e44f
Clean navbar css and modularize html rendering partials
arthurbdiniz Nov 9, 2018
1604d69
Merge pull request #123 from GCES-2018-2/feature/refactor-navbar
arthurbdiniz Nov 9, 2018
8cbc9c0
Organize alert container in one module and rename style
arthurbdiniz Nov 9, 2018
fb58423
Makes rooms table more dynamic with dropdown selector and options
arthurbdiniz Nov 10, 2018
7935c73
Merge pull request #124 from SIGS-UnB/feature/refactor-alert-container
arthurbdiniz Nov 11, 2018
f75659b
Makes a table row into a link on room screen
arthurbdiniz Nov 11, 2018
50fe480
Add pointer click to table row and change hover background color
arthurbdiniz Nov 11, 2018
c889af5
Remove rooms deprecated test
arthurbdiniz Nov 13, 2018
0dc28b0
Fix rooms option dropdown left padding
arthurbdiniz Nov 13, 2018
d9c50cb
Separates rooms filter from rooms index
arthurbdiniz Nov 13, 2018
f486045
Merge pull request #125 from SIGS-UnB/feature/rooms-layout
arthurbdiniz Nov 13, 2018
9814f7a
Applies single responsability principle to reports_disciplines_contro…
victorcmoura Nov 20, 2018
abcc0ea
Removes parser routes from applications
victorcmoura Nov 20, 2018
f450431
Merge pull request #133 from SIGS-UnB/hotfix/130-reports_discipline_s…
arthurbdiniz Nov 20, 2018
d2f2ed3
Merge pull request #132 from SIGS-UnB/bugfix/131-remove-parser-page
arthurbdiniz Nov 20, 2018
70eae19
Create solicitations Helper
Nov 20, 2018
7a7620c
Fix Rubocop issues on solicitation helper
Nov 20, 2018
fdba7bc
Fix error in solicitations controller
Nov 20, 2018
2181447
Add new methods on solicitations helper
Nov 20, 2018
df36d6d
Add missing method on Solicitation helper
Nov 20, 2018
fed4347
Fixing search button bug
sconetto Nov 27, 2018
8be0f0c
Refactoring model class room_solicitation with SOLID principle
hugomartins013 Nov 28, 2018
3241f2f
Refactoring model class solicitation with SOLID principle
hugomartins013 Nov 28, 2018
982afba
Fixing model class solicitation with SOLID principle
hugomartins013 Dec 1, 2018
d32f7e9
Merge pull request #138 from SIGS-UnB/bugfix/105-search-icon-bug
kairon-v Dec 1, 2018
4e5b4c3
Create MatriculaWeb module
victorcmoura Dec 2, 2018
df4bca3
Fixes module integration to rails application
victorcmoura Dec 2, 2018
73b60b7
Adds request feature to MatriculaWeb's module
victorcmoura Dec 2, 2018
1b53ecf
Adds rake task to execute MatriculaWeb's module features
victorcmoura Dec 2, 2018
3be8018
Creates functions to gather all data sources
victorcmoura Dec 2, 2018
ac2ff75
Restructures seed_from_mw files to be executed in the correct order
victorcmoura Dec 2, 2018
60c4222
Adds progress bar structure to all MW seeds
victorcmoura Dec 2, 2018
26b350a
Adds room seeding from mw
victorcmoura Dec 2, 2018
e7d44c9
Adds campi and departments suggested mw seed code to future developers
victorcmoura Dec 2, 2018
3e6fda2
Adds allocations and school room mw seed
victorcmoura Dec 2, 2018
8607b9d
Fixes minor bug with mw seed progress bar
victorcmoura Dec 2, 2018
f3f7574
Adds commented functions to future implementations in MatriculaWeb mo…
victorcmoura Dec 2, 2018
51ed29e
Adds simple documentation to explain to future developers how the mw …
victorcmoura Dec 2, 2018
b0db2b1
Removes json parsing from seeds files
victorcmoura Dec 2, 2018
d0c43c3
Fixes non creation of allocations fetched from MatriculaWeb
victorcmoura Dec 2, 2018
1b2cbbb
Move auxiliary methods to module MatriculaWeb::Utils
victorcmoura Dec 2, 2018
e68026d
Fix width on login particles
arthurbdiniz Dec 2, 2018
2f44702
Merge pull request #141 from SIGS-UnB/feature/140-seed_from_mw
arthurbdiniz Dec 2, 2018
b0d3e66
Fixing model class solicitation with SOLID principle
hugomartins013 Dec 1, 2018
3c06af1
Merge branch 'feature/refactor-solicitation-model' of https://github.…
hugomartins013 Dec 2, 2018
e5909d2
Merge pull request #142 from SIGS-UnB/bugfix/particles-login
kairon-v Dec 3, 2018
cebbf25
Merge pull request #139 from SIGS-UnB/feature/refactor-solicitation-m…
kairon-v Dec 3, 2018
db7d1af
Fix indentation for rubocop on solicitation controller
Nov 20, 2018
382f209
Merge branch 'develop' of https://github.com/GCES-2018-2/SIGS-GCES in…
Dec 3, 2018
da4faf5
Merge pull request #135 from SIGS-UnB/solid-romeu-antunes
victorcmoura Dec 3, 2018
7217168
Merge branch 'develop' of https://github.com/GCES-2018-2/SIGS-GCES in…
Dec 4, 2018
9001d21
Merge pull request #119 from SIGS-UnB/hotfix/cleancode
victorcmoura Dec 4, 2018
579a88e
Sidebar fits all screen #126
arthurbdiniz Dec 4, 2018
54ed37f
Implements watchtower
arthurbdiniz Dec 4, 2018
0f5e64c
Adds homolog docker-compose
arthurbdiniz Dec 4, 2018
0ade90f
Merge pull request #145 from SIGS-UnB/feature/126-sidebar-all-screen
arthurbdiniz Dec 4, 2018
2f14105
Fixing deploy error
sconetto Dec 4, 2018
d8e1953
Fix click bug on rooms/index
Dec 5, 2018
d400e32
Updating links and names references
sconetto Dec 5, 2018
2395561
Fixing #151
sconetto Dec 5, 2018
56b1fd6
Merge pull request #152 from SIGS-UnB/hotfix/issue-144
victorcmoura Dec 5, 2018
365d5fc
Merge pull request #150 from SIGS-UnB/feature/148-homolog-docker-compose
victorcmoura Dec 5, 2018
f01200f
Refactoring controller class user_controllers applying clean code
hugomartins013 Dec 5, 2018
57e86f8
Removes deploy.sh and fix db name
arthurbdiniz Dec 5, 2018
47c2692
Merge branch 'feature/146-watchtower' of https://github.com/GCES-2018…
arthurbdiniz Dec 5, 2018
ada2f9e
Fix init on dockerefile
arthurbdiniz Dec 5, 2018
ef46ef2
Merge pull request #149 from SIGS-UnB/feature/146-watchtower
arthurbdiniz Dec 6, 2018
89ce851
Merge pull request #154 from SIGS-UnB/feature/refact_user_controller_…
sconetto Dec 6, 2018
3da0e96
Remove current behaviour from issue template
Feb 25, 2019
2c71872
Merge pull request #164 from toshitapandey/issue/issue_template
arthurbdiniz Feb 26, 2019
c28f9fd
Changes bootstrap-sass to a newer (and downloadable) version
victorcmoura Apr 4, 2019
f0f9999
Merge branch 'master' of https://github.com/GCES-2018-2/SIGS-GCES int…
arthurbdiniz Apr 4, 2019
566588b
Update docker compose version to 3.7
nukdown Apr 9, 2019
91b5954
Creating a networks on docker-composes of dev, homolog, prod
lucassoaresouza Apr 9, 2019
6d0a5a9
Add maria luiza to gpg file
arthurbdiniz Apr 10, 2019
1b21b22
Changing 'Deletar' redirection
drianne Apr 11, 2019
d1ae410
Linking 'Deletar' button to destroy_room_path
drianne Apr 11, 2019
8943c7d
Merge pull request #170 from SIGS-UnB/feature/168-create-a-network-be…
arthurbdiniz Apr 12, 2019
ad3ca88
Merge pull request #173 from SIGS-UnB/bugfix/144-buttonRedirection
arthurbdiniz Apr 12, 2019
6f12d79
Adding another option to send your key to a keyserver.
mlfaa Apr 13, 2019
71b8e35
Adding tutorial to use GPG Keys
mlfaa Apr 13, 2019
041fd17
Merge branch 'develop' into support/169-document-use-of-gpg-keys
mlfaa Apr 13, 2019
0fae544
Linking controller's destroy method to Deletar button
drianne Apr 15, 2019
f2177f2
Fixing permission condition error
drianne Apr 15, 2019
be0a269
Merge branch 'develop' of https://github.com/SIGS-UnB/core into bugfi…
drianne Apr 15, 2019
9b4fbe7
Change flash with
drianne Apr 15, 2019
d61affe
Fixing writing error in flash message
drianne Apr 15, 2019
92671a3
Changing tutorial details
mlfaa Apr 15, 2019
9a6e3d5
Changing spaces and tabulation to rubocop
drianne Apr 15, 2019
fe64728
Resizing screen of screen profile
mlfaa Apr 16, 2019
7b1fee9
Merge pull request #175 from SIGS-UnB/support/169-document-use-of-gpg…
arthurbdiniz Apr 16, 2019
a68de37
Merge pull request #177 from SIGS-UnB/bugfix/171-deleteRoom
arthurbdiniz Apr 16, 2019
35cf0b6
Merge branch 'develop' into bugfix/110-resize-profile-screen
mlfaa Apr 17, 2019
895aad9
Removing div in edit profile
mlfaa Apr 17, 2019
8f4fad4
Adjusting indentation
mlfaa Apr 17, 2019
1cf5a73
Changing school_rooms table
drianne Apr 17, 2019
c4be53b
Indentate container-edit to the same tab as h1
arthurbdiniz Apr 17, 2019
668bb5b
Merge pull request #179 from SIGS-UnB/bugfix/110-resize-profile-screen
arthurbdiniz Apr 17, 2019
0ac0fd8
Adding new type of branch
drianne Apr 17, 2019
828f968
Merge branch 'develop' of https://github.com/SIGS-UnB/core into impro…
drianne Apr 17, 2019
e3c94e4
Merge pull request #183 from SIGS-UnB/improvement/182-Improvement-as-…
arthurbdiniz Apr 17, 2019
7e95335
Adjusting height from selectors on rooms page filter
mlfaa Apr 17, 2019
cf44911
Add homolog environment on README
Apr 17, 2019
0589d84
Removing unnecessary class
drianne Apr 17, 2019
df5d437
Merge branch 'develop' of https://github.com/SIGS-UnB/core into featu…
drianne Apr 17, 2019
ecc2b93
Merge pull request #187 from SIGS-UnB/support/159-document-homolog-st…
arthurbdiniz Apr 18, 2019
a105c34
Create room_solicitations variable in solicitations_controller
Apr 18, 2019
df3f3f3
Fix words in solicitations views
Apr 18, 2019
0b6bfb3
Merge branch 'develop' into feature/167-update-docker-compose
nukdown Apr 18, 2019
8a340d3
Adding the coverage folder to gitignore and removing the coverage fol…
lucassoaresouza Apr 18, 2019
d6f516f
Merge branch 'develop' into feature/143-Simplify-action-buttons
drianne Apr 18, 2019
35df2a6
Merge pull request #192 from SIGS-UnB/improvement/178-add-coverage-fo…
arthurbdiniz Apr 18, 2019
c4554be
Merge branch 'develop' into feature/143-Simplify-action-buttons
arthurbdiniz Apr 18, 2019
a0d41bb
Merge branch 'develop' into bugfix/158-solicitation-list-not-showing-…
arthurbdiniz Apr 18, 2019
efe74c6
Merge branch 'develop' into feature/167-update-docker-compose
arthurbdiniz Apr 18, 2019
d3be70f
Merge branch 'develop' into improvement/174-rooms-page-filters
arthurbdiniz Apr 18, 2019
d966274
Merge pull request #189 from SIGS-UnB/bugfix/158-solicitation-list-no…
arthurbdiniz Apr 18, 2019
fe01a1b
Merge branch 'develop' into improvement/174-rooms-page-filters
arthurbdiniz Apr 18, 2019
2ab93fb
Merge branch 'develop' into feature/143-Simplify-action-buttons
arthurbdiniz Apr 18, 2019
2c4cca8
Delete form-control on rooms_filter
mlfaa Apr 18, 2019
def3840
Merge branch 'improvement/174-rooms-page-filters' of https://github.c…
mlfaa Apr 18, 2019
fdebd7b
Merge pull request #186 from SIGS-UnB/feature/143-Simplify-action-but…
arthurbdiniz Apr 18, 2019
d0e67d5
Merge branch 'develop' into improvement/174-rooms-page-filters
arthurbdiniz Apr 18, 2019
d29c31b
Merge branch 'develop' into feature/167-update-docker-compose
arthurbdiniz Apr 18, 2019
6777779
Merge pull request #184 from SIGS-UnB/improvement/174-rooms-page-filters
arthurbdiniz Apr 18, 2019
ecd742b
Merge branch 'develop' into feature/167-update-docker-compose
arthurbdiniz Apr 18, 2019
fe221db
Merge pull request #191 from SIGS-UnB/feature/167-update-docker-compose
arthurbdiniz Apr 18, 2019
e36913c
Rollback docker-compose version to 3.4 to deploy
arthurbdiniz Apr 20, 2019
0716524
Add .DS_Store to gitignore
arthurbdiniz Apr 20, 2019
998254b
Joinig .DS_Store to no Other files part
arthurbdiniz Apr 20, 2019
28dac3e
Adding FGA buildings on seeds
lucassoaresouza Apr 25, 2019
9dbf98b
Adding the FGA rooms on the seeds file
lucassoaresouza Apr 25, 2019
b114c99
Refactoring cucumber tests of filter rooms
lucassoaresouza Apr 30, 2019
ec2917b
Updating the scenario test 'filter by name'
lucassoaresouza May 1, 2019
95cc9a5
Updating the scenario test 'filter rooms by code'
lucassoaresouza May 1, 2019
5d77a6d
Solving error on seed of 'galpao' room'
lucassoaresouza May 1, 2019
b07cd80
Updating the scenario test 'filter rooms by wing'
lucassoaresouza May 1, 2019
aef1f98
Updating the scenario test 'filter rooms by wing' using wing with ''
lucassoaresouza May 1, 2019
ad7ff2f
Removing filter room by wing test because the filter is not working
lucassoaresouza May 1, 2019
f7d14a4
Improving logistic of menu
drianne May 1, 2019
c9aba4a
Adding rooms name if school_room is allocated
drianne May 1, 2019
cafabc3
Removing unnecessary css
drianne May 1, 2019
35712ed
Adding main flux in home page
mlfaa May 1, 2019
cda4b8a
Merge pull request #209 from SIGS-UnB/improvement/200-update-the-seed…
mlfaa May 1, 2019
4552268
Merge branch 'develop' into feature/205-main-flux
mlfaa May 1, 2019
c317854
Improving page's layout
drianne May 1, 2019
c285381
Fixing repetition of rooms' name
drianne May 2, 2019
f34cd1d
Linking rooms's information to list
drianne May 2, 2019
c036548
Adding icon to make intuitive
drianne May 2, 2019
8bfbe5b
Change front end from new class page
May 2, 2019
bb15aa4
Changes in the class creation page
May 2, 2019
26e1939
Change in the edit class page
May 2, 2019
a9056b0
Improvement of edit class page
May 2, 2019
7a83c06
Merge pull request #214 from SIGS-UnB/improvement/199-improve-class-c…
lucassoaresouza May 2, 2019
17eb4b3
Merge branch 'develop' into improvement/202-Improve_usability_school_…
lucassoaresouza May 2, 2019
9975bfd
Merge branch 'develop' into feature/205-main-flux
lucassoaresouza May 2, 2019
326d3a9
Merge pull request #211 from SIGS-UnB/improvement/202-Improve_usabili…
lucassoaresouza May 2, 2019
583e76f
Merge branch 'develop' into feature/205-main-flux
lucassoaresouza May 2, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
engines:
duplication:
enabled: true
config:
languages:
- ruby
fixme:
enabled: true
rubocop:
enabled: true
ratings:
paths:
- "SIGS/**.rb"
- "SIGS/"
exclude_paths:
- config/
- spec/
- apps/assets/
76 changes: 76 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# Contributing to SIGS

If you would like to contribute to the project, it may be a good idea to start with the [README](https://github.com/GCES-2018-2/SIGS-GCES/blob/master/README.md) to know more about us.
Another important document that should be read is the [Code of Conduct]().

Thanks for contributing! :tada::+1: Your help will be received with great gratitude!

# How can I contribute?

## Reporting a Bug

* This project follows a [_Issue_](https://github.com/GCES-2018-2/SIGS-GCES/blob/master/.github/ISSUE_TEMPLATE.md) pattern. So if you find a bug, make sure it is not in one of our [_Issues_](https://github.com/GCES-2018-2/SIGS-GCES/issues). Bugs should be marked with _label (tag)_ __bug__.

* If the bug found is not in the _Issues_, just open a [_New Issue_](https://github.com/GCES-2018-2/SIGS-GCES/issues/new).

## Adding and/or modifying some functionality

* First, check that there is no [_Issue_](https://github.com/GCES-2018-2/SIGS-GCES/issues) regarding this modification and/or addition.

* If it does not exist, create a [_New Issue_](https://github.com/GCES-2018-2/SIGS-GCES/issues/new). Give a meaningful title to it, put a description and at least a _label_.

* Changes must be submitted through [_Pull Requests_](https://github.com/GCES-2018-2/SIGS-GCES/compare). You can find more about this in the [_Pull Requests Template_](https://github.com/GCES-2018-2/SIGS-GCES/blob/master/.github/PULL_REQUEST_TEMPLATE.md).

# Commits Pattern

## For standardization we recommend the community to follow our _commit_ style:

* _Commits_ must all be in __English__;

* It should contain a short and objective title of what was done in that _commit_;

* After this title, the commit should describe, with a little more detail, all the activities performed;

* If you are working with an associate, sign on your _commits_ with your partners.

__Example:__

Creating project community files (Shot and objective title)

Adds project license (Description of one of the activities)

Adds project code of conduct file

Adds project contributing file

Adds project issue template file

Adds projects pull request file

Co-authored-by: John Doe <johndoe@mail.com> (Partnership signarute)

# Branch Policy

With the goal of maintaining the completeness and reliability of the project code, the use of branch policy was proposed. This Branches Policy should guide developers in organizing their contributions to the repository.

__Note__: The _branchs_ policy was designed to work in conjunction with the _git flow_ tool, its documentation and more information can be accessed [here](https://github.com/nvie/gitflow).

* __`master`__ - Main branch of the repository where only consolidated and tested software integration will be allowed. This branch will be exclusively for the delivery of realeases, that is, a greater set of functionalities that integrate the software. Here will be the _**stable**_ version of the software.

* __`develop`__ - Branch for the integration of new functionalities, where it will be allowed to deliver the features developed and that are in an advanced stage of completeness. It will be the base branch for the beginning of the development of the features and of the correction of bugs. The releases will also be merged here.

* __`feature/<feature-name>`__ - Branch used for the development of new features. If the feature has been proposed by a _issue_ of the repository and accepted, the name should contain the _issue_ number.
e.g.: `feature/1-<new-feature-name>` (whereas feature has been requested in _issue_ #1)

* __`bugfix/<bug-name>`__ - Branch used to fix low/medium urgency bugs that are not present in the __master__ branch. If the bug has been reported by a _issue_ from the repository the name should contain the _issue_ number.
e.g.: `bugfix/1-<bugfix-name>` (whereas feature has been requested in _issue_ #1)

* __`hotfix/<bug-name>`__ - Branch used to fix high-urgency bugs that are present in the __master__ branch. If the bug has been reported by a _issue_ from the repository the name should contain the _issue_ number.
e.g.: `hotfix/1-<hotfix-name>` (whereas feature has been requested in _issue_ #1)

* __`release/<release-version>`__ - Branch where final adjustments/build will be made prior to delivery of a software product release. Branch name will be the version of the release to be delivered.

* __`support/<theme-or-kind>`__ - Branch where support tasks related to the software will be performed, such as documentation development, configuration management corrections, and so on.

* __`improvement/<improvement-name>`__ - Branch used for the improvement of functionalities or documentation project . If the improvement has been proposed by a _issue_ of the repository, the name should contain the _issue_ number.
e.g.: `improvement/1-<improvement-name>` (whereas feature has been requested in _issue_ #1)
57 changes: 44 additions & 13 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,47 @@
## Descrição do Problema


## Comportamento Esperado


## Comportamento Atual


## Passos Para Reproduzir o Problema

1.
2.
## Problem description
<!--- Provide a general summary of _issue_ in the above title -->
<!--- Forneça um resumo geral da _issue_ no título acima -->

## Expected Behavior
<!--- If you are describing a _bug_, tell us what should happen. -->
<!--- If you are suggesting a change/improvement, tell us how it should work or should be. -->
<!--- Se você está descrevendo um _bug_, conte-nos o que deveria acontecer. -->
<!--- Se você está sugerindo uma mudança/melhoria, conte-nos como deve funcionar ou como deve ser. -->

## Possible Solution
<!--- Not required, but suggest a possible fix/reason for the bug -->
<!--- or ideas on how to implement the addition/change. -->
<!--- Não é obrigatório, mas sugira uma possível correção/razão para o bug -->
<!--- ou ideias de como implementar a adição/mudança. -->

## Step to Reproduce (for _bugs_)
<!--- Forneça um link para um exemplo, ou um conjunto de passos inequívocos -->
<!--- para reproduzir esse _bug_. Inclua código para reproduzir, se relevante. -->
<!--- Provide a link to an example, or a set of unambiguous steps -->
<!--- to reproduce this _bug_. Include code to reproduce, if relevant. -->

1.
2.
3.
4.


## Screenshots
<!--- If relevant, add some screenshots or print screens of the _bug_ -->
<!--- or some prototype for the new addintion/change. -->
<!--- Se relevante, adicione alguns _screenshots_ ou _print screens_ do _bug_ -->
<!--- ou algum protótipo para a nova adição/mudança. -->

## Context
<!--- How does this problem affect you? What are you trying to accomplish? -->
<!--- Providing context helps us find a solution that is most useful in the real world -->
<!--- Como esse problema o afeta? O que você está tentando realizar? -->
<!--- Fornecer o contexto nos ajuda a encontrar uma solução que seja mais útil no mundo real -->

## Your Environment
<!--- Include relevant details about the environment in which you witnessed/experienced the bug. -->
<!--- Inclua detalhes relevantes sobre o ambiente em que você presenciou/experienciou o bug. -->
* Software Version (_Release_):
* Name and version of the browser:
* Name and version of the Operating System (desktop or mobile):
* Link to your project (in case of fork of this project):
50 changes: 34 additions & 16 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,30 +1,48 @@
# Porposed Changes

Make a brief outline of your changes. Make sure you have mentioned the related issue (use a hyperlink).

# Type of Changes

What type of change this Pull Request brings to SIGS? Put an **x** in the boxes that apply
## Proposed Changes
<!--- Make a brief outline of your changes. -->
<!--- Faça um breve resumo de suas mudanças. -->

## _Issue_ Related
<!--- This project only accepts _pull requests_ related to opened _issues_. -->
<!--- If you are suggesting a new _feature_ or change, please discuss in a _issue_ before. -->
<!--- If you are correcting a _bug_, there should be a _issue_ describing it with steps to reproduce. -->
<!--- Please add the link to _issue_ here: -->
<!--- Este projeto apenas aceita _pull requests_ relacionadas à _issues_ abertas. -->
<!--- Se está sugerindo uma nova _feature_ ou mudança, por favor discuta em uma _issue_ antes. -->
<!--- Se está corrigindo um _bug_, deve haver uma _issue_ descrevendo-o com passos para reproduzir. -->
<!--- Por favor, adicione o link para a _issue_ aqui: -->

## Type of Changes
<!--- What type of change this Pull Request brings to SIGS? Put an **x** in the boxes that apply. -->
<!--- Que tipo de mudança o Pull Request traz para o SIGS? Coloque um **x** nas caixas que se aplicam. -->

- [ ] New backend feature or update.
- [ ] New frontend feature or update.
- [ ] Bug fix.
- [ ] Another change (what was the change?).

# Checklist
## How Was This Tested?
<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your test setup and the tests you ran -->
<!--- to see how your change affects other areas of the code, etc. -->
<!--- Por favor, descreva detalhadamente como você testou suas mudanças. -->
<!--- Inclua detalhes do seu ambiente de teste e os testes que você executou -->
<!--- para ver como a sua alteração afeta outras áreas do código, etc. -->

## Checklist
<!--- Put an **x** in the boxes that apply. If you're confused about any of the following topics, ask us. We're here to help you! -->
<!--- Coloque um **x** nas caixas que se aplicam. Se você está confuso sobre qualquer um dos tópicos a seguir, pergunte-nos. Estamos aqui para ajudar você! -->

Put an **x** in the boxes that apply. If you're confused about any of the following topics, ask us. We're here to help you!

- [ ] This Pull Request has a significant name.
- [ ] The commits follow the [[commits policy]].
- [ ] The build is okay (tests, code climate).
- [ ] This Pull Request mentions a related issue.
- [ ] The change was necessary to the progress of the project.

# Screenshots

If necessary, use screenshots to show us your changes on the frontend.

# Further comments
## Screenshots
<!--- If necessary, use screenshots to show us your changes on the frontend. -->
<!--- Se necessário, use capturas de tela para nos mostrar suas alterações no frontend. -->

If you have something more to tell us (questions, explanations, etc) write them down here. We'll answer you as soon as possible.
## Further comments
<!--- If you have something more to tell us (questions, explanations, etc) write them down here. We'll answer you as soon as possible. -->
<!--- Se você tem algo mais para nos dizer (perguntas, explicações, etc) escrava-os aqui. Nós lhe responderemos o mais breve possível. -->
15 changes: 12 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,26 @@
/log/*
/tmp/*
/SIGS/public/reports
/SGIS/public/uploads
!/log/.keep
!/tmp/.keep
!/SIGS/public/reports/.keep

# Ignore Byebug command history file.
.byebug_history

# Ignore the coverage folder
SIGS/coverage/*
SIGS/coverage/

# Other files
.vagrant
.gitignore
SIGS/coverage
SIGS/script/dbScript
SIGS/.generators
SIGS/.rakeTasks
SIGS/db/schema.rb

# Ignore script generated file
/SIGS/start-dev.sh
# Ignore IDE files
.idea/
.DS_Store
61 changes: 38 additions & 23 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,32 +1,47 @@
sudo: true
env:
global:
- CC_TEST_REPORTER_ID=690d2b62e0c4304ed271341a2ed1786a41629b5a50c4c4fc4be8fd3ee6a99f33
language: ruby
rvm:
- 2.3.1
- 2.5.1
services:
- mysql
- mysql
- docker
addons:
ssh_known_hosts:
- 68.183.18.1
before_script:
- cp SIGS/config/database.yml.travis SIGS/config/database.yml
- mysql -e 'create database myapp_test;' -uroot
notifications:
slack: sigs-gces:IISF1PsHHYEWEMomYPJ7KWsi
- cp SIGS/config/database.yml.travis SIGS/config/database.yml
- mysql -e 'create database myapp_test;' -u root
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
- chmod +x ./cc-test-reporter
- ./cc-test-reporter before-build
branches:
only:
- "/.*/"
script:
- cd SIGS
- bundle install
- bundle exec rake db:load_config
- bundle exec rake db:create
- bundle exec rake db:migrate
- rake cucumber
- bundle exec rspec
- rubocop
after_sucess:
- coveralls push
- echo $DOCKERHUB_PASS | docker login -u $DOCKERHUB_USER --password-stdin
- cd SIGS
- bundle install
- bundle exec rake db:load_config
- bundle exec rake db:create
- bundle exec rake db:migrate
- rake cucumber
- bundle exec rspec
- rubocop
after_script:
- ../cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
deploy:
provider: heroku
app: sigsunb
api_key:
secure: Yxxp3xzQ3Vcktw4OOS94+TQkOaSS5fK1nTrNBbInYcqkwZGMfM3kXo0JbrrcJtRolqvr9DETzbC8o8ZJjrdYR51J7mlgaoBEsHNCpuTdzSUXmSBGuHy/8OQgOwebxqJXjx75l3BOmvaMgt+PjNrVCRSDPr9L2qStqBTF94omBz8TXGgfAfcQgVlhp5Obb13pW60ND3dRSI9tWIfs4eBVa0InMjTEOirV2xZ894sh97pVdnxyk4hLItkcWZ/p8UH3mQU4PPhpn157m2eB7ApLW4vtUxmgv3PO742F8ow0U6ZhO0bkBDjdGV80GcP0CsAdx1C6V4P6X/TC862j0nyJPW6JVqiO8t5xBs74l9vn+7a8C2wB3mcWgAxVF6gqQOBPO0lV5Jk6PZSuQyFx3zrJtvVFA8ZV/oaJBNAJsyY6PMvAXcrSfC2O8xCBmKztCC63iGWxVQ2mMKFCy2leqGiB4ZdOjnwBt6WNcNe6PN701y3Xs+6kTIrxTCfKVN6nEemOg/xz5tvPDJyPl7eC5bjPfU7HASIWCNVn/3gzk23FTozqRunbXW6quqpYPNw9P6cSb6VK8h1IAjYFd/2F8TIkHlXwroXuPKT3tdxQZs6Z/70MMRBt28bZr/795uu7CSvrC0wL6yPpPh4V+FrMnvuFQ/pom4NZ7dZyRapjt/OLe2g=
on:
branch: master
run: "rails db:seed"
# Deploy develop on the staging environment
- provider: script
script: bash ../script/staging-deploy.sh
skip_cleanup: true
on:
branch: develop
# Deploy master on the production environment
- provider: script
script: bash ../script/production-deploy.sh
skip_cleanup: true
on:
branch: master
Loading