Pa 71 pomodoro UI design and frontend

backend/src/main/java/com/barmjz/productivityapp/pomodoro/PomodoroController.java

@@ -1,21 +1,25 @@
 package com.barmjz.productivityapp.pomodoro;
 import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/api/pomo")
 @AllArgsConstructor
+@CrossOrigin
 public class PomodoroController {
     private final PomodoroService pomoService;
     private final PomodoroUserProxy proxy;
 
     @GetMapping("/")
     public ResponseEntity<Pomodoro> get() {
         try {
+            System.out.println("Get pomo called");
             return ResponseEntity.ok(pomoService.get(proxy.getCurrentUser()));
         } catch (Exception e) {
+            System.out.println("----" + e.getMessage());
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null);
         }
     }
@@ -34,6 +38,7 @@ public ResponseEntity<String> pause(@PathVariable Long remainingTime) {
         try {
             return ResponseEntity.ok(pomoService.pause(remainingTime,proxy.getCurrentUserId()));
         } catch (Exception e) {
+            System.out.println(e.getMessage());
             return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null);
         }
     }

backend/src/main/java/com/barmjz/productivityapp/pomodoro/PomodoroUserProxy.java

@@ -5,8 +5,10 @@
 import lombok.AllArgsConstructor;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Service;
 
 @AllArgsConstructor
+@Service
 public class PomodoroUserProxy {
     private final UserRepo userRepo;
 

backend/src/test/java/com/barmjz/productivityapp/todo_task_category/task/TaskServiceTest.java

@@ -34,14 +34,9 @@ class TaskServiceTest {
     @Mock
     RepeatedTaskRepo repeatedTaskRepo;
 
+    @InjectMocks
     TaskService taskService;
 
-
-    @BeforeEach
-    void setUp() {
-        taskService = new TaskService(userRepo, categoryRepo, oneTimeTaskRepo, repeatedTaskRepo);
-    }
-
     @Test
     void getOneTimeTaskById() {
         // given

frontend/App.js

@@ -6,6 +6,7 @@ import { PasswordRecovery } from "./components/PasswordRecovery";
 import { SignUp } from "./components/SignUp";
 import TodoScreen from "./components/TodoScreen";
 import MindMapScreen from "./components/MindMapScreen";
+import { Pomodoro } from "./components/pomdoro/Pomodoro"
 import { Notes } from "./components/notes-component/Notes-Main";
 import { StatusBar } from 'expo-status-bar';
 import { NavigationContainer } from "@react-navigation/native";
@@ -14,7 +15,6 @@ import { NativeBaseProvider } from "native-base";
 import { AuthContextProvider } from "./store/auth-context";
 import { theme } from "./UI/theme";
 
-
 const Stack = createNativeStackNavigator();
 
 
@@ -23,18 +23,18 @@ export default function App() {
     <NativeBaseProvider theme={theme}>
       <AuthContextProvider>
         <NavigationContainer>
-
           <StatusBar style="dark" />
           <Stack.Navigator screenOptions={{ headerShown: false }}>
-            <Stack.Screen name="MindMap" component={MindMapScreen} />
-            <Stack.Screen name="Todo" component={TodoScreen} />
             <Stack.Screen name="Login" component={Login} />
             <Stack.Screen name="Sign Up" component={SignUp} />
+            <Stack.Screen name="Pomodoro" component={Pomodoro} />
+            <Stack.Screen name="MindMap" component={MindMapScreen} />
+            <Stack.Screen name="Todo" component={TodoScreen} />
             <Stack.Screen
               name="Password Recovery"
               component={PasswordRecovery}
             />
-            {/* <Stack.Screen name="Home" component={Home} /> */}
+            <Stack.Screen name="Home" component={Home} />
             <Stack.Screen name="Notes" component={Notes} />
           </Stack.Navigator>
         </NavigationContainer>

frontend/api/pomodoro.api.js

@@ -0,0 +1,105 @@
+import { BACKEND_URL } from "./const";
+
+export const getPomodoro = async (token) => {
+    const url = `${BACKEND_URL}/api/pomo/`;
+    const response = await fetch(url,{
+        method:"GET" , headers: { Authorization: `Bearer ${token}`}
+    }).catch((error) => {
+        throw new Error("Problem connecting with the server!");
+      });
+    if (response.status !== 200) {
+        throw new Error(response.status);
+    }
+    return response.json();
+}
+
+export const startStudy = async (token) => {
+    const url = `${BACKEND_URL}/api/pomo/`;
+    const response = await fetch(url,{
+        method:"POST" , headers: { Authorization: `Bearer ${token}`}
+    }).catch((error) => {
+        throw new Error("Problem connecting with the server!");
+      });
+    if (response.status !== 200) {
+        throw new Error(response.status);
+    }
+    return response.text();
+}
+
+export const startBreak = async (token) => {
+    const url = `${BACKEND_URL}/api/pomo/break`;
+    const response = await fetch(url,{
+        method:"POST" , headers: { Authorization: `Bearer ${token}`}
+    }).catch((error) => {
+        throw new Error("Problem connecting with the server!");
+      });
+    if (response.status !== 200) {
+        throw new Error(response.status);
+    }
+    return response.text();
+}
+
+export const pause = async (token,remainingTime) => {
+    const url = `${BACKEND_URL}/api/pomo/${remainingTime}/pause`;
+    const response = await fetch(url,{
+        method:"POST" , headers: { Authorization: `Bearer ${token}`}
+    }).catch((error) => {
+        throw new Error("Problem connecting with the server!");
+      });
+    if (response.status !== 200) {
+        throw new Error(response.status);
+    }
+    return response.text();
+}
+
+export const resume = async (token) => {
+    const url = `${BACKEND_URL}/api/pomo/resume`;
+    const response = await fetch(url,{
+        method:"POST" , headers: { Authorization: `Bearer ${token}`}
+    }).catch((error) => {
+        throw new Error("Problem connecting with the server!");
+      });
+    if (response.status !== 200) {
+        throw new Error(response.status);
+    }
+    return response.text();
+}
+
+export const endStudy = async (token) => {
+    const url = `${BACKEND_URL}/api/pomo/endStudy`;
+    const response = await fetch(url,{
+        method:"POST" , headers: { Authorization: `Bearer ${token}`}
+    }).catch((error) => {
+        throw new Error("Problem connecting with the server!");
+    });
+    if (response.status !== 200) {
+        throw new Error(response.status);
+    }
+    return response.text();
+}
+
+export const setPomodoro = async (token, studyTime, breakTime) => {
+    const url = `${BACKEND_URL}/api/pomo/${studyTime}/${breakTime}`;
+    const response = await fetch(url,{
+        method:"PUT" , headers: {Authorization: `Bearer ${token}`}
+    }).catch((error) => {
+        throw new Error("Problem connecting with the server!");
+      });
+    if (response.status !== 200) {
+        throw new Error(response.status);
+    }
+    return response.text();
+}
+
+export const resetPomodoro = async (token) => {
+    const url = `${BACKEND_URL}/api/pomo/reset`;
+    const response = await fetch(url,{
+        method:"POST" , headers: {Authorization: `Bearer ${token}`}
+    }).catch((error) => {
+        throw new Error("Problem connecting with the server!");
+    });
+    if (response.status !== 200) {
+        throw new Error(response.status);
+    }
+    return response.text();
+}

frontend/components/Login.js

@@ -32,7 +32,7 @@ export const Login = ({ navigation }) => {
       const token = await response.text();
       auth.login(token);
       console.log(token)
-      navigation.navigate("Notes");
+      navigation.navigate("Pomodoro");
     } catch (error) {
       toast.show({
         title: error.message,