diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index c4c6c1a..383f6a0 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -130,15 +130,14 @@ margin: 0 auto; } section.memberinner { border:1px solid black; -width: 250px; +width: 243px; height: auto; float: left; padding: 4px; } body { color: #000; - font-family: 'Comic Sans MS'; - + font-family: Georgia, serif; background: #ff597d; background: linear-gradient(90deg, rgba(255, 89, 125, 1) 0%, rgba(97, 255, 136, 1) 50%, rgba(237, 83, 129, 1) 100%); font-size:17px; diff --git a/app/views/blogs/new.html.erb b/app/views/blogs/new.html.erb index 999b2df..5515235 100644 --- a/app/views/blogs/new.html.erb +++ b/app/views/blogs/new.html.erb @@ -1,4 +1,4 @@ -

Create your blog!

+

Create your blog!

<%= form_with model: [@member, @blog] do |form| %> <%= form.label :title %>
@@ -18,6 +18,7 @@ <%= form.submit %> <% end %> -
+ + diff --git a/app/views/blogs/show.html.erb b/app/views/blogs/show.html.erb index e587bce..bb4e862 100644 --- a/app/views/blogs/show.html.erb +++ b/app/views/blogs/show.html.erb @@ -1,9 +1,14 @@
+ +<%= link_to "Back", blogmap_index_path %> +
<% if current_user %> <%= link_to "Edit", edit_member_blog_path %> | <%= link_to "New Post", new_member_blog_post_path(@blog.member, @blog) %>


<%= button_to "Destroy", member_blog_path(@blog.member, @blog), - method: :delete, - data: { confirm: "Are you sure?" } %> + data: { + turbo_method: :delete, + turbo_confirm: "Are you sure?" + } %> <% end %> @@ -14,25 +19,27 @@ <%= @blog.description %>
<% @posts.each do |post| %> -
<%= post.created_at %> | - Title: <%= post.post_title %>

- <% if post.icon_image.attached? %> +
<%= post.created_at %> +

<%= post.post_title %> | <%= link_to 'Read', member_blog_post_path(@member, @blog, post) %>

+
<% if post.icon_image.attached? %> <%= image_tag post.icon_image, width: "100", height: "100" %> <% else %> -

No avatar image available.

+

No image available.

<% end %>
Content: - <%= truncate(post.text.to_plain_text, length: 400) %> + <%= truncate(post.text.to_plain_text, length: 100) %>
- <%= link_to 'Show', member_blog_post_path(@member, @blog, post) %> + <% if current_user %> <%= link_to 'Edit', edit_member_blog_post_path(@member, @blog, post) %> <%= link_to 'Destroy', member_blog_post_path(@member, @blog, post), data: { - turbo_method: :delete + turbo_method: :delete, + turbo_confirm: "Are you sure?" } %> <% end %>
+
<% end %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 0c18633..0e93a7c 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -28,7 +28,7 @@ <%= javascript_include_tag "application", "data-turbolinks-track" => true %> - +

An emoji of a computer with kiss marks. K I S S I N G C O M P U T E R

Home | About Me | Pages | pink rss feed logo
diff --git a/app/views/members/show.html.erb b/app/views/members/show.html.erb index c238977..ee7e1ca 100644 --- a/app/views/members/show.html.erb +++ b/app/views/members/show.html.erb @@ -71,5 +71,6 @@

about me...

<%= @member.bio %>
+

diff --git a/app/views/posts/index.html.erb b/app/views/posts/index.html.erb index 8e57ed4..ccc1f74 100644 --- a/app/views/posts/index.html.erb +++ b/app/views/posts/index.html.erb @@ -11,9 +11,9 @@

No avatar image available.

<% end %>
Content: - <%= truncate(post.text.to_plain_text, length: 400) %> + <%= truncate(post.text.to_plain_text, length: 100) %>
- <%= link_to 'Show', member_blog_post_path(@member, @blog, post) %> + <% if current_user %> <%= link_to 'Edit', edit_member_blog_post_path(@member, @blog, post) %> diff --git a/app/views/posts/new.html.erb b/app/views/posts/new.html.erb index 73cbb72..0929e64 100644 --- a/app/views/posts/new.html.erb +++ b/app/views/posts/new.html.erb @@ -1,5 +1,5 @@ -
+

New Post

<%= form_with model: [@member, @blog, @post] do |f| %> diff --git a/app/views/posts/show.html.erb b/app/views/posts/show.html.erb index c9e2d25..deefefe 100644 --- a/app/views/posts/show.html.erb +++ b/app/views/posts/show.html.erb @@ -1,4 +1,4 @@ -Back
+Back
<%= image_tag @post.icon_image if @post.icon_image.attached? %>

Title: diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index bbfd61f..22dd4a7 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -1,10 +1,10 @@

-

Latest Post....

+

Latest....

<% if @latest_post %>

<%= @latest_post.post_title %>

<%=@latest_post.created_at %>

<%= truncate(@latest_post.text.to_plain_text, length: 200) %>

-

By: <%= @latest_post.blog.member.name %> | Blog: <%= @latest_post.blog.title %>

+

By: <%= @latest_post.blog.member.name %> | Category: <%= @latest_post.blog.title %>

<%= link_to 'Read More', member_blog_post_path(@latest_post.blog.member, @latest_post.blog, @latest_post) %> <% else %>

No posts yet.