Skip to content

Commit

Permalink
remove some margins for some page of the bo
Browse files Browse the repository at this point in the history
  • Loading branch information
baudelotphilippe committed Sep 10, 2024
1 parent e56a1bd commit c366e14
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 58 deletions.
2 changes: 1 addition & 1 deletion daikoku/javascript/src/apps/DaikokuApp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ export const DaikokuApp = () => {
<ModalProvider>
<div className="d-flex flex-row">
<SideBar />
<div className="wrapper flex-grow-1">
<div className="wrapper flex-grow-1 container-fluid">
<Routes>
<Route
path='/error'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,50 +264,52 @@ export const TeamList = () => {

return (<Can I={manage} a={TENANT} dispatchError>
<div className="row">
<div className="d-flex justify-content-between align-items-center">
<h1>
<Translation i18nkey="Teams">Teams</Translation>
</h1>
<div className="col-5">
<input
placeholder={translate('Find a team')}
className="form-control"
onChange={(e) => {
debouncedResults(e)
}} />
<div className="col">
<div className="d-flex justify-content-between align-items-center">
<h1>
<Translation i18nkey="Teams">Teams</Translation>
</h1>
<div className="col-5">
<input
placeholder={translate('Find a team')}
className="form-control"
onChange={(e) => {
debouncedResults(e)
}} />
</div>
</div>
</div>
{!dataRequest.isLoading && !dataRequest.isError && dataRequest.data &&
<div className="d-flex flex-wrap section">{
dataRequest.data.teams.map((team) => {
return (
<AvatarWithAction key={team._id} avatar={team.avatar} infos={<>
<span className=" section team__name text-truncate">{team.name}</span>
</>} actions={actions(team)} />)
})}
<div className="avatar-with-action new-team-button">
<div className="container">
<div className="avatar__container"
title={translate('Create a new team')}
onClick={createNewTeam}><Plus /></div>
{!dataRequest.isLoading && !dataRequest.isError && dataRequest.data &&
<div className="d-flex flex-wrap section">{
dataRequest.data.teams.map((team) => {
return (
<AvatarWithAction key={team._id} avatar={team.avatar} infos={<>
<span className=" section team__name text-truncate">{team.name}</span>
</>} actions={actions(team)} />)
})}
<div className="avatar-with-action new-team-button">
<div className="container">
<div className="avatar__container"
title={translate('Create a new team')}
onClick={createNewTeam}><Plus /></div>
</div>
</div>
</div>
<div className="apis__pagination d-flex justify-content-center align-items-center" style={{ width: '100%' }}>
<Pagination
previousLabel={translate('Previous')}
nextLabel={translate('Next')}
breakLabel={'...'}
breakClassName={'break'}
pageCount={Math.ceil(dataRequest.data.total / limit)}
marginPagesDisplayed={1}
pageRangeDisplayed={5}
onPageChange={(data) => handlePageClick(data)}
containerClassName={'pagination'}
pageClassName={'page-selector'}
forcePage={page}
activeClassName={'active'} />
</div>
</div>}
<div className="apis__pagination d-flex justify-content-center align-items-center" style={{ width: '100%' }}>
<Pagination
previousLabel={translate('Previous')}
nextLabel={translate('Next')}
breakLabel={'...'}
breakClassName={'break'}
pageCount={Math.ceil(dataRequest.data.total / limit)}
marginPagesDisplayed={1}
pageRangeDisplayed={5}
onPageChange={(data) => handlePageClick(data)}
containerClassName={'pagination'}
pageClassName={'page-selector'}
forcePage={page}
activeClassName={'active'} />
</div>
</div>}
</div>
</div>
</Can>);
};
Expand Down
28 changes: 13 additions & 15 deletions daikoku/javascript/src/components/frontend/team/MyHome.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -94,21 +94,19 @@ export const MyHome = () => {
return (
<main role="main">
<section className="organisation__header col-12 mb-4 p-3">
<div className="container">
<div className="row text-center">
<div className="col-sm-4">
<img
className="organisation__avatar"
src={tenant.logo ? tenant.logo : '/assets/images/daikoku.svg'}
alt="avatar"
/>
</div>
<div className="col-sm-7 d-flex flex-column justify-content-center">
<h1 className="jumbotron-heading">
{tenant.title ? tenant.title : translate('Your APIs center')}
</h1>
<Description description={tenant.description} />
</div>
<div className="row text-center">
<div className="col-sm-4">
<img
className="organisation__avatar"
src={tenant.logo ? tenant.logo : '/assets/images/daikoku.svg'}
alt="avatar"
/>
</div>
<div className="col-sm-7 d-flex flex-column justify-content-center">
<h1 className="jumbotron-heading">
{tenant.title ? tenant.title : translate('Your APIs center')}
</h1>
<Description description={tenant.description} />
</div>
</div>
</section>
Expand Down

0 comments on commit c366e14

Please sign in to comment.