react added to resourses

build.gradle

@@ -17,7 +17,7 @@ repositories {
 
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
-	implementation group: 'org.springframework', name: 'spring-web', version: '6.1.4'
+	implementation 'org.springframework:spring-web:6.1.4'
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	developmentOnly 'org.springframework.boot:spring-boot-devtools'
 	implementation 'mysql:mysql-connector-java:8.0.32'
@@ -28,7 +28,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	//implementation 'com.okta.spring:okta-spring-boot-starter:3.0.6'
 	compileOnly 'org.projectlombok:lombok'
-	compileOnly 'javax.servlet:javax.servlet-api:4.0.1'
+	compileOnly 'javax.servlet:javax.servlet-api:3.1.0'
 	developmentOnly 'org.springframework.boot:spring-boot-devtools'
 	annotationProcessor 'org.projectlombok:lombok'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'

src/main/java/com/unit3project/demo/Controllers/AuthController.java

@@ -37,7 +37,5 @@ public User getUserFromSession(HttpSession session) {
         return userOpt.get();
     }
 
-    //@GetMapping("/register")
-
 
 }

src/main/java/com/unit3project/demo/Controllers/api/AuthApiController.java

@@ -0,0 +1,49 @@
+package com.unit3project.demo.Controllers.api;
+
+import com.unit3project.demo.Controllers.AuthController;
+import com.unit3project.demo.Models.DTO.LogInDTO;
+import com.unit3project.demo.Models.Data.UserRepository;
+import com.unit3project.demo.Models.User;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@CrossOrigin//(origins = "http://localhost:5173", maxAge = 3600)
+@RestController
+@RequestMapping("/api")
+public class AuthApiController extends AuthController {
+
+
+
+    @Autowired
+    UserRepository userRepository;
+
+    @GetMapping("/user")
+    //@ResponseStatus(value= HttpStatus.OK)
+    public List<User> printUser(@RequestParam("username") String username, @RequestParam("password") String password) {
+        List<User> testList = new ArrayList<>();
+        LogInDTO testForm = new LogInDTO();
+        testForm.setUsername(username);
+        testForm.setPassword(password);
+        User testUser = new User(testForm.getUsername(), testForm.getPassword());
+        User testUser2 = new User("karl","654321");
+        testUser.setName("Eric");
+        testUser2.setName("Karl");
+        testList.add(testUser);
+        testList.add(testUser2);
+        userRepository.save(testUser);
+        userRepository.save((testUser2));
+        return testList;
+    }
+
+    /*@PostMapping("/user")
+    public @ResponseBody String setUser() {
+        User testUser =new User("eric", "123456");
+
+         return testUser.toString();
+    }*/
+
+}

src/main/java/com/unit3project/demo/Models/Itinerary.java

@@ -1,5 +1,5 @@
 package com.unit3project.demo.Models;
 
-public class Itinerary extends Park{
+public class Itinerary extends AbstractEntity{
     //properties, getters/setters, how many itineraries can each user have?
 }

src/main/java/com/unit3project/demo/Models/User.java

@@ -24,9 +24,10 @@ public int hashCode() {
 
     public User() {}
 
-    public User(String userName, String pwHash) {
+    public User(String userName, String password) {
+        super();
         this.userName = userName;
-        this.pwHash = pwHash;
+        this.pwHash = encoder.encode(password);
     }
 
     private static final BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
@@ -43,6 +44,14 @@ public void setUserName(String userName) {
         this.userName = userName;
     }
 
+    @Override
+    public String toString() {
+        return "User{" +
+                "id'" + getId() + '\'' +
+                "userName='" + userName + '\'' +
+                '}';
+    }
+
     public void setPwHash(String pwHash) {
         this.pwHash = pwHash;
     }

src/main/java/com/unit3project/demo/WebApplicationConfig.java

@@ -0,0 +1,20 @@
+package com.unit3project.demo;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/*@Configuration
+public class WebApplicationConfig implements WebMvcConfigurer {
+
+    @Bean
+    public AuthenticationFilter authenticationFilter() {
+        return new AuthenticationFilter();
+    }
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry){
+        registry.addInterceptor(authenticationFilter());
+    }
+}*/

src/main/resources/static/js/national-park-app/src/assets/components/LogInForm.jsx

@@ -1,5 +1,5 @@
 // filler page to test react routing
-import { useState } from "react";
+import React from "react";
 
 const LogInForm = () => {
     return (

src/main/resources/static/js/national-park-app/src/main.jsx

@@ -1,10 +1,21 @@
 import React from 'react'
 import ReactDOM from 'react-dom/client'
-import App from './App.jsx'
 import './index.css'
+import Root from "./routes/root"
+import { createBrowserRouter, RouterProvider } from 'react-router-dom'
+import Fetch from './assets/components/Fetch'
+import LogInForm from "./assets/components/LogInForm"
+
+const router = createBrowserRouter([
+  {
+    path: "/",
+    element: <Fetch/>,
+  }
+]);
 
 ReactDOM.createRoot(document.getElementById('root')).render(
   <React.StrictMode>
-    <App />
+    <Root/>//placement for navbar/header element
+    <RouterProvider router={router} />// uses the url path to direct router to react components
   </React.StrictMode>,
 )

src/main/resources/static/js/national-park-app/src/routes/root.jsx

@@ -0,0 +1,13 @@
+import React from 'react'
+import Fetch from "../assets/components/Fetch"
+
+const Root = () => {
+return (
+    <>
+        <div>
+            <h2>Header and navBar</h2>
+        </div>
+    </>
+)
+}
+export default Root;