1.0.8

.gitignore

@@ -38,7 +38,10 @@ src/renderer.prod.js
 src/renderer.prod.js.map
 src/style.css
 src/style.css.map
+app.spec
 dist
+/python
+build
 dll
 main.js
 main.js.map

assets/loaders/update.html

@@ -34,7 +34,7 @@
           progress.style.width = `${downloadPercent}%`
           if (downloadPercent >= 50) {
             message.innerText = "1";
-            title.innerText = "Almost done"
+            title.innerText = 'Almost done'
           }
       });
 

assets/locales/en/translation.json

@@ -1,12 +1,15 @@
 {
+  "AlreadyLinkedText": "This access code is already linked to another PC.",
+  "BlockedText": "You are blocked, write to the seller to clarify the reason.",
+  "NotFoundText": "No such access code found, please try again.",
   "Continue": "Continue",
   "Get Started": "Get Started",
   "Back": "Back",
   "Please enter at least 6 characters": "Please enter at least 6 characters",
   "Help": "Help",
   "Please enter an access code": "Please enter an access code",
   "Access code": "Access code",
-  "Use the access code given to you. 1 key for 1 PC, to reset the binding, write to the seller": "Use the access code given to you. 1 key for 1 PC, to reset the binding, write to the seller",
+  "Use the access code given to you. 1 access code for 1 PC, to reset the binding, write to the seller": "Use the access code given to you. 1 access code for 1 PC, to reset the binding, write to the seller",
   "Enter the access code": "Enter the access code",
   "Loading": "Loading",
   "Unknown error": "Unknown error",

assets/locales/ru/translation.json

@@ -1,17 +1,20 @@
 {
+  "AlreadyLinkedText": "Этот код доступа уже связан с другим ПК.",
+  "BlockedText": "Вас заблокировали, напишите продавцу для уточнения причины.",
+  "NotFoundText": "Такой код доступа не найден, попробуйте еще раз.",
   "Continue": "Далее",
   "Get Started": "Начать",
   "Back": "Назад",
   "Please enter at least 6 characters": "Пожалуйста, введите не менее 6 символов",
   "Help": "Помощь",
   "Please enter an access code": "Пожалуйста, введите код доступа",
   "Access code": "Код доступа",
-  "Use the access code given to you. 1 key for 1 PC, to reset the binding, write to the seller": "Используйте предоставленный вам ключ доступа. 1 клавиша для 1 ПК, для сброса привязки, напишите продавцу",
+  "Use the access code given to you. 1 access code for 1 PC, to reset the binding, write to the seller": "Используйте предоставленный вам код доступа. 1 код доступа для 1 ПК, для сброса привязки, напишите продавцу",
   "Enter the access code": "Введите код доступа",
   "Loading": "Загрузка",
   "Unknown error": "Неизвестная ошибка",
   "You are blocked, write to the seller to clarify the reason": "Вас заблокировали, напишите продавцу, чтобы уточнить причину",
-  "This access code is already linked to another PC": "Такой ключ доступа не найден, повторите попытку",
+  "This access code is already linked to another PC": "Такой код доступа не найден, повторите попытку",
   "The basics": "Основы",
   "Make sure you have the latest version of Windows 10 or Windows 11, it doesn't hurt to check for updates. Change account data Microsoft Store is prohibited. Our account is only needed to access the game. All game statistics, nickname, etc. are linked to your account Xbox": "Убедитесь, что у вас последняя версия Windows 10 или Windows 11, не помешает проверка наличия обновлений. Изменять данные учетной записи Microsoft Store запрещено. Наша учетная запись нужна только для доступа к игре. Вся игровая статистика, никнейм и т.д. привязаны к вашей учетной записи Xbox",
   "Personal account": "Личный кабинет",

package.json

@@ -3,13 +3,14 @@
   "productName": "ForcebuyActivator",
   "description": "ForcebuyActivator",
   "scripts": {
-    "build": "concurrently \"yarn build:main\" \"yarn build:renderer\"",
+    "build": "concurrently \"yarn build:main\" \"yarn build:renderer\" \"yarn build:python\"",
     "build:main": "cross-env NODE_ENV=production webpack --config ./.erb/configs/webpack.config.main.prod.babel.js",
     "build:renderer": "cross-env NODE_ENV=production webpack --config ./.erb/configs/webpack.config.renderer.prod.babel.js",
+    "build:python": "pyinstaller --noconsole --noconfirm --clean --hidden-import flask --distpath ./python --icon ./assets/icon.ico ./src/python/app.py",
     "rebuild": "electron-rebuild --parallel --types prod,dev,optional --module-dir src",
     "lint": "cross-env NODE_ENV=development eslint . --cache --ext .js,.jsx,.ts,.tsx",
-    "package": "pyinstaller --noconsole --noconfirm --hidden-import flask --distpath ./python ./src/app.py --icon ./assets/icon.ico && rimraf src/dist && yarn build && electron-builder build --win --publish never",
-    "deploy": "pyinstaller --noconsole --noconfirm --hidden-import flask --distpath ./python ./src/app.py --icon ./assets/icon.ico && rimraf src/dist && yarn build && electron-builder build --win --publish always",
+    "package": "rimraf src/dist && yarn build && electron-builder build --win --publish never",
+    "deploy": "rimraf src/dist && yarn build && electron-builder build --win --publish always",
     "postinstall": "node -r @babel/register .erb/scripts/CheckNativeDep.js && electron-builder install-app-deps && yarn cross-env NODE_ENV=development webpack --config ./.erb/configs/webpack.config.renderer.dev.dll.babel.js && opencollective-postinstall && yarn-deduplicate yarn.lock",
     "start": "node -r @babel/register ./.erb/scripts/CheckPortInUse.js && yarn start:renderer",
     "start:main": "cross-env NODE_ENV=development electron -r ./.erb/scripts/BabelRegister ./src/main.dev.ts",
@@ -106,7 +107,6 @@
     "@types/node": "14.14.10",
     "@types/react": "^17.0.5",
     "@types/react-dom": "^16.9.9",
-    "@types/react-router-dom": "^5.1.6",
     "@types/react-test-renderer": "^16.9.3",
     "@types/webpack-env": "^1.15.2",
     "@typescript-eslint/eslint-plugin": "^4.8.1",
@@ -130,7 +130,6 @@
     "electron-builder": "^22.10.5",
     "electron-devtools-installer": "git+https://github.com/MarshallOfSound/electron-devtools-installer.git",
     "electron-notarize": "^1.0.0",
-    "electron-rebuild": "^2.3.2",
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.15.3",
     "enzyme-to-json": "^3.5.0",
@@ -152,7 +151,6 @@
     "jest": "^26.1.0",
     "lint-staged": "^10.2.11",
     "mini-css-extract-plugin": "^1.3.1",
-    "node-sass": "^5.0.0",
     "opencollective-postinstall": "^2.0.3",
     "postcss": "^8.3.5",
     "postcss-loader": "^6.1.1",
@@ -175,6 +173,7 @@
   },
   "dependencies": {
     "axios": "^0.21.1",
+    "caniuse-lite": "^1.0.30001299",
     "child_process": "^1.0.2",
     "clsx": "^1.1.1",
     "cwait": "^1.1.2",
@@ -197,8 +196,8 @@
     "react-dom": "^17.0.1",
     "react-hook-form": "^7.5.2",
     "react-i18next": "^11.11.3",
-    "react-router-dom": "^5.2.0",
     "regenerator-runtime": "^0.13.5",
+    "sass": "^1.48.0",
     "source-map-support": "^0.5.19"
   },
   "devEngines": {

src/components/Steps/LoginStep.tsx

@@ -6,7 +6,7 @@ import { Button } from '../Button/Button';
 import Axios from '../../core/axios';
 import { getHWID } from 'hwid';
 import { ipcRenderer } from 'electron';
-import { Info, Lifebuoy } from 'phosphor-react';
+import { AppWindow, Question } from 'phosphor-react';
 import { useTranslation } from 'react-i18next';
 import { motion } from 'framer-motion';
 
@@ -71,13 +71,12 @@ export const LoginStep: React.FC = () => {
       const errorType: string = error.response.data.message;
       let errorMsg: string;
       errorType === 'notFound'
-        ? (errorMsg = 'No such access code was found, try again')
+        ? (errorMsg = t('NotFoundText'))
         : errorType === 'alreadyLinked'
-        ? (errorMsg = 'This access code is already linked to another PC.')
+        ? (errorMsg = t('AlreadyLinkedText'))
         : errorType === 'blocked'
-        ? (errorMsg =
-            'You are blocked, write to the seller to clarify the reason.')
-        : 'Unknown error';
+        ? (errorMsg = t('BlockedText'))
+        : t('Unknown error');
       setError('key', {
         type: 'manual',
         message: errorMsg,
@@ -116,8 +115,7 @@ export const LoginStep: React.FC = () => {
         </h2>
         <p className="mt-3 text-gray-800">
           {t(
-            'Use the access code given to you. 1 key for 1 PC, to reset the binding, write to the seller',
-            '.'
+            'Use the access code given to you. 1 access code for 1 PC, to reset the binding, write to the seller'
           )}
         </p>
       </div>
@@ -163,7 +161,7 @@ export const LoginStep: React.FC = () => {
       <div className="flex items-center justify-between mt-5">
         <div className="text-center sm:text-left whitespace-nowrap">
           <div className="flex items-center transition duration-200 px-3 py-3 font-normal text-sm rounded-lg text-gray-500 ">
-            <Info className="w-5 h-5 inline-block align-text-top" />
+            <AppWindow className="w-5 h-5 inline-block align-text-top" />
             <span className="inline-block ml-1">{appVersion}</span>
           </div>
         </div>
@@ -174,7 +172,7 @@ export const LoginStep: React.FC = () => {
             }
             className="flex items-ceter transition duration-200 px-4 py-3 cursor-pointer font-normal text-sm rounded-lg text-gray-500 hover:bg-gray-100 focus:outline-none focus:bg-gray-200 focus:ring-2 focus:ring-gray-400 focus:ring-opacity-50 ring-inset"
           >
-            <Lifebuoy className="w-5 h-5 inline-block align-text-bottom" />
+            <Question className="w-5 h-5 inline-block align-text-bottom" />
             <span className="inline-block ml-1">{t('Help')}</span>
           </button>
         </div>

src/main.dev.ts

@@ -106,7 +106,7 @@ const createWindow = async () => {
     process.env.NODE_ENV === 'development' ||
     process.env.DEBUG_PROD === 'true'
   ) {
-    spawn(`python ./src/app.py ${port}`, {
+    spawn(`python ./src/python/app.py ${port}`, {
       detached: true,
       shell: true,
       stdio: 'inherit',

src/package.json

@@ -1,11 +1,11 @@
 {
   "name": "forcebuy-activator",
   "productName": "Forcebuy Activator",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "Easy access to any game https://forcebuy.ru",
   "main": "./main.prod.js",
   "author": {
-    "name": "youngtype",
+    "name": "HexagonbutApSenT",
     "email": "support@forcebuy.ru",
     "url": "https://forcebuy.ru"
   },