From 87a1675cda6b6bce80a1b007b9767cffb20114cc Mon Sep 17 00:00:00 2001 From: Mesi Rendon Date: Fri, 10 Feb 2017 15:13:33 -0500 Subject: [PATCH 01/11] Cambios en estilos de vistas en images --- .gitignore | 1 + app/views/images/_form.html.erb | 16 +++++++++------- app/views/images/index.html.erb | 2 +- app/views/images/new.html.erb | 2 +- app/views/images/show.html.erb | 2 +- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 48fb168..d586603 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ # Ignore Byebug command history file. .byebug_history +.idea/ diff --git a/app/views/images/_form.html.erb b/app/views/images/_form.html.erb index 3fabe7b..7b8481a 100644 --- a/app/views/images/_form.html.erb +++ b/app/views/images/_form.html.erb @@ -1,20 +1,22 @@ <%= form_for(image, :url => comment_images_path(params[:comment_id])) do |f| %> <% if image.errors.any? %> -
-

<%= pluralize(image.errors.count, "error") %> prohibited this image from being saved:

+
+

<%= pluralize(image.errors.count, "error") %> prohibited this image from being saved:

    <% image.errors.full_messages.each do |message| %> -
  • <%= message %>
    • +
  • <%= message %>
    • <% end %>
<% end %> -
- <%= f.label :image %> - <%= f.text_area :image %> -
+
+
+ <%= f.label :image %> + <%= f.text_area :image %> +
+
<%= f.submit %> diff --git a/app/views/images/index.html.erb b/app/views/images/index.html.erb index 031b66c..2dd2f72 100644 --- a/app/views/images/index.html.erb +++ b/app/views/images/index.html.erb @@ -1,6 +1,6 @@

<%= notice %>

-

Images

+

Images

diff --git a/app/views/images/new.html.erb b/app/views/images/new.html.erb index 54da409..5f699b9 100644 --- a/app/views/images/new.html.erb +++ b/app/views/images/new.html.erb @@ -1,4 +1,4 @@ -

New Image

+

New Image

<% if params.has_key?(:comment_id)%> <%= render 'form', image: @image %> diff --git a/app/views/images/show.html.erb b/app/views/images/show.html.erb index 23e266d..5413b2d 100644 --- a/app/views/images/show.html.erb +++ b/app/views/images/show.html.erb @@ -1,4 +1,4 @@ -

<%= notice %>

+

<%= notice %>

Image: From fbe2f67a384df602d519be610837b896a3c2d3f8 Mon Sep 17 00:00:00 2001 From: Mesi Rendon Date: Fri, 10 Feb 2017 15:23:50 -0500 Subject: [PATCH 02/11] Agregar clase para tabla --- app/views/images/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/images/index.html.erb b/app/views/images/index.html.erb index 2dd2f72..295d4c4 100644 --- a/app/views/images/index.html.erb +++ b/app/views/images/index.html.erb @@ -2,7 +2,7 @@

Images

-
+
From 1a8a8f8ac22677ad13fbc8410f146f43663b1415 Mon Sep 17 00:00:00 2001 From: Steven Bustos Beltran Date: Fri, 10 Feb 2017 15:34:48 -0500 Subject: [PATCH 03/11] Update index.html.erb Agregar estilo de tabla --- app/views/comments/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/comments/index.html.erb b/app/views/comments/index.html.erb index 5545d48..7aa0e4c 100644 --- a/app/views/comments/index.html.erb +++ b/app/views/comments/index.html.erb @@ -2,7 +2,7 @@

Comments

-
Image
+
From 4f3dcd264d20461f1674d044b2b429ecfbba98b8 Mon Sep 17 00:00:00 2001 From: Steven Bustos Beltran Date: Fri, 10 Feb 2017 15:35:31 -0500 Subject: [PATCH 04/11] Update show.html.erb Agregar text info --- app/views/comments/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/comments/show.html.erb b/app/views/comments/show.html.erb index d6c665a..890c457 100644 --- a/app/views/comments/show.html.erb +++ b/app/views/comments/show.html.erb @@ -1,6 +1,6 @@

<%= notice %>

-

+

Description: <%= @comment.description %>

From 3567e3034a7af58e5bb0a6c5d4ff7431f853cb29 Mon Sep 17 00:00:00 2001 From: Cristian Date: Fri, 10 Feb 2017 20:51:58 +0000 Subject: [PATCH 05/11] data base setup --- app/views/posts/index.html.erb | 5 +++-- config/database.yml | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/views/posts/index.html.erb b/app/views/posts/index.html.erb index 4e23922..93f9212 100644 --- a/app/views/posts/index.html.erb +++ b/app/views/posts/index.html.erb @@ -13,9 +13,10 @@ + dsadas <% @posts.each do |post| %> - - + + diff --git a/config/database.yml b/config/database.yml index 4ffe105..9f642fb 100644 --- a/config/database.yml +++ b/config/database.yml @@ -23,9 +23,9 @@ default: &default development: <<: *default - database: gitworkflow_development - username: gitworkflow - password: 123456789 + database: gitworkflow_devleopment + + # The specified database role being used to connect to postgres. # To create additional roles in postgres see `$ createuser --help`. From 1e474d6ed0d2d924fa87c146e15e13dbc2d78c87 Mon Sep 17 00:00:00 2001 From: Cristian Date: Fri, 10 Feb 2017 20:55:53 +0000 Subject: [PATCH 06/11] post --- app/views/posts/index.html.erb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/views/posts/index.html.erb b/app/views/posts/index.html.erb index 93f9212..ed2c914 100644 --- a/app/views/posts/index.html.erb +++ b/app/views/posts/index.html.erb @@ -2,7 +2,7 @@

Posts

-
Description
<%= post.name %>
<%= post.name %> <%= post.description %> <%= post.user %> <%= link_to 'Show', post %>
+
@@ -13,9 +13,10 @@ - dsadas <% @posts.each do |post| %> - + + + From 7f7e8df1cea101234fbedd225be48cf877bf0281 Mon Sep 17 00:00:00 2001 From: Cristian Date: Fri, 10 Feb 2017 21:00:27 +0000 Subject: [PATCH 07/11] page bootstrap style --- app/views/pages/index.html.erb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/views/pages/index.html.erb b/app/views/pages/index.html.erb index 182fab2..d731d37 100644 --- a/app/views/pages/index.html.erb +++ b/app/views/pages/index.html.erb @@ -1,8 +1,10 @@

<%= notice %>

-

SE2 UNAL

-

Welcome to our gitworkflow practice

+

SE2 UNAL

+

Welcome to our gitworkflow practice

During this pracrice you will understand the basics of Git workflows

-

<%= link_to 'Users', users_path%>

-

<%= link_to 'Posts', posts_path%>

-

<%= link_to 'Comments', comments_path%>

-

<%= link_to 'Images', images_path%>

+ + +

<%= link_to 'Users', users_path%>

+

<%= link_to 'Posts', posts_path%>

+

<%= link_to 'Comments', comments_path%>

+

<%= link_to 'Images', images_path%>

From 7c38bf46c8712a965840294fc861c0883456bb33 Mon Sep 17 00:00:00 2001 From: Cristian Date: Sat, 11 Feb 2017 00:21:32 +0000 Subject: [PATCH 08/11] my database setup, undo later --- config/database.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/database.yml b/config/database.yml index 4ffe105..34325d5 100644 --- a/config/database.yml +++ b/config/database.yml @@ -23,9 +23,9 @@ default: &default development: <<: *default - database: gitworkflow_development - username: gitworkflow - password: 123456789 + database: gitworkflow_devleopment + # username: gitworkflow + # password: 123456789 # The specified database role being used to connect to postgres. # To create additional roles in postgres see `$ createuser --help`. From b07733ca9193a667c6cc21af8c2a84dddc208331 Mon Sep 17 00:00:00 2001 From: Cristian Date: Sat, 11 Feb 2017 00:33:47 +0000 Subject: [PATCH 09/11] normal config --- config/database.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/database.yml b/config/database.yml index 799c4d7..9ceddf7 100644 --- a/config/database.yml +++ b/config/database.yml @@ -23,10 +23,10 @@ default: &default development: <<: *default - database: gitworkflow_devleopment + database: gitworkflow_development - # username: gitworkflow - # password: 123456789 + username: gitworkflow + password: 123456789 # The specified database role being used to connect to postgres. From 4ebf8555d7d7c7f3a09a2fdf0d53f080acd0aaff Mon Sep 17 00:00:00 2001 From: Wilson_Tellez Date: Fri, 10 Feb 2017 21:01:43 -0500 Subject: [PATCH 10/11] Commit modificando el index en table --- app/views/users/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 5106754..d84ec70 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -2,7 +2,7 @@

Users

-
Name
<%= post.name %> <%= post.description %> <%= post.user %>
+
From 1c1efa1629811727d5da195c485f612633a5f025 Mon Sep 17 00:00:00 2001 From: Wilson_Tellez Date: Fri, 10 Feb 2017 21:11:09 -0500 Subject: [PATCH 11/11] bootstrap modificando show --- app/views/users/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 65d6741..2037cd9 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,6 +1,6 @@

<%= notice %>

-

+

Name: <%= @user.name %>

Name