From c4e8db57ba99eba3d4739b85e14b8030a6477a39 Mon Sep 17 00:00:00 2001 From: Andy Gauge Date: Tue, 5 Apr 2016 08:09:45 -0700 Subject: [PATCH] replaced tabs with two spaces --- app/assets/stylesheets/application.scss | 12 +-- .../stylesheets/bootstrap_backport.scss | 4 +- app/assets/stylesheets/login.scss | 50 +++++------ app/assets/stylesheets/navbar.scss | 14 +-- app/assets/stylesheets/prayers.scss | 22 ++--- app/controllers/concerns/logged_in.rb | 16 ++-- app/controllers/concerns/pageable.rb | 4 +- app/controllers/friends_controller.rb | 60 ++++++------- app/controllers/logins_controller.rb | 44 ++++----- app/controllers/praises_controller.rb | 82 ++++++++--------- app/controllers/prayers_controller.rb | 90 +++++++++---------- app/controllers/users_controller.rb | 54 +++++------ app/models/person.rb | 32 +++---- app/models/post.rb | 2 +- app/models/prayer.rb | 6 +- app/models/user.rb | 12 +-- app/views/friends/index.html.erb | 36 ++++---- app/views/layouts/application.html.erb | 6 +- app/views/logins/new.html.erb | 8 +- app/views/logins/root.html.erb | 48 +++++----- app/views/praises/_new.html.erb | 6 +- app/views/praises/edit.html.erb | 2 +- app/views/praises/index.html.erb | 20 ++--- app/views/prayers/_new.html.erb | 36 ++++---- app/views/prayers/_prayer.html.erb | 18 ++-- app/views/prayers/edit.html.erb | 2 +- app/views/prayers/index.html.erb | 6 +- app/views/shared/_flash.html.erb | 2 +- app/views/shared/nav/_bottom.html.erb | 16 ++-- app/views/shared/nav/_top.html | 34 +++---- app/views/shared/nav/_top_out.html.erb | 38 ++++---- app/views/users/_form.html.erb | 8 +- app/views/users/edit.html.erb | 10 +-- app/views/users/new.html.erb | 16 ++-- app/views/users/show.html.erb | 8 +- 35 files changed, 412 insertions(+), 412 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index a8bb66d..958524e 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1,14 +1,14 @@ @import "*"; .navbar { - background-color: #70A; - border-radius: 0.35rem; + background-color: #70A; + border-radius: 0.35rem; } .nav-item.active { - font-weight: bold; - text-shadow: 2px 2px #408; + font-weight: bold; + text-shadow: 2px 2px #408; } body { - top-padding: 60px; - bottom-padding: 60px; + top-padding: 60px; + bottom-padding: 60px; } diff --git a/app/assets/stylesheets/bootstrap_backport.scss b/app/assets/stylesheets/bootstrap_backport.scss index 9691e8c..5943658 100644 --- a/app/assets/stylesheets/bootstrap_backport.scss +++ b/app/assets/stylesheets/bootstrap_backport.scss @@ -8,7 +8,7 @@ text-decoration: none; } .bg-faded { - background-color: #F7F7F9; + background-color: #F7F7F9; } .navbar-dark .navbar-brand { color: white; @@ -83,7 +83,7 @@ background-color: #0275d8; } .nav>li>a:hover .nav>li>a:focus { - background-color: default; + background-color: default; } .nav>li.nav-item>a.pb-navbar-link:hover, .nav>li.nav-item>a.pb-navbar-link:focus { diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss index 30ec72b..cc84247 100644 --- a/app/assets/stylesheets/login.scss +++ b/app/assets/stylesheets/login.scss @@ -7,51 +7,51 @@ $nav-button-text: #408; .purple-nav { - background-color: $top-purple; - color: #FFF; - font-family: fantasy; - padding: 10px; + background-color: $top-purple; + color: #FFF; + font-family: fantasy; + padding: 10px; } .purple-title { - font-size: 3em; - text-transform: uppercase; - letter-spacing: 1px; + font-size: 3em; + text-transform: uppercase; + letter-spacing: 1px; } .input-fields { - font-family: monospace; - font-size: 1.5em; + font-family: monospace; + font-size: 1.5em; } .btn-purple { - color: $nav-button-text; - font-weight: bold; + color: $nav-button-text; + font-weight: bold; } .gray-boxy { - border-radius: 12px; - border: 1px $nav-button-text; - background: #EEE; - padding: 20px; - width: auto; - font-size: 1.25em; + border-radius: 12px; + border: 1px $nav-button-text; + background: #EEE; + padding: 20px; + width: auto; + font-size: 1.25em; } .afore-main { - min-height: 10px; - font-family: 'Freight Sans Bold', 'Helvetica Neue', 'Segoe UI', 'Malgun Gothic', Meiryo, 'Microsoft JhengHei', helvetica, arial, sans-serif; - //we're stealing facebook's decoration + min-height: 10px; + font-family: 'Freight Sans Bold', 'Helvetica Neue', 'Segoe UI', 'Malgun Gothic', Meiryo, 'Microsoft JhengHei', helvetica, arial, sans-serif; + //we're stealing facebook's decoration } .col-centers { float: none; - margin: 0 auto; + margin: 0 auto; } .footer-links li, .footer-links a { - display: inline-block; - font-size: 1.2em; - color: $nav-button-text; - margin: .5em + display: inline-block; + font-size: 1.2em; + color: $nav-button-text; + margin: .5em } \ No newline at end of file diff --git a/app/assets/stylesheets/navbar.scss b/app/assets/stylesheets/navbar.scss index fce93bb..0c4e0e4 100644 --- a/app/assets/stylesheets/navbar.scss +++ b/app/assets/stylesheets/navbar.scss @@ -1,14 +1,14 @@ .pb-navbar-brand { - font-size: 24px; - color: #FFF; - letter-spacing: 1px; - text-shadow: 2px 4px #408; + font-size: 24px; + color: #FFF; + letter-spacing: 1px; + text-shadow: 2px 4px #408; } .pb-navbar-link { - font-size: 1.1em; - color: #EFE; + font-size: 1.1em; + color: #EFE; } .pb-inline-form { - display: block-inline; + display: block-inline; } \ No newline at end of file diff --git a/app/assets/stylesheets/prayers.scss b/app/assets/stylesheets/prayers.scss index 7860d1a..58887e4 100644 --- a/app/assets/stylesheets/prayers.scss +++ b/app/assets/stylesheets/prayers.scss @@ -9,28 +9,28 @@ min-height: 100%; } .top_padding { - margin-top: 80px; + margin-top: 80px; } .left_most { - margin-left: 80px; + margin-left: 80px; } .right_most { - margin-right: 80px; + margin-right: 80px; } h1.titles { - font-weight: bold; - color: #406; - font-size: 56px; - font-family: cursive; + font-weight: bold; + color: #406; + font-size: 56px; + font-family: cursive; } a { - text-decoration: none; + text-decoration: none; } h1.righted { - text-align: right; + text-align: right; } .bordered { - border-bottom-style: dotted; - border-color: #60A; + border-bottom-style: dotted; + border-color: #60A; } diff --git a/app/controllers/concerns/logged_in.rb b/app/controllers/concerns/logged_in.rb index bc3bb6b..ecada6a 100644 --- a/app/controllers/concerns/logged_in.rb +++ b/app/controllers/concerns/logged_in.rb @@ -1,17 +1,17 @@ # Usage: before_action :select_user_from_login, use @user in controller module LoggedIn - extend ActiveSupport::Concern + extend ActiveSupport::Concern - def select_user_from_login - @user = current_user.becomes(User) - end - def current_user - session[:current_user_id] ? Person.find(session[:current_user_id]) : new_guest_user + def select_user_from_login + @user = current_user.becomes(User) + end + def current_user + session[:current_user_id] ? Person.find(session[:current_user_id]) : new_guest_user end def new_guest_user - Person.find(session[:current_user_id] = Person.create({}).id) + Person.find(session[:current_user_id] = Person.create({}).id) end def slay_current_user - @curent_user = session[:current_user_id] = nil + @curent_user = session[:current_user_id] = nil end end \ No newline at end of file diff --git a/app/controllers/concerns/pageable.rb b/app/controllers/concerns/pageable.rb index 45e4b34..539a9a4 100644 --- a/app/controllers/concerns/pageable.rb +++ b/app/controllers/concerns/pageable.rb @@ -1,8 +1,8 @@ # Usage: @first_collection_enumerable, @second_collection_enumerable = combo_page(Model.finder.association, Model.finder.second_association, page: 1) module Pageable - extend ActiveSupport::Concern + extend ActiveSupport::Concern - def combo_page(first, second, page: 1) + def combo_page(first, second, page: 1) klass = first.new.class first_page = first.order(created_at: :desc).page(page) if first_page.count < klass.per_page && first_page.total_pages == page diff --git a/app/controllers/friends_controller.rb b/app/controllers/friends_controller.rb index e2d8736..12e8dfe 100644 --- a/app/controllers/friends_controller.rb +++ b/app/controllers/friends_controller.rb @@ -1,33 +1,33 @@ class FriendsController < ApplicationController - include LoggedIn - before_action :select_user_from_login + include LoggedIn + before_action :select_user_from_login - def index - new_friend - end - def create - if @p = Person.find_by_email(params[:person][:email]) - @user.friends << @p - else - @user.friends.create(friendly_params) - end - redirect_to friends_path - end - def destroy - if @del_me = @user.friends.find_by_id(params[:id]) - @user.friends.delete(@del_me) - end - redirect_to friends_path - end - def names - render json: (@user.friends.map do |f| {name: f.name, id: f.id};end) - end - - private - def new_friend - @friend = Person.new - end - def friendly_params - params.require(:person).permit(:name, :email) - end + def index + new_friend + end + def create + if @p = Person.find_by_email(params[:person][:email]) + @user.friends << @p + else + @user.friends.create(friendly_params) + end + redirect_to friends_path + end + def destroy + if @del_me = @user.friends.find_by_id(params[:id]) + @user.friends.delete(@del_me) + end + redirect_to friends_path + end + def names + render json: (@user.friends.map do |f| {name: f.name, id: f.id};end) + end + + private + def new_friend + @friend = Person.new + end + def friendly_params + params.require(:person).permit(:name, :email) + end end diff --git a/app/controllers/logins_controller.rb b/app/controllers/logins_controller.rb index 6be25fe..fae5ca1 100644 --- a/app/controllers/logins_controller.rb +++ b/app/controllers/logins_controller.rb @@ -1,25 +1,25 @@ class LoginsController < ApplicationController - include LoggedIn - before_action :select_user_from_login, only: [:new, :root, :show] + include LoggedIn + before_action :select_user_from_login, only: [:new, :root, :show] - def new - end - def show - render "new" - end - def create - @user = User.find_by_email(params[:login][:email]) - if @user && @user.authenticate(params[:login][:password]) - session[:current_user_id] = @user.id - redirect_to prayers_path - else - redirect_to login_path, alert: "Failed to logon" - end - end - def destroy - slay_current_user - redirect_to root_url - end - def root - end + def new + end + def show + render "new" + end + def create + @user = User.find_by_email(params[:login][:email]) + if @user && @user.authenticate(params[:login][:password]) + session[:current_user_id] = @user.id + redirect_to prayers_path + else + redirect_to login_path, alert: "Failed to logon" + end + end + def destroy + slay_current_user + redirect_to root_url + end + def root + end end diff --git a/app/controllers/praises_controller.rb b/app/controllers/praises_controller.rb index e4251e6..0545f15 100644 --- a/app/controllers/praises_controller.rb +++ b/app/controllers/praises_controller.rb @@ -1,45 +1,45 @@ class PraisesController < ApplicationController - include LoggedIn - include Pageable - before_action :select_user_from_login - before_action :new_praise, only: ['index', 'show'] + include LoggedIn + include Pageable + before_action :select_user_from_login + before_action :new_praise, only: ['index', 'show'] - def index - praise_page 1 - end - def show - praise_page params[:id].to_i - render 'index' - end - def create - @praise = Praise.new(praise_param.merge({person_id: @user.id})) - if @praise.save - redirect_to praises_path - else - flash[:alert] = @praise.errors - render 'edit' - end - end - def edit - @praise = find_user_praise || Praise.new({person_id: @user.id}) - end - def update - @praise = find_user_praise - @praise.update!(praise_param) if @praise.present? - redirect_to praises_path - end + def index + praise_page 1 + end + def show + praise_page params[:id].to_i + render 'index' + end + def create + @praise = Praise.new(praise_param.merge({person_id: @user.id})) + if @praise.save + redirect_to praises_path + else + flash[:alert] = @praise.errors + render 'edit' + end + end + def edit + @praise = find_user_praise || Praise.new({person_id: @user.id}) + end + def update + @praise = find_user_praise + @praise.update!(praise_param) if @praise.present? + redirect_to praises_path + end - private - def new_praise - @praise = Praise.new({person_id: @user.id}) - end - def praise_page(num=1) - @praises, @praises_for = combo_page(@user.praises, @user.praises_for, page: num) - end - def find_user_praise - @user.praises.find_by_id(params[:id]) - end - def praise_param - params.require(:praise).permit(:body, :title) - end + private + def new_praise + @praise = Praise.new({person_id: @user.id}) + end + def praise_page(num=1) + @praises, @praises_for = combo_page(@user.praises, @user.praises_for, page: num) + end + def find_user_praise + @user.praises.find_by_id(params[:id]) + end + def praise_param + params.require(:praise).permit(:body, :title) + end end diff --git a/app/controllers/prayers_controller.rb b/app/controllers/prayers_controller.rb index 04bdcbf..3e46f4d 100644 --- a/app/controllers/prayers_controller.rb +++ b/app/controllers/prayers_controller.rb @@ -1,51 +1,51 @@ class PrayersController < ApplicationController - include LoggedIn - include Pageable - before_action :select_user_from_login - before_action :new_prayer, only: ['index', 'show'] + include LoggedIn + include Pageable + before_action :select_user_from_login + before_action :new_prayer, only: ['index', 'show'] - def index - prayer_page - end - def show - prayer_page params[:id].to_i - render layout: false - end - def create - @prayer = @user.prayers.new(prayer_param) - params[:prayer][:for] && @prayer.for << Person.find(params[:prayer][:for]) - if @prayer.save - redirect_to prayers_path - else - flash[:alert] = @prayer.errors - render 'edit' - end - end - def edit - @prayer = find_user_prayer || Prayer.new({person_id: @user.id}) - end - def update - @prayer = find_user_prayer - @prayer.update!(prayer_param) if @prayer.present? - redirect_to prayers_path - end - def complete - @prayer = find_user_prayer - @prayer.complete! if @prayer.present? - redirect_to prayers_path - end - - private - def new_prayer - @prayer = @user.prayers.new(params.permit(prayer: [:body])[:prayer]) - end + def index + prayer_page + end + def show + prayer_page params[:id].to_i + render layout: false + end + def create + @prayer = @user.prayers.new(prayer_param) + params[:prayer][:for] && @prayer.for << Person.find(params[:prayer][:for]) + if @prayer.save + redirect_to prayers_path + else + flash[:alert] = @prayer.errors + render 'edit' + end + end + def edit + @prayer = find_user_prayer || Prayer.new({person_id: @user.id}) + end + def update + @prayer = find_user_prayer + @prayer.update!(prayer_param) if @prayer.present? + redirect_to prayers_path + end + def complete + @prayer = find_user_prayer + @prayer.complete! if @prayer.present? + redirect_to prayers_path + end + + private + def new_prayer + @prayer = @user.prayers.new(params.permit(prayer: [:body])[:prayer]) + end def prayer_page(num=1) @prayers, @prayers_for = combo_page(@user.prayers, @user.prayers_for, page: num) end - def find_user_prayer - @user.prayers.find_by_id(params[:id]) || @user.prayers_for.find_by_id(params[:id]) - end - def prayer_param - params.require(:prayer).permit(:body, :title) - end + def find_user_prayer + @user.prayers.find_by_id(params[:id]) || @user.prayers_for.find_by_id(params[:id]) + end + def prayer_param + params.require(:prayer).permit(:body, :title) + end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index f8b961c..873e7e6 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,31 +1,31 @@ class UsersController < ApplicationController - include LoggedIn - before_action :select_user_from_login, only: [:show, :edit, :update] + include LoggedIn + before_action :select_user_from_login, only: [:show, :edit, :update] - def create - @user = User.new(user_params) - if @user.save - redirect_to user_url - else - render :action => 'edit' - end - end - def new - @user = User.new - end - def show - end - def edit - end - def update - if @user.update(user_params) - @user.update(type: "User") if current_user.guest? - redirect_to user_url - else - render :action => 'edit' - end + def create + @user = User.new(user_params) + if @user.save + redirect_to user_url + else + render :action => 'edit' + end + end + def new + @user = User.new + end + def show + end + def edit + end + def update + if @user.update(user_params) + @user.update(type: "User") if current_user.guest? + redirect_to user_url + else + render :action => 'edit' + end + end + def user_params + params.require(:user).permit(:name, :email, :password) end - def user_params - params.require(:user).permit(:name, :email, :password) - end end diff --git a/app/models/person.rb b/app/models/person.rb index 1e94e98..3449e4b 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -1,21 +1,21 @@ class Person < ActiveRecord::Base - before_save :capitalize_name - has_many :posts - has_many :prayers - has_many :praises - has_and_belongs_to_many :prayers_for, class_name: "Prayer", association_foreign_key: :post_id - has_and_belongs_to_many :praises_for, class_name: "Praise", association_foreign_key: :post_id + before_save :capitalize_name + has_many :posts + has_many :prayers + has_many :praises + has_and_belongs_to_many :prayers_for, class_name: "Prayer", association_foreign_key: :post_id + has_and_belongs_to_many :praises_for, class_name: "Praise", association_foreign_key: :post_id - #TODO: add texting capibility - - def guest? - !self.type - end + #TODO: add texting capibility + + def guest? + !self.type + end - def password; end + def password; end - private - def capitalize_name - self.name = self.name.to_s.titleize - end + private + def capitalize_name + self.name = self.name.to_s.titleize + end end diff --git a/app/models/post.rb b/app/models/post.rb index 060ea0d..f2bc4ce 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -1,5 +1,5 @@ class Post < ActiveRecord::Base - validates :title, presence: true + validates :title, presence: true belongs_to :person has_and_belongs_to_many :for, class_name: "Person" diff --git a/app/models/prayer.rb b/app/models/prayer.rb index b7ff481..1dc33a3 100644 --- a/app/models/prayer.rb +++ b/app/models/prayer.rb @@ -1,6 +1,6 @@ class Prayer < Post - def complete! - self.update!(type: "Praise") - end + def complete! + self.update!(type: "Praise") + end end diff --git a/app/models/user.rb b/app/models/user.rb index 79b0a6f..4543fce 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,11 +1,11 @@ class User < Person - # Users require all fields be filled out, - # and email is unique (used for authentication) - validates :name, presence: true - validates :email, uniqueness: true - has_secure_password + # Users require all fields be filled out, + # and email is unique (used for authentication) + validates :name, presence: true + validates :email, uniqueness: true + has_secure_password - has_and_belongs_to_many :friends, + has_and_belongs_to_many :friends, class_name: "Person", join_table: :friends_users, foreign_key: :user_id, diff --git a/app/views/friends/index.html.erb b/app/views/friends/index.html.erb index e1d62d7..25e5817 100644 --- a/app/views/friends/index.html.erb +++ b/app/views/friends/index.html.erb @@ -1,27 +1,27 @@ <% content_for :page_subtitle do %> - Friends + Friends <% end %>
- - <%# Table Header Row %> - - - - +
nameemail 
+ <%# Table Header Row %> + + + + <% @user.friends.each do |pal| -%> - - - - - + + + + + <% end -%> -
nameemail 
<%= pal.name %><%= pal.email %><%= button_to "Pray", prayers_path, method: "get", form_class: 'form-inline', class: 'btn btn-success btn-block', params: { 'prayer[body]' => "@#{pal.name}" } %> - <%= button_to "Drop", friend_path(pal.id), method: "delete", form_class: 'form-inline', class: 'btn btn-danger btn-block', data: {confirm: "Do you want to excommunicate #{pal.name} from your list of friends?"} %>
<%= pal.name %><%= pal.email %><%= button_to "Pray", prayers_path, method: "get", form_class: 'form-inline', class: 'btn btn-success btn-block', params: { 'prayer[body]' => "@#{pal.name}" } %> + <%= button_to "Drop", friend_path(pal.id), method: "delete", form_class: 'form-inline', class: 'btn btn-danger btn-block', data: {confirm: "Do you want to excommunicate #{pal.name} from your list of friends?"} %>
+
<%= form_for(@friend, url: friends_path, layout: :horizontal) do |friend_form| %> - <%= friend_form.text_field :name %> - <%= friend_form.email_field :email %> - <%= friend_form.submit class: "btn btn-primary" %> + <%= friend_form.text_field :name %> + <%= friend_form.email_field :email %> + <%= friend_form.submit class: "btn btn-primary" %> <% end -%> - + diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 79035d6..250f38a 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -22,12 +22,12 @@
- <%= render 'shared/nav/top' %> + <%= render 'shared/nav/top' %> - <%= yield %> + <%= yield %>
-
 
+
 
<%= render 'shared/nav/bottom' %> diff --git a/app/views/logins/new.html.erb b/app/views/logins/new.html.erb index ff5d446..52da1a3 100644 --- a/app/views/logins/new.html.erb +++ b/app/views/logins/new.html.erb @@ -1,9 +1,9 @@ <% content_for :page_subtitle do %> - Login + Login <% end %> <%= render 'shared/flash' %> <%= form_for :login , url: '/login', layout: :horizontal, label_col: "col-md-4", control_col: "col-md-7" do |login_form| %> - <%= login_form.email_field :email %> - <%= login_form.password_field :password %> - <%= login_form.submit "Log in" %> + <%= login_form.email_field :email %> + <%= login_form.password_field :password %> + <%= login_form.submit "Log in" %> <% end %> \ No newline at end of file diff --git a/app/views/logins/root.html.erb b/app/views/logins/root.html.erb index 9315a33..26436aa 100644 --- a/app/views/logins/root.html.erb +++ b/app/views/logins/root.html.erb @@ -1,36 +1,36 @@ <% content_for :page_subtitle do %> - Join Praybook | Login + Join Praybook | Login <% end %> <% if @user.guest? -%>
-
-

Sign Up

-
Better than free
-
+
+

Sign Up

+
Better than free
+
-
- <%= render 'users/form' %> -
+
+ <%= render 'users/form' %> +
-
-

Not ready?

-
No commitment required -- try it first
-
-
 
-
- Try for free -
-
 
+
+

Not ready?

+
No commitment required -- try it first
+
+
 
+
+ Try for free +
+
 
<% end -%>
-
-
-

Praybook is a prayer tracking website

-

Praybook allows you access to your prayers from any device

-

Update on the go, then prayfully consider them at home

-

Answered prayers become praises, remember them with the rest of your thanksgivings.

-
+
+
+

Praybook is a prayer tracking website

+

Praybook allows you access to your prayers from any device

+

Update on the go, then prayfully consider them at home

+

Answered prayers become praises, remember them with the rest of your thanksgivings.

+
\ No newline at end of file diff --git a/app/views/praises/_new.html.erb b/app/views/praises/_new.html.erb index 5f2538b..14ae4ff 100644 --- a/app/views/praises/_new.html.erb +++ b/app/views/praises/_new.html.erb @@ -1,5 +1,5 @@ <%= form_for(@praise, layout: :horizontal, label_col: "col-sm-4", control_col: "col-sm-8") do |prayer_form| %> - <%= prayer_form.text_field :title, label: 'Praise' %> - <%= prayer_form.text_area :body, label: 'Detail' %> - <%= prayer_form.submit "Thank you Jesus", class: "btn btn-primary btn-lg" %> + <%= prayer_form.text_field :title, label: 'Praise' %> + <%= prayer_form.text_area :body, label: 'Detail' %> + <%= prayer_form.submit "Thank you Jesus", class: "btn btn-primary btn-lg" %> <% end %> \ No newline at end of file diff --git a/app/views/praises/edit.html.erb b/app/views/praises/edit.html.erb index 76366bf..0794e6d 100644 --- a/app/views/praises/edit.html.erb +++ b/app/views/praises/edit.html.erb @@ -1,4 +1,4 @@ <% content_for :page_subtitle do %> - Praise + Praise <% end %> <%= render 'new' %> \ No newline at end of file diff --git a/app/views/praises/index.html.erb b/app/views/praises/index.html.erb index 2891cbf..ce6a8e4 100644 --- a/app/views/praises/index.html.erb +++ b/app/views/praises/index.html.erb @@ -1,19 +1,19 @@ <% content_for :page_subtitle do %> - Praise + Praise <% end %> <%= render 'new' %> <% @praises.each do |praise| %>
-
- -
-
- <%= link_to edit_praise_path(praise), class: 'btn btn-success btn-block', role: 'button' do %> - <%= icon :pencil, library: :font_awesome %> Edit - <% end %> -
+
+ +
+
+ <%= link_to edit_praise_path(praise), class: 'btn btn-success btn-block', role: 'button' do %> + <%= icon :pencil, library: :font_awesome %> Edit + <% end %> +
- <%= panel praise.body, heading: praise.title %> + <%= panel praise.body, heading: praise.title %>
<% end %> \ No newline at end of file diff --git a/app/views/prayers/_new.html.erb b/app/views/prayers/_new.html.erb index e7eab3b..ad54867 100644 --- a/app/views/prayers/_new.html.erb +++ b/app/views/prayers/_new.html.erb @@ -1,20 +1,20 @@ <%= form_for(@prayer, layout: :horizontal, label_col: "col-sm-4", control_col: "col-sm-8") do |prayer_form| %> -
- -
- -
- - - <%= icon :user, library: :font_awesome %> - - - -
-
-
- <%= prayer_form.submit "In Jesus' name", class: "btn btn-primary btn-lg" %> - <% @prayer.for.each do |p| %> - - <% end %> +
+ +
+ +
+ + + <%= icon :user, library: :font_awesome %> + + + +
+
+
+ <%= prayer_form.submit "In Jesus' name", class: "btn btn-primary btn-lg" %> + <% @prayer.for.each do |p| %> + + <% end %> <% end %> diff --git a/app/views/prayers/_prayer.html.erb b/app/views/prayers/_prayer.html.erb index d7c5e53..a6dfd9a 100644 --- a/app/views/prayers/_prayer.html.erb +++ b/app/views/prayers/_prayer.html.erb @@ -1,15 +1,15 @@
-
- <%= button_to "\u2714 Complete", complete_prayer_path(prayer), method: :post , class: 'btn btn-danger btn-block'%> -
-
- <%= link_to edit_prayer_path(prayer), class: 'btn btn-success btn-block', role: 'button' do %> - <%= icon :pencil, library: :font_awesome, class: "fa-lg" %> Edit - <% end %> -
+
+ <%= button_to "\u2714 Complete", complete_prayer_path(prayer), method: :post , class: 'btn btn-danger btn-block'%> +
+
+ <%= link_to edit_prayer_path(prayer), class: 'btn btn-success btn-block', role: 'button' do %> + <%= icon :pencil, library: :font_awesome, class: "fa-lg" %> Edit + <% end %> +
- <%= panel prayer.title %> + <%= panel prayer.title %>
diff --git a/app/views/prayers/edit.html.erb b/app/views/prayers/edit.html.erb index a335fc1..4700d03 100644 --- a/app/views/prayers/edit.html.erb +++ b/app/views/prayers/edit.html.erb @@ -1,4 +1,4 @@ <% content_for :page_subtitle do %> - Edit Prayer + Edit Prayer <% end %> <%= render 'new' %> diff --git a/app/views/prayers/index.html.erb b/app/views/prayers/index.html.erb index cff4ddf..e71ef61 100644 --- a/app/views/prayers/index.html.erb +++ b/app/views/prayers/index.html.erb @@ -1,8 +1,8 @@ <% content_for :page_subtitle do %> - Prayers + Prayers <% end %> <%= render 'new' %>
- <%= render @prayers if @prayers.present? %> - <%= render @prayers_for if @prayers_for.present? %> + <%= render @prayers if @prayers.present? %> + <%= render @prayers_for if @prayers_for.present? %>
diff --git a/app/views/shared/_flash.html.erb b/app/views/shared/_flash.html.erb index 66f8c65..8558044 100644 --- a/app/views/shared/_flash.html.erb +++ b/app/views/shared/_flash.html.erb @@ -1,4 +1,4 @@ <% @css_class_alias = {'alert' => 'bg-danger', 'notice' => 'bg-warning'}; @css_class_alias.default = "bg-info"; %> <% flash.each do |name, msg| -%> - <%= content_tag :p, msg, class: @css_class_alias[name] %> + <%= content_tag :p, msg, class: @css_class_alias[name] %> <% end -%> \ No newline at end of file diff --git a/app/views/shared/nav/_bottom.html.erb b/app/views/shared/nav/_bottom.html.erb index c0a4e7b..f988c30 100644 --- a/app/views/shared/nav/_bottom.html.erb +++ b/app/views/shared/nav/_bottom.html.erb @@ -1,8 +1,8 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/views/shared/nav/_top.html b/app/views/shared/nav/_top.html index 90eabff..64a4b32 100644 --- a/app/views/shared/nav/_top.html +++ b/app/views/shared/nav/_top.html @@ -7,23 +7,23 @@ - <% if @user.guest? && current_page?(root_path)%> <%# If new user display login information on home page%> - \ No newline at end of file diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 3b3a6f9..e45b9d6 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,10 +1,10 @@ <% content_for :page_subtitle do %> - My Account + My Account <% end %>
-

Current User: <%= @user.name %>

+

Current User: <%= @user.name %>

-

Update your information:

- <%= render 'users/form' %> +

Update your information:

+ <%= render 'users/form' %>
\ No newline at end of file