From 8bd1a5760962b7066914500d99040d38f8b1e31e Mon Sep 17 00:00:00 2001 From: Tanner Welsh Date: Wed, 29 Oct 2014 19:49:21 -0400 Subject: [PATCH 1/3] =?UTF-8?q?User=20can=20add=20skills=20from=20the=20r?= =?UTF-8?q?=C3=A9sum=C3=A9=20show=20page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Note: skills will automatically associate with the `default_user` --- linkedout.rb | 10 ++++++++++ views/resumes/show.erb | 8 ++++++++ 2 files changed, 18 insertions(+) diff --git a/linkedout.rb b/linkedout.rb index 21fed6b..0c8505b 100644 --- a/linkedout.rb +++ b/linkedout.rb @@ -51,6 +51,16 @@ def default_user redirect "/" end +post "/skills" do + skill_attrs = params[:skill] + skill_attrs.merge!({ :user => default_user }) + + skill = Skill.new(skill_attrs) + skill.save + + redirect "/" +end + put "/skills/edit" do skill_attrs = params[:skill] diff --git a/views/resumes/show.erb b/views/resumes/show.erb index d0e9ff8..2158de4 100644 --- a/views/resumes/show.erb +++ b/views/resumes/show.erb @@ -18,6 +18,14 @@

Skills

From ef5a35e62bf1ded3bc30dfda0135ee711aceab2b Mon Sep 17 00:00:00 2001 From: Tanner Welsh Date: Wed, 29 Oct 2014 19:54:01 -0400 Subject: [PATCH 2/3] Move new skill form into partial; edit name of partials --- views/partials/{skill_form.erb => skill_edit.erb} | 2 +- views/partials/skill_new.erb | 7 +++++++ views/resumes/edit.erb | 2 +- views/resumes/show.erb | 8 +------- 4 files changed, 10 insertions(+), 9 deletions(-) rename views/partials/{skill_form.erb => skill_edit.erb} (93%) create mode 100644 views/partials/skill_new.erb diff --git a/views/partials/skill_form.erb b/views/partials/skill_edit.erb similarity index 93% rename from views/partials/skill_form.erb rename to views/partials/skill_edit.erb index 86d0c73..f42ead9 100644 --- a/views/partials/skill_form.erb +++ b/views/partials/skill_edit.erb @@ -1,4 +1,4 @@ -<% skill = skill_form %> +<% skill = skill_edit %>
  • diff --git a/views/partials/skill_new.erb b/views/partials/skill_new.erb new file mode 100644 index 0000000..1d9104e --- /dev/null +++ b/views/partials/skill_new.erb @@ -0,0 +1,7 @@ +
  • + + + + +
  • +
  • diff --git a/views/resumes/edit.erb b/views/resumes/edit.erb index 00d518b..b04a6c1 100644 --- a/views/resumes/edit.erb +++ b/views/resumes/edit.erb @@ -17,7 +17,7 @@

    Skills

      - <%= partial :'partials/skill_form', collection: @skills %> + <%= partial :'partials/skill_edit', collection: @skills %>
    diff --git a/views/resumes/show.erb b/views/resumes/show.erb index 2158de4..5501568 100644 --- a/views/resumes/show.erb +++ b/views/resumes/show.erb @@ -19,13 +19,7 @@ From cae17786f405fce7f4783070515f708ac0e50fdc Mon Sep 17 00:00:00 2001 From: Tanner Welsh Date: Wed, 29 Oct 2014 19:58:06 -0400 Subject: [PATCH 3/3] =?UTF-8?q?Can=20add=20jobs=20from=20r=C3=A9sum=C3=A9?= =?UTF-8?q?=20show=20page;=20edit=20partial=20names?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- linkedout.rb | 10 ++++++++++ views/partials/{job_form.erb => job_edit.erb} | 2 +- views/partials/job_new.erb | 13 +++++++++++++ views/resumes/edit.erb | 2 +- views/resumes/show.erb | 2 ++ 5 files changed, 27 insertions(+), 2 deletions(-) rename views/partials/{job_form.erb => job_edit.erb} (97%) create mode 100644 views/partials/job_new.erb diff --git a/linkedout.rb b/linkedout.rb index 0c8505b..249fadc 100644 --- a/linkedout.rb +++ b/linkedout.rb @@ -40,6 +40,16 @@ def default_user redirect "/" end +post "/jobs" do + job_attrs = params[:job] + job_attrs.merge!({ :user => default_user }) + + job = Job.new(job_attrs) + job.save + + redirect "/" +end + put "/jobs/edit" do job_attrs = params[:job] diff --git a/views/partials/job_form.erb b/views/partials/job_edit.erb similarity index 97% rename from views/partials/job_form.erb rename to views/partials/job_edit.erb index 24efaf0..57bb66a 100644 --- a/views/partials/job_form.erb +++ b/views/partials/job_edit.erb @@ -2,7 +2,7 @@ # When rendering a partial, the collection item takes the name # of the file for the item, so the job object is assigned to # the local variable `job_form` - job = job_form + job = job_edit %>
  • diff --git a/views/partials/job_new.erb b/views/partials/job_new.erb new file mode 100644 index 0000000..8d9a6a9 --- /dev/null +++ b/views/partials/job_new.erb @@ -0,0 +1,13 @@ +
  • + + at + +
    + +
    + +
    + + +
  • +
  • diff --git a/views/resumes/edit.erb b/views/resumes/edit.erb index b04a6c1..83b0c37 100644 --- a/views/resumes/edit.erb +++ b/views/resumes/edit.erb @@ -10,7 +10,7 @@

    Jobs

      - <%= partial :'partials/job_form', collection: @jobs %> + <%= partial :'partials/job_edit', collection: @jobs %>
    diff --git a/views/resumes/show.erb b/views/resumes/show.erb index 5501568..e98509a 100644 --- a/views/resumes/show.erb +++ b/views/resumes/show.erb @@ -11,6 +11,8 @@

    Jobs

      <%= partial :'partials/job', collection: @jobs %> + + <%= partial :'partials/job_new' %>