Skip to content

Main header, login image and logo changes #135

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

Merged
merged 3 commits into from
Jun 7, 2024
Merged

Main header, login image and logo changes #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3159149
Merge branch 'dev' of https://github.com/contentstack/migration-v2-no…
sayalijoshi27 Jun 6, 2024
24e2a99
Main header, login image and logo changes
sayalijoshi27 Jun 7, 2024
41d6d5d
Merge branch 'dev' of https://github.com/contentstack/migration-v2-no…
sayalijoshi27 Jun 7, 2024
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 modified ui/public/favicon.ico
View file
Open in desktop
Binary file not shown.
Binary file added ui/public/images/ContentstackLogo.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.
Binary file added ui/public/images/login_bg.webp
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.
2 changes: 1 addition & 1 deletion ui/src/cmsData/main_header.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"file_size": "10160",
"tags": [],
"filename": "icon-cs-mobile.svg",
"url": "https://images.contentstack.io/v3/assets/bltd3620ec6418ad3ad/blt4a17564224d007f3/652f91e5fe1f57912c211dfc/icon-cs-mobile.svg",
"url": "https://images.contentstack.io/v3/assets/blt7359e2a55efae483/blt0b9a8281aeac3ec0/664c27d3c9024c35b5ad593a/CS_logo.png",
"ACL": [],
"is_dir": false,
"parent_uid": "blt8e7f7872baa3a09e",
Expand Down
3 changes: 1 addition & 2 deletions ui/src/components/MainHeader/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
border: 0 none;
}
.logo {
// height: 2rem;
margin-right: 1rem;
margin-right: 1.063rem;
position: relative;
width: 3rem;
a {
Expand Down
25 changes: 12 additions & 13 deletions ui/src/components/MainHeader/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,30 @@
// Libraries
import { useContext, useEffect, useState } from 'react';
import { useEffect, useState } from 'react';
import { useNavigate, useLocation, Link } from 'react-router-dom';
import { Dropdown, Tooltip } from '@contentstack/venus-components';
import { useDispatch, useSelector } from 'react-redux';

// Service
import { getCMSDataFromFile } from '../../cmsData/cmsSelector';

// Redux
import { RootState } from '../../store';
import { setSelectedOrganisation } from '../../store/slice/authSlice';

//Utilities
import { CS_ENTRIES } from '../../utilities/constants';

// Context
import { AppContext } from '../../context/app/app.context';
import {
clearLocalStorage,
getDataFromLocalStorage,
setDataInLocalStorage
} from '../../utilities/functions';

// Interface
import { MainHeaderType } from './mainheader.interface';
import { DEFAULT_USER, IDropDown } from '../../context/app/app.interface';
import { IDropDown } from '../../context/app/app.interface';

// Styles
import './index.scss';
import {
clearLocalStorage,
getDataFromLocalStorage,
setDataInLocalStorage
} from '../../utilities/functions';
import { RootState } from '../../store';
import { setSelectedOrganisation } from '../../store/slice/authSlice';

const MainHeader = () => {

Expand Down Expand Up @@ -105,7 +104,7 @@ const MainHeader = () => {
<div className="logo">
<Tooltip position="right" content="Projects" wrapperElementType="div">
<Link to={`${logo?.url}`}>
<img src={logo?.image?.url} width={26} alt="Contentstack Logo" />
<img src={logo?.image?.url} width={32} alt="Contentstack" />
</Link>
</Tooltip>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ui/src/pages/Projects/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
border-top: 0 none;
height: auto;
border-bottom: 1px solid $color-brand-secondary-lightest;
padding:20px;
padding:20px 10px 20px 13px;
}
}
}
Expand Down