Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

120 top level routing #181

Merged
merged 10 commits into from
Feb 16, 2017
Merged

120 top level routing #181

merged 10 commits into from
Feb 16, 2017

Conversation

jameshadfield
Copy link
Member

@jameshadfield jameshadfield commented Feb 14, 2017

  • Routing logic is in index.js - note that localhost:4000/flu redirects to nextflu
  • To get the header to work in the main App I had to add some CSS (index.html) to remove sidebars and offset the Sidebar by the header height. Apparently there's an easier way How do I use sidebar with a fullwidth top header? balloob/react-sidebar#23 but I couldn't make it work. The drop-shadow doesn't go over the main bit, which is a bit rubbish.
  • The titlebar / header is now inside About / Splash / App. Note that when you open the sidebar the titlebar changes...
  • Issue make titlebar component responsive #122 is not addressed, so the titlebar isn't great on mobile
  • About and splash pages done - help / methods etc not part of this PR
  • I haven't looked into the image licenses
  • I don't really know how to use flexbox, so it's a bit of a disaster when the width gets small

jameshadfield and others added 7 commits February 14, 2017 10:35
note the behaviour in app when sidebar is toggled
Header styles have been moved around a bit
Avoids Escher interaction with sidebar. Also, unified links under "brandColor".
@trvrb
Copy link
Member

trvrb commented Feb 15, 2017

I'm getting an error from Heroku when trying to push 120-top-level-routing that I'm not getting on master. This is:

remote:        > nextstrain-auspice@0.0.1 build:webpack /tmp/build_6057c9f69a4ad2029e973b314dfebf0b
remote:        > NODE_ENV=production webpack --config webpack.config.js
remote:        
remote:        fatal: Not a git repository (or any parent up to mount point /tmp)
remote:        Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
remote:        child_process.js:526
remote:        throw err;
remote:        ^
remote:        
remote:        Error: Command failed: git rev-parse --short HEAD
remote:        fatal: Not a git repository (or any parent up to mount point /tmp)
remote:        Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
remote:        
remote:        at checkExecSyncError (child_process.js:483:13)
remote:        at Object.execSync (child_process.js:523:13)
remote:        at Object.<anonymous> (/tmp/build_6057c9f69a4ad2029e973b314dfebf0b/webpack.config.js:5:4)
remote:        at Module._compile (module.js:570:32)
remote:        at Object.Module._extensions..js (module.js:579:10)
remote:        at Module.load (module.js:487:32)
remote:        at tryModuleLoad (module.js:446:12)
remote:        at Function.Module._load (module.js:438:3)
remote:        at Module.require (module.js:497:17)
remote:        at require (internal/module.js:20:19)

I'm investigating...

@trvrb
Copy link
Member

trvrb commented Feb 15, 2017

This is killing Heroku: 4c6cc48#diff-11e9f7f953edc64ba14b0cc350ae7b9dR5. Heroku doesn't have a Git repo to run git rev-parse on. More info here: http://stackoverflow.com/questions/14583282/heroku-display-hash-of-current-commit

trvrb and others added 3 commits February 15, 2017 09:24
due to heroku incompatability
* sunken-titlebar:
  Adjustments to titlebar spacing and styling
  Sunken titlebar
@trvrb trvrb merged commit 466612f into master Feb 16, 2017
@trvrb trvrb deleted the 120-top-level-routing branch February 16, 2017 00:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants