Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix/make matrix publicly accessible #97

Merged
merged 5 commits into from
Dec 16, 2023
Merged

Bugfix/make matrix publicly accessible #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1a163d2
Update index.tsx
idormenco Dec 13, 2023
de3b928
small paper cuts
idormenco Dec 14, 2023
0b627f2
Update evaluation.js
idormenco Dec 14, 2023
031d3bf
Merge branch 'main' into bugfix/make-matrix-publicly-accessible
idormenco Dec 14, 2023
1aa69e6
change favicon
idormenco Dec 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Binary file added client/public/favicon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion client/public/vite.svg
View file
Open in desktop

This file was deleted.

7 changes: 2 additions & 5 deletions client/src/components/Navbar/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) => (
Expand All @@ -154,7 +151,7 @@ const Menu = () => {
);
};

const Example = () => {
const Navbar = () => {
const user = useAppSelector((state) => state.userState.user);

return (
Expand Down Expand Up @@ -194,4 +191,4 @@ const Example = () => {
);
};

export default Example;
export default Navbar;
2 changes: 1 addition & 1 deletion server/src/api/evaluation/controllers/evaluation.js
View file
Open in desktop
Original file line number Diff 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
Loading