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.

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

sc-9903 Add new GDS logo to Nav Menu #826

Merged
merged 1 commit into from
Oct 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file added web/gds-user-ui/src/assets/TRISA-GDS-black.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
485 changes: 485 additions & 0 deletions web/gds-user-ui/src/assets/TRISA-GDS-icon.svg
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 web/gds-user-ui/src/assets/TRISA-GDS-white.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
493 changes: 493 additions & 0 deletions web/gds-user-ui/src/assets/TRISA-GDS.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 9 additions & 3 deletions web/gds-user-ui/src/components/Header/LandingHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ import {
DrawerContent,
useDisclosure,
DrawerCloseButton,
Button
Button,
Link
} from '@chakra-ui/react';
import { MenuIcon, CloseIcon } from '../Icon';
import Logo from 'components/ui/Logo';
Expand All @@ -37,15 +38,20 @@ const LandingHeader = (props: FlexProps): JSX.Element => {
<Flex
width="100%"
position={'relative'}
p={{ base: 4, md: 8 }}
bg={'transparent'}
boxShadow="md"
color={colors.system.blue}
{...props}>
<Container maxW={'5xl'}>
<Box flexBasis={{ base: '100%', md: 'auto' }}>
<Flex align="center" justify={{ md: 'space-between' }}>
<Logo w={{ base: '150px', md: '200px' }} color={['colors.system.blue']} />
<Box>
<NavLink to={'/'}>
<Link _active={{ outline: 'none' }} _focus={{ outline: 'none' }}>
<Logo w={{ base: '50px', md: '120px' }} color={['colors.system.blue']} />
</Link>
</NavLink>
</Box>
<Box ml="auto" display={{ base: 'block', sm: 'none' }} onClick={onOpen}>
{show ? <CloseIcon color={iconColor} /> : <MenuIcon color={iconColor} />}
</Box>
Expand Down
15 changes: 7 additions & 8 deletions web/gds-user-ui/src/components/Sidebar/SidebarContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@ import {
Divider,
VStack,
Stack,
Heading,
Link,
Icon,
Text,
Collapse,
List
} from '@chakra-ui/react';
import trisaLogo from '../../assets/trisa.svg';
import trisaLogo from 'assets/TRISA-GDS-white.png';
import NavItem, { StyledNavItem } from './NavItem';
import MenuItems from '../../utils/menu';
import { MdContactSupport } from 'react-icons/md';
import { IoLogoSlack } from 'react-icons/io';
import { Fragment, useState } from 'react';
import { Trans } from '@lingui/react';
import { LazyLoadImage } from 'react-lazy-load-image-component';
import ChakraRouterLink from 'components/ChakraRouterLink';

interface SidebarProps extends BoxProps {
onClose: () => void;
Expand All @@ -40,12 +40,11 @@ const SidebarContent = ({ onClose, ...rest }: SidebarProps) => {
h="full"
{...rest}>
<Flex h="20" alignItems="center" mx="8" my={2} justifyContent="space-between">
<Stack width="100%" direction={['row']}>
<LazyLoadImage src={trisaLogo} alt="GDS UI" />
<Heading size="sm" color="#FFFFFF" lineHeight={1.35}>
<Trans id="Global Directory Service">Global Directory Service</Trans>
</Heading>
</Stack>
<ChakraRouterLink to="/dashboard/overview">
<Stack width="100%" direction={['row']} height="200px">
<LazyLoadImage src={trisaLogo} alt="GDS UI" />
</Stack>
</ChakraRouterLink>
<CloseButton display={{ base: 'flex', md: 'none' }} onClick={onClose} />
</Flex>
<VStack alignItems="flex-start" justifyContent="center" spacing={0}>
Expand Down
4 changes: 2 additions & 2 deletions web/gds-user-ui/src/components/ui/Logo.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { Box, BoxProps } from '@chakra-ui/react';
import TrisaLogo from 'assets/trisa_logo.svg';
import CkLazyLoadImage from 'components/LazyImage';
import { Link } from 'react-router-dom';
import TrisaLogo from 'assets/TRISA-GDS.svg';

export default function Logo(props: BoxProps) {
return (
<Box {...props}>
<Link to="/">
<CkLazyLoadImage src={TrisaLogo} alt="Trisa logo" width="100%" height="100%" />
<CkLazyLoadImage src={TrisaLogo} alt="Trisa logo" objectFit="none" />
</Link>
</Box>
);
Expand Down