ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity
1,100 Commits 3 Branches 1 Tag 19 MiB
Commit Graph

430 Commits

Author SHA1 Message Date
Ramon Wenger 9e1c0cd39b Merge remote-tracking branch 'origin/feature/objective-control' 2018-10-11 15:44:27 +02:00
Ramon Wenger 55683da3ed Fix Unit Tests 2018-10-11 14:56:11 +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 ce86e45743 Add content block deletion mutation 2018-10-11 11:39:50 +02:00
Ramon Wenger eafff751f8 Filter content blocks by permission and ownership 2018-10-10 14:18:15 +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 9fed2b8422 Rename folder user to users 2018-10-10 09:40:24 +02:00
Ramon Wenger 8110ee359f Distinguish between default and user created content blocks in cms admin 2018-10-09 17:42:19 +02:00
Ramon Wenger f75b04b82f Add active state on submissions link 2018-10-08 16:55:39 +02:00
Ramon Wenger 6e75b55475 Improve navigation styling 2018-10-08 15:32:25 +02:00
Ramon Wenger 6f15ac4173 Fix bug in role retrieval 2018-10-08 14:35:57 +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 9efd000aa1 Refactored from method to computed 2018-10-06 16:26:38 +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 d273d711c1 Renamed UserGroup to SchoolClass step 2 2018-10-05 11:25:05 +02:00
Daniel Egger b2cac389cf Renamed UserGroup to SchoolClass and reset migrations 2018-10-05 10:59:57 +02:00
Daniel Egger 21c85941be Show the name of the logged in user in DefaultLayout 2018-10-05 10:49:12 +02:00
Daniel Egger 31c22846f6 Added DEFAULT_SCHOOL_ID 
The DEFAULT_SCHOOL_ID is used as long as we have only one school.
That simplifies some code for now.
 2018-10-04 22:15:36 +02:00
Daniel Egger 1574b8fbcc Added GraphQL "me" query to get user permissions 2018-10-04 22:10:31 +02:00
Daniel Egger 6a57b35251 Added SchoolRole models from Helloclass 2018-10-04 16:00:21 +02:00
Ramon Wenger ba18946736 Fix tests 2018-10-04 15:57:56 +02:00
Ramon Wenger b9bb41e8cc Add module to assignment 2018-10-04 15:29:45 +02:00
Ramon Wenger e524fe6107 Update factory to include image URL block generation 2018-10-04 13:51:18 +02:00
Daniel Egger 8811829e3a Bugfix for Bitbucket-Pipelines tests 2018-10-04 12:52:56 +02:00
Daniel Egger 35201e6986 Fix Python import error 2018-10-04 10:32:44 +02:00
Daniel Egger a5e58fb3fc Added Authentication for GraphQL api endpoint. Added tests 2018-10-04 10:27:49 +02:00
Ramon Wenger 7a91d9ce77 Rename book to books and reset migrations 2018-10-04 10:05:14 +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
Daniel Egger b870c4b35c StudentSubmission should have URL as document 2018-10-02 18:04:08 +02:00
Daniel Egger e1756300be assignement admin 2018-10-02 18:04:08 +02:00
Ramon Wenger 6ba06e9fe9 Update dummy data and factories 2018-10-02 18:02:52 +02:00
Ramon Wenger 3752ba5c1d Add new dummy data and improve factories 2018-10-02 16:13:36 +02:00
Ramon Wenger e52a98c50b Divide updates for assignment submissions 2018-10-02 14:28:38 +02:00
Ramon Wenger 73759e1af8 Fix dummy data for basic knowledge 2018-10-02 14:27:55 +02:00
Ramon Wenger b22b918d82 Add final submission for assignment 2018-10-02 13:16:50 +02:00
Ramon Wenger 0612daa05f Fix error for user without existing submission 2018-10-02 13:16:29 +02:00
Ramon Wenger d35c151cfb Add assignment query on server 2018-10-02 10:07:36 +02:00
Ramon Wenger 107b5735e9 Add assignment mutation on server side 2018-10-01 13:44:29 +02:00
Ramon Wenger 23176088f4 Fix factory for assignment 2018-10-01 13:42:10 +02:00
Ramon Wenger f5e163c3cd Clean up module query 2018-10-01 13:08:20 +02:00
Ramon Wenger 6f9666407c Fix dummy data 2018-10-01 13:05:53 +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 4eb8406b2c Prepare settings and fix urls for aws s3 usage 2018-09-26 16:31:07 +02:00
Ramon Wenger cb0f96f81e Add "add room entry" mutation with serializer 2018-09-25 17:01:16 +02:00
Ramon Wenger 5b8eb36cbb Add user group to room form 2018-09-24 17:04:57 +02:00
Ramon Wenger 9a89fa874b Add 'allowed blocks' property for room entry 2018-09-24 17:02:57 +02:00
Ramon Wenger 7a6f6ff6e8 Add functionality to room delete button 2018-09-21 15:24:52 +02:00
Ramon Wenger 643374140e Update room dummy data 2018-09-21 13:46:08 +02:00
Ramon Wenger dea1d1b253 Add room update mutation on server 2018-09-21 13:45:51 +02:00
Ramon Wenger 613f099b30 Rename arguments for mutations 2018-09-21 13:03:34 +02:00
Daniel Egger 2e8dc96046 bitbucket pipelines heroku integration 2018-09-20 17:28: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 83ebaa94b9 Change login mask style 2018-09-20 16:02:25 +02:00
Pawel Kowalski 3223dccb2a Add assets dir to staticfiles 2018-09-20 11:39:31 +02:00
Ramon Wenger c8937243f5 Change content block mutation 2018-09-20 10:29:05 +02:00
Daniel Egger 48e724f4e4 anpassungen nach rebase 2018-09-19 17:40:53 +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 2464c97079 Update dummy data types 2018-09-18 19:38:26 +02:00
Ramon Wenger db61ca560a Add room mutation to frontend 2018-09-17 18:56:24 +02:00
Ramon Wenger 1927244f26 Fix room querying 2018-09-17 17:53:14 +02:00
Ramon Wenger fe59a65e87 Add room mutation 2018-09-17 11:35:49 +02:00
Ramon Wenger 0e30f0bd45 Add new room page 2018-09-14 15:57:57 +02:00
Ramon Wenger 7038721bfd Toggle visibility by class / user group 2018-09-13 15:27:22 +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 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 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
Pawel Kowalski 2c2ad3f8f6 Add visibility to ContentBlocks 2018-09-11 16:18:25 +02:00
Ramon Wenger f3a383d8dd Add first mutation 2018-09-11 10:10:42 +02:00
Ramon Wenger 98d29e83e7 Adjust image format in dummy data 2018-09-10 14:30:10 +02:00
Ramon Wenger bf4861f595 Add more tests 
Also, add test settings
 2018-09-10 14:28:08 +02:00
Ramon Wenger 370fd54b98 Refactor helper method from test 2018-09-10 12:54:31 +02:00
Ramon Wenger 9a2bc91a20 Remove top level __init__.py, as it breaks the test runner 2018-09-10 12:52:55 +02:00
Ramon Wenger 7142e3f3b1 Add a first test 2018-09-10 12:04:07 +02:00
Ramon Wenger ec03c03c48 Insert new content block at first position 2018-09-10 10:21:25 +02:00
Ramon Wenger d6b3fc09cb Refactor content block mutation 2018-09-10 10:18:09 +02:00
Ramon Wenger 5725c3d4e4 Update content block mutation 2018-09-10 09:52:38 +02:00
Ramon Wenger 4ed1cd3086 Refactor code, add first sanitation steps 2018-09-07 18:29:53 +02:00
Ramon Wenger 7d0a97208e Add first preliminary version of 'AddContentBlock' mutation 2018-09-07 17:36:28 +02:00
Pawel Kowalski ed4616bd24 Experiment with using wagtail api calls to serialize and deserialize StreamFields 2018-09-05 16:40:39 +02:00
Daniel Egger f3a6c0bfe0 MutateContentBlock with contents 2018-09-05 16:38:39 +02:00
Pawel Kowalski 98a029a998 Add chapters query 2018-09-05 15:22:40 +02:00
Pawel Kowalski c7711989b7 Add first take on adding a new content block via interface 2018-09-05 15:09:16 +02:00
Pawel Kowalski 356329f266 Add first mutation and some util functions 2018-09-05 13:14:17 +02:00
Ramon Wenger a5d0be0396 Add Link Block 2018-09-05 10:17:21 +02:00
Pawel Kowalski 000e3abdf7 Added some sample mutations queries 2018-09-05 09:53:33 +02:00
Pawel Kowalski 7d1cac079b Rename back *Types to *Nodes 2018-09-05 09:33:34 +02:00
Pawel Kowalski 0c10757487 change BookQuery after refactoring 2018-09-04 22:53:11 +02:00
Pawel Kowalski e007482e46 Move book schema into a package and files: queries and mutations 2018-09-04 18:14:08 +02:00
Pawel Kowalski e9897911b3 Implement ImageStreamField 2018-09-04 16:13:03 +02:00
Pawel Kowalski 1367a01ca7 Cleanup dummy data creation 2018-09-04 15:48:50 +02:00
Pawel Kowalski ff9a07e187 Subtitle not Description 2018-09-04 15:42:52 +02:00
Pawel Kowalski b28346d297 Add contents to Room Entries, upgrade wagtail, reset migrations 2018-09-04 14:48:34 +02:00
Unknown c07be5d4a4 Update docker configuration 2018-09-03 17:20:02 +02:00
Unknown a2fd2b50c3 Fix incorrect attribute in dummy data 2018-09-03 14:35:33 +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 c28e1b2b05 Add docker configuration 2018-08-27 14:10:33 +02:00
Pawel Kowalski 3f797db3f4 Minor formatting 2018-08-24 10:09:12 +02:00
Pawel Kowalski 087e8ce252 Add entry count, start working on dynamic room color 2018-08-23 22:14:22 +02:00
Ramon Wenger 8ebfda66b6 Update dummy data set 2018-08-23 20:13:06 +02:00
Pawel Kowalski edb43ce2a3 Rename all *Node => *Type except for ContentBlock because the name clashes 2018-08-23 17:50:45 +02:00
Pawel Kowalski bf913b0417 Use set navigation instead of additional fields with resolvers 2018-08-23 17:38:32 +02:00
Pawel Kowalski 585eccbe12 Update pipenv: required python version=3.6 2018-08-23 16:39:20 +02:00
Ramon Wenger f583c6c8cc Merge branch 'master' of github.com:ramonwenger/skillbox 2018-08-23 16:05:40 +02:00
Pawel Kowalski ff70e441c7 Add RoomEntry model, factory, dummy_data, node 2018-08-23 16:03:32 +02:00
Ramon Wenger 724f741b51 Make a room queryable by slug 2018-08-23 16:03:13 +02:00
Pawel Kowalski 01b77707da Combine room backend with frontend 2018-08-23 14:48:16 +02:00
Pawel Kowalski 7eb8db9671 Keep this import here, or this piece of software will implode 2018-08-23 14:03:51 +02:00
Pawel Kowalski c32372c535 Reset all migrations 2018-08-23 13:55:36 +02:00
Pawel Kowalski e26a55bb03 Probably duplicate type specification 2018-08-23 13:47:47 +02:00
Pawel Kowalski 8c14c2c41e Add migration and package lock after npm install 2018-08-23 13:33:28 +02:00
Pawel Kowalski 5656b15135 Add rooms model, factories, dummy_data generation, graphql node 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 98df92d559 Fix dummy data creation 2018-08-21 16:49:50 +02:00
Pawel Kowalski 2f52f67b64 Move common functions into Wagtail superclass 2018-08-16 17:26:16 +02:00
Pawel Kowalski 2157d4e630 remove unnecessary header comment 2018-08-16 17:04:43 +02:00
Pawel Kowalski 3f159b0473 Add a single module query (without edges/node) 2018-08-16 16:50:31 +02:00
Pawel Kowalski ef4fb4b20e Generate all types of content 2018-08-16 15:48:46 +02:00
Pawel Kowalski 80719e9a65 Enrich test data generation with ImageFields 2018-08-16 15:23:41 +02:00
Pawel Kowalski a24acad07a Add image_block serialization suitable for a SPA, i.e. return path, not the internal id of an image 2018-08-16 15:00:37 +02:00
Pawel Kowalski 4b03a702fe Provide first working version of content block stream content generation 2018-08-16 13:35:39 +02:00
Pawel Kowalski 6c7a1c9a7b Fall back to plain vanilla char blocks because test data generation is not sophisticated enough for RichtTextBlocks 2018-08-16 13:17:43 +02:00
Pawel Kowalski cd1c056cb7 generating test data 2018-08-16 13:10:09 +02:00
Pawel Kowalski 051796a34f Add ContentBlockFactories and test data 2018-08-16 00:07:08 +02:00
Ramon Wenger 0c31f838f2 Change variable names in content blocks 2018-08-15 18:45:20 +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 ca6c5742b4 Add contents to the content panels of the content block 2018-08-15 11:23:17 +02:00
Pawel Kowalski ca294b7836 Cleaned skillbox urls 2018-08-15 11:04:07 +02:00
Pawel Kowalski 74e67e925e Add childpage types for module 2018-08-15 10:54:31 +02:00
Ramon Wenger c4ba21aedd Add subpage types to chapter 2018-08-15 10:49:46 +02:00
Ramon Wenger 4650fecfc7 Add content block model 2018-08-15 10:46:07 +02:00
Ramon Wenger bdeda1428c Update dummy data with html tags 2018-08-14 18:44:41 +02:00
Pawel Kowalski 784083cfe4 intro instead of description 2018-08-14 16:54:16 +02:00
Pawel Kowalski e3ee972530 Adds graphql interface to objectives 2018-08-14 16:26:39 +02:00
Pawel Kowalski 1341589f89 Add testdata generation for objectives, optimize imports 2018-08-14 16:14:13 +02:00
Pawel Kowalski 29499350c1 Add the objectives module 2018-08-14 14:43:16 +02:00
Pawel Kowalski 579d54c8c5 Adds objectives app to project 2018-08-14 14:43:16 +02:00
Pawel Kowalski e32f724dd9 Adds a skeleton for the news module 2018-08-09 18:47:00 +02:00
Pawel Kowalski 0a4fb5555a Und zurück 2018-08-09 16:46:32 +02:00
Pawel Kowalski 0dbd4821e6 Heroku auto deploy demo 2018-08-09 16:44:52 +02:00
Pawel Kowalski 57aa2398f9 No mutations so far 2018-08-09 16:14:14 +02:00
Pawel Kowalski 6de819b0b2 Removed unnecessary cors whitlable entry 2018-08-09 14:26:21 +02:00
Ramon Wenger f2d9d18894 Remove nuxt from project 2018-08-09 14:20:33 +02:00
Ramon Wenger f7e994522c Fix static settings 2018-08-09 10:19:48 +02:00
Pawel Kowalski f11f57eb4e Adds a generic wagtail_parent_filter for django admin 2018-08-09 09:56:42 +02:00
Ramon Wenger 4e4c8768f3 Adjust static url 2018-08-08 18:59:47 +02:00
Ramon Wenger 14b06c809d Update static folder in settings 2018-08-08 18:09:02 +02:00
Pawel Kowalski 6cb6498cd8 Provide a topic filter for modules 2018-08-08 16:31:30 +02:00
Pawel Kowalski c6afb6ce91 Use real test data where available and mix with generated testdata where missing 2018-08-08 16:00:05 +02:00
Pawel Kowalski 739d89f37e Define real test data 2018-08-08 15:41:33 +02:00
Pawel Kowalski 623afa8d0d Add order parameter to module 2018-08-08 15:41:33 +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
Pawel Kowalski 91c81b13c0 implement a navigable book->topic->module query 2018-08-08 14:43:49 +02:00
Pawel Kowalski e21ba0a232 implement base model, factories, nodes 2018-08-08 11:41:39 +02:00
Pawel Kowalski 575e8e2bd7 upgrade wagtail version 2018-08-08 09:48:36 +02:00
Pawel Kowalski b379c6dd3d build 2018-08-07 23:41:30 +02:00
Pawel Kowalski c47537b1ba trigger build 2018-08-07 23:39:35 +02:00
Pawel Kowalski 2a942ea0cf comment aws settings 2018-08-06 23:46:22 +02:00
Pawel Kowalski 5dbef5a694 initial commit 2018-08-06 23:26:23 +02:00