Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
5bac4e9
Created new Rails App
ltrickey Mar 20, 2017
c2a5f8c
Finished hard coding tasks list in controller and displaying in index…
ltrickey Mar 20, 2017
b08a8d6
Created Task model & migrations. Used migration to add 3 tasks
ltrickey Mar 21, 2017
7aaa905
updated controller to show Task.all for index. Updated view to displ…
ltrickey Mar 21, 2017
bc781f7
Created route for tasks#show. Added method in controller and view as …
ltrickey Mar 21, 2017
0661754
Added as:task in routes so I could use link_to and rails wouldn't be …
ltrickey Mar 21, 2017
e10514b
using link_to, added link back to index page on each show page.
ltrickey Mar 21, 2017
281b385
great migration file add_col_to_tasks.rb
ltrickey Mar 21, 2017
292f345
added column to Tasks:image
ltrickey Mar 21, 2017
68b595c
added photo urls in database. Changed show.html.erb to display image…
ltrickey Mar 21, 2017
ca61ee2
created route for getting form for new task
ltrickey Mar 22, 2017
4b945e9
updated controller to add def new
ltrickey Mar 22, 2017
4bf0076
Added new.html.erb
ltrickey Mar 22, 2017
1294ca1
hard coded form into new view file.
ltrickey Mar 22, 2017
f6f8d2d
created route for post '/tasks', to: 'tasks#create'
ltrickey Mar 22, 2017
8316cad
define def create in controller, make it redirect to tasks_path to sh…
ltrickey Mar 22, 2017
94dfd26
created and ran migration to change column data type to text for desc…
ltrickey Mar 22, 2017
3c5998e
used form_for to create erb form
ltrickey Mar 22, 2017
092b173
Added link on index to create new task. Updated controller with priv…
ltrickey Mar 22, 2017
667c775
Changed form type from text_field to text_area for description.
ltrickey Mar 22, 2017
35026c5
Add columns of complete_by and status.
ltrickey Mar 22, 2017
727312d
updated form to accept complete_by and status
ltrickey Mar 22, 2017
0c923b3
messing around with styles
ltrickey Mar 23, 2017
06fa925
Added Edit functionality for rails cycle including view
ltrickey Mar 23, 2017
c9edf99
Added update functionality to save changes to tasks
ltrickey Mar 23, 2017
bd6d402
added link to edit task on task page.
ltrickey Mar 23, 2017
df16fc7
moved styling to application file.
ltrickey Mar 23, 2017
82dcb07
Complete_by not saving
ltrickey Mar 24, 2017
7bfb486
Updated ERB to fix saving problems for complete_by and status
ltrickey Mar 24, 2017
7465fe3
Added root 'tasks#index' and delete path in routes
ltrickey Mar 24, 2017
a67fcd2
Added delete route, path & confirmation window
ltrickey Mar 24, 2017
d2b4b91
added mark complete function, new path, new method
ltrickey Mar 24, 2017
75038e3
Removed option to edit if task is completed
ltrickey Mar 24, 2017
1945974
Changed styling of completed tasks.
ltrickey Mar 24, 2017
480b563
Messing around with styles
ltrickey Mar 26, 2017
12247be
Added Navbar to application.html.erb
ltrickey Mar 26, 2017
a12d52c
Added border for show pages. Fixed date_field in new form
ltrickey Mar 26, 2017
3877e9a
Added confirmation pop-up block for marking complete
ltrickey Mar 26, 2017
1d3b614
Added same styling for all pages
ltrickey Mar 26, 2017
2c6fc82
Added checkmark emoji for completed tasks
ltrickey Mar 26, 2017
05ce81d
Added partial for forms!
ltrickey Mar 26, 2017
1333a74
Changed styling on show page to make header a big larger
ltrickey Mar 26, 2017
5af0202
Adding small change to practice branches.
ltrickey Apr 5, 2017
820719d
Small change to README for practicing pull request.
ltrickey Apr 5, 2017
e52863c
Merge pull request #1 from ltrickey/let/testpull
ltrickey Apr 5, 2017
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
53 changes: 53 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
source 'https://rubygems.org'

git_source(:github) do |repo_name|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
"https://github.com/#{repo_name}.git"
end


# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.0.2'
# Use sqlite3 as the database for Active Record
gem 'sqlite3'
# Use Puma as the app server
gem 'puma', '~> 3.0'
# 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.2'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby

# Use jquery as the JavaScript library
gem 'jquery-rails'
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
gem 'turbolinks', '~> 5'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.5'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 3.0'
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platform: :mri
end

group :development do
# Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
gem 'web-console', '>= 3.3.0'
gem 'listen', '~> 3.0.5'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
174 changes: 174 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,174 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.0.2)
actionpack (= 5.0.2)
nio4r (>= 1.2, < 3.0)
websocket-driver (~> 0.6.1)
actionmailer (5.0.2)
actionpack (= 5.0.2)
actionview (= 5.0.2)
activejob (= 5.0.2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.0.2)
actionview (= 5.0.2)
activesupport (= 5.0.2)
rack (~> 2.0)
rack-test (~> 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.0.2)
activesupport (= 5.0.2)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.0.2)
activesupport (= 5.0.2)
globalid (>= 0.3.6)
activemodel (5.0.2)
activesupport (= 5.0.2)
activerecord (5.0.2)
activemodel (= 5.0.2)
activesupport (= 5.0.2)
arel (~> 7.0)
activesupport (5.0.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
minitest (~> 5.1)
tzinfo (~> 1.1)
arel (7.1.4)
builder (3.2.3)
byebug (9.0.6)
coffee-rails (4.2.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.2.x)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.0.5)
debug_inspector (0.0.2)
erubis (2.7.0)
execjs (2.7.0)
ffi (1.9.18)
globalid (0.3.7)
activesupport (>= 4.1.0)
i18n (0.8.1)
jbuilder (2.6.3)
activesupport (>= 3.0.0, < 5.2)
multi_json (~> 1.2)
jquery-rails (4.2.2)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.4)
mime-types (>= 1.16, < 4)
method_source (0.8.2)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minitest (5.10.1)
multi_json (1.12.1)
nio4r (2.0.0)
nokogiri (1.7.1)
mini_portile2 (~> 2.1.0)
puma (3.8.2)
rack (2.0.1)
rack-test (0.6.3)
rack (>= 1.0)
rails (5.0.2)
actioncable (= 5.0.2)
actionmailer (= 5.0.2)
actionpack (= 5.0.2)
actionview (= 5.0.2)
activejob (= 5.0.2)
activemodel (= 5.0.2)
activerecord (= 5.0.2)
activesupport (= 5.0.2)
bundler (>= 1.3.0, < 2.0)
railties (= 5.0.2)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.2)
activesupport (>= 4.2.0, < 6.0)
nokogiri (~> 1.6)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
railties (5.0.2)
actionpack (= 5.0.2)
activesupport (= 5.0.2)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.0.0)
rb-fsevent (0.9.8)
rb-inotify (0.9.8)
ffi (>= 0.5.0)
sass (3.4.23)
sass-rails (5.0.6)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
spring (2.0.1)
activesupport (>= 4.2)
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.0)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.13)
thor (0.19.4)
thread_safe (0.3.6)
tilt (2.0.7)
turbolinks (5.0.1)
turbolinks-source (~> 5)
turbolinks-source (5.0.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (3.1.9)
execjs (>= 0.3.0, < 3)
web-console (3.4.0)
actionview (>= 5.0)
activemodel (>= 5.0)
debug_inspector
railties (>= 5.0)
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)

PLATFORMS
ruby

DEPENDENCIES
byebug
coffee-rails (~> 4.2)
jbuilder (~> 2.5)
jquery-rails
listen (~> 3.0.5)
puma (~> 3.0)
rails (~> 5.0.2)
sass-rails (~> 5.0)
spring
spring-watcher-listen (~> 2.0.0)
sqlite3
turbolinks (~> 5)
tzinfo-data
uglifier (>= 1.3.0)
web-console (>= 3.3.0)

BUNDLED WITH
1.14.6
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#I changed this!
#I also changed this!!
# Task List
Let's build a Task List in Rails! We will solve the problem of tracking tasks in a web application. This project will enable us to keep track of and persist, add, edit and remove tasks. This is an individual Stage 1 project.

Expand Down
6 changes: 6 additions & 0 deletions Rakefile
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_relative 'config/application'

Rails.application.load_tasks
3 changes: 3 additions & 0 deletions app/assets/config/manifest.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
//= link_tree ../images
//= link_directory ../javascripts .js
//= link_directory ../stylesheets .css
Empty file added app/assets/images/.keep
Empty file.
101 changes: 101 additions & 0 deletions app/assets/images/TaskList.htm
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
<!DOCTYPE html>
<!-- saved from url=(0027)http://localhost:3000/tasks -->
<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>TaskList</title>
<meta name="csrf-param" content="authenticity_token">
<meta name="csrf-token" content="gagS2V1ju1OvHAQw7Ad90ob0Ch1IPpfzVfIeBZTsrzTJjTXEfH45YRb3AJJkSMp5zUuluMNDGm9/OSyXwiIVxA==">

<link rel="stylesheet" media="all" href="./TaskList_files/application.self-166063d169177aba144cffc5b5d8bb21363e26c84cebb532b1b6cfe6f6f0d29b.css" data-turbolinks-track="reload">
<script src="./TaskList_files/jquery.self-bd7ddd393353a8d2480a622e80342adf488fb6006d667e8b42e4c0073393abee.js" data-turbolinks-track="reload"></script>
<script src="./TaskList_files/jquery_ujs.self-784a997f6726036b1993eb2217c9cb558e1cbb801c6da88105588c56f13b466a.js" data-turbolinks-track="reload"></script>
<script src="./TaskList_files/turbolinks.self-c5acd7a204f5f25ce7a1d8a0e4d92e28d34c9e2df2c7371cd7af88e147e4ad82.js" data-turbolinks-track="reload"></script>
<script src="./TaskList_files/action_cable.self-5454023407ffec0d29137c7110917e1e745525ae9afbc05f52104c4cd6597429.js" data-turbolinks-track="reload"></script>
<script src="./TaskList_files/cable.self-6e0514260c1aa76eaf252412ce74e63f68819fd19bf740595f592c5ba4c36537.js" data-turbolinks-track="reload"></script>
<script src="./TaskList_files/tasks.self-877aef30ae1b040ab8a3aba4e3e309a11d7f2612f44dde450b5c157aa5f95c05.js" data-turbolinks-track="reload"></script>
<script src="./TaskList_files/application.self-b89234cf2659d7fedea75bca0b8d231ad7dfc2f3f57fcbaf5f44ed9dc384137b.js" data-turbolinks-track="reload"></script>
</head>

<body>
<h1>All My Tasks</h1>

<article class="main-list">

<h2>Don't Forget!</h2>

<section class="
incomplete
">

<a href="http://localhost:3000/tasks/3">
<h3>Shopping</h3>
<p>

</p><form class="edit_task" id="edit_task_3" action="http://localhost:3000/tasks/3" accept-charset="UTF-8" method="post"><input name="utf8" type="hidden" value="✓"><input type="hidden" name="_method" value="patch"><input type="hidden" name="authenticity_token" value="gagS2V1ju1OvHAQw7Ad90ob0Ch1IPpfzVfIeBZTsrzTJjTXEfH45YRb3AJJkSMp5zUuluMNDGm9/OSyXwiIVxA==">
<input type="submit" name="commit" value="Mark Complete" data-disable-with="Mark Complete">
</form>

<p></p>
</a> </section>
<section class="
incomplete
">

<a href="http://localhost:3000/tasks/4">
<h3>Something else</h3>
<p>

</p><form class="edit_task" id="edit_task_4" action="http://localhost:3000/tasks/4" accept-charset="UTF-8" method="post"><input name="utf8" type="hidden" value="✓"><input type="hidden" name="_method" value="patch"><input type="hidden" name="authenticity_token" value="gagS2V1ju1OvHAQw7Ad90ob0Ch1IPpfzVfIeBZTsrzTJjTXEfH45YRb3AJJkSMp5zUuluMNDGm9/OSyXwiIVxA==">
<input type="submit" name="commit" value="Mark Complete" data-disable-with="Mark Complete">
</form>

<p></p>
</a> </section>
<section class="
complete
">

<a href="http://localhost:3000/tasks/7">
<h3>New Task</h3>
</a><p><a href="http://localhost:3000/tasks/7">


</a><a data-confirm="Are you sure?" rel="nofollow" data-method="delete" href="http://localhost:3000/tasks/7">Delete</a>

</p>
</section>
<section class="
incomplete
">

<a href="http://localhost:3000/tasks/12">
<h3>Test</h3>
<p>

</p><form class="edit_task" id="edit_task_12" action="http://localhost:3000/tasks/12" accept-charset="UTF-8" method="post"><input name="utf8" type="hidden" value="✓"><input type="hidden" name="_method" value="patch"><input type="hidden" name="authenticity_token" value="gagS2V1ju1OvHAQw7Ad90ob0Ch1IPpfzVfIeBZTsrzTJjTXEfH45YRb3AJJkSMp5zUuluMNDGm9/OSyXwiIVxA==">
<input type="submit" name="commit" value="Mark Complete" data-disable-with="Mark Complete">
</form>

<p></p>
</a> </section>
<section class="
incomplete
">

<a href="http://localhost:3000/tasks/13">
<h3>Testing</h3>
<p>

</p><form class="edit_task" id="edit_task_13" action="http://localhost:3000/tasks/13" accept-charset="UTF-8" method="post"><input name="utf8" type="hidden" value="✓"><input type="hidden" name="_method" value="patch"><input type="hidden" name="authenticity_token" value="gagS2V1ju1OvHAQw7Ad90ob0Ch1IPpfzVfIeBZTsrzTJjTXEfH45YRb3AJJkSMp5zUuluMNDGm9/OSyXwiIVxA==">
<input type="submit" name="commit" value="Mark Complete" data-disable-with="Mark Complete">
</form>

<p></p>
</a> </section>

</article>

<a class="bottom-button" href="http://localhost:3000/tasks/new">Create New Task</a>



</body></html>
Loading