Add salary range

.env.example

@@ -1,3 +1,5 @@
+API_URL='127.0.0.1:3000/'
+
 # Mailgun 
 # Create a free account at https://app.mailgun.com/new/signup/, Use the sandbox domain SMTP user/pass
 MAILGUN_USERNAME=''

client/components/Jobs/Add.js

@@ -84,6 +84,7 @@ export default connect(mapStateToProps, mapDispatchToProps)(
  initialValues: {
  type: "fulltime",
  experience_range: 100,
+ salary_range: 30,
  remote_available: false,
  recruiter: false,
  description: DESCRIPTION_TEMPLATE

client/components/Jobs/Form/index.js

@@ -12,12 +12,20 @@ export const TYPE_OPTIONS = [
 ];
 
 export const EXPERIENCE_OPTIONS = [
- { label: "", value: "" },
+ { value: "",  label: "" },
  { value: 100, label: "Junior (Learner: 1-3 Years)" },
  { value: 200, label: "Midlevel (Producer: 3-5 Years)" },
  { value: 300, label: "Senior (Multiplier: 5+ Years)" }
 ];
 
+export const SALARY_OPTIONS = [
+ { value: "", label: "" },
+ { value: 30, label: "$30,000 - $50,000" },
+ { value: 50, label: "$50,000 - $80,000" },
+ { value: 80, label: "$80,000 - $100,000" },
+ { value: 100, label: "$100,000+" }
+];
+
 function _getValue(options) {
  return value => {
  const option = options.find(o => o.value === value);
@@ -27,6 +35,7 @@ function _getValue(options) {
 
 export const getType = _getValue(TYPE_OPTIONS);
 export const getExperience = _getValue(EXPERIENCE_OPTIONS);
+export const getSalary = _getValue(SALARY_OPTIONS);
 
 export const CompanyField = props =>
  (<Field
@@ -36,6 +45,7 @@ export const CompanyField = props =>
  label="Company"
  help={companyHelp()}
  />);
+
 export const TypeField = () =>
  (<Field
  name="type"
@@ -52,6 +62,14 @@ export const ExperienceField = () =>
  label="Experience Range"
  />);
 
+export const SalaryField = () =>
+(<Field
+ name="salary_range"
+ component={Dropdown}
+ options={SALARY_OPTIONS}
+ label="Salary Range"
+/>);
+
 const descHelp = () =>
  (<span>
  Tip: You can use{" "}
@@ -100,12 +118,7 @@ export const JobForm = props => {
  <fieldset>
  <legend>Experience and Compensation</legend>
  <ExperienceField />
- <Field
- name="salary_range"
- component={Input}
- type="number"
- label="Salary Range"
- />
+ <SalaryField />
  </fieldset>
  <fieldset>
  <legend>Contact Information</legend>

client/components/Jobs/View.js

@@ -3,7 +3,7 @@ import { Link } from "react-router";
 import { connect } from "react-redux";
 import capitalize from "lodash/capitalize";
 import MarkdownViewer from "../Markdown/Viewer";
-import { getExperience, getType } from "./Form";
+import { getExperience, getType, getSalary } from "./Form";
 
 import { getJob } from "../../actions/jobs";
 import Messages from "../Messages";
@@ -35,13 +35,11 @@ class JobView extends Component {
  className="job-tag job-type"
  title={`${capitalize(job.type)} employment.`}
  >
- {getType(job.type)} @ ${job.salary_range
- .toString()
- .replace(/\B(?=(\d{3})+(?!\d))/g, ",")}/yr
+ {getType(job.type)} @ {getSalary(job.salary_range)}
  </div>
  <div
  className="job-tag job-experience"
- title={`${capitalize(getExperience(job.experience))}`}
+ title={`${capitalize(getSalary(job.salary_range))}`}
  >
  XP: {getExperience(job.experience_range)}
  </div>

server/controllers/job.js

@@ -32,9 +32,8 @@ exports.create = async function(req, res, next) {
  .assert("experience_range", "Please enter a valid experience range.")
  .isInt();
  req
- .assert("salary_range", "Salaries Must be at least $30,000.")
+ .assert("lower_salary", "Please enter a valid salary range.")
  .isInt()
- .gte(30000);
  req
  .assert(
  "remote_available",
@@ -99,7 +98,7 @@ exports.update = async function(req, res, next) {
  req
  .assert("experience_range", "Please enter a valid experience_range")
  .isInt();
- req.assert("salary_range", "Please enter a valid salary_range").isInt();
+ req.assert("salary_range", "Please enter a valid lower_salary").isInt();
  req
  .assert("remote_available", "Please enter a valid remote_available")
  .isBoolean();

server/migrations/20170717195038_company.js → server/db/migrations/20170717195038_company.js

@@ -10,8 +10,8 @@ exports.up = function(knex, Promise) {
 exports.down = function(knex, Promise) {
  return Promise.all([
  knex.schema.table("companies", function(table) {
- table.dropColumn("user_id");
  table.dropForeign("user_id");
+ table.dropColumn("user_id");
  })
  ]);
 };

server/db/migrations/20170815115709_add_salary_range_to_jobs.js

@@ -0,0 +1,21 @@
+exports.up = function(knex, Promise) {
+ return Promise.all([
+ knex("jobs")
+ .whereBetween("salary_range", [30000, 49999])
+ .update({salary_range: 30}),
+ knex("jobs")
+ .whereBetween("salary_range", [50000, 79999])
+ .update({salary_range: 50}),
+ knex("jobs")
+ .whereBetween("salary_range", [80000, 99999])
+ .update({salary_range: 80}),
+ knex("jobs")
+ .whereBetween("salary_range", [100000, 999999])
+ .update({salary_range: 100})
+ ]);
+};
+
+exports.down = function(knex, Promise) {
+ return Promise.all([
+ ]);
+};

server/db/seeds/seed_dev_data.js

@@ -0,0 +1,59 @@
+var bcrypt = require("bcrypt-nodejs");
+
+exports.seed = function (knex, Promise) {
+ return Promise.all([
+ knex('jobs').del().then(),
+ knex('companies').del().then(),
+ knex('users').del().then(),
+ new Promise(function (resolve, reject) {
+ bcrypt.genSalt(10, function (err, salt) {
+ bcrypt.hash('nashdev', salt, null, function (err, hash) {
+ return knex('users').insert([
+ {
+ id: 1,
+ name: 'Nashville Developer',
+ email: 'jobs@nashdev.org',
+ location: 'Nashville',
+ password: hash
+ },
+ ]).then(function () {
+ return knex('companies').insert([
+ {
+ id: 1,
+ name: 'Nashville Company',
+ location: 'Nashville',
+ phone: '(615) 555-5555',
+ size: '20',
+ description: 'We develop software in Nashville.',
+ user_id: 1
+ },
+ ])
+ })
+ .then(function () {
+ return knex('jobs').insert([
+ {
+ id: 1,
+ user_id: 1,
+ company_id: 1,
+ title: "Half Stack Web Developer",
+ description: "Pick your favorite.",
+ status: "open",
+ type: "fulltime",
+ recruiter: false,
+ location: "Nashville",
+ contact_email: "jobs@nashdev.org",
+ contact_website: "jobs.nashdev.org",
+ contact_person: "Dev Jobs",
+ experience_range: 100,
+ salary_range: 40000,
+ remote_available: true
+ }
+ ])
+ })
+ })
+ })
+ })
+ ])
+}
+
+

server/knexfile.js

@@ -11,6 +11,9 @@ module.exports = {
  database: process.env.DB_NAME
  },
  migrations: {
- directory: "./server/migrations"
+ directory: "./db/migrations"
+ },
+ seeds: {
+ directory: './db/seeds'
  }
 };

server/models/Company.js

@@ -1,4 +1,17 @@
 var Bookshelf = require("../config/bookshelf");
+/*
++------------------+--------------------------+-----------------------+
+| Column | Type | Modifiers |
+|------------------+--------------------------+-----------------------|
+| id | integer | |
+| name | character varying(255) | unique |
+| location | character varying(255) | |
+| phone | character varying(255) | |
+| size | text | |
+| description | text | |
+| user_id | integer | references user.id |
++------------------+--------------------------+-----------------------+
+*/
 
 var Company = Bookshelf.Model.extend(
  {

server/models/User.js

@@ -2,6 +2,28 @@ var crypto = require("crypto");
 var bcrypt = require("bcrypt-nodejs");
 var Bookshelf = require("../config/bookshelf");
 
+/*
++-----------------------+--------------------------+--------------+
+| Column | Type | Modifiers |
+|-----------------------+--------------------------+--------------|
+| id | integer | |
+| name | character varying(255) | |
+| email | character varying(255) | unique |
+| password | character varying(255) | |
+| passwordResetToken | character varying(255) | |
+| passwordResetExpires | timestamp with time zone | |
+| gender | character varying(255) | |
+| location | character varying(255) | |
+| website | character varying(255) | |
+| picture | character varying(255) | |
+| facebook | character varying(255) | |
+| github | character varying(255) | |
+| twitter | character varying(255) | |
+| google | character varying(255) | |
+| vk | character varying(255) | |
++-----------------------+--------------------------+--------------+
+*/
+
 var User = Bookshelf.Model.extend({
  tableName: "users",
  hasTimestamps: true,