diff --git a/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/FullstackProsjektApplication.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/FullstackProsjektApplication.java
index d87214af1024deb0e0207ce150ebac9b7e6a151a..c994953619f2fb3988302a18bf8f0bae8ac93e62 100644
--- a/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/FullstackProsjektApplication.java
+++ b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/FullstackProsjektApplication.java
@@ -21,20 +21,5 @@ public class FullstackProsjektApplication {
SpringApplication.run(FullstackProsjektApplication.class, args);
}
- @Bean
- CommandLineRunner run(RoleRepository roleRepository, UserRepository userRepository, PasswordEncoder encoder) {
- return args -> {
- // Exit early if DB already contains the admin user
- if (roleRepository.findByAuthority("ADMIN").isPresent()) return;
- Role adminRole = roleRepository.save(new Role("ADMIN"));
- roleRepository.save(new Role("USER"));
-
- Set<Role> roles = new HashSet<>();
- roles.add(adminRole);
-
- User admin = new User(2, "potetmos", encoder.encode("potetmos"), roles);
- userRepository.save(admin);
- };
- }
}
\ No newline at end of file
diff --git a/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/QuizCreationAndTest.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/QuizCreationAndTest.java
index a14054067c867d318446681ebde1526cb253032c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/QuizCreationAndTest.java
+++ b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/QuizCreationAndTest.java
@@ -1,73 +0,0 @@
-package edu.ntnu.idatt2105;
-
-import edu.ntnu.idatt2105.model.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-
-public class QuizCreationAndTest {
-
- // Initialize the logger for the class
- private static final Logger logger = LoggerFactory.getLogger(QuizCreationAndTest.class);
-
- public static void main(String[] args) {
- logger.info("Quiz creation and test started.");
-
- //Step 0: Create a User
- Role admin = new Role("ROLE_ADMIN");
- HashSet<Role> roles = new HashSet<>(Arrays.asList(admin));
-
- User JohnDoe = new User("John Doe", "password", roles);
- logger.info("Created user: {}", JohnDoe.getUsername());
-
- // Step 1: Create questions with assigned scores
- MultipleChoiceQuestion question1 = new MultipleChoiceQuestion(null,
- "What is the capital of France?",
- 2,
- Arrays.asList("1. Paris", "2. London", "3. Berlin", "4. Madrid"),
- 0
- );
- logger.info("Created question: {}", question1.getQuestionText());
-
- MultipleChoiceQuestion question2 = new MultipleChoiceQuestion(null,
- "Which language is primarily spoken in Brazil?",
- 3,
- Arrays.asList("1. Spanish", "2. Portuguese", "3. French", "4. English"),
- 1
- );
- logger.info("Created question: {}", question2.getQuestionText());
-
- // Step 2: Create a quiz and add questions
- List<Question> questions = new ArrayList<>();
- questions.add(question1);
- questions.add(question2);
- Quiz quiz = new Quiz("Sample Quiz", questions, JohnDoe, QuizCategory.GEOGRAPHY, QuizDifficulty.EASY);
- questions.forEach(question -> question.setQuiz(quiz));
- logger.info("Created quiz: {}", quiz.getTitle());
-
- // Step 3: Simulate answers from a user
- QuestionAnswer answer1 = new QuestionAnswer(question1, "2");
- QuestionAnswer answer2 = new QuestionAnswer(question2, "2");
- logger.info("Simulated answers for the quiz.");
-
- // Step 4: Create a QuizResult and add answers
- QuizResult quizResult = new QuizResult(quiz, new ArrayList<>(), JohnDoe, "påbegynt", LocalDateTime.now(), null); // Initialize with an empty answers list
- quizResult.addQuestionAnswer(answer1);
- quizResult.addQuestionAnswer(answer2);
- logger.info("Created quiz result for user: {}", JohnDoe.getUsername());
-
- // Output results
- quizResult.getAnswers().forEach(answer -> {
- logger.info("Question: {} - Your Answer: {} - Correct? {}", answer.getQuestion().getQuestionText(), answer.getGivenAnswer(), answer.isCorrect());
- });
-
- logger.info("Quiz completed!");
- int totalPossibleScore = questions.stream().mapToInt(Question::getScore).sum();
- logger.info("Your score: {}/{}", quizResult.getScore(), totalPossibleScore);
- }
-}
diff --git a/FullstackProsjekt/src/frontend/src/components/icons/double-arrow.svg b/FullstackProsjekt/src/frontend/src/components/icons/double-arrow.svg
new file mode 100644
index 0000000000000000000000000000000000000000..a9f979badefd91c5a1ab5c5e0cddcec2df828567
--- /dev/null
+++ b/FullstackProsjekt/src/frontend/src/components/icons/double-arrow.svg
@@ -0,0 +1,7 @@
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
<!-- Uploaded to: SVG Repo, www.svgrepo.com, Transformed by: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+
<g id="SVGRepo_bgCarrier" stroke-width="0"/>
+
<g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"/>
+
<g id="SVGRepo_iconCarrier"> <path d="M13 19L7 12L13 5" stroke="#D9C590" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/> <path d="M17 19L11 12L17 5" stroke="#D9C590" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/> </g>
+
</svg>
\ No newline at end of file
diff --git a/FullstackProsjekt/src/frontend/src/components/icons/go-back-icon.svg b/FullstackProsjekt/src/frontend/src/components/icons/go-back-icon.svg
new file mode 100644
index 0000000000000000000000000000000000000000..6f8349d7552f379c8dfaf069402705610e5ec9d4
--- /dev/null
+++ b/FullstackProsjekt/src/frontend/src/components/icons/go-back-icon.svg
@@ -0,0 +1,7 @@
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
<!-- Uploaded to: SVG Repo, www.svgrepo.com, Transformed by: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+
<g id="SVGRepo_bgCarrier" stroke-width="0"/>
+
<g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"/>
+
<g id="SVGRepo_iconCarrier"> <path d="M4.5 12L9.5 7M4.5 12L9.5 17M4.5 12L14.5 12C16.1667 12 19.5 13 19.5 17" stroke="#363636" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/> </g>
+
</svg>
\ No newline at end of file
diff --git a/FullstackProsjekt/src/frontend/src/components/icons/profile-icon.svg b/FullstackProsjekt/src/frontend/src/components/icons/profile-icon.svg
new file mode 100644
index 0000000000000000000000000000000000000000..a3f0d6ef0886e52199adbf33856a6378168f4d65
--- /dev/null
+++ b/FullstackProsjekt/src/frontend/src/components/icons/profile-icon.svg
@@ -0,0 +1,7 @@
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
<!-- Uploaded to: SVG Repo, www.svgrepo.com, Transformed by: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+
<g id="SVGRepo_bgCarrier" stroke-width="0"/>
+
<g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"/>
+
<g id="SVGRepo_iconCarrier"> <path d="M8 13H16M8 13V18C8 19.8856 8 20.8284 8.58579 21.4142C9.17157 22 10.1144 22 12 22C13.8856 22 14.8284 22 15.4142 21.4142C16 20.8284 16 19.8856 16 18V13M8 13C5.2421 12.3871 3.06717 10.2687 2.38197 7.52787L2 6M16 13C17.7107 13 19.1506 14.2804 19.3505 15.9795L20 21.5" stroke="#FFF" stroke-width="1.5" stroke-linecap="round"/> <circle cx="12" cy="6" r="4" stroke="#FFF" stroke-width="1.5"/> </g>
+
</svg>
\ No newline at end of file
diff --git a/FullstackProsjekt/src/frontend/src/components/icons/sidebar-arrow.png b/FullstackProsjekt/src/frontend/src/components/icons/sidebar-arrow.png
deleted file mode 100644
index b3a75ee4893c82ab3bad18c521c02e73e61775d1..0000000000000000000000000000000000000000
Binary files a/FullstackProsjekt/src/frontend/src/components/icons/sidebar-arrow.png and /dev/null differ
diff --git a/FullstackProsjekt/src/frontend/src/components/shared/sidebar/Sidebar.vue b/FullstackProsjekt/src/frontend/src/components/shared/sidebar/Sidebar.vue
index 5a8670a5ab516fe3dea1116b72477bd4acccdff5..d0014adffe8bd3f2db9a8b89d0b5926273770e25 100644
--- a/FullstackProsjekt/src/frontend/src/components/shared/sidebar/Sidebar.vue
+++ b/FullstackProsjekt/src/frontend/src/components/shared/sidebar/Sidebar.vue
@@ -34,10 +34,10 @@ export default {
<SidebarLink to="/about" icon="about-us-icon">About</SidebarLink>
<SidebarLink to="/feedback" icon="feedback-icon">Feedback</SidebarLink>
<SidebarLink to="/login" icon="login-icon">Login</SidebarLink>
+ <SidebarLink to="/profile" icon="profile-icon">Profile</SidebarLink>
<span class="collapse-icon" :class="{'rotate-180': collapsed}" @click="toggleSideBar">
- <Svg name="sidebar-arrow.png" class="icon"/>
- <button class="iconButton"> <img id="icon" src="../../icons/sidebar-arrow.png"/> </button>
+ <Svg name="double-arrow" class="sidebar-c-icon"/>
</span>
</div>
@@ -75,17 +75,12 @@ export default {
.collapse-icon{
position: absolute;
bottom: 0;
- right: 0px;
- padding: 5px;
+ margin-left: 50px;
transition: 0.2s linear;
}
-#icon{
- height: 18px;
- cursor: pointer;
-}
-.iconButton{
- background-color: transparent;
- border-color: transparent;
+.sidebar-c-icon{
+ height: 30px;
+ width: 30px;
}
.rotate-180{