Commit graph

8902 commits

Author SHA1 Message Date
Ray Schamp
51e491bf44 Merge pull request #498 from rschamp/bugfix/pattern-routes
Always use regex form of route patterns
2016-05-20 10:33:54 -04:00
Ray Schamp
8ded5cb267 Always use regex form of route patterns
When talking to Fastly, don't ever use an express-style url pattern for consistency, and so we don't use : characters in condition names.
2016-05-20 10:33:13 -04:00
Matthew Taylor
cf2165d295 Merge pull request #497 from mewtaylor/feature/conference-schedule
Feature: conference schedule page
2016-05-19 18:04:04 -04:00
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
9c44d4edbe Merge pull request #496 from mewtaylor/cleanup/build-translations-from-routes
Use `routes.json` to get localization paths
2016-05-19 13:34:39 -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
1e57262771 Add fastly rule for express uri patterns
convert path variables in express (i.e. dev-server) into rules that work for fastly (i.e. `.+?`). I tried to make it `\w+?`, but javascript seemed to either want no `\`'s or two `\`'s
2016-05-19 11:36:03 -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
Matthew Taylor
4165132a3e use more descriptive variable names in loops
thanks @rschamp!
2016-05-19 10:43:25 -04:00
Matthew Taylor
fa566ac140 Fix tests, and make error check specific
Since it's using `require` to get the localisation strings, check if the error is `MODULE_NOT_FOUND` before moving on – because if it isn't, then there is an unknown error that should be thrown. Thanks @rschamp for the suggestion!
2016-05-19 06:56:45 -04:00
The_Grits
1b358b773e Termsofuse route 2016-05-18 21:37:06 -04:00
Matthew Taylor
1f871e7cf1 Use routes.json to get localization paths
Before we were using glob, which was about to start failing on subdirectories in views (which we started using in `conference`). Instead of searching for `l10n.json`, it seemed more appropriate to instead look for localization by using the configured pages that need to be localized.
2016-05-18 09:49:49 -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
dd2734f06f Merge pull request #490 from rschamp/bugfix/privacy-policy-footer
Prefix privacyPolicy message string
2016-05-17 23:16:59 -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
2c21a96c2d Exclude minified javascript from linting 2016-05-17 21:01:11 -04:00
Ray Schamp
acf0f1c298 Merge pull request #486 from rschamp/bugfix/remove-tag
Remove tag target
2016-05-17 16:27:13 -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
Ray Schamp
82f3f5782c Remove tag target
Missed this when we moved that task to webpack.
2016-05-17 13:56:38 -04:00
Ray Schamp
d360494ec2 Merge pull request #485 from rschamp/bugfix/fastly-config
Filter before mapping to avoid returning undefined
2016-05-17 13:50:47 -04:00
Ray Schamp
ca546552b9 Filter before mapping to avoid returning undefined
If the map function doesn't return anything, the added item is undefined. Avoid this by filtering the array before mapping.
2016-05-17 13:49:03 -04:00
Ray Schamp
d1fd8b307f Merge pull request #482 from rschamp/bugfix/fastly-config
Fix Pass condition for "static" routes
2016-05-17 13:26:17 -04:00
Rachel Thornton
dc42b317e2 Removed rows from grid, changed explore tabs
Grid component now no longer uses row concept, and changed tabs in the
Explore page to projects/studios, with categories in a new picker above
the tabs. Also compressed svg files.
2016-05-17 12:40:16 -04:00
Ray Schamp
bb70629b6b Fix Pass condition for "static" routes
Previously we relied on the static directory to construct the pass condition, but this doesn't include many things added to the build other than static files. So instead of adding these explicitly through `extraAppRoutes`, base the Pass condition on the final build, but exclude the view .html files. This way the version.txt, routes.json, and all directories added by webpack will be resolved to S3 rather than scratchr2.
2016-05-17 12:20:45 -04: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
Ray Schamp
d1f9f8ee32 Mangling is the default
Thanks @mewtaylor. Not sure what changed. When I double checked this, the common bundle was the same size with or without the option.  Weirdly it also mysteriously changed its size from the last time I checked to 1.23MB. ¯\_(ツ)_/¯
2016-05-17 09:53:04 -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
Ray Schamp
29ea1abd04 Cherry pick PR #476 into master
Required for build to run, deploy to happen
2016-05-17 08:27:27 -04:00
Ray Schamp
cfc1786fae Merge branch 'feature/for-developers' 2016-05-17 08:26:38 -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