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/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

- +
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 %>

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:

<% 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..295d4c4 100644 --- a/app/views/images/index.html.erb +++ b/app/views/images/index.html.erb @@ -1,8 +1,8 @@

<%= notice %>

-

Images

+

Images

-
Description
+
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: 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%>

diff --git a/app/views/posts/index.html.erb b/app/views/posts/index.html.erb index 4e23922..ed2c914 100644 --- a/app/views/posts/index.html.erb +++ b/app/views/posts/index.html.erb @@ -2,7 +2,7 @@

Posts

-
Image
+
@@ -14,8 +14,10 @@ <% @posts.each do |post| %> - - + + + + 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.name %> <%= post.description %> <%= post.user %> <%= link_to 'Show', post %>
+
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 %>

diff --git a/config/database.yml b/config/database.yml index 4ffe105..9ceddf7 100644 --- a/config/database.yml +++ b/config/database.yml @@ -24,8 +24,10 @@ default: &default development: <<: *default database: gitworkflow_development - username: gitworkflow - password: 123456789 + + username: gitworkflow + password: 123456789 + # The specified database role being used to connect to postgres. # To create additional roles in postgres see `$ createuser --help`.
Name