Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion MtdrSpring/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@
**/build/**
**/dist/**
**/target/**
backend/api-service/src/main/java/com/springboot/TaskO/config/OracleConfiguration.java
Original file line number Diff line number Diff line change
Expand Up @@ -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("*"));
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
package com.springboot.TaskO.config;


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;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Loading