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

Jon/lab5 #18

Open
wants to merge 109 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
199ff08
raked db
Jun 18, 2013
24cf522
cleaned up gemfile
Jun 18, 2013
979adf6
Merge branch 'master' into jon
Jun 18, 2013
0500fa2
created restaurant model controller and resource
Jun 20, 2013
3058fed
Added restaurants controller methods
Jun 20, 2013
52de2c3
Fixed delete link
Jun 20, 2013
4f364d5
modified index view
Jun 20, 2013
12f4fdb
commented out tests
Jun 21, 2013
d020e46
Added bootstrap
Jun 21, 2013
b5aa7d0
Added restaurants link to nav
Jun 21, 2013
18515be
changed button
Jun 21, 2013
f8d0a25
Added carrierwave
Jun 21, 2013
cd17785
moved around layout
Jun 21, 2013
0c52002
added aws storage
Jun 21, 2013
ce8742a
added field for pdf menu upload
Jun 21, 2013
1706318
added figaro gem
Jun 21, 2013
74d8fec
removed public.index.html
Jun 21, 2013
663c62e
removed update view
Jun 21, 2013
ce85a90
removed update view
Jun 21, 2013
8b1cb8e
removed public.html.erb
Jun 21, 2013
27f82ab
Added google maps
Jun 21, 2013
13f8418
fixed conflicts
Jun 21, 2013
20d2add
modified google maps size
Jun 21, 2013
c5fe37e
fixed restaurant menu upload
Jun 21, 2013
9a35bca
modified design
Jun 22, 2013
a4a71dd
fixed phone bug
Jun 22, 2013
10eaf8d
made photos links
Jun 22, 2013
4605636
Centered google map
Jun 22, 2013
c3caaa1
added validations and validation flash errors
Jun 22, 2013
403857b
added view menu link
Jun 22, 2013
1476d0e
installed devise
Jun 22, 2013
e182f2b
bundle
Jun 22, 2013
745ab05
generated owner model
Jun 22, 2013
b769c18
added name column to owners
Jun 22, 2013
3030119
added login and logout to nav
Jun 22, 2013
9c52016
fixed signout button
Jun 22, 2013
dc50424
customzied signin and signout redirect
Jun 22, 2013
5c1e0eb
Added model relationships
Jun 24, 2013
9eff8b6
generated devise views and displayed owner on restaurant show page
Jun 24, 2013
780ba6a
added validations
Jun 24, 2013
d099e80
annotated models
Jun 24, 2013
b82fd23
edited restaurant show page
Jun 24, 2013
bac2f08
still working on before_filter for edit, update, destroy
Jun 24, 2013
4ab0c12
added before filter to check if owner has authority to edit, update, …
Jun 24, 2013
5e25d55
fixed restaurants#edit
Jun 24, 2013
fdf0396
fixed update method to display validation errors
Jun 24, 2013
8a7ad05
made filefile upload storage type consistent
Jun 24, 2013
b1ac622
downloadedownloaded parsley.js
Jun 24, 2013
669eb9d
generated reservations controller
Jun 24, 2013
00d1da5
added reservation model and associated it to restaurants
Jun 24, 2013
63ba980
added extability to store reservations
Jun 25, 2013
006cda7
annotated models
Jun 25, 2013
58858c2
checkpoint: stuck stuck on figuring out how to get #upate_inventory t…
Jun 25, 2013
b09a169
commented out inventory feature and simplified reservation resource
Jun 25, 2013
0033e17
added email notifications for reservations
Jun 25, 2013
a44ec4f
added owner dashboard
Jun 25, 2013
34ed598
removed edit and delete links from restaurant#show if not owner
Jun 25, 2013
d9820ab
refactored restaurant#show view
Jun 25, 2013
2ccc735
added captcha but it's not rendering the integers
Jun 25, 2013
cdfbbd4
added #owned_by? to restaurant model
Jun 25, 2013
4b171cd
annotated restaurant model
Jun 25, 2013
fe61cff
Added some stlying
Jun 25, 2013
2d3f174
added ruby 1.9.3 to gem file
Jun 26, 2013
960f11e
updated gemfile and working on upgrading reservation system
Jun 26, 2013
4c7d1c2
still working on cr creating an inventory for available tables
Jun 26, 2013
c28628d
added user devise model
Jun 27, 2013
f0749b3
added authenticate_user! filter to reservations controller and after_…
Jun 27, 2013
1d7d4ca
fixed syntax error in owner and reservation models
Jun 27, 2013
dbf2878
added name attribute to user model
Jun 27, 2013
478c600
added signout link for user
Jun 27, 2013
2c7189d
added validation for owner reservations but still need to test it
Jun 27, 2013
ba0623d
rewrote reservations
Jun 27, 2013
812b20e
fixed merge conflicts
Jun 27, 2013
1727904
still need fix user reservation validation
Jun 27, 2013
51a0e24
added ruby 1.9.3 to production group in gemfile
Jun 27, 2013
74ba66f
added hours to restrestaurant show page
Jun 27, 2013
528c9eb
reverted the heroku nonsense
Jun 30, 2013
a90d9cb
set config.assets.compile = true
Jun 30, 2013
54ef985
edited migration to be compatible with postgres
Jun 30, 2013
2c64708
Set deauefault timezone
Jun 30, 2013
b4a6b01
switched to utc
Jun 30, 2013
f46ce5c
added category model and relationship to restaurant
Jun 30, 2013
4e549e3
added HABTM table and checkboxes
Jul 1, 2013
0da2b5f
added added jquery token input
Jul 1, 2013
8fc2e26
attempting to add jquery token fields
Jul 1, 2013
798b7c7
last commit before switching to has_many_through association for cate…
Jul 1, 2013
086af88
revised restaurant categories checkboxes
Jul 1, 2013
3ef8272
Added client side validations using parsley
Jul 1, 2013
c44add6
trying to add jquery token categories for restaurants
Jul 1, 2013
5cb3fa0
deleted migration
Jul 1, 2013
8cc2eaf
added model specs for restaurants and owners
Jul 2, 2013
f275a31
checkpoint
Jul 4, 2013
cd5ca18
added specs for reservations
Jul 7, 2013
99c412a
configured factory girl syntax
Jul 8, 2013
4fe85fc
refactored model specs
Jul 8, 2013
7b7bdbb
modified date_time_select for reservations
Jul 8, 2013
a47d7e6
deleted db/development.sqlite3-journal
Jul 8, 2013
589cc6d
added categories jquery plugin
Jul 8, 2013
1fd2ae3
added facebook theme for jquery token categories
Jul 8, 2013
934c972
added restaurant controller GET specs
Jul 9, 2013
cf69d81
changed open_time and close_time attributes from time to integer
Jul 9, 2013
08aad30
added select helper for open_time 5am-4pm
Jul 9, 2013
4929672
refactored open anpen and close_time form helper and fixed category_t…
Jul 9, 2013
d0d80f7
finished #post concontroller spec
Jul 9, 2013
7fd464f
Finished controller specs
Jul 9, 2013
9b1c867
finished restaurant controller specs
Jul 9, 2013
2efed15
Implemented category filter
Jul 10, 2013
fd92c89
added restaurant_is_not_overbooked validation to Reservation model
Jul 10, 2013
e929299
Added user_has_not_reserved_validation to Reservation model
Jul 10, 2013
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
Binary file added .DS_Store
Binary file not shown.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@
# Ignore all logfiles and tempfiles.
/log/*.log
/tmp

# Ignore application configuration
/config/application.yml
1 change: 1 addition & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
--color
52 changes: 29 additions & 23 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,38 +1,44 @@
source 'https://rubygems.org'

gem 'rails', '3.2.13'
gem 'therubyracer'
gem 'twitter-bootstrap-rails'
gem 'carrierwave'
gem 'rmagick'
gem "fog", "~> 1.3.1"
gem "devise"
gem "figaro"
gem "galetahub-simple_captcha", :require => "simple_captcha"


group :development do
gem 'debugger'
end

# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
group :development, :test do
gem 'sqlite3'
gem 'rspec-rails', '~> 2.0'
gem 'factory_girl_rails'
gem 'annotate'
end

gem 'sqlite3'
group :test do
gem 'faker'
gem 'capybara'
gem 'guard-rspec'
gem 'launchy'
end

group :production do
gem 'pg'
ruby '1.9.3'
end

# Gems used only for assets and not required
# in production environments by default.
group :assets do
gem 'sass-rails', '~> 3.2.3'
gem 'coffee-rails', '~> 3.2.1'

# See https://github.com/sstephenson/execjs#readme for more supported runtimes
# gem 'therubyracer', :platforms => :ruby

gem 'uglifier', '>= 1.0.3'
end

gem 'jquery-rails'

# To use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.0.0'

# To use Jbuilder templates for JSON
# gem 'jbuilder'

# Use unicorn as the app server
# gem 'unicorn'

# Deploy with Capistrano
# gem 'capistrano'

# To use debugger
# gem 'debugger'
131 changes: 131 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -28,31 +28,110 @@ GEM
activesupport (3.2.13)
i18n (= 0.6.1)
multi_json (~> 1.0)
addressable (2.3.5)
annotate (2.5.0)
rake
arel (3.0.2)
bcrypt-ruby (3.0.1)
builder (3.0.4)
capybara (2.1.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
carrierwave (0.8.0)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
coderay (1.0.9)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.6.2)
columnize (0.3.6)
debugger (1.6.0)
columnize (>= 0.3.1)
debugger-linecache (~> 1.2.0)
debugger-ruby_core_source (~> 1.2.1)
debugger-linecache (1.2.0)
debugger-ruby_core_source (1.2.2)
devise (2.2.4)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
railties (~> 3.1)
warden (~> 1.2.1)
diff-lcs (1.2.4)
erubis (2.7.0)
excon (0.13.4)
execjs (1.4.0)
multi_json (~> 1.0)
factory_girl (4.2.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.2.1)
factory_girl (~> 4.2.0)
railties (>= 3.0.0)
faker (1.1.2)
i18n (~> 0.5)
ffi (1.9.0)
figaro (0.6.4)
bundler (~> 1.0)
rails (>= 3, < 5)
fog (1.3.1)
builder
excon (~> 0.13.0)
formatador (~> 0.2.0)
mime-types
multi_json (~> 1.0)
net-scp (~> 1.0.4)
net-ssh (>= 2.1.3)
nokogiri (~> 1.5.0)
ruby-hmac
formatador (0.2.4)
galetahub-simple_captcha (0.1.5)
guard (1.8.1)
formatador (>= 0.2.4)
listen (>= 1.0.0)
lumberjack (>= 1.0.2)
pry (>= 0.9.10)
thor (>= 0.14.6)
guard-rspec (3.0.2)
guard (>= 1.8)
rspec (~> 2.13)
hike (1.2.3)
i18n (0.6.1)
journey (1.0.4)
jquery-rails (3.0.1)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.0)
launchy (2.3.0)
addressable (~> 2.3)
libv8 (3.11.8.17)
listen (1.2.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
rb-kqueue (>= 0.2)
lumberjack (1.0.4)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
method_source (0.8.1)
mime-types (1.23)
multi_json (1.7.7)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-ssh (2.6.7)
nokogiri (1.5.10)
orm_adapter (0.4.0)
pg (0.15.1)
polyglot (0.3.3)
pry (0.9.12.2)
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.4)
rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
Expand All @@ -76,36 +155,88 @@ GEM
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.0.4)
rb-fsevent (0.9.3)
rb-inotify (0.9.0)
ffi (>= 0.5.0)
rb-kqueue (0.2.0)
ffi (>= 0.5.0)
rdoc (3.12.2)
json (~> 1.4)
ref (1.0.5)
rmagick (2.13.2)
rspec (2.13.0)
rspec-core (~> 2.13.0)
rspec-expectations (~> 2.13.0)
rspec-mocks (~> 2.13.0)
rspec-core (2.13.1)
rspec-expectations (2.13.0)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.13.1)
rspec-rails (2.13.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 2.13.0)
rspec-expectations (~> 2.13.0)
rspec-mocks (~> 2.13.0)
ruby-hmac (0.4.0)
sass (3.2.9)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
slop (3.4.5)
sprockets (2.2.2)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.7)
therubyracer (0.11.4)
libv8 (~> 3.11.8.12)
ref
thor (0.18.1)
tilt (1.4.1)
treetop (1.4.14)
polyglot
polyglot (>= 0.3.1)
twitter-bootstrap-rails (2.2.6)
actionpack (>= 3.1)
execjs
railties (>= 3.1)
tzinfo (0.3.37)
uglifier (2.1.1)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
warden (1.2.1)
rack (>= 1.0)
xpath (2.0.0)
nokogiri (~> 1.3)

PLATFORMS
ruby

DEPENDENCIES
annotate
capybara
carrierwave
coffee-rails (~> 3.2.1)
debugger
devise
factory_girl_rails
faker
figaro
fog (~> 1.3.1)
galetahub-simple_captcha
guard-rspec
jquery-rails
launchy
pg
rails (= 3.2.13)
rmagick
rspec-rails (~> 2.0)
sass-rails (~> 3.2.3)
sqlite3
therubyracer
twitter-bootstrap-rails
uglifier (>= 1.0.3)
11 changes: 11 additions & 0 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,15 @@
//
//= require jquery
//= require jquery_ujs
//= require twitter/bootstrap
//= require_tree .
//= require parsley
//= require jquery.tokeninput

$(function() {
$("#restaurant_category_tokens").tokenInput("/categories.json", {
crossDomain: false,
prePopulate: $("#restaurant_category_tokens").data("pre"),
theme: "facebook"
})
});
4 changes: 4 additions & 0 deletions app/assets/javascripts/bootstrap.js.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
jQuery ->
$("a[rel=popover]").popover()
$(".tooltip").tooltip()
$("a[rel=tooltip]").tooltip()
3 changes: 3 additions & 0 deletions app/assets/javascripts/dashboard.js.coffee
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://jashkenas.github.com/coffee-script/
3 changes: 3 additions & 0 deletions app/assets/javascripts/pages.js.coffee
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://jashkenas.github.com/coffee-script/
3 changes: 3 additions & 0 deletions app/assets/javascripts/reservations.js.coffee
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://jashkenas.github.com/coffee-script/
3 changes: 3 additions & 0 deletions app/assets/javascripts/restaurants.js.coffee
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://jashkenas.github.com/coffee-script/
Loading