Commit Graph

174 Commits

Author SHA1 Message Date
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
195bee516b added bootstrap.js file from the design 2015-04-18 16:20:53 +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
Edin Dazdarevic
96420fc547 Merge branch 'master' of https://github.com/senaduka/ribica 2015-04-13 01:05:40 +02:00
Edin Dazdarevic
9865cb5f0a trimming whitespace on import, fixed issue with units_in_pack column being too small 2015-04-13 01:05:22 +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
Edin Dazdarevic
82f40de96b when importing first do a lookup by code before creating a new item 2015-04-11 13:51:11 +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
b90b4035aa fixed bug with address from a logged in user staying after logout 2015-03-28 06:05:16 +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
Edin Dazdarevic
5bc77597a4 menu -> submenu backend 2015-03-24 06:18:27 +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
e23bfe0a7f Merge branch 'master' of https://github.com/senaduka/ribica 2015-03-22 16:17:05 +01:00
Edin Dazdarevic
9154d216a2 basic version of search implemented 2015-03-22 16:16:52 +01:00
Senad Uka
bbedb4a877 created item groups and link banners and their associations and fixed bugs with join tables 2015-03-22 06:17:05 +01:00
Senad Uka
38548e3e33 removed special offer id from items 2015-03-21 06:30:18 +01:00
Edin Dazdarevic
88c53a8512 added elasticsearch gem and index method 2015-03-21 00:00:36 +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
bc10740780 Merge branch 'master' of https://github.com/senaduka/ribica 2015-03-19 14:27:27 +01:00
Edin Dazdarevic
69f5faffe4 added children to users 2015-03-19 14:27:04 +01:00
Senad Uka
4b019d6b9e logout and login cart state is working now - except a little bug with icon on login 2015-03-19 06:47:41 +01:00
Edin Dazdarevic
1d16951fcf reapplying the fix that was lost by conflict resolution 2015-03-19 01:13:11 +01:00
Edin Dazdarevic
70635ebd1e added 'order' fields to sections, categories and sub_categories. - moved backoffice migrations to front-api 2015-03-19 00:10:24 +01:00
Edin Dazdarevic
a1b9250865 subcategories should not show in the menu 2015-03-18 18:22:21 +01:00
Senad Uka
658fe4931d special offers backoffice is ready now 2015-03-18 06:25:40 +01:00
Senad Uka
3b95500635 cart logic now ties cart with user when cart is created with logged in user 2015-03-15 04:53:04 +01:00