add clicks

frontend/src/shared/Clicker/ClickerBtn/ClickerBtn.tsx

@@ -42,11 +42,13 @@ export function ClickerBtn({ coins, setCoins, energy }: IClickerBtn) {
   }, [styleIndex]);
 
   const btnClick = () => {
-    if(!error) {
+    sendClick();
+    /*if(!error) {
+      sendClick();
       const newEnergy = initEnergy - 1;
       const newFill = (maxEnergy - newEnergy) / maxEnergy * 100;
       if (newFill <= 100) {
-        //sendClick();
+        sendClick();
         const newCoins = coins + 1;
         dispatch<any>(updateCoinsRequestAsync(newCoins, newEnergy))
         setCoins(newCoins);
@@ -68,19 +70,46 @@ export function ClickerBtn({ coins, setCoins, energy }: IClickerBtn) {
       }
     } else {
       sendClick();
-    }
+    }*/
   };
 
   const sendClick = () => {
     if(urlClick && token) {
-      axios.get(`${urlClick}/click`, {
+      axios.get(`${urlClick}/api/v1/click`, {
         headers: {
-          "Content-type": "application/json",
+          //"Content-type": "application/json",
           "Authorization": `TelegramToken ${token}`
         }
       },
       ).then((resp) => {
         console.log(resp);
+        if(resp.data) {
+          const click = Number(resp.data.click.value);
+          //
+          const newEnergy = initEnergy - click;
+          const newFill = (maxEnergy - newEnergy) / maxEnergy * 100;
+          if (newFill <= 100) {
+            const newCoins = coins + click;
+            dispatch<any>(updateCoinsRequestAsync(newCoins, newEnergy))
+            setCoins(newCoins);
+            setEnergy(newEnergy)
+            setFill(newFill);
+          } else {
+            setFill(100);
+          }
+
+          if (newFill < 100) {
+            setSize(220);
+
+            const timer = setTimeout(() => {
+              setSize(240);
+              clearTimeout(timer);
+            }, 100);
+          } else {
+            setClose(false);
+          }
+          //
+        }
         if(error) {
           setError(false)
         }
@@ -101,12 +130,12 @@ export function ClickerBtn({ coins, setCoins, energy }: IClickerBtn) {
     },
     {
       title: 'Как продолжить кликать',
-      text: <span>Чтобы охладиться, нужно перезагрузить систему, нажав по&nbsp;кнопке ниже.</span>,
+      text: <span>Чтобы охладиться, нужно нужно закрыть приложение, нажав по&nbsp;кнопке ниже.</span>,
       img: 'assets/Monocle.png'
     },
     {
       title: 'Что дальше',
-      text: <span>Система перезагрузится и&nbsp;ты&nbsp;сможешь продолжить поддерживать свою большую концентрацию.</span>,
+      text: <span>Затем ты&nbsp;сможешь открыть приложение заново и&nbsp;продолжить поддерживать свою большую концентрацию.</span>,
       img: 'assets/Rocket.png'
     },
   ];
@@ -121,8 +150,8 @@ export function ClickerBtn({ coins, setCoins, energy }: IClickerBtn) {
           {gradient}
         </defs>
       </svg>
-      {!close && <ModalWindow setCloseAnimOut={setClose} setClose={setClose} modalBlock={
+      {!close && <ModalWindow setCloseAnimOut={setClose} removeBtn={true} setClose={setClose} modalBlock={
-        <ClickerPopup title='Кнопка перегрелась' cards={hotCards} setClose={setClose} />
+        <ClickerPopup title='Кнопка перегрелась' cards={hotCards} setClose={setClose} isBtn={true}/>
       } />}
       {!closeError && <ModalWindow removeBtn={true} setCloseAnimOut={setAnimClose} closeAnimOut={animClose} setClose={setCloseError} modalBlock={
         <DevPopup setClose={setAnimClose} type='error'/>

frontend/src/shared/Clicker/ClickerFooter/ClickerFooter.tsx

@@ -10,7 +10,7 @@ export function ClickerFooter() {
   const navigate = useNavigate();
   const [closeAnimOut, setCloseAnimOut] = useState(false);
   const [closeDev, setCloseDev] = useState(true);
-  const isDev = false;
+  const isDev = true;
 
   return (
     <div className={styles.container}>

frontend/src/shared/Clicker/ClickerPopup/ClickerPopup.tsx

@@ -3,6 +3,7 @@ import styles from './clickerpopup.module.css';
 import { ETextStyles } from '../../texts';
 import { PopupCard } from '../../Elements/PopupCard';
 import { generateRandomString } from '../../../utils/generateRandom';
+import { Button } from '../../Button';
 
 interface ICardInterface {
   title: string,
@@ -14,10 +15,11 @@ interface IClickerPopup {
   title: string,
   cards: Array<ICardInterface>,
   setClose(a: boolean): void,
-  text ?: string
+  text ?: string,
+  isBtn?: boolean
 }
 
-export function ClickerPopup({ title, cards, text }: IClickerPopup) {
+export function ClickerPopup({ title, cards, text, isBtn=false }: IClickerPopup) {
 
   const blockCards = cards.map((item) => {
     return <PopupCard key={generateRandomString()} title={item.title} text={item.text} img={item.img}/>
@@ -28,6 +30,13 @@ export function ClickerPopup({ title, cards, text }: IClickerPopup) {
       <h2 style={ETextStyles.RwSb24100} className={styles.title}>{title}</h2>
       <div className={styles.cards}>{blockCards}</div>
       {text && <p className={styles.text}>{text}</p> }
+      {isBtn && <Button text='Закрыть' onClick={() => {
+        //@ts-ignore
+        if (window.Telegram) {
+          //@ts-ignore
+          window.Telegram.WebApp.close()
+        }
+        }}/>}
     </div>
   );
 }

frontend/src/shared/Clicker/SectionsBlock/SectionsBlock.tsx

@@ -17,7 +17,7 @@ export function SectionsBlock() {
   const [closeAnimOut, setCloseAnimOut] = useState(false);
   const [closeDev, setCloseDev] = useState(true);
 
-  const isDev = false;
+  const isDev = true;
 
   const multipCards = [
     {

frontend/src/shared/Elements/StylesSwiper/StylesSwiper.tsx

@@ -68,7 +68,7 @@ export const StylesSwiper: React.FC<IStylesSwiper> = memo(({ selectedStyle, setC
             return (
               <div
                 ref={(el) => (slideRefs.current[index] = el as HTMLDivElement)}
-                className={`${styles.card} ${cardStyle} ${selectedStyle === index && styles.selected}`}
+                className={`${styles.card} ${cardStyle} ${selectedStyle === index && styles.selected} ${index > 0 && styles.disabled}`}
                 style={{
                   transform: `rotate(${isActive ? 0 : deg}deg)`,
                   filter: `blur(${isActive ? 0 : 3}px)`

frontend/src/shared/Elements/StylesSwiper/stylesswiper.module.css

@@ -52,3 +52,18 @@
     background-image: url('assets/style4.png');
 }
 
+.disabled {
+    position: relative;
+    pointer-events: none;
+    filter: blur(3px) !important;
+}
+
+.disabled::after {
+    content: '';
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    background-color: rgb(0, 0, 0, 0.3);
+    filter: blur(25px);
+    border-radius: 27px;
+}

frontend/src/shared/Pages/RoutePage/RoutePage.tsx

@@ -26,9 +26,11 @@ export function RoutePage({ page }: IRoutePage) {
     updateStyles();
   }, [page]);
 
+  //{!verified ? <WrongSourcePage/> : 
+  //} 
+
   return (
     <div>
-      {!verified ? <WrongSourcePage/> : 
       <div>
         {page === 'main' && !loadingUser && !errorUser && dataUser.name && dataUser.avatar && <ClickerPage name={dataUser.name} points={Number(dataUser.points)} img={dataUser.avatar} energy={Number(dataUser.energy)}/>}
         {page === 'rating' && !loadingUser && !errorUser && <RatingPage />}
@@ -37,7 +39,7 @@ export function RoutePage({ page }: IRoutePage) {
         {page === 'styles' && !loadingUser && !errorUser && <StylesPage />}
         {(loadingUser) && <div className={styles.spinnerContainer}><Spinner color='#FFFFFF' size='50px' thickness='6px' className={styles.spinner} /></div> }
         {errorUser && !loadingUser && <ErrorPage detail={errorUser}/>}
-      </div>} 
+      </div> 
     </div>
   );
 }

frontend/src/shared/Pages/StylesPage/StylesPage.tsx

@@ -11,8 +11,10 @@ export function StylesPage() {
   const [selectedStyle, setSelectedStyle] = useState(selectedIndex ? selectedIndex : 0);
   const [currentSlide, setCurrentSlide] = useState(0);
   const [showNotif, setShow] = useState(false);
+  const isDev = true;
 
-  const stylesNames = ['Черно-синий', 'Grapefruit', 'Tropic mamba', 'Mamba & Grapefruit'];
+  //const stylesNames = ['Черно-синий', 'Grapefruit', 'Tropic mamba', 'Mamba & Grapefruit'];
+  const stylesNames = ['Черно-синий', 'Скоро будет доступен', 'Скоро будет доступен', 'Скоро будет доступен'];
   const colors = ['#7EB4DB', '#FE744B', '#F2D06B', '#EA9C55'];
   const gradients = ['linear-gradient(90deg, #90D7ED 13.05%, #6887C4 91.06%, #8085C0 172.24%)', 'linear-gradient(302deg, #FF5421 -59.57%, #FF7248 43.7%, #FF9576 163.26%)', 'linear-gradient(302deg, #6ACB54 -59.57%, #DCBB5A 43.7%, #E2883D 163.26%)', 'linear-gradient(302deg, #FF805A -1.15%, #DEAE53 83.89%)'];
 
@@ -55,7 +57,7 @@ export function StylesPage() {
         <span>Будь круче&nbsp;&mdash;</span> будь на&nbsp;стиле!</h1>
       <StylesSwiper selectedStyle={selectedStyle} setCurrentSlide={setCurrentSlide}/>
       <p style={ETextStyles.RwSb16120} className={styles.styleName}>{stylesNames[currentSlide]}</p>
-      <Button onClick={selectStyle} disabled={currentSlide === selectedStyle} text={currentSlide === selectedStyle ? 'Уже выбран' : 'Выбрать этот стиль'} className={styles.btn}/>
+      {!isDev && <Button onClick={selectStyle} disabled={currentSlide === selectedStyle} text={currentSlide === selectedStyle ? 'Уже выбран' : 'Выбрать этот стиль'} className={styles.btn}/>}
       {showNotif && <Notification title={`Стиль ${stylesNames[selectedStyle]} выбран`} text='Можете вернуться на&nbsp;главную, чтобы увидеть изменения' setShow={setShow} />}
     </div>
   );

frontend/src/shared/hooks/useTgData.ts

@@ -17,6 +17,8 @@ export function useTgData() {
         if (savedToken.length === 0) {
             //@ts-ignore
             const [user, token]: [IUserTg, string] = verificationTg();
+            console.log(`user из useTgData ${user}`);
+            console.log(`token3 ${token}`);
             if (token.length != 0 && user.id && user.id.length != 0) {
                 setVerified(true);
                 dispatch<any>(saveToken(token));

frontend/src/store/me/actions.ts

@@ -53,7 +53,9 @@ export const meRequestAsync = (): ThunkAction<void, RootState, unknown, Action<s
     const secondName = getState().userTg.lastName;
     const token = getState().token;
     const URL = getState().url;
-    if (tgId && URL && !meData.avatar && token.length != 0) {
+    const URLClick = getState().urlClick;
+    //localStorage.setItem('eg', '500');
+    /*if (tgId && URL && !meData.avatar && token.length != 0 && URLClick) {
         dispatch(meRequest());
         axios.get(`${URL}/api/v1/users/${tgId}/`, {
             headers: {
@@ -65,24 +67,40 @@ export const meRequestAsync = (): ThunkAction<void, RootState, unknown, Action<s
             const user = resp.data;
             const encodeToken = btoa(unescape(encodeURIComponent(token)));
             const savedToken = localStorage.getItem('sts');
-            if (savedToken) {
+            axios.get(`${URLClick}/api/v1/energy`, {
-                if (savedToken != encodeToken) {
+                        headers: {
-                    localStorage.setItem('eg', user.energy); //user.energy
+                            //"Content-type": "application/json",
-                    localStorage.setItem('sts', encodeToken);
+                            "Authorization": `TelegramToken ${token}`
-                }
+                        }
-            } else {
+                    },
-                localStorage.setItem('eg', user.energy); //user.energy
+                    ).then((resp) => {
-                localStorage.setItem('sts', encodeToken);
+                        const energy = resp.data.energy;
-            }
+                        if (savedToken) {
-            const userData = {
+                            if (savedToken != encodeToken) {
-                tgId: user.tg_id,
+                                localStorage.setItem('eg', '200'); //enegry
-                username: user.username,
+                                localStorage.setItem('sts', encodeToken);
-                avatar: user.avatar,
+                            }
-                energy: user.energy, //user.energy
+                        } else {
-                points: user.points,
+                            localStorage.setItem('eg', '200'); //energy
-                name: `${firstName} ${secondName}`
+                            localStorage.setItem('sts', encodeToken);
-            };
+                        }
-            dispatch(meRequestSuccess(userData));
+                        const userData = {
+                            tgId: user.tg_id,
+                            username: user.username,
+                            avatar: user.avatar,
+                            energy: energy.toString(), //energy
+                            points: user.points,
+                            name: `${firstName} ${secondName}`
+                        };
+                        dispatch(meRequestSuccess(userData));
+                    }).catch((err) => {
+                        console.log(err);
+                        if (err.response.data.detail) {
+                            dispatch(meRequestError(String(err.response.data.detail)));
+                        } else {
+                            dispatch(meRequestError(String(err)));
+                        }
+                    })
         }).catch((err) => {
             console.log(err);
             if (err.response.data.detail) {
@@ -91,9 +109,9 @@ export const meRequestAsync = (): ThunkAction<void, RootState, unknown, Action<s
                 dispatch(meRequestError(String(err)));
             }
         })
-    }
+    }*/
-    /*if (tgId && URL && !meData.avatar) {
+    if (tgId && URL && !meData.avatar) {
-        axios.get(`${URL}/api/v1/users/get-token/1083462027`, {
+        axios.get(`${URL}/api/v1/users/get-token/123456`, {
             headers: {
                 "Content-type": "application/json"
             }
@@ -113,28 +131,44 @@ export const meRequestAsync = (): ThunkAction<void, RootState, unknown, Action<s
                     const user = resp.data;
                     const encodeToken = btoa(unescape(encodeURIComponent(token)));
                     const savedToken = localStorage.getItem('sts');
-                    if(savedToken) {
+                    axios.get(`${URLClick}/api/v1/energy`, {
-                        if(savedToken != encodeToken) {
+                        headers: {
-                            localStorage.setItem('eg', user.energy); //user.energy
+                            //"Content-type": "application/json",
+                            "Authorization": `TelegramToken ${token}`
+                        }
+                    },
+                    ).then((resp) => {
+                        const energy = resp.data.energy;
+                        if (savedToken) {
+                            if (savedToken != encodeToken) {
+                                localStorage.setItem('eg', '200'); //enegry
+                                localStorage.setItem('sts', encodeToken);
+                            }
+                        } else {
+                            localStorage.setItem('eg', '200'); //energy
                             localStorage.setItem('sts', encodeToken);
                         }
-                    } else {
+                        const userData = {
-                        localStorage.setItem('eg', user.energy); //user.energy
+                            tgId: user.tg_id,
-                        localStorage.setItem('sts', encodeToken);
+                            username: user.username,
-                    }
+                            avatar: user.avatar,
-                    const userData = { 
+                            energy: energy.toString(), //user.energy
-                        tgId: user.tg_id, 
+                            points: user.points,
-                        username: user.username, 
+                            name: `${firstName} ${secondName}`
-                        avatar: user.avatar, 
+                        };
-                        energy: user.energy, //user.energy
+                        dispatch(meRequestSuccess(userData));
-                        points: user.points,
+                    }).catch((err) => {
-                        name: `${firstName} ${secondName}`
+                        console.log(err);
-                    };
+                        if (err.response.data.detail) {
-                    dispatch(meRequestSuccess(userData));
+                            dispatch(meRequestError(String(err.response.data.detail)));
+                        } else {
+                            dispatch(meRequestError(String(err)));
+                        }
+                    })
                 }).catch((err) => {
                     console.log(err);
-                    if(err.response.data.detail) {
+                    if (err.response.data.detail) {
-                       dispatch(meRequestError(String(err.response.data.detail))); 
+                        dispatch(meRequestError(String(err.response.data.detail)));
                     } else {
                         dispatch(meRequestError(String(err)));
                     }
@@ -143,7 +177,8 @@ export const meRequestAsync = (): ThunkAction<void, RootState, unknown, Action<s
         }).catch((err) => {
             console.log(err);
             dispatch(meRequestError(String(err)));
-        })*/
+        })
+    }
 }
 
 

frontend/src/store/reducer.ts

@@ -18,8 +18,8 @@ export type RootState = {
 //urlClick: 'http://127.0.0.1:8080',
 
 const initialState: RootState = {
-  url: '/',
+  url: '',
-  urlClick: '/',
+  urlClick: '',
   urlFull: '',
   token: '',
   userTg: {

frontend/src/utils/verification.js

@@ -5,6 +5,8 @@ export const verificationTg = () => {
         lastName: ''
     };
     let token = '';
+
+    console.log(`window.Telegram из verification ${window.Telegram}`);
     
     if(window.Telegram) {
         const tg = window.Telegram.WebApp;
@@ -39,14 +41,17 @@ export const verificationTg = () => {
         token = btoa(
           unescape(encodeURIComponent(validation))
         );
+        console.log(`token1 ${token}`);
         user.id = tg.initDataUnsafe?.user?.id;
         user.firstName = tg.initDataUnsafe?.user?.first_name;
         user.lastName = tg.initDataUnsafe?.user?.last_name;
     }
+    
+    console.log(`token2 ${token}`);
 
     //локально
     /*token = "TelegramToken";
-    user.id = "1083462027";
+    user.id = "123456";
     user.firstName = 'User';
     user.lastName = 'Name';*/