Commit Graph

1954 Commits

Author SHA1 Message Date
Ramon Wenger 370a391966 Remove shim, add correct type to tsconfig for vite 2024-03-12 15:59:37 +01:00
Ramon Wenger 10d28c73f4 Fix reference bug 2024-03-11 11:55:18 +01:00
Ramon Wenger a1f06f130e Fix elipses when text is overflowing in HighlightSidebar
Resolves MS-897 #complete
2024-03-11 11:53:00 +01:00
Ramon Wenger 7af5f07137 Add content to bookmark on Activity page
Resolves MS-903 #complete
2024-03-11 11:47:58 +01:00
Ramon Wenger 3cdbfa8abf Change topic label on "My Activities" page
Resolves MS-901 #complete
2024-03-11 09:38:47 +01:00
Ramon Wenger f44bf5cd85 Make whole activity entry clickable to jump to the entry
Relates to MS-900 #complete
2024-03-10 22:39:13 +01:00
Ramon Wenger 0c95117832 Add some tests, and fix the one for subtitles
Relates to MS-899 #complete
2024-03-10 21:56:50 +01:00
Ramon Wenger f5b44cdf37 Fix module description highlight test 2024-03-10 16:19:45 +01:00
Ramon Wenger 0e2173afd5 Fix bold text inside of highlights
Relates to MS-898 #complete
2024-03-07 17:31:23 +01:00
Ramon Wenger bc8a84e13a Add scrolling to surveys from MyActivities page
Resolves MS-902 #complete
2024-03-07 17:27:30 +01:00
Ramon Wenger b7466d70d1 Add test for instrument intro and fix it
Relates to MS-895 #complete
2024-03-07 17:13:55 +01:00
Ramon Wenger 0cf39373da Add test for deleting chapter intro highlights
Relates to MS-895
2024-03-07 13:14:54 +01:00
Ramon Wenger 23698a432b Update sidebar on color change
Resolves MS-894 #complete
2024-03-07 10:48:26 +01:00
Ramon Wenger 9c4249de01 Add loading spinner to new activity page 2024-02-29 13:09:06 +01:00
Ramon Wenger 650f8c05d5 Add highlighting to instrument intro 2024-02-29 12:30:52 +01:00
Ramon Wenger 2ee56aa3c0 Fix positioning of popover 2024-02-29 10:50:52 +01:00
Ramon Wenger c2561c2014 Make overflow more dynamic in HighlightSidebar 2024-02-28 15:38:21 +01:00
Ramon Wenger 799e09aefe Enable bold text inside highlights 2024-02-28 15:24:30 +01:00
Ramon Wenger 42a3173123 Fix highlighting in instruments with long contents
Relates to MS-889
2024-02-28 15:09:22 +01:00
Ramon Wenger b6407bfefa Add another fragment name to prevent ambiguity 2024-02-28 13:29:00 +01:00
Ramon Wenger afa44d6a7c Mark error property as not required to prevent errors 2024-02-28 13:26:14 +01:00
Ramon Wenger 8afc7d2229 Update bookmark mutation generator function 2024-02-28 13:20:52 +01:00
Ramon Wenger b09d38a1f2 Add fragment name to ambiguous fragment update 2024-02-28 12:08:12 +01:00
Ramon Wenger de77eeaff3 Update unit test 2024-02-28 11:19:45 +01:00
Ramon Wenger 0e5eb0af0e Add instrument activities 2024-02-28 11:19:45 +01:00
Ramon Wenger cca1f8f1ac Update styling 2024-02-28 11:19:45 +01:00
Ramon Wenger c048e40325 Lint code 2024-02-28 11:19:45 +01:00
Ramon Wenger c6e6491ef9 Add all activity types to page in client 2024-02-28 11:19:45 +01:00
Ramon Wenger ffea3fe1c9 Add more activities 2024-02-28 11:19:45 +01:00
Ramon Wenger 93f180bdd1 Fix linting errors 2024-02-28 11:19:45 +01:00
Ramon Wenger c7c406f0ba Add new activity page 2024-02-28 11:19:45 +01:00
Ramon Wenger 9071b35090 Lint client code 2024-02-28 11:19:45 +01:00
Ramon Wenger 22cd8eb57f Add frontend implementation for chapter highlights, re-enable cypress
test
2024-02-28 11:19:45 +01:00
Ramon Wenger a7df777b0b Integrate highlighting into module component 2024-02-28 11:19:43 +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 4ad5031803 Add new tests for module and chapter highlights 2024-02-28 11:14:45 +01:00
Ramon Wenger b38b8c8586 Refactor and simplify code to create a highlight 2024-02-28 11:14:45 +01:00
Ramon Wenger ebe7be43cb Add new test for instrument page and add onNote function 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 c7fc0b00b7 Update helper code 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 69987e369c Migrate instrument page to use setup syntax and new graphql style 2024-02-28 11:14:45 +01:00
Ramon Wenger 376f2c5f82 Add URL parsing to the HighlightSidebar component
Resolves MS-881 #Complete
2024-02-28 11:14:45 +01:00
Ramon Wenger f0018e2e56 Make note read-only after saving
Resolves MS-880 #Complete
2024-02-28 11:14:45 +01:00
Ramon Wenger 4c42a152fb Switch Popover after Highlight is created
Fixes MS-878 #Complete
2024-02-28 11:14:45 +01:00
Ramon Wenger 9905d32b7b Prevent nested ContentBlocks to also open a HighlightPopover
Also add a Testcase for them

Relates to MS-879
2024-02-28 11:14:45 +01:00
Ramon Wenger 5789e9cc6f Refactor some test code and fix small errors 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 91dcf3cb20 Refactor confirm modals 2024-02-28 11:14:45 +01:00
Ramon Wenger c32864203e Fix type issue 2024-02-28 11:14:45 +01:00
Ramon Wenger c9746769ab Add an initial implementation of a confirm modal for deleting highlights
Relates to MS-871
2024-02-28 11:14:45 +01:00
Ramon Wenger ef3d8ac2e7 Fix some linting issues 2024-02-28 11:14:45 +01:00
Ramon Wenger 837fcc81be Handle choosing a color and clicking on the note icon differently
Resolves MS-869 and MS870 #Complete
2024-02-28 11:14:45 +01:00
Ramon Wenger f69af1e4cf Refactor directive to be more specific 2024-02-28 11:14:45 +01:00
Ramon Wenger 9b813f113b Refactor some mutations 2024-02-28 11:14:45 +01:00
Ramon Wenger 8506392c3f Handle highlight sidebar and popover as one unit for closing them when
clicking elsewhere

Resolves MS-867 and MS-868 #Complete
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 4464b56cbb Start work to also enable highlighting 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 6a70d3ca9e Fix linting issue 2024-02-28 11:14:45 +01:00
Ramon Wenger 8b22146c63 Update highlight fragment 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 97dd9ef600 Make highlight sidebar a singleton 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 5ae1296949 Remove highlight directive 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 f905d6bbc0 Remove debugging info, clean up UI in HighlightSidebar 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 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 776838fb10 Add missing fragment file 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 7932b65895 Add highlight fragment to legacy content block query 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 50bca2cca9 Close popover when clicking outside it 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 6e87464bdf Add some variables as CSS custom properties 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 4daf2946d2 Add better typing, some todos, a highlighting demo 2024-02-28 11:14:44 +01:00
Ramon Wenger 98d413171c Remove example code 2024-02-28 11:14:44 +01:00
Ramon Wenger ba2964d884 Register directive in app 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