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.

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

Jump to bottom

fix: Misplaced Screen Title & Fix Layout Structure #2088

Closed
wants to merge 12 commits into from
Closed

fix: Misplaced Screen Title & Fix Layout Structure #2088

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2639155
fix:Misplaced Screen Title & Fix Layout Structure #2071
anuragnegi000 Jul 14, 2024
17b22f2
Merge branch 'develop' of https://github.com/PalisadoesFoundation/tal…
anuragnegi000 Jul 16, 2024
b345f78
Merge branch 'develop' into develop
anuragnegi000 Jul 16, 2024
63e7065
Apply suggestions from code review
anuragnegi000 Jul 16, 2024
9509daf
removed all the commented lines
anuragnegi000 Jul 16, 2024
ee2628f
removed all comments
anuragnegi000 Jul 16, 2024
a298bf8
removed the conflict
anuragnegi000 Jul 16, 2024
77b8750
removed all comments
anuragnegi000 Jul 16, 2024
527f9bb
final changes
anuragnegi000 Jul 16, 2024
c206334
Merge branch 'develop' into develop
anuragnegi000 Jul 23, 2024
858eafa
changes from px to rem
anuragnegi000 Jul 26, 2024
5444409
Merge branch 'develop' into develop
anuragnegi000 Jul 26, 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
2 changes: 1 addition & 1 deletion src/screens/UserPortal/Events/Events.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
}

.colorLight {
background-color: #f1f3f6;
/* background-color: #f1f3f6; */
anuragnegi000 marked this conversation as resolved.
Show resolved Hide resolved
}

.mainContainer {
Expand Down
6 changes: 5 additions & 1 deletion src/screens/UserPortal/Events/Events.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { ViewType } from 'screens/OrganizationEvents/OrganizationEvents';
import { errorHandler } from 'utils/errorHandler';
import useLocalStorage from 'utils/useLocalstorage';
import styles from './Events.module.css';
import ProfileDropdown from 'components/ProfileDropdown/ProfileDropdown';

const timeToDayJs = (time: string): Dayjs => {
const dateTimeString = dayjs().format('YYYY-MM-DD') + ' ' + time;
Expand Down Expand Up @@ -159,7 +160,10 @@ export default function events(): JSX.Element {
<>
<div className={`d-flex flex-row ${styles.containerHeight}`}>
<div className={`${styles.colorLight} ${styles.mainContainer}`}>
<h1>Events</h1>
<div className="d-flex justify-content-between align-items-center mb-3">
<h1>Events</h1>
<ProfileDropdown />
</div>
<EventHeader
viewType={viewType}
showInviteModal={showInviteModal}
Expand Down
4 changes: 2 additions & 2 deletions src/screens/UserPortal/People/People.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@
}

.colorLight {
background-color: #f5f5f5;
/* background-color: #f5f5f5; */
anuragnegi000 marked this conversation as resolved.
Show resolved Hide resolved
}

.mainContainer {
width: 50%;
flex-grow: 3;
padding: 40px;
padding: 20px;
max-height: 100%;
overflow: auto;
}
Expand Down
6 changes: 5 additions & 1 deletion src/screens/UserPortal/People/People.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import styles from './People.module.css';
import { useTranslation } from 'react-i18next';
import HourglassBottomIcon from '@mui/icons-material/HourglassBottom';
import { useParams } from 'react-router-dom';
import ProfileDropdown from 'components/ProfileDropdown/ProfileDropdown';

interface InterfaceOrganizationCardProps {
id: string;
Expand Down Expand Up @@ -124,7 +125,10 @@ export default function people(): JSX.Element {
<>
<div className={`d-flex flex-row ${styles.containerHeight}`}>
<div className={`${styles.colorLight} ${styles.mainContainer}`}>
<h1>People</h1>
<div className="d-flex justify-content-between align-items-center">
<h1>People</h1>
<ProfileDropdown />
</div>
<div
className={`mt-4 d-flex flex-row justify-content-between flex-wrap ${styles.gap}`}
>
Expand Down
2 changes: 1 addition & 1 deletion src/screens/UserPortal/Posts/Posts.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
.mainContainer {
width: 50%;
flex-grow: 3;
padding: 1rem;
padding: 20px;
anuragnegi000 marked this conversation as resolved.
Show resolved Hide resolved
max-height: 100%;
overflow-y: auto;
overflow-x: hidden;
Expand Down
6 changes: 5 additions & 1 deletion src/screens/UserPortal/Posts/Posts.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import styles from './Posts.module.css';
import convertToBase64 from 'utils/convertToBase64';
import Carousel from 'react-multi-carousel';
import 'react-multi-carousel/lib/styles.css';
import ProfileDropdown from 'components/ProfileDropdown/ProfileDropdown';

const responsive = {
superLargeDesktop: {
Expand Down Expand Up @@ -282,7 +283,10 @@ export default function home(): JSX.Element {
<>
<div className={`d-flex flex-row ${styles.containerHeight}`}>
<div className={`${styles.colorLight} ${styles.mainContainer}`}>
<h1>{t('posts')}</h1>
<div className="d-flex justify-content-between align-items-center">
<h1>{t('posts')}</h1>
<ProfileDropdown />
</div>
<div className={`${styles.postContainer}`}>
<div className={`${styles.heading}`}>{t('startPost')}</div>
<div className={styles.postInputContainer}>
Expand Down
4 changes: 2 additions & 2 deletions src/screens/UserPortal/UserScreen/UserScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import type { TargetsType } from 'state/reducers/routesReducer';
import styles from './UserScreen.module.css';
import { Button } from 'react-bootstrap';
import UserSidebarOrg from 'components/UserPortal/UserSidebarOrg/UserSidebarOrg';
import ProfileDropdown from 'components/ProfileDropdown/ProfileDropdown';
varshith257 marked this conversation as resolved.
Show resolved Hide resolved


const UserScreen = (): JSX.Element => {
const location = useLocation();
Expand Down Expand Up @@ -86,7 +86,7 @@ const UserScreen = (): JSX.Element => {
data-testid="mainpageright"
>
<div className="d-flex justify-content-end align-items-center">
<ProfileDropdown />
{/* <ProfileDropdown /> */}
</div>
<Outlet />
</div>
Expand Down
Loading