Commit Graph
123 Commits
Author SHA1 Message Date
LosEvons 3488d2b1fb Added .preventDefault() to add admin component. 2025-09-19 09:40:11 +03:00
LosEvons 0d76bbd4cb Testicommitti 2025-09-19 09:03:15 +03:00
LosEvons b74576c06d Added rudimentary error handling and a comment to add admin component 2025-09-17 10:32:01 +03:00
LosEvons 76921b854d Merge branch 'miika-admin' of https://github.com/OHTU-German-learning-website/OHTU-German-learning-website 2025-09-17 10:17:34 +03:00
Miika HolmlundandFilippa Högnäsbacka e0101d200e implement crappy version of adding other users to admins via email 2025-09-16 10:04:45 +03:00
Miika HolmlundandFilippa Högnäsbacka 60304761ae add dummy add-admin page 2025-09-16 10:01:47 +03:00
Axel AdlercreutzandGitHub 71e1df8a12 clarifying comments on test logic (#348) 2025-09-10 14:56:19 +03:00
Axel AdlercreutzandGitHub ed4325a6db axel/more tests (#347) 2025-05-05 20:57:57 +03:00
Axel AdlercreutzandGitHub f8a794d2ff axel/improved anchors (#344)
* improved anchors

* copy buttons

* codegen
2025-05-02 15:21:52 +03:00
Axel AdlercreutzandGitHub 00e9686733 axel/fix form (#345)
* offline answrs

* better lightmode colors

* fix test

* run e2e test

* install before run

* node env test

* cleanup

* fix
2025-05-02 15:21:36 +03:00
Mari LehtikariandGitHub 57a93057a7 added link to dnd exercise (#346) 2025-05-02 14:42:59 +03:00
Vili-Ilari KaistoandGitHub 154078088b Vili/clickfixes (#343)
* UI and usability fixes

* refactoring click exercise to save user answers

* add functionality to save user answers

* fetch user answers

* quick cleanup

* add tests

* fix using testfactory
2025-04-30 12:49:06 +03:00
Axel AdlercreutzandGitHub 9617a6094a e2e robot tests (#329)
* robot tests

* github actions

* fix test

* gitignore

* remove screenshot
2025-04-29 18:05:51 +03:00
5a2a4d1844 Admin can create a new drag and drop -exercise (#337)
* Changed admindragdrop location and started connecting it to the database

* Moved files

* Added title for the d&d exercise creation

* Create button can't be pressed until all fields are filled

* Added a preview-window for when creating a drag and drop exercise

* the data now submits correctly from page.js

* data is now received in the correct format

* update schema

* added linkbutton, linked dragdrop form

* Fixed cancel-button link

* Added cancel-button

* Fixed the blue-color

* translated dnd admin form to German

* Creating tests

* fix migration

* Fixed the test

* Re-made translations from English to German cause of a merge fail

* Fixed the bug that broke the color picking function. Translated rest of the words to German

* run dbreset

---------

Co-authored-by: Mari Lehtikari <mari.lehtikari@helsinki.fi>
Co-authored-by: DoebelnAtz <axel.ej.adlercreutz@gmail.com>
2025-04-29 16:47:33 +03:00
Mari LehtikariandGitHub f2e5457039 Last changes (#342)
* change order of grammar items

* changes to texts on the frontpage

* formatting and added texts
2025-04-29 16:29:58 +03:00
Mari LehtikariandGitHub 2030d4de75 Added extra links and scrollbar to sidebar (#335)
* add new sidebar links

* added scrollbar to side navigation

* sidebar links no longer open a new tab

* removed glossar link and changed the title to links to other websites for clarity
2025-04-29 10:26:36 +03:00
Mari LehtikariandGitHub 190f479fef added buttons from /grammar to the front page (#340) 2025-04-28 14:02:43 +03:00
Mari LehtikariandGitHub 37093434ad changed comms topic list to grammar themes style (#330) 2025-04-27 15:41:42 +03:00
Mari LehtikariandGitHub 08f950d766 Added custom 404 page (#331)
* added custom 404 page

* translated 404 page to German
2025-04-27 15:40:15 +03:00
Jukka KuustoandGitHub ff5789c084 Jukka/multichoice listing (#322)
* Create listing of existing multichoice exercises

* Aadd multichoice to exercise listing
2025-04-25 13:58:33 +03:00
Axel AdlercreutzandGitHub 0f39d9ac8d fix (#327)
* fix

* null handler
2025-04-25 13:49:09 +03:00
Axel AdlercreutzandGitHub bab6c5bca4 fix migration (#326)
* fix migration

* allow null

* codegen

* fix gen

* schema
2025-04-25 13:13:15 +03:00
Axel AdlercreutzandGitHub 91e612780c coerce string (#325)
* coerce string

* fix test
2025-04-25 13:10:39 +03:00
pronom8andGitHub 8c3616a99c User can change his email/leo (#307)
* added a front end to change username page

* functionality for user to change its email and tests for it

* made changes according to PR feedback
2025-04-25 12:15:03 +03:00
Mari LehtikariandGitHub 0f94c4a1fb Added content to perfekt page (#320)
* fixed colors again

* added content to perfekt page
2025-04-24 17:19:34 +03:00
Axel AdlercreutzandGitHub 483188f404 axel/exercise anchors backend (#298)
* backend routes for anchors

* migration

* frontend components

* schema

* use logger

* use snake-case

* cleanup

* use variables

* axel/anchor frontend (#308)

* add ability to link & unlink

* add ability to link & unlink

* style and bugfix
2025-04-24 15:19:17 +03:00
Axel AdlercreutzandGitHub d82137829a ability to delete glossary items (#316)
* ability to delete glossary items

* remove silly transform
2025-04-24 15:18:37 +03:00
Axel AdlercreutzandGitHub c8f45a514d some learning fixes (#313) 2025-04-24 15:10:18 +03:00
Mari LehtikariandGitHub cefb00c633 Linked exercises page to /grammar (#315)
* added link to exercises

* removed old things from exercises page

* removed unnecessary imports
2025-04-24 15:06:37 +03:00
Jukka KuustoandGitHub b598ba3d99 Jukka/multichoice db (#304)
* Create database tables for multichoice exercise

* Fetch exercise data from DB, form page slugs according to multichoice_exercises id

* Populate DB with example multichoice exercise data

* Remove confusing user message while useQuery handles data

* Display exercise description

* Add automatic shuffle of multichoice options order

* Reset incorrect answer style coloring when user reselects an answer option (before resubmitting)

* Rename migrations to avoid conflicts with master

* Update populate file with category column

* Create tests for multichoice exercise

* Fix typo from conflict resolving
2025-04-24 14:21:53 +03:00
Jukka KuustoandGitHub fd4a783734 Remove commented-out, unused styling (#306) 2025-04-24 13:19:36 +03:00
pronom8andGitHub 4a36a88652 added a navigation route to the talkback channel via sidebar (#300)
* added a navigation route to the talkback channel via sidebar

* clean up and littleadjustments
2025-04-23 12:01:34 +03:00
Vili-Ilari KaistoandGitHub 881f83cf7e refactoring fix for uniformity (#299)
* refactoring fix for uniformity

* testfactory fix
2025-04-23 10:54:48 +03:00
Mari LehtikariandGitHub 37b98af76b Updates to Grammar Themes page (#297)
* fixed colors on grammar themes

* added links to grammar themes page

* hid the show more button when there are 3 or less subtopics
2025-04-22 14:01:43 +03:00
Mari LehtikariandGitHub a5f2a60fd0 removed old unused page that caused an error (#294) 2025-04-21 11:10:43 +03:00
bf4d42613f Edit info/leo, Added a functionality where a user can change his own password, when logged in (#272)
* added a primitive dit_info page

* further work onto the change information pages

* further work on onto change information pages

* working on change password page

* basic change password functionality added

* added tests for editing ones own password

* improved the tests regarding to edit_password

* Implemented the authMiddleWare to edit_password route

* deleted a console.log

* deleted a comment from a css file

* deleted a console.log

* clean up test and route

---------

Co-authored-by: DoebelnAtz <axel.ej.adlercreutz@gmail.com>
2025-04-20 18:02:14 +03:00
a5878e1171 Updated drag and drop schema (#266)
* Creating a page for admin to create d&d exercise

* Made dropdown menu for the number of boxes that will then dynamically appear on the screen

* Added word boxes next to titles

* Fixed based on comments: 1. there is no number of boxes choosed in the beginning 2. the fields don't reset when the number of boxes is changed

* changed titles to categories

* added color option dropdown menu

* changed layout to rows

* added colors to the dropdown options

* changes to dnd schema

* update dnd schema

* added route file

* Small db changes

* Commented changes away for now

* Updated drag and drop schema

* reordered columns for consistency

* adjusted gaps

* added created_by reference to exercises and dnd_exercises

* added dropdown components

* fixed naming

* Dropdown menu changes to get colors to work

* Added style to dropdown component

* Deleted old comments

* Made progress with database connection

* Made corrections, now the exercise is connected from the database and displayed on the screen.

* Fixed a bug (when dropping a wordbox, the page froze)

* Fixed a bug, now the font color changes when the wordbox is dropped to the right dustbin

* Deleted unnecessary itemtypes file

* Made a sample drag and drop exercise

* Reverted old migrations and made a new one

* Fixed the add dnd exercise migration and altered the old dnd migration file with a new file

* Changes made based on comments

* Lint fix

* add schema

---------

Co-authored-by: Mari Lehtikari <mari.lehtikari@helsinki.fi>
Co-authored-by: DoebelnAtz <axel.ej.adlercreutz@gmail.com>
2025-04-16 16:14:56 +03:00
Mari LehtikariandGitHub 64cf6aa9de Commpage uber vergangenes (#292)
* added content to uber vergangenes

* added glossary paragraphs
2025-04-16 16:11:24 +03:00
Vili-Ilari KaistoandGitHub 3d5935ce3c Vili/redirectpath (#276)
* add redirect for click_exercises

* add redirect freeform

* add tests for reroute

* fix tests

* fix
2025-04-16 14:17:03 +03:00
Mari LehtikariandGitHub 24f5af63a5 Small changes (#284)
* remove vokabeln from sidebar

* renamed PQ to Plusquamperfekt in alphabetical list
2025-04-16 13:29:44 +03:00
Axel AdlercreutzandGitHub 3b6fe5c208 admin migration (#278) 2025-04-16 11:22:31 +03:00
Axel AdlercreutzandGitHub 05dac88a5c axel/glossary frontend (#275)
* glossary admin page

* api route

* glossary tooltip

* use non deprecated scrollY

* add context

* glossary tooltip component

* add to learning resources
2025-04-16 10:57:17 +03:00
Axel AdlercreutzandGitHub bdd4ec1755 glossary admin page (#273) 2025-04-16 10:51:34 +03:00
Axel AdlercreutzandGitHub cf62f618d4 Free form answers (#270)
* init

* complete exercise

* add tests

* style exercises page

* cleanup usequery

* icon

* translate to german

* fix test
2025-04-15 20:05:25 +03:00
Axel AdlercreutzandGitHub 8d106964f4 fix (#271)
* fix

* update requests

* fixes

* ssl

* fix test

* remove pgbouncer

* cleanup
2025-04-11 11:29:54 +03:00
pronom8andGitHub 6cfe6e6782 added a primitive dit_info page (#268) 2025-04-10 15:36:51 +03:00
Axel AdlercreutzandGitHub b72a2152b6 axel/free form admin front (#258)
* free form exercise schema

* schema validation and tests

* frontend for adding admin free form exercises

* fixes based on feedback

* formatting

* schema gen

* schema adjustments

* refactored

* fix tests

* cleanup & make it german

* ui fix

* error handling

* cleanup

* cleanup

* schema utils test

* cleanup
2025-04-10 12:47:10 +03:00
Mari LehtikariandGitHub f7cafa15f6 Perfekt and Partizip II pages (#261)
* new pages

* added italics

* fixed colors

* added underline

* removed unnecessary comments

* moved italic and underline styles to globals.css

* added new blue

* moved alphabetical chapter list to separate file
2025-04-09 12:53:04 +03:00
pronom8andGitHub 0d0f75b8fe Better talkback/leo (#259)
* updated the email sending tests and functionality to match the new cookie updates

* changed the all of the complaint words from the code to message words
2025-04-08 20:12:22 +03:00
Axel AdlercreutzandGitHub e945a3c049 usequery + middleware fixes (#257) 2025-04-04 13:03:47 +03:00