Commit Graph

303 Commits

Author SHA1 Message Date
Ramon Wenger c7c406f0ba Add new activity page 2024-02-28 11:19:45 +01:00
Ramon Wenger 15e173221a Refactor highlight functions and helpers to reuse them with modules and
chapters
2024-02-28 11:14:45 +01:00
Ramon Wenger 848a4764d2 Remove debug info from component 2024-02-28 11:14:45 +01:00
Ramon Wenger 9112fb3fc8 Add more tests for the instrument highlights
Also refactor the existing tests, add a test which clicks the note icon
first, and refactor some of the existing highlight helpers
2024-02-28 11:14:45 +01:00
Ramon Wenger 2d46eedac1 Update client code to reflect highlight change
Add first highlight code to the instrument page
2024-02-28 11:14:45 +01:00
Ramon Wenger 8afe36e8ea Add cypress test for highlights 2024-02-28 11:14:45 +01:00
Ramon Wenger 9b813f113b Refactor some mutations 2024-02-28 11:14:45 +01:00
Ramon Wenger 2f6589680e Update the color in the sidebar when changing it in the popover
Resolves MS-866 #Complete
2024-02-28 11:14:45 +01:00
Ramon Wenger 2121f01a9c Make the highlight selection and the marking more robust
Also cover the case when there are paragraphs and unordered lists in the
same ContentComponent
2024-02-28 11:14:45 +01:00
Ramon Wenger 8ef3f23edc Complete highlights for list items 2024-02-28 11:14:45 +01:00
Ramon Wenger 56b973f02e Add highlights to nested content content-blocks
Also refactor the ContentListBlock component
2024-02-28 11:14:45 +01:00
Ramon Wenger f2c9ec04b8 Add delete mutation, flesh out update mutation for highlights 2024-02-28 11:14:45 +01:00
Ramon Wenger bf71faae3f Add Update Highlight mutation stub 2024-02-28 11:14:45 +01:00
Ramon Wenger 57cac25c6f Add highlight content to sidebar 2024-02-28 11:14:45 +01:00
Ramon Wenger 2ffbd62e4f Fix wrong import syntax for mark.js 2024-02-28 11:14:45 +01:00
Ramon Wenger c180aa94f5 Show sidebar only after clicking some highlighted text 2024-02-28 11:14:45 +01:00
Ramon Wenger f2a9c9cdd9 Fix linting issues 2024-02-28 11:14:45 +01:00
Ramon Wenger ebbbca72c4 Refactor some styles 2024-02-28 11:14:45 +01:00
Ramon Wenger 2e61cfbed6 Add styling for different highlight colors
Also refactor the naming of the colors
2024-02-28 11:14:45 +01:00
Ramon Wenger 4f72c9564d Update highlights on cache change 2024-02-28 11:14:45 +01:00
Ramon Wenger 61d23945f7 Make dynamic components inside ContentComponent not load asynchronously
So they load right with the ContentComponent, otherwise we get
"stuttering", and the contents are not ready to be highlighted without a
timeout
2024-02-28 11:14:45 +01:00
Ramon Wenger 9213d57be5 Add highlight query to client 2024-02-28 11:14:45 +01:00
Ramon Wenger a6974853ef Refactor ContentComponent 2024-02-28 11:14:45 +01:00
Ramon Wenger 99ce0ab84d Add uuid to content component 2024-02-28 11:14:45 +01:00
Lorenz Padberg 87d807f142 Fix typo 2023-08-30 14:59:04 +02:00
Lorenz Padberg 020c4846c4 Fix comments from PR 2023-08-30 14:24:12 +02:00
Ramon Wenger 94b9b5f03b Add optional chaining operator to selectedClass access calls 2023-07-27 17:46:35 +02:00
Ramon Wenger 3f308d9a32 Update matomo event names
Relates to MS-732
2023-06-29 15:47:06 +02:00
Ramon Wenger f3d723838e Adjust size of instruction block text and icon
Resolves MS-722 #complete
2023-05-16 17:55:37 +02:00
Ramon Wenger 2bbf96b77c Change spacing for subtitles
Resolves MS-713 #complete
2023-05-15 17:29:32 +02:00
Ramon Wenger 6e409fa0f0 Fix margins after and before titles
Resolves MS-713 #complete
2023-05-10 16:27:03 +02:00
Ramon Wenger 92f9831cc1 Migrate another component to use correct event emitting 2023-04-19 10:07:31 +02:00
Ramon Wenger d910d68824 Migrate webpack env variables to vite 2023-04-17 14:59:21 +02:00
Ramon Wenger 1134ea9679 Add extensions for .vue and .gql files 2023-04-13 23:03:41 +02:00
Ramon Wenger 9759a64069 Update CSS import 2023-04-13 16:35:56 +02:00
Daniel Egger b27e13fa12 Fire matomoTrackEvents not in then but before 2023-04-05 12:18:44 +02:00
Daniel Egger 0c5f2dc522 MS-628: First version of custom matomo integration 2023-03-28 16:59:25 +02:00
Ramon Wenger 9fada87a56 Re-enable documents in assignment submission form 2023-03-02 14:43:42 +01:00
Ramon Wenger 7ee322ec20 Fix a bug with adding room entries in module rooms
Resolves MS-656 #complete
2023-02-23 16:50:25 +01:00
Ramon Wenger bfeeb232d3 Fix build step with workaround 2023-02-20 14:38:05 +01:00
Ramon Wenger 3c0f5944cc Refactor component 2023-02-16 16:50:09 +01:00
Ramon Wenger 46d42eb279 Fix small router bug 2023-02-14 15:24:12 +01:00
Ramon Wenger 0bfc4f9bcb Apply prettier on project again 2023-02-07 14:31:26 +01:00
Ramon Wenger c879c074dc Fix async import 2023-02-07 14:23:39 +01:00
Ramon Wenger a52671fd40 Upgrade code according to migration guide for Vue 3
Update npm dependencies

Update vue router version

Disable validation temporarily

Specify property

Update dependencies

Update store to v4

Update async component definitions

Update some event emitters

Update tiptap vue version

Implement some router changes for v4

Remove obsolete tag attributes

Update dependencies

Fix some cypress tests

Fix most jest tests

Fix some more cypress tests

Fix school class cypress test

Fix another cypress test

Disable failing test temporarily

Fix validation

Fix error messages for validation

Fix e2e test for beta login page

Apply prettier
2023-02-07 13:38:51 +01:00
Ramon Wenger 4b55f8952c Fix deep-selectors 2023-02-02 14:36:08 +01:00
Ramon Wenger 39e7d27587 Update async component definitions 2023-01-26 16:37:06 +01:00
Ramon Wenger 6cf9457dca Update vue router version 2023-01-26 16:29:37 +01:00
Ramon Wenger 9a91aaf47c Apply prettier to whole project 2023-01-12 15:58:59 +01:00
Ramon Wenger b0a7bd3497 Fix imports, deprecated SCSS code 2022-11-10 12:03:53 +01:00
Ramon Wenger ef4b1356ac Fix styling bug when editing a text block 2022-10-20 10:42:05 +02:00
Ramon Wenger 1149892735 Force infogram iFrame to resize 2022-09-29 14:09:20 +02:00
Ramon Wenger c23830ff40 Mark new technical debt with some todo comments 2022-09-15 16:16:25 +02:00
Ramon Wenger feef4f09b1 Style instruments dynamically
Resolves MS-479
2022-09-15 16:06:04 +02:00
Ramon Wenger 7fae655543 Add documents to client view 2022-09-08 12:28:37 +02:00
Ramon Wenger c27fc9200b Merged in release/mobile-improvements-july-2022 (pull request #116)
Release/mobile improvements july 2022

Approved-by: Lorenz Padberg
2022-08-29 10:42:55 +00:00
Lorenz Padberg 70ab28012b Fix jshint warning 2022-08-09 10:37:33 +02:00
Lorenz Padberg 21413b183a Merge branch 'feature/MS-540-use-custom-document-model' into release/Wagtail-anpassungen 2022-08-03 11:13:34 +02:00
Lorenz Padberg cc9efd216b Show display_text property in frontend 2022-08-02 15:54:03 +02:00
Lorenz Padberg a299ac5bcd Fix bottom spacing cms_document block and image_block 2022-07-28 16:31:13 +02:00
Lorenz Padberg dd57e9c4da Fix html classes in cms-document-block 2022-07-26 11:03:45 +02:00
Lorenz Padberg c679f84236 Add cms-document-block to api and frontend 2022-07-25 18:24:34 +02:00
Ramon Wenger 24d8d48a05 Fix assignment update function to not mutate an immutable property 2022-07-15 16:35:09 +02:00
Ramon Wenger 193614872d Update and rename test, hide assignment input on mobile
Relates to MS-534
2022-07-15 16:34:18 +02:00
Ramon Wenger bf850198f7 Display list items correctly in text blocks
Resolves MS-486
2022-07-11 15:36:36 +02:00
Ramon Wenger ff7e5ad1f6 Merged in feature/rooms-updated-edit-fields-MS-486-MS-487 (pull request #111)
Feature/rooms updated edit fields MS-486 MS 487

Approved-by: Lorenz Padberg
2022-07-11 13:26:51 +00:00
Ramon Wenger deb2a2cd1b Add test for subtitle in room entry, add missing block
Resolves MS-487
2022-07-06 11:00:22 +02:00
Ramon Wenger 9076eb462f Add styling for lists in assignments
Also, refactor some code

Relates to MS-518
2022-06-20 15:53:59 +02:00
Ramon Wenger 4ad31b4654 Update styling of new rich text assignments
Relates to MS-518
2022-06-20 15:41:12 +02:00
Ramon Wenger 5af06069e8 Allow html tags for survey solutions, add sanitizer
Resolves MS-500
2022-05-19 12:42:27 +02:00
Daniel Egger d7eaced895 Refactor from flavor mixin to ES6 module and plugin 2022-05-11 13:24:36 +02:00
Daniel Egger 77c355d569 MS-474: Add myKV-specific terms 2022-05-11 13:24:35 +02:00
Ramon Wenger 86591cd69b Change content block rendering of single list items, refactor code 2022-02-15 17:42:37 +01:00
Ramon Wenger 1112c6754e Add subtitle block to user content block form 2022-02-03 16:24:46 +01:00
Ramon Wenger b775d857a6 Update document block margin 2022-02-02 17:01:35 +01:00
Ramon Wenger 228def84b4 Fix styling bug in text element 2022-02-01 17:10:32 +01:00
Ramon Wenger 51fddbdf60 Move edit mode to local GraphQL property of module node 2022-01-31 18:24:03 +01:00
Ramon Wenger e1d3897e5e Clean up code, sanitize some inputs 2022-01-31 14:15:35 +01:00
Ramon Wenger 57704d7fc2 Refactor bookmark actions 2022-01-28 00:03:36 +01:00
Ramon Wenger 457c59cbc4 Clean up code 2022-01-26 20:49:31 +01:00
Ramon Wenger 7da98d9ae7 Clean up code 2022-01-26 20:04:51 +01:00
Ramon Wenger c4195916a7 Lint some more code 2022-01-19 11:56:20 +01:00
Ramon Wenger 50cb811f05 Refactor styling of nested content lists 2022-01-19 11:23:13 +01:00
Ramon Wenger bc0918876b Update usage of new component 2022-01-13 22:29:15 +01:00
Ramon Wenger 5b548e9d6a Refactor content component form 2022-01-13 22:03:42 +01:00
Ramon Wenger db35d407ca Refactor content list component 2022-01-13 10:44:09 +01:00
Ramon Wenger 40ab4243b8 Split code into more bandwidth-friendly chunks 2021-12-22 10:37:43 +01:00
Christian Cueni bb244d1f17 Style text in lists in solutions correctly 2021-11-29 12:55:36 +01:00
Christian Cueni b0aed1ca74 Add type to parent if missing 2021-11-16 11:55:57 +01:00
Ramon Wenger b4f11fa29b Add buttons to project entry form 2021-10-05 22:54:40 +02:00
Ramon Wenger df0f093b05 Add new emoji bar and some tests for it 2021-08-19 16:34:13 +02:00
Ramon Wenger a6c483c67c Update spell check cypress test 2021-08-03 17:32:12 +02:00
Ramon Wenger 26cda08d94 Add read only on a per school class basis to assignments 2021-07-30 17:54:46 +02:00
Ramon Wenger ecba2e3e3e Fix cypress tests 2021-07-08 15:49:18 +02:00
Ramon Wenger 1d66cc86be Fix naming 2021-07-07 16:02:12 +02:00
Ramon Wenger 949f656079 Make assignments read only in client 2021-07-05 13:14:03 +02:00
Ramon Wenger e4bb4cc9ee Add tests for read only assignments 2021-07-01 16:58:56 +02:00
Ramon Wenger f1db43a092 Turn instrument button into a link 2021-06-06 19:21:40 +02:00
Ramon Wenger 293bdd84ce Fix frontend tests 2021-05-17 14:17:10 +02:00
Ramon Wenger 3a64a11ea8 Refactor some file locations 2021-05-03 11:15:20 +02:00