Changeset 37307aa

Timestamp:

04/21/26 18:07:57 (3 months ago)

Author:

Andrej <asumanovski@…>

Branches:

master

Children:

89156c1

Parents:

c4c43f3

Message:

env file issue fix

Files:

• .idea/.gitignore (added)
• .idea/compiler.xml (added)
• .idea/copilot.data.migration.ask2agent.xml (added)
• .idea/encodings.xml (added)
• .idea/inspectionProfiles/Project_Default.xml (added)
• .idea/jarRepositories.xml (added)
• .idea/misc.xml (added)
• .idea/modules.xml (added)
• .idea/trekr.iml (added)
• .idea/vcs.xml (added)
• backend/src/main/java/com/trekr/backend/BackendApplication.java (modified) (2 diffs)
• db-scripts/ddl.sql (modified) (1 diff)
• db-scripts/dml.sql (modified) (2 diffs)
• frontend/src/pages/Register/Register.jsx (modified) (4 diffs)

backend/src/main/java/com/trekr/backend/BackendApplication.java

@@ -4 +4 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 
 @SpringBootApplication
@@ -60 +64 @@
         for (String[] candidate : candidates) {
             try {
+                Path envPath = Paths.get(candidate[0], candidate[1]).normalize();
+                if (!Files.isRegularFile(envPath)) {
+                    continue;
+                }
+
                 Dotenv loaded = Dotenv.configure()
-                        .directory(candidate[0])
-                        .filename(candidate[1])
+                        .directory(envPath.getParent().toString())
+                        .filename(envPath.getFileName().toString())
                         .ignoreIfMissing()
                         .load();
-                if (loaded != null && !loaded.entries().isEmpty()) {
+                if (loaded != null) {
                     dotenv = loaded;
                     break;

db-scripts/ddl.sql

@@ -21 +21 @@
 CREATE TABLE USERS (
     user_id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
-    email TEXT NOT NULL,
-    username TEXT NOT NULL,
+    email TEXT NOT NULL UNIQUE,
+    username TEXT NOT NULL UNIQUE,
     password TEXT NOT NULL
 );

db-scripts/dml.sql

@@ -2 +2 @@
 
 INSERT INTO USERS (user_id, email, username, password) VALUES
-(1, 'dimitar@example.com', 'dimitar_arsov', '$2a$10$examplehash1'),
-(2, 'filip@example.com', 'filip_gavrilovski', '$2a$10$examplehash2'),
-(3, 'marko@example.com', 'marko_markovski', '$2a$10$examplehash3'),
+(1, 'dimitar@example.com', 'dimitar_arsov', '1234'),
+(2, 'filip@example.com', 'filip_gavrilovski', '1234'),
+(3, 'marko@example.com', 'marko_markovski', '1234'),
 (4, 'andrej.shumanovski@gmail.com', 'andrej_shumanovski', '1234'),
 (5, 'angelovski.mario222@gmail.com', 'angelovski_mario', '1234'),
-(6, 'ana@example.com', 'ana_ilievska', '$2a$10$examplehash6'),
-(7, 'petar@example.com', 'petar_stojanov', '$2a$10$examplehash7'),
-(8, 'elena@example.com', 'elena_ristova', '$2a$10$examplehash8'),
-(9, 'stefan@example.com', 'stefan_nikolov', '$2a$10$examplehash9'),
-(10, 'ivana@example.com', 'ivana_karapandzova', '$2a$10$examplehash10'),
+(6, 'ana@example.com', 'ana_ilievska', '1234'),
+(7, 'petar@example.com', 'petar_stojanov', '1234'),
+(8, 'elena@example.com', 'elena_ristova', '1234'),
+(9, 'stefan@example.com', 'stefan_nikolov', '1234'),
+(10, 'ivana@example.com', 'ivana_karapandzova', '1234'),
 (11, 'nikola@example.com', 'nikola_ivanov', '1234'),
 (12, 'marija@example.com', 'marija_petrova', '1234'),
@@ -193 +193 @@
 
 INSERT INTO TRAINING_SESSIONS (training_id, training_user_id, duration, calories, date, type) VALUES
-(1, 1, 60, 500, '2026-02-01', 'Running'),
-(2, 2, 45, 400, '2026-02-01', 'Cycling'),
-(3, 3, 30, 300, '2026-02-01', 'Swimming'),
-(4, 4, 50, 420, '2026-02-02', 'HIIT'),
-(5, 5, 40, 350, '2026-02-02', 'Strength'),
-(6, 6, 35, 280, '2026-02-02', 'Yoga'),
-(7, 7, 55, 520, '2026-02-03', 'Running'),
-(8, 8, 45, 390, '2026-02-03', 'Cycling'),
-(9, 9, 30, 260, '2026-02-03', 'Rowing'),
-(10, 10, 60, 480, '2026-02-04', 'Swimming'),
-(11, 11, 50, 430, '2026-02-05', 'Strength'),
-(12, 12, 40, 310, '2026-02-05', 'Yoga'),
-(13, 13, 60, 540, '2026-02-06', 'Running'),
-(14, 14, 35, 260, '2026-02-06', 'Pilates'),
-(15, 15, 45, 390, '2026-02-07', 'Cycling'),
-(16, 16, 55, 460, '2026-02-07', 'HIIT'),
-(17, 17, 30, 240, '2026-02-08', 'Rowing'),
-(18, 18, 65, 520, '2026-02-08', 'Swimming'),
-(19, 19, 50, 440, '2026-02-09', 'Running'),
-(20, 20, 45, 370, '2026-02-09', 'Strength'),
-(21, 11, 35, 300, '2026-02-12', 'Cycling'),
-(22, 13, 30, 260, '2026-02-12', 'Core'),
-(23, 15, 70, 600, '2026-02-13', 'Long Run'),
-(24, 17, 40, 320, '2026-02-13', 'Strength');
+(1, 1, 60, 500, '2026-02-01', 'running'),
+(2, 2, 45, 400, '2026-02-01', 'cycling'),
+(3, 3, 30, 300, '2026-02-01', 'swimming'),
+(4, 4, 50, 420, '2026-02-02', 'hiit'),
+(5, 5, 40, 350, '2026-02-02', 'strength'),
+(6, 6, 35, 280, '2026-02-02', 'yoga'),
+(7, 7, 55, 520, '2026-02-03', 'running'),
+(8, 8, 45, 390, '2026-02-03', 'cycling'),
+(9, 9, 30, 260, '2026-02-03', 'rowing'),
+(10, 10, 60, 480, '2026-02-04', 'swimming'),
+(11, 11, 50, 430, '2026-02-05', 'strength'),
+(12, 12, 40, 310, '2026-02-05', 'yoga'),
+(13, 13, 60, 540, '2026-02-06', 'running'),
+(14, 14, 35, 260, '2026-02-06', 'pilates'),
+(15, 15, 45, 390, '2026-02-07', 'cycling'),
+(16, 16, 55, 460, '2026-02-07', 'hiit'),
+(17, 17, 30, 240, '2026-02-08', 'rowing'),
+(18, 18, 65, 520, '2026-02-08', 'swimming'),
+(19, 19, 50, 440, '2026-02-09', 'running'),
+(20, 20, 45, 370, '2026-02-09', 'strength'),
+(21, 11, 35, 300, '2026-02-12', 'cycling'),
+(22, 13, 30, 260, '2026-02-12', 'strength'),
+(23, 15, 70, 600, '2026-02-13', 'running'),
+(24, 17, 40, 320, '2026-02-13', 'strength');
 
 SELECT setval(

frontend/src/pages/Register/Register.jsx

@@ -21 +21 @@
     setError("");
     setIsSubmitting(true);
+
+    const normalizedEmail = email.trim().toLowerCase();
+    const normalizedUsername = username.trim();
+    const normalizedPassword = password;
+
+    if (normalizedUsername.length < 3 || normalizedUsername.length > 50) {
+      setError("Username must be between 3 and 50 characters");
+      setIsSubmitting(false);
+      return;
+    }
+
+    if (normalizedPassword.length < 6) {
+      setError("Password must be at least 6 characters");
+      setIsSubmitting(false);
+      return;
+    }
+
     try {
       const res = await api.post("/auth/register", {
-        email,
-        username,
-        password,
+        email: normalizedEmail,
+        username: normalizedUsername,
+        password: normalizedPassword,
       });
       localStorage.setItem("authToken", res.data.token);
@@ -38 +55 @@
       navigate("/dashboard");
     } catch (err) {
+      const fieldErrors = err?.response?.data?.errors ?? {};
+      const firstFieldError = Object.values(fieldErrors)[0];
       const message =
+        firstFieldError ||
         err?.response?.data?.message ||
-        Object.values(err?.response?.data?.errors ?? {})[0] ||
         "Registration failed";
       setError(message);
@@ -75 +94 @@
           onChange={(e) => setUsername(e.target.value)}
           autoComplete="username"
+          minLength={3}
+          maxLength={50}
           required
         />
@@ -86 +107 @@
           onChange={(e) => setPassword(e.target.value)}
           autoComplete="new-password"
+          minLength={6}
           required
         />