Index: backend/auth_form/models.py
===================================================================
--- backend/auth_form/models.py (revision 67110f7e948d34373d82e0ea0c0d5367e4395627)
+++ backend/auth_form/models.py (revision 1e50206d8d7aa0de982980ec03b956a27854a0eb)
@@ -5,5 +5,5 @@
class UserManager(BaseUserManager):
- def create_user(self, email, password=None, **extra_fields):
+ def create_user(self, email, password=None, full_name=None, **extra_fields):
if not email:
raise ValueError('The Email field but be set')
@@ -11,5 +11,5 @@
extra_fields.setdefault('username', email)
- user = self.model(email=email, **extra_fields)
+ user = self.model(email=email, full_name=full_name, **extra_fields)
user.set_password(password)
user.save(using=self._db)
Index: backend/auth_form/serializers.py
===================================================================
--- backend/auth_form/serializers.py (revision 67110f7e948d34373d82e0ea0c0d5367e4395627)
+++ backend/auth_form/serializers.py (revision 1e50206d8d7aa0de982980ec03b956a27854a0eb)
@@ -4,9 +4,9 @@
from django.contrib.auth.password_validation import validate_password
from rest_framework.exceptions import AuthenticationFailed
-from rest_framework_simplejwt.serializers import TokenObtainPairSerialzer
+from rest_framework_simplejwt.serializers import TokenObtainPairSerializer
User = get_user_model()
-class CustomTokenObtainPairSerializer(TokenObtainPairSerialzer):
+class CustomTokenObtainPairSerializer(TokenObtainPairSerializer):
def validate(self, attrs):
data = super().validate(attrs)
Index: backend/auth_form/views.py
===================================================================
--- backend/auth_form/views.py (revision 67110f7e948d34373d82e0ea0c0d5367e4395627)
+++ backend/auth_form/views.py (revision 1e50206d8d7aa0de982980ec03b956a27854a0eb)
@@ -24,5 +24,7 @@
# If the serializer is not valid, return an error response
+ print(serializer.errors)
return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+
class LoginView(APIView):
Index: frontend/package-lock.json
===================================================================
--- frontend/package-lock.json (revision 67110f7e948d34373d82e0ea0c0d5367e4395627)
+++ frontend/package-lock.json (revision 1e50206d8d7aa0de982980ec03b956a27854a0eb)
@@ -9,4 +9,6 @@
"version": "0.0.0",
"dependencies": {
+ "axios": "^1.9.0",
+ "jwt-decode": "^4.0.0",
"react": "^19.0.0",
"react-dom": "^19.0.0",
@@ -1822,4 +1824,10 @@
"license": "Python-2.0"
},
+ "node_modules/asynckit": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+ "license": "MIT"
+ },
"node_modules/autoprefixer": {
"version": "10.4.21",
@@ -1860,4 +1868,15 @@
}
},
+ "node_modules/axios": {
+ "version": "1.9.0",
+ "resolved": "https://registry.npmjs.org/axios/-/axios-1.9.0.tgz",
+ "integrity": "sha512-re4CqKTJaURpzbLHtIi6XpDv20/CnpXOtjRY5/CU32L8gU8ek9UIivcfvSWvmKEngmVbrUtPpdDwWDWL7DNHvg==",
+ "license": "MIT",
+ "dependencies": {
+ "follow-redirects": "^1.15.6",
+ "form-data": "^4.0.0",
+ "proxy-from-env": "^1.1.0"
+ }
+ },
"node_modules/balanced-match": {
"version": "1.0.2",
@@ -1937,4 +1956,17 @@
}
},
+ "node_modules/call-bind-apply-helpers": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+ "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+ "license": "MIT",
+ "dependencies": {
+ "es-errors": "^1.3.0",
+ "function-bind": "^1.1.2"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
"node_modules/callsites": {
"version": "3.1.0",
@@ -2053,4 +2085,16 @@
"license": "MIT"
},
+ "node_modules/combined-stream": {
+ "version": "1.0.8",
+ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+ "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+ "license": "MIT",
+ "dependencies": {
+ "delayed-stream": "~1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
"node_modules/commander": {
"version": "4.1.1",
@@ -2146,4 +2190,13 @@
"license": "MIT"
},
+ "node_modules/delayed-stream": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+ "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=0.4.0"
+ }
+ },
"node_modules/didyoumean": {
"version": "1.2.2",
@@ -2160,4 +2213,18 @@
"license": "MIT"
},
+ "node_modules/dunder-proto": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+ "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+ "license": "MIT",
+ "dependencies": {
+ "call-bind-apply-helpers": "^1.0.1",
+ "es-errors": "^1.3.0",
+ "gopd": "^1.2.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
"node_modules/eastasianwidth": {
"version": "0.2.0",
@@ -2180,4 +2247,49 @@
"dev": true,
"license": "MIT"
+ },
+ "node_modules/es-define-property": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+ "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+ "license": "MIT",
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/es-errors": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+ "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+ "license": "MIT",
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/es-object-atoms": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+ "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+ "license": "MIT",
+ "dependencies": {
+ "es-errors": "^1.3.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/es-set-tostringtag": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+ "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+ "license": "MIT",
+ "dependencies": {
+ "es-errors": "^1.3.0",
+ "get-intrinsic": "^1.2.6",
+ "has-tostringtag": "^1.0.2",
+ "hasown": "^2.0.2"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
},
"node_modules/esbuild": {
@@ -2548,4 +2660,24 @@
"license": "ISC"
},
+ "node_modules/follow-redirects": {
+ "version": "1.15.9",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+ "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
+ "funding": [
+ {
+ "type": "individual",
+ "url": "https://github.com/sponsors/RubenVerborgh"
+ }
+ ],
+ "license": "MIT",
+ "engines": {
+ "node": ">=4.0"
+ },
+ "peerDependenciesMeta": {
+ "debug": {
+ "optional": true
+ }
+ }
+ },
"node_modules/foreground-child": {
"version": "3.3.1",
@@ -2565,4 +2697,19 @@
}
},
+ "node_modules/form-data": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
+ "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
+ "license": "MIT",
+ "dependencies": {
+ "asynckit": "^0.4.0",
+ "combined-stream": "^1.0.8",
+ "es-set-tostringtag": "^2.1.0",
+ "mime-types": "^2.1.12"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
"node_modules/fraction.js": {
"version": "4.3.7",
@@ -2598,5 +2745,4 @@
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
- "dev": true,
"license": "MIT",
"funding": {
@@ -2612,4 +2758,41 @@
"engines": {
"node": ">=6.9.0"
+ }
+ },
+ "node_modules/get-intrinsic": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+ "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+ "license": "MIT",
+ "dependencies": {
+ "call-bind-apply-helpers": "^1.0.2",
+ "es-define-property": "^1.0.1",
+ "es-errors": "^1.3.0",
+ "es-object-atoms": "^1.1.1",
+ "function-bind": "^1.1.2",
+ "get-proto": "^1.0.1",
+ "gopd": "^1.2.0",
+ "has-symbols": "^1.1.0",
+ "hasown": "^2.0.2",
+ "math-intrinsics": "^1.1.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/get-proto": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+ "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+ "license": "MIT",
+ "dependencies": {
+ "dunder-proto": "^1.0.1",
+ "es-object-atoms": "^1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.4"
}
},
@@ -2687,4 +2870,16 @@
}
},
+ "node_modules/gopd": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+ "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+ "license": "MIT",
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
"node_modules/graphemer": {
"version": "1.4.0",
@@ -2704,9 +2899,35 @@
}
},
+ "node_modules/has-symbols": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+ "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+ "license": "MIT",
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/has-tostringtag": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+ "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+ "license": "MIT",
+ "dependencies": {
+ "has-symbols": "^1.0.3"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
"node_modules/hasown": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
"integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
- "dev": true,
"license": "MIT",
"dependencies": {
@@ -2926,4 +3147,13 @@
}
},
+ "node_modules/jwt-decode": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-4.0.0.tgz",
+ "integrity": "sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=18"
+ }
+ },
"node_modules/keyv": {
"version": "4.5.4",
@@ -3003,4 +3233,13 @@
}
},
+ "node_modules/math-intrinsics": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+ "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+ "license": "MIT",
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
"node_modules/merge2": {
"version": "1.4.1",
@@ -3025,4 +3264,25 @@
"engines": {
"node": ">=8.6"
+ }
+ },
+ "node_modules/mime-db": {
+ "version": "1.52.0",
+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+ "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+ "license": "MIT",
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/mime-types": {
+ "version": "2.1.35",
+ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+ "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+ "license": "MIT",
+ "dependencies": {
+ "mime-db": "1.52.0"
+ },
+ "engines": {
+ "node": ">= 0.6"
}
},
@@ -3462,4 +3722,10 @@
"node": ">= 0.8.0"
}
+ },
+ "node_modules/proxy-from-env": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+ "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+ "license": "MIT"
},
"node_modules/punycode": {
Index: frontend/package.json
===================================================================
--- frontend/package.json (revision 67110f7e948d34373d82e0ea0c0d5367e4395627)
+++ frontend/package.json (revision 1e50206d8d7aa0de982980ec03b956a27854a0eb)
@@ -14,4 +14,6 @@
},
"dependencies": {
+ "axios": "^1.9.0",
+ "jwt-decode": "^4.0.0",
"react": "^19.0.0",
"react-dom": "^19.0.0",
Index: frontend/src/App.tsx
===================================================================
--- frontend/src/App.tsx (revision 67110f7e948d34373d82e0ea0c0d5367e4395627)
+++ frontend/src/App.tsx (revision 1e50206d8d7aa0de982980ec03b956a27854a0eb)
@@ -1,5 +1,5 @@
import { createBrowserRouter, RouterProvider } from "react-router-dom";
import CourseCatalog from "./components/SubjectCatalog/SubjectCatalog";
-import Login from "./pages/Login";
+// import Login from "./pages/Login";
import Register from "./pages/Register";
import "./index.css";
@@ -17,5 +17,5 @@
{
path: "/login",
- element: ,
+ // element: ,
},
{
Index: frontend/src/pages/Login.tsx
===================================================================
--- frontend/src/pages/Login.tsx (revision 67110f7e948d34373d82e0ea0c0d5367e4395627)
+++ frontend/src/pages/Login.tsx (revision 1e50206d8d7aa0de982980ec03b956a27854a0eb)
@@ -1,3 +1,127 @@
-import React from 'react';
+import React, { useState } from "react";
+import axios from "axios";
+import { useNavigate } from "react-router-dom";
+interface LoginForm {
+ email: string;
+ password: string;
+}
+const Login: React.FC = () => {
+ const [formData, setFormData] = useState({
+ email: "",
+ password: "",
+ });
+ const [loading, setLoading] = useState(false);
+ const [error, setError] = useState(null);
+ const navigate = useNavigate();
+
+ const handleChange = (e: React.ChangeEvent) => {
+ setFormData({
+ ...formData,
+ [e.target.name]: e.target.value,
+ });
+ };
+
+ const handleRegister = async (e: React.FormEvent) => {
+ e.preventDefault();
+ setError(null);
+ setLoading(true);
+
+ if (formData.password !== formData.confirmPassword) {
+ setError("Passwords do not match.");
+ setLoading(false);
+ return;
+ }
+
+ try {
+ console.log(formData);
+ const response = await axios
+ .post("http://localhost:8000/auth/register/", {
+ email: formData.email,
+ password: formData.password,
+ confirm_password: formData.confirmPassword,
+ full_name: formData.fullName,
+ })
+ .catch((error) => {
+ console.error(
+ "Registration failed:",
+ error.response?.data || error.message
+ );
+ setError(
+ error.response?.data?.error ||
+ "Registration failed. Please try again."
+ );
+ });
+ // property data does not exist on type 'void'?
+ const { token, userType } = response.data;
+
+ localStorage.setItem("token", token);
+ localStorage.setItem("userType", userType);
+
+ navigate("/");
+ // ovde ne znam sto so err i any da pravam :()
+ } catch (err: any) {
+ setError("Registration failed. Please try again.");
+ } finally {
+ setLoading(false);
+ }
+ };
+ return (
+
+ );
+};
+export default Register;
Index: frontend/src/pages/Register.tsx
===================================================================
--- frontend/src/pages/Register.tsx (revision 67110f7e948d34373d82e0ea0c0d5367e4395627)
+++ frontend/src/pages/Register.tsx (revision 1e50206d8d7aa0de982980ec03b956a27854a0eb)
@@ -1,10 +1,131 @@
-import React from 'react';
+import React, { useState } from "react";
+import axios from "axios";
+import { useNavigate } from "react-router-dom";
+
+interface RegisterForm {
+ email: string;
+ password: string;
+ confirmPassword: string;
+ fullName: string;
+}
const Register: React.FC = () => {
- return (
-
-
-
- )
-}
+ const [formData, setFormData] = useState({
+ email: "",
+ password: "",
+ confirmPassword: "",
+ fullName: "",
+ });
+ const [loading, setLoading] = useState(false);
+ const [error, setError] = useState(null);
+ const navigate = useNavigate();
+
+ const handleChange = (e: React.ChangeEvent) => {
+ setFormData({
+ ...formData,
+ [e.target.name]: e.target.value,
+ });
+ };
+
+ const handleRegister = async (e: React.FormEvent) => {
+ e.preventDefault();
+ setError(null);
+ setLoading(true);
+
+ if (formData.password !== formData.confirmPassword) {
+ setError("Passwords do not match.");
+ setLoading(false);
+ return;
+ }
+
+ try {
+ console.log(formData);
+ const response = await axios
+ .post("http://localhost:8000/auth/register/", {
+ email: formData.email,
+ password: formData.password,
+ confirm_password: formData.confirmPassword,
+ full_name: formData.fullName,
+ })
+ .catch((error) => {
+ console.error(
+ "Registration failed:",
+ error.response?.data || error.message
+ );
+ setError(
+ error.response?.data?.error ||
+ "Registration failed. Please try again."
+ );
+ });
+ // property data does not exist on type 'void'?
+ const { token, userType } = response.data;
+
+ localStorage.setItem("token", token);
+ localStorage.setItem("userType", userType);
+
+ navigate("/");
+ // ovde ne znam sto so err i any da pravam :()
+ } catch (err: any) {
+ setError("Registration failed. Please try again.");
+ } finally {
+ setLoading(false);
+ }
+ };
+ return (
+
+ );
+};
export default Register;