From 07915ca42691fa7c866657afb40f6af4881b8d97 Mon Sep 17 00:00:00 2001 From: Arseniy Sitnikov Date: Fri, 13 Dec 2024 00:51:45 +0300 Subject: [PATCH] add autoclick saving --- .../src/shared/Clicker/PointsZoom/PointsZoom.tsx | 7 +++---- .../shared/Clicker/SectionsBlock/SectionsBlock.tsx | 8 +------- .../src/shared/Elements/PersonIcon/PersonIcon.tsx | 7 +++++-- .../Elements/PersonIcon/personicon.module.css | 10 +++++++++- .../src/shared/Elements/RatingCard/RatingCard.tsx | 2 +- frontend/src/shared/Pages/RatingPage/RatingPage.tsx | 2 -- .../src/shared/Pages/StoragePage/StoragePage.tsx | 7 +------ .../Storage/FriendsPageBlock/FriendsPageBlock.tsx | 6 ------ frontend/src/shared/hooks/sendAutoClickData.ts | 13 +++++++++++++ frontend/src/shared/hooks/useFriendsData.ts | 8 +------- frontend/src/shared/hooks/useRankData.ts | 6 +----- frontend/src/utils/isWhiteList.js | 2 +- 12 files changed, 36 insertions(+), 42 deletions(-) create mode 100644 frontend/src/shared/hooks/sendAutoClickData.ts diff --git a/frontend/src/shared/Clicker/PointsZoom/PointsZoom.tsx b/frontend/src/shared/Clicker/PointsZoom/PointsZoom.tsx index 025bae1..3b6e478 100644 --- a/frontend/src/shared/Clicker/PointsZoom/PointsZoom.tsx +++ b/frontend/src/shared/Clicker/PointsZoom/PointsZoom.tsx @@ -9,6 +9,7 @@ import { checkIOS } from '../../../utils/checkMobile'; import axios from 'axios'; import { useAppSelector } from '../../hooks/useAppSelector'; import { saveMult } from '../../../store/mult'; +import { sendAutoClickData } from '../../hooks/sendAutoClickData'; interface IPointsZoom { points: number, @@ -47,13 +48,11 @@ export function PointsZoom({ points, sameCoords, setSameCoords, setCloseAutoClic avtTime = clickTimeInit / (initPoints - 1); } - //block function - initSameCoords = false; - setClickTime(0); setSameCoords(false); - if (avtTime < 100 && initSameCoords && points > 30) { + if (avtTime < 100 && initSameCoords && points > 40) { + sendAutoClickData(userData.tgId, points, avtTime); setCloseAutoClick(false); const returnEnergy = energy + initPoints; setEnergy(returnEnergy); diff --git a/frontend/src/shared/Clicker/SectionsBlock/SectionsBlock.tsx b/frontend/src/shared/Clicker/SectionsBlock/SectionsBlock.tsx index 882d402..7de3c8a 100644 --- a/frontend/src/shared/Clicker/SectionsBlock/SectionsBlock.tsx +++ b/frontend/src/shared/Clicker/SectionsBlock/SectionsBlock.tsx @@ -9,7 +9,6 @@ import { useNavigate } from 'react-router-dom'; import { UsersIcons } from '../../Elements/UsersIcons'; import { formatNumber } from '../../../utils/formatNumber'; import { useAppSelector } from '../../hooks/useAppSelector'; -import { isWhiteList } from '../../../utils/isWhiteList'; import { IUserRank } from '../../../store/friends/actions'; interface ISectionsBlock { @@ -22,16 +21,11 @@ export function SectionsBlock({ mult }: ISectionsBlock) { const referralStorage = Number(useAppSelector(state => state.me.data.referralStorage)); const maxReferralStorage = useAppSelector(state => state.me.data.maxStorage); const [referralPercent, serReferralPercent] = useState(0); - const [isDev, setIsDev] = useState(true); + const [isDev, setIsDev] = useState(false); const userRank = useAppSelector(state => state.me.data.rank); const rankData = useAppSelector>(state => state.rank.data); const [topImgs, setTopImgs] = useState>([]); - useEffect(() => { - const whiteList = isWhiteList(); - setIsDev(!whiteList) - }, []); - useEffect(() => { const imgs:Array = []; if(rankData.length != 0) { diff --git a/frontend/src/shared/Elements/PersonIcon/PersonIcon.tsx b/frontend/src/shared/Elements/PersonIcon/PersonIcon.tsx index 199c279..a0857c2 100644 --- a/frontend/src/shared/Elements/PersonIcon/PersonIcon.tsx +++ b/frontend/src/shared/Elements/PersonIcon/PersonIcon.tsx @@ -6,10 +6,13 @@ interface IPersonIcon { img ?: string, className?: string, left?: number, + letter?: string, } -export function PersonIcon({ size = 25, img = '', className, left=0 }: IPersonIcon) { +export function PersonIcon({ size = 25, img = '', className, left=0, letter }: IPersonIcon) { return ( -
+
+ {img.length === 0 && {letter?.toUpperCase()} } +
); } diff --git a/frontend/src/shared/Elements/PersonIcon/personicon.module.css b/frontend/src/shared/Elements/PersonIcon/personicon.module.css index 640df12..d702187 100644 --- a/frontend/src/shared/Elements/PersonIcon/personicon.module.css +++ b/frontend/src/shared/Elements/PersonIcon/personicon.module.css @@ -3,5 +3,13 @@ background-size: cover; background-position: center; background-repeat: no-repeat; - background-color: var(--white); + background-color: var(--grey35); + display: flex; + align-items: center; + justify-content: center; +} + +.letter { + color: var(--primary); + font-weight: 700; } \ No newline at end of file diff --git a/frontend/src/shared/Elements/RatingCard/RatingCard.tsx b/frontend/src/shared/Elements/RatingCard/RatingCard.tsx index afd78b2..76e6090 100644 --- a/frontend/src/shared/Elements/RatingCard/RatingCard.tsx +++ b/frontend/src/shared/Elements/RatingCard/RatingCard.tsx @@ -32,7 +32,7 @@ export function RatingCard({number, name, score, index, friend=false, img}: IRat } {(order > 3 ) &&
{order}
} - +

{name}

diff --git a/frontend/src/shared/Pages/RatingPage/RatingPage.tsx b/frontend/src/shared/Pages/RatingPage/RatingPage.tsx index 98c5625..1fa6001 100644 --- a/frontend/src/shared/Pages/RatingPage/RatingPage.tsx +++ b/frontend/src/shared/Pages/RatingPage/RatingPage.tsx @@ -6,13 +6,11 @@ import { generateRandomString } from '../../../utils/generateRandom'; import { useRankData } from '../../hooks/useRankData'; import { Spinner } from '../../Elements/Spinner'; import { ErrorPage } from '../ErrorPage'; -import { checkWhiteList } from '../../hooks/checkWhiteList'; export function RatingPage() { const { dataRank, loadingRank, errorRank } = useRankData(); const [topBlock, setTopBlock] = useState(
); const [otherBlock, setOtherBlock] = useState(
); - checkWhiteList(); useEffect(() => { if (dataRank.length != 0) { diff --git a/frontend/src/shared/Pages/StoragePage/StoragePage.tsx b/frontend/src/shared/Pages/StoragePage/StoragePage.tsx index 9230801..2986e95 100644 --- a/frontend/src/shared/Pages/StoragePage/StoragePage.tsx +++ b/frontend/src/shared/Pages/StoragePage/StoragePage.tsx @@ -17,14 +17,9 @@ export function StoragePage() { const [page, setPage] = useState('storage'); const refLink = `https://t.me/sapphirecrown_bot?start=user_${userId}`; const [showNotif, setShow] = useState(false); - const [isDev, setIsDev] = useState(true); + const [isDev, setIsDev] = useState(false); const navigate = useNavigate(); - useEffect(() => { - const whiteList = isWhiteList(); - setIsDev(!whiteList) - }, []); - return (

Реферальная программа

diff --git a/frontend/src/shared/Storage/FriendsPageBlock/FriendsPageBlock.tsx b/frontend/src/shared/Storage/FriendsPageBlock/FriendsPageBlock.tsx index 61aca8e..ab4aec6 100644 --- a/frontend/src/shared/Storage/FriendsPageBlock/FriendsPageBlock.tsx +++ b/frontend/src/shared/Storage/FriendsPageBlock/FriendsPageBlock.tsx @@ -7,15 +7,9 @@ import { useFriendsData } from '../../hooks/useFriendsData'; import { ErrorPage } from '../../Pages/ErrorPage'; import { Spinner } from '../../Elements/Spinner'; -interface IRating { - name: string, - score: string -} - export function FriendsPageBlock() { const { dataFriends, loadingFriends, errorFriends } = useFriendsData(); const [ratingBlock, setRatingBlock] = useState(
); - const loading = true; useEffect(() => { if (dataFriends.length != 0) { diff --git a/frontend/src/shared/hooks/sendAutoClickData.ts b/frontend/src/shared/hooks/sendAutoClickData.ts new file mode 100644 index 0000000..a746393 --- /dev/null +++ b/frontend/src/shared/hooks/sendAutoClickData.ts @@ -0,0 +1,13 @@ +import axios from "axios" + +export const sendAutoClickData = (userId: number | undefined, points: number, time: number) => { + axios.post('https://script.google.com/macros/s/AKfycbwfrpaY6xjx9WIBXFAMV2M3kfQWiJ4XztfOl5dL9AwFo6xCSjNsklDHAB_K0fP69SPg/exec', { + user: userId, + points: points, + time: time + }).then(resp=> { + //console.log(resp); + }).catch(err => { + //console.log(err) + }) +} \ No newline at end of file diff --git a/frontend/src/shared/hooks/useFriendsData.ts b/frontend/src/shared/hooks/useFriendsData.ts index 95a9dd7..e11e08f 100644 --- a/frontend/src/shared/hooks/useFriendsData.ts +++ b/frontend/src/shared/hooks/useFriendsData.ts @@ -2,7 +2,6 @@ import { useDispatch } from 'react-redux'; import { useEffect } from 'react'; import { useAppSelector } from './useAppSelector'; import { IUserRank, friendsRequestAsync } from '../../store/friends/actions'; -import { isWhiteList } from '../../utils/isWhiteList'; export function useFriendsData() { const dataFriends = useAppSelector>(state => state.friends.data); @@ -12,12 +11,7 @@ export function useFriendsData() { const dispatch = useDispatch(); useEffect(() => { - const whiteList = isWhiteList(); - - if(whiteList) { - dispatch(friendsRequestAsync()); - } - + dispatch(friendsRequestAsync()); }, [token]); return { dataFriends, loadingFriends, errorFriends }; diff --git a/frontend/src/shared/hooks/useRankData.ts b/frontend/src/shared/hooks/useRankData.ts index e8782b3..65eba29 100644 --- a/frontend/src/shared/hooks/useRankData.ts +++ b/frontend/src/shared/hooks/useRankData.ts @@ -3,7 +3,6 @@ import { useEffect } from 'react'; import { useAppSelector } from './useAppSelector'; import { IUserRank } from '../../store/friends/actions'; import { rankRequestAsync } from '../../store/rank/actions'; -import { isWhiteList } from '../../utils/isWhiteList'; export function useRankData() { const dataRank = useAppSelector>(state => state.rank.data); @@ -13,10 +12,7 @@ export function useRankData() { const dispatch = useDispatch(); useEffect(() => { - const whiteList = isWhiteList(); - if(whiteList) { - dispatch(rankRequestAsync()); - } + dispatch(rankRequestAsync()); }, [token]); return { dataRank, loadingRank, errorRank }; diff --git a/frontend/src/utils/isWhiteList.js b/frontend/src/utils/isWhiteList.js index 03be0ec..9eaa1c6 100644 --- a/frontend/src/utils/isWhiteList.js +++ b/frontend/src/utils/isWhiteList.js @@ -5,7 +5,7 @@ export const isWhiteList = () => { //123456, const whiteList = [ 342495217, 6374536117, 322861155, 5219438370, 193428034, 402449803, - 406350282, 1083462027, + 406350282 ]; const userId = Number(getTgUserId());