diff --git a/frontend/src/.DS_Store b/frontend/src/.DS_Store
index 4eef03b..c14f32c 100644
Binary files a/frontend/src/.DS_Store and b/frontend/src/.DS_Store differ
diff --git a/frontend/src/shared/.DS_Store b/frontend/src/shared/.DS_Store
deleted file mode 100644
index c4b26bf..0000000
Binary files a/frontend/src/shared/.DS_Store and /dev/null differ
diff --git a/frontend/src/shared/Auction/Timer/Timer.tsx b/frontend/src/shared/Auction/Timer/Timer.tsx
index c373d51..b7cde2f 100644
--- a/frontend/src/shared/Auction/Timer/Timer.tsx
+++ b/frontend/src/shared/Auction/Timer/Timer.tsx
@@ -35,7 +35,7 @@ export function Timer({initTime}: ITimer) {
return (
-
{hour}
+
{hour.toString().length === 1 ? `0${hour}` : hour}
{declension(hour, 'час', 'часа', 'часов')}
diff --git a/frontend/src/shared/Clicker/ClickerFooter/ClickerFooter.tsx b/frontend/src/shared/Clicker/ClickerFooter/ClickerFooter.tsx
index fc9c2e8..cbb4fba 100644
--- a/frontend/src/shared/Clicker/ClickerFooter/ClickerFooter.tsx
+++ b/frontend/src/shared/Clicker/ClickerFooter/ClickerFooter.tsx
@@ -1,17 +1,12 @@
-import React, { useEffect, useState } from 'react';
+import React, { useState } from 'react';
import styles from './clickerfooter.module.css';
import { ClickerBtnFooter } from '../ClickerBtnFooter';
import { EIcons, Icon } from '../../Icons';
import { useNavigate } from 'react-router-dom';
-import { isWhiteList } from '../../../utils/isWhiteList';
export function ClickerFooter() {
const navigate = useNavigate();
- const [isDev, setIsDev] = useState(true);
-
- useEffect(() => {
- setIsDev(!isWhiteList());
- }, []);
+ const [isDev, setIsDev] = useState(false);
return (
diff --git a/frontend/src/shared/Pages/ClickerPage/ClickerPage.tsx b/frontend/src/shared/Pages/ClickerPage/ClickerPage.tsx
index 8dd080f..c8db46c 100644
--- a/frontend/src/shared/Pages/ClickerPage/ClickerPage.tsx
+++ b/frontend/src/shared/Pages/ClickerPage/ClickerPage.tsx
@@ -42,9 +42,8 @@ export function ClickerPage({ name, points, img, energy }: IClickerPageInterface
const html = document.querySelector('html');
if(html) {
- html.style.overflow = 'scroll';
+ html.style.overflowY = 'scroll';
}
-
}, []);
useEffect(() => {
diff --git a/frontend/src/store/auction/actions.ts b/frontend/src/store/auction/actions.ts
index e09970b..b329a18 100644
--- a/frontend/src/store/auction/actions.ts
+++ b/frontend/src/store/auction/actions.ts
@@ -88,6 +88,7 @@ export const auctionRequestAsync = (): ThunkAction {
const user = resp.data;
+ sessionStorage.setItem('shT', 't');
+ sessionStorage.setItem('shL', 't');
axios.get(`${URLClick}/api/v1/energy`, {
headers: {
//"Content-type": "application/json",
@@ -125,8 +127,6 @@ export const meRequestAsync = (): ThunkAction {
console.log(err);
if (err.response.data.detail) {
@@ -203,6 +204,8 @@ export const meRequestAsync = (): ThunkAction {
+ sessionStorage.setItem('shT', 't');
+ sessionStorage.setItem('shL', 't');
const user = resp.data;
let avatar = user.avatar;
if (!avatar) {
@@ -221,8 +224,6 @@ export const meRequestAsync = (): ThunkAction {
console.log(err);
if (err.response.data.detail) {
diff --git a/frontend/src/utils/isWhiteList.js b/frontend/src/utils/isWhiteList.js
index 6f40c1e..930407e 100644
--- a/frontend/src/utils/isWhiteList.js
+++ b/frontend/src/utils/isWhiteList.js
@@ -2,10 +2,8 @@ import { getTgUserId } from "./verification";
export const isWhiteList = () => {
let isWhiteList = false;
- //123456,
const whiteList = [
- 342495217, 6374536117, 322861155, 5219438370, 193428034, 402449803,
- 406350282, 1083462027
+ //TODO!
];
const userId = Number(getTgUserId());