Code

Bootstrap#69

Code

Open

dmeskis wants to merge 143 commits intoturingschool-projects:masterturingschool-projects/job-tracker:masterfrom KathleenScriver:bootstrapKathleenScriver/job-tracker:bootstrapCopy head branch name to clipboard

+1,339-64

Commits

Commits on Aug 24, 2018

• Wrote category model test

  dmeskis

  committed
  9af5889

  Copy full SHA for 9af5889

• Validates presence of title in category

  dmeskis

  committed
  bc42db1

  Copy full SHA for bc42db1

• Merge pull request #19 from KathleenYruegas/create-new-category#3

  Show description for 1213b1c
  KathleenScriver

  authored
  1213b1c

  Copy full SHA for 1213b1c

• Added user edits job feature test

  dmeskis

  committed
  ce8084a

  Copy full SHA for ce8084a

• Add column_id to jobs db

  dmeskis

  committed
  3442d73

  Copy full SHA for 3442d73

• Rolledback db and fixed category foreign key in jobs

  dmeskis

  committed
  cd73f88

  Copy full SHA for cd73f88

• Added controller functionality for edit page

  dmeskis

  committed
  12bd9b4

  Copy full SHA for 12bd9b4

• Working on passing in the company and category ids into params

  dmeskis

  committed
  4b60610

  Copy full SHA for 4b60610

• Created drop downs in job form, create job test needs to be rewritten

  dmeskis

  committed
  fe036fe

  Copy full SHA for fe036fe

Commits on Aug 25, 2018

• Added user deletes job test

  dmeskis

  committed
  0b6d8d3

  Copy full SHA for 0b6d8d3

• Fixed company job path for delete job test

  dmeskis

  committed
  6fbeae7

  Copy full SHA for 6fbeae7

• Update job passes, create job test passes now

  dmeskis

  committed
  b50adb3

  Copy full SHA for b50adb3

• Merge pull request #20 from KathleenYruegas/update-job#1

  Show description for c4fa9a7
  KathleenScriver

  authored
  c4fa9a7

  Copy full SHA for c4fa9a7

• Merge branch 'master' of https://github.com/KathleenYruegas/job-tracker into delete-job#2

  dmeskis

  committed
  815a0e7

  Copy full SHA for 815a0e7

• ADds category/job model relationships

  

  Kathleen Yruegas

  committed
  5f694ed

  Copy full SHA for 5f694ed

• Adds test for category index

  

  Kathleen Yruegas

  committed
  5e2c4d8

  Copy full SHA for 5e2c4d8

• Adds categories controller

  

  Kathleen Yruegas

  committed
  370dba0

  Copy full SHA for 370dba0

• Delete job test passes

  dmeskis

  committed
  39e5069

  Copy full SHA for 39e5069

• Merge pull request #21 from KathleenYruegas/delete-job#2

  Show description for 065906e
  KathleenScriver

  authored
  065906e

  Copy full SHA for 065906e

• Adds view and index method to controller

  

  Kathleen Yruegas

  committed
  511f434

  Copy full SHA for 511f434

• Merge branch 'master' of github.com:KathleenYruegas/job-tracker into create-category#3

  Show description for 63a2bc0
  

  Kathleen Yruegas

  committed
  63a2bc0

  Copy full SHA for 63a2bc0

• Consolidated index list for jobs and company jobs

  dmeskis

  committed
  8ead00f

  Copy full SHA for 8ead00f

• Update job.rb

  dmeskis

  authored
  4634f21

  Copy full SHA for 4634f21

• Merge pull request #23 from KathleenYruegas/create-category#3

  Show description for 70f8271
  dmeskis

  authored
  70f8271

  Copy full SHA for 70f8271

• Fixed delete function broken by changing index page

  dmeskis

  committed
  190622f

  Copy full SHA for 190622f

• Fixed merge conflicts in routes file

  dmeskis

  committed
  5c053f5

  Copy full SHA for 5c053f5

• Adds test for user to create a new job

  

  Kathleen Yruegas

  committed
  6f17212

  Copy full SHA for 6f17212

• Merge pull request #24 from KathleenYruegas/create-jobs-index#22

  Show description for cec7646
  KathleenScriver

  authored
  cec7646

  Copy full SHA for cec7646

• Merge branch 'master' of github.com:KathleenYruegas/job-tracker into edit-category

  

  Kathleen Yruegas

  committed
  27d2192

  Copy full SHA for 27d2192

Commits on Aug 26, 2018

• Adds new and show views, builds out controller

  

  Kathleen Yruegas

  committed
  db93ce2

  Copy full SHA for db93ce2

• Merge pull request #25 from KathleenYruegas/edit-category

  Show description for 6c28413
  dmeskis

  authored
  6c28413

  Copy full SHA for 6c28413

• Added job comment test

  dmeskis

  committed
  285fe9c

  Copy full SHA for 285fe9c

• Merge branch 'master' of https://github.com/KathleenYruegas/job-tracker into viewing-job-comments#9

  dmeskis

  committed
  0a11c7c

  Copy full SHA for 0a11c7c

• Adds file for edit feature test

  

  Kathleen Yruegas

  committed
  0616e68

  Copy full SHA for 0616e68

• Created Job Comment table

  dmeskis

  committed
  096652a

  Copy full SHA for 096652a

• Adds test for error message for duplicate category name

  

  Kathleen Yruegas

  committed
  eaf7e07

  Copy full SHA for eaf7e07

• Created migration to add job to job comments

  dmeskis

  committed
  d49d6d5

  Copy full SHA for d49d6d5

• Completed job comment model test

  dmeskis

  committed
  e6d337c

  Copy full SHA for e6d337c

• Adds flash notice for duplicate category name

  

  Kathleen Yruegas

  committed
  e9f8f57

  Copy full SHA for e9f8f57

• Wrote feature test for user can see job comments for a job

  dmeskis

  committed
  a0f3883

  Copy full SHA for a0f3883

• Merge pull request #26 from KathleenYruegas/category-error-message

  Show description for 1c1216d
  dmeskis

  authored
  1c1216d

  Copy full SHA for 1c1216d

• Added feature testing for viewing job comments

  dmeskis

  committed
  10c74ab

  Copy full SHA for 10c74ab

• Merge branch 'master' of https://github.com/KathleenYruegas/job-tracker into viewing-job-comments#9

  dmeskis

  committed
  5ee4f9c

  Copy full SHA for 5ee4f9c

• Merge pull request #27 from KathleenYruegas/viewing-job-comments#9

  Show description for 3baff57
  KathleenScriver

  authored
  3baff57

  Copy full SHA for 3baff57

• Adds test to edit category

  

  Kathleen Yruegas

  committed
  e75e6c1

  Copy full SHA for e75e6c1

• Merge branch 'master' of github.com:KathleenYruegas/job-tracker into edit-category#6

  

  Kathleen Yruegas

  committed
  13464f3

  Copy full SHA for 13464f3

• Adds partial for new and edit forms

  

  Kathleen Yruegas

  committed
  17e411c

  Copy full SHA for 17e411c

• Adds edit and update methods to controller

  

  Kathleen Yruegas

  committed
  c44f840

  Copy full SHA for c44f840

• Adds css tags and controller updates to save edit

  

  Kathleen Yruegas

  committed
  8242044

  Copy full SHA for 8242044

• Adds test for an error to an updated

  

  Kathleen Yruegas

  committed
  7f30a9e

  Copy full SHA for 7f30a9e

• Adds test for show page

  

  Kathleen Yruegas

  committed
  4096a11

  Copy full SHA for 4096a11

• Created company contact spec

  dmeskis

  committed
  d264834

  Copy full SHA for d264834

• Working through tests for company contact

  dmeskis

  committed
  a4f8cb9

  Copy full SHA for a4f8cb9

• Merge pull request #28 from KathleenYruegas/edit-category#6

  Show description for e4d34af
  dmeskis

  authored
  e4d34af

  Copy full SHA for e4d34af

• Adds info for category show

  

  Kathleen Yruegas

  committed
  237b673

  Copy full SHA for 237b673

• Fixes merge conflict

  

  Kathleen Yruegas

  committed
  e7ecb93

  Copy full SHA for e7ecb93

• Adds test for edit link on show page

  

  Kathleen Yruegas

  committed
  219d98a

  Copy full SHA for 219d98a

• Finished add company contact, HOLY DAMN

  dmeskis

  committed
  b807b2c

  Copy full SHA for b807b2c

• Fixed merge conflict

  dmeskis

  committed
  875c7d2

  Copy full SHA for 875c7d2

• Merge pull request #29 from KathleenYruegas/create-company-contacts#12

  Show description for 18298a4
  KathleenScriver

  authored
  18298a4

  Copy full SHA for 18298a4

• Removed save and open page

  dmeskis

  committed
  84c7b71

  Copy full SHA for 84c7b71

• Adds categories to existing job tests

  

  Kathleen Yruegas

  committed
  04e9779

  Copy full SHA for 04e9779

• Adds params to Edit from show page

  

  Kathleen Yruegas

  committed
  4c3a5f3

  Copy full SHA for 4c3a5f3

• Added tests and functionality for adding a job comment

  dmeskis

  committed
  1e3f3e5

  Copy full SHA for 1e3f3e5

• Merge pull request #30 from KathleenYruegas/add-a-comment#10

  Show description for 5533ec6
  KathleenScriver

  authored
  5533ec6

  Copy full SHA for 5533ec6

• Fixes merge conflict in Job Model test

  

  Kathleen Yruegas

  committed
  092ce9f

  Copy full SHA for 092ce9f

• Adds categories to test jobs to newly merged tests

  

  Kathleen Yruegas

  committed
  8e1dac6

  Copy full SHA for 8e1dac6

• Fixes merge conflict

  

  Kathleen Yruegas

  committed
  c4991a3

  Copy full SHA for c4991a3

• Merge pull request #31 from KathleenYruegas/category-showpage

  Show description for ebc12a8
  dmeskis

  authored
  ebc12a8

  Copy full SHA for ebc12a8

• Adds Add New Job link to category show page

  

  Kathleen Yruegas

  committed
  46cd415

  Copy full SHA for 46cd415

• Creates test for deleting a catagory

  

  Kathleen Yruegas

  committed
  ddc6769

  Copy full SHA for ddc6769

• Created nav bar

  dmeskis

  committed
  ae97f25

  Copy full SHA for ae97f25

• Merge pull request #32 from KathleenYruegas/links-on-show

  Show description for e83874f
  dmeskis

  authored
  e83874f

  Copy full SHA for e83874f

• Delete index.html.erb_spec.rb

  KathleenScriver

  authored
  fd8b19a

  Copy full SHA for fd8b19a

• Merge pull request #33 from KathleenYruegas/create_navigation_bar

  Show description for d0dbfcf
  KathleenScriver

  authored
  d0dbfcf

  Copy full SHA for d0dbfcf

• Merge branch 'master' of github.com:KathleenYruegas/job-tracker into delete-category

  

  Kathleen Yruegas

  committed
  7c8246d

  Copy full SHA for 7c8246d

• Merges master

  

  Kathleen Yruegas

  committed
  e88950d

  Copy full SHA for e88950d

• adds controller method destroy

  

  Kathleen Yruegas

  committed
  92fa0f1

  Copy full SHA for 92fa0f1

• Adds destroy dependency to categories

  

  Kathleen Yruegas

  committed
  3b0bf79

  Copy full SHA for 3b0bf79

• Adds new category link to job new

  

  Kathleen Yruegas

  committed
  3fecd3f

  Copy full SHA for 3fecd3f

• Merge pull request #34 from KathleenYruegas/delete-category

  Show description for abefa66
  dmeskis

  authored
  abefa66

  Copy full SHA for abefa66

• Adds test for sorting jobs by location

  

  Kathleen Yruegas

  committed
  ced908d

  Copy full SHA for ced908d

• Adds css for testing sorted location

  

  Kathleen Yruegas

  committed
  7dbedb4

  Copy full SHA for 7dbedb4

• Adds test for sorting method

  

  Kathleen Yruegas

  committed
  53cc798

  Copy full SHA for 53cc798

• Adds class method to sort by location

  

  Kathleen Yruegas

  committed
  c72fc39

  Copy full SHA for c72fc39

• Adds database cleaner gem

  

  Kathleen Yruegas

  committed
  324ef38

  Copy full SHA for 324ef38

• Added method tests for job

  dmeskis

  committed
  a8e20d7

  Copy full SHA for a8e20d7

• Refactored some controller logic into a job method

  dmeskis

  committed
  647abae

  Copy full SHA for 647abae

• Updates job controller

  

  Kathleen Yruegas

  committed
  954fbe6

  Copy full SHA for 954fbe6

Commits on Aug 27, 2018

• Fixed job_helpers

  dmeskis

  committed
  a77bfd2

  Copy full SHA for a77bfd2

• Added pluralize method to the word jobs in the dashboard view

  dmeskis

  committed
  b914568

  Copy full SHA for b914568

• Adds sorting by city

  

  Kathleen Yruegas

  committed
  235b444

  Copy full SHA for 235b444

• Merge pull request #35 from KathleenYruegas/fixing_paths

  Show description for 56065ba
  KathleenScriver

  authored
  56065ba

  Copy full SHA for 56065ba

• Updates tests for level of interest counter

  

  Kathleen Yruegas

  committed
  ff7a013

  Copy full SHA for ff7a013

• Adds features test for level of interest count

  

  Kathleen Yruegas

  committed
  66a855c

  Copy full SHA for 66a855c

• Added branch to jobs controller index for sorting jobs by location

  dmeskis

  committed
  d8c9d4c

  Copy full SHA for d8c9d4c

• Merge pull request #36 from KathleenYruegas/sort-by-location

  Show description for 95fa099
  dmeskis

  authored
  95fa099

  Copy full SHA for 95fa099

• Merge branch 'master' into job-count-by-location#17

  KathleenScriver

  authored
  01b07e1

  Copy full SHA for 01b07e1

• Merge pull request #37 from KathleenYruegas/job-count-by-location#17

  Show description for 3b9d48f
  KathleenScriver

  authored
  3b9d48f

  Copy full SHA for 3b9d48f

• Merge branch 'master' of github.com:KathleenYruegas/job-tracker into count-level-of-interest

  

  Kathleen Yruegas

  committed
  09594d2

  Copy full SHA for 09594d2

• Changed our routes file

  dmeskis

  committed
  43772a7

  Copy full SHA for 43772a7

• Fixed forms to not have hidden fields and modified controllers to reflect this change

  dmeskis

  committed
  5ab3658

  Copy full SHA for 5ab3658

• Adds job count by level of interest

  

  Kathleen Yruegas

  committed
  c2d47fb

  Copy full SHA for c2d47fb

• Merge pull request #40 from KathleenYruegas/count-level-of-interest

  Show description for 128b59d
  dmeskis

  authored
  128b59d

  Copy full SHA for 128b59d

• More fixing of controllers/routes

  dmeskis

  committed
  8ed915e

  Copy full SHA for 8ed915e

• Update company_contacts_controller.rb

  KathleenScriver

  authored
  d0d965c

  Copy full SHA for d0d965c

• Update job_comments_controller.rb

  KathleenScriver

  authored
  d55f11f

  Copy full SHA for d55f11f

• Merge pull request #41 from KathleenYruegas/routing#39

  Show description for 8f2677b
  KathleenScriver

  authored
  8f2677b

  Copy full SHA for 8f2677b

Commits on Aug 28, 2018

• Adds sort by interest functionality

  

  Kathleen Yruegas

  committed
  98422a1

  Copy full SHA for 98422a1

• Merge pull request #42 from KathleenYruegas/sort-by-interest

  Show description for 919c885
  dmeskis

  authored
  919c885

  Copy full SHA for 919c885

• Added method for creating company average interest hash

  dmeskis

  committed
  74143f0

  Copy full SHA for 74143f0

• Adds city sort link

  

  Kathleen Yruegas

  committed
  fa23f8a

  Copy full SHA for fa23f8a

• Merge pull request #43 from KathleenYruegas/location-sort-fix

  Show description for 32ccd74
  dmeskis

  authored
  32ccd74

  Copy full SHA for 32ccd74

• Working on view page

  dmeskis

  committed
  a3146f1

  Copy full SHA for a3146f1

• Merge branch 'master' of https://github.com/KathleenYruegas/job-tracker into top-companies-by-interest#16

  dmeskis

  committed
  957c360

  Copy full SHA for 957c360

• Added view and controller function for top companies by interest

  dmeskis

  committed
  7136e1f

  Copy full SHA for 7136e1f

• Changed test to be less hard corded

  dmeskis

  committed
  5e9eebe

  Copy full SHA for 5e9eebe

• Merge pull request #44 from KathleenYruegas/top-companies-by-interest#16

  Show description for 5cf8cb1
  KathleenScriver

  authored
  5cf8cb1

  Copy full SHA for 5cf8cb1

• Adds simplecov

  

  Kathleen Yruegas

  committed
  a29cf9c

  Copy full SHA for a29cf9c

• Merge pull request #45 from KathleenYruegas/add-simple-cov

  Show description for 64a6f0d
  dmeskis

  authored
  64a6f0d

  Copy full SHA for 64a6f0d

• Adds link to make new job

  

  Kathleen Yruegas

  committed
  cd75dfa

  Copy full SHA for cd75dfa

• Adds 1-5 rating in level_of_interest

  

  Kathleen Yruegas

  committed
  b99739d

  Copy full SHA for b99739d

• Removes unneeded comments

  

  Kathleen Yruegas

  committed
  01fe23a

  Copy full SHA for 01fe23a

• Changes how comment context name is on rendered view

  

  Kathleen Yruegas

  committed
  3c1acfe

  Copy full SHA for 3c1acfe

• Removes comments, changes formats

  

  Kathleen Yruegas

  committed
  5b6fb96

  Copy full SHA for 5b6fb96

• Adds test for edit on company show

  

  Kathleen Yruegas

  committed
  271af4f

  Copy full SHA for 271af4f

• adds links to create new company and job

  

  Kathleen Yruegas

  committed
  5c9db41

  Copy full SHA for 5c9db41

• Deletes duplicated show method in Categories controller

  

  Kathleen Yruegas

  committed
  2568d4d

  Copy full SHA for 2568d4d

• Merge pull request #46 from KathleenYruegas/job-index-link

  Show description for a53b6dc
  dmeskis

  authored
  a53b6dc

  Copy full SHA for a53b6dc

• Merge pull request #47 from KathleenYruegas/restrict-job-level-of-interest

  Show description for 97e16d4
  dmeskis

  authored
  97e16d4

  Copy full SHA for 97e16d4

• Merge pull request #49 from KathleenYruegas/delete-dup-show

  Show description for 98bb035
  dmeskis

  authored
  98bb035

  Copy full SHA for 98bb035

• Merge branch 'master' into bug-fixes

  dmeskis

  authored
  80dc26f

  Copy full SHA for 80dc26f

• Merge pull request #48 from KathleenYruegas/bug-fixes

  Show description for 743127d
  KathleenScriver

  authored
  743127d

  Copy full SHA for 743127d

• Removed launchy save and open page

  dmeskis

  committed
  000b629

  Copy full SHA for 000b629

• Adds links to job index page

  

  Kathleen Yruegas

  committed
  c9b5d00

  Copy full SHA for c9b5d00

• Merge pull request #50 from KathleenYruegas/add-links

  Show description for 85a4119
  dmeskis

  authored
  85a4119

  Copy full SHA for 85a4119

• Adds tests for links on job index page

  

  Kathleen Yruegas

  committed
  82560a0

  Copy full SHA for 82560a0

• Removes comments and debugging tools

  

  Kathleen Yruegas

  committed
  e67a326

  Copy full SHA for e67a326

• Removes comments, fixes path helpers

  

  Kathleen Yruegas

  committed
  b4c2c89

  Copy full SHA for b4c2c89

• Merge pull request #51 from KathleenYruegas/test-fixes

  Show description for 41c1266
  dmeskis

  authored
  41c1266

  Copy full SHA for 41c1266

• Merge pull request #52 from KathleenYruegas/remove-comments

  Show description for 692b98f
  dmeskis

  authored
  692b98f

  Copy full SHA for 692b98f

• Merge conflict

  dmeskis

  committed
  8e2d686

  Copy full SHA for 8e2d686

• Integrated bootstrap into our layout

  dmeskis

  committed
  57e89bf

  Copy full SHA for 57e89bf