Skip to content

Robits #41

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.

Sign up for GitHub

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

Jump to bottom
Open
wants to merge 342 commits into
base: master
Choose a base branch
from
Open

Robits #41

wants to merge 342 commits into from

Conversation

@beylulkbreab
Copy link

@beylulkbreab beylulkbreab commented Oct 28, 2016 •
edited
Loading

Heroku deployment: https://ada-robits.herokuapp.com/

Team members: Sarah Nahmias, B Kbreab, Kelly Tran, Guinevere Saenger

Things we are proud of:

  • We covered all user stories. Yay!
  • We passed 100% on model tests.
  • We gave the merchant the control to upload an image for his/her new product.
  • We are mindful of routes for authentication security, and validations for user inputs.
  • We have lots of awesome partials and view helpers.
  • Team dynamics: agile, supportive, good work-life balance, laughters.

Things to improve and we love to receive feedback for:

  • Flash errors for error messages - how to display ?
  • Keep controllers skinny
  • Controller tests for non-skinny controllers
  • How to do TDD for controller's methods
  • Protocols for team members git pushing to master branch

nahmisa and others added 30 commits October 20, 2016 19:59
@nahmisa
Adds skip login before payment details
ebe5134
@nahmisa
Merge branch 'master' of github.com:Bella8/betsy
38005b1
@nahmisa
Cleans up order_items_controller
ca64751
@nahmisa
Cleans up order item model
62ceef7
@nahmisa
Adds semantic tags
73378d5
@nahmisa
Adds semantic HTML
79e7d38
@nahmisa
Refactors redirect in orders#create out
b6e3daa
@nahmisa
Cleans up payment controller and moves asks to model
8283e91
@nahmisa
Cleaner
9586ca4
@nahmisa
Will need to eventually make the comented out validation work
72d6b1b
@nahmisa
Purchasing the cart marks the order as paid
729c79e
@KellyPT
Added Foundation CSS. Added background image. Modified application.cs…
d1d553e 
…s. Fixed typo error.
@KellyPT
Added new route, new Session controller action, created merchant_logi…
add5059 
…n view for Merchant Control Menu only available to authenticated user. Minor change on styles.
@KellyPT
Merge branch 'master' of https://github.com/Bella8/betsy
21d32fe
@nahmisa
Fixes payment_details update
7a289b7
@nahmisa
Note to ask Guin about self method
a8ecbdf
@nahmisa
Removes space
b18c153
@nahmisa
Adds order detail to confirmation page
7004b4b
@nahmisa
Merge branch 'master' of github.com:Bella8/betsy
591045f
@nahmisa
Corrects skip before action from only to except in products
135eb60
@beylulkbreab
removed a belongs to catagory from products.
7769b70
@beylulkbreab
fixed merge conflict.
2c437fc
@beylulkbreab
schema change
3b8a1c5
@beylulkbreab
added a way for a merchant can add a product
8d60747
@beylulkbreab
changed new review path
d92a17c
@KellyPT
Changed the nav bar. Added new joint table csv file. Modified product…
acaecfd 
….csv and category.csv.
@KellyPT
changes to schema.rb
c3bc238
@KellyPT
Merge branch 'master' of https://github.com/Bella8/betsy
a62ef8a
@KellyPT
Make Product#new and Product#create work
ea0b4ee
@beylulkbreab
fixed catogireis products relationship
98f0ecf
beylulkbreab and others added 29 commits October 28, 2016 11:46
@beylulkbreab
Merge branch 'master' of https://github.com/Bella8/betsy
ecb6349
@beylulkbreab
readed link to image
00124c1
@beylulkbreab
added a link
b172c3d
@KellyPT
Added semantic HTML for orders/index and application.scss
9ebaf2d
@KellyPT
Merge branch 'master' of https://github.com/Bella8/betsy
2149ca6
@nahmisa
Styles reviews
42a909b
@nahmisa
Merge branch 'master' of github.com:Bella8/betsy
e3acb9e
@KellyPT
added a container around the body section, added margin, changed layo…
e4570ae 
…ut in merchant_login
@beylulkbreab
added random images if not image
9f0e88c
@guineveresaenger
Styling to Categories and Merchants index views
bfd31a4
@guineveresaenger
Merge branch 'master' of https://github.com/Bella8/betsy
559c55b
@nahmisa
Resolves merge conflict
5c369ff
@nahmisa
Merge branch 'master' of github.com:Bella8/betsy
7efd3f6
@nahmisa
Makes button text visible
cd71e63
@guineveresaenger
Something
85e9054
@guineveresaenger
Merge branch 'master' of https://github.com/Bella8/betsy
b8e6a9a
@KellyPT
:q
ee6a1ba 
Change categories layouts
:wq

save
@KellyPT
Merge branch 'master' of https://github.com/Bella8/betsy
bcc63ba
@KellyPT
added styles back'
6ea6bd9
@nahmisa
Fixes button that I messed up
ae8936d
@nahmisa
Begins styling order fulfilment page
66ef93c
@beylulkbreab
added css to cart
88e7ba6
@beylulkbreab
Merge branch 'master' of https://github.com/Bella8/betsy
445da12
@nahmisa
Finishes order fufilment page
d8a0d1d
@nahmisa
Merge branch 'master' of github.com:Bella8/betsy
3b0db29
@nahmisa
Finishes order fufilment page
12fc7dd
@nahmisa
Fixes font sizing issue
408c5dd
@nahmisa
Last-minute css fixes
b6abd27
@KellyPT
something
86da01a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

brackets

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@beylulkbreab @kariabancroft @nahmisa @KellyPT @guineveresaenger