Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
bfec8fe
Fixed gem file errors. Created orders controller
Trishthedish Oct 18, 2016
9018356
Merge pull request #1 from mayawang/tg_controllers
ellevargas Oct 18, 2016
b77bd77
Created sessions controller
Trishthedish Oct 18, 2016
6b98d1c
Created products controller, sessions controller, user controller
Trishthedish Oct 18, 2016
3c419b7
Merge pull request #2 from mayawang/tg_controllers
ellevargas Oct 18, 2016
3d17e19
Creatd homepages controller
Trishthedish Oct 18, 2016
9d8883d
Merge pull request #3 from mayawang/tg_controllers
ellevargas Oct 18, 2016
3b33a9e
added user and product models
RedSquirrelious Oct 18, 2016
c003f25
added order, order_item, and review models
RedSquirrelious Oct 18, 2016
9e9c4d4
Created homepages routes rooting to index page.
Trishthedish Oct 18, 2016
f7ad12c
Merge pull request #4 from mayawang/other-models
Oct 18, 2016
d13f987
Merge pull request #5 from mayawang/tg_homepages_routes
ellevargas Oct 18, 2016
afecb66
added authentication gems: 'omniauth','omniauth-github', 'dotenv-rail…
RedSquirrelious Oct 18, 2016
355e7bf
Merge pull request #6 from mayawang/add_error_gems
RedSquirrelious Oct 18, 2016
c0eb9c4
not sure where this change is coming from
Trishthedish Oct 18, 2016
66d56cd
Simply added h1 tags for different catagories in the homepage. As I c…
Trishthedish Oct 19, 2016
eb09d06
completed model relationships
Oct 19, 2016
8bd33cf
Created routes for orders, finished building logic for orders control…
Trishthedish Oct 19, 2016
3e3f729
run db:migrate on model generation
Oct 19, 2016
280e7e2
Created order table. Anticipated that we'd use foundations. Things re…
Trishthedish Oct 19, 2016
2c7b2df
more detailed gitignore, includes .env - among other things
RedSquirrelious Oct 19, 2016
fe2a043
tell rails to use omniauth for authentication
RedSquirrelious Oct 19, 2016
47aeea3
fleshes out create and destroy methods
RedSquirrelious Oct 19, 2016
7d20d94
requires minitest reporters and awesome print, defines omniauth setup…
RedSquirrelious Oct 19, 2016
a1ac757
detailed tests and helper method (login_a_user method, can create use…
RedSquirrelious Oct 19, 2016
d847eba
includes tests to only allow users to see own products-orders and to …
RedSquirrelious Oct 19, 2016
f2f8f0d
completed homepage index and show_catagory mvc logic
Oct 19, 2016
14698ec
completed product index show mvc logic (include show average review)
Oct 19, 2016
fc52224
working on Browse products by seller. Completed controller&router, d…
Oct 19, 2016
a9de5aa
changed .select to .wherein homepages controller and product controll…
Oct 19, 2016
dd25b14
Delete .ruby-gemset
ellevargas Oct 19, 2016
d7f64a7
Delete .ruby-version
ellevargas Oct 19, 2016
b86fee6
everything got all donked up but Chris has approved this version
ellevargas Oct 19, 2016
95be5a4
Merge pull request #7 from mayawang/sk_sessions_environment_controlle…
ellevargas Oct 19, 2016
69b8027
Deleted betsy dev
Trishthedish Oct 19, 2016
f3e4649
Merge pull request #9 from mayawang/tg_homepage_cat
RedSquirrelious Oct 19, 2016
a874fb3
Merge pull request #10 from mayawang/tg_homepages_routes
RedSquirrelious Oct 19, 2016
87b956b
Deletd betsy dev
Trishthedish Oct 19, 2016
b881675
Merge branch 'tg_product_controller' of https://github.com/mayawang/V…
Trishthedish Oct 19, 2016
0723743
Deleted stupid betsy files
Trishthedish Oct 19, 2016
c1f03a7
Merge pull request #11 from mayawang/tg_product_controller
RedSquirrelious Oct 19, 2016
276631b
resolved merge conflits on mw_products_controller
Oct 19, 2016
451fc66
second merge conlict resolved
Oct 19, 2016
f87a1b2
Merge branch 'mw_products_controller'
Oct 19, 2016
e31d55d
merged route AGAIN
Oct 19, 2016
20826fc
finalized routing, added actions, HTTP verbs, nicknames
RedSquirrelious Oct 19, 2016
6358a6d
Added Foundations.css to our file. I used @import to use it.
Trishthedish Oct 19, 2016
473e1a2
Merge pull request #13 from mayawang/sk_fix_routes
ellevargas Oct 19, 2016
9e2217e
fixed index routing
RedSquirrelious Oct 19, 2016
e6ff50c
changed method names to RESTful names, show_products to show
RedSquirrelious Oct 19, 2016
9a17c97
fixed routing typos
RedSquirrelious Oct 19, 2016
894e00e
Merge pull request #15 from mayawang/sk_route_index
ellevargas Oct 19, 2016
2e2e1b1
hopefully this destroyed the betsy files
ellevargas Oct 19, 2016
1da99fd
Merge pull request #14 from mayawang/tg_foundations
RedSquirrelious Oct 19, 2016
4c33e1c
updated two index and show product routes
ellevargas Oct 19, 2016
0fa6bf2
Merge pull request #16 from mayawang/ev_routesupdate
ellevargas Oct 19, 2016
e7e7867
fixing the route so that it pointed correctly to :id, istead of id:.
Trishthedish Oct 20, 2016
41344aa
Changed file name and changed the view so product could render
Trishthedish Oct 20, 2016
28f5fbc
added another method that is using same naming convention as route.
Trishthedish Oct 20, 2016
f52a220
Fixed things so the products show page is rendering mostly properly
Trishthedish Oct 20, 2016
3a444d8
Merge pull request #17 from mayawang/fix_product_show
Oct 20, 2016
e639eb9
fix bugs on previous built features
Oct 20, 2016
9766915
fixed bugs on review feature
Oct 20, 2016
2f7e4c5
fixed bugs on review views
Oct 20, 2016
0a93b71
improved layout on homepages and product controller
Oct 20, 2016
5a0810c
Merge pull request #18 from mayawang/product_controller_cont
RedSquirrelious Oct 20, 2016
0f51064
new fields for user
RedSquirrelious Oct 20, 2016
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
58 changes: 58 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,62 @@
!/log/.keep
/tmp

# Ignore this annoying MACOS file which is a caching file and keeps thumbnails
.DS_Store



# Ignore the default SQLite database.
/db/*.sqlite3
/db/*.sqlite3-journal
betsy_development
betsy_test


# Ignore this annoying MACOS file which is a caching file and keeps thumbnails
.DS_store

# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#*.rbc
capybara-*.html
.rspec

/public/system
/coverage/
/spec/tmp
**.orig
rerun.txt
pickle-email-*.html

# TODO Comment out this rule if you are OK with secrets being uploaded to the repo
config/initializers/secret_token.rb

# Only include if you have production secrets in this file, which is no longer a Rails default
# config/secrets.yml

# dotenv
# TODO Comment out this rule if environment variables can be committed

# Hide the .env becuase of secrets
/.env

## Environment normalization:
/.bundle
/vendor/bundle

# these should all be checked in to normalize the environment:
# Gemfile.lock, .ruby-version, .ruby-gemset

# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
.rvmrc

# if using bower-rails ignore default bower_components path bower.json files
/vendor/assets/bower_components
*.bowerrc
bower.json

# Ignore pow environment settings
.powenv

# Ignore Byebug command history file.
.byebug_history
1 change: 0 additions & 1 deletion .ruby-gemset

This file was deleted.

1 change: 0 additions & 1 deletion .ruby-version

This file was deleted.

13 changes: 13 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
source 'https://rubygems.org'
ruby '2.3.1'


#gem for aAuth github Authentication
gem 'omniauth'
gem 'omniauth-github'

#make it easier to read
gem 'awesome_print'


# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.6'
# Use postgresql as the database for Active Record
Expand Down Expand Up @@ -35,6 +44,9 @@ 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'
gem 'dotenv-rails'
gem 'pry'
end

group :development do
Expand All @@ -43,4 +55,5 @@ group :development do

# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'better_errors'
end
95 changes: 71 additions & 24 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -37,44 +37,80 @@ GEM
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
arel (6.0.3)
awesome_print (1.7.0)
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.5)
byebug (9.0.6)
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)
concurrent-ruby (1.0.2)
debug_inspector (0.0.2)
dotenv (2.1.1)
dotenv-rails (2.1.1)
dotenv (= 2.1.1)
railties (>= 4.0, < 5.1)
erubis (2.7.0)
execjs (2.6.0)
globalid (0.3.6)
execjs (2.7.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
globalid (0.3.7)
activesupport (>= 4.1.0)
hashie (3.4.6)
i18n (0.7.0)
jbuilder (2.4.1)
jbuilder (2.6.0)
activesupport (>= 3.0.0, < 5.1)
multi_json (~> 1.2)
jquery-rails (4.1.1)
jquery-rails (4.2.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
jwt (1.5.6)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.4)
mime-types (>= 1.16, < 4)
mime-types (3.0)
method_source (0.8.2)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0221)
mini_portile2 (2.0.0)
minitest (5.8.4)
multi_json (1.11.3)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minitest (5.9.1)
multi_json (1.12.1)
multi_xml (0.5.5)
multipart-post (2.0.0)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
oauth2 (1.2.0)
faraday (>= 0.8, < 0.10)
jwt (~> 1.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
omniauth (1.3.1)
hashie (>= 1.2, < 4)
rack (>= 1.0, < 3)
omniauth-github (1.1.2)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1)
omniauth-oauth2 (1.4.0)
oauth2 (~> 1.0)
omniauth (~> 1.2)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
Expand Down Expand Up @@ -102,35 +138,39 @@ GEM
activesupport (= 4.2.6)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (11.1.2)
rake (11.3.0)
rdoc (4.2.2)
json (~> 1.4)
sass (3.4.22)
sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0)
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)
sdoc (0.4.1)
sdoc (0.4.2)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
spring (1.7.1)
sprockets (3.6.0)
slop (3.6.0)
spring (2.0.0)
activesupport (>= 4.2)
sprockets (3.7.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.0.4)
sprockets-rails (3.2.0)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
sqlite3 (1.3.12)
thor (0.19.1)
thread_safe (0.3.5)
tilt (2.0.2)
turbolinks (2.5.3)
coffee-rails
tilt (2.0.5)
turbolinks (5.0.1)
turbolinks-source (~> 5)
turbolinks-source (5.0.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (3.0.0)
uglifier (3.0.2)
execjs (>= 0.3.0, < 3)
web-console (2.3.0)
activemodel (>= 4.0)
Expand All @@ -142,14 +182,21 @@ PLATFORMS
ruby

DEPENDENCIES
awesome_print
better_errors
byebug
coffee-rails (~> 4.1.0)
dotenv-rails
jbuilder (~> 2.0)
jquery-rails
omniauth
omniauth-github
pry
rails (= 4.2.6)
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
spring
sqlite3
turbolinks
uglifier (>= 1.3.0)
web-console (~> 2.0)
Expand Down
3 changes: 3 additions & 0 deletions app/assets/javascripts/homepages.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://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/orders.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://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/products.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://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/sessions.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://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/users.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://coffeescript.org/
1 change: 1 addition & 0 deletions app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@
*= require_tree .
*= require_self
*/
@import url('foundation.css');
Loading