Commit graph

379 commits

Author SHA1 Message Date
chrisgarrity
ca7d0cf30e Next draft
Includes new SVGs for banner and resources link
MasonryGrid does the reordering of items
Using react-responsive MediaQuery to change columns
Brought in ../forms/button.scss for button styling, and then modified for TTT

Still needs Modal
Final styling pass with Carl
2016-11-09 09:28:59 -05:00
Matthew Taylor
5af05466f6 Add ttt modal component
This assumes that the parent view that renders it will contain the strings that are specific to the ttt element.
2016-11-08 14:44:50 -05:00
Matthew Taylor
c9de1d73d9 Refactor modal components
1. Split out base modal stylings from iframe modal stylings
2. Move iframe-specific stylings into a separate copmonent
3. Move width/height iframe stylings to scss
4. Change global stylings for modals to match #980
5. Update styles to use trello style guide
2016-11-08 14:44:03 -05:00
chrisgarrity
c6f2fa68a7 First version of TTT page 2016-11-07 15:07:19 -05:00
Matthew Taylor
88a78480ba Back to hide-and-seek with new cards 2016-10-19 16:54:24 -04:00
Matthew Taylor
e01afa0161 Add new cards and card thumbs to www
Fixes #856. This also updates the styling of the `cards.jsx` view to follow the trello style guide, as previously discussed.
2016-10-19 13:45:37 -04:00
Matthew Taylor
6bcc7eeae3 Update make it fly hoc image to be higher res
Higher res AND SMALLER FILE SIZE?!?! This really is 2016. We live in an amazing time.
2016-10-03 16:40:57 -04:00
Matthew Taylor
cd6a60e5b8 Change bearstack/bball to hide and dance
Also make updates to style scoping based on feedback from @rschamp
2016-09-15 11:44:33 -04:00
Matthew Taylor
469d7a35bb Update hoc page with new tutorials
Adds:
1. Make it Fly
2. Make Music

Removes:
1. Hide-and-Seek
2. Dance, Dance, Dance
2016-09-15 08:15:37 -04:00
Technoboy10
6cb3d5ceb0 add SVGs for tab icons 2016-08-23 09:26:21 -06:00
Matthew Taylor
feee2f2955 Update conference schedule icons for consistency
from @carljbowman, to @carljbowman
2016-08-02 09:45:36 -04:00
Technoboy10
adab508b09 replace asset per #737 2016-07-21 10:26:53 -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
Connor Hudson
a90b7cab2a add the not-carousel images 2016-06-24 08:06:08 -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
dd249e8b88 add assets for teacher page 2016-06-22 13:18:47 -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
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
fe74208f32 Add international phone validation 2016-06-14 17:29:29 -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
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
Ray Schamp
fe08f8c18f Update final graphic 2016-05-26 14:38:56 -04:00
Ray Schamp
448bb8aa3f Add Power Puff Girls banner 2016-05-24 17:14:12 -04:00
Matthew Taylor
bca90bd835 Add icons for schedule/details
from @carljbowman
2016-05-19 16:40:30 -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
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
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
carljbowman
e885c08ea1 For Developers
Add landing page for developers
2016-05-17 07:51:08 -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
Rachel Thornton
4b632e4f5f Removed extraneous image file 2016-05-10 08:26:41 -04:00
Rachel Thornton
d7c9057cbd Refactoring, new grid component
Significant refactoring of Explore and Search pages, including new grid
component for displaying projects
2016-05-10 00:54:46 -04:00
Matthew Taylor
cf71520875 final content update for conference
"coming soon" image for schedule, and schedule reference on landing page. Also background image for the landing page.
2016-04-27 23:23:43 -04:00
Matthew Taylor
3c487163a0 Last minute copy updates 2016-04-22 09:07:32 -04:00
Matthew Taylor
66113e1c58 Add conference sub-site 2016-04-21 16:22:39 -04:00
Sayamindu Dasgupta
bd81438800 Add view for community blocks interview recruitment
We are recruiting Scratchers for interviews on the Scratch Community
blocks feature; this is a part of my PhD disseration. This commit has
the PDF forms and the views that are needed for the recruitment.
2016-04-01 13:23:48 -04:00
Ray Schamp
78649b69e2 Merge pull request #353 from morantsur/feature/microworlds
Moving Microworlds pages to scratch-www & adding arts
2016-03-25 15:43:10 -04:00
Ray Schamp
29fa914b9a Merge pull request #391 from rschamp/feature/token-from-cookie
Add method to retrieve token from session cookie and use it
2016-03-24 12:27:07 -04:00
Matthew Taylor
b903067658 Update the cards with new grouped structure 2016-03-23 16:37:15 -04:00
Matthew Taylor
5d693ed53d Add /info/cards/ route
Also implements a method for handling translation of static files as described in https://github.com/LLK/scratch-www/issues/372#issuecomment-193350144
2016-03-23 16:37:15 -04:00
Ray Schamp
96bc1b1ab1 Add method for reading session cookie
Assumes the session cookie is stored as JSON which may or may not have been compressed via zlib (indicated by a leading `.`), which is then base64-encoded, and made URL-safe by replacing all `+` and `/` characters with `-` and `_` respectively.
2016-03-22 09:11:09 -04:00
Ray Schamp
a5e336a175 Use redux for session handling 2016-03-18 11:51:22 -04:00
morant
2e5a0e1439 Merge remote-tracking branch 'upstream/develop' into feature/microworlds
* Removed microwords from server/routes for now.

# Conflicts:
#	server/routes.json
#	src/components/thumbnail/thumbnail.jsx
2016-03-11 21:14:27 -05:00
Matthew Taylor
b484480e1e Merge branch 'wedo-landing' into develop
* wedo-landing:
  Update with links, fix linter issues, center setup
  [WIP] Add WeDo Landing page

# Conflicts:
#	server/routes.json
2016-03-10 09:05:51 -05:00
carljbowman
3220fd1b9d [WIP] Add WeDo Landing page
Adding LEGO WeDO landing page. This also includes the initial pass on Global Typographic Standards.

Needs Work
-Add URLs to all links on the page (still being generated)
-Ater URLs have been added, update translation JSON to include messages that include links
2016-03-09 14:33:17 -05:00
Andrew Sliwinski
f4be08fc4f Remove unused files 2016-03-02 09:50:11 -05:00
Andrew Sliwinski
6204b52479 WIP 2016-01-31 13:02:10 -05:00
morant
77a4bd2d10 adding tips to the microworld 2015-12-21 13:30:22 -05:00
Andrew Sliwinski
aa7efc7e4f Merge branch 'develop' of github.com:llk/scratch-www into feature/about 2015-12-08 10:31:48 -05:00
Hannah Cole
c82aecf1f7 created jobs page 2015-11-29 13:42:26 -05:00
morant
bd1319edff Add interactive design studio, and make studios show arts projects.
Also many design changes.
2015-11-29 09:32:01 -05:00
morant
9f0d36624a Fresh version of arts microworld 2015-11-22 21:40:08 -05:00
Matthew Taylor
45b44204b4 Merge pull request #250 from carljbowman/HOC-Collab-Update
Hoc collab update
2015-11-20 17:41:59 -05:00
carljbowman
ba2902f979 Add Made with Code Logo 2015-11-20 09:56:10 -05:00
Matthew Taylor
133e42de06 Update to beta 1
locales configuration not loaded automatically anymore, so we need to load react-intl with locales included into the browser ahead of time
2015-11-19 15:25:39 -05:00
Andrew Sliwinski
87dd5e7bf3 Migrate static images for about view 2015-11-18 20:09:29 -05:00
carljbowman
4cfd7cc02e Add new backgrounds for Dance and Name 2015-11-10 16:20:48 -08:00
carljbowman
37843fa3a2 Merge branch 'develop' of github.com:LLK/scratch-www into HOC-content-update 2015-11-10 16:12:55 -08:00
carljbowman
96b1dba277 Update HOC tutorials and linking
- Swapped Pong Game with B-Ball Hoops
- Changed Bearstack Story's thumbnail to clear up confusion around similar thumbnails
- Added 'B-Ball Hoops' to localization JSON
- Added anchor link to resource section for easy acess.
2015-11-10 10:58:08 -08:00
Ray Schamp
aa2eeab353 Log Javascript errors to Sentry 2015-11-06 17:08:50 -05:00
Matthew Taylor
ad8d32474f Update HOC page with new mobile, styling & content
Mobile styling is from the frameless framework from #198 (ht @rthorn!). Localization also in as well.

Use `white-space: normal` instead of `inline-block`

Prep for componetizing Sub-Nav

- Fixed top banner extra margin
- Updated HTML containers and SCSS

Add subnavigation component

Added more content

- More projects (still need photos)
- Added section about Studios (need to create links to studios)

WIP: adding frameless to HOC page

Remove Grid elements on Sections

Made the implmentation more granular with breakpoints in mind.

More formatting adjustments

Cards in box now working.

Update responsive behavior and spacing

Updated all elements to respond to new grid system breakpoints.

Update content and organize HOC assets

- Added studios section with studio elements
- Reorganized the image assets for HOC 2015

Fix SCSS linting errors

Update addtional activities photo assets

Generalize `info` class on subnav

Move onto one line

left-align single-column studio links

Add strings for localization

Some rebase conflicts

Code review feedback

ht @thisandagain!

Fix alignment of studios

Keep `inline-block` for mobile
2015-11-03 23:50:51 -05:00
Andrew Sliwinski
c0907f34cd Update default og:image 2015-10-29 18:40:56 -04:00
carljbowman
3034abc2b4 Update arrow icons on Carousels
Had to overwrite slick-slider's iconfont with background image for a quick fix.
2015-10-23 13:05:48 -04:00
Ray Schamp
be6358fba9 Merge pull request #138 from rschamp/feature/welcome-panel
Add welcome panel component to homepage
2015-10-22 22:42:47 -04:00
Ray Schamp
58d3ed4ecb Add welcome component and show it conditionally
Move some of the colors used on the splash page into _colors.scss so they can be reused.
2015-10-22 12:21:47 -04:00
Andrew Sliwinski
d86703e5db Add window.Intl polyfill. Resolves GH-96 2015-10-21 20:49:31 -04:00
Andrew Sliwinski
a7255c49b2 Add GA tracking and optimize open graph tags 2015-10-20 10:51:33 -04:00
Andrew Sliwinski
578e1afab8 Add 'matchMedia' polyfill. Resolves GH-56 2015-10-16 12:05:27 -04:00
Matthew Taylor
54920f5e9f Merge branch 'develop' into feature/upgrade-react-0.14
* develop:
  Avoid class name conflict on login li
  Update Hover JS fuctions with intative naming
  Remove extra white space on HOC Landing
  Add Collaborators and Logos
  Add CN Logo to Hide & Seek asset
  Remove excess/unused CSS
  Update HOC with Banner Hoverstates & Assets
2015-10-14 23:03:01 -04:00
Matthew Taylor
c3b62c8f05 Update core react dependencies 2015-10-14 22:59:38 -04:00
carljbowman
4424fe2f0b Add Collaborators and Logos 2015-10-14 14:45:00 -06:00
carljbowman
75756e4096 Add CN Logo to Hide & Seek asset 2015-10-14 11:51:34 -06:00
carljbowman
2d745dd1ea Update HOC with Banner Hoverstates & Assets
- Added hover states on the tutorial cards that changes the banner background.
- Included new web optimized image assets.
2015-10-14 10:30:52 -06:00
carljbowman
823609f1a7 Update HOC Landing Page
- Added folder of SVGS (includes on for the landing page)
- Swapped out images assets (removed links to Dropbox)
- Added resource styling
2015-10-01 14:30:30 -04:00
carljbowman
1c6720b123 Update User Info and Assets in Navigation 2015-09-23 09:57:20 -04:00
carljbowman
9a67d3fb98 Navigation WIP 2015-09-21 09:18:00 -04:00
Ray Schamp
ab85004e4e Add logged in state and dropdown 2015-09-14 16:14:40 -04:00
Andrew Sliwinski
41176aaee1 Extend build process to support multiple views 2015-09-03 22:26:56 -07:00
Andrew Sliwinski
fa4fce1b1c Initial commit 2015-09-02 12:08:58 -07:00