Commit Graph

1305 Commits

Author SHA1 Message Date
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 e2f283ba71 Add new postcss mixin 2024-02-28 11:14:45 +01:00
Ramon Wenger f2a9c9cdd9 Fix linting issues 2024-02-28 11:14:45 +01:00
Ramon Wenger eaca8f32e4 Experiment with overflowing text and ellipses 2024-02-28 11:14:45 +01:00
Ramon Wenger ebbbca72c4 Refactor some styles 2024-02-28 11:14:45 +01:00
Ramon Wenger d6860154f7 Add initial component for highlight sidebar, with styling but without logic 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 f41b43aa70 Add mutation for adding highlights to client also 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 4584cb860e Fix some typing issues 2024-02-28 11:14:45 +01:00
Ramon Wenger 99ce0ab84d Add uuid to content component 2024-02-28 11:14:45 +01:00
Ramon Wenger b83d9b9faa Add events to popover component and handlers for them 2024-02-28 11:14:45 +01:00
Ramon Wenger 6e85b3a9dc Reformat, refactor some code and fix some linting errors 2024-02-28 11:14:45 +01:00
Ramon Wenger 41b2357bf6 Add some styling and dynamic postioning to new popover service 2024-02-28 11:14:44 +01:00
Ramon Wenger 109ab958fc Add some initial code for the popover service 2024-02-28 11:14:44 +01:00
Ramon Wenger 2953ea4c8e Refactor some code 2024-02-28 11:14:44 +01:00
Ramon Wenger 6f1b0dfefd Move the selection from the directive to the component 2024-02-28 11:14:44 +01:00
Ramon Wenger 1927036610 Update and add to GraphQL typing in client and on server 2024-02-28 11:14:44 +01:00
Ramon Wenger 98d413171c Remove example code 2024-02-28 11:14:44 +01:00
Ramon Wenger 50b19c6405 Add proof of concept component to module, start a little refactor 2024-02-28 11:14:33 +01:00
Ramon Wenger 485e07067b Add new directive responsible for saving selections 2024-02-28 11:06:20 +01:00
Ramon Wenger 8e556399fa Add old proof of concept code 2024-02-28 11:06:20 +01:00
Lorenz Padberg d0bceda44e Remove Lernziele title for skillbox 2024-02-14 11:34:59 +01:00
Lorenz Padberg a07f2aab4f Merged in feature/MS851-MigrateSnapshots (pull request #143)
Feature/MS851 MigrateSnapshots

Approved-by: Ramon Wenger
2024-02-13 10:40:42 +00:00
Lorenz Padberg 95cf48717c Move show-objectives to computed properties 2024-02-13 11:15:54 +01:00
Ramon Wenger b0e8d011f1 Merge branch 'hotfix/srf-video-embed-MS-865' into develop 2024-02-08 17:39:48 +01:00
Ramon Wenger 9c525f3040 Replace SRF embed URL
Also add some tests to test correctness of the URL generation and also
the iframe src
2024-02-08 17:37:04 +01:00
Ramon Wenger a6fdb2d0b0 Add a test for the "Toggle Solutions" page
Also do some refactoring to support it
2024-02-07 19:18:33 +01:00
Ramon Wenger f0a8b8f835 Migrate Checkbox component to setup syntax 2024-02-07 15:14:20 +01:00
Ramon Wenger 0b0f262b62 Merge branch 'hotfix/toggle-solutions-checkbox' into develop 2024-02-07 14:58:31 +01:00
Ramon Wenger 4005e0239f Fix an issue with solutions setting in module not updating in cache
Resolves MS-862 #Complete
2024-02-07 14:57:03 +01:00
Lorenz Padberg ce7ab55cba Fix visiblity of old objectives 2024-02-07 12:04:22 +01:00
Lorenz Padberg 0631b42867 Add tests for objectives migration 2024-02-06 17:13:22 +01:00
Lorenz Padberg 106bad4c52 Fix linting error 2024-02-05 10:51:07 +01:00
Lorenz Padberg 13e9c2d9ae Merged in feature/MS-747-TestforInstrumentFilters (pull request #139)
Feature/MS-747 TestforInstrumentFilters

Approved-by: Ramon Wenger
2024-01-17 15:46:45 +00:00
Ramon Wenger 64d86b688c Remove test specific changes to vue code and skip test 2024-01-17 16:44:12 +01:00
Lorenz Padberg 8b80a12516 Fix naming on radio-button 2023-12-20 11:32:18 +01:00
Ramon Wenger 8b080abe20 Add save check, refactor component
Resolves MS-785
2023-12-14 14:16:01 +01:00
Lorenz Padberg 033157b1c8 Add language filter test 2023-12-13 10:47:14 +01:00
Lorenz Padberg 0943a49f25 Add test filter by title 2023-12-12 15:54:16 +01:00
Ramon Wenger fd7ba5d300 Fix linting errors 2023-12-06 16:43:50 +01:00
Ramon Wenger 93bb7f4473 Update TipTap to not use a beta version anymore 2023-12-05 15:58:27 +01:00
Ramon Wenger 3cb566c599 Fix bug on snapshot detail page 2023-10-17 13:32:40 +02:00
Ramon Wenger b700931a8b Fix bug on snapshot overview page 2023-10-17 13:27:11 +02:00
Ramon Wenger 67c8511d50 Fix bug with Toggle component after disabling Vue3 compat-mode 2023-10-11 21:04:14 +02:00
Ramon Wenger f7546a68f4 Fix bug with activity links to submissions
Resolves MS-817 #complete
2023-10-09 16:30:48 +02:00
Ramon Wenger 4667465b9c Fix a bug with module bookmarks and one with instrument bookmarks 2023-09-21 14:42:56 +02:00
Ramon Wenger c721dc26aa Fix numbering issue on topic navigation
Resolves MS-810 #complete
2023-09-21 12:06:02 +02:00
Lorenz Padberg 55b9644f2a Add disable language filter to module filter 2023-09-13 17:38:44 +02:00
Lorenz Padberg a271fb54be Add loading skeleton to instruments 2023-09-13 13:23:54 +02:00
Lorenz Padberg d3f2d10427 Make Dorpdowns wider for longer texts 2023-09-13 11:38:03 +02:00
Lorenz Padberg da4eb0112e Refactor Module teaser Limit texts to two lines 2023-09-13 11:34:20 +02:00
Lorenz Padberg a0086a8010 Merge branch 'hotfix/MS-792-MeineAkivitäten' into develop
# Conflicts:
#	client/src/components/ui/InfoMessage.vue
#	client/src/styles/_variables.scss
2023-09-08 11:26:24 +02:00
Lorenz Padberg bfc37c767c Fix linting 2023-09-08 10:04:31 +02:00
Lorenz Padberg bc715a937f Add loading message to activities and refactor the module and intrument activities 2023-09-08 10:00:17 +02:00
Lorenz Padberg 595332825a add loading spinner 2023-09-08 09:22:11 +02:00
Lorenz Padberg 896837ccf4 Make font smaller - otherwise code is displayed as SH-BU82 instead of SHBU82 2023-09-07 11:38:30 +02:00
Lorenz Padberg b62211a5b4 Fix content blocks, notes, and chapters. 2023-09-06 16:31:24 +02:00
Lorenz Padberg a5dbddf60a Merge branch 'develop' into feature/Fix-ui 2023-09-05 12:02:35 +02:00
Lorenz Padberg 058bdaf3cc Fix Instruments filter bar responsive 2023-09-05 11:54:59 +02:00
Lorenz Padberg 0f82134c81 Add App flavor to show topic numbering. 2023-09-04 11:41:56 +02:00
Ramon Wenger 3780008146 Satisfy linter 2023-08-31 16:04:39 +02:00
Ramon Wenger 4cde2febe0 Make topic page responsive
Resolves MS-791 #complete
2023-08-31 15:37:31 +02:00
Ramon Wenger f07b631817 Add fragment to client mutation
Also remove now unneeded update function, and leave in some commented out code to be
extracted later
Resolves MS-788 #complete
2023-08-31 15:00:43 +02:00
Ramon Wenger e6dbe06ca9 Remove outline from filter input
Relates to MS-787
2023-08-31 12:02:37 +02:00
Ramon Wenger b3ced207cc Add feature flag for language filter in client
Resolves MS-786 #complete
2023-08-30 22:16:12 +02:00
Lorenz Padberg 87d807f142 Fix typo 2023-08-30 14:59:04 +02:00
Lorenz Padberg d059a4d82a Add flavor for showModuleFilters 2023-08-30 14:33:54 +02:00
Lorenz Padberg 020c4846c4 Fix comments from PR 2023-08-30 14:24:12 +02:00
Lorenz Padberg acbb8b7517 Add NoModules and NoIntruments texts when filter leads to no result. 2023-08-30 11:13:43 +02:00
Lorenz Padberg b24c5419f1 Add module Filter category or level == null -> belongs to all 2023-08-30 09:28:58 +02:00
Lorenz Padberg de4737fa3f Fix linter error 2023-08-30 09:28:58 +02:00
Lorenz Padberg 2246e9ca3c Add language filter to instruments 2023-08-30 09:28:58 +02:00
Lorenz Padberg 6de2cc3ff0 Fix a few linter errors 2023-08-30 09:28:58 +02:00
Lorenz Padberg 6f9340192b Set focus to search bar 2023-08-30 09:28:58 +02:00
Lorenz Padberg cf36184e1c Add feature flag to show intrument Subcategories 2023-08-30 09:28:58 +02:00
Lorenz Padberg ce645001a1 Add filter function 2023-08-30 09:28:58 +02:00
Lorenz Padberg 77aede3948 Add Search Icon 2023-08-30 09:28:58 +02:00
Lorenz Padberg 0297d49e0c Refactoring 2023-08-30 09:28:58 +02:00
Lorenz Padberg 7298f443e9 Add FilterBar component to Instruments page 2023-08-30 09:28:58 +02:00
Ramon Wenger 9837686319 Refactor code and fix some styling issues
Relates to MS-781
2023-08-28 17:47:18 +02:00
Ramon Wenger c2b8bc1762 Integrate language into module filter 2023-08-24 19:49:09 +02:00
Ramon Wenger 81b2b41979 Add frontend language setting to local cache
Relates to MS-758
2023-08-24 12:29:54 +02:00
Lorenz Padberg 0ae86202c7 Merged in feature/MS743-ModuleCategorization (pull request #131)
Feature/MS743 ModuleCategorization

Approved-by: Ramon Wenger
2023-08-24 08:40:04 +00:00
Lorenz Padberg be18b2c4c7 Fix bug in mutation 2023-08-23 16:24:45 +02:00
Lorenz Padberg bb54aeb145 Refactoring according to Puillrequest comments 2023-08-23 14:44:51 +02:00
Lorenz Padberg 1d9290a688 Fix linter errors 2023-08-22 15:11:13 +02:00
Lorenz Padberg 990b92139f Add database migrations 2023-08-22 15:05:10 +02:00
Lorenz Padberg 322e0278f6 Fix loading bug 2023-08-22 14:08:18 +02:00
Lorenz Padberg 52bc017ba5 Refactoring 2023-08-22 14:04:47 +02:00
Lorenz Padberg 5cd1876f31 Add filter attribute type "Alle Lehrjahre" 2023-08-21 16:06:29 +02:00
Lorenz Padberg 8444a48c26 Fix typo 2023-08-21 15:21:04 +02:00
Lorenz Padberg 807c038a34 Rename ModuleCategoryType to ModuleCategory 2023-08-21 15:17:52 +02:00
Lorenz Padberg 0b1954c570 Rename ModuleCategory -> ModuleLevel 2023-08-21 14:22:28 +02:00
Lorenz Padberg 0648497d50 Refactoring Move PillRadioButtons and Dropdown to ui components 2023-08-21 10:50:26 +02:00
Lorenz Padberg 040064c68b Add PillRadioButton component 2023-08-18 10:44:11 +02:00
Lorenz Padberg cc060b66db Add Styling 2023-08-17 12:47:57 +02:00
Lorenz Padberg 5fd408a080 Add dropdown component 2023-08-17 12:00:55 +02:00
Ramon Wenger 3526b6d6b2 Merge branch 'hotfix/help-text-join-class' into develop 2023-08-16 10:56:22 +02:00
Ramon Wenger c4044d9131 Move help text to correct location 2023-08-16 10:54:33 +02:00
Lorenz Padberg 6d312da0ae Add Category Pills to Module 2023-08-15 16:36:47 +02:00
Lorenz Padberg 475afd03ed Store LastModuleCategory with the user 2023-08-15 16:36:47 +02:00
Lorenz Padberg f60f0d68da Filter Modules by Id 2023-08-15 16:36:47 +02:00
Lorenz Padberg aa095ac7ea Create ModuleFilters dynamically 2023-08-15 16:36:47 +02:00
Lorenz Padberg e99c703f55 Add Category and CategoryType to module 2023-08-15 16:36:47 +02:00
Lorenz Padberg 38c9b7623d Move modules to modules filter 2023-08-15 16:36:47 +02:00
Lorenz Padberg a06f7af44a add modules to list 2023-08-15 16:36:47 +02:00
Lorenz Padberg 631290722b Add first version of module filter component 2023-08-15 16:36:47 +02:00
Ramon Wenger 3c7ad2e2f3 Remove unnecessary fragment parts 2023-08-10 16:17:21 +02:00
Ramon Wenger bc86e99cf7 Fix code errors 2023-08-08 22:23:54 +02:00
Ramon Wenger 46ad200f1e Update components and query definition to fix cypress test 2023-08-08 22:23:54 +02:00
Ramon Wenger 36b60c6a2e Add graphql codgen and refactor some code
Use unique names for all queries and fragments and mutations
2023-08-08 22:23:49 +02:00
Ramon Wenger 754e67b06b Fix linting error 2023-07-27 19:11:47 +02:00
Ramon Wenger 5dd7958334 Merge branch 'hotfix/selected-class-type-error' into develop 2023-07-27 17:49:03 +02:00
Ramon Wenger 94b9b5f03b Add optional chaining operator to selectedClass access calls 2023-07-27 17:46:35 +02:00
Ramon Wenger 526faac179 Refactor module query in one component 2023-07-27 17:10:28 +02:00
Ramon Wenger e726dcc073 Remove debug logs, refactor some problematic code 2023-07-27 15:40:23 +02:00
Ramon Wenger fcc38047b1 Remove explicit support link property
Change support link to dynamic href using base url environment variable

Resolves MS-730 #complete
2023-07-19 12:09:06 +02:00
Lorenz Padberg e9ed895d0a Revert "Fix "Deaktivieren" "Verlassen" unreadable text."
This reverts commit 6eb6a97919.
2023-07-18 11:17:53 +02:00
Lorenz Padberg 6eb6a97919 Fix "Deaktivieren" "Verlassen" unreadable text. 2023-07-12 17:25:30 +02:00
Ramon Wenger 3f308d9a32 Update matomo event names
Relates to MS-732
2023-06-29 15:47:06 +02:00
Ramon Wenger 13b6ec8741 Fix overflow bug
Resolves MS-729 #complete
2023-06-26 17:00:33 +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 d25e133618 Add margin after solution on assignment submissions page
Resolves MS-721 #complete
2023-05-16 17:48:32 +02:00
Ramon Wenger acf32f624b Fix icon colors
Resolves MS-717 #complete
2023-05-16 16:37:34 +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 a25296d3d3 Merge branch 'feature/vite-vue3' into develop 2023-05-08 16:14:06 +02:00
Ramon Wenger 29c4d8f236 Update text for 'clear filter' link to be different depending on flavor 2023-04-20 16:53:27 +02:00
Ramon Wenger d30e216647 Fix typo in CSS 2023-04-20 11:21:39 +02:00
Ramon Wenger b39d610dbc Migrate another component 2023-04-20 11:16:50 +02:00
Ramon Wenger 8cbe498a78 Fix another component's events 2023-04-19 17:09:20 +02:00
Ramon Wenger c3fccd6cce Fix events in another component 2023-04-19 15:56:27 +02:00
Ramon Wenger 4df91e7372 Fix events for ChooserElement 2023-04-19 15:23:06 +02:00
Ramon Wenger 92f9831cc1 Migrate another component to use correct event emitting 2023-04-19 10:07:31 +02:00
Ramon Wenger d7ab92af02 Fix another input event handler 2023-04-18 17:15:00 +02:00
Ramon Wenger 588d92283e Fix modal input event handling 2023-04-18 16:46:17 +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
Ramon Wenger 6a506278ad Replace symbol with correct HTML code 2023-04-13 14:26:13 +02:00
Daniel Egger a98935a87f Merged in feature/ms-628-metrics (pull request #126)
MS-628: First version of custom matomo integration

Approved-by: Ramon Wenger
2023-04-12 19:00:04 +00:00
Ramon Wenger dd511681ac Change wording
Fixes MS-689 #complete
2023-04-06 22:06:42 +02:00
Ramon Wenger 264f0abc27 Merge branch 'hotfix/duplicate-and-delete-content-blocks-cachee' into develop 2023-04-06 12:38:37 +02:00
Ramon Wenger 46574d6375 Fix cache update issue when duplicating or deleting content block 2023-04-06 12:37:16 +02:00
Daniel Egger b27e13fa12 Fire matomoTrackEvents not in then but before 2023-04-05 12:18:44 +02:00