navigation fixed in Verify + transitions specified

mraron · Sep 29, 2023 · 2c1895f · 2c1895f
2 parents 1a8970a + 8b7fe2d
commit 2c1895f
Show file tree

Hide file tree

Showing 19 changed files with 153 additions and 174 deletions.
diff --git a/frontend/build/locales/en/translation.json b/frontend/build/locales/en/translation.json
@@ -56,6 +56,11 @@
         "unsuccessful_settings_save": "The settings couldn't be saved.",
         "successful_password_change": "The password has been changed successfully."
     },
+    "tag_modal": {
+        "title": "Change tags",
+        "cancel": "Cancel",
+        "save": "Save"
+    },
     "tag": {
         "dp": "dynamic programming",
         "greedy": "greedy",

diff --git a/frontend/build/locales/hu/translation.json b/frontend/build/locales/hu/translation.json
@@ -56,6 +56,11 @@
         "unsuccessful_settings_save": "A beállítások mentése nem sikerült.",
         "successful_password_change": "A jelszóváltoztatás sikeres volt."
     },
+    "tag_modal": {
+        "title": "Címkék módosítása",
+        "cancel": "Mégse",
+        "save": "Mentés"
+    },
     "tag": {
         "dp": "dinamikus programozás",
         "greedy": "mohó",

diff --git a/frontend/build/static/css/main.b6c49d21.css b/frontend/build/static/css/main.b6c49d21.css
diff --git a/frontend/build/static/css/main.b6c49d21.css.map b/frontend/build/static/css/main.b6c49d21.css.map
diff --git a/frontend/build/static/js/main.fc656d11.js b/frontend/build/static/js/main.fc656d11.js
diff --git a/frontend/build/static/js/main.fc656d11.js.LICENSE.txt b/frontend/build/static/js/main.fc656d11.js.LICENSE.txt
diff --git a/frontend/build/static/js/main.fc656d11.js.map b/frontend/build/static/js/main.fc656d11.js.map
diff --git a/frontend/src/components/concrete/other/ProfileSidebar.js b/frontend/src/components/concrete/other/ProfileSidebar.js
@@ -77,8 +77,8 @@ function SubmissionsFrame({ titleComponent, submissions }) {
             <td className="padding-td-default">
                 <Link
                     className="link"
-                    to={routeMap.problem.replace(":problem", item.problem)}>
-                    {item.problem}
+                    to={item.problem.href}>
+                    {item.problem.text}
                 </Link>
             </td>
         </tr>
@@ -93,7 +93,6 @@ function SubmissionsFrame({ titleComponent, submissions }) {
 function ProfileSideBar() {
     const { t } = useTranslation();
     const { userData, isLoggedIn } = useContext(UserContext);
-    console.log(isLoggedIn + " ??? ")
     const titleComponent = (
         <SVGTitleComponent
             svg={

diff --git a/frontend/src/config/RouteConfig.js b/frontend/src/config/RouteConfig.js
@@ -20,7 +20,7 @@ export const routeMap = {
     admin: "/user/admin/",
 };
 
-const apiRoot = "https://127.0.0.1:5555/api/v2";
+const apiRoot = "http://localhost:5555/api/v2";
 
 export function apiRoute(route) {
     console.log(`${apiRoot}${route}`);

diff --git a/frontend/src/util/auth.js b/frontend/src/util/auth.js
@@ -9,6 +9,7 @@ export async function login(username, password) {
             username: username,
             password: password,
         }),
+        credentials: 'include',
     };
     try {
         const response = await fetch(
@@ -32,6 +33,7 @@ export async function register(username, email, password, passwordConfirm) {
             password: password,
             passwordConfirm: passwordConfirm,
         }),
+        credentials: 'include',
     };
     try {
         const response = await fetch(
@@ -67,7 +69,10 @@ export async function logout() {
 
 export async function authenticate() {
     try {
-        const response = await fetch(apiRoute("/user/auth/"));
+        const requestOptions = {
+            credentials: 'include',
+        };
+        const response = await fetch(apiRoute("/user/auth/"), requestOptions);
         const data = await response.json();
         return data.userData;
     } catch (error) {

diff --git a/frontend/src/util/settings.js b/frontend/src/util/settings.js
@@ -8,6 +8,7 @@ export async function saveSettings(user, showUnsolved, hideSolved) {
             showUnsolved: showUnsolved,
             hideSolved: hideSolved,
         }),
+        credentials: 'include',
     };
     console.log(
         apiRoute(`/user/profile/${encodeURIComponent(user)}/settings/other/`),
@@ -29,6 +30,7 @@ export async function changePassword(user, oldPw, newPw, newPwConfirm) {
             newPw: newPw,
             newPwConfirm: newPwConfirm,
         }),
+        credentials: 'include',
     };
     const response = await fetch(
         apiRoute(

diff --git a/frontend/src/util/submitSolution.js b/frontend/src/util/submitSolution.js
@@ -13,6 +13,7 @@ async function submitSolution({ problem, language, file, submissionCode }) {
     const requestOptions = {
         method: "POST",
         body: formData,
+        credentials: 'include',
     };
     const response = await fetch(
         apiRoute("/problemset/main/submit/"),