Skip to content

Commit

Permalink
Merge pull request #61 from gunet/update-brand
Browse files Browse the repository at this point in the history
Update brand (Logos and texts)
  • Loading branch information
kkmanos committed Sep 22, 2023
2 parents acaf6d9 + d4b36bf commit 00c521c
Show file tree
Hide file tree
Showing 18 changed files with 16 additions and 305 deletions.
Binary file modified public/favicon.ico
Binary file not shown.
Binary file added public/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
144 changes: 0 additions & 144 deletions public/logo.svg

This file was deleted.

Binary file modified public/wallet_16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/wallet_192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/wallet_32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/wallet_512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/wallet_64.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
144 changes: 0 additions & 144 deletions src/assets/images/ediplomasLogo.svg

This file was deleted.

Binary file added src/assets/images/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/wallet_white.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/Layout.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useState } from 'react';
import Sidebar from './Sidebar';
import { GiHamburgerMenu } from 'react-icons/gi';
import logo from '../assets/images/ediplomasLogo.svg';
import logo from '../assets/images/logo.png';
import { useLocation, useNavigate } from 'react-router-dom';

const Layout = ({ children }) => {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Notification.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
import toast, { Toaster } from 'react-hot-toast';
import { onMessageListener } from '../firebase';
import { AiOutlineClose } from 'react-icons/ai';
import logo from '../assets/images/ediplomasLogo.svg';
import logo from '../assets/images/logo.png';

const ToastDisplay = ({ id, notification }) => {
return (
Expand Down
13 changes: 6 additions & 7 deletions src/components/Sidebar.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { IoIosTime, IoIosAddCircle, IoIosSend } from "react-icons/io";
import { useLocation, useNavigate } from 'react-router-dom';

import * as api from '../api';
import logo from '../assets/images/ediplomasLogo.svg';
import logo from '../assets/images/wallet_white.png';
import { useLocalStorageKeystore } from '../services/LocalStorageKeystore';


Expand Down Expand Up @@ -77,15 +77,14 @@ const Sidebar = ({ isOpen, toggle }) => {
<img
src={logo}
alt="Logo"
className="w-22 h-22 mb-2 mr-2 cursor-pointer"
className="w-20 h-22 mb-2 mr-2 cursor-pointer"
onClick={() => handleNavigate('/')}
/>
<h1
className="text-white text-lg font-bold cursor-pointer"
className="text-white text-xl font-bold cursor-pointer"
onClick={() => handleNavigate('/')}
>
eDiplomas <br />
Digital Wallet
wwWallet
</h1>
<button className="sm:hidden" onClick={toggle}>
<AiOutlineClose size={30} />
Expand Down Expand Up @@ -134,8 +133,8 @@ const Sidebar = ({ isOpen, toggle }) => {
</div>
<div className="absolute bottom-0 bg-custom-blue text-white text-sm space-x-2 mb-4 p-2">
Powered by{' '}
<a href="https://www.gunet.gr/" rel="noreferrer" target="_blank" className="underline">
GUnet
<a href="https://www.wwwallet.org/" rel="noreferrer" target="_blank" className="underline">
wwWallet
</a>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Spinner.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import logo from '../assets/images/ediplomasLogo.svg';
import logo from '../assets/images/logo.png';

function Spinner() {
return (
Expand Down
4 changes: 2 additions & 2 deletions src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@
"usernameExistsError": "Failed to create user account, username already exists",
"usernameLabel": "Username",
"weakPasswordError": "Weak password",
"welcomeMessagepart1": "Welcome to eDiplomas",
"welcomeMessagepart2": "Digital Wallet"
"welcomeMessagepart1": "Welcome to",
"welcomeMessagepart2": "wwWallet"
}
8 changes: 4 additions & 4 deletions src/pages/Login/Login.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { useTranslation } from 'react-i18next'; // Import useTranslation hook

import * as api from '../../api';
import { useLocalStorageKeystore } from '../../services/LocalStorageKeystore';
import logo from '../../assets/images/ediplomasLogo.svg';
import logo from '../../assets/images/logo.png';
// import LanguageSelector from '../../components/LanguageSelector/LanguageSelector'; // Import the LanguageSelector component
import SeparatorLine from '../../components/SeparatorLine';

Expand Down Expand Up @@ -355,11 +355,11 @@ const Login = () => {
<section className="bg-gray-100 dark:bg-gray-900 h-full">
<div className="flex flex-col items-center justify-center px-6 py-8 mx-auto h-max min-h-screen pb-20">
<a href="/" className="flex items-center mb-6 text-2xl font-semibold text-gray-900 dark:text-white">
<img className="w-20" src={logo} alt="logo" />
<img className="w-40" src={logo} alt="logo" />
</a>

<h1 className="text-xl mb-7 font-bold leading-tight tracking-tight text-gray-900 md:text-2xl text-center dark:text-white">
{t('welcomeMessagepart1')} <br /> {t('welcomeMessagepart2')}
<h1 className="text-3xl mb-7 font-bold leading-tight tracking-tight text-gray-900 text-center dark:text-white">
{t('welcomeMessagepart1')} <span className='text-custom-blue'>{t('welcomeMessagepart2')}</span>
</h1>

<div className="relative w-full bg-white rounded-lg shadow dark:border md:mt-0 sm:max-w-md xl:p-0 dark:bg-gray-800 dark:border-gray-700">
Expand Down
2 changes: 1 addition & 1 deletion src/pages/NotFound/NotFound.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import logo from '../../assets/images/ediplomasLogo.svg';
import logo from '../../assets/images/logo.png';
import { useNavigate } from 'react-router-dom';

const NotFound = () => {
Expand Down

0 comments on commit 00c521c

Please sign in to comment.