Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Matt Peters and JP Lynch #55

Open
wants to merge 93 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
302c70c
fix initial errors
Jul 7, 2018
787c6a8
Merge pull request #1 from JPLynch35/initial-errors
wehttamclan Jul 7, 2018
6d890cd
verified existing tests
Jul 7, 2018
9b23673
adds feature test
Jul 7, 2018
82c8a7f
adds Add Job link to companies jobs page
Jul 7, 2018
28e670d
Merge pull request #2 from JPLynch35/initial-tests
wehttamclan Jul 7, 2018
e605b8e
Add feature test and functionality for jobs edit
JPLynch35 Jul 7, 2018
3b809db
Add feature test and functionality for job delete
JPLynch35 Jul 7, 2018
e1e44ef
adds tests for incomplete form cases
JPLynch35 Jul 7, 2018
fb1a2ea
Merge pull request #4 from JPLynch35/setup
JPLynch35 Jul 7, 2018
7231ee3
Merge pull request #5 from JPLynch35/development
JPLynch35 Jul 7, 2018
ce29c63
WIP categories
Jul 8, 2018
ba7e49b
Merge pull request #6 from JPLynch35/categories
wehttamclan Jul 8, 2018
c9ed8e2
Add job routes
JPLynch35 Jul 8, 2018
deb8ed9
Add new routes for jobs
JPLynch35 Jul 8, 2018
825807d
Fix tests for new routes
JPLynch35 Jul 8, 2018
ae5449f
adds setup methods in tests
JPLynch35 Jul 8, 2018
55d55cf
Merge pull request #7 from JPLynch35/fix-tests
JPLynch35 Jul 8, 2018
959446d
created edit and update method
Jul 8, 2018
9adf522
adds edit.html.rb
Jul 8, 2018
345bf24
finished categories
Jul 8, 2018
21d8c8d
Merge pull request #8 from JPLynch35/categories
wehttamclan Jul 8, 2018
f101498
adds sort jobs by location
Jul 8, 2018
de85a4e
Merge pull request #9 from JPLynch35/analysis
wehttamclan Jul 8, 2018
2ba2862
adds sort funtionality for location and interest
Jul 8, 2018
204121d
Merge pull request #10 from JPLynch35/analysis
wehttamclan Jul 8, 2018
cd15583
reformat
Jul 8, 2018
f3951ec
Merge branch 'development' of https://github.com/JPLynch35/job-tracke…
Jul 8, 2018
058ec2e
updated jobs controller with .includes
Jul 8, 2018
d1dc348
Merge pull request #11 from JPLynch35/analysis
wehttamclan Jul 8, 2018
df82368
Adds count of jobs by interest level
JPLynch35 Jul 8, 2018
6301d65
Adds top 3 companies ranked by interest on dashboard
JPLynch35 Jul 8, 2018
21e400b
create contacts model and form on company show page
Jul 8, 2018
1f391ca
Adds comments to db
JPLynch35 Jul 9, 2018
8a29553
adds test for comment relationships
JPLynch35 Jul 9, 2018
f329e3d
Adds shoulda-mtachers and relationship tests for comments
JPLynch35 Jul 9, 2018
f8aa794
Adds test for comment form feature
JPLynch35 Jul 9, 2018
9a1519e
Adds comments to job show page
JPLynch35 Jul 9, 2018
7fd62a5
Adds form for comments and controller
JPLynch35 Jul 9, 2018
ce358fe
Adds feature test for comment display order
JPLynch35 Jul 9, 2018
0094c81
Merge pull request #13 from JPLynch35/comments
JPLynch35 Jul 9, 2018
a41c2d5
Create DTR.md
JPLynch35 Jul 9, 2018
c7290fb
comments
Jul 9, 2018
2cd9e3b
Merge branch 'development' into company_contacts
wehttamclan Jul 9, 2018
206b22b
Merge pull request #14 from JPLynch35/company_contacts
wehttamclan Jul 9, 2018
6b78cbc
adds route to companies contacts and create method for contacts
Jul 10, 2018
4141f7b
Merge pull request #15 from JPLynch35/company_contacts
wehttamclan Jul 10, 2018
b2858fe
Adds styling for jobs
JPLynch35 Jul 10, 2018
6fc1115
Merge branch 'development' into wireframe-additions
JPLynch35 Jul 10, 2018
6c270fa
Merge pull request #16 from JPLynch35/wireframe-additions
JPLynch35 Jul 10, 2018
646292c
adds test for incomplete contact form
Jul 10, 2018
f7dc72d
Merge branch 'development' into company_contacts
wehttamclan Jul 10, 2018
ff9e3f9
Merge pull request #17 from JPLynch35/company_contacts
wehttamclan Jul 10, 2018
a1081b7
add filter by location and category. add @heading to index view.
Jul 10, 2018
2caac93
Fixes job index
JPLynch35 Jul 10, 2018
1cd165f
Merge branch 'development' into job_controller
JPLynch35 Jul 10, 2018
a73cabe
Merge pull request #18 from JPLynch35/job_controller
JPLynch35 Jul 10, 2018
25e6b85
Merge branch 'development' into wireframe-additions
JPLynch35 Jul 10, 2018
90f427b
Merge pull request #19 from JPLynch35/wireframe-additions
JPLynch35 Jul 10, 2018
c953675
Adds styling for categories
JPLynch35 Jul 10, 2018
74ce7d2
Removes category show and adds destroy
JPLynch35 Jul 10, 2018
44931bf
Removes categories#show from routes
JPLynch35 Jul 10, 2018
557e33b
Adds remaining category styling;
JPLynch35 Jul 10, 2018
5153ee6
Adds flash notices for creation and update failures
JPLynch35 Jul 10, 2018
2cffc49
adds some css to nav bar, adds nav bar to application layout
Jul 10, 2018
d7a9780
Removes Company reference in jobs create due to error
JPLynch35 Jul 10, 2018
7d483bc
Merge pull request #20 from JPLynch35/job_controller
wehttamclan Jul 10, 2018
6bff056
Merge pull request #21 from JPLynch35/wireframe-additions
JPLynch35 Jul 10, 2018
0d68670
adds and fixes botton funtionality
Jul 11, 2018
1a068f1
Merge pull request #22 from JPLynch35/user_testing
JPLynch35 Jul 11, 2018
224cda5
Fixes all tests
JPLynch35 Jul 11, 2018
70d511f
Adds styling for dashboard
JPLynch35 Jul 11, 2018
29bae74
Adds additional dashboard styling
JPLynch35 Jul 11, 2018
3dbd847
Merge pull request #23 from JPLynch35/test-fixes
JPLynch35 Jul 11, 2018
49c035f
Merge pull request #24 from JPLynch35/dashboard
JPLynch35 Jul 11, 2018
f8f38b4
Adds edit and delete buttons to jobs index
JPLynch35 Jul 11, 2018
51418f9
Adds job tests for new buttons and links
JPLynch35 Jul 11, 2018
9f64e3e
Merge pull request #25 from JPLynch35/job-tests
JPLynch35 Jul 11, 2018
213afd7
tested some buttons after the fact
Jul 11, 2018
f04ad52
Merge branch 'development' into test_companies_buttons
JPLynch35 Jul 11, 2018
4f525f7
Merge pull request #26 from JPLynch35/test_companies_buttons
JPLynch35 Jul 11, 2018
1b14d91
Adds tests for ccategories index and show page
JPLynch35 Jul 11, 2018
acc71a2
Merge pull request #27 from JPLynch35/categories-tests
JPLynch35 Jul 11, 2018
adcbc6c
Adds delete button for contacts
JPLynch35 Jul 11, 2018
f7578ff
refactors some logic
Jul 11, 2018
2daad5e
Adds delete button and tests for job comments
JPLynch35 Jul 11, 2018
9fa520a
Merge pull request #28 from JPLynch35/development
JPLynch35 Jul 11, 2018
6d8aefd
Merge pull request #29 from JPLynch35/polish
JPLynch35 Jul 11, 2018
b421d11
merge conflicts
Jul 11, 2018
bb731c0
Merge pull request #30 from JPLynch35/refactors
wehttamclan Jul 11, 2018
031fa57
Fixes dependency issues
JPLynch35 Jul 11, 2018
ae9f445
Merge pull request #31 from JPLynch35/dependency
JPLynch35 Jul 11, 2018
b61903a
Merge pull request #32 from JPLynch35/development
JPLynch35 Jul 11, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@
/tmp
.byebug_history
Gemfile.lock
/coverage/*
39 changes: 39 additions & 0 deletions DTR.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
## Project:
Job Tracker


## Group Member Names:
JP Lynch, Matt Peters

## Project Expectations: What does each group member hope to get out of this project?
To learn about Rails, increase our Rails proficiency, and to learn how to overcome Rails problems.

## Goals and expectations:
To finish the project in its entirety. To gain more skills in CSS/Bootstrap.

## Team strengths:
Working hard to understand any issues that pop up.

## How to overcome obstacles:
Talk over the issue with each other. If there are still issues, talk to the instructors.

## Schedule Expectations (When are we available to work together and individually?):
Look over the project on Friday night. Meet Saturday at 10am and work all day. Meet Sunday at 10am and work all day. Monday and Tuesday as needed.

## Communication Expectations (How and often will we communicate? How do we keep lines of communication open?):
We should communicate daily, as we will be working daily until project is due.

## Abilities Expectations (Technical strengths and areas for desired improvement):
We both excel at figuring out algorithms to find what we want. We both need work on routes and controller usage.

## Workload Expectations (What features do we each want to work on?):
We we will work on most of the project together, except JP will complete comments and Matt will complete contacts.

## Workflow Expectations (Git workflow/Tools/Code Review/Reviewing Pull Requests):
We will have a development branch which is like a more granular master branch. Test all integrations in development prior to merging development into master.

## Expectations for giving and receiving feedback:
Be honest, have think skin, but be kind.

## Agenda to discuss project launch:
We will discuss throughout the project.
7 changes: 7 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,13 @@ group :development, :test do
gem 'capybara', '~> 2.13'
gem 'rspec-rails'
gem 'selenium-webdriver'
gem 'database_cleaner'
gem 'launchy'
gem 'simplecov'
gem 'orderly'
gem 'shoulda-matchers'
gem 'tux'
gem 'orderly'
end

group :development do
Expand Down
63 changes: 55 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ GEM
public_suffix (>= 2.0.2, < 4.0)
arel (8.0.0)
bindex (0.5.0)
bond (0.5.1)
builder (3.2.3)
byebug (10.0.2)
capybara (2.18.0)
Expand All @@ -62,17 +63,22 @@ GEM
coffee-script-source (1.12.2)
concurrent-ruby (1.0.5)
crass (1.0.4)
database_cleaner (1.7.0)
diff-lcs (1.3)
docile (1.3.1)
erubi (1.7.1)
execjs (2.7.0)
ffi (1.9.23)
ffi (1.9.25)
globalid (0.4.1)
activesupport (>= 4.2.0)
i18n (1.0.1)
concurrent-ruby (~> 1.0)
jbuilder (2.7.0)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
json (2.1.0)
launchy (2.4.3)
addressable (~> 2.3)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
Expand All @@ -87,13 +93,19 @@ GEM
mini_portile2 (2.3.0)
minitest (5.11.3)
multi_json (1.13.1)
nio4r (2.3.0)
nokogiri (1.8.2)
mustermann (1.0.2)
nio4r (2.3.1)
nokogiri (1.8.4)
mini_portile2 (~> 2.3.0)
orderly (0.0.3)
capybara (>= 1.1)
rspec (>= 2.14)
pg (0.21.0)
public_suffix (3.0.2)
puma (3.11.4)
rack (2.0.5)
rack-protection (2.0.3)
rack
rack-test (1.0.0)
rack (>= 1.0, < 3)
rails (5.1.6)
Expand Down Expand Up @@ -123,6 +135,18 @@ GEM
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
ripl (0.7.1)
bond (~> 0.5.1)
ripl-multi_line (0.3.1)
ripl (>= 0.3.6)
ripl-rack (0.2.0)
rack (>= 1.0)
rack-test (>= 0.5)
ripl (>= 0.3.5)
rspec (3.7.0)
rspec-core (~> 3.7.0)
rspec-expectations (~> 3.7.0)
rspec-mocks (~> 3.7.0)
rspec-core (3.7.1)
rspec-support (~> 3.7.0)
rspec-expectations (3.7.0)
Expand Down Expand Up @@ -153,15 +177,27 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
selenium-webdriver (3.11.0)
selenium-webdriver (3.13.0)
childprocess (~> 0.5)
rubyzip (~> 1.2)
shoulda-matchers (3.1.2)
activesupport (>= 4.0.0)
simplecov (0.16.1)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
sinatra (2.0.3)
mustermann (~> 1.0)
rack (~> 2.0)
rack-protection (= 2.0.3)
tilt (~> 2.0)
spring (2.0.2)
activesupport (>= 4.2)
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0)
sprockets (3.7.1)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
Expand All @@ -171,19 +207,24 @@ GEM
thor (0.20.0)
thread_safe (0.3.6)
tilt (2.0.8)
tux (0.3.0)
ripl (>= 0.3.5)
ripl-multi_line (>= 0.2.4)
ripl-rack (>= 0.2.0)
sinatra (>= 1.2.1)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.10)
uglifier (4.1.14)
execjs (>= 0.3.0, < 3)
web-console (3.6.1)
web-console (3.6.2)
actionview (>= 5.0)
activemodel (>= 5.0)
bindex (>= 0.4.0)
railties (>= 5.0)
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
xpath (3.0.0)
xpath (3.1.0)
nokogiri (~> 1.8)

PLATFORMS
Expand All @@ -193,16 +234,22 @@ DEPENDENCIES
byebug
capybara (~> 2.13)
coffee-rails (~> 4.2)
database_cleaner
jbuilder (~> 2.5)
launchy
listen (>= 3.0.5, < 3.2)
orderly
pg (~> 0.18)
puma (~> 3.7)
rails (~> 5.1.2)
rspec-rails
sass-rails (~> 5.0)
selenium-webdriver
shoulda-matchers
simplecov
spring
spring-watcher-listen (~> 2.0.0)
tux
tzinfo-data
uglifier (>= 1.3.0)
web-console (>= 3.3.0)
Expand Down
121 changes: 121 additions & 0 deletions app/assets/stylesheets/main.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
body {
background-color: bisque;
}

header {
font-family: Franklin Gothic Medium, 'Arial Bold', sans-serif;
}

footer {
display: flex;
justify-content: flex-start;
align-items: center;
border: 5px solid;
background-color: azure;
height: 40px;
}

.font {
font-family: 'Courier New', Courier, monospace;
}

.ul-pad {
padding-left: 0;
}

.centered {
text-align: center;
}

.inline-objects {
display: inline-block;
}

.job-info {
font-size: 25;
font-weight: bold;
font-family: 'Courier New', Courier, monospace;
}

.button {
display: inline;
font: bold 11px Arial;
text-decoration: none;
background-color: #EEEEEE;
color: #333333;
padding: 2px 6px 2px 6px;
border-top: 1px solid #CCCCCC;
border-right: 1px solid #333333;
border-bottom: 1px solid #333333;
border-left: 1px solid #CCCCCC;
padding: 5px;
}

.job-form {
font-family: 'Courier New', Courier, monospace;
}

.dash-box {
width: 300px;
height: 250px;
border: 5px solid black;
background-color: tomato;
text-align: left;
vertical-align: middle;
display: inline-block;
}

.inner-text1 {
margin-left: 65px;
}

.inner-text2 {
margin-left: 10px;
}

.nav {
display: flex;
justify-content: flex-end;
align-content: center;
border: 5px solid black;
background-color: azure;
}

.nav-links {
display: flex;
flex-direction: row;
align-items: stretch;
}

.nav-link {
display: flex;
align-items: center;
padding: 8px 4px;
font-family: 'Chela One', cursive;
}

.dashboard {
display: flex;
align-items: center;
padding: 8px 4px;
font-family: 'Chela One', cursive;
}

#back {
position: absolute;
left: 20px;
font-family: 'Chela One', cursive;
font-size: large;
font-weight: 800;
}

#job-tracker {
position: absolute;
left: 20px;
font-size: x-large;
}

#right-nav-links {
display: flex;
font-size: x-large;
}
50 changes: 50 additions & 0 deletions app/controllers/categories_controller.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
class CategoriesController < ApplicationController
def index
@categories = Category.all.includes(:jobs)
end

def new
@category = Category.new
end

def create
@category = Category.new(category_params)
if @category.save
flash[:success] = "#{@category.title} added!"
redirect_to categories_path
else
flash.notice = "Category not created."
render :new
end
end

def edit
@category = Category.find(params[:id])
end

def update
@category = Category.find(params[:id])
@category.update(category_params)
if @category.save
flash[:success] = "#{@category.title} updated!"
redirect_to "/jobs?category=#{@category.title}"
else
flash.notice = "Category not updated."
render :edit
end
end

def destroy
category = Category.find(params[:id])
category.destroy

flash[:success] = "#{category.title} was successfully deleted!"
redirect_to categories_path
end

private

def category_params
params.require(:category).permit(:title)
end
end
Loading