Merge remote-tracking branch 'origin/develop' into #955-footer1200media

ita-social-projects · Nov 28, 2024 · 5f83600 · 5f83600
2 parents 6b91f4a + ebcf9e8
commit 5f83600
Show file tree

Hide file tree

Showing 127 changed files with 2,790 additions and 2,312 deletions.
diff --git a/BackEnd/forum/pagination.py b/BackEnd/forum/pagination.py
@@ -7,6 +7,12 @@ class ForumPagination(PageNumberPagination):
     page_size_query_param = "page_size"
     max_page_size = 64
 
+    def get_page_number(self, request, paginator):
+        page_number = super().get_page_number(request, paginator)
+        if int(page_number) > paginator.num_pages:
+            page_number = paginator.num_pages or 1
+        return page_number
+
     def get_paginated_response(self, data):
         return Response(
             {

diff --git a/FrontEnd/public/favicon-16x16.png b/FrontEnd/public/favicon-16x16.png
diff --git a/FrontEnd/public/favicon-32x32.png b/FrontEnd/public/favicon-32x32.png
diff --git a/FrontEnd/public/favicon.ico b/FrontEnd/public/favicon.ico
diff --git a/FrontEnd/public/forum-logo.ico b/FrontEnd/public/forum-logo.ico
diff --git a/FrontEnd/public/img/cookies.png b/FrontEnd/public/img/cookies.png
diff --git a/FrontEnd/public/svg/arrow-down.svg b/FrontEnd/public/svg/arrow-down.svg
diff --git a/FrontEnd/public/svg/arrow-up.svg b/FrontEnd/public/svg/arrow-up.svg
diff --git a/FrontEnd/public/svg/baget.svg b/FrontEnd/public/svg/baget.svg
diff --git a/FrontEnd/public/svg/car.svg b/FrontEnd/public/svg/car.svg
diff --git a/FrontEnd/public/svg/hotel.svg b/FrontEnd/public/svg/hotel.svg
diff --git a/FrontEnd/public/svg/people.svg b/FrontEnd/public/svg/people.svg
diff --git a/FrontEnd/public/svg/post.svg b/FrontEnd/public/svg/post.svg
diff --git a/FrontEnd/public/svg/rocket.svg b/FrontEnd/public/svg/rocket.svg
diff --git a/FrontEnd/public/svg/shop.svg b/FrontEnd/public/svg/shop.svg
diff --git a/FrontEnd/public/svg/wine.svg b/FrontEnd/public/svg/wine.svg
diff --git a/FrontEnd/src/App.css b/FrontEnd/src/App.css
@@ -5,4 +5,4 @@
 
 body {
   width: 100vw;
-}
+}
diff --git a/FrontEnd/src/components/CompanyCard/CompanyCard.jsx b/FrontEnd/src/components/CompanyCard/CompanyCard.jsx
@@ -1,4 +1,5 @@
 import { Link } from 'react-router-dom';
+import { mutate } from 'swr';
 import styles from './CompanyCard.module.css';
 import { useAuth } from '../../hooks';
 import PropTypes from 'prop-types';
@@ -45,6 +46,11 @@ export default function CompanyCard({
     changeCompanies(profile.id, false);
     try {
       await axios.delete(`${process.env.REACT_APP_BASE_API_URL}/api/saved-list/${profile.id}`);
+      await mutate(
+        (key) => typeof key === 'string' && key.includes('/api/profiles/?is_saved=True'),
+        undefined,
+        {revalidate: true}
+      );
     } catch (error) {
       console.error(error);
     }

diff --git a/FrontEnd/src/components/CompanyCard/CompanyCard.module.css b/FrontEnd/src/components/CompanyCard/CompanyCard.module.css
@@ -2,11 +2,11 @@
   width: 345px;
   height: 365px;
   display: block;
-  align-items: center;
   border-radius: 11px;
   position: relative;
   margin: auto;
   background: var(--company-card-color);
+  box-shadow: 0px 0px 2px 0px #41404533;
 }
 
 .company-card:hover {
@@ -80,7 +80,8 @@
   text-align: left;
   padding-left: 16px;
   padding-top: 6px;
-  max-width: 300px;
+  max-width: 262px;
+  height: 35px;
 }
 
 .company-card__name-text {
@@ -152,7 +153,7 @@
   height: 50px;
   background: var(--company-card-color);
   border-radius: 9999px;
-  border: 2px solid #232424;
+  border: 1px solid var(--grey-border-color);
 }
 
 .company-card__logo-image {
@@ -183,6 +184,6 @@
   }
 
   .company-card__category-text {
-    max-width: 250px;
+    max-width: 220px;
   }
 }