diff --git a/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/FullstackProsjektApplication.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/FullstackProsjektApplication.java new file mode 100644 index 0000000000000000000000000000000000000000..19fb31bd81ca9c717f745327d9e68332d6dd7c7e --- /dev/null +++ b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/FullstackProsjektApplication.java @@ -0,0 +1,41 @@ +package edu.ntnu.idatt2105; + +import edu.ntnu.idatt2105.model.Role; +import edu.ntnu.idatt2105.model.User; +import edu.ntnu.idatt2105.repository.RoleRepository; +import edu.ntnu.idatt2105.repository.UserRepository; +import org.springframework.boot.CommandLineRunner; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.web.bind.annotation.CrossOrigin; + +import java.util.HashSet; +import java.util.Set; + +@SpringBootApplication +@CrossOrigin(origins = "http://localhost:5173") +public class FullstackProsjektApplication { + + public static void main(String[] args) { + 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/main/java/edu/ntnu/idatt2105/QuizCreationAndTest.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/QuizCreationAndTest.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/QuizCreationAndTest.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/QuizCreationAndTest.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/configuration/SecurityConfiguration.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/configuration/SecurityConfiguration.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/configuration/SecurityConfiguration.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/configuration/SecurityConfiguration.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/AuthenticationController.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/controller/AuthenticationController.java similarity index 87% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/AuthenticationController.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/controller/AuthenticationController.java index 7109197e9c096bdcd374e288bba57e31a5f9b5fe..cb46685a1ef91f8bcb2ad74219dc65f3ed5b29f9 100644 --- a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/AuthenticationController.java +++ b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/controller/AuthenticationController.java @@ -6,15 +6,19 @@ 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.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.*; + @RestController @RequestMapping("/api/auth") @CrossOrigin(origins = "http://localhost:5173") public class AuthenticationController { private final AuthenticationService authService; + private static final Logger logger = LoggerFactory.getLogger(AuthenticationController.class); public AuthenticationController(AuthenticationService authService) { this.authService = authService; @@ -28,6 +32,7 @@ public class AuthenticationController { @PostMapping("/login") public LoginResponseDTO loginUser(@RequestBody UserRegistrationDTO registrationDTO) { + logger.info("Logging in with user " + registrationDTO.toString()); return authService.loginUser(registrationDTO.getName(), registrationDTO.getPassword()); } diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/HelloController.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/controller/HelloController.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/HelloController.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/controller/HelloController.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/QuestionAnswerController.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/controller/QuestionAnswerController.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/QuestionAnswerController.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/controller/QuestionAnswerController.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/QuestionController.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/controller/QuestionController.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/QuestionController.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/controller/QuestionController.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/QuizController.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/controller/QuizController.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/QuizController.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/controller/QuizController.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/QuizResultController.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/controller/QuizResultController.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/QuizResultController.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/controller/QuizResultController.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/UserController.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/controller/UserController.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/controller/UserController.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/controller/UserController.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/LoginResponseDTO.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/dto/LoginResponseDTO.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/LoginResponseDTO.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/dto/LoginResponseDTO.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/QuestionAnswerDTO.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/dto/QuestionAnswerDTO.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/QuestionAnswerDTO.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/dto/QuestionAnswerDTO.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/QuestionDTO.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/dto/QuestionDTO.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/QuestionDTO.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/dto/QuestionDTO.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/QuizDTO.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/dto/QuizDTO.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/QuizDTO.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/dto/QuizDTO.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/QuizResultDTO.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/dto/QuizResultDTO.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/QuizResultDTO.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/dto/QuizResultDTO.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/TokenDTO.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/dto/TokenDTO.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/TokenDTO.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/dto/TokenDTO.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/UserDTO.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/dto/UserDTO.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/UserDTO.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/dto/UserDTO.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/UserRegistrationDTO.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/dto/UserRegistrationDTO.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/dto/UserRegistrationDTO.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/dto/UserRegistrationDTO.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/exception/QuestionNotFoundException.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/exception/QuestionNotFoundException.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/exception/QuestionNotFoundException.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/exception/QuestionNotFoundException.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/exception/QuizNotFoundException.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/exception/QuizNotFoundException.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/exception/QuizNotFoundException.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/exception/QuizNotFoundException.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/exception/UserNotFoundException.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/exception/UserNotFoundException.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/exception/UserNotFoundException.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/exception/UserNotFoundException.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/MultipleChoiceQuestion.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/model/MultipleChoiceQuestion.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/MultipleChoiceQuestion.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/model/MultipleChoiceQuestion.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/Question.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/model/Question.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/Question.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/model/Question.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/QuestionAnswer.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/model/QuestionAnswer.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/QuestionAnswer.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/model/QuestionAnswer.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/Quiz.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/model/Quiz.java similarity index 98% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/Quiz.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/model/Quiz.java index d66280eab4909fa910e7e9106e9c577a59f25e20..fb51e9a7e139b9e132c92f9d60029786b6a4f649 100644 --- a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/Quiz.java +++ b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/model/Quiz.java @@ -6,6 +6,7 @@ import java.util.List; @Entity +@Table(name = "quiz") public class Quiz { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/QuizCategory.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/model/QuizCategory.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/QuizCategory.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/model/QuizCategory.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/QuizDifficulty.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/model/QuizDifficulty.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/QuizDifficulty.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/model/QuizDifficulty.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/QuizResult.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/model/QuizResult.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/QuizResult.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/model/QuizResult.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/Role.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/model/Role.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/Role.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/model/Role.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/User.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/model/User.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/model/User.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/model/User.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/repository/QuestionAnswerRepository.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/repository/QuestionAnswerRepository.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/repository/QuestionAnswerRepository.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/repository/QuestionAnswerRepository.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/repository/QuestionRepository.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/repository/QuestionRepository.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/repository/QuestionRepository.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/repository/QuestionRepository.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/repository/QuizRepository.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/repository/QuizRepository.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/repository/QuizRepository.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/repository/QuizRepository.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/repository/QuizResultRepository.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/repository/QuizResultRepository.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/repository/QuizResultRepository.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/repository/QuizResultRepository.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/repository/RoleRepository.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/repository/RoleRepository.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/repository/RoleRepository.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/repository/RoleRepository.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/repository/UserRepository.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/repository/UserRepository.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/repository/UserRepository.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/repository/UserRepository.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/AuthenticationService.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/service/AuthenticationService.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/AuthenticationService.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/service/AuthenticationService.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/QuestionAnswerService.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/service/QuestionAnswerService.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/QuestionAnswerService.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/service/QuestionAnswerService.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/QuestionService.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/service/QuestionService.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/QuestionService.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/service/QuestionService.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/QuizResultService.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/service/QuizResultService.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/QuizResultService.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/service/QuizResultService.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/QuizService.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/service/QuizService.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/QuizService.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/service/QuizService.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/TokenService.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/service/TokenService.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/TokenService.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/service/TokenService.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/UserService.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/service/UserService.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/service/UserService.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/service/UserService.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/utils/KeyGeneratorUtility.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/utils/KeyGeneratorUtility.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/utils/KeyGeneratorUtility.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/utils/KeyGeneratorUtility.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/utils/RSAKeyProperties.java b/FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/utils/RSAKeyProperties.java similarity index 100% rename from FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/utils/RSAKeyProperties.java rename to FullstackProsjekt/src/backend/main/java/edu/ntnu/idatt2105/utils/RSAKeyProperties.java diff --git a/FullstackProsjekt/src/backend/main/resources/application.properties b/FullstackProsjekt/src/backend/main/resources/application.properties new file mode 100644 index 0000000000000000000000000000000000000000..1ecdc67e36103bae075238695f70cca336ea35ad --- /dev/null +++ b/FullstackProsjekt/src/backend/main/resources/application.properties @@ -0,0 +1,10 @@ +spring.application.name=FullstackProsjekt +server.port = 5173 + +spring.datasource.url=jdbc:h2:tcp://129.241.98.27:9092/~/brainstormer_db +spring.datasource.driverClassName=org.h2.Driver +spring.datasource.username= +spring.datasource.password= +spring.jpa.database-platform=org.hibernate.dialect.H2Dialect +spring.jpa.hibernate.ddl-auto=update + diff --git a/FullstackProsjekt/src/test/java/edu/ntnu/idatt2105/CheckHTTPResponse.java b/FullstackProsjekt/src/backend/test/java/edu/ntnu/idatt2105/CheckHTTPResponse.java similarity index 100% rename from FullstackProsjekt/src/test/java/edu/ntnu/idatt2105/CheckHTTPResponse.java rename to FullstackProsjekt/src/backend/test/java/edu/ntnu/idatt2105/CheckHTTPResponse.java diff --git a/FullstackProsjekt/src/test/java/edu/ntnu/idatt2105/FullstackProsjektApplicationTests.java b/FullstackProsjekt/src/backend/test/java/edu/ntnu/idatt2105/FullstackProsjektApplicationTests.java similarity index 100% rename from FullstackProsjekt/src/test/java/edu/ntnu/idatt2105/FullstackProsjektApplicationTests.java rename to FullstackProsjekt/src/backend/test/java/edu/ntnu/idatt2105/FullstackProsjektApplicationTests.java diff --git a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/FullstackProsjektApplication.java b/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/FullstackProsjektApplication.java deleted file mode 100644 index 68ec13512b7b3003383783144b47aa6d2b879f1e..0000000000000000000000000000000000000000 --- a/FullstackProsjekt/src/main/java/edu/ntnu/idatt2105/FullstackProsjektApplication.java +++ /dev/null @@ -1,13 +0,0 @@ -package edu.ntnu.idatt2105; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class FullstackProsjektApplication { - - public static void main(String[] args) { - SpringApplication.run(FullstackProsjektApplication.class, args); - } - -} diff --git a/FullstackProsjekt/src/main/resources/application.properties b/FullstackProsjekt/src/main/resources/application.properties deleted file mode 100644 index 7c02774f3547659ef7de96ba2be247b79da51825..0000000000000000000000000000000000000000 --- a/FullstackProsjekt/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -spring.application.name=FullstackProsjekt