Commit Graph

697 Commits

Author SHA1 Message Date
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 c7cf6f7863 Add document name to room entry preview 2019-05-21 14:49:13 +02:00
Ramon Wenger 7bc8c3c3aa Add cypress test for project entry deletion 2019-05-21 14:42:06 +02:00
Ramon Wenger 735d2d9afa Add project entry deletion by user 2019-05-21 14:39:25 +02:00
Ramon Wenger d5364d8d9d Re-add intro to module 2019-05-21 14:08:30 +02:00
Ramon Wenger b29de0cf50 Fix assignment console bug 2019-05-21 11:18:57 +02:00
Ramon Wenger 5432e4c8df Fix scrolling issue 2019-05-21 11:18:27 +02:00
Ramon Wenger 78e2e3ecc5 Add polling to rooms and portfolio pages 2019-05-15 18:21:04 +02:00
Ramon Wenger 8764aee445 Add icon to document form 2019-05-15 15:34:32 +02:00
Ramon Wenger caa6736330 Handle document upload in image form 2019-05-15 15:14:32 +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
Ramon Wenger dda9f75011 Disable task content block creation for students 2019-05-09 10:20:26 +02:00
Ramon Wenger 28f96f8517 Force http on links 2019-05-09 09:18:21 +02:00
Ramon Wenger 545f3adb41 Fix wording 2019-05-09 09:13:01 +02:00
Ramon Wenger c8f02ec6b2 Fix room entry widget height 2019-05-09 09:12:42 +02:00
Ramon Wenger bd1286abba Prevent double saving on entity creation 2019-05-08 14:42:58 +02:00
Ramon Wenger e88b9a07db Hide assignment block type on room entry form 2019-05-07 15:50:19 +02:00
Ramon Wenger a0b49a752b Display documents in projects in a more useful manner 2019-05-07 15:27:21 +02:00
Christian Cueni 6513da19cf Fix url in cypress test 2019-04-25 12:41:19 +02:00
Ramon Wenger 96ffc7f484 Fix typos 2019-04-25 12:01:00 +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 4688a29122 Clean up code 2019-04-25 10:57:13 +02:00
Christian Cueni 1da5c4bb29 Use background image instead of img 2019-04-24 17:06:11 +02:00
Christian Cueni 979b732583 Move profile link to parent elements 2019-04-24 14:50:00 +02:00
Christian Cueni aca8bd0d2d Add possibility to upload avatars 2019-04-24 14:23:54 +02:00
Ramon Wenger d7a3dd74c2 Add document upload to project entry 2019-04-24 10:41:27 +02:00
Ramon Wenger 244f7405f6 Fix portfolio on mobile 2019-04-23 16:38:24 +02:00
Christian Cueni 6b0a2e0d59 update text 2019-04-16 14:25:14 +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 e9bb8844e7 update hamburger icon 2019-04-16 08:33:20 +02:00
Christian Cueni d7cd5d2809 Merge branch 'develop' of bitbucket.org:iterativ/skillbox into develop 2019-04-16 08:22:39 +02:00
Christian Cueni 6ae6a7cbdb clean up some copy and css 2019-04-16 08:22:23 +02:00
Ramon Wenger 83721de7ea Fix cypress test 2019-04-15 12:56:55 +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
Ramon Wenger d7b9fa0106 Make tooltip wrappable 2019-04-11 17:03:06 +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 6853cc8734 Update last module in a mutation instead of the query 2019-04-11 14:15:36 +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 26981f3125 Fix cypress test 2019-04-09 14:37:21 +02:00
Ramon Wenger 8a57e7ae48 Merged in feature/mobile-navigation (pull request #14)
Feature/mobile navigation

Approved-by: Christian Cueni <christian.cueni@iterativ.ch>
2019-04-09 10:58:07 +00: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
Christian Cueni e3b4f658e2 add hint in pw form 2019-04-09 09:18:42 +02:00
Christian Cueni 0ee5f65b10 add actions to room widget 2019-04-09 08:27:54 +02:00
Ramon Wenger 3f229f10ab Fix cypress test 2019-04-08 17:23:46 +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
Ramon Wenger 1bce7a710f Remove some non-read-only elements from mobile 2019-04-08 17:12:52 +02:00
Ramon Wenger b95fd6161f Disable user zoom on mobile 2019-04-08 17:11:31 +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 5b47cc5a43 Add form validation, style form 2019-04-04 13:37:38 +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
Ramon Wenger afb21fa499 Add moment to dependencies 2019-03-29 16:32:30 +01:00
Christian Cueni ffc6332894 add edit project page 2019-03-28 08:42:37 +01:00
Christian Cueni d03524e803 add entry count to project widget 2019-03-27 15:56:27 +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
Christian Cueni d9f07c1adb refactor widget footer, add possibility to delete project 2019-03-27 09:33:12 +01:00
Christian Cueni 43278550f7 Add sendgrid config 2019-03-25 13:16:32 +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 0a67c322be Add fullscreen image to ImageBlock 2019-03-13 16:33:57 +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 99de7270a4 Add new project cypress test 2019-03-11 15:38:39 +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 636740a5a0 Add typography mixins 2019-03-04 13:07:12 +01:00
Ramon Wenger bce54d0f46 Fix initial data on start page 2019-03-01 15:26:18 +01:00
Ramon Wenger 18633d4de8 Remove full screen buttons 2019-03-01 11:23:24 +01:00
Ramon Wenger 10b35a5a3e Add last visited module to user 2019-03-01 11:19:43 +01:00
Ramon Wenger b86b1eea37 Replace more explicit values with variables 2019-02-27 16:52:55 +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 170bfda78c Add genial.ly block to modal 2019-02-21 14:28:38 +01:00
Ramon Wenger 4f72f804c6 Add genial.ly block 2019-02-21 09:55:41 +01:00
Ramon Wenger 32f2ddaea5 Add full screen infographic component 2019-02-20 16:12:16 +01:00
Ramon Wenger 0d99019e94 Make full screen image scrollable 2019-02-20 15:00:40 +01:00
Ramon Wenger 97b3be305f Fix cypress test 2019-02-20 13:43:54 +01:00
Ramon Wenger a50f3737a6 Add full screen modal for images 2019-02-20 10:57:17 +01:00
Ramon Wenger e147d75893 Add assignment text to submissions page 2019-02-19 20:42:06 +01:00
Ramon Wenger 836dbd2bbb Add Infogram block 2019-02-18 16:59:47 +01:00
Ramon Wenger 821473cf7a Update solution e2e test and reactivate it 2019-02-14 18:54:57 +01:00
Ramon Wenger 29c9ceb542 Add check for fetched module in module component 2019-02-14 18:54:37 +01:00
Ramon Wenger be7259403e Add cypress command to wait for specific GraphQL query 2019-02-14 18:54:16 +01:00
Ramon Wenger 59495d13c8 Add workaround for cypress.wait for fetch requests 2019-02-14 18:53:00 +01:00
Ramon Wenger 63e98b099f Rename config variable again 2019-02-14 12:34:17 +01:00
Ramon Wenger 3d09cc8e4b Add new config variable 2019-02-14 12:33:15 +01:00
Ramon Wenger c4c025d0cc Change variable name for Google Analytics ID 2019-02-14 12:22:58 +01:00
Ramon Wenger f5d146df95 Add check for Analytics ID 2019-02-14 11:26:47 +01:00
Ramon Wenger be9f4f4aae Add Google Analytics 2019-02-14 10:07:52 +01:00
Ramon Wenger 1c09a0629f Add solution to result page 2019-02-13 16:35:06 +01:00
Ramon Wenger 2452494b33 Add solution to assignment in content block 2019-02-13 16:21:18 +01:00
Ramon Wenger 4c5a786e7d Fix margin after solution 2019-02-13 16:19:29 +01:00
Ramon Wenger 31a78b6619 Disable test that is not working consistently for now 2019-02-13 15:49:06 +01:00
Ramon Wenger b01802153e Unify solution e2e tests 2019-02-13 14:15:51 +01:00
Ramon Wenger ea7a306522 Add solution toggling to frontend 2019-02-07 16:58:20 +01:00
Ramon Wenger f365225830 Fix cypress test 2019-02-05 18:55:12 +01:00
Ramon Wenger 47761c11c0 Update rendering of solutions 2019-02-05 18:51:41 +01:00
Ramon Wenger 07785ae2c1 Add transition to solutions 2019-02-04 18:54:55 +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 5ce09a4e13 Add solution block to client (including cypress test) 2019-02-04 15:19:58 +01:00
Ramon Wenger 10841a69be Update cypress test 2019-01-31 16:47:27 +01:00
Ramon Wenger 050f700760 Add basics for cypress tests in pipelines file 2019-01-31 16:47:07 +01:00
Ramon Wenger 662a3b8d4b Add basics for project entry wizard 2019-01-30 10:56:24 +01:00
Ramon Wenger 906b5c88bd Add modal basics for new project entry 2019-01-29 17:35:14 +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 c468a13720 Add some more base for cypress testing 2019-01-24 15:15:14 +01:00
Ramon Wenger fc6cf0c0d9 Add new news item 2018-12-19 18:20:41 +01:00
Ramon Wenger 2fa373bc30 Add class filter to results 2018-12-06 16:29:27 +01:00
Ramon Wenger 0080dfe0d7 Fix continuous input bug 2018-12-04 13:24:36 +01:00
Ramon Wenger d46d0dde0a Add mobile styling 2018-11-21 18:33:38 +01:00
Ramon Wenger 1b11599eb8 Remove objective group buttons from students 2018-11-21 18:26:16 +01:00
Ramon Wenger bcb3e5e719 Merge branch 'feature/objectives-created-by-user' 2018-11-21 15:19:44 +01:00
Ramon Wenger 4bf3f51644 Apply sorting of objective groups to students as well 2018-11-21 15:18:54 +01:00
Ramon Wenger 9a6b9bf3e3 Add edit objective form wizard to client 2018-11-21 14:56:43 +01:00
Ramon Wenger a89c0d006b Save objective group via mutation 2018-11-20 18:48:48 +01:00
Ramon Wenger 35f29cb00f Add second news entry 2018-11-20 17:32:42 +01:00
Ramon Wenger a1fd28b48e Add objective group mutation 2018-11-20 17:28:29 +01:00
Ramon Wenger 8d9cb86ae8 Move style for icon button 2018-11-20 15:20:02 +01:00
Ramon Wenger 0e9bd79fa6 Add modal for objective group addition 2018-11-20 15:19:40 +01:00
Ramon Wenger 949846f9d0 Move objective group files to own folder 2018-11-20 15:17:53 +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 6387024f81 Add SRF video embedding 2018-11-14 11:53: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 a51a882c1d Update styling 2018-11-01 16:01:13 +01:00
Ramon Wenger b33e75d67a Add placeholder to room form's select input 2018-11-01 16:00:56 +01:00
Ramon Wenger 62bd0b2435 Restrict deletion of rooms to teachers 2018-11-01 15:25:40 +01:00
Ramon Wenger 58d42e2472 Merged in feature/objectives-by-user (pull request #10)
Feature/objectives by user
2018-11-01 13:28:15 +00:00
Ramon Wenger e72475fc14 Unify objectives under one objective group for students 2018-11-01 14:24:41 +01:00
Ramon Wenger 5ca9bbb017 Split objective groups by type 2018-11-01 10:58:08 +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 7c002dcf36 Clean up code 2018-10-31 16:09:37 +01:00
Ramon Wenger 97bea4289e Add visibility popover to objective group widget 2018-10-31 15:37:46 +01:00
Ramon Wenger 9b6207f192 Change title in objective group model 2018-10-30 23:31:54 +01:00
Ramon Wenger 58030fc70d Update package lock 2018-10-30 17:53:30 +01:00
Ramon Wenger 5b50e497c9 Add room entry edit mask 2018-10-30 11:57:41 +01:00
Ramon Wenger c536a04122 Add parts for room entry deletion 2018-10-29 18:54:34 +01:00
Ramon Wenger acf59b218b Add popover to room entry 2018-10-29 13:30:31 +01:00
Ramon Wenger cc99dd00b1 Generalize popover for widgets 2018-10-29 13:24:24 +01:00
Ramon Wenger daa8491578 Add workaround for cache misses 2018-10-29 13:23:42 +01:00
Ramon Wenger 7c3d19170d Add newlines to student submissions 2018-10-25 16:52:55 +02:00
Ramon Wenger 0aec11dd76 Clean up code 2018-10-25 16:03:42 +02:00
Ramon Wenger 0ab58b7582 Fix disappearing submission bug for student 2018-10-25 15:46:31 +02:00
Ramon Wenger 6b6277fe6d Add default text for empty submission list 2018-10-25 15:33:04 +02:00
Ramon Wenger 6591958546 Add assignment result link for teacher view 2018-10-25 15:24:48 +02:00
Ramon Wenger 8b8929c728 Change "Aufgabe" to "Auftrag" 2018-10-25 15:00:43 +02:00
Ramon Wenger 96cbb70477 Remove unused code 2018-10-25 14:34:17 +02:00
Ramon Wenger 631a500dca Update styling 2018-10-25 13:55:12 +02:00
Ramon Wenger 106d90ed17 Add basic knowledge page to content block 2018-10-25 13:54:49 +02:00
Ramon Wenger aea8beff49 Add navigation by basic knowledge slug 2018-10-25 13:53:13 +02:00
Ramon Wenger 365002f800 Fix assignment submission bug on navigation 2018-10-24 16:49:33 +02:00
Ramon Wenger 543a9ea6e9 Add config for e2e tests 2018-10-24 16:26:06 +02:00
Ramon Wenger b2c67569ab Add e2e test for room entry addition 2018-10-24 16:04:57 +02:00
Ramon Wenger 4ad67a09b3 Add author to room entry 2018-10-24 15:34:52 +02:00
Ramon Wenger 617d82f484 Merge branch 'feature/e2e-with-cypress' 2018-10-24 15:19:55 +02:00
Ramon Wenger c0857dcb3f Add missing return statement 2018-10-24 15:19:01 +02:00
Ramon Wenger ee8e33e026 Remove role from GQL query 2018-10-24 15:16:31 +02:00
Ramon Wenger a90501d7e8 Clean up some more code 2018-10-24 15:15:48 +02:00
Christian Cueni 2ecec5b344 Merged in feature/use-role-for-room-creation (pull request #7)
Prevent students from adding new rooms, Verify room form

Approved-by: Ramon Wenger <ramon.wenger@iterativ.ch>
2018-10-24 13:06:45 +00:00
Ramon Wenger 41e8aac63c Clean up code 2018-10-24 15:02:25 +02:00
Ramon Wenger 2dae1dfb0b Add basic rooms page tests 2018-10-24 14:36:42 +02:00
Ramon Wenger 4abf899222 Refactor login test to command 2018-10-24 14:33:46 +02:00