scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-02 11:59:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
1286 commits 216 branches 1 tag 482 MiB
Commit graph

836 commits

Author SHA1 Message Date
Matthew Taylor
97516b1e1d styling cleanup for teacher registration 
some scoping, as well as class labeling
 2016-06-24 11:19:41 -04:00
Technoboy10
93054cf393 change from defaultValue to value because of formsy 2016-06-24 11:13:05 -04:00
Connor Hudson
5724a4c609 Merge pull request #606 from technoboy10/gh604-localize-educator-landing 
Fix GH-604: Localize Educator Landing Page
 2016-06-24 10:51:34 -04:00
Technoboy10
0277b96698 move teacher accounts string to general 2016-06-24 10:39:55 -04:00
Technoboy10
3d18f04a43 localize educator landing page 2016-06-24 10:05:44 -04:00
Matthew Taylor
633fee162a Merge pull request #603 from TheGrits/patch-2 
Fix gh-602: Remove Community Counselor
 2016-06-24 08:58:10 -04:00
Connor Hudson
5cb46b1579 Merge pull request #601 from technoboy10/educator-landing 
Fix GH-311: Educator landing page
 2016-06-24 08:21:02 -04:00
Matthew Taylor
ebf45c6f1d Fix linting errors 
Signed-off-by: Connor Hudson <technoboy10@fake.email>
 2016-06-24 08:13:32 -04:00
Matthew Taylor
92883d3cbe swap logos in conference footer 2016-06-23 22:46:11 -04:00
The_Grits
f233f660b0 Fix gh-602: Remove Community Counselor 2016-06-23 18:28:24 -04:00
Connor Hudson
1da0978029 routes.json 2016-06-23 17:26:28 -04:00
Connor Hudson
53eb56c1df style tweaks 2016-06-23 17:23:35 -04:00
Matthew Taylor
e71aff5df1 Merge pull request #594 from St19Galla/develop 
Navbar issues; :hover
 2016-06-23 17:20:44 -04:00
St19_Galla
49f6a6bee2 Update navigation.scss 
Changed padding rather than height
 2016-06-23 17:06:40 -04:00
Matthew Taylor
74bd2b3255 Merge pull request #599 from mewtaylor/feature/teacher-registration-flow 
[Updates] Teacher registration flow
 2016-06-23 16:48:58 -04:00
Connor Hudson
7de13d029b get rid of carousel, make things centered if they need it 2016-06-23 15:46:02 -04:00
Matthew Taylor
0c1abada3a Small tweaks 
1. left-align form elements even in mobile
2. Bolden input labels, except for checkboxes and radio elements

/cc @carljbowman
 2016-06-23 15:44:14 -04:00
Andrew Sliwinski
89f8434d71 Move GA tracking code into page head 2016-06-23 15:34:47 -04:00
Matthew Taylor
6aeee284bc style waiting room 
also "deep purple" :)
 2016-06-23 15:25:22 -04:00
Matthew Taylor
86a8f94919 some code formatting tweaks 2016-06-23 15:10:51 -04:00
Matthew Taylor
10f154ca10 accidentally took this out 2016-06-23 15:10:41 -04:00
Matthew Taylor
f00aedd17e linter error 2016-06-23 14:27:42 -04:00
Matthew Taylor
1a08e7ae49 Finalize styling for registration flow 
/cc @carljbowman

One issue we ran into is that our `frameless` configuration is in `em` rather than `rem`, making it difficult to have an aboslute grid applied uniformly at all hierarchies. For now, we're using straight `rem` calculations instead of `$cols{1,8}` in the styling until we can refactor `frameless` to use `em`.
 2016-06-23 14:06:36 -04:00
Connor Hudson
6d3d8b7446 more styling 2016-06-23 13:48:18 -04:00
Connor Hudson
c52a6e16e9 attempted mobile styling 2016-06-23 13:18:45 -04:00
Matthew Taylor
1910d38bc6 Merge branch 'feature/teacher-registration-flow' of https://github.com/rschamp/scratch-www into feature/teacher-registration-flow 
* 'feature/teacher-registration-flow' of https://github.com/rschamp/scratch-www:
  Add teacher waiting room view
  Only pass necessary props to steps

# Conflicts:
#	src/components/registration/steps.jsx
#	src/views/teacherregistration/teacherregistration.jsx
 2016-06-23 07:35:06 -04:00
Matthew Taylor
8fb16bf397 Add formatting for teacher reg flow 2016-06-23 07:27:43 -04:00
Connor Hudson
3624e18e08 inherit line height, remove margin 2016-06-22 16:58:58 -04:00
Connor Hudson
230cadffa5 more styling, carousel 2016-06-22 16:48:58 -04:00
Ray Schamp
93ed60cd0d Add teacher waiting room view 2016-06-22 13:35:38 -04:00
Connor Hudson
9c14f7cb3f create landing page 2016-06-22 13:18:19 -04:00
St19_Galla
ab2dc47921 Update navigation.scss 2016-06-22 11:22:30 -04:00
Ray Schamp
de8ac6c56a Only pass necessary props to steps 
Rather than lazily including all form progress to every step, just give each step what it needs.
 2016-06-21 18:45:41 -04:00
carljbowman
ee8d6bf0c5 Update Jobs page 
- Add 'Web Designer' position
- Adjusted typography to match new Type Standards
- Add Hex Value to Colors for consistency
 2016-06-21 15:00:51 -04:00
Matthew Taylor
9d6fb63d18 Merge branch 'feature/teacher-registration-flow' of https://github.com/rschamp/scratch-www into feature/teacher-registration-flow 
* 'feature/teacher-registration-flow' of https://github.com/rschamp/scratch-www: (46 commits)
  Add serverside email validation
  Clean up
  Move registration step to main component
  Submit the rest of the fields when registering
  This help text is redundant now
  Fix organization "other" field enablement
  Get the form creating regular accounts
  Add method to api for submitting forms
  Update language chooser for formsy
  Add missing string
  Add progress indicators
  Style pass
  Remove unused label component
  Remove unused mixin factory
  Fixup api refactor
  Add serverside username validation
  L10n pass
  Explain the GeneralError component
  Add help text when a field is not required
  L10n WIP
  ...

# Conflicts:
#	src/l10n.json
#	src/views/splash/splash.jsx
 2016-06-17 15:32:49 -04:00
Connor Hudson
5d12e5773d Merge pull request #584 from technoboy10/gh554-localize-faq 
Fix GH-554: Localize FAQ title
 2016-06-17 14:47:46 -04:00
Matthew Taylor
b337b47590 Merge pull request #586 from mewtaylor/issue/conference-updates 
Fix GH-[571,563] – updates to the conference site
 2016-06-17 14:14:53 -04:00
Ray Schamp
bf76e88ca2 Add serverside email validation 2016-06-17 13:01:53 -04:00
Ray Schamp
11b9876930 Clean up 2016-06-17 12:22:29 -04:00
Ray Schamp
078463ac25 Move registration step to main component 
Add a placeholder error step
 2016-06-17 12:22:11 -04:00
Ray Schamp
8646bd84b3 Submit the rest of the fields when registering 2016-06-17 11:01:34 -04:00
Ray Schamp
532a1cce57 This help text is redundant now 2016-06-17 11:01:10 -04:00
Ray Schamp
ad5da0f543 Fix organization "other" field enablement 2016-06-17 11:00:48 -04:00
Matthew Taylor
f0b178c290 Merge pull request #583 from mewtaylor/issue/gh-541-faq-schools 
Fix GH-541: Add "schools" section to faq
 2016-06-17 09:39:41 -04:00
Ray Schamp
d7ca0166ab Get the form creating regular accounts 2016-06-16 17:25:14 -04:00
Ray Schamp
26e1ee553b Add method to api for submitting forms 
Some of our legacy endpoints expect this style rather than json.

Also clean up the way useCsrf works — don't always set json attribute to an empty object.
 2016-06-16 17:24:31 -04:00
Matthew Taylor
32e9b089c5 updates to the conference site 
1. new collaborators
2. new sold out language
3. some copy edits
 2016-06-16 17:07:22 -04:00
Ray Schamp
d27b0a2433 Update language chooser for formsy 2016-06-16 16:31:13 -04:00
Ray Schamp
9a3b83f8c6 Add missing string 2016-06-16 16:30:59 -04:00
Connor Hudson
1e571d0e2d localize FAQ title 2016-06-16 15:11:43 -04:00
Matthew Taylor
f5cbdfa2c9 Merge pull request #582 from mewtaylor/issue/teacher-faq 
Add teacher faq page
 2016-06-16 11:31:29 -04:00
Connor Hudson
c188a268e2 Merge pull request #568 from TheGrits/patch-1 
Fix gh-555: Squished News Icons
 2016-06-16 11:17:44 -04:00
Ray Schamp
e062096445 Add progress indicators 2016-06-16 10:54:36 -04:00
Matthew Taylor
b13a388425 Fix typo 
thanks @technoboy10!
 2016-06-16 10:54:35 -04:00
Matthew Taylor
8ef3acd5d9 Merge pull request #560 from mewtaylor/issue/gh-556-footer 
Fix GH-556: Add "For Developers" to the footer
 2016-06-16 10:28:19 -04:00
Matthew Taylor
098bc8618a Merge pull request #577 from mewtaylor/issue/gh-573-grid-align 
Fix GH-573: center align grid while left aligning projects
 2016-06-16 10:24:53 -04:00
Matthew Taylor
b828200e94 add teacher faq page 2016-06-16 10:22:37 -04:00
Matthew Taylor
2ea2cfa6c5 Add "schools" section to faq 2016-06-15 15:22:41 -04:00
Ray Schamp
1fba322d01 Style pass 2016-06-15 15:08:56 -04:00
Matthew Taylor
626b3f008e Merge branch 'develop' of https://github.com/LLK/scratch-www into issue/gh-543-teacher-banner 
* 'develop' of https://github.com/LLK/scratch-www: (29 commits)
  Add explore redirects
  Allow access to 2014 and 2015 pages
  use route aliases for generalizable route patterns
  remove `/components` from `routes.json`
  Remove Make it Fly banner
  Fix issues in FAQ of /developers page.
  move shuffle to utility module
  fix error with shuffleArray function
  add shuffleArray function, shuffle most loved and most remixed
  use `image` to get studio thumbnail
  quick formatting fix for box header on search
  Fix merge issue
  Add localizations, minor style changes
  Removed rows from grid, changed explore tabs
  Removed extraneous image file
  Whitespace added
  Small fix
  Support for studios
  Refactoring, new grid component
  Style changes
  ...

# Conflicts:
#	src/views/splash/splash.jsx
#	src/views/splash/splash.scss
 2016-06-15 09:45:05 -04:00
Matthew Taylor
2193914650 center align grid while left aligning projects 
Fixes #573
 2016-06-15 09:34:15 -04:00
Matthew Taylor
311f431ca1 Add explore redirects 
for `/explore`, `/explore/projects` and `/explore/studios` to `/explore/<projects|studios>/all`
 2016-06-15 08:19:27 -04:00
Ray Schamp
fb57c25afd Remove unused label component 2016-06-14 17:47:56 -04:00
Ray Schamp
333d52d2b6 Remove unused mixin factory 2016-06-14 17:41:12 -04:00
Ray Schamp
dffea48299 Fixup api refactor 
Updates after a rebase
 2016-06-14 17:33:54 -04:00
Ray Schamp
8da8ab4100 Add serverside username validation 
With this we get cleanspeak for free
 2016-06-14 17:29:31 -04:00
Ray Schamp
8dac67f292 L10n pass 2016-06-14 17:29:31 -04:00
Ray Schamp
97c4e9beb9 Explain the GeneralError component 2016-06-14 17:29:31 -04:00
Ray Schamp
f74a078afb Add help text when a field is not required 
Most of our fields are required, so it makes more sense to display help when they are optional than to asterisk every required field
 2016-06-14 17:29:31 -04:00
Ray Schamp
667ff08a36 L10n WIP 2016-06-14 17:29:31 -04:00
Ray Schamp
ce007d64f8 Change password confirmation to "show password" 2016-06-14 17:29:30 -04:00
Ray Schamp
4e0d54df98 Split up concerns of form progression and display 
Still thinking of a good name for the form "card" component...
 2016-06-14 17:29:30 -04:00
Ray Schamp
da2a4ce48c Add bot honeypot 2016-06-14 17:29:30 -04:00
Ray Schamp
cfa85427b1 Add address validation 2016-06-14 17:29:30 -04:00
Ray Schamp
f8037f6767 Lint 2016-06-14 17:29:30 -04:00
Ray Schamp
d7df1e980f Move api mixin to lib, remove mixin 
The mixin doesn't gain us anything except complexity
 2016-06-14 17:29:30 -04:00
Ray Schamp
56e16bc0dc Actually provide every state in world choice 2016-06-14 17:29:30 -04:00
Ray Schamp
0512b614be Fixup use iso 2016-06-14 17:29:29 -04:00
Ray Schamp
0206a4da9d Lint 2016-06-14 17:29:29 -04:00
Ray Schamp
f126a71336 Use iso-31660-2 package for country data 2016-06-14 17:29:29 -04:00
Ray Schamp
9da2bb29a8 Base phone and address country on user country 2016-06-14 17:29:29 -04:00
Ray Schamp
3ea1c64184 Split out steps from the view 2016-06-14 17:29:29 -04:00
Ray Schamp
0f3485534b Organize form data into objects 2016-06-14 17:29:29 -04:00
Ray Schamp
fe74208f32 Add international phone validation 2016-06-14 17:29:29 -04:00
Ray Schamp
bcda082014 Add validation to the rest of the form 2016-06-14 17:29:29 -04:00
Ray Schamp
175a71711d Update existing forms on the site to use formsy 
Or not in the case of the search form
 2016-06-14 17:29:29 -04:00
Ray Schamp
b5c615b1fa Use formsy-react for validation 
Complete validation for username/password form (except for checking if a username exists).
 2016-06-14 17:27:53 -04:00
Ray Schamp
de3151924c Lint 2016-06-14 17:27:53 -04:00
Ray Schamp
1eaf6effcc Tiny bit of style 2016-06-14 17:27:53 -04:00
Ray Schamp
04c8650512 Allow other types other than form in FormStep 2016-06-14 17:27:53 -04:00
Ray Schamp
2ca846f826 Use Scratch components for the form and clean up 2016-06-14 17:27:52 -04:00
Ray Schamp
350a573fc5 Move formset into forms 2016-06-14 17:27:52 -04:00
Ray Schamp
17a3f1ebcb Add initial form data 2016-06-14 17:27:52 -04:00
Ray Schamp
68d49a84dc Update FormSet to advance steps onSubmit 2016-06-14 17:27:52 -04:00
Ray Schamp
144d6e3754 wip 2016-06-14 17:27:52 -04:00
Ray Schamp
a080b2b64f wip 2016-06-14 17:27:52 -04:00
Matthew Taylor
60187d4a75 Allow access to 2014 and 2015 pages 2016-06-14 12:42:13 -04:00
Matthew Taylor
dfc4f9574d use route aliases for generalizable route patterns 
1. match all `^/explore` to www
2. match all `^/search` to www
3. match all `^/conference` to www
 2016-06-14 11:28:20 -04:00
Matthew Taylor
45d78b9c7c remove /components from routes.json 
It's a dev-only route, and is in `dev-routes.json` already
 2016-06-14 11:26:17 -04:00
The_Grits
1785c767b4 whoops 2016-06-13 15:37:31 -04:00
The_Grits
554dcb100c Fix gh-555: Squished News Icons 2016-06-13 15:06:41 -04:00
Ray Schamp
01b662f77f Merge pull request #567 from rschamp/hotfix/remove-banner 
[Develop] Remove Make it Fly banner
 2016-06-13 14:43:37 -04:00
Ray Schamp
e2dcd6c647 Remove Make it Fly banner 
This reverts commit 7cf3846231, reversing
changes made to afe14ebe88.
 2016-06-13 14:35:08 -04:00
Andrew Sliwinski
e05572dc0a Fix issues in FAQ of /developers page. 2016-06-13 11:38:11 -04:00
Matthew Taylor
e04b314656 remove dashes 
Thanks @rschamp!
 2016-06-13 10:07:00 -04:00
Matthew Taylor
5b73c4192d change name to getUnsignedValue 
thanks @rschamp!
 2016-06-13 10:06:43 -04:00
Matthew Taylor
0c2a73a910 Don't use dash in name 
It's used for grouping in `build-locales`.
 2016-06-13 09:41:12 -04:00
Connor Hudson
fde193ca06 move shuffle to utility module 2016-06-13 09:40:32 -04:00
Matthew Taylor
e5f274933b Add final copy for teacher account banner 2016-06-13 07:47:43 -04:00
Connor Hudson
3d6a95e84b fix error with shuffleArray function 2016-06-09 17:33:49 -04:00
Connor Hudson
04166ab423 add shuffleArray function, shuffle most loved and most remixed 2016-06-09 17:22:31 -04:00
Matthew Taylor
e5467e5f45 Add "For Developers" to the footer 
Fixes #556
 2016-06-09 11:54:14 -04:00
Matthew Taylor
ef0037942e use image to get studio thumbnail 
same as with `project`
 2016-06-09 09:44:09 -04:00
Matthew Taylor
b065ed5254 quick formatting fix for box header on search 2016-06-09 07:57:41 -04:00
Matthew Taylor
365c3d0bad Fix merge issue 2016-06-09 07:44:28 -04:00
Matthew Taylor
9fad938eb8 Add localizations, minor style changes 2016-06-09 07:32:25 -04:00
Matthew Taylor
ac17850491 Add teacher banner to splash page 
This only shows if the logged in user is a teacher, and persists for teachers.
 2016-06-08 13:47:11 -04:00
Matthew Taylor
0894724dfd Merge branch 'develop' of https://github.com/rthorn/scratch-www into feature/explore-from-rthorn 
* 'develop' of https://github.com/rthorn/scratch-www:
  Removed rows from grid, changed explore tabs
  Removed extraneous image file
  Whitespace added
  Small fix
  Support for studios
  Refactoring, new grid component
  Style changes
  Changed path of search page to allow for studio tabs
  Changes to path for search results
  Removed unnecessary files
  Search page functions
  Starting mock of search page
  Fixed problem with loading
  Load button and tabs functioning
  Merge remote-tracking branch 'LLK/develop' into develop
  Early Explore Page

# Conflicts:
#	src/components/navigation/www/navigation.jsx
 2016-06-07 09:06:01 -04:00
Matthew Taylor
bf1fa2934d Merge pull request #552 from mewtaylor/bugfix/mobile-nav-conference 
[Develop] hotfix: mobile nav conference
 2016-06-06 11:01:12 -04:00
Connor Hudson
8022d76aaa Merge pull request #553 from technoboy10/gh548-signout 
Fix GH-548: Sign out should take effect before reload
 2016-06-06 09:06:36 -04:00
Connor Hudson
75ce6378a2 remove comment 2016-06-06 08:46:28 -04:00
Connor Hudson
9c66939bc3 use defaults instead of defaultsDeep 2016-06-06 08:45:35 -04:00
Matthew Taylor
fb4464d0d4 Correction for Nichole Pinkard's name on /expect 
Apologies for the copy error!
 2016-06-06 08:32:48 -04:00
Matthew Taylor
fce41dc32e use row wrap instead of columns 
apparently mobile doesn't like columns as much as row wrap for flexbox.
 2016-06-06 08:29:51 -04:00
Matthew Taylor
bcec3d8fc6 Merge pull request #549 from mewtaylor/bugfix/conference-schedule 
[Develop] Hotfix: conference schedule bug fixes
 2016-06-03 19:52:16 -04:00
Matthew Taylor
c8f6c36b1f Fix schedule formatting 
1. Sort schedule by 24-hour time to handle 12-o-clock
2. Sort chunks by type AND time, since multiple chunks have the same name
 2016-06-03 19:43:53 -04:00
Connor Hudson
5bd1f4f2ac add container div to fix dmca 2016-06-03 15:02:55 -04:00
Connor Hudson
245c9cbe4f Merge pull request #542 from technoboy10/gh307-newstatic 
Fix GH-307: Restyle FAQ and legal pages
 2016-06-03 14:31:08 -04:00
Technoboy10
acea4f4df1 move imports into .information-page 2016-06-03 14:16:17 -04:00
Technoboy10
fea1fc611f restrict styles to only informationpage element 2016-06-03 14:14:45 -04:00
Technoboy10
9853f5ba5a Move all styling into the InformationPage component 2016-06-03 14:02:29 -04:00
Connor Hudson
86e4dd6ce8 Another results -> session fix 2016-06-02 10:04:54 -04:00
Connor Hudson
292a9773fc fix session.js 2016-06-01 17:23:19 -04:00
Connor Hudson
f280d1d8df Remove quotes around keys, results -> session 2016-06-01 17:22:11 -04:00
Connor Hudson
11621564f6 why hello there, travis 2016-06-01 17:11:18 -04:00
Connor Hudson
6f39466d9f Reduxified 2016-06-01 17:07:21 -04:00
Connor Hudson
fd1401fe1b used stricter comparison 2016-06-01 16:14:58 -04:00
Connor Hudson
4d65d478ed change to more extensible session 2016-06-01 15:28:18 -04:00
Connor Hudson
00ac15d475 add test, tweak terms 2016-06-01 12:05:03 -04:00
Connor Hudson
1178a50beb restyle all the things 2016-06-01 11:57:50 -04:00
Connor Hudson
10a4dc656e fix travis 2016-06-01 10:49:59 -04:00
Connor Hudson
e402363576 initial pass 2016-05-31 16:37:42 -04:00
Ray Schamp
7fb512f4a8 Merge pull request #531 from rschamp/feature/cn-banner 
[Develop] Homepage module
 2016-05-31 12:25:16 -04:00
Ray Schamp
3632f3dc1d Merge branch 'release/2.2.9' into develop 2016-05-31 12:24:21 -04:00
Ray Schamp
7cf3846231 Merge pull request #530 from rschamp/feature/cn-banner 
[Master] Homepage module
 2016-05-31 10:18:20 -04:00
Ray Schamp
89bdeff631 Don't break up navigation on mobile 2016-05-31 09:32:04 -04:00
Ray Schamp
0335fe1275 Merge pull request #516 from rschamp/upgrade/react-15 
Upgrade to React 15
 2016-05-31 09:23:49 -04:00
Matthew Taylor
932dab40c7 Some additional mobile changes 2016-05-29 11:59:53 -04:00
Matthew Taylor
6eeebe05c3 Merge pull request #525 from mewtaylor/issue/conference-tweaks 
For GH-497: conference tweaks for fallout from schedule/typography
 2016-05-27 16:40:39 -04:00
Matthew Taylor
ad1e723188 Drop the text below the button 
thanks @carljbowman!
 2016-05-27 16:35:23 -04:00
Matthew Taylor
011032308c Consolidate text 
thanks @carljbowman !
 2016-05-27 16:19:51 -04:00
Matthew Taylor
c351d54e9b fix lint warning 
thanks @rschamp!
 2016-05-27 16:02:38 -04:00
Matthew Taylor
74ac6e52bb conference formatting tweaks for mobile 
thanks @carljbowman!
 2016-05-27 15:55:27 -04:00
Matthew Taylor
b07b61c925 Update conference to reflect being sold out 2016-05-27 15:55:08 -04:00
Ray Schamp
45abaff962 Fix account links on Privacy Policy page 2016-05-27 14:33:12 -04:00
Ray Schamp
992f6d7481 Update footer and nav styles per @carljbowman 2016-05-27 12:02:22 -04:00
Ray Schamp
986341341b Fix line height and wrapping on splash components 2016-05-27 11:46:35 -04:00
The_Grits
4f75713bd5 Update privacypolicy.jsx 2016-05-27 09:56:56 -04:00
Connor Hudson
a4f15f4ec8 Merge pull request #510 from technoboy10/gh507-scheduleanchor 
Fix gh-507: Consistently change URI
 2016-05-26 16:59:44 -04:00
Connor Hudson
59f4d303c6 Merge pull request #512 from TheGrits/patch-1 
Fix gh-29: Migrate Terms of Use
 2016-05-26 16:15:21 -04:00
Ray Schamp
2a01ebee84 Fix search button display 
Update search form submit button from an input[type=submit] to a button.  React 15 omits the value prop if it's blank, so the `<input type="submit" value="">` was rendered as `<input type="submit">`. This caused the input to display the default value of "Submit".  The button element is more appropriate for this behavior and doesn't have the missing value issue.
 2016-05-26 16:00:28 -04:00
Ray Schamp
c966f8a0ba Fix modal layout 
The styles in the upgraded react-modal broke our centering.
The auto-focusing on the modal made an annoying blue border around it in Chrome.
 2016-05-26 16:00:28 -04:00
Ray Schamp
fe08f8c18f Update final graphic 2016-05-26 14:38:56 -04:00
Ray Schamp
18bb2357c6 Update final copy and links 2016-05-26 14:10:59 -04:00
The_Grits
62f8978edc Update route 2016-05-26 11:31:54 -04:00
The_Grits
f3fafb7b3a Rename and Update 2016-05-26 11:31:16 -04:00
The_Grits
9bd63bd11a Spacing 2016-05-26 11:23:17 -04:00
Ray Schamp
d1f675374b Localize banner 2016-05-24 17:30:48 -04:00
Ray Schamp
a0a30155af Hide components route in production 2016-05-24 17:15:03 -04:00
Ray Schamp
448bb8aa3f Add Power Puff Girls banner 2016-05-24 17:14:12 -04:00
Matthew Taylor
87ce6db1cd generalize pdf check 
thanks @rschamp! fyi, I left it in cards only because I'm not sure that we really do this `(English)` thing anywhere else.
 2016-05-24 14:27:16 -04:00
Matthew Taylor
ffc1e8d0ca Fix pdf localization check 
It was adding the `(English)` suffix no matter what. This fixes it by getting the locale from props, and also by making the conditional check a bit more safe.
 2016-05-24 13:09:34 -04:00
The_Grits
7948c8bbc4 Hello Travis 2016-05-24 10:21:19 -04:00
The_Grits
ac96ffc6f6 Squash and Merge 2016-05-24 10:05:17 -04:00
Connor Hudson
e73b26b686 fix spacing issues 
Fixes Travis testing
 2016-05-23 15:35:05 -04:00
Technoboy10
a3fda6be30 use single quotes to appease travis 2016-05-23 14:28:34 -04:00
Technoboy10
6bddc8d2d3 replace anchor when schedule day clicked 2016-05-23 14:10:09 -04:00
Technoboy10
0b6b81e1f1 Merge branch 'release/2.2.9' of https://github.com/llk/scratch-www into release/2.2.9 2016-05-23 10:48:29 -04:00
Technoboy10
b020964ef4 add media query to center links 2016-05-23 10:48:11 -04:00
Connor Hudson
173a7bc52a Merge pull request #508 from technoboy10/gh505-schedulebackground 
Fix gh-505: Incorrect time header background
 2016-05-23 10:25:02 -04:00
Technoboy10
7bb9c622c7 set time headers to correct color 2016-05-23 10:10:31 -04:00
The_Grits
e41f8b8635 Footer Press link 2016-05-20 12:05:22 -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
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
The_Grits
1b358b773e Termsofuse route 2016-05-18 21:37:06 -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