Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
bc9b323
incorporate bootsrap
mandeldl Mar 30, 2015
ea18999
bootstrap css for activities and new welcome page (default route)
mandeldl Mar 30, 2015
d92b927
include login and logout buttons in header of application erb
mandeldl Mar 30, 2015
ef38f02
update index and update views and controllers
mandeldl Mar 30, 2015
63bf93e
Heroku config
mandeldl Mar 30, 2015
a54063f
add funky header to new activities view
mandeldl Mar 30, 2015
6ccfa64
update login view and scss
mandeldl Mar 31, 2015
9e19e51
add logos, update signup pages
mandeldl Apr 1, 2015
5bb0d9d
update header and navigation
mandeldl Apr 1, 2015
d06d9e8
add favicon
mandeldl Apr 1, 2015
a2d5520
rickroll for April 1
mandeldl Apr 1, 2015
e718bc5
add footer
mandeldl Apr 2, 2015
dd4c431
add css for welcome page
mandeldl Apr 2, 2015
bd51c8d
update README with project scope and description
mandeldl Apr 2, 2015
ce8d22d
Update links and styling for welcome, login and signup pages
mandeldl Apr 2, 2015
68e211a
Update Readme.doc
mandeldl Apr 2, 2015
6d2e35e
changed heading
angelawyman Apr 2, 2015
64fa1fc
Merge pull request #1 from angelawyman/master
mandeldl Apr 2, 2015
26bb457
validate activity name
mandeldl Apr 2, 2015
5d52e33
remove unused images
mandeldl Apr 2, 2015
0b17541
update logos for signup and login
mandeldl Apr 2, 2015
770037f
Lots of changes! Added Elizabeth copy, reworked layout and BESTOF ALL…
angelawyman Apr 3, 2015
19cc2bb
found the footer html AND added the photos to the images folder
angelawyman Apr 3, 2015
6742aa6
update favicon
mandeldl Apr 3, 2015
28e658e
updated angela changes
mandeldl Apr 3, 2015
5a088bc
Merge branch 'angelawyman-master'
mandeldl Apr 3, 2015
829a8bf
incorporate raty javascript
mandeldl Apr 3, 2015
6b3cc11
add predictive puppy modeling
mandeldl Apr 3, 2015
ecd68e7
update google web font to https
mandeldl Apr 3, 2015
f138941
relink star images
mandeldl Apr 3, 2015
7e413c0
revise image links in javascript
mandeldl Apr 3, 2015
2bae800
update contact link in header
mandeldl Apr 4, 2015
0cb7b46
remove round on activities rating average
mandeldl Apr 4, 2015
c789fc1
made if statement more specific
mandeldl Apr 4, 2015
2640162
Add instructions to Activities page
fergfluff Apr 4, 2015
9fa8f32
Merge branch 'fergfluff-master'
mandeldl Apr 4, 2015
040c5c7
background css for activities page
mandeldl Apr 4, 2015
47daf1b
add font-awesome icons to index page
mandeldl Apr 4, 2015
5e71b42
update background image on landing page
mandeldl Apr 6, 2015
972eb20
swapped out last photo to shot of our NYC class instead
angelawyman Apr 12, 2015
fdec1dd
corey photo replace
angelawyman May 5, 2015
9743b53
corey photo replace again
angelawyman May 5, 2015
207c201
Merge pull request #5 from angelawyman/master
mandeldl May 5, 2015
ba51ff6
change photo to include Corey
mandeldl May 5, 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
8 changes: 6 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@ source 'https://rubygems.org'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.1.8'
# Use sqlite3 as the database for Active Record
gem 'sqlite3'
# Use sqlite3 as the database for Active Record (Just Development)
gem 'sqlite3', group: [:development]
# Use Postgres for Production
gem 'pg'
# Use rails_12factor
gem 'rails_12factor', group: :production
# Use SCSS for stylesheets
gem 'sass-rails', '~> 4.0.3'
# Use Uglifier as compressor for JavaScript assets
Expand Down
8 changes: 8 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ GEM
mime-types (2.4.3)
minitest (5.5.1)
multi_json (1.11.0)
pg (0.17.1)
rack (1.5.2)
rack-test (0.6.3)
rack (>= 1.0)
Expand All @@ -66,6 +67,11 @@ GEM
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.8)
sprockets-rails (~> 2.0)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.4)
rails_stdout_logging (0.0.3)
railties (4.1.8)
actionpack (= 4.1.8)
activesupport (= 4.1.8)
Expand Down Expand Up @@ -113,7 +119,9 @@ DEPENDENCIES
coffee-rails (~> 4.0.0)
jbuilder (~> 2.0)
jquery-rails
pg
rails (= 4.1.8)
rails_12factor
sass-rails (~> 4.0.3)
sdoc (~> 0.4.0)
spring
Expand Down
33 changes: 13 additions & 20 deletions README.rdoc
Original file line number Diff line number Diff line change
@@ -1,28 +1,21 @@
== README

This README would normally document whatever steps are necessary to get the
application up and running.
Get back to what makes you happy. Give yourself the feedback you need to put your time where it matters most, and pull away from what’s dragging you down.

Things you may want to cover:
== Scope
Minimum Viable Product:
A light & fun way to mark down how you plan to fill your day, then in the evening quickly rate how much you enjoyed or disliked each thing you did.

* Ruby version
== Features:

* System dependencies
In the morning, add list items: As in the jQuery project “ListEasy”, the user can create a list of what they plan to do each day (by adding to the html form element with added jquery function <input id=”todo”>).

* Configuration
In the evening, rate list items: From a drop down menu (code to be found), rate with a percentage
number how much you enjoyed or disliked that project.

== In a later version:
Features:

* Database creation
By the end of 7 days, get back a digest of what you enjoyed or disliked the most. To one’s surprise you may not be putting your time towards what you like the most! Time to reprioritize!

* 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>.
Also, it’d be cool if the app knew how to assign an emoji face to the rating reports, so that the feeling was more approachable than like a grade!
Binary file added app/assets/images/blue2light.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/bluedandelion.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/bluestmood.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/class3v2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/favicon.ico
Binary file not shown.
Binary file added app/assets/images/icons.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/assets/images/icons.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 20 additions & 0 deletions app/assets/images/logo2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 20 additions & 0 deletions app/assets/images/logo_solo_2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions app/assets/images/logo_solo_3.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions app/assets/images/logo_solo_4.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/rethinklogo1.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/rethinklogo2.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading