Update jobs partials and layout

Author: constantine-nikolaou

app/assets/stylesheets/custom.scss

@@ -293,7 +293,24 @@ p.member_profile_invalid {
   margin-top: 25px;
 }
 
-.clear-padding-margin{
+.clear-padding-margin {
   padding:0px;
   margin:0px;
+}
+
+.lb-sm {
+  font-size: 12px;
+}
+
+.lb-md {
+  font-size: 14px;
+}
+
+.lb-lg {
+  font-size: 18px;
+}
+
+.center-content {
+  margin:auto;
+  text-align:center;
 }

app/controllers/jobs_controller.rb

@@ -114,6 +114,15 @@ def approve
     end
   end
 
+  # PATCH/PUT /jobs/1/reject
+  def reject
+    if @job.publish!
+      redirect_to(@job, notice: 'The job is now live.')
+    else
+      render :edit
+    end
+  end
+
   # PATCH/PUT /jobs/1/take_down
   def take_down
     if @job.take_down!

app/models/job.rb

@@ -57,7 +57,7 @@ class Job < ApplicationRecord
     end
 
     event :publish do
-      transitions :from => [:under_review, :disabled], :to => :approved
+      transitions :from => [:under_review, :edited, :disabled], :to => :approved
 
       after do
         unless self.posted_to_slack?
@@ -69,6 +69,10 @@ class Job < ApplicationRecord
       end
     end
 
+    # event :reject do
+    #   transitions :from => [:under_review, :edited, :disabled], :to => :rejected
+    # end
+
     event :modify do
       transitions :from => [:under_review, :approved, :disabled], :to => :edited
     end

app/views/jobs/_admin_job_actions.html.erb

@@ -3,7 +3,7 @@
     <%= link_to("Approve", approve_job_path(job), class: "button button-3d button-small button-green", method: 'put') %>
   </div>
   <div class="button-container">
-    <%= link_to("Reject", approve_job_path(job), class: "button button-3d button-small button-red", method: 'put') %>
+    <%= link_to("Reject", reject_job_path(job), class: "button button-3d button-small button-red", method: 'put') %>
   </div>
 <% elsif job.online? %>
   <div class="button-container">

app/views/jobs/_job_sidebar.html.erb …views/jobs/_job_actions_sidebar.html.erbapp/views/jobs/_job_sidebar.html.erb renamed to app/views/jobs/_job_actions_sidebar.html.erb app/views/jobs/_job_sidebar.html.erb renamed to app/views/jobs/_job_actions_sidebar.html.erb

@@ -0,0 +1,49 @@
+<!-- Sidebar Company
+    ============================================= -->
+<div class="sidebar nobottommargin col_last clearfix visible-lg visible-md">
+  <div class="sidebar-widgets-wrap">
+    <div class="panel">
+      <div class="panel-body">
+        <div class="row">
+          <!-- Display company details -->
+          <div class="col-lg-12 clear-padding-margin">
+            <h3><%= job.company_name %></h3>
+            <strong><%= job.location_name %></strong>
+            
+            <% if @job.online? %>
+              <hr/>
+              <div class="center-content">
+                <%= link_to("Apply for this position", @job.external_link, class: "button button-3d button-small", target: "_blank") %>
+
+                <% unless @job.apply_email.blank? %>
+                  <%= mail_to(@job.apply_email, "Apply via email", class: "button button-3d button-yellow button-small", target: "_blank") %>
+                <% end %>
+              </div>
+            <% end %>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="panel">
+      <div class="panel-body">
+        <div class="row">
+          <!-- Display company details -->
+          <div class="col-lg-12 center-content">
+            <% if @job.online? %>
+              <p>Share this job:</p>
+              <%= link_to("mailto:?subject=Job on MENAdevs&body=Hi, you might be interested in this job I found on MENAdevs #{job_url(@job)}") do %>
+                <%= fa_icon("envelope 2x") %>
+              <% end %>
+              &nbsp;
+              <%= link_to("https://twitter.com/intent/tweet?" + @job.to_text_for_twitter, target: "_blank") do %>
+                <%= fa_icon("twitter 2x") %>
+              <% end %>
+            <% end %>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+<!-- .sidebar company end -->

app/views/jobs/_job_info_sidebar.html.erb

@@ -3,7 +3,6 @@
     <div class="row clearfix">
       <div class="col-md-8 col-xs-12">
         <h1><%= @job.title %></h1>
-        <h2><%= @job.company_name %> <%= location_str(@job) %></h2>
       </div>
     </div>
   </div>
@@ -38,16 +37,15 @@
             <!-- Entry Content
               ============================================= -->
             <div class="entry-content notopmargin">
-              <span class="label label-primary"><%= @job.employment_type.try(:humanize) %></span>
+              <span class="label label-primary lb-md"><%= @job.employment_type.try(:humanize) %></span>
 
-              <span class="label label-primary"><%= @job.experience.try(:humanize) %></span>
+              <span class="label label-primary lb-md"><%= @job.experience.try(:humanize) %></span>
 
-              <span class="label label-primary">Equity or stock options: <%= @job.equity? ? 'Yes' : 'No' %></span>
+              <span class="label label-primary lb-md">Equity or stock options: <%= @job.equity? ? 'Yes' : 'No' %></span>
 
-              <span class="label label-primary">Remote: <%= @job.remote? ? 'Yes' : 'No' %></span>
-              <p>
-                <span class="label label-success"><%= @job.salary_to_s %></span>
-              </p>
+              <span class="label label-primary lb-md">Remote: <%= @job.remote? ? 'Yes' : 'No' %></span>
+              
+              <span class="label label-success lb-md"><%= @job.salary_to_s %></span>
 
               <div class="job-description">
                 <% if @job.description.blank? %>
@@ -60,47 +58,40 @@
             <!-- .entry-content end -->
           </div>
         </div>
-
-              <!-- .actions starts -->
-        <% if @job.online? %>
-          <div class="job-post-user-actions">
-            <div class="col-md-6 col-xs-12">
-              <%= link_to("Apply for this position", @job.external_link, class: "button button-3d", target: "_blank") %>
-
-              <%# unless @job.apply_email.blank? %>
-                <%= mail_to(@job.apply_email, "Apply for this position via email", class: "button button-3d button-yellow button-mini", target: "_blank") %>
-              <%# end %>
-            </div>
-
-            <div class="col-md-6 col-xs-12" style="text-align:right">
-              <p style="margin:0px;">Share this job:</p>
-              <%= link_to("mailto:?subject=Job on MENAdevs&body=Hi, you might be interested in this job I found on MENAdevs #{job_url(@job)}") do %>
-                <%= fa_icon("inbox 2x") %>
-              <% end %>
-              &nbsp;
-              <%= link_to("https://twitter.com/intent/tweet?" + @job.to_text_for_twitter, target: "_blank") do %>
-                <%= fa_icon("twitter 2x") %>
-              <% end %>
-            </div>
-          </div>
-        <% end %>
-      <!-- .actions end -->
       </div>
 
-      <%= render('job_sidebar', job: @job, job_statistics: @job_statistics) %>
+      <%= render('job_info_sidebar', job: @job) %>
 
+      <%= render('job_actions_sidebar', job: @job, job_statistics: @job_statistics) %>
     </div>
   </div>
 </section>
 
 <script type="application/ld+json">
 {
-  "@context": "http://schema.org",
-  "@type": "NewsArticle",
-  "mainEntityOfPage": {
-    "@type": "WebPage",
-    "@id": "https://google.com/article"
+  "@context": "https://schema.org",
+  "@type": "JobPosting",
+  "baseSalary": "<%= @job.from_salary %>",
+  "datePosted": <% if @job.posted_on %>"<%= @job.posted_on.strftime('%Y-%m-%d') %>"<% end %>,
+  "validThrough": <% if @job.expires_on %>"<%= @job.expires_on.strftime('%Y-%m-%d') %>"<% end %>,
+  "description": "<%= @job.description %>",
+  "educationRequirements": "<%= @job.education %>",
+  "employmentType": "<%= @job.employment_type %>",
+  "experienceRequirements": "<%= @job.experience %>",
+  "incentiveCompensation": "<%= @job.equity %>",
+  "industry": "Computer Software",
+  "hiringOrganization": "<%= @job.company_name %>",
+  "jobLocation": {
+    "@type": "Place",
+    "address": {
+      "@type": "Text",
+      "addressCountry": "<%= @job.location_name %>"
+    }
   },
-  "headline": "<%= @job.title %>",
+  "occupationalCategory": "15-1132.00 Software Developers, Application",
+  "qualifications": "Ability to work in a team environment with members of varying skill levels. Highly motivated. Learns quickly.",
+  "responsibilities": "Design and write specifications for tools for in-house customers Build tools according to specifications",
+  "salaryCurrency": "<%= @job.currency %>",
+  "title": "<%= @job.title %>"
 }
 </script>

app/views/jobs/show.html.erb

@@ -128,6 +128,7 @@
     member do
       put :pre_approve
       put :approve
+      put :reject
       put :take_down
       get :feedback
     end

config/routes.rb

@@ -122,7 +122,7 @@
 
       expect(page).to have_content('Test Title')
 
-      expect(page).to have_content('By: ' + user.name)
+      expect(page).to have_content('By ' + user.name)
 
       expect(page).to have_content('Submit for approval')
       expect(page).to have_content('Edit')
@@ -139,7 +139,7 @@
       visit(job_path(@job))
 
       expect(page).to have_content(@job.title)
-      expect(page).to have_content('Tell a friend')
+      expect(page).to have_content('Share this job:')
       expect(page).to_not have_content('Statistics')
     end
 
@@ -224,14 +224,13 @@
       visit(job_path(@draft_job))
 
       expect(page).to have_content(@draft_job.title)
-      expect(page).to_not have_content('Tell a friend')
+      expect(page).to_not have_content('Share this job')
       expect(page).to have_content('Edit')
 
       click_on('Submit for approval', match: :first)
-
-      expect(page).to have_content('Job is under review')
+      expect(page).to have_content('Pending Approval')
       expect(page).to have_content('The job post was successfully submitted for approval before made public.')
-      expect(page).to_not have_content('Tell a friend')
+      expect(page).to_not have_content('Share this job')
     end
   end
 
@@ -250,13 +249,13 @@
 
       expect(page).to have_content(@pending_job.title)
       # not approved yet
-      expect(page).to_not have_content('Tell a friend')
+      expect(page).to_not have_content('Share this job:')
 
       click_on('Approve', match: :first)
 
       expect(page).to have_content('The job is now live.')
       expect(page).to have_content('Take down')
-      expect(page).to have_content('Tell a friend')
+      expect(page).to have_content('Share this job:')
       expect(page).to have_content('Statistics')
     end
 
@@ -266,8 +265,8 @@
 
       expect(page).to have_content(@pending_job.title)
       # not approved yet
-      expect(page).to_not have_content('Tell a friend')
-      expect(page).to have_content('Job is under review')
+      expect(page).to_not have_content('Share this job:')
+      expect(page).to have_content('Pending Approval')
       expect(page).to have_content('Edit')
 
       expect(page).to_not have_content('Approve')
@@ -288,13 +287,13 @@
       visit(job_path(@approved_job))
 
       expect(page).to have_content(@approved_job.title)
-      expect(page).to have_content('Tell a friend')
+      expect(page).to have_content('Share this job:')
       expect(page).to have_content('Statistics')
 
       click_on('Take down', match: :first)
 
       expect(page).to have_content('The job is no longer published.')
-      expect(page).to_not have_content('Tell a friend')
+      expect(page).to_not have_content('Share this job:')
     end
   end
 

spec/requests/jobs_spec.rb

@@ -12,7 +12,7 @@
     before do
       visit new_user_session_path
 
-      expect(page).to have_content('Personal email and password')
+      expect(page).to have_content('Login with your email and password')
       expect(page).to have_content('Email')
       expect(page).to have_content('Password')
     end
@@ -60,9 +60,9 @@
 
       click_on('Send me reset password instructions')
 
-      expect(page).to have_content("Use ONE of the login options below to login")
+      expect(page).to have_content("Use any of the login options below to login")
       expect(page).to have_content("MENAdevs Slack credentials")
-      expect(page).to have_content("Personal email and password")
+      expect(page).to have_content("Login with your email and password")
     end
   end
 
@@ -125,7 +125,7 @@
     before do
       visit new_user_session_path
 
-      expect(page).to have_content('Personal email and password')
+      expect(page).to have_content('Login with your email and password')
       expect(page).to have_content('Email')
       expect(page).to have_content('Password')
     end