diff --git a/src/components/Cover/CoverHomeTasks.tsx b/src/components/Cover/CoverHomeTasks.tsx
index 1b58b54..5e1d632 100644
--- a/src/components/Cover/CoverHomeTasks.tsx
+++ b/src/components/Cover/CoverHomeTasks.tsx
@@ -7,7 +7,6 @@ import {
const CoverHomeTasks = () => {
const theme = useTheme();
const mdDown = useMediaQuery(theme.breakpoints.down('md'));
- const xsDown = useMediaQuery(theme.breakpoints.down('xs'));
const smDown = useMediaQuery(theme.breakpoints.down('sm'));
return (
@@ -23,7 +22,7 @@ const CoverHomeTasks = () => {
-
+
WEB3TASK
@@ -31,7 +30,7 @@ const CoverHomeTasks = () => {
diff --git a/src/components/Cover/CoverUserProfile.tsx b/src/components/Cover/CoverUserProfile.tsx
index e88dcad..42d697f 100644
--- a/src/components/Cover/CoverUserProfile.tsx
+++ b/src/components/Cover/CoverUserProfile.tsx
@@ -1,17 +1,18 @@
-import { Box, Typography } from '@mui/material'
+import { Box, Typography, useMediaQuery } from '@mui/material'
import {
useTheme,
} from "@mui/material";
const CoverCreateTask = () => {
const theme = useTheme();
+ const mdDown = useMediaQuery(theme.breakpoints.down('md'));
+ const smDown = useMediaQuery(theme.breakpoints.down('xs'));
return (
-
-
-
-
+
+
+
PERSONAL PROFILE
@@ -19,7 +20,7 @@ const CoverCreateTask = () => {
diff --git a/src/content/applications/Tasks/HomeTasks.tsx b/src/content/applications/Tasks/HomeTasks.tsx
index 8001100..22ab03c 100644
--- a/src/content/applications/Tasks/HomeTasks.tsx
+++ b/src/content/applications/Tasks/HomeTasks.tsx
@@ -37,13 +37,6 @@ const HomeTasks = () => {
}
};
- useEffect(() => {
- setMinimumTasks(((currentPage - 1) * tasksPerPage) + 1);
- setMaxTasks(currentPage * tasksPerPage);
- fetchData();
- }, [currentPage, totalPages, minimumTasks, maxTasks]);
-
-
const maxReward = multiTasksData?.reduce((acc, curr) => {
const parsedReward = Number.parseFloat(curr.reward)
@@ -52,6 +45,12 @@ const HomeTasks = () => {
const filteredMultiTasks = filterTasks(multiTasksData || [])
+ useEffect(() => {
+ setMinimumTasks(((currentPage - 1) * tasksPerPage) + 1);
+ setMaxTasks(currentPage * tasksPerPage);
+ fetchData();
+ }, [currentPage, totalPages, minimumTasks, maxTasks]);
+
return (
<>
diff --git a/src/content/applications/Users/profile/UserProfile.tsx b/src/content/applications/Users/profile/UserProfile.tsx
index bdbf7a5..d5078c1 100644
--- a/src/content/applications/Users/profile/UserProfile.tsx
+++ b/src/content/applications/Users/profile/UserProfile.tsx
@@ -32,6 +32,7 @@ const BoxCoverAction = styled(Box)(
const UserProfile = () => {
const theme = useTheme();
const mdDown = useMediaQuery(theme.breakpoints.down('md'));
+ const smDown = useMediaQuery(theme.breakpoints.down('sm'));
const { shortenAddressFromUser, userAddress } = useWeb3Utils();
const taskService = useTaskService();
const { handleCountUserTasks, handleUserScore, countUserTasks, handleMultiTask, multiTasksData, loading } = useTaskServiceHook(taskService);
@@ -79,6 +80,7 @@ const UserProfile = () => {
Web3Task - Profile
+
@@ -86,7 +88,7 @@ const UserProfile = () => {
style={{
position: 'absolute',
top: 'calc(50% + 0px)',
- left: 'calc(50% - 315px)',
+ left: smDown ? 'calc(50% + 50px)' : mdDown ? 'calc(50% + 0px)' : 'calc(50% - 315px)',
transform: 'translate(-50%, -50%)',
zIndex: 2,
pointerEvents: 'none'
@@ -95,7 +97,7 @@ const UserProfile = () => {
{
style={{
position: 'absolute',
top: 'calc(50% + 180px)',
- left: 'calc(50% - 250px)',
+ left: smDown ? 'calc(50% + 185px)' : mdDown ? 'calc(50% + 210px)' : 'calc(50% - 250px)',
transform: 'translate(-50%, -50%)',
zIndex: 2,
pointerEvents: 'none'
@@ -115,7 +117,7 @@ const UserProfile = () => {
{
style={{
position: 'absolute',
top: 'calc(50% + 230px)',
- left: 'calc(50% - 250px)',
+ left: smDown ? 'calc(50% + 150px)' : mdDown ? 'calc(50% + 50px)' : 'calc(50% - 250px)',
transform: 'translate(-50%, -50%)',
zIndex: 1,
pointerEvents: 'none',
@@ -139,17 +141,16 @@ const UserProfile = () => {
-
+
-
{
style={{
position: 'absolute',
top: 'calc(50% + 230px)',
- left: 'calc(50% + 300px)',
+ left: smDown ? 'calc(50% + 80px)' : mdDown ? 'calc(50% + 70px)' : 'calc(50% + 300px)',
transform: 'translate(-50%, -50%)',
zIndex: 1,
pointerEvents: 'none',
@@ -182,7 +183,7 @@ const UserProfile = () => {
/>
-
+
{shortenAddressFromUser()}
@@ -192,12 +193,12 @@ const UserProfile = () => {
-
-
+
+
-
+
diff --git a/src/layouts/BaseLayout/index.tsx b/src/layouts/BaseLayout/index.tsx
index b2ae539..25ce2c0 100644
--- a/src/layouts/BaseLayout/index.tsx
+++ b/src/layouts/BaseLayout/index.tsx
@@ -61,7 +61,8 @@ const BaseLayout: FC = () => {
position: 'relative',
zIndex: 5,
display: 'block',
- flex: 1
+ flex: 1,
+ mb: 1
}}
>
@@ -74,7 +75,8 @@ const BaseLayout: FC = () => {
position: 'relative',
zIndex: 5,
display: 'block',
- flex: 1
+ flex: 1,
+ mb: 0
}}
>