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

Grupo3 - Sprint 1 #82

Open
wants to merge 37 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
ea5cee1
Bump nokogiri from 1.10.5 to 1.10.8
dependabot[bot] Feb 27, 2020
19ead50
Bump websocket-extensions from 0.1.4 to 0.1.5
dependabot[bot] Jun 6, 2020
cd08b95
Bump rack from 2.0.7 to 2.2.3
dependabot[bot] Jun 25, 2020
ed584a3
Merge pull request #73 from EngSwCIC/dependabot/bundler/rack-2.2.3
icaronr Sep 24, 2020
8d75616
Bump puma from 3.12.1 to 3.12.6
dependabot[bot] Sep 24, 2020
40a5769
Merge pull request #72 from EngSwCIC/dependabot/bundler/websocket-ext…
icaronr Sep 24, 2020
038a318
Merge pull request #74 from EngSwCIC/dependabot/bundler/puma-3.12.6
icaronr Sep 24, 2020
37d96d1
Merge pull request #69 from EngSwCIC/dependabot/bundler/nokogiri-1.10.8
icaronr Sep 24, 2020
7077f57
Issue #30 Cadastro Topico
Andreymazepas Oct 30, 2020
dea6502
Issue #31 Cadastro Pergunta e Resposta
Andreymazepas Oct 30, 2020
1449cb6
Adicionado testes cucumber sprint1
zfortes Oct 30, 2020
c335a4f
faq_issues_34_35_sprint1
brenfeliped Oct 30, 2020
f5b36a1
Merge branch 'brenofeliped' into jose-grupo6
brenfeliped Oct 30, 2020
1721744
Merge remote-tracking branch 'origin/andreymazepas' into jose-grupo6
brenfeliped Oct 30, 2020
20e159f
Implementado spec do faq_controller
alineavila Oct 31, 2020
01c7ac5
Implementado Rspec do model Question
alineavila Oct 31, 2020
a0c810f
Implementado Rspec do model QuestionTopic
alineavila Oct 31, 2020
434b90e
Implementado Rspec da view FAQ
alineavila Oct 31, 2020
beebe83
adicionando estrutura
brenfeliped Nov 13, 2020
75e2eac
Merge branch 'grupo3' of https://github.com/zfortes/secretaria_ppgi i…
brenfeliped Nov 13, 2020
9c4219e
adicionando estrutura
brenfeliped Nov 13, 2020
6d2d5bf
estrutura do faqs
Andreymazepas Nov 13, 2020
0721df5
faqs_suggestions estrutura
brenfeliped Nov 14, 2020
9d25818
Corrigido configuração com o banco
zfortes Nov 15, 2020
16013ca
Configurado para somente um admin alterar um faq
zfortes Nov 15, 2020
88668e5
update faq_suggestions"
brenfeliped Nov 16, 2020
99905a2
adicionado descrição no cucumber do cadastro de topico
alineavila Dec 4, 2020
3b72e9e
Implementado happy path e sad path para o cadastro de topico
alineavila Dec 4, 2020
ee50245
Adicionado alguns sad path, descrições e correções diversas
alineavila Dec 4, 2020
a0cbd42
final_updates
brenfeliped Dec 4, 2020
0974be9
Adicionado rspec para topics
alineavila Dec 5, 2020
2fc0cc6
clean controllers
brenfeliped Dec 5, 2020
765bb42
autenticação
brenfeliped Dec 5, 2020
247b89c
ajustes view
brenfeliped Dec 5, 2020
3dfb6b2
Documentação Rdoc
Andreymazepas Dec 5, 2020
5f1db9a
documentação Rdoc
Andreymazepas Dec 5, 2020
8662502
Merge branch 'grupo3' of https://github.com/zfortes/secretaria_ppgi i…
Andreymazepas Dec 5, 2020
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
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gem 'rails', '~> 5.2.3'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 3.11'
gem 'puma', '~> 3.12'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
Expand Down Expand Up @@ -60,6 +60,7 @@ group :test do
gem 'selenium-webdriver'
# Easy installation and use of chromedriver to run system tests with Chrome
gem 'webdrivers'
gem 'cucumber'
gem 'cucumber-rails', require: false
# database_cleaner is not required, but highly recommended
gem 'database_cleaner'
Expand Down
13 changes: 7 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,13 @@ GEM
multi_json (1.14.1)
multi_test (0.1.2)
nio4r (2.5.2)
nokogiri (1.10.5)
nokogiri (1.10.8)
mini_portile2 (~> 2.4.0)
orm_adapter (0.5.0)
pg (1.1.4)
public_suffix (4.0.1)
puma (3.12.1)
rack (2.0.7)
puma (3.12.6)
rack (2.2.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.3)
Expand Down Expand Up @@ -243,7 +243,7 @@ GEM
selenium-webdriver (>= 3.0, < 4.0)
websocket-driver (0.7.1)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.4)
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)

Expand All @@ -255,13 +255,14 @@ DEPENDENCIES
byebug
capybara (>= 2.15)
coffee-rails (~> 4.2)
cucumber
cucumber-rails
database_cleaner
devise
jbuilder (~> 2.5)
listen (>= 3.0.5, < 3.2)
pg (>= 0.18, < 2.0)
puma (~> 3.11)
puma (~> 3.12)
rails (~> 5.2.3)
rspec-rails
sass-rails (~> 5.0)
Expand All @@ -279,4 +280,4 @@ RUBY VERSION
ruby 2.6.3p62

BUNDLED WITH
1.17.2
2.1.4
3 changes: 3 additions & 0 deletions app/assets/javascripts/faqs.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/faqs_suggestions.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/topics.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
187 changes: 187 additions & 0 deletions app/assets/stylesheets/faqs.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,187 @@
// Place all the styles related to the Faqs controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
/* Sakura.css v1.3.1
* ================
* Minimal css theme.
* Project: https://github.com/oxalorg/sakura/
*/
/* Body */
html {
font-size: 62.5%;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif; }

body {
font-size: 1.8rem;
line-height: 1.618;
max-width: 38em;
margin: auto;
color: #4a4a4a;
background-color: #f9f9f9;
padding: 13px; }

@media (max-width: 684px) {
body {
font-size: 1.53rem; } }

@media (max-width: 382px) {
body {
font-size: 1.35rem; } }

h1, h2, h3, h4, h5, h6 {
line-height: 1.1;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif;
font-weight: 700;
margin-top: 3rem;
margin-bottom: 1.5rem;
overflow-wrap: break-word;
word-wrap: break-word;
-ms-word-break: break-all;
word-break: break-word; }

h1 {
font-size: 2.35em; }

h2 {
font-size: 2.00em; }

h3 {
font-size: 1.75em; }

h4 {
font-size: 1.5em; }

h5 {
font-size: 1.25em; }

h6 {
font-size: 1em; }

p {
margin-top: 0px;
margin-bottom: 2.5rem; }

small, sub, sup {
font-size: 75%; }

hr {
border-color: #1d7484; }

a {
text-decoration: none;
color: #1d7484; }
a:hover {
color: #982c61;
border-bottom: 2px solid #4a4a4a; }
a:visited {
color: #144f5a; }

ul {
padding-left: 1.4em;
margin-top: 0px;
margin-bottom: 2.5rem; }

li {
margin-bottom: 0.4em; }

blockquote {
margin-left: 0px;
margin-right: 0px;
padding-left: 1em;
padding-top: 0.8em;
padding-bottom: 0.8em;
padding-right: 0.8em;
border-left: 5px solid #1d7484;
margin-bottom: 2.5rem;
background-color: #f1f1f1; }

blockquote p {
margin-bottom: 0; }

img, video {
height: auto;
max-width: 100%;
margin-top: 0px;
margin-bottom: 2.5rem; }

/* Pre and Code */
pre {
background-color: #f1f1f1;
display: block;
padding: 1em;
overflow-x: auto;
margin-top: 0px;
margin-bottom: 2.5rem; }

code {
font-size: 0.9em;
padding: 0 0.5em;
background-color: #f1f1f1;
white-space: pre-wrap; }

pre > code {
padding: 0;
background-color: transparent;
white-space: pre; }

/* Tables */
table {
text-align: justify;
width: 100%;
border-collapse: collapse; }

td, th {
padding: 0.5em;
border-bottom: 1px solid #f1f1f1; }

/* Buttons, forms and input */
input, textarea {
border: 1px solid #4a4a4a; }
input:focus, textarea:focus {
border: 1px solid #1d7484; }

textarea {
width: 100%; }

.button, button, input[type="submit"], input[type="reset"], input[type="button"] {
display: inline-block;
padding: 5px 10px;
text-align: center;
text-decoration: none;
white-space: nowrap;
background-color: #1d7484;
color: #f9f9f9;
border-radius: 1px;
border: 1px solid #1d7484;
cursor: pointer;
box-sizing: border-box; }
.button[disabled], button[disabled], input[type="submit"][disabled], input[type="reset"][disabled], input[type="button"][disabled] {
cursor: default;
opacity: .5; }
.button:focus:enabled, .button:hover:enabled, button:focus:enabled, button:hover:enabled, input[type="submit"]:focus:enabled, input[type="submit"]:hover:enabled, input[type="reset"]:focus:enabled, input[type="reset"]:hover:enabled, input[type="button"]:focus:enabled, input[type="button"]:hover:enabled {
background-color: #982c61;
border-color: #982c61;
color: #f9f9f9;
outline: 0; }

textarea, select, input {
color: #4a4a4a;
padding: 6px 10px;
/* The 6px vertically centers text on FF, ignored by Webkit */
margin-bottom: 10px;
background-color: #f1f1f1;
border: 1px solid #f1f1f1;
border-radius: 4px;
box-shadow: none;
box-sizing: border-box; }
textarea:focus, select:focus, input:focus {
border: 1px solid #1d7484;
outline: 0; }

input[type="checkbox"]:focus {
outline: 1px dotted #1d7484; }

label, legend, fieldset {
display: block;
margin-bottom: .5rem;
font-weight: 600; }
3 changes: 3 additions & 0 deletions app/assets/stylesheets/faqs_suggestions.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Place all the styles related to the FaqsSuggestions controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
Loading