Commit Graph

2003 Commits

Author SHA1 Message Date
Ramon Wenger ec1d68dd51 Add sentence offset to spell check results
Without that property, the offset always just starts at the current
sentence, not the whole user input
2020-02-03 15:04:52 +01:00
Christian Cueni 113b1d8d9a Reset cache on logout, refactor logout 2020-01-22 08:43:01 +01:00
Ramon Wenger c9222adf60 Update cypress tests to mock the server 2020-01-20 17:14:20 +01:00
Ramon Wenger 2b9d14222d Fix order of corrections 2020-01-20 13:03:01 +01:00
Ramon Wenger bc9bf8cdec Remove modules from manual cache definition 2020-01-20 13:03:01 +01:00
Ramon Wenger 374186ed27 Re-add styling for highlights 2020-01-20 13:02:27 +01:00
Ramon Wenger cdb2570203 Add schema file, also add instructions to readme 2020-01-20 13:02:27 +01:00
Ramon Wenger cfde20c67c Add spell check component 2020-01-20 13:01:47 +01:00
Ramon Wenger ff7a6b93b3 Add first implementation of a test with mocked GraphQL calls 2020-01-20 13:01:47 +01:00
Ramon Wenger 9ee3dc48b5 Add login via GraphQL to cypress commands 2020-01-20 13:01:00 +01:00
Ramon Wenger 7f71977523 Add initial frontend implementation for spell checks 2020-01-20 13:01:00 +01:00
Ramon Wenger a195492ece Temporarily disable problematic test 2020-01-20 11:06:51 +01:00
Ramon Wenger 6c8628f56f Prevent apollo client from throwing errors on 302 response 2020-01-20 10:38:29 +01:00
Ramon Wenger 013b020f68 Upgrade cypress version 2020-01-16 17:48:25 +01:00
Ramon Wenger 68c5375bab Add test to check solution display in surveys 2020-01-16 16:36:27 +01:00
Ramon Wenger 6b8b520bc5 Add test to check solution display in surveys 2020-01-16 16:07:00 +01:00
Ramon Wenger 00b2b02113 Use slug to identify module when toggling solutions 2020-01-16 15:49:50 +01:00
Ramon Wenger ea95efc23f Make test fail when it should fail 2020-01-16 15:49:14 +01:00
Ramon Wenger 8c908fddd2 Use slug to identify modules for the bookmark mutation 2020-01-16 15:03:50 +01:00
Ramon Wenger e92412cf21 Clean up code 2020-01-16 14:10:16 +01:00
Ramon Wenger d4d2e9934e Add note to instruments 2020-01-16 10:45:36 +01:00
Ramon Wenger 5200d2165d Use slug to identify instruments on client 2020-01-16 10:44:37 +01:00
Ramon Wenger 35cdd5ff5f Remove superfluous query file 2020-01-13 19:48:46 +01:00
Ramon Wenger 2b40f81764 Add bookmark actions to instrument, implement instrument bookmark 2020-01-08 15:00:40 +01:00
Ramon Wenger 8765de9603 Add instrument query by id 2020-01-08 14:58:07 +01:00
Ramon Wenger 01ab01a9e9 Add instruments to local cache 2020-01-08 14:56:07 +01:00
Ramon Wenger 27b068e9ef Add news item 2019-12-24 22:23:58 +01:00
Ramon Wenger a75ae4f3fc Add top border to my activities 2019-12-19 14:19:42 +01:00
Ramon Wenger 32ae0b0641 Add filter for my activity 2019-12-19 14:19:20 +01:00
Ramon Wenger 74c74c1eca Add missing block type in my activities 2019-12-19 11:38:15 +01:00
Ramon Wenger 7237b86ac0 Refactor code 2019-12-19 11:38:07 +01:00
Ramon Wenger a76b27bf0b Fix margin on link block in my activities 2019-12-19 11:37:31 +01:00
Ramon Wenger de5882f644 Add anchor for notes 2019-12-19 11:36:29 +01:00
Ramon Wenger 64db0487ca Refresh my activities periodically 2019-12-19 11:35:47 +01:00
Ramon Wenger ddf3bde076 Add clickable link to my activities 2019-12-19 11:34:20 +01:00
Ramon Wenger 9fb8e13c1c Enable scrolling to the content blocks in a module 2019-12-18 16:28:24 +01:00
Ramon Wenger 65a09fb9c7 Use the GQL cache for local state 2019-12-18 16:23:33 +01:00
Ramon Wenger 54a6a2a702 Update package versions 2019-12-18 16:16:32 +01:00
Ramon Wenger a713048b86 Add styling for module activity entries 2019-12-18 13:18:42 +01:00
Ramon Wenger b132e320af Fix scrolling to assignments 2019-12-18 13:18:17 +01:00
Ramon Wenger cb13aa1ea5 Update my activity in client 2019-12-18 13:17:08 +01:00
Ramon Wenger eba199dc60 Add more emojis! 2019-12-11 11:04:23 +01:00
Ramon Wenger 388c1f63d7 Merged in feature/bookmarks-for-modules-and-chapters (pull request #42)
Feature/bookmarks for modules and chapters
2019-12-10 14:09:13 +00:00
Ramon Wenger dab5d907f3 Update mobile navigation styling 2019-12-10 14:11:14 +01:00
Ramon Wenger 84bcfdc7cf Add comments 2019-12-09 15:44:50 +01:00
Ramon Wenger d400b2f61c Add todo 2019-12-09 15:29:07 +01:00
Ramon Wenger c2ead4c78d Add cypress test 2019-12-09 15:18:47 +01:00
Ramon Wenger 3dc778d41b Fix cypress tests 2019-12-09 11:14:34 +01:00
Christian Cueni 92d03dbe50 Merged in feature/feedback (pull request #41)
Feature/feedback
2019-12-09 10:04:27 +00:00
Ramon Wenger 89e3925590 Change submissionfeedback to submission_feedback or submissionFeedback,
respectively
2019-12-09 10:30:49 +01:00
Ramon Wenger 3f66ce5a0f Add notes to chapters and modules 2019-12-05 14:39:50 +01:00
Ramon Wenger f6f61aaf05 Add bookmark action for modules 2019-12-03 15:06:47 +01:00
Ramon Wenger a06f32bcb0 Add bookmark action to chapter 2019-12-03 14:03:30 +01:00
Christian Cueni 84a69b24f1 Incoorperate feedback 2019-12-02 17:12:19 +01:00
Ramon Wenger 7c534cbe5c Add first raw implementation for adtl. bookmark types 2019-12-02 13:56:52 +01:00
Ramon Wenger f7213b44e7 Always close the mobile navigation on router link click 2019-11-28 15:34:42 +01:00
Ramon Wenger 88bbd505f0 Add instruments to mobile subnavigation 2019-11-26 16:57:22 +01:00
Ramon Wenger 9e3a7d1607 Add topics to mobile navigation 2019-11-26 16:43:23 +01:00
Ramon Wenger 2913796a1b Add Thinglink block to frontend views 2019-11-26 09:31:39 +01:00
Christian Cueni 7641e5dcaa Add logout button 2019-11-21 12:35:42 +01:00
Ramon Wenger 42f888d0d6 Change bookmark icon color 2019-11-20 15:47:41 +01:00
Christian Cueni 735eae25e3 Handle submissions with no feedback 2019-11-19 15:32:13 +01:00
Christian Cueni 3e606073e2 Refactor emojis 2019-11-19 12:59:18 +01:00
Christian Cueni 066f5259ce Refactor submission form 2019-11-19 10:25:24 +01:00
Christian Cueni a732074a9b Add feedback in student view 2019-11-18 17:42:53 +01:00
Christian Cueni d0b8ca7ac7 Style final an non-final feedbacks 2019-11-18 16:35:06 +01:00
Christian Cueni 714cb713b1 Style submission page 2019-11-18 15:31:42 +01:00
Christian Cueni 6bdce35f7f Style submissions page 2019-11-18 15:15:25 +01:00
Christian Cueni 662071d066 Handle form updates 2019-11-18 13:46:27 +01:00
Christian Cueni a2af5759bb Add emojis 2019-11-18 11:12:09 +01:00
Christian Cueni 6b739034de Refactor feedback form and final submission 2019-11-14 14:36:20 +01:00
Christian Cueni d3a81e17d8 Add Feedback container component 2019-11-14 11:11:58 +01:00
Christian Cueni ad07ada2f2 Add feedback to submission view, style view 2019-11-13 19:25:24 +01:00
Christian Cueni 4965eb5fa1 Add login link to registration 2019-11-12 10:49:09 +01:00
Christian Cueni d163f1b88a Comment test 2019-11-11 18:19:35 +01:00
Christian Cueni e2f5c0b3f0 Fix copy, fix styles on server 2019-11-11 18:19:35 +01:00
Christian Cueni c84a87fc7f Keep cypress fail videos 2019-11-11 18:19:35 +01:00
Christian Cueni 193c1d39b5 Style no class page, change admin display 2019-11-11 18:19:35 +01:00
Christian Cueni 06dbf20094 Add no-class page & guard 2019-11-11 18:19:34 +01:00
Christian Cueni b20917d29a Validate license on login 2019-11-11 18:19:34 +01:00
Christian Cueni bceb01c5f4 Add and update tests, add dummy data 2019-11-11 18:19:34 +01:00
Christian Cueni 148b2cae3d Init password reset after registration 2019-11-11 18:19:34 +01:00
Christian Cueni 836cd63cfd Style inputs, make registration page public 2019-11-11 18:19:34 +01:00
Christian Cueni f3ae0fec7e Display server errors 2019-11-11 18:19:34 +01:00
Christian Cueni 436a9b891f Add registration component 2019-11-11 18:19:34 +01:00
Christian Cueni 95d1c4708a Merge branch 'develop' into feature/highlight-proof-of-concept
# Conflicts:
#	client/src/components/ContentBlock.vue
2019-11-06 08:17:40 +01:00
Christian Cueni a623a13c1d Hide bookmark actions for mobile 2019-11-05 11:04:29 +01:00
Christian Cueni 2d39ee8775 Hide bookmark actions in edit mode 2019-11-04 16:29:30 +01:00
Ramon Wenger 9b1c54cad2 Add optimistic update for the new note wizard 2019-10-28 15:21:06 +01:00
Ramon Wenger c346cfef3f Fix positioning of bookmark icons 2019-10-28 10:58:33 +01:00
Ramon Wenger 081f567334 Update content block optimistically 2019-10-24 16:22:41 +02:00
Ramon Wenger 91c278cae7 Remove module edit toggle from submissions page 2019-10-24 15:01:31 +02:00
Christian Cueni 38777cf914 Merged in feature/move-login (pull request #37)
Feature/move login

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
2019-10-23 06:58:46 +00:00
Christian Cueni 81d89dae9a Change css names, refactor login guard 2019-10-23 08:33:37 +02:00
Ramon Wenger 1c2e0fc88b Add Thinglink block 2019-10-22 17:06:46 +02:00
Ramon Wenger 9b2db99d0b Make bookmarks work with content list blocks 2019-10-22 14:29:58 +02:00
Ramon Wenger d061116585 Add fixmes 2019-10-15 16:21:44 +02:00
Ramon Wenger 4fc896c224 Check for valid bookmark property 2019-10-15 13:47:02 +02:00
Ramon Wenger 1d5603ed5f Add note update mutation 2019-10-12 08:54:20 +02:00
Ramon Wenger 62460d58ab Add node for notes 2019-10-12 08:52:23 +02:00
Ramon Wenger 67cfc4b572 Add modal for adding notes 2019-10-10 09:50:27 +02:00
Ramon Wenger 95bc633cfb Fix unit test 2019-10-08 19:22:12 +02:00
Ramon Wenger 2656829d86 Add new bookmark component and some icons 2019-10-08 18:37:16 +02:00
Christian Cueni 2eae460b31 Fix integration test 2019-10-08 14:35:48 +02:00
Christian Cueni 0694471270 Fix test, cleanup 🛁 2019-10-08 13:41:09 +02:00
Christian Cueni c396c34be2 Hide registration, redirect to correct page after reset, style reset 2019-10-08 10:14:57 +02:00
Christian Cueni 31de68e3d0 Use app logout 2019-10-08 09:30:00 +02:00
Christian Cueni e93dde272d Update tests 2019-10-08 09:30:00 +02:00
Christian Cueni 80b1d38b93 Style public pages, add links to login page 2019-10-08 09:30:00 +02:00
Christian Cueni a1954e00c5 Update integration tests 2019-10-08 09:30:00 +02:00
Christian Cueni 57224d228a Style default layout, style login 2019-10-08 09:30:00 +02:00
Christian Cueni 9783bd802a Redirect user to visited page after login 2019-10-08 09:30:00 +02:00
Christian Cueni 062269f030 Add loggedIn guard, add basic login component 2019-10-08 09:30:00 +02:00
Ramon Wenger 5fd81a2bd6 Rename Highlight to Bookmark 2019-10-07 17:10:39 +02:00
Ramon Wenger 9837248881 Fix unit test 2019-10-02 14:57:52 +02:00
Ramon Wenger 4247164067 Add highlight mutation 2019-10-02 11:39:40 +02:00
Ramon Wenger 584b48a6a6 Add notes app and a PoC for highlights 2019-10-02 11:38:53 +02:00
Ramon Wenger 90598342b8 Move content block content handling to own component 2019-10-02 11:36:59 +02:00
Ramon Wenger 2c665399b6 Add survey save button text 2019-09-17 17:51:02 +02:00
Ramon Wenger 64bf100a19 Save user answers in surveys on page change 2019-09-17 10:12:28 +02:00
Ramon Wenger e940066db8 Display solutions for teachers always 2019-09-16 14:02:28 +02:00
Christian Cueni e551bdbdbd Merged in feature/fix-css-numbering (pull request #36)
Remove css numbering, use JS instead

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
2019-09-12 14:34:09 +00:00
Christian Cueni 3a19f1a0b5 Remove css numbering, use JS instead 2019-09-12 10:35:49 +02:00
Ramon Wenger 23936ec6ae Fix bug where surveys don't retain answers without reloading 2019-09-12 09:08:16 +02:00
Christian Cueni 5c2ed30ccf Merged in feature/fix-numbering (pull request #35)
Fix content list numbering

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
2019-09-11 14:01:35 +00:00
Christian Cueni 03f418df38 Fix content list numbering 2019-09-11 14:45:31 +02:00
Ramon Wenger 4ae9c5813f Merged in feature/survey-with-correct-answer (pull request #34)
Feature/survey with correct answer

Approved-by: Christian Cueni <christian.cueni@iterativ.ch>
2019-09-11 11:02:37 +00:00
Ramon Wenger b2e133542c Fix cypress test 2019-09-09 16:00:35 +02:00
Ramon Wenger 0a4269aaad Change news link to use SSL 2019-09-09 14:09:27 +02:00
Ramon Wenger e10b577ac1 Add solution visibility check to survey 2019-09-09 14:04:47 +02:00
Ramon Wenger 371c5cd276 Refactor code to be clearer 2019-09-09 11:07:45 +02:00
Ramon Wenger fd54e22430 Remove news subnavigation item 2019-09-06 15:55:38 +02:00
Ramon Wenger 8993f3f72b Add new news entry, re-enable news footer 2019-09-06 15:53:09 +02:00
Ramon Wenger 232e5246b4 Move objective border to the right spot 2019-09-06 15:46:39 +02:00
Ramon Wenger bddeeba74e Remove menu from user widget where not necessary 2019-09-06 15:42:13 +02:00
Ramon Wenger aeab246aee Add solutions to survey 2019-09-05 15:22:01 +02:00
Christian Cueni 2c5b49a4f2 Remove comment 2019-09-05 08:52:27 +02:00
Christian Cueni 117782a337 Add continuos numbering for content lists 2019-09-05 08:31:38 +02:00
Ramon Wenger 65663491b0 Add rudimentary answer display to survey page 2019-09-04 15:18:37 +02:00
Ramon Wenger fb671cbc2d Update cypress version 2019-09-04 15:17:56 +02:00
Ramon Wenger 0bcdcf9941 Merged in feature/objectives-by-class (pull request #32)
Feature/objectives by class
2019-08-26 13:12:34 +00:00
Christian Cueni a9de457e35 Add computed property for permission check 2019-08-26 14:49:05 +02:00
Christian Cueni 919c9876d6 Add package to dependencies 2019-08-26 14:28:59 +02:00
Christian Cueni d7b977ba06 Merged in feature/jest-tests (pull request #31)
Feature/jest tests

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
2019-08-26 11:32:15 +00:00
Christian Cueni a4d19cbfe6 Fix typo 2019-08-26 13:19:32 +02:00
Ramon Wenger 046599af81 Hide hidden objectives when not in edit mode 2019-08-26 11:25:46 +02:00
Ramon Wenger 6020da8598 Add action menu and delete method to objectives 2019-08-26 11:15:25 +02:00
Ramon Wenger 6d5fa1806d Enable teachers to add new objectives instead of objective groups 2019-08-22 19:01:26 +02:00
Ramon Wenger 76b3f70a87 Hide single objectives instead of whole groups 2019-08-21 16:26:51 +02:00
Christian Cueni 29a0ec5aef Hide news 2019-08-14 13:31:21 +02:00
Christian Cueni c2985d663a Make layout styles scoped 2019-08-14 11:52:44 +02:00
Christian Cueni 2fa006d790 Rename block, update frontend 2019-08-14 11:52:44 +02:00
Christian Cueni 8c42daca7f Update copy, fix widget height 2019-08-13 11:25:38 +02:00
Christian Cueni 3918d170f9 Add jest to all tests 2019-08-13 11:10:01 +02:00
Christian Cueni 8f1ee79347 Add jest tests 2019-08-13 10:57:11 +02:00
Christian Cueni 4ecb7a8c2b Use assignments from chapters for list generation 2019-08-13 09:15:37 +02:00
Ramon Wenger cb76318601 Re-add solution toggle to module navigation bar 2019-07-31 17:11:15 +02:00
Ramon Wenger 5bdf5d53ee Update survey styling 2019-07-31 16:00:16 +02:00
Ramon Wenger 4d300e92eb Add custom style for dropdowns 2019-07-31 15:33:00 +02:00
Ramon Wenger 99c39b1b69 Update and normalize meta title style 2019-07-31 15:31:27 +02:00
Ramon Wenger 9e118720b0 Add missing margins 2019-07-31 14:04:13 +02:00
Ramon Wenger 4eea9c3a2c Normalize line height for headings 2019-07-31 14:03:39 +02:00
Ramon Wenger c577cc6c1a Update survey styling for 'completed' page 2019-07-31 10:59:30 +02:00
Ramon Wenger 46474db70d Fix content block delete bug 2019-07-31 10:36:38 +02:00
Ramon Wenger 5e2ddf69b8 Fix filter on assignments with submissions page
Student submissions were not displayed because of a wrong filter. They
are now displayed again.
2019-07-29 15:26:57 +02:00
Ramon Wenger 0b0942ba4b Display the assignment text, not the title for assignment submission
page
2019-07-29 11:28:21 +02:00
Ramon Wenger 5ae47029a3 Hide content blocks for teachers when not in edit mode 2019-07-29 11:09:51 +02:00
Ramon Wenger 4483175dbe Hide module subnavigation for students 2019-07-29 10:53:31 +02:00
Ramon Wenger fae0043138 Only display edit actions for content block when edit mode is on 2019-07-29 10:34:12 +02:00
Ramon Wenger 981302192c Fix content block bug 2019-07-29 09:40:12 +02:00
Ramon Wenger 04cfa18853 Add user widget to custom content blocks 2019-07-25 17:05:59 +02:00
Ramon Wenger d93ffe1534 Add actions for custom content blocks 2019-07-25 16:57:59 +02:00
Christian Cueni deabbf328f Use UserMetaWidget 2019-07-25 11:43:51 +02:00
Christian Cueni 780602dfd2 Add option for mobile 2019-07-25 11:43:51 +02:00
Christian Cueni 638bea0cd0 Use cache to propagate changes, add tests, style popover 2019-07-25 11:43:51 +02:00
Christian Cueni 91967ceb21 Add mutations and query, fix popover 2019-07-25 11:43:51 +02:00
Christian Cueni 90b919c839 Add class selection widget 2019-07-25 11:43:51 +02:00
Christian Cueni ea9822562a Use popover in user widget 2019-07-25 11:43:51 +02:00
Ramon Wenger b19419af69 Normalize heading font size in survey panels 2019-07-25 11:12:24 +02:00
Ramon Wenger ee89522b99 Update panel styling in surveys 2019-07-25 10:54:18 +02:00
Ramon Wenger 18b6079d26 Merged in feature/content-actions (pull request #29)
Feature/content actions

Approved-by: Christian Cueni <christian.cueni@iterativ.ch>
2019-07-25 08:15:02 +00:00
Ramon Wenger 0c2cc090e2 Add comment to unreadable code block 2019-07-25 09:52:26 +02:00
Ramon Wenger b2ae3dce23 Add style to subnavigation 2019-07-24 15:32:11 +02:00
Ramon Wenger fa72d8f5b8 Add button to reopen survey 2019-07-24 15:22:53 +02:00
Ramon Wenger c81bcbd26b Add survey block to content block in back- and frontend 2019-07-24 14:23:27 +02:00
Ramon Wenger a34313932f Add lead paragraph styling to chapter description 2019-07-24 11:38:47 +02:00
Ramon Wenger 185cd4a81e Remove visibility popover, add eye icon button 2019-07-24 11:28:46 +02:00
Ramon Wenger c479d0f2bf Only show module edit checkbox for teacher 2019-07-24 11:19:39 +02:00
Ramon Wenger 824e5b9357 Remove obsolete content block action icons 2019-07-24 10:29:02 +02:00
Ramon Wenger a4cf7a0d62 Add toggle for module editing 2019-07-23 16:04:23 +02:00
Ramon Wenger 8bd6d51028 Add new SVGs for icons 2019-07-23 15:59:53 +02:00
Ramon Wenger e422d29759 Fix position of top filter 2019-07-23 14:26:05 +02:00
Ramon Wenger 648a3e9229 Fix survey cypress test 2019-07-23 12:05:16 +02:00
Christian Cueni 162b988998 Skip solution test 2019-07-23 11:32:46 +02:00
Ramon Wenger 062d799c4c Set locale on survey 2019-07-23 11:14:02 +02:00
Ramon Wenger 48ee15850f Merged in feature/old-surveyjs-styling (pull request #27)
Feature/old surveyjs styling

Approved-by: Christian Cueni <christian.cueni@iterativ.ch>
2019-07-23 08:33:37 +00:00
Ramon Wenger c537fd37aa Add more styling 2019-07-22 16:27:59 +02:00
Ramon Wenger d8f4077d63 Fix typo 2019-07-22 14:42:07 +02:00
Ramon Wenger eda5653477 Always display survey title from JSON, never from model 2019-07-22 11:36:08 +02:00
Ramon Wenger 3a64365f7d Replace values with a variable 2019-07-18 16:33:21 +02:00
Christian Cueni 81315e9848 Hide filters 2019-07-18 15:36:16 +02:00
Ramon Wenger b84059adf5 Add checkbox styling 2019-07-18 15:13:58 +02:00
Ramon Wenger d5a63a0c7e Add styling for survey progress bar 2019-07-18 15:01:55 +02:00
Ramon Wenger a9b10fdf88 Add radiobutton styling to survey 2019-07-18 14:55:46 +02:00
Ramon Wenger dd1bf56f49 Fix subnavigation styling 2019-07-18 10:20:52 +02:00
Christian Cueni a1234f6688 Merged in feature/nested-block (pull request #26)
Feature/nested block

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
2019-07-17 15:14:57 +00:00
Christian Cueni cc55dbdf69 Fix subtitle and genially blocks in instruments 2019-07-17 15:11:43 +02:00
Christian Cueni 7419ab72c4 Push that pixel 👨‍🎨 2019-07-17 11:49:32 +02:00
Christian Cueni 599344e4be Augment fields in content list item 2019-07-17 11:33:20 +02:00
Ramon Wenger 12b580a94a Hide subnavigation on navigation 2019-07-17 11:26:33 +02:00
Ramon Wenger dae832b98d Add navigation to and from instrument overview 2019-07-17 11:20:01 +02:00
Ramon Wenger bd17543ec2 Add teaser helper function 2019-07-17 09:54:34 +02:00
Ramon Wenger cd6ff31cef Add instrument query to instrument overview 2019-07-17 09:54:34 +02:00
Ramon Wenger 2a4cf56825 Refactor some more occurences of basic knowledge to instrument 2019-07-17 09:54:34 +02:00
Ramon Wenger 98a8acac4f Refactor subnavigation and implement module subnavigation 2019-07-16 16:15:20 +02:00
Ramon Wenger d788466942 Rename some components 2019-07-16 16:12:04 +02:00
Christian Cueni 251c05abad Treat single content items as blocks 2019-07-16 11:45:00 +02:00
Christian Cueni 2905486c2f Remove content list in wagtail, add content list in frontend 2019-07-16 09:36:43 +02:00
Ramon Wenger 3820256872 Fix css bug 2019-07-15 18:18:42 +02:00
Christian Cueni 8f0e0f9fe7 Hide nested content's title 2019-07-15 14:13:10 +02:00
Christian Cueni defce01a3f Remove log messages 2019-07-15 13:05:42 +02:00
Christian Cueni a41947e951 Add content list block component 2019-07-15 13:00:32 +02:00
Ramon Wenger 33a4f9e2c1 Merged in feature/new-assignment-design (pull request #21)
Feature/new assignment design

Approved-by: Christian Cueni <christian.cueni@iterativ.ch>
2019-07-15 08:35:44 +00:00
Ramon Wenger b7e4d3eb53 Clean up code 2019-07-11 18:50:31 +02:00
Ramon Wenger c5fea80ab4 Add single button file upload 2019-07-11 16:19:06 +02:00
Christian Cueni e3c7cc77a9 Merged in feature/instruments (pull request #20)
Change default set for rich text, add blocks

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
2019-07-11 12:25:20 +00:00
Ramon Wenger 6710f51b64 Adjust style of assignment input 2019-07-11 14:13:28 +02:00
Ramon Wenger d768087b2e Add auto grow directive to textarea 2019-07-11 13:55:39 +02:00
Christian Cueni 707909761e Change default set for rich text, add blocks 2019-07-11 10:49:54 +02:00
Christian Cueni 7339e72c1e Fix html 2019-07-11 10:46:04 +02:00
Christian Cueni 7bdeb4b6f5 Add import 2019-07-11 10:43:04 +02:00
Christian Cueni 1f72d4757f Change boldest font weight 2019-07-11 10:42:33 +02:00
Christian Cueni 2eb3fec0bb Use variables and mixins 2019-07-11 10:41:55 +02:00
Ramon Wenger 0ef9298c19 Refactor code 2019-07-11 10:41:55 +02:00
Ramon Wenger e1936a33b1 Rename constant 2019-07-11 10:41:55 +02:00
Christian Cueni 9df8ef6423 Change title markup 2019-07-11 10:41:55 +02:00
Christian Cueni adbb6ca4d4 Fix margin 2019-07-11 10:41:55 +02:00
Christian Cueni ecba0d84bc Add subtitle to contentblock, style instrument widget 2019-07-11 10:41:55 +02:00
Christian Cueni 695a9a8ccb Change grayscale, add border 2019-07-11 10:41:55 +02:00
Christian Cueni 03d8ed6712 Add subtitle block, update font sizes 2019-07-11 10:41:55 +02:00
Christian Cueni d2dabd6952 Update font styles, change width 2019-07-11 10:41:55 +02:00
Ramon Wenger ca17ed42f7 Add property check to answer 2019-07-08 16:03:55 +02:00
Ramon Wenger a09bf2786d Save correct answer with answer given by user 2019-07-08 15:10:33 +02:00
Ramon Wenger 9dca627465 Merged in feature/surveyjs (pull request #17)
Feature/surveyjs
2019-07-04 11:31:12 +00:00
Ramon Wenger e296d500aa Clean up code 2019-07-04 10:24:12 +02:00
Ramon Wenger 0e3ed9ea7a Remove year from school class model 2019-07-03 11:58:25 +02:00
Ramon Wenger b498dc4efa Add cypress test for surveys 2019-07-01 13:08:42 +02:00
Ramon Wenger fbe39e2784 Add style guide 2019-06-27 17:56:49 +02:00
Ramon Wenger 9b85560795 Add answers to surveys 2019-06-27 17:56:29 +02:00
Ramon Wenger f9642ff49e Get survey from server and display it dynamically 2019-06-27 17:55:07 +02:00
Ramon Wenger d8e3d24f4a Fix background color bug 2019-06-26 13:59:00 +02:00
Ramon Wenger db4353faa1 Remove second objective groups block 2019-06-26 09:39:31 +02:00
Ramon Wenger 03623fbcc6 Remove header 2019-06-25 18:06:24 +02:00
Ramon Wenger 43da8adfa4 Change default topic 2019-06-24 16:07:42 +02:00
Ramon Wenger bad289ac3a Rename basic knowledge to instrument in frontend 2019-06-24 15:54:38 +02:00
Ramon Wenger 2494245b12 Add survey.js demo implementation to frontend 2019-06-20 14:51:09 +02:00
Ramon Wenger 590fd180c3 Move project and room actions to own component
Also adds those actions to the detail pages of both entity types. Also refactors some code.
2019-05-22 17:47:31 +02:00
Ramon Wenger c7cf6f7863 Add document name to room entry preview 2019-05-21 14:49:13 +02:00
Ramon Wenger 7bc8c3c3aa Add cypress test for project entry deletion 2019-05-21 14:42:06 +02:00
Ramon Wenger 735d2d9afa Add project entry deletion by user 2019-05-21 14:39:25 +02:00
Ramon Wenger d5364d8d9d Re-add intro to module 2019-05-21 14:08:30 +02:00
Ramon Wenger b29de0cf50 Fix assignment console bug 2019-05-21 11:18:57 +02:00
Ramon Wenger 5432e4c8df Fix scrolling issue 2019-05-21 11:18:27 +02:00
Ramon Wenger 78e2e3ecc5 Add polling to rooms and portfolio pages 2019-05-15 18:21:04 +02:00
Ramon Wenger 8764aee445 Add icon to document form 2019-05-15 15:34:32 +02:00
Ramon Wenger caa6736330 Handle document upload in image form 2019-05-15 15:14:32 +02:00
Ramon Wenger 1417f8fc2d Add long polling to room and project 2019-05-14 17:17:24 +02:00
Ramon Wenger a5b05c5faa Add refresh on room page 2019-05-14 09:53:49 +02:00
Ramon Wenger 175b517e75 Add form for editing project entries 2019-05-13 17:57:21 +02:00
Ramon Wenger dda9f75011 Disable task content block creation for students 2019-05-09 10:20:26 +02:00
Ramon Wenger 28f96f8517 Force http on links 2019-05-09 09:18:21 +02:00
Ramon Wenger 545f3adb41 Fix wording 2019-05-09 09:13:01 +02:00
Ramon Wenger c8f02ec6b2 Fix room entry widget height 2019-05-09 09:12:42 +02:00
Ramon Wenger bd1286abba Prevent double saving on entity creation 2019-05-08 14:42:58 +02:00
Ramon Wenger e88b9a07db Hide assignment block type on room entry form 2019-05-07 15:50:19 +02:00
Ramon Wenger a0b49a752b Display documents in projects in a more useful manner 2019-05-07 15:27:21 +02:00
Christian Cueni 6513da19cf Fix url in cypress test 2019-04-25 12:41:19 +02:00
Ramon Wenger 96ffc7f484 Fix typos 2019-04-25 12:01:00 +02:00
Christian Cueni ed38e73f5b Merged in feature/profile-image (pull request #16)
Feature/profile image

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
2019-04-25 09:23:37 +00:00
Christian Cueni 4688a29122 Clean up code 2019-04-25 10:57:13 +02:00
Christian Cueni 1da5c4bb29 Use background image instead of img 2019-04-24 17:06:11 +02:00
Christian Cueni 979b732583 Move profile link to parent elements 2019-04-24 14:50:00 +02:00
Christian Cueni aca8bd0d2d Add possibility to upload avatars 2019-04-24 14:23:54 +02:00
Ramon Wenger d7a3dd74c2 Add document upload to project entry 2019-04-24 10:41:27 +02:00
Ramon Wenger 244f7405f6 Fix portfolio on mobile 2019-04-23 16:38:24 +02:00
Christian Cueni 6b0a2e0d59 update text 2019-04-16 14:25:14 +02:00
Christian Cueni f869b0141f show add entry button only to owner, don’t allow project entries from other users 2019-04-16 12:48:54 +02:00
Christian Cueni 69c9ecafd8 fix white background in projects, add screenshots to gitignore 2019-04-16 11:16:27 +02:00
Christian Cueni e9bb8844e7 update hamburger icon 2019-04-16 08:33:20 +02:00
Christian Cueni d7cd5d2809 Merge branch 'develop' of bitbucket.org:iterativ/skillbox into develop 2019-04-16 08:22:39 +02:00
Christian Cueni 6ae6a7cbdb clean up some copy and css 2019-04-16 08:22:23 +02:00
Ramon Wenger 83721de7ea Fix cypress test 2019-04-15 12:56:55 +02:00
Christian Cueni 40a0c3ecbe Merge branch 'feature/pw-reset' into develop 2019-04-15 10:31:14 +02:00
Christian Cueni 807005e164 truncate activity text 2019-04-15 10:29:24 +02:00
Christian Cueni 2051395e7b fix scrolling 2019-04-15 09:36:56 +02:00
Ramon Wenger 67370f7b4f Fix some more IE11 issues 2019-04-14 21:09:56 +02:00
Ramon Wenger d7b9fa0106 Make tooltip wrappable 2019-04-11 17:03:06 +02:00
Christian Cueni 59d88d5143 use activity data in frontent 2019-04-11 17:00:59 +02:00
Ramon Wenger 0fd1e928ae Add tooltip for help text 2019-04-11 16:47:46 +02:00
Ramon Wenger e525e0d3de Add correct color to portfolio project page 2019-04-11 14:31:09 +02:00
Ramon Wenger 6853cc8734 Update last module in a mutation instead of the query 2019-04-11 14:15:36 +02:00
Ramon Wenger 09d20e346d Add test for current module 2019-04-11 14:15:36 +02:00
Christian Cueni f8c1f372cb merge develop into feature/pw-reset 2019-04-11 08:14:08 +02:00
Christian Cueni f51924330c add new components with dummy data 2019-04-10 15:50:14 +02:00
Christian Cueni aca36b8a66 resolve conflicts 2019-04-10 09:37:42 +02:00
Christian Cueni 42c579b047 use me query, add components 2019-04-09 16:24:05 +02:00
Ramon Wenger 78bc046462 Add back button on submissions page 2019-04-09 14:50:16 +02:00
Ramon Wenger 26981f3125 Fix cypress test 2019-04-09 14:37:21 +02:00
Ramon Wenger 8a57e7ae48 Merged in feature/mobile-navigation (pull request #14)
Feature/mobile navigation

Approved-by: Christian Cueni <christian.cueni@iterativ.ch>
2019-04-09 10:58:07 +00:00
Ramon Wenger 4a2492ef50 Clean up code 2019-04-09 12:57:05 +02:00
Christian Cueni 8b53d2fa7e add my schoolclasses query, fix test 2019-04-09 11:27:30 +02:00
Christian Cueni e3b4f658e2 add hint in pw form 2019-04-09 09:18:42 +02:00
Christian Cueni 0ee5f65b10 add actions to room widget 2019-04-09 08:27:54 +02:00
Ramon Wenger 3f229f10ab Fix cypress test 2019-04-08 17:23:46 +02:00
Ramon Wenger d879aa1955 Add mobile navigation 2019-04-08 17:16:35 +02:00
Ramon Wenger db96fbac84 Adjust some elements to be more mobile friendly 2019-04-08 17:15:16 +02:00
Ramon Wenger 1bce7a710f Remove some non-read-only elements from mobile 2019-04-08 17:12:52 +02:00
Ramon Wenger b95fd6161f Disable user zoom on mobile 2019-04-08 17:11:31 +02:00
Christian Cueni f3289ba881 add subnavigation, minor cleanup 2019-04-08 17:11:08 +02:00
Christian Cueni 13685b082e rename components, add cypress tests, update hash 2019-04-08 14:18:43 +02:00
Christian Cueni 236afbeb4f style for mobile 2019-04-08 09:51:42 +02:00
Christian Cueni e3575bcf97 Handle backenderrors in frontend 2019-04-04 15:57:02 +02:00
Christian Cueni 5b47cc5a43 Add form validation, style form 2019-04-04 13:37:38 +02:00
Christian Cueni d64c641661 Add pw change endpoint in API 2019-04-03 15:53:00 +02:00
Ramon Wenger 7d3bcf0fbd Fix layout in IE 10+ 2019-04-03 10:12:36 +02:00
Ramon Wenger 760e36a344 Remove add room button on mobile 2019-04-01 18:18:26 +02:00
Ramon Wenger d80cfc07e9 Fix styling for start and rooms pages in IE 2019-04-01 16:44:47 +02:00
Ramon Wenger 08e66795b5 Add header to start page 2019-04-01 10:44:53 +02:00
Ramon Wenger afb21fa499 Add moment to dependencies 2019-03-29 16:32:30 +01:00
Christian Cueni ffc6332894 add edit project page 2019-03-28 08:42:37 +01:00
Christian Cueni d03524e803 add entry count to project widget 2019-03-27 15:56:27 +01:00
Christian Cueni f9f1b6819c use id as condition for menu, add owner name 2019-03-27 15:37:59 +01:00
Christian Cueni cdd31516cf hide portfolio menu on role condition 2019-03-27 15:26:12 +01:00
Christian Cueni 0e1bca4c78 add unshare for projects 2019-03-27 14:20:21 +01:00
Christian Cueni 2b39cc92dd implement share project button 2019-03-27 14:09:34 +01:00
Christian Cueni d9f07c1adb refactor widget footer, add possibility to delete project 2019-03-27 09:33:12 +01:00
Christian Cueni 43278550f7 Add sendgrid config 2019-03-25 13:16:32 +01:00
Ramon Wenger b49c759bf7 Add some paddings 2019-03-14 09:50:23 +01:00
Ramon Wenger 8754900e84 Add dynamic project entry display and creation to frontend 2019-03-13 17:55:13 +01:00
Ramon Wenger 0a67c322be Add fullscreen image to ImageBlock 2019-03-13 16:33:57 +01:00
Ramon Wenger 4a834b8140 Add play icon to topic page 2019-03-12 10:35:51 +01:00
Ramon Wenger d36bbafb04 Fix cypress test for new project 2019-03-11 22:04:50 +01:00
Ramon Wenger 117e8bf0d8 Add vimeo video to topic 2019-03-11 19:45:28 +01:00
Ramon Wenger 1ebfacfbdb Hide module navigation 2019-03-11 15:49:59 +01:00
Ramon Wenger 99de7270a4 Add new project cypress test 2019-03-11 15:38:39 +01:00
Ramon Wenger 658acd2ed7 Remove unnecessary component 2019-03-11 15:38:39 +01:00
Ramon Wenger 474110126d Wire up portfolio frontend to backend 2019-03-07 10:54:27 +01:00
Ramon Wenger 485a6ca4eb Add portfolio backend 2019-03-07 10:49:52 +01:00
Ramon Wenger 25c282a194 Add project form 2019-03-05 17:58:49 +01:00
Ramon Wenger 32697fcf49 Add links for basic knowledge dropdown 2019-03-05 11:20:23 +01:00
Ramon Wenger e1ea01cbb8 Add basic knowledge overview 2019-03-04 18:54:21 +01:00
Ramon Wenger 0b0033177c Update colors to be in line with style guide 2019-03-04 16:41:37 +01:00
Ramon Wenger e480f06b57 Add subnavigation to routes 2019-03-04 13:29:59 +01:00
Ramon Wenger 652ccfc332 Update typography styles 2019-03-04 13:22:00 +01:00
Ramon Wenger 636740a5a0 Add typography mixins 2019-03-04 13:07:12 +01:00
Ramon Wenger bce54d0f46 Fix initial data on start page 2019-03-01 15:26:18 +01:00
Ramon Wenger 18633d4de8 Remove full screen buttons 2019-03-01 11:23:24 +01:00
Ramon Wenger 10b35a5a3e Add last visited module to user 2019-03-01 11:19:43 +01:00
Ramon Wenger b86b1eea37 Replace more explicit values with variables 2019-02-27 16:52:55 +01:00
Ramon Wenger 42d07f8561 Replace explicit values with new variables 2019-02-27 16:19:51 +01:00
Ramon Wenger 10ed3e8630 Add new news styling 2019-02-27 16:18:33 +01:00
Ramon Wenger f463c4e61a Add new illustrations to dashboard 2019-02-21 16:47:25 +01:00
Ramon Wenger 170bfda78c Add genial.ly block to modal 2019-02-21 14:28:38 +01:00
Ramon Wenger 4f72f804c6 Add genial.ly block 2019-02-21 09:55:41 +01:00
Ramon Wenger 32f2ddaea5 Add full screen infographic component 2019-02-20 16:12:16 +01:00
Ramon Wenger 0d99019e94 Make full screen image scrollable 2019-02-20 15:00:40 +01:00
Ramon Wenger 97b3be305f Fix cypress test 2019-02-20 13:43:54 +01:00
Ramon Wenger a50f3737a6 Add full screen modal for images 2019-02-20 10:57:17 +01:00
Ramon Wenger e147d75893 Add assignment text to submissions page 2019-02-19 20:42:06 +01:00
Ramon Wenger 836dbd2bbb Add Infogram block 2019-02-18 16:59:47 +01:00
Ramon Wenger 821473cf7a Update solution e2e test and reactivate it 2019-02-14 18:54:57 +01:00
Ramon Wenger 29c9ceb542 Add check for fetched module in module component 2019-02-14 18:54:37 +01:00
Ramon Wenger be7259403e Add cypress command to wait for specific GraphQL query 2019-02-14 18:54:16 +01:00
Ramon Wenger 59495d13c8 Add workaround for cypress.wait for fetch requests 2019-02-14 18:53:00 +01:00
Ramon Wenger 63e98b099f Rename config variable again 2019-02-14 12:34:17 +01:00
Ramon Wenger 3d09cc8e4b Add new config variable 2019-02-14 12:33:15 +01:00
Ramon Wenger c4c025d0cc Change variable name for Google Analytics ID 2019-02-14 12:22:58 +01:00
Ramon Wenger f5d146df95 Add check for Analytics ID 2019-02-14 11:26:47 +01:00
Ramon Wenger be9f4f4aae Add Google Analytics 2019-02-14 10:07:52 +01:00
Ramon Wenger 1c09a0629f Add solution to result page 2019-02-13 16:35:06 +01:00
Ramon Wenger 2452494b33 Add solution to assignment in content block 2019-02-13 16:21:18 +01:00
Ramon Wenger 4c5a786e7d Fix margin after solution 2019-02-13 16:19:29 +01:00
Ramon Wenger 31a78b6619 Disable test that is not working consistently for now 2019-02-13 15:49:06 +01:00
Ramon Wenger b01802153e Unify solution e2e tests 2019-02-13 14:15:51 +01:00
Ramon Wenger ea7a306522 Add solution toggling to frontend 2019-02-07 16:58:20 +01:00
Ramon Wenger f365225830 Fix cypress test 2019-02-05 18:55:12 +01:00
Ramon Wenger 47761c11c0 Update rendering of solutions 2019-02-05 18:51:41 +01:00
Ramon Wenger 07785ae2c1 Add transition to solutions 2019-02-04 18:54:55 +01:00
Ramon Wenger a08be83283 Add styling to solution 2019-02-04 18:09:51 +01:00
Ramon Wenger 6e60a17468 Fix cypress test 2019-02-04 17:42:28 +01:00
Ramon Wenger 5ce09a4e13 Add solution block to client (including cypress test) 2019-02-04 15:19:58 +01:00
Ramon Wenger 10841a69be Update cypress test 2019-01-31 16:47:27 +01:00
Ramon Wenger 050f700760 Add basics for cypress tests in pipelines file 2019-01-31 16:47:07 +01:00
Ramon Wenger 662a3b8d4b Add basics for project entry wizard 2019-01-30 10:56:24 +01:00
Ramon Wenger 906b5c88bd Add modal basics for new project entry 2019-01-29 17:35:14 +01:00
Ramon Wenger 85914a1f14 Add project page 2019-01-29 17:34:41 +01:00
Ramon Wenger 8e9cd3600d Add new portfolio page layout 2019-01-29 09:20:18 +01:00
Ramon Wenger c468a13720 Add some more base for cypress testing 2019-01-24 15:15:14 +01:00
Ramon Wenger fc6cf0c0d9 Add new news item 2018-12-19 18:20:41 +01:00
Ramon Wenger 2fa373bc30 Add class filter to results 2018-12-06 16:29:27 +01:00
Ramon Wenger 0080dfe0d7 Fix continuous input bug 2018-12-04 13:24:36 +01:00
Ramon Wenger d46d0dde0a Add mobile styling 2018-11-21 18:33:38 +01:00
Ramon Wenger 1b11599eb8 Remove objective group buttons from students 2018-11-21 18:26:16 +01:00
Ramon Wenger bcb3e5e719 Merge branch 'feature/objectives-created-by-user' 2018-11-21 15:19:44 +01:00
Ramon Wenger 4bf3f51644 Apply sorting of objective groups to students as well 2018-11-21 15:18:54 +01:00
Ramon Wenger 9a6b9bf3e3 Add edit objective form wizard to client 2018-11-21 14:56:43 +01:00
Ramon Wenger a89c0d006b Save objective group via mutation 2018-11-20 18:48:48 +01:00
Ramon Wenger 35f29cb00f Add second news entry 2018-11-20 17:32:42 +01:00
Ramon Wenger a1fd28b48e Add objective group mutation 2018-11-20 17:28:29 +01:00
Ramon Wenger 8d9cb86ae8 Move style for icon button 2018-11-20 15:20:02 +01:00
Ramon Wenger 0e9bd79fa6 Add modal for objective group addition 2018-11-20 15:19:40 +01:00
Ramon Wenger 949846f9d0 Move objective group files to own folder 2018-11-20 15:17:53 +01:00
Ramon Wenger 061e20306a Change wording on start page 2018-11-19 17:41:22 +01:00
Ramon Wenger 3a1d2b8168 Add correct component handling to basic knowledge 2018-11-16 16:20:28 +01:00
Ramon Wenger 6387024f81 Add SRF video embedding 2018-11-14 11:53:28 +01:00
Ramon Wenger ee512dc7c2 Adjust start page navigation 2018-11-01 17:09:32 +01:00
Ramon Wenger 90f980fe09 Remove subtitle from room entry 2018-11-01 16:18:35 +01:00
Ramon Wenger a51a882c1d Update styling 2018-11-01 16:01:13 +01:00
Ramon Wenger b33e75d67a Add placeholder to room form's select input 2018-11-01 16:00:56 +01:00
Ramon Wenger 62bd0b2435 Restrict deletion of rooms to teachers 2018-11-01 15:25:40 +01:00
Ramon Wenger 58d42e2472 Merged in feature/objectives-by-user (pull request #10)
Feature/objectives by user
2018-11-01 13:28:15 +00:00
Ramon Wenger e72475fc14 Unify objectives under one objective group for students 2018-11-01 14:24:41 +01:00
Ramon Wenger 5ca9bbb017 Split objective groups by type 2018-11-01 10:58:08 +01:00
Ramon Wenger 4deac16b5d Add static news entry on start page 2018-10-31 16:27:53 +01:00
Ramon Wenger bb5172bde5 Disabled portfolio link and add message to missing page 2018-10-31 16:20:24 +01:00
Ramon Wenger 7c002dcf36 Clean up code 2018-10-31 16:09:37 +01:00
Ramon Wenger 97bea4289e Add visibility popover to objective group widget 2018-10-31 15:37:46 +01:00
Ramon Wenger 9b6207f192 Change title in objective group model 2018-10-30 23:31:54 +01:00
Ramon Wenger 58030fc70d Update package lock 2018-10-30 17:53:30 +01:00
Ramon Wenger 5b50e497c9 Add room entry edit mask 2018-10-30 11:57:41 +01:00
Ramon Wenger c536a04122 Add parts for room entry deletion 2018-10-29 18:54:34 +01:00
Ramon Wenger acf59b218b Add popover to room entry 2018-10-29 13:30:31 +01:00
Ramon Wenger cc99dd00b1 Generalize popover for widgets 2018-10-29 13:24:24 +01:00
Ramon Wenger daa8491578 Add workaround for cache misses 2018-10-29 13:23:42 +01:00
Ramon Wenger 7c3d19170d Add newlines to student submissions 2018-10-25 16:52:55 +02:00
Ramon Wenger 0aec11dd76 Clean up code 2018-10-25 16:03:42 +02:00
Ramon Wenger 0ab58b7582 Fix disappearing submission bug for student 2018-10-25 15:46:31 +02:00
Ramon Wenger 6b6277fe6d Add default text for empty submission list 2018-10-25 15:33:04 +02:00
Ramon Wenger 6591958546 Add assignment result link for teacher view 2018-10-25 15:24:48 +02:00
Ramon Wenger 8b8929c728 Change "Aufgabe" to "Auftrag" 2018-10-25 15:00:43 +02:00
Ramon Wenger 96cbb70477 Remove unused code 2018-10-25 14:34:17 +02:00
Ramon Wenger 631a500dca Update styling 2018-10-25 13:55:12 +02:00
Ramon Wenger 106d90ed17 Add basic knowledge page to content block 2018-10-25 13:54:49 +02:00
Ramon Wenger aea8beff49 Add navigation by basic knowledge slug 2018-10-25 13:53:13 +02:00
Ramon Wenger 365002f800 Fix assignment submission bug on navigation 2018-10-24 16:49:33 +02:00
Ramon Wenger 543a9ea6e9 Add config for e2e tests 2018-10-24 16:26:06 +02:00
Ramon Wenger b2c67569ab Add e2e test for room entry addition 2018-10-24 16:04:57 +02:00
Ramon Wenger 4ad67a09b3 Add author to room entry 2018-10-24 15:34:52 +02:00
Ramon Wenger 617d82f484 Merge branch 'feature/e2e-with-cypress' 2018-10-24 15:19:55 +02:00
Ramon Wenger c0857dcb3f Add missing return statement 2018-10-24 15:19:01 +02:00
Ramon Wenger ee8e33e026 Remove role from GQL query 2018-10-24 15:16:31 +02:00
Ramon Wenger a90501d7e8 Clean up some more code 2018-10-24 15:15:48 +02:00
Christian Cueni 2ecec5b344 Merged in feature/use-role-for-room-creation (pull request #7)
Prevent students from adding new rooms, Verify room form

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
2018-10-24 13:06:45 +00:00
Ramon Wenger 41e8aac63c Clean up code 2018-10-24 15:02:25 +02:00
Ramon Wenger 2dae1dfb0b Add basic rooms page tests 2018-10-24 14:36:42 +02:00
Ramon Wenger 4abf899222 Refactor login test to command 2018-10-24 14:33:46 +02:00
Christian Cueni e832f60cfb Hide Task checkbox in roomentry form 2018-10-24 13:04:49 +02:00
Christian Cueni 1591095553 Prevent students from adding new rooms, Verify room form 2018-10-24 08:40:30 +02:00
Ramon Wenger 4f76d56b19 Add cypress test runner and some initial e2e tests 2018-10-23 13:39:46 +02:00
Ramon Wenger aa85c152dd Use module teaser image as background image 2018-10-23 13:34:55 +02:00
Ramon Wenger 82417a5a7a Add hero image to module detail component 2018-10-23 12:47:31 +02:00
Christian Cueni f3db3c6657 Remove logout from user widget, Fix missing user in article header 2018-10-23 10:20:22 +02:00
Christian Cueni 2dcfa78a3f Change ObjectiveGroupControl background color 2018-10-23 09:34:33 +02:00
Ramon Wenger ff5aeaddee Simplify regex 2018-10-23 08:22:48 +02:00
Christian Cueni 93ad822457 Add logout functionality
Remove unused imports

Add file header

Check response

remove file headers
2018-10-23 08:20:25 +02:00
Ramon Wenger 867dc72abd Add Youtube short URLs 2018-10-23 08:05:42 +02:00
Ramon Wenger 11464c3014 Clean up code 2018-10-22 20:36:02 +02:00
Ramon Wenger 51cebfa34a Fix content block refresh bug 2018-10-22 20:34:42 +02:00
Ramon Wenger 40f11914fb Add bullet points 2018-10-22 20:17:17 +02:00
Christian Cueni 033372848e Merged in feature/detailpage (pull request #5)
Feature/detailpage

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
2018-10-22 17:22:38 +00:00
Christian Cueni 2d52a5b13d Fix broken css expression 2018-10-22 13:56:23 +02:00
Christian Cueni 390a387a56 Remove unused scss 2018-10-22 13:33:47 +02:00
Christian Cueni 8da1d63b42 Add link to document 2018-10-22 13:33:47 +02:00
Christian Cueni d7aa98e3e3 Add basic pages & queries for single submissions 2018-10-22 13:33:47 +02:00
Ramon Wenger 7a73545d8a Mark top navigation links as active on module pages 2018-10-21 20:44:54 +02:00
Ramon Wenger e1ac0e696f Add primary class to save button 2018-10-20 12:48:37 +02:00
Ramon Wenger cbf82d3b4c Remove inactive topics 2018-10-20 12:46:46 +02:00
Ramon Wenger a410f74764 Fix grid layout 2018-10-20 12:44:49 +02:00
Ramon Wenger 56e59ecf0b Hide results for students 2018-10-19 11:23:26 +02:00
Ramon Wenger a7141c3ea0 Add topic slug to route params 2018-10-19 11:04:05 +02:00
Ramon Wenger 2e4255260b Add hero image to module teasers 2018-10-19 10:57:07 +02:00
Ramon Wenger febed9adc4 Fetch topic information from API 2018-10-19 10:36:31 +02:00
Christian Cueni 622365bfbd Use same find methods 2018-10-18 16:59:28 +02:00
Christian Cueni 7a2f8c91e4 Filter user created blocks based on classes 2018-10-18 16:59:28 +02:00
Ramon Wenger eef657e318 Fix layout 2018-10-18 09:50:11 +02:00
Ramon Wenger 6212e6bb94 Make filter bar sticky 2018-10-17 16:44:42 +02:00
Ramon Wenger 387a403565 Adjust color of user widget 2018-10-17 16:25:45 +02:00
Ramon Wenger 7e88642918 Remove order property from module 2018-10-17 15:48:14 +02:00
Ramon Wenger 100fd19165 Hide room popover 2018-10-17 15:32:15 +02:00
Christian Cueni 13a9812ba0 Merged in feature/colors (pull request #3)
Feature/colors

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
2018-10-17 12:34:16 +00:00
Ramon Wenger e0aa2911ab Fix module navigation 2018-10-17 09:42:11 +02:00
Ramon Wenger 1faa75fdba Hide visibility popover on click outside of element 2018-10-17 09:36:12 +02:00
Ramon Wenger c81c7675b6 Add links to landing page 2018-10-16 18:17:14 +02:00
Christian Cueni 0db89c116d style checkbox, refactor task assignment 2018-10-16 15:28:18 +02:00
Christian Cueni 3547a30228 allow user to set block type 2018-10-16 07:29:41 +02:00
Christian Cueni a1a75e9b3f rename types of Contentblocks, change box appearance 2018-10-15 14:10:24 +02:00
Christian Cueni 78f142e2da fix missing objectives 2018-10-15 14:09:56 +02:00
Ramon Wenger 72cab13b36 Add default users 2018-10-15 13:54:34 +02:00
Ramon Wenger 74f25850f1 Remove debug information 2018-10-11 16:14:48 +02:00
Ramon Wenger 6772aba1c9 Make image blocks work 2018-10-11 16:07:02 +02:00
Ramon Wenger 9e1c0cd39b Merge remote-tracking branch 'origin/feature/objective-control' 2018-10-11 15:44:27 +02:00
Christian Cueni cf01aa2bf9 add missing variables to update, remove confusing class name 🤯 2018-10-11 15:08:35 +02:00
Christian Cueni 5dd77eab5d use cache for update, incorperate feedback 2018-10-11 14:12:47 +02:00
Ramon Wenger 3d0c9e4b93 Render room entry dynamically on article view 2018-10-11 14:09:09 +02:00
Ramon Wenger a4954b4e82 Remove sandbox folder 2018-10-11 13:46:12 +02:00
Ramon Wenger ce86e45743 Add content block deletion mutation 2018-10-11 11:39:50 +02:00
Christian Cueni 5970ac3427 update objective progress items 2018-10-10 10:45:56 +02:00
Ramon Wenger 645c998d5c Add 'user created' property on user created content blocks 2018-10-10 10:34:30 +02:00
Ramon Wenger 8110ee359f Distinguish between default and user created content blocks in cms admin 2018-10-09 17:42:19 +02:00
Christian Cueni 3369d0fbb7 add blank layout 2018-10-09 10:22:54 +02:00
Christian Cueni 6d988d3a5c Merge branch 'master' of bitbucket.org:iterativ/skillbox 2018-10-09 09:57:35 +02:00
Christian Cueni e602cd8a8d add start page 2018-10-09 09:57:10 +02:00
Ramon Wenger c56cfb8c19 Add user icon to user widget 2018-10-08 17:42:52 +02:00
Ramon Wenger ace485bca2 Move assignment with submissions to own component 2018-10-08 16:56:25 +02:00
Ramon Wenger f75b04b82f Add active state on submissions link 2018-10-08 16:55:39 +02:00
Ramon Wenger 26d3479871 Add title to assignment view
Also, make route changes work smoothly
2018-10-08 16:00:32 +02:00
Ramon Wenger 6e75b55475 Improve navigation styling 2018-10-08 15:32:25 +02:00
Ramon Wenger 3be07c471c Add submissions query to submissions page 2018-10-08 15:05:59 +02:00
Ramon Wenger b1e44ef263 Rename rooms query 2018-10-08 14:34:56 +02:00
Ramon Wenger 2adfffd441 Add role to user query 2018-10-08 11:34:04 +02:00
Ramon Wenger d970f75fa4 Refactor school class naming 2018-10-08 10:52:55 +02:00
Daniel Egger 85cc99470e Fixed case problem in filename for gql imports 2018-10-06 23:23:00 +02:00
Daniel Egger 9efd000aa1 Refactored from method to computed 2018-10-06 16:26:38 +02:00
Daniel Egger 1d29cc51ec Fixed rooms for new SchoolClass model 2018-10-05 14:38:51 +02:00
Daniel Egger 67f303f46f Hide "Alles"-RadioButton when user is student 2018-10-05 14:23:53 +02:00
Daniel Egger bd4a9fded3 Show ContentBlock actions only with the right permission 2018-10-05 14:11:00 +02:00
Daniel Egger f3bcea7528 Refactored VisibilityPopover for new SchoolClass 2018-10-05 11:51:41 +02:00
Daniel Egger 41d6e87f81 Refactored FilterBar to only show school-classes of logged in user 2018-10-05 11:40:24 +02:00
Daniel Egger d273d711c1 Renamed UserGroup to SchoolClass step 2 2018-10-05 11:25:05 +02:00
Daniel Egger 21c85941be Show the name of the logged in user in DefaultLayout 2018-10-05 10:49:12 +02:00
Ramon Wenger a204de4098 Improve dynamic module navigation, add anchors 2018-10-04 20:06:22 +02:00
Ramon Wenger bf5ee0ea09 Re-use module query in client code 2018-10-04 15:31:25 +02:00
Ramon Wenger e72668402f Clean up client code 2018-10-04 13:51:49 +02:00
Ramon Wenger d379bfcc10 Add dynamic slug to module route 2018-10-04 10:49:35 +02:00
Daniel Egger 5f32bfe109 fix trailing space 2018-10-04 10:12:06 +02:00
Ramon Wenger 5956bab1df Update dummy name 2018-10-03 18:59:08 +02:00
Ramon Wenger e425122455 Add description to chapter 2018-10-03 18:48:31 +02:00
Ramon Wenger 551f20544a Fix filter bar in module 2018-10-03 14:32:27 +02:00
Daniel Egger 465fc9f3ed fix css problem 2018-10-03 11:45:17 +02:00
Ramon Wenger 10ce0059ca Replace loading icon 2018-10-03 11:33:58 +02:00
Ramon Wenger b1363d58bf Add default redirect for demo 2018-10-03 11:33:37 +02:00
Ramon Wenger b5abc3c3a5 Add submission list page 2018-10-03 10:31:16 +02:00
Daniel Egger c688aae30c FinalSubmission zeigt auch Dokument an 2018-10-03 09:49:54 +02:00
Daniel Egger b0df2aad01 user can delete submitted document 2018-10-03 09:38:45 +02:00
Daniel Egger 00255ea28c first version working document upload in assignment 2018-10-02 18:04:08 +02:00
Daniel Egger 8420d8aab1 upload documents in user assignment 2018-10-02 18:04:08 +02:00
Daniel Egger 329c068d80 nur namen vom file anzeigen 2018-10-02 18:04:08 +02:00
Daniel Egger c436f694e6 upload documents 2018-10-02 18:04:08 +02:00
Daniel Egger e1756300be assignement admin 2018-10-02 18:04:08 +02:00
Ramon Wenger 39f542c638 Add word wrap 2018-10-02 17:11:39 +02:00
Ramon Wenger c1154f5e3a Add animation when saving a submission
The correct icon is missing, needs to be delivered yet.
2018-10-02 17:08:36 +02:00
Ramon Wenger 9226f44db6 Update styling on tasks and assignments 2018-10-02 16:14:05 +02:00
Ramon Wenger 95f2e348f1 Update submission on assignment component
Update the data on the parent component to prevent inconsistent data on the server
2018-10-02 15:01:43 +02:00
Ramon Wenger e52a98c50b Divide updates for assignment submissions 2018-10-02 14:28:38 +02:00
Ramon Wenger b22b918d82 Add final submission for assignment 2018-10-02 13:16:50 +02:00
Ramon Wenger f4fb15e428 Refactor folder structure 2018-10-02 13:16:01 +02:00
Ramon Wenger 091b5b4d39 Update assignment widget styling 2018-10-02 11:24:12 +02:00
Ramon Wenger ea9fa06634 Add assignment queries and mutation to client 2018-10-02 10:08:59 +02:00
Ramon Wenger f5e163c3cd Clean up module query 2018-10-01 13:08:20 +02:00
Ramon Wenger 7feff2f178 Remove dropzone 2018-09-28 16:39:14 +02:00
Ramon Wenger 70c6b4329b Update assignment component naming 2018-09-27 22:40:16 +02:00
Ramon Wenger 8f7f8e4d4f Add assignment handling on API 2018-09-27 16:07:48 +02:00
Ramon Wenger 826849f1e0 Add assignment app 2018-09-27 11:50:37 +02:00
Ramon Wenger 65d50f686c Fix image block in front-end 2018-09-27 11:50:37 +02:00
Pawel Kowalski fe9fdb69f1 Package lock 2018-09-26 23:24:34 +02:00
Ramon Wenger cabbceb843 Clean up code 2018-09-26 09:25:25 +02:00
Ramon Wenger f3eb6ded51 Add "add room entry" mutation to frontend 2018-09-25 17:57:29 +02:00
Ramon Wenger 1ef4c6d8e1 Refactor contents form modal and add new component for room entries 2018-09-25 11:31:13 +02:00
Ramon Wenger 1aec0662f4 Add room filter by class 2018-09-24 17:14:41 +02:00
Ramon Wenger 5b8eb36cbb Add user group to room form 2018-09-24 17:04:57 +02:00
Ramon Wenger b4a3699aa3 Normalize user group in GraphQL queries 2018-09-24 17:03:48 +02:00
Ramon Wenger fb5b77e7f2 Limit length of room entry teasers 2018-09-21 17:51:07 +02:00
Ramon Wenger 7a6f6ff6e8 Add functionality to room delete button 2018-09-21 15:24:52 +02:00
Ramon Wenger 7747547c8d Update styling on room widget popover 2018-09-21 13:54:35 +02:00
Ramon Wenger b60f3f1c06 Add component to edit a room 2018-09-21 13:54:15 +02:00
Ramon Wenger 300db36d13 Add popover for room widget menu 2018-09-21 13:03:34 +02:00
Ramon Wenger 45dd310443 Refactor room form 2018-09-21 13:03:34 +02:00
Ramon Wenger b37038f74d Split up add and change mutations for rooms 2018-09-20 16:21:36 +02:00
Ramon Wenger 66ad787779 Generalize room mutation using serializer 2018-09-20 16:03:42 +02:00
Ramon Wenger c8937243f5 Change content block mutation 2018-09-20 10:29:05 +02:00
Ramon Wenger e9938985e4 Add dependency to package.json 2018-09-20 09:06:05 +02:00
Daniel Egger 41bf6efce1 bugfix freezed array -> make deep copy of contentBlock 2018-09-19 18:03:11 +02:00
Daniel Egger 48e724f4e4 anpassungen nach rebase 2018-09-19 17:40:53 +02:00
Daniel Egger 4b10fc83fa added git-crypt 2018-09-19 17:11:01 +02:00
Daniel Egger a16a4753b0 uploadcare styling and handling 2018-09-19 16:37:27 +02:00
Daniel Egger 5ff2f97606 basic working exmaple with uploadpanel 2018-09-19 16:37:27 +02:00
Daniel Egger b8b09b1af3 example with uploadcare 2018-09-19 16:37:27 +02:00
Ramon Wenger ef48f5afb6 Add content block edit modal
Also clean up the state store.
Also change the properties of the content block contents on the server
2018-09-19 15:40:21 +02:00
Ramon Wenger 8067ca439d Extend the content block menu 2018-09-19 14:13:57 +02:00
Ramon Wenger a760949b84 Make modal handling a bit more generic 2018-09-19 14:13:31 +02:00
Ramon Wenger c9d43dd111 Use auto-cache update for content block mutations 2018-09-18 19:39:32 +02:00
Ramon Wenger 0c2cab4c96 Re-use cache for modules 2018-09-18 19:38:48 +02:00
Ramon Wenger b2b2baab0f Remove debug info 2018-09-18 08:11:04 +02:00
Ramon Wenger db61ca560a Add room mutation to frontend 2018-09-17 18:56:24 +02:00
Ramon Wenger 345b269435 Move background colors to mixin 2018-09-17 18:54:26 +02:00
Ramon Wenger 5cb71cd877 Update room color handling 2018-09-17 17:52:43 +02:00
Ramon Wenger fe59a65e87 Add room mutation 2018-09-17 11:35:49 +02:00
Ramon Wenger 8ab7877401 Fix background color bug 2018-09-17 09:20:08 +02:00
Ramon Wenger a522f9117c Remove filter from state, move to router 2018-09-17 09:19:38 +02:00
Ramon Wenger 0e30f0bd45 Add new room page 2018-09-14 15:57:57 +02:00
Ramon Wenger 5b1572b228 Add filter for content blocks 2018-09-14 10:59:29 +02:00
Ramon Wenger 4a9eb441af Generalize radiobuttons and checkboxes 2018-09-14 10:12:21 +02:00
Ramon Wenger daddb24fcc Update styles 2018-09-13 16:24:46 +02:00
Ramon Wenger 2ffeca189a Clean up code 2018-09-13 15:34:18 +02:00
Ramon Wenger 7038721bfd Toggle visibility by class / user group 2018-09-13 15:27:22 +02:00
Pawel Kowalski 2db6464f8d Implement filtering of ContentBlocks 2018-09-13 12:52:10 +02:00
Daniel Egger 4a964b3e81 example mutate hidden/visibility userGroup <-> contentBlock 2018-09-13 12:05:37 +02:00
Pawel Kowalski 2ad89ce6ef Example Visibility server side filtering 2018-09-13 11:44:31 +02:00
Pawel Kowalski 2ead4f221b Added hidden_for ManyToMany 2018-09-13 10:20:20 +02:00
Ramon Wenger 9045935d96 Generalize modal display 2018-09-13 10:18:06 +02:00
Ramon Wenger 6347fa07e1 Add form validation for new content block 2018-09-12 17:40:13 +02:00
Ramon Wenger 639fa7665c Add document block 2018-09-12 15:05:36 +02:00
Ramon Wenger 23f282b358 Add link block 2018-09-12 14:37:28 +02:00
Ramon Wenger 395434620b Refactor code 2018-09-12 11:05:38 +02:00
Ramon Wenger 4010b21cce Add video block to frontend and backend 2018-09-12 10:27:40 +02:00
Pawel Kowalski 4cb5c6ad63 Add User query, get users in FilterBar, add Visibility node 2018-09-11 17:18:50 +02:00
Ramon Wenger 35a8184cd1 Insert new content block at correct position 2018-09-11 16:16:12 +02:00
Ramon Wenger 872eb6efa5 Fix typo 2018-09-11 15:53:09 +02:00
Ramon Wenger 26fa7e70bc Enable adding text blocks 2018-09-11 15:23:37 +02:00
Ramon Wenger d6316fc328 Update module query after mutation 2018-09-11 15:09:55 +02:00
Ramon Wenger 4260147f2d Add visibility button 2018-09-11 10:51:09 +02:00
Pawel Kowalski d756e29ee4 Formatting changes 2018-09-11 10:22:38 +02:00
Ramon Wenger f3a383d8dd Add first mutation 2018-09-11 10:10:42 +02:00
Ramon Wenger 424e1c7f48 Add title change event hook 2018-09-11 10:01:56 +02:00
Pawel Kowalski f07268a627 add object param example 2018-09-10 19:48:11 +02:00
Ramon Wenger 9362fdb4e2 Update query file 2018-09-10 10:23:21 +02:00
Ramon Wenger 5dec3d06c9 Add example add content block query 2018-09-07 21:25:22 +02:00
Ramon Wenger 1ff1cce9ae Remove some debug information 2018-09-07 17:36:50 +02:00
Ramon Wenger 499b52dad1 Fix SVG clipping issue 2018-09-07 14:01:56 +02:00
Ramon Wenger 37df05b1e6 Add pointer to add content component 2018-09-07 13:55:25 +02:00
Ramon Wenger 459d275f87 Add a file input with styling for the image upload 2018-09-07 13:46:18 +02:00
Ramon Wenger 186eab6253 Fix modal bug on save 2018-09-07 11:14:41 +02:00
Ramon Wenger a7368541a3 Dynamically display embedded videos 2018-09-07 11:14:24 +02:00
Ramon Wenger e4c576d26c Add modal save action 2018-09-06 16:48:37 +02:00
Ramon Wenger ab699291c0 Make link form component reactive 2018-09-06 16:19:50 +02:00
Ramon Wenger 48e88ddc45 Add exercise form component 2018-09-06 15:31:13 +02:00
Ramon Wenger 4fb8220f7d Add help text styling 2018-09-06 15:30:59 +02:00
Ramon Wenger da1fb4a372 Add document form component 2018-09-06 14:39:08 +02:00
Ramon Wenger 56d9711a2c Add text form component 2018-09-06 14:35:44 +02:00
Ramon Wenger bc49de49a8 Add video form and other components 2018-09-06 14:28:33 +02:00
Ramon Wenger 596364b6a4 Add new element and change type at correct position 2018-09-06 14:27:33 +02:00
Ramon Wenger c07ec49d14 Add link form and remove button 2018-09-06 13:39:36 +02:00
Ramon Wenger 300a7b8b08 Clean up SCSS 2018-09-06 11:03:37 +02:00
Ramon Wenger f97a4db8d1 Rename component 2018-09-06 11:02:16 +02:00
Ramon Wenger 9ba1485c75 Add new widget 2018-09-06 10:14:28 +02:00
Ramon Wenger 873a49c7dc Rename icon to make purpose clearer 2018-09-06 10:14:09 +02:00
Ramon Wenger 05f3e87a66 Rethink modal handling 2018-09-05 23:15:43 +02:00
Ramon Wenger e4c95ddfa9 Refactor component name 2018-09-05 23:15:07 +02:00
Ramon Wenger b23fc8c055 Refactor widget name 2018-09-05 17:56:33 +02:00
Ramon Wenger bdc9fc6cb0 Add preliminary input field to modal 2018-09-05 17:54:01 +02:00
Ramon Wenger f7d15b35d6 Refactor icon folder location 2018-09-05 16:09:29 +02:00
Ramon Wenger 318892f55c Display a preliminary room teaser 2018-09-05 16:03:45 +02:00
Ramon Wenger 52d6d20194 Add content add widget in modal 2018-09-05 16:02:57 +02:00
Ramon Wenger 9155b86451 Rename component to be more clear 2018-09-05 16:02:28 +02:00
Ramon Wenger b0520773ed Prevent scrolling when modal is shown 2018-09-05 16:02:02 +02:00
Pawel Kowalski 54d6a884a7 Add MutateContentBlock mutation 2018-09-05 15:29:23 +02:00
Pawel Kowalski c7711989b7 Add first take on adding a new content block via interface 2018-09-05 15:09:16 +02:00
Ramon Wenger 8b15bc76e6 Add server data to room entries 2018-09-05 10:19:11 +02:00
Ramon Wenger 56c22a9105 Improve removeAllEdges 2018-09-05 10:17:55 +02:00
Pawel Kowalski 000e3abdf7 Added some sample mutations queries 2018-09-05 09:53:33 +02:00
Pawel Kowalski 12d8d2375c update get rid of 2018-09-04 18:08:06 +02:00
Pawel Kowalski ff9a07e187 Subtitle not Description 2018-09-04 15:42:52 +02:00
Ramon Wenger a963111287 Add button to open modal 2018-09-04 15:13:16 +02:00
Pawel Kowalski 5ddbcdddeb Remove unnecessary RoomEntriesQuery 2018-09-04 15:10:04 +02:00
Pawel Kowalski 5bdb427a17 Add contents to the room query 2018-09-04 15:01:06 +02:00
Pawel Kowalski b28346d297 Add contents to Room Entries, upgrade wagtail, reset migrations 2018-09-04 14:48:34 +02:00
Unknown 160abd75be Add basis for modal 2018-09-04 14:46:28 +02:00
Unknown b048295134 Change app title 2018-09-04 14:45:37 +02:00
Unknown 97006dead5 Visually add "Add Content" button 2018-09-03 18:56:13 +02:00
Unknown 2972e455f3 Add sticky navigation 2018-09-03 14:38:18 +02:00
Unknown 47cb55930d Add special class to content block 2018-09-03 14:38:04 +02:00
Ramon Wenger f2edc096b8 Randomize images 2018-08-27 21:40:41 +02:00
Ramon Wenger df7efc7c05 Adjust styling of room 2018-08-27 19:52:00 +02:00
Ramon Wenger 552b27ba2b Add related name to objective groups 2018-08-27 18:18:09 +02:00
Ramon Wenger dcf612f2df Add related name to room entries 2018-08-27 18:05:19 +02:00
Ramon Wenger 18dba85bb6 Change home link target 2018-08-27 17:55:55 +02:00
Ramon Wenger 333f68b04d Add icon to tasks 2018-08-27 16:45:08 +02:00
Ramon Wenger 0a6cd1b258 Add dummy module hero image 2018-08-27 16:44:41 +02:00
Ramon Wenger 031e2a797d Add book and topic views including styling 2018-08-27 16:38:26 +02:00
Ramon Wenger 14ee995a47 Fix column break bug with few room entries 2018-08-27 15:01:20 +02:00
Ramon Wenger fc02dce2ed Re-add dummy data in rooms for presentation purposes 2018-08-27 14:56:05 +02:00
Pawel Kowalski 192b728572 Get rid of unnecessary console.log stmts, add get for room appearance computed property 2018-08-23 22:48:34 +02:00
Pawel Kowalski e7fafb40a8 Change the way we setup router-links 2018-08-23 22:27:27 +02:00
Pawel Kowalski 087e8ce252 Add entry count, start working on dynamic room color 2018-08-23 22:14:22 +02:00
Ramon Wenger eee12f5871 Add active link class to navigation 2018-08-23 20:21:18 +02:00
Ramon Wenger 4754d9ddb2 Adjust slug of default module 2018-08-23 20:13:38 +02:00
Pawel Kowalski 69af860187 no message 2018-08-23 17:42:44 +02:00
Pawel Kowalski bf913b0417 Use set navigation instead of additional fields with resolvers 2018-08-23 17:38:32 +02:00
Pawel Kowalski a68122f3e7 Fix problem with reactive property and use computed to get the length of the rooms 2018-08-23 16:36:36 +02:00
Pawel Kowalski 8fc0b07eb1 Start connecting entries frontend to backend 2018-08-23 16:20:25 +02:00
Pawel Kowalski ff70e441c7 Add RoomEntry model, factory, dummy_data, node 2018-08-23 16:03:32 +02:00
Ramon Wenger 51bac30f3e Add new image component 2018-08-23 15:17:24 +02:00
Ramon Wenger 34024c88a2 Add property to room route 2018-08-23 15:17:06 +02:00
Pawel Kowalski 01b77707da Combine room backend with frontend 2018-08-23 14:48:16 +02:00
Pawel Kowalski 8c14c2c41e Add migration and package lock after npm install 2018-08-23 13:33:28 +02:00
Ramon Wenger 64dec5e3ee Merge branch 'master' of github.com:ramonwenger/skillbox 2018-08-23 12:28:48 +02:00
Ramon Wenger 1748caa6db Change naming from 'modal text' to 'basic knowledge' 2018-08-23 12:28:04 +02:00
Pawel Kowalski 34220d7262 Add UserGroup and test data generation for it 2018-08-23 12:23:39 +02:00
Ramon Wenger e92927132c Add basic knowledge page 2018-08-23 12:23:21 +02:00
Ramon Wenger 6db6dceb85 Add smooth scrolling 2018-08-23 11:42:51 +02:00
Ramon Wenger c95a7f32ee Adjust scroll behavior on route change 2018-08-23 11:28:33 +02:00
Ramon Wenger 673e05d6a6 Adjust styles to be more consistent 2018-08-23 11:22:22 +02:00
Ramon Wenger 51be815601 Move around some files 2018-08-23 08:51:39 +02:00
Ramon Wenger ded9426742 Add simple layout 2018-08-22 18:19:51 +02:00
Ramon Wenger 2193f5b482 Add different layouts, with default layout for starters 2018-08-22 17:47:18 +02:00
Ramon Wenger f93d6b5f71 Add article page 2018-08-22 16:48:43 +02:00
Ramon Wenger db70aaf271 Add some more components to room page 2018-08-22 16:15:38 +02:00
Ramon Wenger c712ee34f5 Add props to user widget 2018-08-22 16:13:52 +02:00
Ramon Wenger 948878013c Fix grid in Edge browser 2018-08-22 15:06:18 +02:00
Ramon Wenger 9a88c2709d Add IE10+ fixes 2018-08-22 15:02:56 +02:00
Ramon Wenger 600a7ec66e Add "dynamic" room data 2018-08-22 13:23:44 +02:00
Ramon Wenger 7e3455340f Add room page with widgets 2018-08-22 11:37:16 +02:00
Ramon Wenger 82e49d0037 Add state variables, actions and mutations 2018-08-22 11:36:28 +02:00
Ramon Wenger b335354efa Rename profile to user widget 2018-08-22 11:35:00 +02:00
Ramon Wenger fa8f0b6d7c Add function to calculate rem 2018-08-22 11:33:42 +02:00
Ramon Wenger 08efcec4a6 Add filter bar and checkbox components 2018-08-21 17:59:42 +02:00
Ramon Wenger 732f857fa9 Merge branch 'master' of github.com:ramonwenger/skillbox 2018-08-21 16:50:16 +02:00
Ramon Wenger 71c339a40c Add room page and widgets 2018-08-21 14:37:15 +02:00
Pawel Kowalski c401bc4d91 Add empty console link 2018-08-20 18:03:56 +02:00
Ramon Wenger d3a65539fb Update styling 2018-08-20 17:45:03 +02:00
Ramon Wenger f94e037c27 Add base rooms layout 2018-08-20 17:38:30 +02:00
Ramon Wenger d1a68d7094 Add profile widget 2018-08-20 17:05:53 +02:00
Ramon Wenger 9c6e06c4a8 Add module navigation 2018-08-20 17:05:40 +02:00
Ramon Wenger 19de9a7e65 Improve edge removal code
Keep arrays as arrays instead of objects
2018-08-20 15:35:00 +02:00
Ramon Wenger c7bc57d38d Add top navigation 2018-08-20 14:45:47 +02:00
Pawel Kowalski bc29989908 Use component this scoped function instead of Vue global function for getRidOfEdges 2018-08-18 00:53:57 +02:00
Pawel Kowalski d6d8d60c9b And now also get rid of edges 2018-08-18 00:40:30 +02:00
Pawel Kowalski de14c02f0a Add ModalText to get rid of console errors 2018-08-18 00:14:17 +02:00
Pawel Kowalski bd136d79b3 Not perfect, but an intermediary solution for the edges/nodes problem 2018-08-18 00:02:31 +02:00
Pawel Kowalski ea073a29ac Replace specific edge/node removal with a generic solution: move into globally available function.
- Why is it not possible to change data with apollo link?
2018-08-17 18:08:15 +02:00
Pawel Kowalski 17b0047b32 Provide a draft for the edges/nodes removal 2018-08-17 02:29:27 +02:00
Pawel Kowalski 92a6e1f10f Revert "Add favicon"
This reverts commit f30fbaa43f.
2018-08-16 17:49:11 +02:00
Pawel Kowalski 462c548964 Revert "Copy static dir during build"
This reverts commit dbc84964b6.
2018-08-16 17:48:28 +02:00
Pawel Kowalski 44c386c073 Revert "Add static .gitkeep dir because django puts static resources here (collectstatic)"
This reverts commit b5a7e17ee0.
2018-08-16 17:48:15 +02:00
Pawel Kowalski dbc84964b6 Copy static dir during build 2018-08-16 17:45:28 +02:00
Pawel Kowalski b5a7e17ee0 Add static .gitkeep dir because django puts static resources here (collectstatic) 2018-08-16 17:40:14 +02:00
Pawel Kowalski 2157d4e630 remove unnecessary header comment 2018-08-16 17:04:43 +02:00
Pawel Kowalski 46a13cc2c8 Merge branch 'master' of github.com:ramonwenger/skillbox
* 'master' of github.com:ramonwenger/skillbox:
  Add styling to user input fields
  Move styles
  Add favicon
  Add dropzone
2018-08-16 16:52:21 +02:00
Pawel Kowalski 3f159b0473 Add a single module query (without edges/node) 2018-08-16 16:50:31 +02:00
Ramon Wenger 08527a7575 Merge branch 'master' of github.com:ramonwenger/skillbox 2018-08-16 16:32:06 +02:00
Ramon Wenger 4bff192922 Add styling to user input fields 2018-08-16 16:31:51 +02:00
Ramon Wenger 1f6d497d02 Move styles 2018-08-16 16:31:17 +02:00
Ramon Wenger f30fbaa43f Add favicon 2018-08-16 16:30:07 +02:00
Ramon Wenger 1999a7ee10 Add dropzone 2018-08-16 16:28:25 +02:00
Pawel Kowalski e2c20cca2f Fix ContentBlock import problem in Chapter component 2018-08-16 16:14:22 +02:00
Pawel Kowalski a512ef4f63 Move content blocks into content-blocks directory 2018-08-16 16:13:05 +02:00
Ramon Wenger fa26609c49 Add student entry component 2018-08-16 10:51:18 +02:00
Ramon Wenger 80b46a4781 Add dynamic components 2018-08-15 18:47:33 +02:00
Ramon Wenger 13d378897a Add chapter and content block components 2018-08-15 14:46:00 +02:00
Ramon Wenger 348de74dee Clean up query function 2018-08-15 14:45:44 +02:00
Pawel Kowalski 3ba9af1ce7 Add StreamField serializer 2018-08-15 14:45:18 +02:00
Pawel Kowalski 4a3ffd9eac Implement chapters / content blocks graphql interface 2018-08-15 14:30:00 +02:00
Pawel Kowalski 640af9b047 Add ContentBlock factory, add apollo-link first steps 2018-08-15 13:59:21 +02:00
Pawel Kowalski 7b50f558f3 Remove forbidden debug stmt 2018-08-14 18:10:41 +02:00
Ramon Wenger 73c3dec5df Merge branch 'feature/query-module' 2018-08-14 17:59:59 +02:00
Pawel Kowalski a01eb7f467 Adds params to modules query 2018-08-14 17:58:26 +02:00
Ramon Wenger cb3b659949 Fetch module data from server 2018-08-14 17:58:10 +02:00
Ramon Wenger b99d354284 Add apollo base for module 2018-08-14 16:53:03 +02:00
Pawel Kowalski 5d48f42ffe Adds scaffold for objectives 2018-08-14 16:41:20 +02:00
Pawel Kowalski e3ee972530 Adds graphql interface to objectives 2018-08-14 16:26:39 +02:00
Ramon Wenger fc1b0519c4 Parametrize module component 2018-08-14 15:10:37 +02:00
Ramon Wenger 0c8b5553df Parametrize the objective group component 2018-08-14 14:38:56 +02:00
Ramon Wenger e708f8e334 Update styles from style guide 2018-08-14 14:00:13 +02:00
Ramon Wenger c58986a0b4 Add module page 2018-08-14 11:47:27 +02:00
Ramon Wenger 18f7c91c35 Adjust styling 2018-08-14 11:47:09 +02:00
Ramon Wenger ac112ca69c Merge branch 'master' of github.com:ramonwenger/skillbox 2018-08-14 11:46:14 +02:00
Ramon Wenger ae3f794071 Add routing for convenience 2018-08-14 11:45:59 +02:00
Pawel Kowalski 690e9a9e02 Formatting of book 2018-08-13 22:12:49 +02:00
Ramon Wenger d6ee3a290f Add book sidebar component 2018-08-13 18:59:32 +02:00
Ramon Wenger 955f6d7fc0 Add book route 2018-08-13 18:21:47 +02:00
Ramon Wenger a2484b9d6f Add some styles 2018-08-13 18:21:20 +02:00
Pawel Kowalski 25f4809d22 Name query, don't prefetch 2018-08-09 15:34:23 +02:00
Pawel Kowalski ca6e179a2e Fixed styling of vue components 2018-08-09 15:16:49 +02:00
Ramon Wenger b7d8503cd9 Clean up style files 2018-08-09 14:54:18 +02:00
Ramon Wenger 5b9c28b112 Change store creation 2018-08-09 14:46:18 +02:00
Ramon Wenger 7f8739500e Update webpack build conf 2018-08-09 14:41:34 +02:00
Ramon Wenger 1efb11c4d6 Merge branch 'feature/no-nuxt' 2018-08-09 14:37:41 +02:00
Pawel Kowalski dfc057dda8 Fixed npm vulnerabilities using npm audit fix --force 2018-08-09 14:37:23 +02:00
Ramon Wenger 562fbca542 Change components to work without nuxt 2018-08-09 14:36:16 +02:00
Pawel Kowalski da9e011f16 Removed unnecessary colon 2018-08-09 14:31:12 +02:00
Pawel Kowalski 91862f3947 Cleaned packagacke.json 2018-08-09 14:29:54 +02:00
Pawel Kowalski 1dd1f9f605 remove nuxt from deps 2018-08-09 14:23:58 +02:00
Ramon Wenger f2d9d18894 Remove nuxt from project 2018-08-09 14:20:33 +02:00
Pawel Kowalski c98d525caa Adds example filtered query 2018-08-09 13:59:04 +02:00
Ramon Wenger eedb86c7fd Add base url 2018-08-09 10:34:56 +02:00
Ramon Wenger 071f3be43f Tweak build settings 2018-08-09 10:22:41 +02:00
Ramon Wenger 2eb9ab9e4d Add base url 2018-08-09 10:20:02 +02:00
Pawel Kowalski 9dbccbee88 Fixed dependency vulnerabilities with npm audit fix 2018-08-08 22:50:14 +02:00
Ramon Wenger 7842aa19b4 Add prod api url 2018-08-08 19:11:45 +02:00
Ramon Wenger ce3432dc8f Update spa settings for build 2018-08-08 17:49:31 +02:00
Ramon Wenger e09a981fe1 Update dependencies 2018-08-08 17:36:34 +02:00
Ramon Wenger 4a46feb4af Add first component 2018-08-08 17:31:19 +02:00
Ramon Wenger 773a907be3 Fix build 2018-08-08 17:30:55 +02:00
Ramon Wenger 5faf3a2a8c Add styles 2018-08-08 17:30:28 +02:00
Pawel Kowalski 53d4c3e452 Remove topic and module filter in book query 2018-08-08 16:37:17 +02:00
Ramon Wenger d884298413 Remove unused code 2018-08-08 15:38:37 +02:00
Pawel Kowalski bac0690721 Redirect from server to the client if no server url responds to the request 2018-08-08 15:25:00 +02:00
Pawel Kowalski 9d47f0349a Add order to Topic, Show how to iterate over apollo results 2018-08-08 15:14:54 +02:00
Ramon Wenger 9122640750 Merge branch 'master' of github.com:ramonwenger/skillbox 2018-08-08 15:01:22 +02:00
Ramon Wenger 5e6ea1f52e Add nuxt.js to project 2018-08-08 15:00:56 +02:00
Ramon Wenger 93085a11a7 Update gitignore 2018-08-08 14:59:01 +02:00
Pawel Kowalski 91c81b13c0 implement a navigable book->topic->module query 2018-08-08 14:43:49 +02:00
Pawel Kowalski 5dbef5a694 initial commit 2018-08-06 23:26:23 +02:00