Skip to content

Commit

Permalink
Upload image with URL
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewcockerham committed Jul 4, 2013
1 parent b4657ba commit 754525d
Show file tree
Hide file tree
Showing 16 changed files with 74 additions and 66 deletions.
2 changes: 0 additions & 2 deletions app/controllers/job_experiences_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ def show
# GET /job_experiences/new
# GET /job_experiences/new.json
def new
#@job_experience = current_user.job_experiences.new
#@job_experience = JobExperience.new
@job_experience = current_user.build_job_experience

respond_to do |format|
Expand Down
9 changes: 2 additions & 7 deletions app/controllers/pages_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,11 @@ def bryan
def dad
end

def david
@data = params[:David_answer]
end

def answer
end

def vip
end

def job_post
end
end

#@data = params[:David_answer]
41 changes: 32 additions & 9 deletions app/controllers/users_controller.rb
Original file line number Diff line number Diff line change
@@ -1,16 +1,39 @@
class UsersController < ApplicationController
def new
@user = User.new(job_experience: JobExperience.new)
#@job_experience = JobExperience.new(:user_id => 1) #current_user.user_id)
#@job_experience.save
# @user = User.new(job_experience: JobExperience.new)
# super
# @user = User.new
end

def create
@user = User.new(params[:user])
if @user.save
redirect_to(@user, notice: "User was successfully created")
else
render :new
end
# super
# @user = User.new(params[:user])
# if @user.save
# redirect_to(@user, notice: "User was successfully created")
#redirect_to(next page from ppt)
# else
# render :new
# end

# from tutorial
# @user = User.new(params[:user])
# if @user.save
# redirect_to @user
# else
# render :action => 'new'
# end

end

# from tutorial
# def update
# super
# @user = User.find(params[:id])
# if @user.update(params[:user])
# redirect_to @user
# else
# render :action => 'edit'
# end
# end

end
7 changes: 7 additions & 0 deletions app/helpers/form_helper.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
module FormHelper
def setup_user(user)
#user.job_experience ||= JobExperience.new
2.times { user.job_experiences.build }
user
end
end
3 changes: 2 additions & 1 deletion app/models/pin.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ class Pin < ActiveRecord::Base
has_attached_file :image, styles: { medium: "320x240>" }

def image_remote_url=(url_value)
self.image = URI.parse(url_value) unless url_value.blank?
self.image = URI.parse(url_value) unless url_value.blank?
super
end

end
7 changes: 6 additions & 1 deletion app/models/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,17 @@ class User < ActiveRecord::Base
attr_accessible :email, :password, :password_confirmation, :remember_me, :name, :hirer, :job_experience_attributes
# attr_accessible :title, :body

# Validations
validates_uniqueness_of :email


# Associations
has_many :pins, :dependent => :destroy
has_many :job_postings, :dependent => :destroy
has_many :job_applications, :dependent => :destroy
has_one :job_experience, :dependent => :destroy

# Nested Attributes
accepts_nested_attributes_for :job_experience
# :allow_destroy => true,
# :reject_if => :all_blank
end
4 changes: 2 additions & 2 deletions app/views/devise/registrations/edit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
<%= f.input :password_confirmation, label: "New Password Confirmation", autocomplete: "off" %>
<%= f.input :current_password %>


<h2> Job Experience </h2>
<%= f.fields_for :job_experience_attributes do |j| %>
<%= j.input :company %>
<%= j.input :job_title %>
<%= j.input :description, as: :text, input_html: { rows: "10" } %>
<%= j.input :start_date, as: :date, discard_day: true %>
<% end %>


<div class="form-actions">
<%= f.submit "Update", class: "btn btn-primary" %>
</div>
Expand Down
6 changes: 1 addition & 5 deletions app/views/devise/registrations/new.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<%= f.input :hirer, as: :boolean %>



<%= f.fields_for :job_experience_attributes do |j| %>
<%= j.input :company %>

Expand All @@ -25,10 +24,7 @@
<%= render "devise/shared/links" %>


<!-- # @job_experience = JobExperience.new(params[:job_experience_id = :user_id])
@job_experience = current_user.job_experiences.new(params[:user_id])
<!--
<div>#f.label :email <br />
#f.email_field :email, :autofocus => true </div>
Expand Down
11 changes: 0 additions & 11 deletions app/views/devise/sessions/new.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,6 @@
<%= f.input :password %>
<%= f.input :remember_me, as: :boolean %>

<!-- ** default stuff for email
<div><%= f.label :email %><br />
<%= f.email_field :email, :autofocus => true %></div>
<div><%= f.label :password %><br />
<%= f.password_field :password %></div>
<% if devise_mapping.rememberable? -%>
<div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
<% end -%>
-->
<div class="form-actions">
<%= f.submit "Sign in", class: "btn btn-primary" %>
</div>
Expand Down
11 changes: 11 additions & 0 deletions app/views/job_experiences/_my_form.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<%= simple_form_for(@user) do |f| %>

<h2> Job Experiences </h2>
<%= f.fields_for :job_experiences_attributes do |j| %>
<div>
<%= j.label :company %>
<%= j.text_field :company %>
</div>
<% end %>

<% end %>
1 change: 0 additions & 1 deletion app/views/layouts/_header.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<div class="nav-collapse collapse">
<ul class='nav'>
<li><%= link_to "Home", root_path %></li>
<li><%= link_to "David", david_path %></li>
<li><%= link_to "About", about_path %></li>
<li><%= link_to "Bryan", bryan_path %></li>
<li><%= link_to "Job Postings", job_postings_path %></li>
Expand Down
3 changes: 0 additions & 3 deletions app/views/pages/answer.html.erb

This file was deleted.

14 changes: 0 additions & 14 deletions app/views/pages/david.html.erb

This file was deleted.

1 change: 0 additions & 1 deletion app/views/pins/_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,3 @@
</div>
<% end %>

<!-- <div class="form-inputs"> </div> -->
11 changes: 11 additions & 0 deletions app/views/users/_form.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<%= simple_form_for(@user) do |f| %>

<h2> Job Experiences </h2>
<%= f.fields_for :job_experiences do |j| %>
<div>
<%= j.label :company %>
<%= j.text_field :company %>
</div>
<% end %>

<% end %>
9 changes: 0 additions & 9 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,10 @@

root :to => 'pages#home'

#get '' => 'pages#home'
#get '/' => 'pages#home'

#get "pages/Bryan"

get 'bryan' => 'pages#bryan'

get 'dad' => 'pages#dad'

get 'david' => 'pages#david'

get 'answer' => 'pages#answer'

get 'vip' => 'pages#vip'

get 'job_post' => 'pages#job_post'
Expand Down

0 comments on commit 754525d

Please sign in to comment.