Commit Graph

754 Commits

Author SHA1 Message Date
Ramon Wenger e94573cd09 Format matrix solutions in a more readable way 2020-10-07 11:22:15 +02:00
Ramon Wenger efd1c7e8f7 Force correct order and newlines for matrix solutions 2020-10-05 15:07:16 +02:00
Ramon Wenger 76b14e3cc8 Add intro to instruments 2020-09-29 13:56:17 +02:00
Christian Cueni 5057e54e4d Merged in hotfix/typos (pull request #75)
Hotfix/typos
2020-09-28 16:56:40 +00:00
Ramon Wenger ab989d15a7 Add more spacing on start page 2020-09-28 14:54:35 +02:00
Christian Cueni 33bd20d44b Fix typos 2020-09-28 14:18:21 +02:00
Ramon Wenger bb50fc75a0 Add button with loading spinner component 2020-08-04 11:31:32 +02:00
Ramon Wenger 6360f1950a Add loading button component 2020-08-04 10:33:49 +02:00
Ramon Wenger b0b46e12b0 Add 404 page with styling 2020-08-04 10:33:28 +02:00
Ramon Wenger 16c587ea59 Clean up semicolons 2020-08-03 14:35:25 +02:00
Ramon Wenger 5332e60dba Change some wording, fix typos 2020-07-22 11:36:10 +02:00
Ramon Wenger f8458b8139 Add onboarding cypress test, fix join class procedure 2020-07-10 16:46:10 +02:00
Ramon Wenger c50aa19f94 Add new schema, fix cypress tests 2020-07-10 10:12:27 +02:00
Ramon Wenger f588abee43 Add onboarding visited flag to user 2020-07-07 22:31:25 +02:00
Ramon Wenger 5778f98448 Replace illustrations 2020-07-07 16:27:18 +02:00
Ramon Wenger e6fe2397b7 Add onboarding sub-pages 2020-07-07 15:49:01 +02:00
Ramon Wenger 62338a5ddb Add onboarding page with first layout implementation 2020-07-07 09:42:29 +02:00
Ramon Wenger 44e7e4c322 Clean up code 2020-07-02 12:32:44 +02:00
Ramon Wenger 10cc8ca3ba Add new test scenario and fix it 2020-07-02 11:12:00 +02:00
Ramon Wenger 240fcf0795 Display text when no modules have been visited by the user 2020-07-01 11:33:15 +02:00
Ramon Wenger f4f9b7c1a1 Refactor and update news teasers on start page 2020-06-30 18:05:45 +02:00
Ramon Wenger 841b75e0db Add cypress test for new start page 2020-06-29 16:54:52 +02:00
Ramon Wenger 943ac76859 Archive old start page 2020-06-29 16:39:44 +02:00
Ramon Wenger feb6a87888 Show recent modules on start page 2020-06-25 15:19:42 +02:00
Ramon Wenger 991efbe613 Remove 'forgot password' link 2020-06-22 10:47:26 +02:00
Ramon Wenger da5bd1e439 Merged in feature/save-last-topic (pull request #67)
Save last topic and go there on topic navigation

Approved-by: Christian Cueni
2020-06-18 14:08:18 +00:00
Ramon Wenger b5fbc562b5 Clean up code 2020-06-18 11:54:02 +02:00
Christian Cueni d6e8db5f99 Make linter happy 2020-06-17 14:38:49 +02:00
Christian Cueni e07e0a199a Merge branch 'develop' of bitbucket.org:iterativ/skillbox into develop 2020-06-17 14:22:31 +02:00
Christian Cueni 1b4a0da2e1 Merged in feature/news (pull request #65)
Feature/news

Approved-by: Ramon Wenger
2020-06-17 11:53:45 +00:00
Ramon Wenger 0080cf283e Fix linting errors 2020-06-16 16:40:19 +02:00
Ramon Wenger c6bdae3fd3 Save last topic and go there on topic navigation 2020-06-16 16:29:41 +02:00
Christian Cueni b64bd5b614 Merge branch 'develop' of bitbucket.org:iterativ/skillbox into develop 2020-06-16 13:51:31 +02:00
Christian Cueni 49cd6e590f Remove trailing comma 2020-06-16 13:18:24 +02:00
Christian Cueni 1d60a76760 Use correct property 2020-06-04 13:22:17 +02:00
Christian Cueni 17d3978c46 Fix registration tests 2020-06-04 13:21:30 +02:00
Christian Cueni 3f8c604a0c Remove migrations, rename html properties 2020-06-04 13:20:30 +02:00
Christian Cueni a4ac9d57cb Update tests 2020-06-04 13:19:17 +02:00
Christian Cueni 20a6290eb9 Update copy 2020-06-04 13:19:17 +02:00
Christian Cueni d9fd4dac35 Enforce terms in proxy 2020-06-04 13:19:17 +02:00
Christian Cueni 012ff7c604 Add confirmation field 2020-06-04 13:19:17 +02:00
Ramon Wenger 9fedebd42c Update topic page 2020-06-04 13:02:19 +02:00
Ramon Wenger b5d9d6a998 Refactor handling of mobile view 2020-06-02 16:46:58 +02:00
Ramon Wenger 6d43226ebb Merge branch 'hotfix/lockdown-news' into develop 2020-05-27 18:09:45 +02:00
Ramon Wenger 8dfc862efb Add new news entry, remove old one 2020-05-27 18:07:53 +02:00
Ramon Wenger 7f118a9161 Fix eslint issues 2020-05-27 16:24:37 +02:00
Christian Cueni 12c5bf8d90 Format date, style source 2020-05-27 11:51:43 +02:00
Christian Cueni 8ce5401311 Add basic grid 2020-05-25 15:36:55 +02:00
Ramon Wenger 07059f63f4 Add missing ID 2020-05-25 14:45:23 +02:00
Ramon Wenger 38e99e4747 Add and fix some more rules 2020-05-25 14:19:12 +02:00
Ramon Wenger d6772bb3db Update linter rules and fix them 2020-05-25 14:19:12 +02:00
Christian Cueni 6933e10a7f Add news page, add field 2020-05-20 15:42:50 +02:00
Christian Cueni ce299e0f0e Merged in feature/licensing (pull request #50)
Feature/licensing
2020-05-12 11:37:17 +00:00
Christian Cueni d159876472 Rename input variable 2020-05-12 11:20:43 +02:00
Christian Cueni 47129e81a6 Clean up code 2020-05-12 10:59:22 +02:00
Christian Cueni 685fa3ff34 Use built-in graphql errors 2020-05-12 09:56:48 +02:00
Ramon Wenger bf3e2db7a9 Prevent overwrite bug in student submission feedback form 2020-05-07 17:23:50 +02:00
Ramon Wenger 6d5e66c469 Remove unused code 2020-05-07 12:25:41 +02:00
Ramon Wenger e60d88dcf0 Replace old instrument overview with new one 2020-05-06 16:52:22 +02:00
Christian Cueni a0733d1caf Remove unused page, fix password error display 2020-05-06 09:04:31 +02:00
Christian Cueni b222fc86e4 Style pages, remove no-class page 2020-05-06 08:37:30 +02:00
Christian Cueni 5be7428b70 Style links 2020-05-04 15:22:35 +02:00
Christian Cueni 6b76c27c55 Merge branch 'develop' into feature/licensing
# Conflicts:
#	client/config/dev.env.js
#	client/config/prod.env.js
#	client/cypress/fixtures/schema.json
#	client/cypress/integration/beta-login.spec.js
#	client/package-lock.json
#	client/src/graphql/client.js
#	client/src/layouts/PublicLayout.vue
#	client/src/main.js
#	client/src/styles/main.scss
#	server/core/settings.py
#	server/registration/mutations_public.py
#	server/users/factories.py
#	server/users/models.py
#	server/users/schema.py
2020-04-30 15:22:55 +02:00
Christian Cueni fd619ab47b Fix login error messages 2020-04-30 14:17:56 +02:00
Christian Cueni 0aa1625837 Update links, add group_id in customer 2020-04-30 12:16:24 +02:00
Christian Cueni 55f120f1ff Update links to shop 2020-04-30 10:54:00 +02:00
Christian Cueni ebc8d070f6 Remove error field from query 2020-04-30 09:12:36 +02:00
Christian Cueni d46cc7a177 Use remove error field, fix tests 2020-04-30 08:49:54 +02:00
Ramon Wenger a799160501 Update icon 2020-04-14 15:53:59 +02:00
Ramon Wenger 1e5c66fb64 Clean up code 2020-04-14 12:18:25 +02:00
Ramon Wenger 10078cde5f Parse answers from survey matrix 2020-04-14 10:43:27 +02:00
Ramon Wenger c1ac3e779f Add instructions to client 2020-04-10 21:28:39 +02:00
Ramon Wenger 2f6b66112c Add additional editor plugins for instrument WYSIWYG editor 2020-04-06 13:31:40 +02:00
Ramon Wenger e26c4b7093 Hide solutions on completed survey 2020-03-25 15:48:25 +01:00
Ramon Wenger 32e3c6067b Move modal to plugin 2020-03-25 12:58:53 +01:00
Ramon Wenger 4173fe70ab Add confirmation modal when deactivating users in school class 2020-03-24 16:16:13 +01:00
Ramon Wenger 4bd2c9c065 Add page to display the class code 2020-03-20 22:49:51 +01:00
Ramon Wenger 950fe9c60e Add "create class" view 2020-03-20 10:14:55 +01:00
Christian Cueni 0e52ab6f49 Clean up code 2020-03-17 14:20:06 +01:00
Christian Cueni 9617a1ee88 Revert "Use GraphQL for email available"
This reverts commit 24cccbf053.
2020-03-17 13:29:40 +01:00
Christian Cueni 24cccbf053 Use GraphQL for email available 2020-03-16 16:50:19 +01:00
Ramon Wenger 611a066c65 Add button to change the school class name 2020-03-14 11:27:16 +01:00
Ramon Wenger 8d5e9845e4 Fix cypress test 2020-03-11 13:44:40 +01:00
Ramon Wenger 3368d03ede Merge branch 'hotfix/news-entry' into develop 2020-03-11 11:47:51 +01:00
Ramon Wenger 24b66bbf9e Add new news entry 2020-03-11 11:47:02 +01:00
Ramon Wenger e6f852fdc4 Clean up code 2020-03-10 15:35:55 +01:00
Ramon Wenger 394469d773 Add new cypress test and fix old ones 2020-03-10 10:16:30 +01:00
Christian Cueni 5d614dd7e5 Fix minor issues 2020-03-09 16:22:56 +01:00
Christian Cueni e5b0fe539f Rename LocalLogin -> BetaLogin 2020-03-09 15:47:50 +01:00
Ramon Wenger 442bab19bc Add unit test for old classes query 2020-03-09 15:34:09 +01:00
Christian Cueni 59d5376f60 Handle native GraphQLErrors 2020-03-09 14:53:00 +01:00
Ramon Wenger 229c6b4d8b Add old classes view 2020-03-08 11:57:42 +01:00
Ramon Wenger f4270b8243 Remove actions in class list for students 2020-03-05 16:41:07 +01:00
Ramon Wenger 9dab0856e8 Remove and add members in client 2020-03-05 16:20:57 +01:00
Ramon Wenger a99a073460 Distinguish between active and inactive users in class list 2020-03-04 16:57:15 +01:00
Ramon Wenger b3457502d9 Change class list to display only currently selected class 2020-03-02 18:38:36 +01:00
Ramon Wenger fffbc47fde Change profile layout 2020-02-27 14:21:56 +01:00
Ramon Wenger c8449e7fe9 Fix some IE 10 issues 2020-02-27 14:01:13 +01:00
Christian Cueni d95e8ca492 Merge branch 'develop' into feature/licensing
# Conflicts:
#	Pipfile.lock
#	client/cypress/fixtures/schema.json
#	client/src/graphql/client.js
#	client/src/graphql/resolvers.js
#	client/src/graphql/typedefs.js
#	client/src/main.js
#	client/src/router/index.js
#	server/users/models.py
2020-02-27 10:29:24 +01:00
Christian Cueni 8f9750ebe8 Style beta login pages 2020-02-27 09:10:25 +01:00
Ramon Wenger 5054f21bc9 Update wording 2020-02-26 16:01:26 +01:00
Ramon Wenger 0ffe77b745 Add more data properties 2020-02-26 12:47:20 +01:00
Christian Cueni 5e77ee0cee Fix helloEmail, make linter happy 2020-02-26 12:44:41 +01:00
Ramon Wenger ee78a3229f Refactor mixins 2020-02-25 15:46:11 +01:00
Ramon Wenger a7413c6ce0 Merged in feature/multiple-classes-for-everyone (pull request #46)
Feature/multiple classes for everyone

Approved-by: Christian Cueni
2020-02-25 08:42:21 +00:00
Ramon Wenger 2e1d7b46bc Add error message and add styling 2020-02-24 18:32:55 +01:00
Ramon Wenger a59733b2f1 Add redirect after joining class 2020-02-24 16:23:55 +01:00
Christian Cueni f8fab82851 Finish coupon flow 2020-02-24 11:30:37 +01:00
Christian Cueni 1152f1fd95 Add forgot password page, add cancel button to login 2020-02-20 11:24:10 +01:00
Christian Cueni e9713c736b Redirect to hello, add redirect query param 2020-02-18 16:32:12 +01:00
Christian Cueni e067717d50 Fix local login 2020-02-18 16:01:20 +01:00
Christian Cueni 3c72c9559e Split token and local login 2020-02-18 14:36:49 +01:00
Christian Cueni 42d16caafc Allow coupon calls 2020-02-18 14:10:04 +01:00
Christian Cueni 26a342c5a5 Fix license verification flow 2020-02-18 13:32:17 +01:00
Ramon Wenger fb65e23f3d Update news links on start page 2020-02-18 10:24:17 +01:00
Christian Cueni 677d8dbf44 Fix login & tests 2020-02-18 10:05:07 +01:00
Christian Cueni c9c42e2296 Check user license in Api, save 2020-02-17 15:08:06 +01:00
Ramon Wenger d22a77e513 Update styling on join class page 2020-02-13 15:51:50 +01:00
Christian Cueni d5276d5adc Update and test front end email verification 2020-02-13 12:42:17 +01:00
Christian Cueni 909f7337ac Fix email verification for stage 2020-02-13 11:28:23 +01:00
Christian Cueni 82c1135f0e Add coupon call in frontend, add tests, fix api 2020-02-13 10:03:00 +01:00
Ramon Wenger 76fa510053 Update local school class cache after joining a class 2020-02-12 20:28:46 +01:00
Christian Cueni f5ddff12e3 Add email verification tests 2020-02-12 15:49:56 +01:00
Christian Cueni 6509b31ab5 Add registration tests 2020-02-12 13:37:36 +01:00
Ramon Wenger a4a5e37268 Add code to school class, add form and mutation to join class 2020-02-12 10:17:31 +01:00
Christian Cueni dd272757bf Add login tests 2020-02-11 16:47:21 +01:00
Christian Cueni 0922c5d198 Fix local signup, style header 2020-02-11 14:44:57 +01:00
Christian Cueni b36ba5f9a1 Add email verifcation page 2020-02-11 14:44:14 +01:00
Christian Cueni a0eeec4e18 Add extra fields to registration, remove unused fields 2020-02-11 14:44:14 +01:00
Christian Cueni 587d661ca8 Add hello page, add local mutation 2020-02-11 14:42:58 +01:00
Christian Cueni 1d50287dbf Add basic registration flow 2020-02-11 14:41:55 +01:00
Ramon Wenger 6688cedd7c Add initial cypress test for students to join classes 2020-02-10 15:42:22 +01:00
Ramon Wenger 66842ac1d8 Add instruments to the my activity page 2020-02-05 11:35:04 +01:00
Christian Cueni 113b1d8d9a Reset cache on logout, refactor logout 2020-01-22 08:43:01 +01:00
Ramon Wenger 5200d2165d Use slug to identify instruments on client 2020-01-16 10:44:37 +01:00
Ramon Wenger 2b40f81764 Add bookmark actions to instrument, implement instrument bookmark 2020-01-08 15:00:40 +01:00
Ramon Wenger 27b068e9ef Add news item 2019-12-24 22:23:58 +01:00
Ramon Wenger 32ae0b0641 Add filter for my activity 2019-12-19 14:19:20 +01:00
Ramon Wenger 64db0487ca Refresh my activities periodically 2019-12-19 11:35:47 +01:00
Ramon Wenger 9fb8e13c1c Enable scrolling to the content blocks in a module 2019-12-18 16:28:24 +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
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
Christian Cueni 84a69b24f1 Incoorperate feedback 2019-12-02 17:12:19 +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
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 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 e2f5c0b3f0 Fix copy, fix styles on server 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 81d89dae9a Change css names, refactor login guard 2019-10-23 08:33:37 +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 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 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
Ramon Wenger 23936ec6ae Fix bug where surveys don't retain answers without reloading 2019-09-12 09:08:16 +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 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 8993f3f72b Add new news entry, re-enable news footer 2019-09-06 15:53:09 +02:00
Ramon Wenger aeab246aee Add solutions to survey 2019-09-05 15:22:01 +02:00
Ramon Wenger 65663491b0 Add rudimentary answer display to survey page 2019-09-04 15:18:37 +02:00
Christian Cueni 29a0ec5aef Hide news 2019-08-14 13:31:21 +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
Ramon Wenger 99c39b1b69 Update and normalize meta title style 2019-07-31 15:31:27 +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
Christian Cueni deabbf328f Use UserMetaWidget 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
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 fa72d8f5b8 Add button to reopen survey 2019-07-24 15:22:53 +02:00
Ramon Wenger a4cf7a0d62 Add toggle for module editing 2019-07-23 16:04:23 +02:00
Ramon Wenger 062d799c4c Set locale on survey 2019-07-23 11:14:02 +02:00
Ramon Wenger eda5653477 Always display survey title from JSON, never from model 2019-07-22 11:36:08 +02:00
Ramon Wenger a9b10fdf88 Add radiobutton styling to survey 2019-07-18 14:55:46 +02:00
Christian Cueni cc55dbdf69 Fix subtitle and genially blocks in instruments 2019-07-17 15:11:43 +02:00
Ramon Wenger dae832b98d Add navigation to and from instrument overview 2019-07-17 11:20:01 +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 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 c5fea80ab4 Add single button file upload 2019-07-11 16:19:06 +02:00
Christian Cueni 707909761e Change default set for rich text, add blocks 2019-07-11 10:49:54 +02:00
Christian Cueni 695a9a8ccb Change grayscale, add border 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 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 f9642ff49e Get survey from server and display it dynamically 2019-06-27 17:55:07 +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 78e2e3ecc5 Add polling to rooms and portfolio pages 2019-05-15 18:21:04 +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
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 244f7405f6 Fix portfolio on mobile 2019-04-23 16:38:24 +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 6ae6a7cbdb clean up some copy and css 2019-04-16 08:22:23 +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
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 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 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
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
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 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
Christian Cueni ffc6332894 add edit project page 2019-03-28 08:42:37 +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
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 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 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 bce54d0f46 Fix initial data on start page 2019-03-01 15:26:18 +01:00
Ramon Wenger 10b35a5a3e Add last visited module to user 2019-03-01 11:19:43 +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 29c9ceb542 Add check for fetched module in module component 2019-02-14 18:54:37 +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 10841a69be Update cypress test 2019-01-31 16:47:27 +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 fc6cf0c0d9 Add new news item 2018-12-19 18:20:41 +01:00
Ramon Wenger d46d0dde0a Add mobile styling 2018-11-21 18:33:38 +01:00
Ramon Wenger 35f29cb00f Add second news entry 2018-11-20 17:32:42 +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 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 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 c536a04122 Add parts for room entry deletion 2018-10-29 18:54:34 +01:00
Ramon Wenger 7c3d19170d Add newlines to student submissions 2018-10-25 16:52:55 +02:00
Ramon Wenger 631a500dca Update styling 2018-10-25 13:55:12 +02:00
Ramon Wenger aea8beff49 Add navigation by basic knowledge slug 2018-10-25 13:53:13 +02:00
Ramon Wenger 4ad67a09b3 Add author to room entry 2018-10-24 15:34:52 +02:00
Ramon Wenger c0857dcb3f Add missing return statement 2018-10-24 15:19:01 +02:00
Ramon Wenger a90501d7e8 Clean up some more code 2018-10-24 15:15:48 +02:00
Christian Cueni 1591095553 Prevent students from adding new rooms, Verify room form 2018-10-24 08:40:30 +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 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 a410f74764 Fix grid layout 2018-10-20 12:44:49 +02:00
Ramon Wenger a7141c3ea0 Add topic slug to route params 2018-10-19 11:04:05 +02:00
Ramon Wenger febed9adc4 Fetch topic information from API 2018-10-19 10:36:31 +02:00
Ramon Wenger c81c7675b6 Add links to landing page 2018-10-16 18:17:14 +02:00
Ramon Wenger 3d0c9e4b93 Render room entry dynamically on article view 2018-10-11 14:09:09 +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 ace485bca2 Move assignment with submissions to own component 2018-10-08 16:56:25 +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
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
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
Ramon Wenger b5abc3c3a5 Add submission list page 2018-10-03 10:31:16 +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 1aec0662f4 Add room filter by class 2018-09-24 17:14:41 +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 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 0c2cab4c96 Re-use cache for modules 2018-09-18 19:38:48 +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
Pawel Kowalski 4cb5c6ad63 Add User query, get users in FilterBar, add Visibility node 2018-09-11 17:18:50 +02:00
Ramon Wenger 872eb6efa5 Fix typo 2018-09-11 15:53:09 +02:00
Ramon Wenger d6316fc328 Update module query after mutation 2018-09-11 15:09:55 +02:00
Ramon Wenger 8b15bc76e6 Add server data to room entries 2018-09-05 10:19:11 +02:00
Pawel Kowalski 5bdb427a17 Add contents to the room query 2018-09-04 15:01:06 +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 031e2a797d Add book and topic views including styling 2018-08-27 16:38:26 +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 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 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 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 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 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 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 71c339a40c Add room page and widgets 2018-08-21 14:37:15 +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 9c6e06c4a8 Add module navigation 2018-08-20 17:05:40 +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 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
Ramon Wenger 80b46a4781 Add dynamic components 2018-08-15 18:47:33 +02:00
Ramon Wenger 348de74dee Clean up query function 2018-08-15 14:45:44 +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
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 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 1efb11c4d6 Merge branch 'feature/no-nuxt' 2018-08-09 14:37:41 +02:00
Ramon Wenger 562fbca542 Change components to work without nuxt 2018-08-09 14:36:16 +02:00
Pawel Kowalski c98d525caa Adds example filtered query 2018-08-09 13:59:04 +02:00
Ramon Wenger 4a46feb4af Add first component 2018-08-08 17:31:19 +02:00
Ramon Wenger d884298413 Remove unused code 2018-08-08 15:38:37 +02:00