Commit Graph

137 Commits

Author SHA1 Message Date
Edin Dazdarevic
2ddfcf2141 cart page logic restructuring 2015-05-27 12:08:01 +02:00
Edin Dazdarevic
d358934a01 fixes for inconsistent cart state 2015-05-27 11:57:55 +02:00
Edin Dazdarevic
a2ecdc5d63 margin-top fix 2015-05-26 21:35:06 +02:00
Edin Dazdarevic
ac41e8aef7 unknown bug fix 2015-05-26 18:24:49 +02:00
Edin Dazdarevic
12f48ab0e7 Merge branch 'master' of https://github.com/senaduka/ribica
Conflicts:
	front-ui/app/components/cart/cartPage.js
2015-05-26 18:12:26 +02:00
Senad Uka
db6dd6a1ab ahi fixed button that jumps around 2015-05-26 18:08:16 +02:00
Edin Dazdarevic
8bed4eb3f7 started with cart design
removing of items from cart now possible
2015-05-26 18:08:03 +02:00
Edin Dazdarevic
e1be044fd9 - removed our copy jquery & bootstrap. using cdn instead
- added search box to the header
- made reindex rake task
2015-05-25 20:49:52 +02:00
Senad Uka
c99bcbda7a fixed misleading name of an action 2015-05-17 03:20:26 +02:00
Senad Uka
16ff955c21 fixed css on product page - this is as far as my sabur goes :) 2015-05-16 04:10:21 +02:00
Senad Uka
8e3f071ef3 almost finished product page / need to fix some css stuff 2015-05-15 18:38:45 +02:00
Senad Uka
6453b1b241 fixed bug with amount not updating / solved double dispatch problem with cartAction.load / removed all console.log calls - it became too chatty / add them as needed 2015-05-14 06:21:49 +02:00
Senad Uka
49dd10acbc almost finished new design on product page / reproduced bug with amount not updating 2015-05-13 16:32:53 +02:00
Senad Uka
fe452d359f added orders to confirm report / phone allows more digits now / added reports to rails admin navigation 2015-05-11 11:35:24 +02:00
Senad Uka
1f0e005723 Merge branch 'master' of github.com:senaduka/ribica 2015-04-21 06:39:44 +02:00
Senad Uka
c9949c444a item groups now have order - start page is now item group 1 (configurable in globals) 2015-04-21 06:39:30 +02:00
Edin Dazdarevic
e4536055df bug fix: menu does not work in firefox 2015-04-20 14:34:57 +02:00
Senad Uka
ecbe58c626 money in upper right works now - zavrsi narudzbu is white 2015-04-20 05:49:23 +02:00
Edin Dazdarevic
a5836a428f implemented design for login page 2015-04-19 23:07:03 +02:00
Edin Dazdarevic
9eb7690d2d jsx reformat and added href to A tags 2015-04-19 18:42:34 +02:00
Edin Dazdarevic
0cdf57d4a9 sidebar design implemented on search by category and by section page 2015-04-19 15:58:08 +02:00
Edin Dazdarevic
2f809cfbcf registration page design added, some other minor changes 2015-04-19 15:00:06 +02:00
Edin Dazdarevic
79752fca47 small ui changes, fixed issue with items floating 2015-04-18 21:57:24 +02:00
Edin Dazdarevic
aafda1d187 bug fix: menu not visible on small screens 2015-04-18 16:13:55 +02:00
Senad Uka
269ad19e4f it's not fluid anymore - and shadows are not that strong 2015-04-16 21:19:33 +02:00
Senad Uka
fc9f7496d2 number of items in cart is now properly aligned 2015-04-16 06:45:38 +02:00
Edin Dazdarevic
19cdca76b1 added menu sub sub items (horrible name i know) 2015-04-15 00:10:37 +02:00
Edin Dazdarevic
f71ab5ea47 hide menu when something (section, category, subcategory) is clicked 2015-04-14 23:34:46 +02:00
Edin Dazdarevic
452a2cd5f4 basic version of the menu 2015-04-13 23:16:33 +02:00
Senad Uka
ea2837bd00 items are now done and pictures resize on serverside automagically 2015-04-12 11:11:26 +02:00
Senad Uka
8197104040 design in progress - very ugly now 2015-04-12 09:21:00 +02:00
Senad Uka
6da4e6c9fd created a very ugly report 2015-04-08 07:35:00 +02:00
Edin Dazdarevic
670f58fcff increased max number of pages on itemlist component 2015-04-08 00:11:44 +02:00
Edin Dazdarevic
5464ec5770 added ribica rake task (item import, copying sections to menu etc.) 2015-04-07 00:29:14 +02:00
Edin Dazdarevic
76d5fd7599 fixed paging on subcategory browsing page 2015-03-30 00:05:57 +02:00
Edin Dazdarevic
7c1eb2f4fd - browsing by subcategory 2015-03-29 23:23:21 +02:00
Edin Dazdarevic
8e3557cf2e minor refactoring of filters 2015-03-29 16:34:42 +02:00
Senad Uka
b3fc46633c Merge branch 'master' of github.com:senaduka/ribica 2015-03-29 12:47:08 +02:00
Senad Uka
7acf1a8d6c banners are show now ! 2015-03-29 12:46:51 +02:00
Edin Dazdarevic
71fbde93de added brands 2015-03-28 14:38:15 +01:00
Edin Dazdarevic
6c7a1b962f login & register form are now being submitted when pressing the 'enter' key 2015-03-28 14:10:56 +01:00
Edin Dazdarevic
1e256f728d finished menu items 2015-03-28 13:59:04 +01:00
Senad Uka
d8668115ed fixed bugs with address in incognito and NaN in delivery costs and total 2015-03-25 06:12:38 +01:00
Senad Uka
b534d15866 groups of articles now shown on ribica.ba/group/1/, background is in cloudinary 2015-03-23 07:21:53 +01:00
Edin Dazdarevic
0ff47313df minor search page fixes 2015-03-23 00:19:48 +01:00
Edin Dazdarevic
9154d216a2 basic version of search implemented 2015-03-22 16:16:52 +01:00
Edin Dazdarevic
fb080ed487 registration bug fix and login button style fix 2015-03-20 00:40:03 +01:00
Edin Dazdarevic
76379c4ae5 fixed 'registruj me' button a bit 2015-03-19 22:36:32 +01:00
Edin Dazdarevic
a7e40e579f bunch of fixes, need to refactoring to move state to the store in order to make it more fluxy 2015-03-19 22:29:16 +01:00
Edin Dazdarevic
69f5faffe4 added children to users 2015-03-19 14:27:04 +01:00