Commit graph

484 commits

Author SHA1 Message Date
Matthew Taylor
a477be4814 Some more cleanup
1. typo with splitting token/session out
2. redefine `chunk` as `timeSlot`
3. move timeSlot sorting into its own method
2016-05-19 17:37:51 -04:00
Matthew Taylor
337b6dcfca fix lint warnings 2016-05-19 17:02:21 -04:00
Matthew Taylor
a860b27941 Some updates to the redux structure
1. split `auth.js` up so it's 1 reducer per file
2. consolidate the conference schedule reducers
3. make conference reducer names more descriptive
4. add error handling for `body === 'undefined'`

Thanks @rschamp for all the help!
2016-05-19 16:55:25 -04:00
Matthew Taylor
bca90bd835 Add icons for schedule/details
from @carljbowman
2016-05-19 16:40:30 -04:00
Matthew Taylor
d69de477a1 Merge branch 'develop' of https://github.com/LLK/scratch-www into feature/conference-schedule
* 'develop' of https://github.com/LLK/scratch-www: (32 commits)
  Lint
  Bundle all locale data
  Don't bundle polyfills
  Set up Raven within init.js
  Prefix privacyPolicy message string
  Exclude minified javascript from linting
  One space more
  Changes "interfacesto" to "interfaces to"
  Remove tag target
  Filter before mapping to avoid returning undefined
  Fix Pass condition for "static" routes
  Spacing2
  Mangling is the default
  Spacing
  Update for typography fixes
  Cherry pick PR #476 into master
  Add invisible spacer to anchored sections
  For Developers
  Lint JSON, expand and simplify lint step
  Fix banned user redirect
  ...

# Conflicts:
#	src/redux/actions.js
#	src/redux/reducer.js
2016-05-19 13:25:36 -04:00
Matthew Taylor
cad75217f0 Add schedule/detail components for conference 2016-05-19 11:34:59 -04:00
Matthew Taylor
b969c4e2ed Split reducers into separate files
Use a model of reducer/action files for each component that has them, and make `reducer.js` be the one that imports and configures all of them. This modeling is based on a few examples I've seen which seemed to work for our current case, but I'm totally fine with splitting actions and reducers into separate directories if we'd like too.
2016-05-19 11:34:28 -04:00
Matthew Taylor
4017266327 Fix typo 2016-05-19 11:26:11 -04:00
Ray Schamp
b1be409dea Merge pull request #491 from rschamp/bugfix/common-chunk-fallout
Fix fallout from common chunk refactor
2016-05-17 23:17:06 -04:00
Ray Schamp
f9bb5592d4 Lint
Remove min context, we don't use it anymore.
2016-05-17 21:09:18 -04:00
Ray Schamp
650b98c009 Bundle all locale data
The npm installed version of react-intl does not include all locales, they must be added manually
2016-05-17 21:02:36 -04:00
Ray Schamp
884e9ff4a7 Don't bundle polyfills
They are inherently global, so don't belong in the domain of webpack.
2016-05-17 21:02:36 -04:00
Ray Schamp
b65332c5d4 Set up Raven within init.js
Now that Raven is bundled with webpack, it's not available in the global context, so require it and configure it within the init module.

I struggled to figure out how to expose the raven-js module as a global, as all the combinations of `externals` and `ProvidePlugin` only applied to webpacked modules, not the global window.  The correct way to do it seems to be exports-loader but that looked rather hacky and hard to understand.
2016-05-17 21:02:35 -04:00
Ray Schamp
219d144be2 Prefix privacyPolicy message string
So that it matches the rest, and is localized. Not sure, but I think this was fallout from de-localizing the Privacy Policy page.
2016-05-17 21:01:49 -04:00
Ray Schamp
bb0ac87aec Merge pull request #488 from TheGrits/patch-1
[Privacy Policy] One space more
2016-05-17 16:26:50 -04:00
Ray Schamp
dff9c3d128 Merge pull request #489 from technoboy10/patch-3
Hotfix: Resolve gh-484 (cosmetic issue in developers page)
2016-05-17 16:24:17 -04:00
Ray Schamp
f7e9b7ca38 Merge pull request #473 from rschamp/feature/lint
Lint JSON and all of our .js and .scss
2016-05-17 16:01:55 -04:00
The_Grits
2d80c46c74 One space more
I can't believe I missed this one earlier. *facepalm*
2016-05-17 15:46:20 -04:00
Connor Hudson
9808a31d9a Changes "interfacesto" to "interfaces to" 2016-05-17 13:07:19 -06:00
Matthew Taylor
829cb6ff0c Merge pull request #478 from mewtaylor/issue/gh-419
Fix GH-419: Some localization cleanup
2016-05-17 11:43:27 -04:00
Ray Schamp
0ede616f44 Merge pull request #481 from TheGrits/patch-2
Fix Spacing Issues on Privacy Policy
2016-05-17 11:03:11 -04:00
The_Grits
792a5c9622 Spacing2
Changed as per @rschamp's comments
2016-05-17 11:02:34 -04:00
Ray Schamp
7f275efdf0 Merge pull request #479 from rschamp/feature/common-chunk
Move externals, polyfill and init to common chunk
2016-05-17 10:36:14 -04:00
The_Grits
834f2db463 Spacing
I noticed some spacing issues on the page, I thought I would fix them.
2016-05-17 09:52:42 -04:00
Ray Schamp
6b420b4445 Update for typography fixes 2016-05-17 08:30:27 -04:00
Ray Schamp
b7dd55e7e0 Merge branch 'feature/for-developers' into develop 2016-05-17 08:28:25 -04:00
Matthew Taylor
89c2f2628e Add invisible spacer to anchored sections
so that the headers are visible
2016-05-17 08:24:03 -04:00
carljbowman
e885c08ea1 For Developers
Add landing page for developers
2016-05-17 07:51:08 -04:00
Ray Schamp
b0b520fe18 Lint JSON, expand and simplify lint step 2016-05-16 13:02:55 -04:00
Ray Schamp
31c2f98afc Fix banned user redirect 2016-05-16 13:02:55 -04:00
Ray Schamp
8f2697b7f1 Move externals, polyfill and init to common chunk
This should allow us to define and update our dependencies more easily (via npm) as well as reducing the number of requests.

Additionally, when we add common packages this will avoid the issue after deploys where a user may get a cached HTML page, but new Javascript, leading to the dreaded blank page because the browser didn't download all dependencies.

Using mangle with UglifyJS also made the total file size for the common chunk bundle smaller than the current total for all of our external/polyfill scripts (1.18MB vs 1.55MB).
2016-05-16 12:59:58 -04:00
Matthew Taylor
82942b988d Localize title of page after strings load
This doesn't solve the issue of making it crawlable in other languages, but it does allow the title to be translatable for user parsing (and accessibility)
2016-05-16 10:55:51 -04:00
Matthew Taylor
4abebd8194 Remove duplicate About Scratch entry
Towards #419 – makes "About Scratch" work on the About page. Additionally, removes `defaultMessages` from the footer since we no longer use those.
2016-05-16 10:19:52 -04:00
The_Grits
76c003d854 Lint fixes 2016-05-16 06:45:06 -04:00
The_Grits
5d05d19566 aha
Does this fix the lint error?
2016-05-14 23:21:10 -04:00
The_Grits
c2fca9c4c6 Squash and Merge 2016-05-14 22:39:40 -04:00
The_Grits
f3439eba5c Add privacypolicy route 2016-05-13 20:45:48 -04:00
Matthew Taylor
bf1b3f894d Some leftovers
Thanks @rschamp again!
2016-05-12 22:54:07 -04:00
Matthew Taylor
804a65e3d0 Whoops
That change is coming later with more redux in conference :).
2016-05-12 18:39:33 -04:00
Matthew Taylor
82dbfabcec Constrain view styles to within view name classes
So that they don't affect styles declared outside the scope of the view. Thanks @rschamp!
2016-05-12 18:32:57 -04:00
Matthew Taylor
e1cebe46db Ergonomics – get rid of typography file
1. Merge typography into main
2. Get rid of use of `#view` in scss
3. Make `render` work with conference pages
2016-05-12 18:05:26 -04:00
The_Grits
8d294e4d29 Float 2016-05-11 09:53:39 -04:00
The_Grits
75258be4a4 margin-right
4.4px is the max margin we can put to the right of the button without the "Forgot password?" text wrapping.
2016-05-09 11:27:22 -04:00
Matthew Taylor
fd1016059b Merge branch 'patch-8' of https://github.com/TheGrits/scratch-www into TheGrits-patch-8
* 'patch-8' of https://github.com/TheGrits/scratch-www:
  Indent p element
  Edit spacing
  Whoops
  Squash and Merge
  Add DMCA route

# Conflicts:
#	src/routes.json
2016-05-03 10:23:34 -04:00
Ray Schamp
fb292f3773 Merge pull request #466 from LLK/hotfix/analytics
[Develop] Hotfix: Add missing env variables needed for the build
2016-05-02 14:01:55 -04:00
Ray Schamp
e48b04f907 Add missing env variables needed for build 2016-05-02 11:57:46 -04:00
Matthew Taylor
47d7257895 Merge pull request #462 from mewtaylor/hotfix/add-register-faq
[Develop] Hotfix: Add Registration to FAQ
2016-05-01 12:48:41 -04:00
Matthew Taylor
c28f90857b Add registration faq question 2016-04-29 17:37:41 -04:00
Matthew Taylor
07bbc38822 Merge pull request #433 from TheGrits/patch-7
Fix gh-19: Migrate Community Guidelines
2016-04-29 17:32:35 -04:00
The_Grits
20dcf8eb4f switch 2016-04-29 17:27:39 -04:00