Reset your password
+Click the link below to reset your password. It expires in 1 hour.
+ + Reset password + + """ + }) + + return jsonify({"message": "Password reset email sent"}), 200 + + +@user_routes_bp.route('/reset-password', methods=['POST']) +def reset_password(): + data = request.get_json() + token = data.get('token') + new_password = data.get('password') + + if not token or not new_password: + return jsonify({"message": "Token and password are required"}), 400 + + user = db.session.execute( + db.select(User).where(User.reset_token == token) + ).scalar_one_or_none() + + if user is None: + return jsonify({"message": "Invalid or expired token"}), 404 + + user.set_password(new_password) + user.reset_token = None + db.session.commit() + + return jsonify({"message": "Password updated successfully"}), 200 + + + +# codigo de la academia: +@user_routes_bp.route('/hello', methods=['POST', 'GET']) +def handle_hello(): + + response_body = { + "message": "Hello! I'm a message that came from the backend, check the network tab on the google inspector and you will see the GET request" + } + + return jsonify(response_body), 200 \ No newline at end of file diff --git a/src/app.py b/src/app.py index 1b3340c0fa..d507148ea4 100644 --- a/src/app.py +++ b/src/app.py @@ -1,25 +1,32 @@ -""" -This module takes care of starting the API Server, Loading the DB and Adding the endpoints -""" import os from flask import Flask, request, jsonify, url_for, send_from_directory from flask_migrate import Migrate from flask_swagger import swagger +from flask_cors import CORS from api.utils import APIException, generate_sitemap from api.models import db -from api.routes import api +from api.routes.user_routes import user_routes_bp +from api.routes.folder import folders_bp +from api.routes.page import pages_bp +from api.routes.goals import goals_bp from api.admin import setup_admin from api.commands import setup_commands - -# from models import Person +from flask_jwt_extended import JWTManager +from datetime import timedelta +from flask_mail import Mail ENV = "development" if os.getenv("FLASK_DEBUG") == "1" else "production" static_file_dir = os.path.join(os.path.dirname( os.path.realpath(__file__)), '../dist/') app = Flask(__name__) app.url_map.strict_slashes = False +CORS(app, resources={r"/api/*": {"origins": "*"}}) +mail = Mail(app) + +app.config["JWT_SECRET_KEY"] = os.getenv("JWT_SECRET_KEY") +jwt = JWTManager(app) +app.config["JWT_ACCESS_TOKEN_EXPIRES"] = timedelta(days=2) -# database condiguration db_url = os.getenv("DATABASE_URL") if db_url is not None: app.config['SQLALCHEMY_DATABASE_URI'] = db_url.replace( @@ -31,42 +38,32 @@ MIGRATE = Migrate(app, db, compare_type=True) db.init_app(app) -# add the admin setup_admin(app) - -# add the admin setup_commands(app) -# Add all endpoints form the API with a "api" prefix -app.register_blueprint(api, url_prefix='/api') - -# Handle/serialize errors like a JSON object - +app.register_blueprint(user_routes_bp, url_prefix='/api/user') +app.register_blueprint(folders_bp, url_prefix='/api/folders') +app.register_blueprint(pages_bp, url_prefix='/api/pages') +app.register_blueprint(goals_bp, url_prefix='/api/goals') @app.errorhandler(APIException) def handle_invalid_usage(error): return jsonify(error.to_dict()), error.status_code -# generate sitemap with all your endpoints - - @app.route('/') def sitemap(): if ENV == "development": return generate_sitemap(app) return send_from_directory(static_file_dir, 'index.html') -# any other endpoint will try to serve it like a static file @app.route('/
+
+ );
+};
\ No newline at end of file
diff --git a/src/front/components/Folder.jsx b/src/front/components/Folder.jsx
new file mode 100644
index 0000000000..87708d5dbc
--- /dev/null
+++ b/src/front/components/Folder.jsx
@@ -0,0 +1,71 @@
+import { useState } from 'react';
+import '../styles/Folder.css';
+
+const darkenColor = (hex, percent) => {
+ let color = hex.startsWith('#') ? hex.slice(1) : hex;
+ if (color.length === 3) color = color.split('').map(c => c + c).join('');
+ const num = parseInt(color, 16);
+ let r = Math.max(0, Math.min(255, Math.floor(((num >> 16) & 0xff) * (1 - percent))));
+ let g = Math.max(0, Math.min(255, Math.floor(((num >> 8) & 0xff) * (1 - percent))));
+ let b = Math.max(0, Math.min(255, Math.floor((num & 0xff) * (1 - percent))));
+ return '#' + ((1 << 24) + (r << 16) + (g << 8) + b).toString(16).slice(1).toUpperCase();
+};
+
+const Folder = ({ color = '#2D3A4A', size = 1, items = [], className = '' }) => {
+ const maxItems = 3;
+ const papers = items.slice(0, maxItems);
+ while (papers.length < maxItems) papers.push(null);
+
+ const [open, setOpen] = useState(false);
+ const [paperOffsets, setPaperOffsets] = useState(Array.from({ length: maxItems }, () => ({ x: 0, y: 0 })));
+
+ const folderBackColor = darkenColor(color, 0.08);
+ const paper1 = darkenColor('#ffffff', 0.1);
+ const paper2 = darkenColor('#ffffff', 0.05);
+ const paper3 = '#ffffff';
+
+ const handleClick = () => {
+ setOpen(prev => !prev);
+ if (open) setPaperOffsets(Array.from({ length: maxItems }, () => ({ x: 0, y: 0 })));
+ };
+
+ const handlePaperMouseMove = (e, index) => {
+ if (!open) return;
+ const rect = e.currentTarget.getBoundingClientRect();
+ const offsetX = (e.clientX - rect.left - rect.width / 2) * 0.15;
+ const offsetY = (e.clientY - rect.top - rect.height / 2) * 0.15;
+ setPaperOffsets(prev => { const n = [...prev]; n[index] = { x: offsetX, y: offsetY }; return n; });
+ };
+
+ const handlePaperMouseLeave = (e, index) => {
+ setPaperOffsets(prev => { const n = [...prev]; n[index] = { x: 0, y: 0 }; return n; });
+ };
+
+ return (
+
+ {!showConfirm ? (
+ <>
+
+
+
+ break time
+{formatTime(timeLeft)}
+ + + +{tip}
+ + ) : ( +
+
+ )}
+
+ We recommend not skipping your breaks.
+
+ Are you sure you want to continue your pomodoro?
+
+
+
+
+
+
+ );
+};
+
+export default Folder;
\ No newline at end of file
diff --git a/src/front/components/Footer.jsx b/src/front/components/Footer.jsx
index f06302dbd2..8d127706a2 100644
--- a/src/front/components/Footer.jsx
+++ b/src/front/components/Footer.jsx
@@ -1,11 +1,12 @@
-export const Footer = () => (
-
-);
+import "../styles/footer.css";
+
+export const Footer = () => {
+ return (
+
+ );
+};
\ No newline at end of file
diff --git a/src/front/components/GlobalAudioPlayer.jsx b/src/front/components/GlobalAudioPlayer.jsx
new file mode 100644
index 0000000000..c3b1c47e74
--- /dev/null
+++ b/src/front/components/GlobalAudioPlayer.jsx
@@ -0,0 +1,38 @@
+import useGlobalReducer from "../hooks/useGlobalReducer";
+
+export const GlobalAudioPlayer = () => {
+ const { store, dispatch, audioRef } = useGlobalReducer();
+ const { currentPlaylist, currentTrackIndex, isPlaying } = store;
+
+ const playNext = () => {
+ if (!currentPlaylist || currentTrackIndex >= currentPlaylist.sounds.length - 1) return;
+ dispatch({ type: "set_track_index", payload: currentTrackIndex + 1 });
+ };
+
+ const playPrevious = () => {
+ if (!currentPlaylist || currentTrackIndex <= 0) return;
+ dispatch({ type: "set_track_index", payload: currentTrackIndex - 1 });
+ };
+
+ if (!currentPlaylist) return null;
+
+ return (
+
+
+
+ {papers.map((item, i) => (
+
+ handlePaperMouseMove(e, i)}
+ onMouseLeave={e => handlePaperMouseLeave(e, i)}
+ style={open ? { '--magnet-x': `${paperOffsets[i]?.x || 0}px`, '--magnet-y': `${paperOffsets[i]?.y || 0}px` } : {}}
+ >
+ {item}
+
+ ))}
+
+
+
+
+
+
+
+ );
+};
\ No newline at end of file
diff --git a/src/front/components/LoginModal.jsx b/src/front/components/LoginModal.jsx
new file mode 100644
index 0000000000..7391797307
--- /dev/null
+++ b/src/front/components/LoginModal.jsx
@@ -0,0 +1,158 @@
+import "../styles/loginModal.css";
+import { useState } from "react";
+import { loginUser, forgotPassword } from "../services/loginBS";
+import { useNavigate } from "react-router-dom";
+
+export const LoginModal = ({ onClose, onSwitchToRegister }) => {
+
+ const [user, setUser] = useState({ email: "", password: "" });
+ const [error, setError] = useState("");
+ const [showPassword, setShowPassword] = useState(false);
+ const [view, setView] = useState("login");
+ const [forgotEmail, setForgotEmail] = useState("");
+ const [forgotMessage, setForgotMessage] = useState("");
+ const navigate = useNavigate();
+
+ const handleOverlayClick = (e) => {
+ if (e.target === e.currentTarget) onClose();
+ };
+
+ const handleChange = (e) => {
+ setUser({ ...user, [e.target.name]: e.target.value });
+ };
+
+ const handleSubmit = async (e) => {
+ e.preventDefault();
+ if (!user.email || !user.password) {
+ setError("All fields are required.");
+ return;
+ }
+ try {
+ const data = await loginUser({ ...user, email: user.email.trim().toLowerCase() });
+ localStorage.setItem("token", data.token);
+ onClose();
+ navigate("/home");
+ } catch (err) {
+ setError(err.message);
+ }
+ };
+
+ const handleForgot = async (e) => {
+ e.preventDefault();
+ if (!forgotEmail) { setForgotMessage("Please enter your email."); return; }
+ try {
+ await forgotPassword(forgotEmail.trim().toLowerCase());
+ setForgotMessage("Check your email for the reset link!");
+ } catch (err) {
+ setForgotMessage(err.message);
+ }
+ };
+
+ return (
+
+
+ );
+};
\ No newline at end of file
diff --git a/src/front/components/Navbar.jsx b/src/front/components/Navbar.jsx
index 30d43a2636..b4738e036b 100644
--- a/src/front/components/Navbar.jsx
+++ b/src/front/components/Navbar.jsx
@@ -1,19 +1,282 @@
-import { Link } from "react-router-dom";
+import { Link, useLocation, useNavigate } from "react-router-dom";
+import "../styles/Navbar.css";
+import { useState, useEffect } from "react";
+import { LoginModal } from "./LoginModal";
+import { RegisterModal } from "./RegisterModal";
+import { getGoals, updateGoal, deleteGoal, createGoal } from "./goals/GoalsService";
+
+const backend_url = import.meta.env.VITE_BACKEND_URL;
export const Navbar = () => {
+ const location = useLocation();
+ const navigate = useNavigate();
+ const [isLoggedIn, setIsLoggedIn] = useState(false);
+ const [isDropdownOpen, setIsDropdownOpen] = useState(false);
+ const [showLogin, setShowLogin] = useState(false);
+ const [showRegister, setShowRegister] = useState(false);
+ const [user, setUser] = useState(null);
+
+ const [showGoalsModal, setShowGoalsModal] = useState(false);
+ const [goals, setGoals] = useState([]);
+ const [editingId, setEditingId] = useState(null);
+ const [editingText, setEditingText] = useState("");
+ const [newGoalText, setNewGoalText] = useState("");
+
+ useEffect(() => {
+ const token = localStorage.getItem("token");
+ setIsLoggedIn(!!token);
+ if (token) fetchUser();
+ }, [location]);
+
+ useEffect(() => {
+ const handleClickOutside = (e) => {
+ if (!e.target.closest(".user-dropdown-container")) {
+ setIsDropdownOpen(false);
+ }
+ };
+ document.addEventListener("mousedown", handleClickOutside);
+ return () => document.removeEventListener("mousedown", handleClickOutside);
+ }, []);
+
+ const fetchUser = async () => {
+ const res = await fetch(`${backend_url}/api/user/profile`, {
+ headers: { Authorization: `Bearer ${localStorage.getItem("token")}` }
+ });
+ if (!res.ok) return;
+ const data = await res.json();
+ setUser(data);
+ };
+
+ const fetchGoals = async () => {
+ const data = await getGoals();
+ if (data) setGoals(data.filter(g => g));
+ };
+
+ const handleLogout = () => {
+ localStorage.removeItem("token");
+ setIsLoggedIn(false);
+ setUser(null);
+ window.location.href = "/";
+ };
+
+ const openGoalsModal = () => {
+ fetchGoals();
+ setShowGoalsModal(true);
+ };
+
+ const saveEdit = async (id) => {
+ if (!editingText.trim()) return;
+ const data = await updateGoal(id, { title: editingText });
+ if (!data?.goal) return;
+ setGoals(goals.map(g => g.id === id ? data.goal : g));
+ setEditingId(null);
+ setEditingText("");
+ };
+
+ const handleDelete = async (id) => {
+ await deleteGoal(id);
+ setGoals(goals.filter(g => g.id !== id));
+ if (selectedGoal === id) setSelectedGoal(null);
+ };
+
+ const handleCreateGoal = async () => {
+ if (!newGoalText.trim()) return;
+ const data = await createGoal(newGoalText.trim(), newGoalText.trim());
+ if (!data?.goal) return;
+ setGoals([...goals, data.goal]);
+ setNewGoalText("");
+ window.dispatchEvent(new Event("goals:updated"));
+ };
+
+ const handleCreateGoalAndGo = async () => {
+ if (newGoalText.trim()) {
+ await handleCreateGoal();
+ }
+ setShowGoalsModal(false);
+ navigate("/goals");
+ };
+
+ const changeStatus = async (id, status) => {
+ const data = await updateGoal(id, { status });
+ if (!data?.goal) return;
+ setGoals(goals.map(g => g.id === id ? data.goal : g));
+ };
+
+ const getInitial = () => {
+ if (!user) return "U";
+ return (user.name || user.email || "U")[0].toUpperCase();
+ };
+
+ const renderAvatar = () => {
+ if (!user?.avatar_url) return getInitial();
+ if (user.avatar_url.startsWith("http")) {
+ return
+
+
+
+ {view === "login" ? (
+ <>
+
+ log in
+ + + ++ Don't have an account?{" "} + + Sign up + +
+ + ) : ( + <> +reset password
+ ++ Enter your email to receive a reset link. +
+ + + ++ setView("login")}> + ← Back to log in + + {" · "} + + Sign up + +
+ + )} + + setShowGoalsModal(false)}>
+
+ )}
+
+ {showLogin && (
+ e.stopPropagation()}>
+
+
+
+
+
+ Your Goals
+ +
+ {goals.length === 0 && (
+
+
+
+
+ )}
+ {goals.map(goal => (
+ + No goals yet. Create one! +
+
+ setNewGoalText(e.target.value)}
+ onKeyDown={e => e.key === "Enter" && handleCreateGoal()}
+ autoFocus
+ />
+
+
+
+
+ ))}
+
+ {editingId === goal.id ? (
+ setEditingText(e.target.value)}
+ onBlur={() => saveEdit(goal.id)}
+ onKeyDown={e => e.key === "Enter" && saveEdit(goal.id)}
+ autoFocus
+ />
+ ) : (
+ { setEditingId(goal.id); setEditingText(goal.title); }}>
+ {goal.title}
+
+ )}
+
+
+
+
+
+
+
+ {["urgent", "progress", "done"].map(s => (
+
+ ))}
+
+
+
+
+
+
+
+
+
+ setTitle(e.target.value)}
+ />
+
+ + {editingPageId ? "Editing page" : "start writing..."} +
+
+ {saved && ✓ saved}
+
+
+
+
+
+
+ {showDropdown && (
+
+
+
+
+
+
+
+ )}
+