maverick/flex-template-web
1
0
Fork 0
mirror of https://github.com/kingomarnajjar/flex-template-web.git synced 2026-07-31 02:26:50 +10:00
Code Issues Projects Releases Packages Wiki Activity Actions
724 commits 6 branches 51 tags 20 MiB
Commit graph

724 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kimmo Puputti
6f3d8efb0d Rename addEntities to addMarketplaceEntities 2017-05-02 11:39:57 +03:00
Kimmo Puputti
6354600d34 User generic addEntities action to add entities to the global store 2017-05-02 11:35:10 +03:00
Kimmo Puputti
e2955bfa13 Remove redux-saga and all unused actions in marketplaceData.duck 2017-05-02 11:27:50 +03:00
Kimmo Puputti
20f263a7d7 Rename data to marketplaceData in Redux store 2017-05-02 11:09:10 +03:00
Kimmo Puputti
afe2389066 Unify mapStateToProps functions 2017-05-02 11:03:26 +03:00
Kimmo Puputti
d64744588c Rename sdk.duck.js file to marketplaceData.duck.js 2017-05-02 10:43:31 +03:00
Vesa Luusua
9e18456d8a Merge pull request #132 from sharetribe/transaction-pages-fix-links-with-wrong-role 
Enforcing role on order & sale pages
 2017-04-29 00:22:21 +03:00
Vesa Luusua
6c499a2160 Enforsing role on order & sale pages 2017-04-29 00:18:48 +03:00
Vesa Luusua
01c7d48785 Merge pull request #133 from sharetribe/bookinginfo-fix-typo 
fix typo
 2017-04-28 17:32:38 +03:00
Vesa Luusua
1cbdf5a1a1 fix typo 2017-04-28 17:27:56 +03:00
Kimmo Puputti
0dc7bbc2b6 Merge pull request #131 from sharetribe/remove-edit-listing-link 
Remove edit listing link
 2017-04-28 16:00:23 +03:00
Kimmo Puputti
0747fc170a Fetch current user on app init instead of in various loadData fns 2017-04-28 14:17:06 +03:00
Kimmo Puputti
2bb3a6e63e Fix current user fetch order after login 
fetchCurrentUser relies on the values that loginSuccess changes in the
store, and should therefore be done after login
 2017-04-28 14:14:54 +03:00
Kimmo Puputti
2cc769e585 Improve Topbar prop types 2017-04-28 14:14:24 +03:00
Kimmo Puputti
a679c946eb Hide edit listing link 2017-04-28 14:14:04 +03:00
Kimmo Puputti
00224c34f2 Merge pull request #123 from sharetribe/refactor-authentication 
Refactor authentication
 2017-04-28 11:20:31 +03:00
Kimmo Puputti
0896ea47a7 Move prop type destructuring statement 2017-04-28 11:12:28 +03:00
Kimmo Puputti
814184aa0a Rename loginOrLogoutInProgress to authenticationInProgress 2017-04-28 11:04:59 +03:00
Kimmo Puputti
a99b33e5e8 Ignore fetching current user when logged out 2017-04-28 10:48:07 +03:00
Kimmo Puputti
f2dd3c9105 Sync current user with auth login/logout 2017-04-28 10:48:07 +03:00
Kimmo Puputti
30f9909b45 Refactor authentication from redux-saga to redux-thunk 2017-04-28 10:48:07 +03:00
Kimmo Puputti
2a351c9247 Change authInfo to use redux-thunk 2017-04-28 10:47:21 +03:00
Vesa Luusua
be76dae810 Merge pull request #130 from sharetribe/provider-rejects 
Provider rejects
 2017-04-28 00:18:49 +03:00
Vesa Luusua
c7184f2551 OrderDetailsPanel and SaleDetailsPanel show state/rejected info 2017-04-28 00:11:51 +03:00
Vesa Luusua
7ce435171c sdk.transactions.transition reject call + reject button + refactoring 2017-04-28 00:10:54 +03:00
Vesa Luusua
70990f4048 Merge pull request #129 from sharetribe/provider-accepts 
Provider accepts
 2017-04-27 23:23:39 +03:00
Vesa Luusua
3f186aace9 OrderDetailsPanel updated for state/accepted 2017-04-27 23:17:07 +03:00
Vesa Luusua
03d3ae9adb SaleDetailsPanel updated + some formatting in BookingInfo 2017-04-27 23:15:55 +03:00
Vesa Luusua
efb5f0ee6e sdk.transactions.transition accept call + accept button 2017-04-27 23:11:36 +03:00
Vesa Luusua
4c7c0bcd86 Merge pull request #128 from sharetribe/saledetailspanel-remove-extra-margin 
Remove extra margin (copy-paste stuff)
 2017-04-27 17:22:15 +03:00
Vesa Luusua
809ebb7235 Remove extra margin (copy-paste stuff) 2017-04-27 17:18:24 +03:00
Vesa Luusua
86c245dab9 Merge pull request #126 from sharetribe/salepage-real-data 
Salepage: fetching actual transaction data with SDK
 2017-04-27 17:03:27 +03:00
Vesa Luusua
d70b1f83cf Showing commission (and calculating subtotal and total) 2017-04-27 16:59:14 +03:00
Vesa Luusua
a59c01486a Styling changes on SaleDetailsPage (vs OrderDetailsPage) 2017-04-27 16:40:34 +03:00
Vesa Luusua
fbdb3b157f SalePage: initial draft - this is pretty much the same as OrderPage 2017-04-27 14:16:46 +03:00
Vesa Luusua
bbb6e90d25 bugfix: tx-state is under attributes 2017-04-27 13:20:27 +03:00
Vesa Luusua
fb9197499a Merge pull request #124 from sharetribe/orderpage-real-data 
OrderPage: fetching actual transaction data with SDK
 2017-04-27 13:19:25 +03:00
Vesa Luusua
5f09c58a86 OrderPage fetches order data and passes that to OrderDetailsPanel 2017-04-27 12:52:36 +03:00
Vesa Luusua
b0f06f4b9a OrderDetailsPanel updated and related child components too 2017-04-26 20:20:01 +03:00
Vesa Luusua
403f097ceb Merge pull request #127 from sharetribe/fix-for-api-schema-changes 
API changed, no slug in user anymore
 2017-04-26 20:18:10 +03:00
Vesa Luusua
f51e898453 API changed, no slug in user anymore 2017-04-26 20:11:59 +03:00
Vesa Luusua
fac9cfdd0d Merge pull request #125 from sharetribe/checkoutpage-submit-handle-fix 
Use storage data in submit and clear it afterwards
 2017-04-26 17:22:27 +03:00
Vesa Luusua
6206b745ae Use storage data in submit and clear it afterwards 2017-04-26 17:07:22 +03:00
Vesa Luusua
c05a27b078 Merge pull request #117 from sharetribe/checkoutpage-refresh-fix 
CheckoutPage refresh fix
 2017-04-25 23:41:49 +03:00
Vesa Luusua
cecae6b23e Save CheckoutPage data to sessionStore 2017-04-25 22:52:23 +03:00
Kimmo Puputti
f899a51472 Merge pull request #122 from sharetribe/prevent-booking-own-listing 
Prevent booking own listing
 2017-04-20 09:50:45 +03:00
Kimmo Puputti
126beafe09 Allow logged out user start booking 2017-04-20 09:34:05 +03:00
Kimmo Puputti
6606d05ebf Show listing edit link for own listings 2017-04-20 09:34:05 +03:00
Kimmo Puputti
383d274c1f Show booking button only if author different from current user 2017-04-20 09:34:05 +03:00
Kimmo Puputti
665728f979 Improve test data creation 
- Add optional author to listing
 - Separate user and current user creation
 2017-04-20 09:34:05 +03:00