Commit graph

409 commits

Author SHA1 Message Date
Nick Winter
5a4be88887 Named CS2 instructive activity 2016-09-15 13:20:22 -07:00
Nick Winter
77c16000e9 Add events module to CS2 curriculum plan. 2016-09-15 13:16:09 -07:00
Nick Winter
5c4e9ca417 Finished CS3 curriculum guide 2016-09-13 16:12:23 -07:00
Nick Winter
9702c91127 Add first few modules for CS3 curriculum 2016-09-12 18:26:41 -07:00
Nick Winter
d7f4ef6809 Updates to CS 2 curriculum; stub for CS 3 curriculum modules 2016-09-12 16:26:59 -07:00
Phoenix Eliot
bdabee865c Filter domains for webdev iFrame
This serves the web-dev surface iFrame from another domain, such that user-created levels can't sniff cookies from a visitor to their page. It forces a redirect if a path is accesses through the wrong domain.

Use ENV variables for hostnames

Allow messages from all relevant domains

Use the right iFrame URL for different domains

Let the load balancer check /healthcheck

Add special handling for china server

Generalize subdomain handling
2016-09-06 16:17:38 -07:00
Robin Yang
60f5e88280 Recrop team photos 2016-09-02 11:31:53 -07:00
Robin Yang
d7b4cadd29 Standardize avatar sizes 2016-09-02 11:06:43 -07:00
Robin Yang
2df6ef9f0f Add Hover behavior to Team Photos
Also reorganized image folders
2016-09-02 10:51:07 -07:00
themaka
8f20ccaed6 Add headshot thumbnails of full-time team 2016-09-01 16:39:08 -07:00
Robin Yang
6f1019878e Add Pair Programming Activity 2016-09-01 15:45:04 -07:00
Robin Yang
099781c513 Merge pull request #3900 from codecombat/course-curriculum
Update CS2 Guide
2016-09-01 15:08:23 -07:00
Robin Yang
9c31b21293 Update CS2 Guide
Changes to course progression/levels reflected in updated guide,
properties and input handling moved to CS3.
2016-09-01 14:52:59 -07:00
Phoenix Eliot
663c220eaf Show wev-dev iFrame error messages like Aether's
This heavily refactors SpellView and adds infrastructure for receiving and reporting Errors raised by the web-dev iFrame. The web-dev error system, the Aether error system, and the Ace html-worker avoid disturbing each others' errors/annotations (though currently Aether+web-dev errors won't coexist), and they clear/update their own asynchronously.

Show web-dev iFrame errors as Ace annotations

Add functional error banners (with poor messages)

Improve error banners, don't allow duplicate Problems

Refactor setAnnotations override

Convert all constructor calls for Problems

Add comments, clean up

Clean up

Don't clear things unnecessarily

Clean up error message sending from iFrame

Add web-dev:error schema

Clarify error message attributes

Refactor displaying AetherProblems

Refactor displaying user problem banners

Refactor onWebDevError

Set ace styles on updating @problems

Clean up, fix off-by-1 error

Add comment

Show stale web-dev errors differently
Some web-dev errors are generated by "stale" code — code that's still running in the iFrame but doesn't have the player's recent changes.
This shows those errors differently than if they weren't "stale", and suggests they re-run their code.

Hook up web-dev event schema

Destroy ignored duplicate problems

Functionalize a bit of stuff

Fix ProblemAlertView never loading
2016-08-31 10:59:06 -07:00
Robin Yang
79415fc99d Merge pull request #3889 from codecombat/course-curriculum
Add Getting Started guide in Markdown
2016-08-29 17:09:32 -07:00
Robin Yang
3cdec61fe1 Add Getting Started guide in Markdown
- Replace PDF link on /teachers/resources
- Add .pngs
2016-08-29 17:06:05 -07:00
Robin Yang
bd87783631 Merge pull request #3877 from codecombat/about-page-language-logos
Change programming language listing on About page
2016-08-29 09:30:03 -07:00
Robin Yang
c7c3eff0bd Merge pull request #3884 from codecombat/course-curriculum
Update formatting on CS2 Guide
2016-08-29 09:29:57 -07:00
Imperadeiro98
dd6f862f70 Remove minicolors image 2016-08-28 23:14:25 +01:00
Robin Yang
d6d8d84722 Update formatting on CS2 Guide 2016-08-26 16:53:28 -07:00
Nick Winter
878dcbdc49 Better handling of non-user-code problems in game-dev mode. Don't simulate whole level first time a game-dev level is loaded. 2016-08-24 15:21:09 -07:00
Robin Yang
8435789691 Change programming language listing on About page 2016-08-24 14:02:03 -07:00
Rob Blanckaert
d9b688c5b8 Merge pull request #3874 from codecombat/course-curriculum
Create Markdown for CS1, CS2 Curriculum
2016-08-23 18:16:19 -07:00
Robin Yang
b550aae76a Remove target grades from Curriculum 2016-08-23 16:07:10 -07:00
Robin Yang
5d31496ceb Update CS1, CS2 curriculum content 2016-08-23 14:45:32 -07:00
Phoenix Eliot
209b7d724e Fix webdev for china server 2016-08-23 11:08:57 -07:00
Scott Erickson
ef0547f72a Simplify applying licenses
In TeacherClassView, when a teacher assigns a paid course to any unenrolled
student, the view automatically enrolls those students, rather than requiring
the teacher to enroll those students manually first. Update copy throughout.

Also add back (smaller) padding to progress dots in TeacherClassView.
2016-08-23 10:43:31 -07:00
Robin Yang
fe3b9e01e0 Create Markdown for both CS1, CS2 Curriculum 2016-08-22 17:33:49 -07:00
Matt Lott
05159ff7c2 Support course slugs that match course names
Must be backwards compatible until we update the course slugs.

Closes #3867
2016-08-19 16:05:37 -07:00
Phoenix Eliot
dc7c220b57 Add goal checking on user clicks 2016-08-18 16:40:48 -07:00
Matt Lott
720e7ea897 Update beta campaign world selector images 2016-08-17 21:14:11 -07:00
Matt Lott
f84897eaa7 Update home course tiles 2016-08-15 14:41:09 -07:00
Matt Lott
c87f505759 Add gd1 and wd1 to campaign world Ux
Add 1st game-dev and web-dev campaigns to world selector
Take player back out to world selector after completing campaigns up through forest

Closes #3828
2016-08-10 15:06:14 -07:00
themaka
f111c16482 Add Sean to /about (#3826)
* Add Sean to /about

* Remove empty line
2016-08-08 17:46:22 -07:00
Nick Winter
35966b24c1 ES5ify web-dev-listener.js 2016-08-03 13:02:55 -07:00
Matt Lott
079ad6c0fa Replace /about Matt and Nick pics with real photos 2016-08-03 10:17:57 -07:00
Matt Lott
1c777ee7f5 Update site desert image 2016-07-28 16:10:28 -07:00
Nick Winter
d77625bc77 Game dev levels (#3810)
* Tweak API doc behavior and styling

* Instead of moving to the left during active dialogues, just move to the top
* Allow pointer events
* Adjust close button
* Re-enable pinning API docs for game-dev and web-dev levels

* Make sidebar in PlayGameDevLevelView stretch, better layout columns

* Set up content of PlayGameDevLevelView sidebar to scroll

* Add rest of PlayGameDevLevelView sidebar content, rework what loading looks like

* Finish PlayGameDevLevelView

* Add share area below
* Cover the brown background, paint it gray

* Tweak PlayGameDevLevelView

* Have progress bar show everything
* Fix Surface resize handling

* Fix PlayGameDevLevelView resizing incorrectly when playing

* Add GameDevVictoryModal to PlayGameDevLevelView

* Don't show missing-doctype annotation in Ace

* Hook up GameDevVictoryModal copy button

* Fix onChangeAnnotation runtime error

* Fix onLevelLoaded runtime error

* Have CourseVictoryModal link to /courses when course is done

* Trim, update CourseDetailsView

* Remove last vestiges of teacherMode
* Remove giant navigation buttons at top
* Quick switch to flat style

* Add analytics for game-dev

* Update Analytics events for gamedev

* Prefix event names with context
* Send to Mixpanel
* Include more properties

* Mostly set up indefinite play and autocast for game-dev levels

* Set up cast buttons and shortcut for game-dev

* Add rudimentary instructions when students play game-dev levels

* Couple tweaks

* fix a bit of code that expects frames to always stick around
* have PlayGameDevLevelView render a couple frames on load

* API Docs use 'game' instead of 'hero'

* Move tags to head without combining

* Add HTML comment-start string

Fixes missing entry point arrows

* Fix some whitespace
2016-07-28 13:39:58 -07:00
Rob
b0f653db19 Remove white pixels from logo via. Robin. 2016-07-27 16:45:14 -07:00
Nick Winter
9ae5109e40 Show projects in TeacherClassView, proper font in first web-dev project level for now for demo 2016-07-24 14:42:07 -07:00
phoenixeliot
2ebf94c3db Combine extracted script/style tags 2016-07-20 17:20:21 -07:00
phoenixeliot
f28c17c9bf Fix spacing to be consistent 2016-07-20 15:47:20 -07:00
phoenixeliot
62813e41a3 Extract styles and scripts 2016-07-20 15:44:01 -07:00
Rob Blanckaert
5bb7f243f5 Update web-dev-listener.js 2016-07-19 13:44:25 -07:00
Nick Winter
6e65171a83 i18n, comments, misc cleanup 2016-07-17 00:53:17 -07:00
Nick Winter
5d0b9c875a Fix some typos that made it not work in Firefox (not sure how it worked in Chrome) 2016-07-16 13:32:54 -07:00
Nick Winter
7e4733f07e Hack: check HTML goals now and in a second to account for built-in CSS transition 2016-07-15 20:25:37 -07:00
Nick Winter
224ad54bdd View web dev levels. Add proper victory modal game/webpage share links. Fix playing game dev levels. Add generic change transition to all web-dev pages. 2016-07-15 20:03:12 -07:00
Nick Winter
9be8151959 Don't create God for web-dev levels 2016-07-15 13:24:54 -07:00
Nick Winter
5a688e42c7 Slightly more flexible iframe origin checking 2016-07-15 11:19:22 -07:00