Commit graph

209 commits

Author SHA1 Message Date
Scott Erickson
8662fb057f Fix /courses when not joining 2015-11-29 18:20:38 -05:00
Scott Erickson
87c7bafd57 Add join-class functionality to /courses 2015-11-29 18:13:31 -05:00
Scott Erickson
405785bafe Add completion stats to /courses 2015-11-29 17:18:24 -05:00
Scott Erickson
07ad8382cc Project sessions loaded in /courses 2015-11-29 16:17:55 -05:00
Scott Erickson
47acfc93d0 Fix course buttons and level links in /courses 2015-11-29 15:26:17 -05:00
Scott Erickson
ea0c274a3c Fix /courses initial implementation 2015-11-29 15:26:17 -05:00
Matt Lott
c385aaa414 Merge branch 'master' into courses-vhoc 2015-11-25 16:11:36 -08:00
Matt Lott
d7a66722b9 Update teacher surveys
Removing trial subscriptions
Updating trial page copy
Adding special HoC trial
Introducing a new course prepaid property endDate, which won’t be
returned or redeemed after the date.
2015-11-24 10:32:19 -08:00
Scott Erickson
2adb3362ed Add ChangeCourseLanguageModal to CoursesView 2015-11-23 11:52:15 -06:00
Scott Erickson
03a38f6129 Remove some logs 2015-11-23 08:53:13 -08:00
Scott Erickson
ea4a98af86 Add rest of CoursesView, untested, unhooked to server
On a plane, so skipping my usual iterative testing.
Bugs are undoubtedly everywhere.
2015-11-23 08:46:08 -08:00
Nick Winter
e0011ee5d0 Classroom invite codes are now real words like BigFrogFarm 2015-11-22 07:47:28 -08:00
Scott Erickson
a98d0b1b2a Partial work on /courses view when signed in 2015-11-22 00:08:46 -08:00
Scott Erickson
5aff591a8b Set up courses view for anonymous users 2015-11-21 11:38:34 -08:00
Scott Erickson
9292396dad Add logout link to HourOfCodeView when signed in 2015-11-20 18:22:52 -08:00
Scott Erickson
27b21d0c4e Add classroom code handling to StudentSignUpModal 2015-11-20 18:02:02 -08:00
Scott Erickson
aee1f6587a Add StudentSignUpModal to HourOfCodeView 2015-11-20 16:28:28 -08:00
Scott Erickson
65dd571041 Fix StudentLoginModal when email or password is not included 2015-11-20 15:17:04 -08:00
Scott Erickson
f7f405b774 Remove colons from template, unused formValues from view 2015-11-20 14:52:13 -08:00
Scott Erickson
f8a5baa4f6 Finish StudentLoginModal implementation 2015-11-20 13:59:43 -08:00
Scott Erickson
9dbd4d296a Merge branch 'master' into courses-vhoc 2015-11-20 13:28:43 -08:00
Scott Erickson
bcb869594d Add start of StudentLoginModal 2015-11-20 07:52:35 -08:00
Nick Winter
7ede7928ca Fix typo in course ladder links 2015-11-20 07:17:16 -08:00
Nick Winter
9ccd03f8d6 Make /teachers -> /courses/teachers?hoc=true more reliable 2015-11-19 15:32:52 -08:00
Scott Erickson
1a4a143340 Initial build of /hoc, no login/create account modals yet 2015-11-19 15:26:45 -08:00
Nick Winter
3926204f47 Don't do course arena league for solo course ladders 2015-11-19 13:20:21 -08:00
Scott Erickson
7a6c42b89f Set up course-ladder level handling
* LadderView displays course info, different style for course-ladder levels
* LadderView hides simulate tab for course-ladder levels
* HeroVictoryModal links to LadderView for course-ladder levels
* CourseDetails page links to LadderView for course-ladder levels
* Enable course instances for league simulation
2015-11-18 14:02:45 -08:00
Scott Erickson
6a54c7cf54 Add classroom name, description, and language editing, and classroom language infrastructure 2015-11-17 16:10:23 -08:00
Nick Winter
f7f7cd683e Allow using hero levels as course levels. Refactor current course tracking to use GET parameters. 2015-11-12 10:25:25 -08:00
Nick Winter
fae1411e3a Fix hourOfCode initialization for unregistered players with inconsistent system time or coming to /hoc after 5 minutes 2015-11-11 09:07:16 -08:00
Scott Erickson
a0212da789 Improve StudentCoursesView
* Add alert explaining when a user joins a course, and links directly to the course
* Add header to My Courses list
* Have My Courses list sorted by classroom creation then course creation
2015-11-10 12:08:44 -08:00
Scott Erickson
c8fc893ef1 Adjust CourseDetailsView for classrooms
* Disable settings modal
 * Show classroom name instead of course instance name if available
2015-11-09 18:08:39 -08:00
Scott Erickson
628ed9a990 Remove add students tab from CourseDetailsView 2015-11-09 18:00:55 -08:00
Scott Erickson
97cb5275c3 Fixes for courses, hoc
* Handling prepaids with strings for maxRedeemers
* Add link to TeacherCoursesView from HourOfCodeView
* Show only course instances with classrooms attached in TeacherCoursesView and StudentCoursesView
* Add event tracking to HourOfCodeView
* Add not-logged-in handling to TeacherCoursesView
* Fixed a GET prepaids bug
* Have course instances created for hour of code have hourOfCode property set to true.
2015-11-09 17:58:40 -08:00
Scott Erickson
c8a47818c2 Initial setup of the hoc page 2015-11-09 16:45:12 -08:00
Scott Erickson
f7a41dc91a When a student joins a classroom, they also join all course instances for that classroom which are free to join 2015-11-09 13:29:49 -08:00
Scott Erickson
1f37f12cc5 Fix auto course-instance creation
The interface now shows a progress bar while course instances are created for a class.
It also creates the course instances as soon as the classroom is created.
2015-11-09 12:12:10 -08:00
Scott Erickson
b0a0530d3c Add courses tab to teacher courses page 2015-11-09 11:48:40 -08:00
Scott Erickson
7daff0861f Add functionality to StudentCoursesView 2015-11-05 17:31:11 -08:00
Scott Erickson
4c4b301925 Add functionality to TeacherCoursesView 2015-11-05 17:26:31 -08:00
Scott Erickson
b36bf7b171 Add PurchaseCoursesView 2015-11-05 15:30:57 -08:00
Scott Erickson
00ce821939 Add InviteToClassroomModal, begin join class in StudentCoursesView 2015-11-04 16:54:13 -08:00
Scott Erickson
66432990f4 Add framework for new courses pages 2015-11-03 16:41:06 -08:00
Scott Erickson
fa4355f946 Add programming language to options in course instances 2015-10-30 15:56:43 -07:00
Scott Erickson
0da66bd468 Refactor CourseEnrollView to use view in template 2015-10-30 11:40:34 -07:00
Scott Erickson
11d3bfc9c4 Make redeem coupon network errors on /courses happen within modal 2015-10-30 11:05:24 -07:00
Matt Lott
8b254164c9 Free course enrollment for admins 2015-10-29 14:09:19 -07:00
Scott Erickson
6e1cb8a1d1 Add owner name to course details page 2015-10-27 17:47:48 -07:00
Scott Erickson
9e04d425cc Levels link in ControlBarView goes to last visited course instance page for course levels 2015-10-27 17:04:07 -07:00
Nick Winter
d776809e1c Update Hour of Code student flow and tracking, remove signup requirement 2015-10-13 08:12:07 -07:00
Matt Lott
708f78153b Route /hoc to courses
When in HoC mode:
Students have an option to play through as a single player, in addition
to entering a code to join an existing class.
Teachers get the normal course enrollment flow, without a sales blurb
on /courses.
2015-10-12 16:25:23 -07:00
Matt Lott
0cb30d9500 Prompt for login in /courses redeem code dialog 2015-10-09 09:32:46 -07:00
Matt Lott
1bd5078ecf 🐛Sort course details nameless members 2015-10-09 09:27:30 -07:00
Nick Winter
5dde55c1f3 Add premium server recognition for Brazil 2015-10-09 08:05:34 -07:00
Matt Lott
3642ebd58c 🐛Fix course details playtime stats 2015-10-08 06:10:12 -07:00
Matt Lott
1c1a5d4295 /courses student mode when _ppc present 2015-10-08 06:10:12 -07:00
Matt Lott
c3af5324d5 🐛Fix course details average playtime calc 2015-10-07 17:14:56 -07:00
Matt Lott
2767bbb639 Skip seat count selection for free courses
Default to 9999 instead.
2015-10-07 17:08:22 -07:00
Matt Lott
440bf9c6e0 /courses?_ppc=blah logged out message
Also trim /courses prepaid code input.
2015-10-07 14:56:10 -07:00
Matt Lott
7390f2d1e4 Separate URLs for /courses/students and /courses/teachers 2015-10-07 14:37:41 -07:00
Matt Lott
75b9cb50d9 Add /courses prepaid code query var
Update invite students link to go to /courses
2015-10-06 12:30:22 -07:00
Matt Lott
9c7345fed0 Redeem course prepaid code on /courses page
Completes #54270566052118
2015-10-06 11:20:57 -07:00
Scott Erickson
3a90356f59 Add class invite system 2015-10-05 16:01:32 -07:00
Scott Erickson
212ee8a65a Add invite link and capacity info to CourseDetailsView 2015-10-05 16:01:32 -07:00
Matt Lott
5095eac4ac Purchase prepaid on course instance creation
Updating purchase prepaid API to support courses.
Refactoring the prepaid server code.

Completes #54270567235517
2015-10-01 15:23:20 -07:00
Imperadeiro98
446b193f8c Added i18n to courses 2015-09-25 20:51:51 +01:00
Matt Lott
feef9c0ac6 🐛Fix instance selection on /courses page 2015-09-24 17:52:00 -07:00
Matt Lott
d7d6694ee9 Update course level routing 2015-09-24 17:12:18 -07:00
Matt Lott
b4d59ced3e Update course details progress level cell popups 2015-09-24 14:48:54 -07:00
Matt Lott
238ea49090 Add stats to course details page 2015-09-24 07:28:43 -07:00
Matt Lott
cbaac98556 Course details page no instances selected UI 2015-09-23 16:27:49 -07:00
Matt Lott
b68e5e209b Update course details page 2015-09-12 22:02:03 -07:00
Matt Lott
a2577cc521 Update courses landing page 2015-09-10 10:39:21 -07:00
Matt Lott
9131d8668f Course enroll page
Will add a prepaid purchase once the prepaid-v2 branch is merged into
master.
2015-09-03 11:04:52 -07:00
Matt Lott
8de00767b3 Initial courses object model 2015-08-29 07:15:39 -07:00
Matt Lott
545567a24b Courses UI: Add teachers mode button to landing page 2015-08-28 11:33:37 -07:00
Matt Lott
066d6e7fc1 Courses UI: Add FAQ popup to landing page 2015-08-27 16:52:02 -07:00
Matt Lott
e8a4fd9336 Courses UI: update purchase/continue flow
Don’t show unlock code entry to teachers
Don’t show existing class selection or purchase course to students
Update copy to make it clearer what’s going on
2015-08-23 14:33:07 -07:00
Matt Lott
69f874a31d Courses UI: Add student option to courses landing page 2015-08-23 13:48:52 -07:00
Matt Lott
f966b8a2fc Courses UI: Add course details condensed progress view
Defaulting to condensed view, with checkbox to expand details.
2015-08-21 17:00:44 -07:00
Matt Lott
ab9e3d39ee 👕Fix courses view linter warning
warn: Linting of app/views/courses/mock1/CoursesView.coffee: warn:
ensure_comprehensions at line 72.

May be a linter bug, have filed an issue here:
https://github.com/clutchski/coffeelint/issues/482
2015-08-07 12:03:09 -07:00
Matt Lott
985cfa2c56 Courses UI - Update free course button copy 2015-08-07 10:12:11 -07:00
Matt Lott
697b0e9e42 Courses UI - Clean up details page summary 2015-08-05 10:58:12 -07:00
Matt Lott
ea90b93bd2 Courses UI - Consolidate class settings into single modal 2015-08-05 09:35:18 -07:00
Matt Lott
c90fcada7d Update course names 2015-08-04 20:03:30 -07:00
Matt Lott
38efeb119c Courses UI - take class size as buy input instead of bucketizing 2015-08-04 15:33:02 -07:00
Matt Lott
60e21600b8 Course details - use given instance 2015-08-04 15:33:02 -07:00
Matt Lott
9547bd1021 Add sales copy to beginning of courses landing page 2015-08-04 15:33:02 -07:00
Matt Lott
b53e4707d8 Update course names
Trying different formats.
2015-08-04 11:26:18 -07:00
Matt Lott
bfd4b4f0ca Courses UI - Update landing page flow
Simplify initial options, add course instance selection.
2015-08-04 11:21:02 -07:00
Matt Lott
8fe189f915 Course details page student level progress popups 2015-07-30 16:04:13 -07:00
Matt Lott
59c730ef20 Add aggregate student progress to course details page 2015-07-30 15:30:36 -07:00
Matt Lott
14b4b83148 Move course purchase details off buy button 2015-07-30 13:54:02 -07:00
Matt Lott
260d062014 🐛Fix courses jquery css typo 2015-07-30 13:54:02 -07:00
Matt Lott
1eb9162463 Add more course info gameplay screenshots 2015-07-29 16:11:06 -07:00
Matt Lott
c5efdb97e1 Course details mock UI edit dialogs 2015-07-29 16:11:06 -07:00
Matt Lott
2baf18ef56 Course mock UI redeem code dialog 2015-07-29 16:11:06 -07:00
Matt Lott
30e8fc2397 Courses: Link to campaigns, add intro course instances
Courses will now use campaign levels instead of mock data if available.
 At the moment only the first intro course has a campaign specified
(‘intro’).
2015-07-29 09:51:01 -07:00
Nick Winter
15ecc92abc Adding 'course' type levels. Removing 'campaign' type levels. 2015-07-24 17:37:42 -07:00
Matt Lott
e70b8b8652 Add sorting to course details mock UI 2015-07-10 17:11:16 -07:00
Matt Lott
49a75d2d42 Update course info mock UI 2015-07-10 17:11:16 -07:00
Matt Lott
0b714e98d1 Update course info mock UI 2015-07-10 11:04:52 -07:00
Matt Lott
57f869379d Add student view to course details mock UI 2015-07-10 10:37:41 -07:00
Matt Lott
0a2248393d Update course details mock UI
Add student concepts progress.
Add level status and concepts covered.
Add mostly working level Play button.
2015-07-09 17:53:35 -07:00
Matt Lott
a62e0a8fe6 👕Fix linter warning in mock course details view
warn: Linting of app/views/courses/mock1/CourseDetailsView.coffee:
warn: ensure_comprehensions at line 50.
2015-07-02 10:54:22 -07:00
Matt Lott
af612afcdd Mock course UI show last expanded complete level 2015-07-01 15:36:33 -07:00
Matt Lott
254d6a9d6b Add course mock UI for student level progress 2015-07-01 15:16:20 -07:00
Matt Lott
71fd13276f Update mock course details page
Add individual course session selection, call them classes.
Edit buttons for class name and description.
Rearrange layout.
Update course concept lists to use real values.
Also add class name field to course enrollment page.
2015-06-30 16:53:37 -07:00
Matt Lott
e36cf0ca3f Initial courses mock UI
Do not localize these files.
This is under construction.
2015-06-29 12:15:10 -07:00