Skip to content

Commit

Permalink
chore: various updates regarding logo loading colors and app name
Browse files Browse the repository at this point in the history
  • Loading branch information
Birloi Florian authored and Birloi Florian committed Dec 4, 2023
1 parent 63b2f4e commit 32f79fc
Show file tree
Hide file tree
Showing 10 changed files with 11,195 additions and 42,265 deletions.
14,939 changes: 2,246 additions & 12,693 deletions backend/package-lock.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@aws-sdk/s3-request-presigner": "^3.325.0",
"@bull-board/api": "^4.11.0",
"@bull-board/express": "^4.11.0",
"@nestjs-modules/mailer": "^1.8.1",
"@nestjs-modules/mailer": "^1.7.1",
"@nestjs/axios": "^2.0.0",
"@nestjs/bull": "^0.6.3",
"@nestjs/common": "^9.0.0",
Expand Down Expand Up @@ -112,7 +112,7 @@
"testEnvironment": "node"
},
"engines": {
"node": "16.15.1",
"npm": "8.11.0"
"node": "18.18.2",
"npm": "9.8.1"
}
}
2 changes: 1 addition & 1 deletion frontend/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/logo.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Teo</title>
<title>VIC</title>
</head>
<body>
<div id="root"></div>
Expand Down
38,442 changes: 8,892 additions & 29,550 deletions frontend/package-lock.json

Large diffs are not rendered by default.

8 changes: 3 additions & 5 deletions frontend/public/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions frontend/src/assets/images/app_logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 0 additions & 6 deletions frontend/src/assets/images/logo.svg

This file was deleted.

8 changes: 2 additions & 6 deletions frontend/src/components/Header.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { Fragment } from 'react';
import logo from '../assets/images/logo.svg';
import logo from '../assets/images/app_logo.svg';
import { Bars3Icon, ChevronDownIcon, ArrowRightOnRectangleIcon } from '@heroicons/react/24/outline';
import { useNavigate } from 'react-router-dom';
import { useTranslation } from 'react-i18next';
Expand Down Expand Up @@ -36,11 +36,7 @@ const Header = ({ openSlidingMenu }: HeaderProps) => {
</div>
)}
<div className="flex items-center cursor-pointer" onClick={onNavigate.bind(null, '/')}>
<img
src={logo}
alt="Code 4 Romania - Teo"
className="h-full w-full sm:max-h-full max-h-10"
/>
<img src={logo} alt="Code 4 Romania - VIC" className="max-h-8 w-full sm:max-h-11" />
</div>
</div>
{isAuthenticated && (
Expand Down
24 changes: 23 additions & 1 deletion frontend/src/contexts/auth/AuthContextProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,29 @@ const AuthContextProvider = ({ children }: { children: React.ReactNode }) => {

return (
<AuthContext.Provider value={{ isAuthenticated, login, logout, profile }}>
{!(isLoading || isFetchingProfile) ? children : <div>Loading...</div>}
{!(isLoading || isFetchingProfile) ? (
children
) : (
<div role="status" className="h-[100vh] w-full flex items-center justify-center">
<svg
aria-hidden="true"
className="w-8 h-8 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600"
viewBox="0 0 100 101"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
fill="currentColor"
/>
<path
d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
fill="currentFill"
/>
</svg>
<span className="sr-only">Loading...</span>
</div>
)}
</AuthContext.Provider>
);
};
Expand Down
2 changes: 2 additions & 0 deletions frontend/tailwind.config.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ module.exports = {
900: '#7F1D1D',
},
yellow: {
DEFAULT: '#FFD209',
900: '#F57F17',
500: '#FFD209',
},
},
transitionProperty: {
Expand Down

0 comments on commit 32f79fc

Please sign in to comment.