Skip to content

Commit

Permalink
replaced tabs with two spaces
Browse files Browse the repository at this point in the history
  • Loading branch information
AndyGauge committed Apr 5, 2016
1 parent 7d40de5 commit c4e8db5
Show file tree
Hide file tree
Showing 35 changed files with 412 additions and 412 deletions.
12 changes: 6 additions & 6 deletions 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;
}
4 changes: 2 additions & 2 deletions app/assets/stylesheets/bootstrap_backport.scss
Expand Up @@ -8,7 +8,7 @@
text-decoration: none;
}
.bg-faded {
background-color: #F7F7F9;
background-color: #F7F7F9;
}
.navbar-dark .navbar-brand {
color: white;
Expand Down Expand Up @@ -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 {
Expand Down
50 changes: 25 additions & 25 deletions app/assets/stylesheets/login.scss
Expand Up @@ -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
}
14 changes: 7 additions & 7 deletions 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;
}
22 changes: 11 additions & 11 deletions app/assets/stylesheets/prayers.scss
Expand Up @@ -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;
}

16 changes: 8 additions & 8 deletions 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
4 changes: 2 additions & 2 deletions 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
Expand Down
60 changes: 30 additions & 30 deletions 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
44 changes: 22 additions & 22 deletions 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

0 comments on commit c4e8db5

Please sign in to comment.