Skip to content
Merged

Dev #103

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
84dd11c
add trim false in case of tfa token in login api
shristi-sinha May 7, 2024
c15d573
Merge pull request #93 from contentstack/feature/tfa-token-validation
umeshmore45 May 7, 2024
bb54887
add advanced field in mapper model
shristi-sinha May 7, 2024
091b2b1
Merge pull request #94 from contentstack/feature/add-mapper-json
shreyasBhoyar May 7, 2024
bae09bf
code refactor
sayalijoshi27 May 7, 2024
647ca18
solved locale issue
snehalsankhe May 8, 2024
3dbe63c
add validation for error handling
snehalsankhe May 9, 2024
a361b9f
Merge pull request #95 from contentstack/cmg-99-locales-search
AishDani May 9, 2024
53d848b
create a function to get all locals of particular stack and add that…
shristi-sinha May 9, 2024
06dcd46
Merge pull request #96 from contentstack/feature/get-all-locale
shreyasBhoyar May 9, 2024
d65aa5f
Solved bugs
snehalsankhe May 9, 2024
8513574
Merge pull request #97 from contentstack/cmg-99-locales-search
sayalijoshi27 May 9, 2024
d115a48
[CMG-103] - UI for Mapping with group field
sayalijoshi27 May 9, 2024
1a6e4fb
Code refactored: resolved PR comments
sayalijoshi27 May 10, 2024
90700da
Merge pull request #98 from contentstack/feature/CMG-103
AishDani May 10, 2024
ffc12dc
Merge branch 'dev' of https://github.com/contentstack/migration-v2-no…
sayalijoshi27 May 10, 2024
2953148
feat:integrated advanced propertise with backend
AishDani May 10, 2024
3df80e2
Merge branch 'dev' of github.com:contentstack/migration-v2-node-serve…
AishDani May 10, 2024
02f5f32
refactor:resized modal size
AishDani May 10, 2024
0bad06d
refactor:changed library sequences
AishDani May 10, 2024
b1565f8
Merge pull request #99 from contentstack/feature/project-dashboard
sayalijoshi27 May 10, 2024
3bd3583
[CMG-102] - UI for for On row uncheck make isdeleted value to true
sayalijoshi27 May 10, 2024
f4f8ded
Content mapper merged
sayalijoshi27 May 10, 2024
ad7d166
Removed console
sayalijoshi27 May 10, 2024
b978606
Merge pull request #100 from contentstack/feature/CMG-102
AishDani May 10, 2024
71142e7
refactor:resolved project name error showing on tab change
AishDani May 10, 2024
3040039
[CMG-105] - UI - Disable Title and Url fields from being mapped
sayalijoshi27 May 10, 2024
0c869ce
Merge pull request #101 from contentstack/feature/project-dashboard
sayalijoshi27 May 10, 2024
f0af2e3
Merge pull request #102 from contentstack/feature/CMG-102
snehalsankhe May 13, 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
Prev Previous commit
Next Next commit
Solved bugs
  • Loading branch information
snehalsankhe committed May 9, 2024
commit d65aa5f7ca1fe9543779c84db29f26c9ac2ddafb
38 changes: 37 additions & 1 deletion ui/src/components/MainHeader/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,42 @@
// height: 2rem;
margin-right: 1rem;
position: relative;
width: 2rem;
width: 3rem;
a {
align-items: center;
display: flex;
height: 2.5rem;
justify-content: center;
padding: .5rem;
text-decoration: none;
}
a:focus {
border-radius: 5px;
box-shadow: 0 0 1px $color-brand-primary-base, 0 0 0 4px #bbb4f4;
}
}
.organisationWrapper:focus {
box-shadow: 0 0 1px $color-brand-primary-base, 0 0 0 4px #bbb4f4;
}
.Dropdown__header__value {
overflow: visible;
line-height: 1.2;
}
.Dropdown__header__label {
margin-bottom: 0;
}
.Dropdown.Dropdown--hover .Dropdown__menu--primary {
top: 2.5rem;
}
.organisationWrapper {
.Dropdown__header__value {
color: #475161;
max-width: 11.1875rem;
width: auto;
overflow: hidden;
}
.Dropdown__menu--primary .Dropdown__menu__list__item, .Dropdown__menu--secondary .Dropdown__menu__list__item, .Dropdown__menu--tertiary .Dropdown__menu__list__item {
max-width: 14.5rem;
}
}
}
21 changes: 10 additions & 11 deletions ui/src/components/MainHeader/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Libraries
import { useContext, useEffect, useState } from 'react';
import { useNavigate, useLocation } from 'react-router-dom';
import { Dropdown } from '@contentstack/venus-components';
import { useNavigate, useLocation, Link } from 'react-router-dom';
import { Dropdown, Tooltip } from '@contentstack/venus-components';

// Service
import { getCMSDataFromFile } from '../../cmsData/cmsSelector';
Expand Down Expand Up @@ -100,21 +100,20 @@ const MainHeader = () => {
<div className="col-6 d-flex align-items-center">
{logo?.image?.url ? (
<div className="logo">
<a
className="navbar-brand"
title="contentstack.com"
href={`${logo?.url}?region=${newParam}`}
>
<img src={logo?.image?.url} className="w-100" alt="Contentstack Logo" />
</a>
<Tooltip position="right" content="Stacks" wrapperElementType="div">
<Link to={`${logo?.url}`}>
<img src={logo?.image?.url} className="w-100" alt="Contentstack Logo"/>
</Link>
</Tooltip>
</div>
) : (
''
)}

<div>
<div className="Dropdown__header__label">{organizationLabel}</div>
<div className='organisationWrapper'>
<Dropdown
withSearch
headerLabel={organizationLabel}
closeAfterSelect
highlightActive
list={orgsList}
Expand Down
5 changes: 4 additions & 1 deletion ui/src/components/ProjectsHeader/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const ProjectsHeader = ({
setSearchText,
searchPlaceholder,
cta,
allProject,
handleModal
}: ProjectsHeaderType) => {
let interval: ReturnType<typeof setTimeout>;
Expand All @@ -21,6 +22,7 @@ const ProjectsHeader = ({
}
const SearchProject = (
<>
{allProject && allProject?.length > 0 && (
<div className="project-search-wrapper" onClick={setFocus}>
<Search
placeholder={searchPlaceholder}
Expand All @@ -31,6 +33,7 @@ const ProjectsHeader = ({
id="search-project-input"
/>
</div>
)}
</>
);

Expand All @@ -57,7 +60,7 @@ const ProjectsHeader = ({

return (
<>
<PageHeader title={{ label: headingText, component: SearchProject }} actions={pageActions} />
<PageHeader title={{ label: headingText, component: SearchProject }} actions={allProject && allProject?.length > 0 && pageActions} />
</>
);
};
Expand Down
2 changes: 2 additions & 0 deletions ui/src/components/ProjectsHeader/projectsHeader.interface.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { CTA } from '../../types/common.interface';
import { ProjectsObj } from '../../pages/Projects/projects.interface'

export interface ProjectsHeaderType {
cta?: CTA;
Expand All @@ -7,4 +8,5 @@ export interface ProjectsHeaderType {
setSearchText: (value: string) => void;
searchPlaceholder: string;
handleModal?: () => void;
allProject?: ProjectsObj[] | null;
}
1 change: 1 addition & 0 deletions ui/src/pages/Projects/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ const Projects = () => {
setSearchText={setSearchText}
cta={cta}
handleModal={openModal}
allProject={projects}
/>
</>
)
Expand Down
8 changes: 8 additions & 0 deletions ui/src/scss/App.scss
Original file line number Diff line number Diff line change
Expand Up @@ -339,3 +339,11 @@ h2 {
}
}
}
.ReactModal__Overlay .ReactModal__Content .ReactModal__Content__header h3 {
color: $color-black-2121;
font-weight: bold;
}
.ReactModal__Content__footer .Button{
font-size: 1rem;
line-height: 100%;
}