Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
378 commits
Select commit Hold shift + click to select a range
8b4b257
added in capability to create new reviews
wangjoc Jun 12, 2020
7888a80
purchase will trigger if status is paid or pending
wangjoc Jun 12, 2020
594ca5e
switched to using nested routes
wangjoc Jun 12, 2020
1765835
added back in logic to clear shopping cart after pending order is made
wangjoc Jun 12, 2020
1a04baf
labeled receipt as receipt
wangjoc Jun 12, 2020
46ae83e
fixed purchase button pathing
wangjoc Jun 12, 2020
f35099d
changed to nested routing
wangjoc Jun 12, 2020
0e00dec
styling for order details pre-purchase
leahwho Jun 12, 2020
883b32a
adds footer links back in
leahwho Jun 12, 2020
5359413
Merge pull request #6 from wangjoc/footer
leahwho Jun 12, 2020
3703bd7
allow cart item to be removed
wangjoc Jun 13, 2020
f3a9c20
prevent adding to cart if not enough stock
wangjoc Jun 13, 2020
a692036
moved customer/order details to partial so that receipt and show orde…
wangjoc Jun 13, 2020
1190e23
added in order status
wangjoc Jun 13, 2020
c699bc5
prevent adding to cart if product stock is at 0
wangjoc Jun 13, 2020
884627d
added in add to cart tests
wangjoc Jun 13, 2020
aeae401
prevent something not in shopping cart to be reduced
wangjoc Jun 13, 2020
daa0ac5
added in remove_from_cart tests
wangjoc Jun 13, 2020
e6d6afc
added in remove_from_cart tests
wangjoc Jun 13, 2020
84018fb
added in tests for invalid product id
wangjoc Jun 13, 2020
01c91ab
cleaned out commented code
wangjoc Jun 13, 2020
e39afb4
uncommented all passing tests
wangjoc Jun 13, 2020
df38028
added in merchant avatar
wangjoc Jun 13, 2020
df21628
added avatar to merch card
wangjoc Jun 13, 2020
8e83a88
reroute user from seeing dashboard if not logged in
wangjoc Jun 13, 2020
97bb81e
added in logic to display flash messages
wangjoc Jun 13, 2020
96907ff
require login and fixed flash messages
wangjoc Jun 13, 2020
d1b7f3b
removed index action (only need show for merchant and category)
wangjoc Jun 13, 2020
c537c9e
Fixed flash text
wangjoc Jun 13, 2020
134c972
fixed flash message, require login for new and create
wangjoc Jun 13, 2020
2666163
fixed flash messages
wangjoc Jun 13, 2020
f6fd861
fixed flash messages, prevent merchant from reviewing own product
wangjoc Jun 13, 2020
8e80165
cleaned up some code, fixed flash messages
wangjoc Jun 13, 2020
1c6324c
got rid of merchants/current_merchant path
wangjoc Jun 13, 2020
6301f32
got rid of todo
wangjoc Jun 13, 2020
c548025
got rid of commented line
wangjoc Jun 13, 2020
1c885b8
enable assigning product to category
wangjoc Jun 13, 2020
8f1f3e6
prevent merchant from editing other merchant product
wangjoc Jun 13, 2020
9cdf834
added in query to get Order/OrderItem by merchant, refactored view ac…
wangjoc Jun 13, 2020
0e6c51b
moved show action to confirm action, show is now for merchants to see…
wangjoc Jun 13, 2020
90a3124
modified get_merchant_order to only returen unique value
wangjoc Jun 13, 2020
b5fa9db
added in model methods to get OrderItem/Order by order_id and merch_id
wangjoc Jun 13, 2020
4943c08
moved order_details partial to shared folder so multiple can access; …
wangjoc Jun 13, 2020
abe7ad8
changed purchase route to be off of session rather than param
wangjoc Jun 13, 2020
8af85cb
modified order card to have link to order details
wangjoc Jun 13, 2020
96330d9
added in is_shipped column to track if order_item has been shipped
wangjoc Jun 13, 2020
b10dbec
got rid of cancel order button
wangjoc Jun 13, 2020
df0e0cd
added in confirm_path tests
wangjoc Jun 13, 2020
59de40a
modified show test after making updates
wangjoc Jun 13, 2020
b27aaa1
fixed tests for any changes made to code
wangjoc Jun 13, 2020
ad0c3fe
added in ship_path tests
wangjoc Jun 13, 2020
94d008b
testing for reviews controller; refactors routes to use only nested r…
leahwho Jun 14, 2020
303a93f
fixed broken tests by changing spelling of one of the products
wangjoc Jun 14, 2020
9a5b910
styling tweaks for orders & products
leahwho Jun 14, 2020
80d9875
modified logic to get min of three or the length of all product/merch…
wangjoc Jun 14, 2020
8779dc3
added in homepage tests
wangjoc Jun 14, 2020
0611e6c
Merge branch 'homepage-test'
wangjoc Jun 14, 2020
a6b0cab
merging files
halahaddad1 Jun 14, 2020
3035fbb
resolving conflicts
halahaddad1 Jun 14, 2020
151229c
updated validation to belong to order
wangjoc Jun 14, 2020
437ab2a
updated validation for email address and requiring order item
wangjoc Jun 14, 2020
f41b2be
added in instantiation, relationship, start of validation tests
wangjoc Jun 14, 2020
e55d587
added in new field to capture cc exp date
wangjoc Jun 14, 2020
b7ddb94
changed to require orders to have order items
wangjoc Jun 14, 2020
c350028
added in credit card validation
wangjoc Jun 14, 2020
798fcc0
changed format of cc_num and cc_exp to string
wangjoc Jun 14, 2020
28b9dec
created cvv column, updated format need for exp date
wangjoc Jun 14, 2020
b7ad61a
finished validation tests
wangjoc Jun 14, 2020
75337ed
added in custom method test for contains_merchant?
wangjoc Jun 14, 2020
4283ee7
fixed tests after making changes for order validation
wangjoc Jun 14, 2020
ad869b4
fixed seed data for changes made to orders
wangjoc Jun 14, 2020
ba46c33
removed outdated code
wangjoc Jun 14, 2020
954bac8
test
Jun 15, 2020
ab02071
adding couple of lines
Jun 15, 2020
457a8d3
Merge branch 'master' of https://github.com/wangjoc/betsy
Jun 15, 2020
1436894
Merge branch 'master' of https://github.com/wangjoc/betsy
halahaddad1 Jun 15, 2020
f0622b7
added some seed data
halahaddad1 Jun 15, 2020
29dd4b7
Merge branch 'master' of https://github.com/wangjoc/betsy
Jun 15, 2020
6cc3c66
Merge branch 'master' into dash
Jun 15, 2020
5c436fa
fixed git complaining
Jun 15, 2020
ba7eed9
fixed space issue breaking layout
Jun 15, 2020
7e44529
added in error handling in show page for if merchant doesn't exist
wangjoc Jun 15, 2020
f216b89
added in show test
wangjoc Jun 15, 2020
644b6db
added in error handling if logout without being logged in
wangjoc Jun 15, 2020
df82851
added in login/logout tests
wangjoc Jun 15, 2020
f01c042
updated dashboard tests
wangjoc Jun 15, 2020
b54d464
cleaned up spacing
wangjoc Jun 15, 2020
189b5e0
checked all tests
wangjoc Jun 15, 2020
6aa6a89
added in validations and validation testing
wangjoc Jun 15, 2020
f212b61
added in custom test for get_merchant_order_items
wangjoc Jun 15, 2020
b8bcc8e
added custom test for get_merchant_order
wangjoc Jun 15, 2020
4cbc065
added in test to confirm that an invalid merch id returns empty array
wangjoc Jun 15, 2020
ee9c579
updated featured_merchants to pull top three merchants with most orde…
wangjoc Jun 15, 2020
86ef719
added in section for newest merchants, with model tests
wangjoc Jun 15, 2020
4a2fd4d
added in new and create controller tests
wangjoc Jun 15, 2020
e7407ff
added in show tests
wangjoc Jun 15, 2020
0716904
added in instantiation test
wangjoc Jun 15, 2020
92c7fe1
added in relationship test
wangjoc Jun 15, 2020
9145357
added in validations tests
wangjoc Jun 15, 2020
2fd9455
uncomment all passing tests
wangjoc Jun 15, 2020
42d08e7
added in simple cov
wangjoc Jun 15, 2020
cb2034c
changed date format
wangjoc Jun 15, 2020
1b4efd9
formatted dollars
wangjoc Jun 15, 2020
087b96f
Merge branch 'master' of https://github.com/wangjoc/betsy
Jun 15, 2020
5989c29
Merge branch 'dash'
Jun 15, 2020
e7a0866
cleaned up order detail and dashboard presentation
wangjoc Jun 15, 2020
85fead3
fixed order show path if it directs to a order that doesn't exist
wangjoc Jun 15, 2020
8b535db
fixed indentation
Jun 15, 2020
45554a7
fixed warning message label for validation
wangjoc Jun 15, 2020
07bc1d4
added in blanks to drop down for cc_exp
wangjoc Jun 15, 2020
72b433a
fixed total of order for confirmation page and receipt
wangjoc Jun 15, 2020
4a3187a
Merge branch 'master' into simplecov
wangjoc Jun 15, 2020
d4c3436
added methods and tests to product
halahaddad1 Jun 15, 2020
06e0e20
added methods and tests to product
halahaddad1 Jun 15, 2020
ec27108
re-adding the deleted test
Jun 15, 2020
1f442d5
Merge branch 'master' of https://github.com/wangjoc/betsy
Jun 15, 2020
30f6dd1
removed increase stock
halahaddad1 Jun 15, 2020
6894ec3
reduce stock quantity when purchase is made
wangjoc Jun 15, 2020
a4c9edc
added in test for making sure stock decreases
wangjoc Jun 15, 2020
a4501f1
minor tweaks to order_controller logic
wangjoc Jun 15, 2020
d983ed3
limited featured to 5
halahaddad1 Jun 15, 2020
bf0611f
minor edit to featured products
halahaddad1 Jun 15, 2020
4f5783b
more edits to product.rb
halahaddad1 Jun 15, 2020
5214d00
adds style tweaks
leahwho Jun 15, 2020
064f3e9
organize routes
leahwho Jun 15, 2020
bc23479
route cleanup refactor
leahwho Jun 15, 2020
96edcdb
Merge branch 'master' of https://github.com/wangjoc/betsy
Jun 15, 2020
e733caa
edited tests
halahaddad1 Jun 15, 2020
7f4f260
Merge branch 'master' of https://github.com/wangjoc/betsy
halahaddad1 Jun 15, 2020
54d8a4d
Merge branch 'master' of https://github.com/wangjoc/betsy
Jun 15, 2020
af3bfa1
ignore code coverage
Jun 15, 2020
b215e23
deleted ignore files
Jun 15, 2020
b21e49a
so many styling tweaks
leahwho Jun 15, 2020
0837750
style tweaks and pulled changes
leahwho Jun 15, 2020
fe50b62
Merge branch 'master' of https://github.com/wangjoc/betsy
Jun 15, 2020
73b8ccf
fixed routes order
halahaddad1 Jun 15, 2020
ec1356d
Merge branch 'master' of https://github.com/wangjoc/betsy
halahaddad1 Jun 15, 2020
5f6827d
Merge branch 'master' of https://github.com/wangjoc/betsy
Jun 15, 2020
304e4e7
adds merchant styling
leahwho Jun 15, 2020
3cd7568
commits pulled changes to routes, coverage, order controller test
leahwho Jun 15, 2020
d8099a6
added helpers for merchants and orders
Jun 15, 2020
52fbd91
Merge branch 'master' of https://github.com/wangjoc/betsy
Jun 15, 2020
c0f21d4
Merge branch 'master' into merchant_test
Jun 16, 2020
907b6b9
order total price test and added helped fixtures
Jun 16, 2020
bf96f70
added category tags to product seed data, now categories come out acc…
halahaddad1 Jun 16, 2020
d70a5f7
Merge branch 'master' of https://github.com/wangjoc/betsy
halahaddad1 Jun 16, 2020
eee0438
added merchant model test
Jun 16, 2020
6f7c93c
Merge branch 'master' of https://github.com/wangjoc/betsy
Jun 16, 2020
4aab2bd
added retire product
halahaddad1 Jun 16, 2020
027ea56
commented out broken ship tests
halahaddad1 Jun 16, 2020
96f0965
Merge branch 'master' into merchant_test
Jun 16, 2020
65a7a72
Merge branch 'master' of https://github.com/wangjoc/betsy
Jun 16, 2020
21cc55e
Merge branch 'master' of https://github.com/wangjoc/betsy
wangjoc Jun 16, 2020
74ba5ac
fixed spacing
wangjoc Jun 16, 2020
aee5a0a
Revert "fixed spacing" - overrode other work
wangjoc Jun 16, 2020
4935f89
Revert "Merge branch 'master' of https://github.com/wangjoc/betsy"
wangjoc Jun 16, 2020
3ac3572
Merge branch 'master' into old-stat
wangjoc Jun 16, 2020
c34fe1a
added avatars to merchant seed data
halahaddad1 Jun 16, 2020
748d1d7
Merge branch 'master' of https://github.com/wangjoc/betsy
halahaddad1 Jun 16, 2020
03f1af8
merchant seeds edits
halahaddad1 Jun 16, 2020
16edca1
added uniq to featured products
halahaddad1 Jun 16, 2020
a18a66c
2 more product seed data
halahaddad1 Jun 16, 2020
f85719b
added in logic to reduce stock upon purchase
wangjoc Jun 16, 2020
b7dcf95
fixed shipping logic and order/order item presentation
wangjoc Jun 16, 2020
88f2f3d
Merge branch 'stock-connect-car'
wangjoc Jun 16, 2020
2b169dd
adds modal to contact us
leahwho Jun 16, 2020
e7356dd
added fixture data for testing
Jun 16, 2020
344e453
fixed indentation
Jun 16, 2020
371d166
added merchant model test
Jun 16, 2020
0bf705d
added helper method for revenue for merchant
Jun 16, 2020
8b30a81
added order model test for revenue
Jun 16, 2020
1dc60bb
Merge branch 'master' into merchant_test
Jun 16, 2020
2002b23
adds contact modal
leahwho Jun 16, 2020
6df7ce3
adds pulled changes from hannahs last commit; adds contact us modal a…
leahwho Jun 16, 2020
68a53ab
cleaned up category/product seeds
halahaddad1 Jun 16, 2020
5a5f01d
Merge branch 'master' of https://github.com/wangjoc/betsy
halahaddad1 Jun 16, 2020
9627564
adds total_orders to merchant.rb, adds in method calls in dashboard t…
leahwho Jun 16, 2020
80ac083
refactoring
halahaddad1 Jun 16, 2020
0f12cd9
added average rating for merchant
halahaddad1 Jun 16, 2020
4a9aab3
add product form, dashbord restyle, merchant info on show page
leahwho Jun 16, 2020
9927a09
order form tweak to increase box size
leahwho Jun 16, 2020
f60244a
form style
leahwho Jun 16, 2020
2e737e5
Merge branch 'total-rev-total-ords'
leahwho Jun 16, 2020
8f335d3
edits to avg rating in merchant
halahaddad1 Jun 16, 2020
2ee22f6
adds review model tests
leahwho Jun 16, 2020
074af9e
refactor review model test, review controller test updates to add log…
leahwho Jun 16, 2020
c13bd33
trying to push changes
halahaddad1 Jun 16, 2020
4987f6e
Merge branch 'master' of https://github.com/wangjoc/betsy
halahaddad1 Jun 16, 2020
64e3ef7
fixing migration bugs
halahaddad1 Jun 16, 2020
761b7df
added most recent regrets to root view
halahaddad1 Jun 16, 2020
6616f70
replace ### in root merchant cards
halahaddad1 Jun 16, 2020
3cef21c
column fixes to display at 5 column layout
leahwho Jun 16, 2020
c9b58a2
fixed something
Jun 16, 2020
d865e1e
Merge branch 'master' of https://github.com/wangjoc/betsy
Jun 16, 2020
5f7ddb5
added tests
Jun 17, 2020
9767c8c
Merge branch 'master' into merchant_test
Jun 17, 2020
38ea649
retire product working
halahaddad1 Jun 17, 2020
f7ba302
retire product working
halahaddad1 Jun 17, 2020
7e68d2f
fixed a bug in product.rb
halahaddad1 Jun 17, 2020
a316849
added average product rating to product cards
halahaddad1 Jun 17, 2020
696b852
add in total_revenue to dashboard
leahwho Jun 17, 2020
c4c6382
adds total_revenue, commits Halas changes for retire product
leahwho Jun 17, 2020
7283b1a
update to order form view; table view for products in cart
leahwho Jun 17, 2020
83e3364
adds ternary to display avg. rating on cards in case there are no rat…
leahwho Jun 17, 2020
3ffef18
image resize
halahaddad1 Jun 17, 2020
6c6f3a5
added more test and stuff to help with test
Jun 17, 2020
5ebfb93
Merge branch 'master' into merchant_test
Jun 17, 2020
c5a7b8c
more image resizing
halahaddad1 Jun 17, 2020
b3b2eca
added product seed data
halahaddad1 Jun 17, 2020
735399b
added a nicolas cage category
halahaddad1 Jun 17, 2020
d4f984e
a little edit
halahaddad1 Jun 17, 2020
62fe08f
a typo
halahaddad1 Jun 17, 2020
56d4fed
Revert "a typo"
halahaddad1 Jun 17, 2020
7b0e662
added a pets category
halahaddad1 Jun 17, 2020
efff0d8
temporarily added edit to product cards
halahaddad1 Jun 17, 2020
e494cc7
added a food category
halahaddad1 Jun 17, 2020
57c889a
refactoring product
halahaddad1 Jun 17, 2020
cf0aaf7
fixed order_controller test, replaced must_equal nil with must_be_nil
wangjoc Jun 17, 2020
5b636fb
cleaned out todos, uncommented ship tests
wangjoc Jun 17, 2020
f93a8b0
fixed tests
wangjoc Jun 17, 2020
9a7f236
uncommented homepage tests
wangjoc Jun 17, 2020
3fef15b
deleted uncessary test
wangjoc Jun 17, 2020
9df1faf
refactored add to cart logic
wangjoc Jun 17, 2020
e474f62
updated ship test to pass more consistently
wangjoc Jun 17, 2020
dce1523
added in test to check to make sure that order can't be added in thro…
wangjoc Jun 17, 2020
7dad5a0
cleaned out todo items, added in instantiation and relationship order…
wangjoc Jun 17, 2020
cf404de
added in order item validations and testing
wangjoc Jun 17, 2020
eaa7252
added in custom tests for order items
wangjoc Jun 17, 2020
516b4c5
cleanted up or assigned todo items
wangjoc Jun 17, 2020
511ab7f
fixed spacing and indentation
Jun 17, 2020
51add0b
refactored
Jun 17, 2020
933cd32
changes to shared card to render views in different pages as card-dec…
leahwho Jun 17, 2020
d8dca50
dashboard card update, dashboard display update to display current or…
leahwho Jun 17, 2020
1c86c47
adds clickable image links to product cards
leahwho Jun 17, 2020
94c9316
added stars rating to views
halahaddad1 Jun 17, 2020
5e272bd
merging cleanup branch with column fixes, card display changes
leahwho Jun 17, 2020
748e580
pulled halas changes, committing, fix dashboard merge conflict
leahwho Jun 17, 2020
4ff8244
fix view errors in dashboard
leahwho Jun 17, 2020
9b80604
added stars to merchant cards
halahaddad1 Jun 17, 2020
9e1b283
Merge branch 'master' of https://github.com/wangjoc/betsy
halahaddad1 Jun 17, 2020
6ad65bb
added stars to individual reviews
halahaddad1 Jun 17, 2020
911b90a
refactor confirm and receipt after column fix made sizes wonky
leahwho Jun 17, 2020
307c4bd
Merge branch 'master' of https://github.com/wangjoc/betsy
leahwho Jun 17, 2020
96468ce
added links to be first to review
halahaddad1 Jun 17, 2020
ea097e1
Merge branch 'master' of https://github.com/wangjoc/betsy
halahaddad1 Jun 17, 2020
a044e0a
added search bar
halahaddad1 Jun 18, 2020
47616b6
minor change to search
halahaddad1 Jun 18, 2020
4164b95
adds style to search page and refactors search partials
leahwho Jun 18, 2020
4265e86
fix typo in search to render product alert; refactor footer to get th…
leahwho Jun 18, 2020
b2418dc
removed edit product on product cards
halahaddad1 Jun 18, 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
Binary file added .DS_Store
Binary file not shown.
1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
defaults
39 changes: 39 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# 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'

# 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
.env
/coverage/*
/coverage
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.6.5
84 changes: 84 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
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.1"
# 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

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

gem "omniauth"
gem "omniauth-github"

gem "simplecov", require: false, group: :test
Loading