diff --git a/api/util/authentication.py b/api/util/authentication.py
index 43b147a..021399a 100644
--- a/api/util/authentication.py
+++ b/api/util/authentication.py
@@ -45,7 +45,6 @@ def authenticate_user(db, username: str, password: str):
if not user:
return False
if not verify_password(password, user.hashed_password):
- print("WHY")
return False
return user
diff --git a/app/package.json b/app/package.json
index d7b658b..2d2f2ed 100644
--- a/app/package.json
+++ b/app/package.json
@@ -29,7 +29,7 @@
"globals": "^15.11.0",
"typescript": "~5.6.2",
"typescript-eslint": "^8.11.0",
- "vite": "^6.0.2"
+ "vite": "^6.0.3"
},
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
}
diff --git a/app/src/App.tsx b/app/src/App.tsx
index 06ead3b..54a500d 100644
--- a/app/src/App.tsx
+++ b/app/src/App.tsx
@@ -7,7 +7,6 @@ import {
import Login from './components/Login';
import Signup from './components/Signup';
import Dashboard from './components/Dashboard';
-import CreateLink from './components/CreateLink';
function App() {
return (
@@ -17,7 +16,6 @@ function App() {
} />
} />
} />
- } />
);
diff --git a/app/src/components/CreateLink.tsx b/app/src/components/CreateLink.tsx
deleted file mode 100644
index a6456f1..0000000
--- a/app/src/components/CreateLink.tsx
+++ /dev/null
@@ -1,100 +0,0 @@
-import { useState, FormEvent, useEffect } from 'react';
-import createStyles from '../styles/Create.module.css';
-import styles from '../styles/Auth.module.css';
-import { Link } from 'react-router-dom';
-import axios from 'axios';
-import Navbar from './Navbar';
-import { useNavigate } from 'react-router-dom';
-
-function CreateLink() {
- document.title = 'LinkLogger | Create Short Link';
-
- const [link, setLink] = useState('');
- const [url, setURL] = useState('');
- const [isSubmitting, setIsSubmitting] = useState(false);
- const [isCopied, setIsCopied] = useState(false);
- const [error, setError] = useState(null);
- const navigate = useNavigate();
-
- // Get /api/users/me to make sure the user is logged in, and
- // to get the username for rendering on screen
- useEffect(() => {
- axios
- .get('/api/users/me')
- .then((res) => {
- if (res.status != 200) {
- navigate('/login');
- }
- })
- .catch(() => {
- navigate('/login');
- });
- }, []);
-
- const handleSubmit = async (e: FormEvent) => {
- e.preventDefault();
- setIsSubmitting(true);
- try {
- const res = await axios.post('/api/links', { url });
- if (res.status === 200) {
- setLink(res.data.link);
- }
- } catch (error) {
- setError('STRANGE');
- }
- };
-
- const copyLink = () => {
- navigator.clipboard.writeText(`${window.location.origin}/c/${link}`);
- setIsCopied(true);
- // Wait 5 seconds, then set isCopied back to false
- setTimeout(() => {
- setIsCopied(false);
- }, 5000);
- };
-
- return (
- <>
-
-
-
Create a new short link by entering the long URL below
-
- {error}
-
-
-
-
-
-
- Click here
- {' '}
- to visit your dashboard.
-
-
-
- );
-}
-
-export default CreateLink;
diff --git a/app/src/components/Dashboard.tsx b/app/src/components/Dashboard.tsx
index d699efb..913b566 100644
--- a/app/src/components/Dashboard.tsx
+++ b/app/src/components/Dashboard.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, FormEvent } from 'react';
import axios from 'axios';
import styles from '../styles/Dashboard.module.css';
import { useNavigate, Link } from 'react-router-dom';
@@ -28,6 +28,14 @@ function Dashboard() {
expire_date: string;
}
+ // Link creation states
+ const [link, setLink] = useState('');
+ const [url, setURL] = useState('');
+ const [isSubmitting, setIsSubmitting] = useState(false);
+ const [isCopied, setIsCopied] = useState(false);
+ const [error, setError] = useState(null);
+
+ // Log and link states
const [links, setLinks] = useState([]);
const [logs, setLogs] = useState([]);
const [visibleLog, setVisibleLog] = useState(null);
@@ -35,6 +43,37 @@ function Dashboard() {
const [loadingLogs, setLoadingLogs] = useState(true); // Track loading state for logs
const navigate = useNavigate();
+ // Handle form submission to create a new link
+ const handleSubmit = async (e: FormEvent) => {
+ e.preventDefault();
+ setIsSubmitting(true);
+ try {
+ const res = await axios.post('/api/links', { url });
+ if (res.status === 200) {
+ setLink(res.data.link);
+ }
+ } catch (error: unknown) {
+ if (axios.isAxiosError(error)) {
+ const customErrorMessage = error.response?.data?.error || null;
+ setError(customErrorMessage || 'An error occurred. Please try again.');
+ setIsSubmitting(false);
+ } else {
+ setError('Unknown error. Please try again.');
+ setIsSubmitting(false);
+ }
+ }
+ };
+
+ // Copy the link to the clipboard
+ const copyLink = () => {
+ navigator.clipboard.writeText(`${window.location.origin}/c/${link}`);
+ setIsCopied(true);
+ // Wait 5 seconds, then set isCopied back to false
+ setTimeout(() => {
+ setIsCopied(false);
+ }, 5000);
+ };
+
// Fetch links from API
useEffect(() => {
axios
@@ -130,6 +169,36 @@ function Dashboard() {
return (
<>
+
+
+
Create a new short link by entering the long URL below
+
+
+ {error}
+
+
+
{/* Show loading spinner if either links or logs are still loading */}
{loadingLinks || loadingLogs ? (
diff --git a/app/src/components/Signup.tsx b/app/src/components/Signup.tsx
index 0822c46..300f189 100644
--- a/app/src/components/Signup.tsx
+++ b/app/src/components/Signup.tsx
@@ -66,9 +66,9 @@ function Signup() {