forked from AdaGold/task-list
-
Notifications
You must be signed in to change notification settings - Fork 22
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
TasklistRails Assignment #1
Open
jadevance
wants to merge
13
commits into
Ada-C5:master
Choose a base branch
from
jadevance:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
aecf3e3
Edit and delete functionality are working. New tasks can also be adde…
jadevance f26cf65
Updated .gitignore to ignore .DS_Store file
jadevance 1d78471
Added Chronic gem for task completion. Minor CSS formatting changes. …
jadevance 0f4ea1c
Changed the task display to actual post-its because it looks cool. De…
jadevance a7ec052
Added Person models and seeded the database with new data.
jadevance c8d7101
wave four requirements complete.
jadevance 49669ad
CSS tweaks on people task pages
jadevance a6eb158
Updated gemfile
jadevance c0ddb18
gem file commit
jadevance c02b7ee
Moving things to make Heroku do the thing
jadevance d7ad9af
Still trying to make heroku do the thing
jadevance 4e107c8
pushing seeds
jadevance 9fd605b
trying to get CSS to work.
jadevance File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
source 'https://rubygems.org' | ||
gem 'chronic' | ||
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' | ||
gem 'rails', '4.2.6' | ||
# Use sqlite3 as the database for Active Record | ||
# Use SCSS for stylesheets | ||
gem 'sass-rails', '~> 5.0' | ||
# Use Uglifier as compressor for JavaScript assets | ||
gem 'uglifier', '>= 1.3.0' | ||
# Use CoffeeScript for .coffee assets and views | ||
gem 'coffee-rails', '~> 4.1.0' | ||
# Use jquery as the JavaScript library | ||
gem 'jquery-rails' | ||
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks | ||
gem 'turbolinks' | ||
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder | ||
gem 'jbuilder', '~> 2.0' | ||
# bundle exec rake doc:rails generates the API under doc/api. | ||
gem 'sdoc', '~> 0.4.0', group: :doc | ||
|
||
group :development, :test do | ||
# Call 'byebug' anywhere in the code to stop execution and get a debugger console | ||
gem 'byebug' | ||
gem 'sqlite3' | ||
end | ||
|
||
group :development do | ||
# Access an IRB console on exception pages or by using <%= console %> in views | ||
gem 'web-console', '~> 2.0' | ||
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring | ||
gem 'spring' | ||
gem 'better_errors' | ||
gem 'binding_of_caller' | ||
end | ||
|
||
group :production do | ||
gem 'pg' | ||
gem 'rails_12factor' | ||
|
||
end | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,177 @@ | ||
GEM | ||
remote: https://rubygems.org/ | ||
specs: | ||
actionmailer (4.2.6) | ||
actionpack (= 4.2.6) | ||
actionview (= 4.2.6) | ||
activejob (= 4.2.6) | ||
mail (~> 2.5, >= 2.5.4) | ||
rails-dom-testing (~> 1.0, >= 1.0.5) | ||
actionpack (4.2.6) | ||
actionview (= 4.2.6) | ||
activesupport (= 4.2.6) | ||
rack (~> 1.6) | ||
rack-test (~> 0.6.2) | ||
rails-dom-testing (~> 1.0, >= 1.0.5) | ||
rails-html-sanitizer (~> 1.0, >= 1.0.2) | ||
actionview (4.2.6) | ||
activesupport (= 4.2.6) | ||
builder (~> 3.1) | ||
erubis (~> 2.7.0) | ||
rails-dom-testing (~> 1.0, >= 1.0.5) | ||
rails-html-sanitizer (~> 1.0, >= 1.0.2) | ||
activejob (4.2.6) | ||
activesupport (= 4.2.6) | ||
globalid (>= 0.3.0) | ||
activemodel (4.2.6) | ||
activesupport (= 4.2.6) | ||
builder (~> 3.1) | ||
activerecord (4.2.6) | ||
activemodel (= 4.2.6) | ||
activesupport (= 4.2.6) | ||
arel (~> 6.0) | ||
activesupport (4.2.6) | ||
i18n (~> 0.7) | ||
json (~> 1.7, >= 1.7.7) | ||
minitest (~> 5.1) | ||
thread_safe (~> 0.3, >= 0.3.4) | ||
tzinfo (~> 1.1) | ||
arel (6.0.3) | ||
better_errors (2.1.1) | ||
coderay (>= 1.0.0) | ||
erubis (>= 2.6.6) | ||
rack (>= 0.9.0) | ||
binding_of_caller (0.7.2) | ||
debug_inspector (>= 0.0.1) | ||
builder (3.2.2) | ||
byebug (8.2.4) | ||
chronic (0.10.2) | ||
coderay (1.1.1) | ||
coffee-rails (4.1.1) | ||
coffee-script (>= 2.2.0) | ||
railties (>= 4.0.0, < 5.1.x) | ||
coffee-script (2.4.1) | ||
coffee-script-source | ||
execjs | ||
coffee-script-source (1.10.0) | ||
concurrent-ruby (1.0.1) | ||
debug_inspector (0.0.2) | ||
erubis (2.7.0) | ||
execjs (2.6.0) | ||
globalid (0.3.6) | ||
activesupport (>= 4.1.0) | ||
i18n (0.7.0) | ||
jbuilder (2.4.1) | ||
activesupport (>= 3.0.0, < 5.1) | ||
multi_json (~> 1.2) | ||
jquery-rails (4.1.1) | ||
rails-dom-testing (>= 1, < 3) | ||
railties (>= 4.2.0) | ||
thor (>= 0.14, < 2.0) | ||
json (1.8.3) | ||
loofah (2.0.3) | ||
nokogiri (>= 1.5.9) | ||
mail (2.6.4) | ||
mime-types (>= 1.16, < 4) | ||
mime-types (3.0) | ||
mime-types-data (~> 3.2015) | ||
mime-types-data (3.2016.0221) | ||
mini_portile2 (2.0.0) | ||
minitest (5.8.4) | ||
multi_json (1.11.2) | ||
nokogiri (1.6.7.2) | ||
mini_portile2 (~> 2.0.0.rc2) | ||
pg (0.18.4) | ||
rack (1.6.4) | ||
rack-test (0.6.3) | ||
rack (>= 1.0) | ||
rails (4.2.6) | ||
actionmailer (= 4.2.6) | ||
actionpack (= 4.2.6) | ||
actionview (= 4.2.6) | ||
activejob (= 4.2.6) | ||
activemodel (= 4.2.6) | ||
activerecord (= 4.2.6) | ||
activesupport (= 4.2.6) | ||
bundler (>= 1.3.0, < 2.0) | ||
railties (= 4.2.6) | ||
sprockets-rails | ||
rails-deprecated_sanitizer (1.0.3) | ||
activesupport (>= 4.2.0.alpha) | ||
rails-dom-testing (1.0.7) | ||
activesupport (>= 4.2.0.beta, < 5.0) | ||
nokogiri (~> 1.6.0) | ||
rails-deprecated_sanitizer (>= 1.0.1) | ||
rails-html-sanitizer (1.0.3) | ||
loofah (~> 2.0) | ||
rails_12factor (0.0.3) | ||
rails_serve_static_assets | ||
rails_stdout_logging | ||
rails_serve_static_assets (0.0.5) | ||
rails_stdout_logging (0.0.5) | ||
railties (4.2.6) | ||
actionpack (= 4.2.6) | ||
activesupport (= 4.2.6) | ||
rake (>= 0.8.7) | ||
thor (>= 0.18.1, < 2.0) | ||
rake (11.1.2) | ||
rdoc (4.2.2) | ||
json (~> 1.4) | ||
sass (3.4.22) | ||
sass-rails (5.0.4) | ||
railties (>= 4.0.0, < 5.0) | ||
sass (~> 3.1) | ||
sprockets (>= 2.8, < 4.0) | ||
sprockets-rails (>= 2.0, < 4.0) | ||
tilt (>= 1.1, < 3) | ||
sdoc (0.4.1) | ||
json (~> 1.7, >= 1.7.7) | ||
rdoc (~> 4.0) | ||
spring (1.7.1) | ||
sprockets (3.6.0) | ||
concurrent-ruby (~> 1.0) | ||
rack (> 1, < 3) | ||
sprockets-rails (3.0.4) | ||
actionpack (>= 4.0) | ||
activesupport (>= 4.0) | ||
sprockets (>= 3.0.0) | ||
sqlite3 (1.3.11) | ||
thor (0.19.1) | ||
thread_safe (0.3.5) | ||
tilt (2.0.2) | ||
turbolinks (2.5.3) | ||
coffee-rails | ||
tzinfo (1.2.2) | ||
thread_safe (~> 0.1) | ||
uglifier (3.0.0) | ||
execjs (>= 0.3.0, < 3) | ||
web-console (2.3.0) | ||
activemodel (>= 4.0) | ||
binding_of_caller (>= 0.7.2) | ||
railties (>= 4.0) | ||
sprockets-rails (>= 2.0, < 4.0) | ||
|
||
PLATFORMS | ||
ruby | ||
|
||
DEPENDENCIES | ||
better_errors | ||
binding_of_caller | ||
byebug | ||
chronic | ||
coffee-rails (~> 4.1.0) | ||
jbuilder (~> 2.0) | ||
jquery-rails | ||
pg | ||
rails (= 4.2.6) | ||
rails_12factor | ||
sass-rails (~> 5.0) | ||
sdoc (~> 0.4.0) | ||
spring | ||
sqlite3 | ||
turbolinks | ||
uglifier (>= 1.3.0) | ||
web-console (~> 2.0) | ||
|
||
BUNDLED WITH | ||
1.11.2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
== README | ||
|
||
This README would normally document whatever steps are necessary to get the | ||
application up and running. | ||
|
||
Things you may want to cover: | ||
|
||
* Ruby version | ||
|
||
* System dependencies | ||
|
||
* Configuration | ||
|
||
* Database creation | ||
|
||
* Database initialization | ||
|
||
* How to run the test suite | ||
|
||
* Services (job queues, cache servers, search engines, etc.) | ||
|
||
* Deployment instructions | ||
|
||
* ... | ||
|
||
|
||
Please feel free to use a different markup language if you do not plan to run | ||
<tt>rake doc:app</tt>. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
# Add your own tasks in files placed in lib/tasks ending in .rake, | ||
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. | ||
|
||
require File.expand_path('../config/application', __FILE__) | ||
|
||
Rails.application.load_tasks |
Binary file not shown.
Binary file not shown.
Empty file.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
// This is a manifest file that'll be compiled into application.js, which will include all the files | ||
// listed below. | ||
// | ||
// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, | ||
// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path. | ||
// | ||
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the | ||
// compiled file. | ||
// | ||
// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details | ||
// about supported directives. | ||
// | ||
//= require jquery | ||
//= require jquery_ujs | ||
//= require turbolinks | ||
//= require_tree . |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
# Place all the behaviors and hooks related to the matching controller here. | ||
# All this logic will automatically be available in application.js. | ||
# You can use CoffeeScript in this file: http://coffeescript.org/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
# Place all the behaviors and hooks related to the matching controller here. | ||
# All this logic will automatically be available in application.js. | ||
# You can use CoffeeScript in this file: http://coffeescript.org/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
/* | ||
* This is a manifest file that'll be compiled into application.css, which will include all the files | ||
* listed below. | ||
* | ||
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, | ||
* or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path. | ||
* | ||
* You're free to add application-wide styles to this file and they'll appear at the bottom of the | ||
* compiled file so the styles you add here take precedence over styles defined in any styles | ||
* defined in the other CSS/SCSS files in this directory. It is generally better to create a new | ||
* file per style scope. | ||
* | ||
*= require_tree . | ||
*= require_self | ||
*/ | ||
|
||
/* http://meyerweb.com/eric/tools/css/reset/ | ||
v2.0 | 20110126 | ||
License: none (public domain) | ||
*/ | ||
|
||
html { | ||
background-attachment: fixed; | ||
background-image: url("../assets/notebook-background.png"); | ||
background-position: center; | ||
background-repeat: no-repeat; | ||
background-size: cover; | ||
-webkit-background-size: cover; | ||
-moz-background-size: cover; | ||
-o-background-size: cover; | ||
font-family: 'Raleway', sans-serif; | ||
color:#4D434F; | ||
font-size: 18px; | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
// Place all the styles related to the people controller here. | ||
// They will automatically be included in application.css. | ||
// You can use Sass (SCSS) here: http://sass-lang.com/ | ||
|
||
.name-container { | ||
background-color: rgba(255,255,255,.7); | ||
border-radius: 5px; | ||
color:#4D434F; | ||
display: -webkit-flex; | ||
display: flex; | ||
flex-wrap: wrap; | ||
margin: auto; | ||
overflow: auto; | ||
padding: 2%; | ||
width: 777px; | ||
|
||
} | ||
|
||
.name-container a { | ||
text-decoration: none; | ||
color:#1B6FC7; | ||
font-weight: 400; | ||
} | ||
|
||
.name-container a:hover { | ||
color: #360361 | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Some great css effects here! Makes for a professional looking end project! |
||
|
||
|
||
.name-item { | ||
background-image: url("../assets/name-tag.png"); | ||
background-position: center; | ||
background-repeat: no-repeat; | ||
background-size: cover; | ||
display: inline-block; | ||
font-size: 20px; | ||
font-weight: 300; | ||
margin: 2%; | ||
padding: 5%; | ||
text-align: center; | ||
width: 150px; | ||
overflow: auto; | ||
border-radius: 5px; | ||
} | ||
|
||
.name-item a { | ||
text-decoration: none; | ||
color:#1B6FC7; | ||
font-weight: 400; | ||
|
||
} | ||
|
||
.name-item a:hover { | ||
color: #360361 | ||
} | ||
.name-description { | ||
font-size: 16px; | ||
line-height: 2rem; | ||
} | ||
|
||
p.top-bar { | ||
color:#1B6FC7; | ||
text-align: center; | ||
width: 100%; | ||
font-size: 24px; | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LOVE LOVE LOVE your background image!