Commit Graph

307 Commits

Author SHA1 Message Date
Ramon Wenger 65a09fb9c7 Use the GQL cache for local state 2019-12-18 16:23:33 +01:00
Ramon Wenger cb13aa1ea5 Update my activity in client 2019-12-18 13:17:08 +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 89e3925590 Change submissionfeedback to submission_feedback or submissionFeedback,
respectively
2019-12-09 10:30:49 +01:00
Ramon Wenger f6f61aaf05 Add bookmark action for modules 2019-12-03 15:06:47 +01:00
Ramon Wenger 7c534cbe5c Add first raw implementation for adtl. bookmark types 2019-12-02 13:56:52 +01:00
Christian Cueni 735eae25e3 Handle submissions with no feedback 2019-11-19 15:32:13 +01:00
Christian Cueni a732074a9b Add feedback in student view 2019-11-18 17:42:53 +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 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 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
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
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 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 e10b577ac1 Add solution visibility check to survey 2019-09-09 14:04:47 +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 2fa006d790 Rename block, update frontend 2019-08-14 11:52:44 +02:00
Christian Cueni 638bea0cd0 Use cache to propagate changes, add tests, style popover 2019-07-25 11:43:51 +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 9dca627465 Merged in feature/surveyjs (pull request #17)
Feature/surveyjs
2019-07-04 11:31:12 +00:00
Ramon Wenger 0e3ed9ea7a Remove year from school class model 2019-07-03 11:58:25 +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 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 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 175b517e75 Add form for editing project entries 2019-05-13 17:57:21 +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 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
Christian Cueni 40a0c3ecbe Merge branch 'feature/pw-reset' into develop 2019-04-15 10:31:14 +02:00
Christian Cueni 59d88d5143 use activity data in frontent 2019-04-11 17:00:59 +02:00
Ramon Wenger 6853cc8734 Update last module in a mutation instead of the query 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 42c579b047 use me query, add components 2019-04-09 16:24:05 +02:00
Christian Cueni e3575bcf97 Handle backenderrors in frontend 2019-04-04 15:57:02 +02: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 0e1bca4c78 add unshare for projects 2019-03-27 14:20:21 +01:00
Christian Cueni d9f07c1adb refactor widget footer, add possibility to delete project 2019-03-27 09:33:12 +01:00
Ramon Wenger 8754900e84 Add dynamic project entry display and creation to frontend 2019-03-13 17:55:13 +01:00
Ramon Wenger 117e8bf0d8 Add vimeo video to topic 2019-03-11 19:45:28 +01:00
Ramon Wenger 474110126d Wire up portfolio frontend to backend 2019-03-07 10:54:27 +01:00
Ramon Wenger 10b35a5a3e Add last visited module to user 2019-03-01 11:19:43 +01:00
Ramon Wenger 0d99019e94 Make full screen image scrollable 2019-02-20 15:00:40 +01:00
Ramon Wenger e147d75893 Add assignment text to submissions page 2019-02-19 20:42:06 +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 ea7a306522 Add solution toggling to frontend 2019-02-07 16:58:20 +01:00
Ramon Wenger 2fa373bc30 Add class filter to results 2018-12-06 16:29:27 +01:00
Ramon Wenger 9a6b9bf3e3 Add edit objective form wizard to client 2018-11-21 14:56:43 +01:00
Ramon Wenger a1fd28b48e Add objective group mutation 2018-11-20 17:28:29 +01:00
Ramon Wenger 90f980fe09 Remove subtitle from room entry 2018-11-01 16:18:35 +01:00
Ramon Wenger e72475fc14 Unify objectives under one objective group for students 2018-11-01 14:24:41 +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 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 daa8491578 Add workaround for cache misses 2018-10-29 13:23:42 +01:00
Ramon Wenger 0ab58b7582 Fix disappearing submission bug for student 2018-10-25 15:46:31 +02:00
Ramon Wenger aea8beff49 Add navigation by basic knowledge slug 2018-10-25 13:53:13 +02:00
Ramon Wenger ee8e33e026 Remove role from GQL query 2018-10-24 15:16:31 +02:00
Ramon Wenger 82417a5a7a Add hero image to module detail component 2018-10-23 12:47:31 +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
Christian Cueni d7aa98e3e3 Add basic pages & queries for single submissions 2018-10-22 13:33:47 +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 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
Ramon Wenger 9e1c0cd39b Merge remote-tracking branch 'origin/feature/objective-control' 2018-10-11 15:44:27 +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 26d3479871 Add title to assignment view
Also, make route changes work smoothly
2018-10-08 16:00:32 +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 1d29cc51ec Fixed rooms for new SchoolClass model 2018-10-05 14:38:51 +02:00
Daniel Egger bd4a9fded3 Show ContentBlock actions only with the right permission 2018-10-05 14:11:00 +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 bf5ee0ea09 Re-use module query in client code 2018-10-04 15:31:25 +02:00
Ramon Wenger d379bfcc10 Add dynamic slug to module route 2018-10-04 10:49:35 +02:00
Ramon Wenger e425122455 Add description to chapter 2018-10-03 18:48:31 +02:00
Daniel Egger 8420d8aab1 upload documents in user assignment 2018-10-02 18:04:08 +02:00
Ramon Wenger e52a98c50b Divide updates for assignment submissions 2018-10-02 14:28:38 +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 f3eb6ded51 Add "add room entry" mutation to frontend 2018-09-25 17:57:29 +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 7a6f6ff6e8 Add functionality to room delete button 2018-09-21 15:24:52 +02:00
Ramon Wenger b60f3f1c06 Add component to edit a room 2018-09-21 13:54:15 +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 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 c9d43dd111 Use auto-cache update for content block mutations 2018-09-18 19:39:32 +02:00
Ramon Wenger db61ca560a Add room mutation to frontend 2018-09-17 18:56:24 +02:00
Ramon Wenger fe59a65e87 Add room mutation 2018-09-17 11:35:49 +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
Pawel Kowalski 4cb5c6ad63 Add User query, get users in FilterBar, add Visibility node 2018-09-11 17:18:50 +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
Pawel Kowalski 54d6a884a7 Add MutateContentBlock mutation 2018-09-05 15:29:23 +02:00
Pawel Kowalski 000e3abdf7 Added some sample mutations queries 2018-09-05 09:53:33 +02:00
Pawel Kowalski ff9a07e187 Subtitle not Description 2018-09-04 15:42:52 +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
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
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 087e8ce252 Add entry count, start working on dynamic room color 2018-08-23 22:14:22 +02:00
Pawel Kowalski bf913b0417 Use set navigation instead of additional fields with resolvers 2018-08-23 17:38:32 +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
Pawel Kowalski 01b77707da Combine room backend with frontend 2018-08-23 14:48:16 +02:00
Pawel Kowalski c401bc4d91 Add empty console link 2018-08-20 18:03:56 +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 3f159b0473 Add a single module query (without edges/node) 2018-08-16 16:50:31 +02:00
Ramon Wenger 80b46a4781 Add dynamic components 2018-08-15 18:47:33 +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 a01eb7f467 Adds params to modules query 2018-08-14 17:58:26 +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
Pawel Kowalski 25f4809d22 Name query, don't prefetch 2018-08-09 15:34:23 +02:00
Pawel Kowalski c98d525caa Adds example filtered query 2018-08-09 13:59:04 +02:00
Pawel Kowalski 53d4c3e452 Remove topic and module filter in book query 2018-08-08 16:37:17 +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
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