From a0d572e1c9c32845443e760d6df35d2aef892764 Mon Sep 17 00:00:00 2001 From: Roberto Teigeiro Date: Wed, 11 Jun 2025 19:54:44 -0600 Subject: [PATCH 1/6] fix --- .gitignore | 1 - MtdrSpring/.gitignore | 1 - .../TaskO/config/OracleConfiguration.java | 49 +++++++++++++++++++ .../src/components/pages/login/Login.tsx | 2 +- 4 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 MtdrSpring/backend/api-service/src/main/java/com/springboot/TaskO/config/OracleConfiguration.java diff --git a/.gitignore b/.gitignore index c811d7e..6795807 100644 --- a/.gitignore +++ b/.gitignore @@ -22,7 +22,6 @@ backend/.classpath # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* *~ -MtdrSpring/backend/api-service/src/main/java/com/springboot/TaskO/config/OracleConfiguration.java # See https://help.github.com/articles/ignoring-files/ for more about ignoring files. # dependencies diff --git a/MtdrSpring/.gitignore b/MtdrSpring/.gitignore index d337a5e..8e276f0 100644 --- a/MtdrSpring/.gitignore +++ b/MtdrSpring/.gitignore @@ -2,4 +2,3 @@ **/build/** **/dist/** **/target/** -backend/api-service/src/main/java/com/springboot/TaskO/config/OracleConfiguration.java \ No newline at end of file diff --git a/MtdrSpring/backend/api-service/src/main/java/com/springboot/TaskO/config/OracleConfiguration.java b/MtdrSpring/backend/api-service/src/main/java/com/springboot/TaskO/config/OracleConfiguration.java new file mode 100644 index 0000000..9ff44d9 --- /dev/null +++ b/MtdrSpring/backend/api-service/src/main/java/com/springboot/TaskO/config/OracleConfiguration.java @@ -0,0 +1,49 @@ + + +import oracle.jdbc.pool.OracleDataSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.Environment; + + +import javax.sql.DataSource; +import java.sql.SQLException; +///* +// This class grabs the appropriate values for OracleDataSource, +// The method that uses env, grabs it from the environment variables set +// in the docker container. The method that uses dbSettings is for local testing +// @author: peter.song@oracle.com +// */ +// +// +@Configuration +public class OracleConfiguration { + Logger logger = LoggerFactory.getLogger(DbSettings.class); + @Autowired + private DbSettings dbSettings; + @Autowired + private Environment env; + @Bean + public DataSource dataSource() throws SQLException{ + OracleDataSource ds = new OracleDataSource(); + ds.setDriverType(env.getProperty("driver_class_name")); + logger.info("Using Driver " + env.getProperty("driver_class_name")); + ds.setURL(env.getProperty("db_url")); + logger.info("Using URL: " + env.getProperty("db_url")); + ds.setUser(env.getProperty("db_user")); + logger.info("Using Username " + env.getProperty("db_user")); + ds.setPassword(env.getProperty("dbpassword")); +// For local testing + //ds.setDriverType(dbSettings.getDriver_class_name()); + //logger.info("Using Driver " + dbSettings.getDriver_class_name()); + //ds.setURL(dbSettings.getUrl()); + //logger.info("Using URL: " + dbSettings.getUrl()); + //ds.setUser(dbSettings.getUsername()); + //logger.info("Using Username: " + dbSettings.getUsername()); + //ds.setPassword(dbSettings.getPassword()); + return ds; + } +} \ No newline at end of file diff --git a/MtdrSpring/backend/frontend-service/src/main/frontend/src/components/pages/login/Login.tsx b/MtdrSpring/backend/frontend-service/src/main/frontend/src/components/pages/login/Login.tsx index a900616..f5805c9 100644 --- a/MtdrSpring/backend/frontend-service/src/main/frontend/src/components/pages/login/Login.tsx +++ b/MtdrSpring/backend/frontend-service/src/main/frontend/src/components/pages/login/Login.tsx @@ -11,7 +11,7 @@ import { Lock, User, AlertCircle, Loader2 } from "lucide-react"; import { useSignIn, useUser } from "@clerk/react-router"; import { Alert, AlertDescription } from "@/components/ui/alert"; import oracleLogo from "../../../assets/oracleLogo.svg"; -import styles from './Login.module.css'; +import styles from './login.module.css'; export default function Login() { const navigate = useNavigate(); From 2e295b0dd5c7ab9df7de41145e1209e0b03f165a Mon Sep 17 00:00:00 2001 From: Roberto Teigeiro Date: Wed, 11 Jun 2025 20:13:31 -0600 Subject: [PATCH 2/6] oracleConfig --- .../java/com/springboot/TaskO/config/OracleConfiguration.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/MtdrSpring/backend/api-service/src/main/java/com/springboot/TaskO/config/OracleConfiguration.java b/MtdrSpring/backend/api-service/src/main/java/com/springboot/TaskO/config/OracleConfiguration.java index 9ff44d9..3b695d9 100644 --- a/MtdrSpring/backend/api-service/src/main/java/com/springboot/TaskO/config/OracleConfiguration.java +++ b/MtdrSpring/backend/api-service/src/main/java/com/springboot/TaskO/config/OracleConfiguration.java @@ -1,5 +1,3 @@ - - import oracle.jdbc.pool.OracleDataSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -7,6 +5,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; +import com.springboot.TaskO.config.DbSettings; import javax.sql.DataSource; From 6d96b518253969c92be6d75644cb22b22ebd7945 Mon Sep 17 00:00:00 2001 From: Roberto Teigeiro Date: Wed, 11 Jun 2025 20:28:39 -0600 Subject: [PATCH 3/6] fix --- .../java/com/springboot/TaskO/config/OracleConfiguration.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/MtdrSpring/backend/api-service/src/main/java/com/springboot/TaskO/config/OracleConfiguration.java b/MtdrSpring/backend/api-service/src/main/java/com/springboot/TaskO/config/OracleConfiguration.java index 3b695d9..f651a1c 100644 --- a/MtdrSpring/backend/api-service/src/main/java/com/springboot/TaskO/config/OracleConfiguration.java +++ b/MtdrSpring/backend/api-service/src/main/java/com/springboot/TaskO/config/OracleConfiguration.java @@ -1,3 +1,6 @@ +package com.springboot.TaskO.config; + + import oracle.jdbc.pool.OracleDataSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -5,7 +8,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; -import com.springboot.TaskO.config.DbSettings; import javax.sql.DataSource; From 86572fa6b9bf4052b6c9d2ec919a375f170ebe7d Mon Sep 17 00:00:00 2001 From: Roberto Teigeiro Date: Wed, 11 Jun 2025 20:42:20 -0600 Subject: [PATCH 4/6] fix --- .../src/main/java/com/springboot/TaskO/config/CorsConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MtdrSpring/backend/api-service/src/main/java/com/springboot/TaskO/config/CorsConfig.java b/MtdrSpring/backend/api-service/src/main/java/com/springboot/TaskO/config/CorsConfig.java index a42e88e..418f3cf 100644 --- a/MtdrSpring/backend/api-service/src/main/java/com/springboot/TaskO/config/CorsConfig.java +++ b/MtdrSpring/backend/api-service/src/main/java/com/springboot/TaskO/config/CorsConfig.java @@ -25,7 +25,7 @@ public class CorsConfig { public CorsFilter corsFilter(){ CorsConfiguration config = new CorsConfiguration(); config.setAllowedOrigins(List.of("http://localhost:3000","https://objectstorage.us-phoenix-1.oraclecloud.com", - "https://petstore.swagger.io", "http://localhost:5173")); + "https://petstore.swagger.io", "http://localhost:5173", "https://www.tasko.works")); config.setAllowedMethods(List.of("GET","POST","PUT","OPTIONS","DELETE","PATCH")); // Remove this line as it overrides the previous setAllowedOrigins call // config.setAllowedOrigins(Collections.singletonList("*")); From 2526f8cb5643b15daf8a57d2621a20c88f23dac8 Mon Sep 17 00:00:00 2001 From: Sadracae Date: Thu, 12 Jun 2025 14:39:16 -0600 Subject: [PATCH 5/6] nada --- .../frontend/src/components/pages/home/DeleteSprintDialog.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MtdrSpring/backend/frontend-service/src/main/frontend/src/components/pages/home/DeleteSprintDialog.tsx b/MtdrSpring/backend/frontend-service/src/main/frontend/src/components/pages/home/DeleteSprintDialog.tsx index 605d20d..de3024f 100644 --- a/MtdrSpring/backend/frontend-service/src/main/frontend/src/components/pages/home/DeleteSprintDialog.tsx +++ b/MtdrSpring/backend/frontend-service/src/main/frontend/src/components/pages/home/DeleteSprintDialog.tsx @@ -35,7 +35,7 @@ export function DeleteSprintDialog({ sprintId, sprintName, onDelete }: DeleteSpr } } catch (error) { console.error('Error deleting sprint:', error) - alert('Error deleting sprint. Please try again.') + alert('Error deleting sprint, Please try again.') } finally { setIsDeleting(false) } From 78fcad2f28bd2955aaf481fe769b7db66b4ffb6a Mon Sep 17 00:00:00 2001 From: Sadracae Date: Thu, 12 Jun 2025 16:16:42 -0600 Subject: [PATCH 6/6] sprint order by start date --- .../main/frontend/src/components/pages/home/Sprints.tsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/MtdrSpring/backend/frontend-service/src/main/frontend/src/components/pages/home/Sprints.tsx b/MtdrSpring/backend/frontend-service/src/main/frontend/src/components/pages/home/Sprints.tsx index 856a493..fc84437 100644 --- a/MtdrSpring/backend/frontend-service/src/main/frontend/src/components/pages/home/Sprints.tsx +++ b/MtdrSpring/backend/frontend-service/src/main/frontend/src/components/pages/home/Sprints.tsx @@ -121,7 +121,7 @@ export default function Sprints() { const data = await response.json(); - // Obtener todos los IDs de usuarios únicos que tienen asignee - VERSIÓN MEJORADA + // Obtener todos los IDs de usuarios únicos que tienen assignee - VERSIÓN MEJORADA const assigneeIds = [...new Set( data .map((task: ServerTask) => task.assignee) @@ -411,9 +411,8 @@ export default function Sprints() { ) : ( filteredSprints .sort((a, b) => { - const rateA = getCompletionRate(a.id); - const rateB = getCompletionRate(b.id); - return rateB - rateA; // Sort in descending order + // Sort by start date in descending order (most recent first) + return new Date(b.startDate).getTime() - new Date(a.startDate).getTime(); }) .map((sprint) => { const completionRate = getCompletionRate(sprint.id);