login bool and promise chanining

backend/src/main/java/hu/pazmany/Controller.java

@@ -19,14 +19,14 @@ public class Controller {
     }
 
     @PostMapping("/api/login")
-    public String login(@RequestBody UserLoginDto userLoginDto) {
+    public UserLoginDto login(@RequestBody UserLoginDto userLoginDto) {
         System.out.println(userLoginDto);
         return noteStoreService.authenticate(userLoginDto.getUsername(), userLoginDto.getPassword());
     }
 
     @PostMapping("/api/register")
-    public void register(@RequestBody UserLoginDto userLoginDto) {
-        noteStoreService.register(userLoginDto.getFullName(), userLoginDto.getUsername(), userLoginDto.getPassword());
+    public String register(@RequestBody UserLoginDto userLoginDto) {
+        return noteStoreService.register(userLoginDto.getFullName(), userLoginDto.getUsername(), userLoginDto.getPassword());
     }
 
     @PostMapping("/api/details")

backend/src/main/java/hu/pazmany/NoteStoreService.java

@@ -16,20 +16,35 @@ public class NoteStoreService {
         this.subjectRepository = subjectRepository;
     }
 
-    public String authenticate(String username, String password) {
+    public UserLoginDto authenticate(String username, String password) {
         User user = userRepository.findByUsername(username);
+        UserLoginDto userLoginDto = new UserLoginDto();
+        userLoginDto.setUsername("Usernamen't");
+        userLoginDto.setPassword("Passwordn't");
+        userLoginDto.setFullName("Fullnamen't");
+        userLoginDto.setLoggedIn(false);
         if (user != null && user.getPassword().equals(password)) {
-            return user.getFullName();
+            userLoginDto.setUsername(user.getUsername());
+            userLoginDto.setPassword(user.getPassword());
+            userLoginDto.setFullName(user.getFullName());
+            userLoginDto.setLoggedIn(!user.isLoggedIn());
+            user.setLoggedIn(!user.isLoggedIn());
+            userRepository.save(user);
         }
-        return "Helytelen felhasználónév vagy jelszó!";
+        return userLoginDto;
     }
 
-    public void register(String fullName, String username, String password) {
+    public String register(String fullName, String username, String password) {
+        if (userRepository.findByUsername(username) == null) {
             User user = new User();
             user.setFullName(fullName);
             user.setUsername(username);
             user.setPassword(password);
+            user.setLoggedIn(false);
             userRepository.save(user);
+            return "Successful registration!";
+        }
+        return "User already exists!";
     }
 
     public DocumentDto getDetails(long id, String subjectName) {

backend/src/main/java/hu/pazmany/User.java

@@ -18,6 +18,9 @@ public class User {
     @Column(name = "fullName")
     private String fullName;
 
+    @Column(name = "loggedIn")
+    private boolean loggedIn;
+
     // Getters and setters
 
     public String getUsername() {
@@ -43,4 +46,8 @@ public class User {
     public void setFullName(String fullName) {
         this.fullName = fullName;
     }
+
+    public boolean isLoggedIn() {return loggedIn;}
+
+    public void setLoggedIn(boolean loggedIn) {this.loggedIn = loggedIn;}
 }

backend/src/main/java/hu/pazmany/UserLoginDto.java

@@ -4,6 +4,7 @@ public class UserLoginDto {
     private String fullName;
     private String username;
     private String password;
+    private boolean loggedIn;
 
     public String getFullName() {
         return fullName;
@@ -28,4 +29,8 @@ public class UserLoginDto {
     public void setPassword(String password) {
         this.password = password;
     }
+
+    public boolean isLoggedIn() {return loggedIn;}
+
+    public void setLoggedIn(boolean loggedIn) {this.loggedIn = loggedIn;}
 }

frontend/src/App.vue

@@ -7,6 +7,7 @@ import IntroKomponens from "@/components/intro-komponens.vue";
 
 import {ref} from "vue";
 import BrowseKomponens from "@/components/browse-komponens.vue";
+import axios from "axios";
 // import loggedIn from "@/components/login-komponens.vue"
 const isNotLoggedIn = ref(true);
 
@@ -14,6 +15,46 @@ function setStatus(status){
   isNotLoggedIn.value = !status;
 }
 
+function registerUser(credentials, callback) {
+  return axios.post('http://localhost:8080/api/register', credentials)
+      .then(response => {
+        callback(response.data)
+      })
+      .catch(error => {
+        console.error(error);
+      });
+}
+
+// Prepopulating the database
+  registerUser({fullName: 'Gipsz Jakab', username: 'gipja', password: 'süti'}, function (res) {
+    console.log(res)
+  }).then(() => {
+    registerUser({fullName: 'Kada Zsolt', username: 'kazso', password: 'keksz'}, function (res) {
+      console.log(res)
+    })
+  }).then(() => {
+    return axios.post('http://localhost:8080/api/addsubject', {subjectId: "szofttech", name: "Szoftver Technológia"})
+  }).then(() => {
+      return axios.post('http://localhost:8080/api/setdetails', {
+        id: 1,
+        user: "kazso",
+        subject: "szofttech",
+        title: "1. előadás",
+        description: "tehe",
+        filepath: "1.eloadas_szoftvertechnologia_2024_v1.0.pdf"
+      })
+  }
+  ).then(() => {
+        return axios.post('http://localhost:8080/api/setdetails', {
+          id: 2,
+          user: "kazso",
+          subject: "szofttech",
+          title: "3. előadás",
+          description: "tehee",
+          filepath: "3.eloadas_szoftvertechnologia_2024_v1.0.pdf"
+        })
+      }
+  )
 
 </script>
 

frontend/src/components/browse-komponens.vue

@@ -22,36 +22,6 @@ function getDocumentDetails(id) {
       });
 }
 
-function registerUser(credentials) {
-  axios.post('http://localhost:8080/api/register', credentials)
-      .then(response => {
-        console.log("Sikeres regisztráció!")
-      })
-      .catch(error => {
-        console.error('Sikertelen regisztráció!', error);
-      });
-}
-
-// Prepopulating the database
-registerUser({fullName: 'Kada Zsolt', username: 'kazso', password: 'keksz'})
-axios.post('http://localhost:8080/api/addsubject', {subjectId: "szofttech", name: "Szoftver Technológia"})
-axios.post('http://localhost:8080/api/setdetails', {
-  id: 1,
-  user: "kazso",
-  subject: "szofttech",
-  title: "1. előadás",
-  description: "tehe",
-  filepath: "1.eloadas_szoftvertechnologia_2024_v1.0.pdf"
-})
-axios.post('http://localhost:8080/api/setdetails', {
-  id: 1,
-  user: "kazso",
-  subject: "szofttech",
-  title: "3. előadás",
-  description: "tehee",
-  filepath: "3.eloadas_szoftvertechnologia_2024_v1.0.pdf"
-})
-
 function downloadFile(filename) {
   console.log("Filename:", filename);
   axios({

frontend/src/components/intro-komponens.vue

@@ -6,6 +6,7 @@ import EcosystemIcon from './icons/IconEcosystem.vue'
 import CommunityIcon from './icons/IconCommunity.vue'
 import SupportIcon from './icons/IconSupport.vue'
 import RegisterKomponens from "@/components/register-komponens.vue";
+import axios from "axios";
 </script>
 
 <template>

frontend/src/components/login-komponens.vue

@@ -44,12 +44,19 @@ function login(){
   loggedIn.value = !loggedIn.value
 
   if(loggedIn.value){
-    loginUser({username: 'gipja', password: 'keksz'}, function(response) {
-        userName.value = response
-      //Itt lesz a kitalált user (Gipsz Jakab, keksz) aki megpróbál bejelentkezni
+    loginUser({username: 'gipja', password: 'süti'}, function(response) {
+        userName.value = response["fullName"]
+        //Tessék bool :P
+        const bool = response["loggedIn"];
+        console.log(response)
     })
     btnText.value = "Kijelentkezés"
   } else {
+    loginUser({username: 'gipja', password: 'süti'}, function(response) {
+      //Tessék bool :P
+      const bool = response["loggedIn"];
+      console.log(response)
+    })
     userName.value = ""
     btnText.value = "Bejelentkezés"
   }

frontend/src/components/register-komponens.vue

@@ -2,18 +2,20 @@
 
 import axios from "axios";
 
-function registerUser(credentials) {
+function registerUser(credentials, callback) {
   axios.post('http://localhost:8080/api/register', credentials)
       .then(response => {
-        console.log("Sikeres regisztráció!")
+        callback(response.data)
       })
       .catch(error => {
-        console.error('Sikertelen regisztráció!', error);
+        console.error(error);
       });
 }
 
 function register(){
-  registerUser({fullName: 'Gipsz Jakab', username: 'gipja', password: 'keksz'})
+  registerUser({fullName: 'Joe', username: 'joe', password: 'Mama'}, function (res) {
+    console.log(res)
+  })
 }
 </script>