Commit Graph
80 Commits
Author SHA1 Message Date
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
Axel AdlercreutzandGitHub 4a194ed861 fix usequery (#242)
* fix usequery

* cleanup
2025-04-03 13:03:46 +03:00
Axel AdlercreutzandGitHub 70e96ca8f4 free form exercise schema (#239)
* free form exercise schema

* fixes based on feedback

* formatting

* schema gen
2025-04-03 12:51:59 +03:00
Vili-Ilari KaistoandGitHub e725e486aa Vili/createclickon (#241)
* add frontend for create click exercise and connect it to DB

* translate text to german

* unit tests for create click exercise

* fix
2025-04-03 12:42:39 +03:00
Mari LehtikariandGitHub 68c7f30b5d LinkButton component (#238)
* created a link button component

* replaced links with buttons with linkbutton component

* updated linkbutton component to support button variants and sizes
2025-04-02 20:29:13 +03:00
Axel AdlercreutzandGitHub 2d435292be logout and nav button fix (#237) 2025-04-02 12:48:44 +01:00
Jukka KuustoandGitHub e20242db8a Jukka/multichoice front (#234)
* Create multiple choice exercise page

* Create multichoice exercise logic with basic user feedback

* Create multichoice.css, use Button component

* Fine-tune and clean up exercise CSS

* Remove reset of incorrect answers, small changes for improved readability

* Change to a more explicit structure for exercise data

* Change file and component names to more descriptive ones
2025-04-02 12:08:33 +03:00
pronom8andGitHub 97c9d71d4a Talkback/leo, talkback channel functionality added with an anti-spam feature. (#203)
* email sending functionality for talkback channel made

* tests made for email sending feedback functionality

* api vulnerability fixed

* improvement on tests

* changes

* updates to this branch

* timeout anti spam attack functionality added

* improved the tests for api/talkback/route.js
2025-04-02 09:34:30 +03:00
Axel AdlercreutzandGitHub 2d8586bd8e admin page + auth hooks (#205)
* admin page + auth hooks

* user context updates

* admin related fixes

* update readme

* middleware readme

* fix tests

* fix schema gen

* fixes based on feedback

* store actAs in localstorage to prevent flickering
2025-04-01 14:51:23 +01:00
Axel AdlercreutzandGitHub 2dcca10552 added suspense (#226) 2025-03-29 20:32:08 +02:00
9a959a1dfb Vili/click on something (#218)
* add basic mockup version of click exercise

* basic form for creating a click-on exercise

* refine frontend and template

* create schema for click

* schema

* add routing, not yet complete

* add dynamic route

* route click and connect to db complete

* fix

---------

Co-authored-by: DoebelnAtz <axel.ej.adlercreutz@gmail.com>
2025-03-28 09:55:45 +02:00
Jukka KuustoandGitHub b7430d725a Update middleware protected path (#217) 2025-03-27 14:12:30 +02:00
Salla RautiainenandGitHub 9f1d9ecd22 Drag and Drop: The user can see only part of the exercise words (#212)
* Took strike away from used wordboxes. Changed the wordbox font colors when dropped in dustbins

* Replacing dragged words with new ones

* Fixed the bug that when all words were in dustbins but the bug displayed placeholder words

* Fixed the bug (less than 5 words displayed)

* Fixed try again -button bug

* Made changes based on comments: made masc, fem and neutral colors, deleted console.logs

* Changed paths

* UI changes after master merge changed UI
2025-03-27 13:41:26 +02:00
Mari LehtikariandGitHub d27d527548 Grammar pages (#215)
* made a schema for grammar items

* changed all mentions of grammar1 to grammar

* fixed imports for exercises

* linked the alphabetical page to lessons page

* added grammar items in alphabetical order

* fixed link colors

* removed vocabulary link from the sidebar

* added subtopics to lessons page, removed exercise placeholders

* UI fixes

* changed lessons page to themes page, moved exercises folder to directly under grammar, fixed imports

* updated schema
2025-03-27 13:25:51 +02:00
Jukka KuustoandGitHub dda5a559e8 Jukka/session management (#181)
* Create session check feature with logout link in navbar

* Create session context to update conditional user view on first render

* Add logout api call to navigation logout button

* Create middleware to restrict logged-in users from accessing login and register pages

* Add middleware for logged-in users only protected pages

* Redirect user back to original protected page after successful login

* Create tests for session api route

* Create documentation
2025-03-26 12:38:06 +02:00
Mari LehtikariandGitHub 262eec6b54 Communications pages (#206)
* added new page before the communications and grammar pages

* added all 16 communications pages

* added a link to communications pages onto sidebar
2025-03-25 14:28:06 +02:00
666835a0da Added fill in the gap excercise (#180)
* Added fill in the gap excercise

* Fixed few bugs

* fixed another bug

* another fix

* and another fix

---------

Co-authored-by: Visuri Emil A <evisuri@cubbli22-gold.local>
2025-03-20 11:32:03 +02:00
Axel AdlercreutzandGitHub 2e631c5692 quick fixes (#179)
* quick fixes

* fix primary colors

* fix
2025-03-20 08:31:56 +02:00
Salla RautiainenandGitHub 4e00f45414 Deleted footer and made UI fixes (#175)
* Deleted footer and other unnecessary styling. Fixed h1-title

* Changed hard-coded colors back to variables

* Refactoring navbar styling

* Frontpage color fixes

* Fixed colors in auth and learning forms

* Fixed color issues

* Changed link color
2025-03-19 20:05:45 +02:00
Axel AdlercreutzandGitHub ad8416aae3 axel/learning resources (#166)
* init

* bunch of content

* navbar with chapters
2025-03-19 19:44:37 +02:00
Salla RautiainenandGitHub 34b6648a22 Drag and Drop -exercise success message and UI changes (#170)
* Added a success message after the exercise is complete

* Modified UI for drag and drop exercise

* Made dustbin height dynamic

* Made wordboxes align with the dustbins
2025-03-18 16:17:24 +02:00
pronom8andGitHub 22cd66bd5a Update globals.css, fixed a curly braces typo syntax error here, on t… (#167)
* Update globals.css, fixed a curly braces typo syntax error here, on the .cta-button

* Update globals.css, fixed another syntax issue in the .feature card, added a }

* Update globals.css
2025-03-16 20:01:24 +02:00
9a1d5f9ef9 Frontend Renewals (#160)
* Testing openshift setups

* husky caused some error in the redhatopenshift environement so I am trying to debugg that

* trying to debugg the deployment for openshift

* more debbugging for getting the app deployed on openshift

* more debugging for openshift deployment

* same as the other previous 2 commits

* continuing the debugg

* making a memory optimization to Dockerfile for getting this next.js app deployed

* made a : Deploy Dockerimage to github registry functionality

* fixed a syntax issue, regarding to this push

* added 2 missing lines of code for deploying docker image to Github registry

* added a new tag and deleted unused files

* tags? (#133)

* openshift deployment functionality

* new frontend renewals made

* Toteutettu kommenteista saatuja palautteita, koskien etusivua ja nav baaria

* käännetty login ja sign up nyt saksaksi

* edited according to feedback some more

* fixed the coloring on the lessons page to a better direction

* triyng to fix formatting issues

* fixed a minor formatting issue

---------

Co-authored-by: Axel Adlercreutz <39679469+DoebelnAtz@users.noreply.github.com>
2025-03-16 10:53:02 +02:00
Axel AdlercreutzandGitHub b181c4e09b fix bugs (#164)
* fix bugs

* more fixes
2025-03-13 15:05:14 +02:00
Axel AdlercreutzandGitHub 4cbce6338c fixes based on feedback (#161) 2025-03-13 14:46:01 +02:00
Salla RautiainenandGitHub a85a85dd65 Drag & Drop exercise template (#158)
* Started the drag drop functionality

* Fixed a bug

* Deleted old ui boxes

* Hovering over the box doesn't change the title

* The dustbin shows all the placed items instead of the last dropped

* Changed styling to globals.css

* Wordbox doesn't move after it is already placed in a dustbin

* Added wordboxes. Moved itemtypes under exercises-dragdrop

* Made a reset button

* Refactoring code based on comments
2025-03-13 14:07:58 +02:00
000d0f2e28 Jukka/login tests (#154)
* WIP

* WIP2

* fixed jsdom

* Create 3 more tests for login and refactor for drier code

* Chore: Fix spelling of verifyPassword

---------

Co-authored-by: DoebelnAtz <axel.ej.adlercreutz@gmail.com>
2025-03-11 13:36:45 +02:00
Axel AdlercreutzandGitHub a7a0dd487b layout containers (#153) 2025-03-11 13:10:31 +02:00
ddf1b33dc2 Created a sql schema for drag-and-drop exercise template (#115)
* Fixed a typo

* Created sql schema for drag-and-drop exercise template

* Updated exercise schema

* Started making UI for drag-and-drop exercise template

* UI changes for the top box

* Updated schema

* Updated schema

* Started working with drag function

* Jukka/login refactor (#132)

* Refactor password verification logic into verifyPassword()

* Refactor: Move session.js to backend/auth and update imports and test mock paths

* Vili/username (#135)

* update db includes username

* add create username

* add username as login option

* update login test

* fix renaming migrate files (#136)

* RedHat OpenShift deployment functionality (#137)

* Testing openshift setups

* husky caused some error in the redhatopenshift environement so I am trying to debugg that

* trying to debugg the deployment for openshift

* more debbugging for getting the app deployed on openshift

* more debugging for openshift deployment

* same as the other previous 2 commits

* continuing the debugg

* making a memory optimization to Dockerfile for getting this next.js app deployed

* made a : Deploy Dockerimage to github registry functionality

* fixed a syntax issue, regarding to this push

* added 2 missing lines of code for deploying docker image to Github registry

* added a new tag and deleted unused files

* tags? (#133)

* openshift deployment functionality

---------

Co-authored-by: Axel Adlercreutz <39679469+DoebelnAtz@users.noreply.github.com>

* fix build error (#138)

* fix build error

* rm slug

* Fixed typo on schema

* Update data/migrations/00005_drag_and_drop_exercise.sql

* fix schema

---------

Co-authored-by: Jukka Kuusto <38991418+jkuusto@users.noreply.github.com>
Co-authored-by: Vili-Ilari Kaisto <162989993+w1ll1ey@users.noreply.github.com>
Co-authored-by: pronom8 <139699276+pronom8@users.noreply.github.com>
Co-authored-by: Axel Adlercreutz <39679469+DoebelnAtz@users.noreply.github.com>
Co-authored-by: DoebelnAtz <axel.ej.adlercreutz@gmail.com>
2025-03-06 15:51:09 +02:00
Axel AdlercreutzandGitHub 60da905a97 fix build error (#138)
* fix build error

* rm slug
2025-03-06 15:09:57 +02:00
8f41938fd5 RedHat OpenShift deployment functionality (#137)
* Testing openshift setups

* husky caused some error in the redhatopenshift environement so I am trying to debugg that

* trying to debugg the deployment for openshift

* more debbugging for getting the app deployed on openshift

* more debugging for openshift deployment

* same as the other previous 2 commits

* continuing the debugg

* making a memory optimization to Dockerfile for getting this next.js app deployed

* made a : Deploy Dockerimage to github registry functionality

* fixed a syntax issue, regarding to this push

* added 2 missing lines of code for deploying docker image to Github registry

* added a new tag and deleted unused files

* tags? (#133)

* openshift deployment functionality

---------

Co-authored-by: Axel Adlercreutz <39679469+DoebelnAtz@users.noreply.github.com>
2025-03-06 15:03:25 +02:00
Vili-Ilari KaistoandGitHub 4f4121cb95 fix renaming migrate files (#136) 2025-03-06 12:51:39 +02:00
Vili-Ilari KaistoandGitHub 4ac9a8d17c Vili/username (#135)
* update db includes username

* add create username

* add username as login option

* update login test
2025-03-06 12:36:51 +02:00
Jukka KuustoandGitHub ddd404d3f8 Jukka/login refactor (#132)
* Refactor password verification logic into verifyPassword()

* Refactor: Move session.js to backend/auth and update imports and test mock paths
2025-03-06 10:32:11 +02:00
Axel AdlercreutzandGitHub 7d92d64278 do pgmigrate in docker (#131) 2025-03-03 13:43:18 +02:00
Mari LehtikariandGitHub 7660bb9d97 Updated front page and navigation (#129)
* Added how you learn and learn grammar buttons to front page

* updated forms link

* Removed unnecessary buttons from front page

* Updated front page UI and navigation
2025-02-27 19:55:30 +02:00
Jukka KuustoandGitHub 792f75ead9 Jukka/login db (#128)
* Add input email and password verification by comparing to db entry
2025-02-27 16:11:01 +02:00
a4fce8fce3 modified error and success messages (#127)
Co-authored-by: Visuri Emil A <evisuri@cubbli22-gold.local>
2025-02-27 15:33:04 +02:00
Axel AdlercreutzandGitHub 068435bf15 axel/user survey front (#104)
* migrate form schema

* refactored sidebar & init form frontend

* added radio button (that dont radio)

* wip

* add to user test

* added tests

* auth

* working answers

* previous & next logic

* custom radio button

* custom radio button

* fix render issue

* answer page

* fix style

* regen data

* fix teil

* cleanup

* generic placeholder user
2025-02-27 15:14:59 +02:00
e8639db6c0 Vili/routing register (#66)
* route to backend (hello world)

* add route for register

* fix lint

* fix routing

* connect to db

* add hashing with salt

* add error handling

* add unit tests for register

* fix errors

* axel/fix-import

* fix register

* update response to use error instead of message

* fix tests

* fix register

* testfactory user toLowerCase()

* fix migrate

* fix register style

* fix layout

---------

Co-authored-by: DoebelnAtz <axel.ej.adlercreutz@gmail.com>
2025-02-27 12:57:46 +02:00
4d34590cd6 Emil/auth (#103)
* Modified error and success messages on login and register pages

* deleted few old comments

* added prettier on devDependecies

* fixed bugs

* added username to users table

* deleted username from users table

* upgraded Zod

* fixed a few issues

---------

Co-authored-by: Visuri Emil A <evisuri@cubbli22-gold.local>
2025-02-27 12:28:48 +02:00
Mari LehtikariandGitHub ccb70241c2 Updated the header (#112)
* Added new placeholder logo and linked it to the front page

* Removed unnecessary link, linked Anmeldung to the Login page

* Added lock icon to the login link
2025-02-26 12:20:17 +02:00
8045cc4175 Created simple lesson and exercise pages (#91)
* Added basic lessons page. Added a logo placeholder.

* Added basic navigation bar

* Added styling to navigation bar

* Added sidebar navigation

* Added a drop-down menu, color corrections

* Fixed text wrapping issue

* Some fixes to lessons-page and cleaning the code

* Added grammar boxes and fixed ui

* Added two more grammatik boxes. Made show more -links to each box and some css-styling to links

* Changed Übung-texts to links and changed css styling for different links

* Changed the code so you don't have to do so much manual work when adding a new grammatik box. Still needs some styling though

* Fixed the h1-title bug so that it is not hidden underneath the sidebar anymore

* Made links from lessons-page to one exercise-page. Created a route to exercises, however, it still needs to be changed since one page isn't enough.

* Changed the ui for exercise-page

* Made changes based on the comments in PR draft

* Started implementing simple test

* Deleted the unnecessary test. Fixed lessons-page based on comments. Changed back filenames

* Changed button name to German

---------

Co-authored-by: Mari Lehtikari <mari.lehtikari@helsinki.fi>
2025-02-26 11:31:53 +02:00
Axel AdlercreutzandGitHub dea5aaf376 Axel/user survey (#92)
* config file

* init formcomponent

* form migration

* form migration

* init populate migration

* form route

* cleanup and test fixesgps

* cleanup

* cleanup

* button

* fix zod issue

* fix tests

* update tests to use mock requests
2025-02-19 17:57:59 +02:00