Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
20e633a
updated code
umeshmore45 May 16, 2024
36285b6
updated code
umeshmore45 May 16, 2024
39ef821
updated code
umeshmore45 May 16, 2024
52d8866
updated code
umeshmore45 May 16, 2024
cb17fa0
updated code
umeshmore45 May 16, 2024
75b0287
create project delete api and also comment status update in current-s…
shristi-sinha May 23, 2024
5fc5ab9
Merge pull request #121 from contentstack/feature/project-delete
shreyasBhoyar May 23, 2024
763f1f4
card Ui
snehalsankhe May 24, 2024
5806219
Mapping corrections on the fields
sayalijoshi27 May 24, 2024
f046622
create Project restore api and add isDeleted filter in get all projec…
shristi-sinha May 27, 2024
db34863
apply validation
shristi-sinha May 28, 2024
1a0cbe9
Merge pull request #123 from contentstack/feature/project-restore
sayalijoshi27 May 28, 2024
53ac6b3
[CMG-130] - Project dashboard | Project delete is not working
sayalijoshi27 May 28, 2024
d04ccfd
Merge branch 'dev' of https://github.com/contentstack/migration-v2-no…
sayalijoshi27 May 28, 2024
5f251f3
Merge pull request #124 from contentstack/feature/project-delete
AishDani May 28, 2024
dde0d35
Merge branch 'dev' of https://github.com/contentstack/migration-v2-no…
sayalijoshi27 May 28, 2024
6d90a06
Advanced Properties changes as per the field type
sayalijoshi27 May 28, 2024
8201804
Merge pull request #125 from contentstack/feature/CMG-103
AishDani May 28, 2024
45a801e
changes in layout
snehalsankhe May 29, 2024
81cce41
Merge pull request #122 from contentstack/new-project-dashboard
sayalijoshi27 May 29, 2024
e10da74
dev pull
snehalsankhe May 29, 2024
1ebba64
feat:created redux setup
AishDani Jun 3, 2024
57b3054
feat:latest package-lock.json file
AishDani Jun 3, 2024
b59305f
[CMG-107] - UI for Populate advance properties for the content type i…
sayalijoshi27 Jun 3, 2024
bf3bb9a
refactor:resolved empty org value in dropdown
AishDani Jun 3, 2024
5b93f1c
refactor:added optional chaining
AishDani Jun 3, 2024
e9f1d90
refactor:resolved PR comments
AishDani Jun 3, 2024
df899db
Merge pull request #126 from contentstack/feature/redux-setup
sreeneshkini Jun 3, 2024
b3c6360
added layout changes
snehalsankhe Jun 3, 2024
e8be3f0
resolved conflicts
snehalsankhe Jun 3, 2024
4798cfe
changes in card status
snehalsankhe Jun 4, 2024
bd9c525
removed commented
snehalsankhe Jun 4, 2024
89a546d
Merge pull request #127 from contentstack/layout-changes
sreeneshkini Jun 4, 2024
e52397f
Embed Objects added for RTE advanced properties
sayalijoshi27 Jun 4, 2024
4d0a9ef
Merge branch 'dev' of https://github.com/contentstack/migration-v2-no…
sayalijoshi27 Jun 4, 2024
da11d85
added mapper
umeshmore45 Jun 4, 2024
6da67f8
Removed contentstack/utils package
sayalijoshi27 Jun 4, 2024
c0c3fb1
Removed commented code
sayalijoshi27 Jun 4, 2024
0b4f990
Removed commented code
sayalijoshi27 Jun 5, 2024
9171e77
Merge pull request #128 from contentstack/feature/CMG-103
sreeneshkini Jun 5, 2024
cf64f71
feat:created horizontal stepper component
AishDani Jun 5, 2024
f4fe3e2
Merge branch 'dev' of github.com:contentstack/migration-v2-node-serve…
AishDani Jun 5, 2024
79dd79d
added layout changes
snehalsankhe Jun 5, 2024
d4cea28
merged data from dev
snehalsankhe Jun 5, 2024
b7ad519
refactor:removed commented code
AishDani Jun 5, 2024
23556b2
Merge pull request #129 from contentstack/layout-changes
sreeneshkini Jun 5, 2024
c2d09d4
Merge pull request #130 from contentstack/feature/horizontal-stepper
sreeneshkini Jun 5, 2024
676285b
added mapper
umeshmore45 Jun 6, 2024
19e26a2
resloved conflicts
umeshmore45 Jun 6, 2024
fe46948
resloved conflict
umeshmore45 Jun 6, 2024
68c9012
Merge pull request #131 from contentstack/feature/resloved-conflicts
sreeneshkini Jun 6, 2024
4c060b7
refactor:changed stepper as per new design
AishDani Jun 6, 2024
fa70d6a
Migration flow header UI and Stepper changes
sayalijoshi27 Jun 6, 2024
d0b147d
Merge pull request #132 from contentstack/feature/horizontal-stepper
sreeneshkini Jun 6, 2024
3159149
Merge branch 'dev' of https://github.com/contentstack/migration-v2-no…
sayalijoshi27 Jun 6, 2024
fc2c43c
Merge pull request #133 from contentstack/feature/CMG-57
sreeneshkini Jun 6, 2024
4116a39
Update code as per new design update
snehalsankhe Jun 7, 2024
cd7e23b
Merge pull request #134 from contentstack/layout-changes
v1shalpatel Jun 7, 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
f7975d2
Merge pull request #135 from contentstack/feature/CMG-57
sreeneshkini 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
Binary file not shown.
Binary file added ui/public/images/ContentstackLogo.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 ui/public/images/login_bg.webp
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
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
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
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
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