Merge pull request #97 from code4romania/bugfix/make-matrix-publicly-…

…accessible Bugfix/make matrix publicly accessible
code4romania · Dec 16, 2023 · 4855f17 · 4855f17 · vercel · Dec 16, 2023
2 parents 0f8281d + 1aa69e6
commit 4855f17
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 8 deletions.
diff --git a/client/index.html b/client/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link rel="icon" type="image/png" href="/favicon.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Evaluare ONG | Creștem.ONG</title>
   </head>

diff --git a/client/public/favicon.png b/client/public/favicon.png
diff --git a/client/public/vite.svg b/client/public/vite.svg
diff --git a/client/src/components/Navbar/index.tsx b/client/src/components/Navbar/index.tsx
@@ -126,9 +126,6 @@ const Menu = () => {
   console.log("userType", userType);
   const menu = MENU[userType];
 
-  const linkClassName =
-    "flex flex-wrap border-b-2 border-transparent px-3 py-2 font-medium items-center text-gray-900 border-teal-600";
-
   return (
     <ul className="items-center hidden text-sm gap-x-3 lg:flex lg:flex-wrap">
       {menu.map((menuItem) => (
@@ -154,7 +151,7 @@ const Menu = () => {
   );
 };
 
-const Example = () => {
+const Navbar = () => {
   const user = useAppSelector((state) => state.userState.user);
 
   return (
@@ -194,4 +191,4 @@ const Example = () => {
   );
 };
 
-export default Example;
+export default Navbar;
diff --git a/server/src/api/evaluation/controllers/evaluation.js b/server/src/api/evaluation/controllers/evaluation.js
@@ -67,7 +67,7 @@ module.exports = createCoreController(
               ""
             )}${
               dimensions[dimensionIndex]?.comment &&
-              `<p><b>Argumentare:</b> ${dimensions[dimensionIndex]?.comment}</p>`
+              `<div style="padding: 1em 0 1em 0"><b>Argumentare:</b> ${dimensions[dimensionIndex]?.comment}</p>`
             }
             <hr>
             `;
-Original file line number
+Diff line change
@@ Expand Up / @@ -67,7 +67,7 @@ module.exports = createCoreController( @@
                   ""
                 )}${
                   dimensions[dimensionIndex]?.comment &&
-                  `<p><b>Argumentare:</b> ${dimensions[dimensionIndex]?.comment}</p>`
+                  `<div style="padding: 1em 0 1em 0"><b>Argumentare:</b> ${dimensions[dimensionIndex]?.comment}</p>`
                 }
                 <hr>
                 `;
@@ Expand Down @@