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

todo_app #7

Open
wants to merge 27 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
0149e12
Created a Project Model. Created and migrated the database.
kbondanza Jan 31, 2015
1e71239
Created lists model, and migraton.
kbondanza Jan 31, 2015
a3b1ee5
Created the tasks model and did the migration.
kbondanza Jan 31, 2015
aa9644b
Created notes model and the migration.
kbondanza Jan 31, 2015
d746d53
Seeded the database.
kbondanza Jan 31, 2015
d555a79
Created routes for projects, lists, tasks, and notes.
kbondanza Jan 31, 2015
e260bcd
Created controllers for projects, lists, tasks, notes.
kbondanza Jan 31, 2015
e71c5ca
Added has_many to the following models: project, list, task.
kbondanza Jan 31, 2015
e1cfda2
Created views for Projects, Lists, Tasks, and Notes. Created forms fo…
kbondanza Jan 31, 2015
4bc2458
Updated projects index.html.erb to include links for lists, tasks and…
kbondanza Jan 31, 2015
cfe83c2
Filled out all the views, however I am getting NoMethodErrors. Need t…
kbondanza Jan 31, 2015
4ef2aec
Changed application stylesheet to a scss file so that way I can use S…
kbondanza Jan 31, 2015
82e3ee9
Filled in Notes controller. Got rid of root_path.
kbondanza Jan 31, 2015
986f8d2
Filled out controller sections for lists and tasks.
kbondanza Jan 31, 2015
e99e7f9
Tried to simplify routes. Also commented out require foundation in th…
kbondanza Jan 31, 2015
452616d
Got very frustrated. Nothing was working. Tried to do things at once.…
kbondanza Jan 31, 2015
9dcb879
Created a new tasks model, droped the database, created a new databas…
kbondanza Jan 31, 2015
50b24e6
Re-seeded database.
kbondanza Jan 31, 2015
c053b9d
Filled new tasks_controller.rb
kbondanza Jan 31, 2015
34e37f3
Added the task route.
kbondanza Jan 31, 2015
1ddf505
Filled in views for tasks. Got everything for tasks to work.
kbondanza Feb 1, 2015
3b39cef
Created the notes section. Created the parent/child relationship of t…
kbondanza Feb 1, 2015
dc11601
Added foundation to gemfile.
kbondanza Feb 1, 2015
57684bd
Can't figure out foundation. Don't know if I'm secretly using it. I j…
kbondanza Feb 1, 2015
50315cd
Just installed Font Awesome, Ruby Gem.
kbondanza Feb 2, 2015
64ff4eb
tried to add some styling. but this whole thing is so frustrating, no…
kbondanza Feb 2, 2015
0e95335
trie to add this on a separate branch but im not sure that worked. i …
kbondanza Feb 2, 2015
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
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ ruby '2.2.0'
gem 'rails', '4.2.0'
gem 'pg'
gem 'sass-rails', '~> 5.0'
gem 'font-awesome-sass'
gem 'foundation-rails'
gem 'uglifier', '>= 1.3.0'
gem 'coffee-rails', '~> 4.1.0'
gem 'jquery-rails'
Expand Down
7 changes: 7 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,12 @@ GEM
faker (1.4.3)
i18n (~> 0.5)
ffi (1.9.6)
font-awesome-sass (4.3.0)
sass (~> 3.2)
formatador (0.2.5)
foundation-rails (5.4.5.0)
railties (>= 3.1.0)
sass (>= 3.2.0)
globalid (0.3.0)
activesupport (>= 4.1.0)
guard (2.11.1)
Expand Down Expand Up @@ -285,6 +290,8 @@ DEPENDENCIES
dotenv-rails
factory_girl_rails (~> 4.0)
faker
font-awesome-sass
foundation-rails
guard
guard-rails
jbuilder (~> 2.0)
Expand Down
1 change: 1 addition & 0 deletions ToDo_app
Submodule ToDo_app added at b099e7
2 changes: 2 additions & 0 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,7 @@
//
//= require jquery
//= require jquery_ujs
= require foundation
//= require turbolinks
//= require_tree .
$(function(){ $(document).foundation(); });
76 changes: 61 additions & 15 deletions app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
@@ -1,15 +1,61 @@
/*
* 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
*/
/* SECTIONS */
body {
background-color: rgba(136, 148, 232, 0.4)
}
.section {
clear: both;
padding: 0px;
margin: 0px;
background-color: rgba(6, 19, 132, 1);
}

/* COLUMN SETUP */
.col {
display: block;
float:left;
margin: 1% 0 1% 1.6%;
text-align: center;
color: white;
font-family: papyrus;
}
.col:first-child { margin-left: 0; }

/* GROUPING */
.group:before,
.group:after { content:""; display:table; }
.group:after { clear:both;}
.group { zoom:1; /* For IE 6/7 */ }
/* GRID OF THREE */
.span_3_of_3 { width: 100%; }
.span_2_of_3 { width: 66.13%; }
.span_1_of_3 { width: 32.26%; }

/* GO FULL WIDTH BELOW 480 PIXELS */
@media only screen and (max-width: 480px) {
.col { margin: 1% 0 1% 0%; }
.span_3_of_3, .span_2_of_3, .span_1_of_3 { width: 100%; }
}

.tasks_style {
border: solid 6px rgba(6, 19, 132, 0.7);
margin-left: 25%;
margin-right: 25%;
margin-top: 8%;
background-color: white;
padding: 15px;
text-align: center;
}

h2 .tasks_style {
font-weight: bold;
font-size: 16px;
}

.unstyled {
list-style: none;
}

li .task_style {
list-style: inline;
}

Loading