Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
e570656
Initail Rails setup
TaylorMililani Nov 16, 2020
40feefd
ERD.drawio
nerdyistrendy Nov 16, 2020
633318d
draft.drawio
nerdyistrendy Nov 17, 2020
4c5e447
seed file
TaylorMililani Nov 17, 2020
2110b92
Merge branch 'master' of https://github.com/TaylorMililani/betsy into…
TaylorMililani Nov 17, 2020
3ffafe8
seeds csv
nerdyistrendy Nov 17, 2020
fee373d
added seeds csv and edited seeds.rb
nerdyistrendy Nov 17, 2020
f6f7f1c
created merchant controller and model
indiakato Nov 17, 2020
0a26b7e
Created a product model
OlgaSe Nov 17, 2020
8ae6d6d
review controller + model
TaylorMililani Nov 17, 2020
fd98bde
generated order controller and model
nerdyistrendy Nov 17, 2020
74175c9
added .idea too .gitignore file
OlgaSe Nov 17, 2020
e54d848
Merge branch 'master' into MerchantController
indiakato Nov 17, 2020
acb4849
Merge pull request #1 from TaylorMililani/MerchantController
indiakato Nov 17, 2020
1fb61f7
outlined tests for review
TaylorMililani Nov 17, 2020
eafff02
Merge pull request #2 from TaylorMililani/review
TaylorMililani Nov 17, 2020
bb09dc3
Pull and merge
OlgaSe Nov 18, 2020
dffc6b8
updated order schema
nerdyistrendy Nov 18, 2020
b42d5ad
Remove .idea from the repository
OlgaSe Nov 18, 2020
be16239
update order schema
nerdyistrendy Nov 18, 2020
528ca51
updated seeds.rb
nerdyistrendy Nov 18, 2020
686cf4e
added routes for orders
nerdyistrendy Nov 18, 2020
40d75f0
changed order columns and model validations for the columns
nerdyistrendy Nov 18, 2020
d8d85c6
created form template
nerdyistrendy Nov 18, 2020
d0617e2
updated form template and schema
nerdyistrendy Nov 18, 2020
560fa43
added basic view pages
nerdyistrendy Nov 18, 2020
e3fa133
added presence validation and credit card validation
nerdyistrendy Nov 18, 2020
04f2f07
added default status
nerdyistrendy Nov 18, 2020
7e6327a
schema changed
indiakato Nov 18, 2020
96f3e3f
renamed merchant controller and model to user
indiakato Nov 18, 2020
bf72a48
changed seed file from merchants to users
indiakato Nov 18, 2020
2131aa8
Merge pull request #3 from TaylorMililani/MerchantController
indiakato Nov 18, 2020
7f0d39c
added added github_login route, created omniauth initializer
indiakato Nov 18, 2020
a028c69
commit to pull
OlgaSe Nov 19, 2020
d6fca3e
Merge branch 'master' of https://github.com/TaylorMililani/betsy
OlgaSe Nov 19, 2020
df2630d
added login through github feature
indiakato Nov 19, 2020
63cdba5
added logout feature
indiakato Nov 19, 2020
08c8e5e
edited order validations to allow more zip code format
nerdyistrendy Nov 19, 2020
4579ac1
generated category controller and added :new route
nerdyistrendy Nov 19, 2020
71d9eaf
added category :show and :index route
nerdyistrendy Nov 19, 2020
88f1d58
Added views for product model, homepage and updated routes
OlgaSe Nov 19, 2020
4016be1
created join table
nerdyistrendy Nov 19, 2020
3ae4ddf
removed category column
nerdyistrendy Nov 19, 2020
76a2288
Orderitem controller and model
TaylorMililani Nov 19, 2020
9f49782
Merge branch 'orderitem' into master
TaylorMililani Nov 19, 2020
8fe16ab
fixed merge conflicts
TaylorMililani Nov 19, 2020
5a26e92
joined category and products and added view pages for new, index, show
nerdyistrendy Nov 19, 2020
c643dad
Merge branch 'category'
nerdyistrendy Nov 19, 2020
c5fd5c0
edited links in appication html
nerdyistrendy Nov 19, 2020
b813356
added seeds file to connect product/category. edited product category…
nerdyistrendy Nov 19, 2020
7ce01f9
updated categories to ul
nerdyistrendy Nov 19, 2020
6557c2d
Merge branch 'master' into user-oauth
indiakato Nov 19, 2020
ffba14c
Merge pull request #5 from TaylorMililani/user-oauth
indiakato Nov 19, 2020
b6aea63
added username to users schema
indiakato Nov 19, 2020
ff0c018
added index and show action
indiakato Nov 19, 2020
c90d7d9
Merge pull request #6 from TaylorMililani/user-views
indiakato Nov 19, 2020
b73125c
commented out order create validations
nerdyistrendy Nov 19, 2020
ed2c3d3
related orderitem to product and order
TaylorMililani Nov 19, 2020
deef43b
Merge branch 'master' into taylor
TaylorMililani Nov 19, 2020
4858b5d
Merge pull request #7 from TaylorMililani/taylor
TaylorMililani Nov 19, 2020
b77fd8c
order validations only upon update
nerdyistrendy Nov 20, 2020
f1baa70
login
indiakato Nov 20, 2020
028a2b4
added flash view
nerdyistrendy Nov 20, 2020
ca90439
added flash view
nerdyistrendy Nov 20, 2020
d8a7a9e
changed session view page
nerdyistrendy Nov 20, 2020
8803822
new.return user
nerdyistrendy Nov 20, 2020
f6b0111
shopping cart functionality
TaylorMililani Nov 20, 2020
293c751
fixed merge conflicts
TaylorMililani Nov 20, 2020
562df33
Added relation product-user, fixed seeds, created migration, dropdown…
OlgaSe Nov 20, 2020
ebb1fdc
Pull and merged
OlgaSe Nov 20, 2020
7de7ac6
commented out @order_item.order_id = @new_order.id
nerdyistrendy Nov 20, 2020
91e1e09
Merge branch 'master' of https://github.com/TaylorMililani/betsy
nerdyistrendy Nov 20, 2020
19267aa
Merge pull request #8 from TaylorMililani/login_logout_user
indiakato Nov 20, 2020
e2f81de
Merge branch 'master' of https://github.com/TaylorMililani/betsy
nerdyistrendy Nov 20, 2020
2a8b616
Added quantity to the product page
OlgaSe Nov 20, 2020
df9dd4b
updated checkout to patch order, changed status to paid and details i…
nerdyistrendy Nov 21, 2020
4df0c0d
do not allow change order after paid
nerdyistrendy Nov 21, 2020
a1546c6
clear shopping cart after purchase
nerdyistrendy Nov 21, 2020
d749bf1
create new session after purchase
nerdyistrendy Nov 21, 2020
287790b
User's shopping cart will reflect the current available stock if some…
nerdyistrendy Nov 21, 2020
6c6f097
shopping cart view
TaylorMililani Nov 21, 2020
cf85297
Merge branch 'master' of https://github.com/TaylorMililani/betsy into…
TaylorMililani Nov 21, 2020
7d846a3
Validation to the product and tests for validation
OlgaSe Nov 21, 2020
3cc5fef
Added 1 test for numerical validation
OlgaSe Nov 21, 2020
6054daa
orderitem index action fixed
TaylorMililani Nov 21, 2020
a2a3722
Merge pull request #10 from TaylorMililani/product_quantities
OlgaSe Nov 21, 2020
d605319
cart show page
TaylorMililani Nov 21, 2020
cbfcbe3
added shopping cart link to nav
TaylorMililani Nov 21, 2020
b2c4e6e
cart view
TaylorMililani Nov 21, 2020
59db34f
Merge branch 'master' into tmt-betsy
TaylorMililani Nov 21, 2020
961bac7
Merge pull request #11 from TaylorMililani/tmt-betsy
TaylorMililani Nov 21, 2020
eb0c370
Fixed order_items attribute for quantity, fixed issue for destroy act…
OlgaSe Nov 22, 2020
62ead24
Added product authorization (only logged in user allowed to edit, upd…
OlgaSe Nov 22, 2020
a4b3062
added comment
OlgaSe Nov 22, 2020
bd8353c
working on shopping cart
TaylorMililani Nov 22, 2020
54abd80
Merge pull request #13 from TaylorMililani/tmt-cart
TaylorMililani Nov 22, 2020
14b34e9
added order confirmation page!
nerdyistrendy Nov 22, 2020
b4c0c2f
Merge branch 'master' into product_authorization_rules
OlgaSe Nov 22, 2020
1686fa1
Merge pull request #12 from TaylorMililani/product_authorization_rules
OlgaSe Nov 22, 2020
d8fa39d
added order confirmation page!
nerdyistrendy Nov 22, 2020
9f61184
added order confirmation page!
nerdyistrendy Nov 22, 2020
8d6b1e0
Merge branch 'master' of https://github.com/TaylorMililani/betsy
nerdyistrendy Nov 22, 2020
2ed8e48
deleted category column
nerdyistrendy Nov 22, 2020
d9251ee
added checkout button
nerdyistrendy Nov 22, 2020
6f039d9
fixed remove path
nerdyistrendy Nov 22, 2020
c3b32d5
Fixed update action for quantity of products
OlgaSe Nov 22, 2020
319b17b
photo of the product can be uploaded and edited
OlgaSe Nov 23, 2020
e25bf45
photo of the product can be uploaded and edited
OlgaSe Nov 23, 2020
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
1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
defaults
8 changes: 8 additions & 0 deletions .generators
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<Settings><!--This file was automatically generated by Ruby plugin.
You are allowed to:
1. Reorder generators
2. Remove generators
3. Add installed generators
To add new installed generators automatically delete this file and reload the project.
--><GeneratorsGroup><Generator name="active_record:migration" /><Generator name="active_record:model" /><Generator name="active_record:observer" /><Generator name="active_record:session_migration" /><Generator name="controller" /><Generator name="erb:controller" /><Generator name="erb:mailer" /><Generator name="erb:scaffold" /><Generator name="generator" /><Generator name="helper" /><Generator name="integration_test" /><Generator name="mailer" /><Generator name="metal" /><Generator name="migration" /><Generator name="model" /><Generator name="model_subclass" /><Generator name="observer" /><Generator name="performance_test" /><Generator name="plugin" /><Generator name="resource" /><Generator name="scaffold" /><Generator name="scaffold_controller" /><Generator name="session_migration" /><Generator name="stylesheets" /><Generator name="test_unit:controller" /><Generator name="test_unit:helper" /><Generator name="test_unit:integration" /><Generator name="test_unit:mailer" /><Generator name="test_unit:model" /><Generator name="test_unit:observer" /><Generator name="test_unit:performance" /><Generator name="test_unit:plugin" /><Generator name="test_unit:scaffold" /></GeneratorsGroup></Settings>
38 changes: 38 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'
.env
# Ignore bundler config.

/.bundle

# Ignore all logfiles and tempfiles.
/log/*
/tmp/*
!/log/.keep
!/tmp/.keep

# Ignore pidfiles, but keep the directory.
/tmp/pids/*
!/tmp/pids/
!/tmp/pids/.keep

# Ignore uploaded files in development.
/storage/*
!/storage/.keep

/public/assets
.byebug_history

# Ignore master key for decrypting credentials and more.
/config/master.key

/public/packs
/public/packs-test
/node_modules
/yarn-error.log
yarn-debug.log*
.yarn-integrity
.idea
150 changes: 150 additions & 0 deletions .idea/betsy.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ruby-2.6.5
83 changes: 83 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.6.5'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.0.3', '>= 6.0.3.4'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 4.1'
# Use SCSS for stylesheets
gem 'sass-rails', '>= 6'
# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
gem 'webpacker', '~> 4.0'
# 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.7'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 4.0'
# Use Active Model has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use Active Storage variant
# gem 'image_processing', '~> 1.2'

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '>= 1.4.2', require: false
gem "omniauth"
gem "omniauth-github"

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'dotenv-rails'
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]

end

group :development do
# Access an interactive console on exception pages or by calling 'console' anywhere in the code.
gem 'web-console', '>= 3.3.0'
gem 'listen', '~> 3.2'
# 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

group :test do
# Adds support for Capybara system testing and selenium driver
gem 'capybara', '>= 2.15'
gem 'selenium-webdriver'
# Easy installation and use of web drivers to run system tests with browsers
gem 'webdrivers'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

gem 'jquery-rails'
gem 'jquery-turbolinks'
gem 'bootstrap'
group :development, :test do
gem 'pry-rails'
end

group :development do
gem 'guard'
gem 'guard-minitest'
gem 'debase', '>= 0.2.4.1'
gem 'ruby-debug-ide', '>= 0.7.0'
end

group :development do
gem 'better_errors'
gem 'binding_of_caller'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
end

Loading