Brett Sun
2aa3aa5ff7
Fix Footer rendering from route declarations
...
Also a few cosmetic changes to make it more obvious the route holds an
actual footer type.
2016-06-10 10:25:09 +02:00
Brett Sun
0f57137c52
Remove route from context and use setRouteLeaveHooks in top level route components
2016-06-08 15:10:58 +02:00
Brett Sun
71dbad2a18
Add location to context
2016-06-08 14:54:05 +02:00
Brett Sun
5a0a6e88db
Convert usages of withRouter to withContext
2016-06-08 13:53:50 +02:00
Brett Sun
5073b0988d
Convert withCurrentUser and withWhitelabel to withContext
2016-06-08 13:53:46 +02:00
Brett Sun
75247b2594
Remove obsolete AppRouteWrapper
...
Now that currentUser and whitelabel are passed as context, we don’t
need AppRouteWrapper to copy them into routes as props
2016-06-08 13:11:52 +02:00
Brett Sun
34b1a2c1fc
Add whitelabel and isLoggedIn as arguments to ProxyHandler's redirectFunctions
2016-06-08 13:11:52 +02:00
Brett Sun
b02695a33a
Convert whitelabel to be passed down through context and withWhitelabel HOC
2016-06-08 13:11:48 +02:00
Brett Sun
b5eda1cdd2
Inject isLoggedIn through withCurrentUser
...
Makes checking for logged in status less error prone than always using
`currentUser.email` or `currentUser.username`.
2016-06-07 14:56:40 +02:00
Brett Sun
d1dba86b1a
Convert currentUser to be passed down through context and withCurrentUser HOC
...
Similar to what react-router did with their router and withRouter HOC.
2016-06-07 14:56:35 +02:00
Brett Sun
6b67a8462f
Convert usage of router from context to using withRouter
2016-06-06 16:54:38 +02:00
Brett Sun
c807f62297
Replace usage of history with router passed down through context
2016-06-06 16:10:41 +02:00
Brett Sun
d1dfdbdbec
Only import what we need from react-router
...
Unfortunately webpack doesn’t understand jsnext:main declarations yet,
so we have to do this ourselves by using react-router’s es6 build
2016-06-06 16:07:47 +02:00
Tim Daubenschütz
fcaa85a0ed
Replace usage of History mixin with contextTypes
2016-06-06 16:07:16 +02:00
Brett Sun
d6c1dca63a
Enable code splitting for whitelabels
2016-06-03 17:52:38 +02:00
Brett Sun
7eaa3b1a2b
Inject environment variables into app
...
Injects environment variables into the app through webpack, rather than
script snippets in index.html.
As part of this:
* Updated server.js to use node’s path package to resolve file paths
* Ensure that all url environment variables passed to the app don’t
have a trailing slash, allowing for cleaner template urls
**Note**: There are still a number of constants that should be taken
out of the app and put into environment variables.
2016-06-02 17:14:58 +02:00
Brett Sun
37e4b68afb
Remove prize whitelabels
2016-05-27 12:04:36 +02:00
Brett Sun
c12a5f4977
Set the default editable status of the MarketFurtherDetails to be false
...
Non-owners don't get provided an acl_edit in their edition acls, so the
default behaviour of MarketAdditionalDetailsForm was to set the form to
be editable.
2016-04-25 17:32:59 +02:00
Brett Sun
702107258a
Fix weird messaging IkonoTV empty further details placeholdher
2016-04-21 11:04:17 +02:00
tim
76daa7edc2
Add Liquid Gallery Whitelabel Page
2016-04-06 16:22:03 +02:00
Tim Daubenschütz
1edfca48c8
Fix minor indentation issue
2016-03-07 14:09:51 +01:00
Tim Daubenschütz
6301c0fe46
Refactor to route specific footer
2016-03-07 13:45:40 +01:00
Tim Daubenschütz
1c94ecc177
Add footer property to Route
2016-03-04 15:53:55 +01:00
Tim Daubenschütz
627ace63cd
Add demo whitelabel page
2016-02-24 11:16:56 +01:00
Brett Sun
dcdae7b7b1
Merge pull request #156 from ascribe/AG-114-show-visual-add-for-cosign-wallet-uneditable-works
...
AG-114 Show visual aid for uneditable works in consign wallet
2016-02-10 13:40:26 +01:00
Brett Sun
e17347a98c
Add error modal for uneditable marketplace editions that cannot be consigned due to missing fields
2016-02-09 12:07:09 +01:00
Tim Daubenschütz
dad4ea4e87
Merge pull request #107 from ascribe/cosmetic-fix-for-multiline-destructure
...
Update multiline destructuring format based on style guide
2016-02-09 09:27:26 +01:00
Brett Sun
0f9e7cd3f6
Fix missing cases of getLangText
2016-02-08 14:50:24 +01:00
Brett Sun
8fce04125f
Merge with master
2016-02-08 14:08:54 +01:00
Tim Daubenschütz
e69dc21518
Merge branch 'master' into AP-7-artcity-consignment-wallet
...
Ok, it was my fault...
Conflicts:
js/components/whitelabel/wallet/wallet_app.js
2016-02-08 10:09:14 +01:00
Tim Daubenschütz
030a86e883
Merge branch 'master' into AP-7-artcity-consignment-wallet
...
Conflicts:
js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js
js/components/whitelabel/wallet/wallet_app.js
2016-02-08 10:05:35 +01:00
Tim Daubenschütz
373d9d13a7
Merge branch 'master' into AP-6-polline-consignment-wallet
...
Conflicts:
js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js
js/components/whitelabel/wallet/wallet_app.js
2016-02-08 10:03:06 +01:00
Brett Sun
40894cfea6
Use the 'ascribe-app' class for all apps
...
Simplifies testing so we can just look for a single class throughout
all the apps when ensuring React has loaded our app
2016-02-05 14:22:42 +01:00
Brett Sun
15cf6498a8
Remove unused Cyland hero component
2016-02-05 11:54:02 +01:00
Brett Sun
8ba9eb20b6
Add better PropType validation for components
2016-02-05 11:53:33 +01:00
Brett Sun
826ca08073
Merge with master
2016-02-05 10:38:59 +01:00
Tim Daubenschütz
88926998a8
Use whitelabel routes for wl-specific requests
2016-02-04 14:46:20 +01:00
Tim Daubenschütz
0a17ec0414
Use whitelabel routes for wl-specific requests
2016-02-04 14:45:46 +01:00
Tim Daubenschütz
f12630dfad
Add routes and styling for artcity.ascribe.io
2016-02-04 13:44:45 +01:00
Tim Daubenschütz
7dfe6a51a4
For 23vivi, switch back to appropriate piece list
2016-02-04 11:51:54 +01:00
Tim Daubenschütz
f6a5734871
Add routes and styling for polline.ascribe.io
2016-02-04 10:54:38 +01:00
Tim Daubenschütz
b405bc675b
Fix PR feedback
2016-02-01 14:47:51 +01:00
Tim Daubenschütz
e2a481a3f0
Fix redirection of wallet owners
...
This also fixes a problem where newly created
users would be redirected to a 404 page.
2016-02-01 13:50:55 +01:00
Tim Daubenschütz
83eadf8528
Merge pull request #119 from ascribe/AG-109-marketplace-thumbnail-uploader-does-not-use-validation
...
AG-109 Marketplace thumbnail uploader does not use validation
2016-01-26 11:58:51 +01:00
Tim Daubenschütz
d8f2423344
Merge pull request #95 from ascribe/add-default-should-redirect
...
Collection should redirect to Register Work when a user does not have pieces yet
2016-01-26 11:08:32 +01:00
Brett Sun
9559bc09b4
Disable 'Collection' header item when no pieces are found for the user
...
The disabling only happens when the piece list is fetched, which may
not happen immediately in some cases (ie. logged in user goes straight
to another person’s edition first). We’re not able to fetch the piece
list immediately, as some white labels apply default filters on the
piece list which forces them to wait until they can begin fetching
their piece lists.
2016-01-21 16:47:35 +01:00
Brett Sun
4dd701a414
Add extension validation to marketplace thumbnail uploader
2016-01-21 12:24:31 +01:00
Brett Sun
0045dc6981
Add anchorization to whitelabel forms
2016-01-20 12:31:02 +01:00
Brett Sun
fbc1a43bf0
Merge with master
2016-01-19 15:28:50 +01:00
Brett Sun
2ad2ea242d
Changes for PR comments
2016-01-18 17:31:56 +01:00
