diff options
author | Stanley Yip <33562077+yipstanley@users.noreply.github.com> | 2020-01-20 17:30:37 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-20 17:30:37 -0500 |
commit | 65c0769d420841765cb9545a4c99213c4433e7af (patch) | |
tree | cec7e1ea69596513c373c2245610b5e4a679da56 /src/mobile/ImageUpload.tsx | |
parent | cc2cbf44ba5c30a70bad2ffd7a57d2c6d17d0e4e (diff) | |
parent | 758d960b4251672c9615b0bf53ea992065ca524b (diff) |
Merge pull request #331 from browngraphicslab/pen
Pen
Diffstat (limited to 'src/mobile/ImageUpload.tsx')
-rw-r--r-- | src/mobile/ImageUpload.tsx | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/src/mobile/ImageUpload.tsx b/src/mobile/ImageUpload.tsx index ec698b151..0b0280519 100644 --- a/src/mobile/ImageUpload.tsx +++ b/src/mobile/ImageUpload.tsx @@ -11,6 +11,8 @@ import { List } from '../new_fields/List'; import { observer } from 'mobx-react'; import { observable } from 'mobx'; import { Utils } from '../Utils'; +import MobileInterface from './MobileInterface'; +import { CurrentUserUtils } from '../server/authentication/models/current_user_utils'; @@ -104,10 +106,25 @@ class Uploader extends React.Component { } -DocServer.init(window.location.protocol, window.location.hostname, 4321, "image upload"); - -ReactDOM.render(( - <Uploader /> -), - document.getElementById('root') -);
\ No newline at end of file +// DocServer.init(window.location.protocol, window.location.hostname, 4321, "image upload"); +(async () => { + const info = await CurrentUserUtils.loadCurrentUser(); + DocServer.init(window.location.protocol, window.location.hostname, 4321, info.email + "mobile"); + await Docs.Prototypes.initialize(); + if (info.id !== "__guest__") { + // a guest will not have an id registered + await CurrentUserUtils.loadUserDocument(info); + } + document.getElementById('root')!.addEventListener('wheel', event => { + if (event.ctrlKey) { + event.preventDefault(); + } + }, true); + ReactDOM.render(( + // <Uploader /> + <MobileInterface /> + ), + document.getElementById('root') + ); +} +)();
\ No newline at end of file |