Commit Graph

355 Commits

Author SHA1 Message Date
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