fixed directory to match new repository

.gitignore

-HELP.md
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/

FullstackProsjekt/pom.xml

@@ -17,30 +17,52 @@
 		<java.version>17</java.version>
 	</properties>
 	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
 
 		<dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
 			<scope>runtime</scope>
-            <optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<!-- Spring Security -->
 		<dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-security</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>io.jsonwebtoken</groupId>
+			<artifactId>jjwt-api</artifactId>
+			<version>0.11.5</version>
+		</dependency>
+
+		<dependency>
+			<groupId>io.jsonwebtoken</groupId>
+			<artifactId>jjwt-impl</artifactId>
+			<version>0.11.5</version>
 		</dependency>
+
+		<dependency>
+			<groupId>io.jsonwebtoken</groupId>
+			<artifactId>jjwt-jackson</artifactId>
+			<version>0.11.5</version>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web-services</artifactId>
+			<artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
 		</dependency>
 	</dependencies>
 

src/main/java/idatt2105/group11/idatt2105projectbackend/QuizCreationAndTest.java → FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/QuizCreationAndTest.java

-package idatt2105.group11.idatt2105projectbackend;
+package edu.ntnu.idatt2105;
 
-import idatt2105.group11.idatt2105projectbackend.model.*;
+import edu.ntnu.idatt2105.model.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/idatt2105/group11/idatt2105projectbackend/configuration/SecurityConfiguration.java → FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/configuration/SecurityConfiguration.java

-package idatt2105.group11.idatt2105projectbackend.configuration;
+package edu.ntnu.idatt2105.configuration;
 
 
 import com.nimbusds.jose.jwk.JWK;
@@ -7,7 +7,7 @@ import com.nimbusds.jose.jwk.RSAKey;
 import com.nimbusds.jose.jwk.source.ImmutableJWKSet;
 import com.nimbusds.jose.jwk.source.JWKSource;
 import com.nimbusds.jose.proc.SecurityContext;
-import idatt2105.group11.idatt2105projectbackend.utils.RSAKeyProperties;
+import edu.ntnu.idatt2105.utils.RSAKeyProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.authentication.AuthenticationManager;

src/main/java/idatt2105/group11/idatt2105projectbackend/controller/AuthenticationController.java → FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/AuthenticationController.java

-package idatt2105.group11.idatt2105projectbackend.controller;
+package edu.ntnu.idatt2105.controller;
 
 
-import idatt2105.group11.idatt2105projectbackend.dto.LoginResponseDTO;
-import idatt2105.group11.idatt2105projectbackend.dto.TokenDTO;
-import idatt2105.group11.idatt2105projectbackend.dto.UserRegistrationDTO;
-import idatt2105.group11.idatt2105projectbackend.model.User;
-import idatt2105.group11.idatt2105projectbackend.service.AuthenticationService;
+import edu.ntnu.idatt2105.dto.LoginResponseDTO;
+import edu.ntnu.idatt2105.dto.TokenDTO;
+import edu.ntnu.idatt2105.dto.UserRegistrationDTO;
+import edu.ntnu.idatt2105.model.User;
+import edu.ntnu.idatt2105.service.AuthenticationService;
 import org.springframework.web.bind.annotation.*;
 
 

src/main/java/idatt2105/group11/idatt2105projectbackend/controller/QuestionAnswerController.java → FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/QuestionAnswerController.java

-package idatt2105.group11.idatt2105projectbackend.controller;
+package edu.ntnu.idatt2105.controller;
 
-import idatt2105.group11.idatt2105projectbackend.dto.QuestionAnswerDTO;
-import idatt2105.group11.idatt2105projectbackend.model.QuestionAnswer;
-import idatt2105.group11.idatt2105projectbackend.service.QuestionAnswerService;
+import edu.ntnu.idatt2105.dto.QuestionAnswerDTO;
+import edu.ntnu.idatt2105.model.QuestionAnswer;
+import edu.ntnu.idatt2105.service.QuestionAnswerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

src/main/java/idatt2105/group11/idatt2105projectbackend/controller/QuestionController.java → FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/QuestionController.java

-package idatt2105.group11.idatt2105projectbackend.controller;
+package edu.ntnu.idatt2105.controller;
 
-import idatt2105.group11.idatt2105projectbackend.dto.QuestionDTO;
-import idatt2105.group11.idatt2105projectbackend.model.MultipleChoiceQuestion;
-import idatt2105.group11.idatt2105projectbackend.model.Question;
-import idatt2105.group11.idatt2105projectbackend.service.QuestionService;
+import edu.ntnu.idatt2105.dto.QuestionDTO;
+import edu.ntnu.idatt2105.model.MultipleChoiceQuestion;
+import edu.ntnu.idatt2105.model.Question;
+import edu.ntnu.idatt2105.service.QuestionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/idatt2105/group11/idatt2105projectbackend/controller/QuizController.java → FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/QuizController.java

-package idatt2105.group11.idatt2105projectbackend.controller;
+package edu.ntnu.idatt2105.controller;
 
-import idatt2105.group11.idatt2105projectbackend.dto.*;
-import idatt2105.group11.idatt2105projectbackend.exception.UserNotFoundException;
-import idatt2105.group11.idatt2105projectbackend.model.*;
-import idatt2105.group11.idatt2105projectbackend.service.QuizService;
+
+import edu.ntnu.idatt2105.dto.QuizDTO;
+import edu.ntnu.idatt2105.model.Question;
+import edu.ntnu.idatt2105.model.Quiz;
+import edu.ntnu.idatt2105.model.QuizCategory;
+import edu.ntnu.idatt2105.model.QuizDifficulty;
+import edu.ntnu.idatt2105.service.QuizService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/idatt2105/group11/idatt2105projectbackend/controller/QuizResultController.java → FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/QuizResultController.java

-package idatt2105.group11.idatt2105projectbackend.controller;
+package edu.ntnu.idatt2105.controller;
 
-import idatt2105.group11.idatt2105projectbackend.dto.QuizResultDTO;
-import idatt2105.group11.idatt2105projectbackend.model.QuizResult;
-import idatt2105.group11.idatt2105projectbackend.service.QuizResultService;
+
+import edu.ntnu.idatt2105.dto.QuizResultDTO;
+import edu.ntnu.idatt2105.model.QuizResult;
+import edu.ntnu.idatt2105.service.QuizResultService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/idatt2105/group11/idatt2105projectbackend/controller/UserController.java → FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/UserController.java

-package idatt2105.group11.idatt2105projectbackend.controller;
+package edu.ntnu.idatt2105.controller;
 
 
-import idatt2105.group11.idatt2105projectbackend.model.User;
-import idatt2105.group11.idatt2105projectbackend.service.UserService;
+import edu.ntnu.idatt2105.model.User;
+import edu.ntnu.idatt2105.service.UserService;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;

src/main/java/idatt2105/group11/idatt2105projectbackend/dto/LoginResponseDTO.java → FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/LoginResponseDTO.java

-package idatt2105.group11.idatt2105projectbackend.dto;
+package edu.ntnu.idatt2105.dto;
 
-import idatt2105.group11.idatt2105projectbackend.model.User;
+
+import edu.ntnu.idatt2105.model.User;
 
 public class LoginResponseDTO {
 

src/main/java/idatt2105/group11/idatt2105projectbackend/dto/QuestionAnswerDTO.java → FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/QuestionAnswerDTO.java

-package idatt2105.group11.idatt2105projectbackend.dto;
+package edu.ntnu.idatt2105.dto;
 
 public class QuestionAnswerDTO {
   private Integer id;

src/main/java/idatt2105/group11/idatt2105projectbackend/dto/QuestionDTO.java → FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/QuestionDTO.java

-package idatt2105.group11.idatt2105projectbackend.dto;
+package edu.ntnu.idatt2105.dto;
 
 import java.util.List;
 

src/main/java/idatt2105/group11/idatt2105projectbackend/dto/QuizDTO.java → FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/QuizDTO.java

-package idatt2105.group11.idatt2105projectbackend.dto;
+package edu.ntnu.idatt2105.dto;
 
-import idatt2105.group11.idatt2105projectbackend.model.Quiz;
-import idatt2105.group11.idatt2105projectbackend.model.QuizCategory;
-import idatt2105.group11.idatt2105projectbackend.model.QuizDifficulty;
+
+import edu.ntnu.idatt2105.model.QuizCategory;
+import edu.ntnu.idatt2105.model.QuizDifficulty;
 
 import java.util.List;
 

src/main/java/idatt2105/group11/idatt2105projectbackend/dto/QuizResultDTO.java → FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/QuizResultDTO.java

-package idatt2105.group11.idatt2105projectbackend.dto;
+package edu.ntnu.idatt2105.dto;
 
 import java.time.LocalDateTime;
 import java.util.List;

src/main/java/idatt2105/group11/idatt2105projectbackend/dto/TokenDTO.java → FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/TokenDTO.java

-package idatt2105.group11.idatt2105projectbackend.dto;
+package edu.ntnu.idatt2105.dto;
 
 
 public class TokenDTO {

src/main/java/idatt2105/group11/idatt2105projectbackend/dto/UserDTO.java → FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/UserDTO.java

-package idatt2105.group11.idatt2105projectbackend.dto;
+package edu.ntnu.idatt2105.dto;
 
 import java.util.List;
 

src/main/java/idatt2105/group11/idatt2105projectbackend/dto/UserRegistrationDTO.java → FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/UserRegistrationDTO.java

-package idatt2105.group11.idatt2105projectbackend.dto;
+package edu.ntnu.idatt2105.dto;
 
 public class UserRegistrationDTO {
 

src/main/java/idatt2105/group11/idatt2105projectbackend/exception/QuestionNotFoundException.java → FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/exception/QuestionNotFoundException.java

-package idatt2105.group11.idatt2105projectbackend.exception;
+package edu.ntnu.idatt2105.exception;
 
 public class QuestionNotFoundException extends RuntimeException {
   public QuestionNotFoundException(String message) {

src/main/java/idatt2105/group11/idatt2105projectbackend/exception/QuizNotFoundException.java → FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/exception/QuizNotFoundException.java

-package idatt2105.group11.idatt2105projectbackend.exception;
+package edu.ntnu.idatt2105.exception;
 
 
 public class QuizNotFoundException extends RuntimeException {