Leshangpang / COMP30022-SDGs-Frontend

Interactive learning website for the 17 Sustainable Development Goals
2 stars 2 forks source link

Fix: merge the conflict and change the style of flashcard page and quiz page #30

Closed Wj12344 closed 1 month ago

Wj12344 commented 1 month ago

According to the suggestions from the meeting on September 16th, the necessary changes have been made. However, a merge conflict occurred. To resolve this, I used a temporary branch, resolved the conflict manually, and then renamed the branch. The updated code has been committed, and you can review it now.

Firstly, I updated the Flashcard page by modifying the font and size, changing the button colors, and adjusting the decorative image on the right.( fix the current code)

Secondly, I made minor layout adjustments to the TakeQuiz page, updated the background color and button colors as suggested, and added specific questions. Currently, there are 10 questions set.(fix the current code)

For the sidebar, I added a dropdown menu compared to the main version.

For each goal's sub-label, I added a new component EachGoalBar.vue, which can be directly used and called as needed.(compare to the version of main)