tari-project · stringhandler · Aug 13, 2024 · Aug 12, 2024 · Aug 12, 2024 · Aug 12, 2024
diff --git a/assets/fonts/Jost-Regular.woff b/assets/fonts/Jost-Regular.woff
diff --git a/assets/fonts/Jost-Regular.woff2 b/assets/fonts/Jost-Regular.woff2
diff --git a/assets/index-DFDuEtdz.css b/assets/index-DFDuEtdz.css
diff --git a/assets/index-DNOwXiCN.js b/assets/index-DNOwXiCN.js
diff --git a/assets/js/dat.gui.min.js b/assets/js/dat.gui.min.js
diff --git a/assets/textures/clay.exr b/assets/textures/clay.exr
diff --git a/assets/textures/clay3.exr b/assets/textures/clay3.exr
diff --git a/eslint.config.js b/eslint.config.js
@@ -1,15 +1,18 @@
-import pluginJs from '@eslint/js'
-import tseslint from 'typescript-eslint'
-import react from 'eslint-plugin-react'
-import eslintConfigPrettier from 'eslint-config-prettier'
+import pluginJs from '@eslint/js';
+import tseslint from 'typescript-eslint';
+import react from 'eslint-plugin-react';
+import prettierConfig from 'eslint-config-prettier';
+import globals from 'globals';
 
 export default [
  react.configs.flat.recommended,
  react.configs.flat['jsx-runtime'],
  pluginJs.configs.recommended,
  ...tseslint.configs.recommended,
- eslintConfigPrettier,
  {
+ languageOptions: {
+ globals: { ...globals.browser },
+ },
  files: ['src/**/*.{js,ts,jsx,tsx}'],
  ignores: ['./**/*.config.{js,ts}'],
  plugins: { react },
@@ -19,4 +22,5 @@ export default [
  '@typescript-eslint/no-explicit-any': 'warn',
  },
  },
-]
+ prettierConfig,
+];
diff --git a/index.html b/index.html
@@ -2,13 +2,11 @@
 <html lang="en">
  <head>
  <meta charset="UTF-8" />
- <link rel="icon" type="image/svg+xml" href="/vite.svg" />
  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+ <link rel="icon" type="image/svg+xml" href="/vite.svg" />
  <title>Tari Universe</title>
- <script type="module" crossorigin src="/assets/index-DNOwXiCN.js"></script>
- <link rel="stylesheet" crossorigin href="/assets/index-DFDuEtdz.css">
  <style>
- canvas  {
+ canvas {
  visibility: visible;
  padding: 0 0 0 200px;
  position: absolute;
@@ -25,7 +23,7 @@
  </head>
  <body>
  <div id="root"></div>
- <script src="assets/js/dat.gui.min.js"></script>
+ <script type="module" crossorigin src="/assets/index-CcNHoC10.js"></script>
  <script type="module" src="/src/main.tsx"></script>
  </body>
 </html>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -15,6 +15,7 @@
  "@emotion/styled": "^11.13.0",
  "@mui/material": "^5.16.6",
  "@tauri-apps/api": "^1",
+ "globals": "^15.9.0",
  "react": "^18.2.0",
  "react-dom": "^18.2.0",
  "react-icons": "^5.2.1",

diff --git a/public/assets/index-CcNHoC10.js b/public/assets/index-CcNHoC10.js
diff --git a/assets/models/BASE.buf → public/assets/models/BASE.buf b/assets/models/BASE.buf → public/assets/models/BASE.buf
diff --git a/assets/models/BOX.buf → public/assets/models/BOX.buf b/assets/models/BOX.buf → public/assets/models/BOX.buf
diff --git a/assets/models/lose_animation.buf → public/assets/models/lose_animation.buf b/assets/models/lose_animation.buf → public/assets/models/lose_animation.buf
diff --git a/public/assets/textures/LDR_RGB1_0.png b/public/assets/textures/LDR_RGB1_0.png
diff --git a/public/assets/textures/matcap.exr b/public/assets/textures/matcap.exr
diff --git a/src/App.tsx b/src/App.tsx
@@ -17,8 +17,8 @@ import { TauriEvent } from './types.ts';
 import useAppStateStore from './store/appStateStore.ts';
 import { useMining } from './hooks/useMining.ts';
 
-import { preload } from './visuals.js';
 import { useGetApplicatonsVersions } from './hooks/useGetApplicatonsVersions.ts';
+import { preload } from './visuals';
 
 function App() {
  const background = useUIStore((s) => s.background);

diff --git a/src/containers/Dashboard/MiningView/components/MiningButton.tsx b/src/containers/Dashboard/MiningView/components/MiningButton.tsx
@@ -5,6 +5,7 @@ import { useAppStatusStore } from '../../../../store/useAppStatusStore.ts';
 import { useMining } from '../../../../hooks/useMining.ts';
 import { styled } from '@mui/material/styles';
 import { keyframes } from '@emotion/react';
+import { useUIStore } from '../../../../store/useUIStore.ts';
 
 const StartStyle = {
  background: '#06C983',
@@ -44,9 +45,12 @@ const StyledIcon = styled(AiOutlineLoading)(() => ({
 
 function MiningButton() {
  const mining = useAppStatusStore((s) => s.cpu?.is_mining);
- const { startMining, stopMining, isLoading } = useMining();
+ const isLoading = useUIStore((s) => s.isMiningLoading);
+
+ const { startMining, stopMining } = useMining();
 
  const handleMining = () => {
+ if (isLoading) return;
  if (mining) {
  stopMining();
  } else {

diff --git a/src/hooks/useMining.ts b/src/hooks/useMining.ts
@@ -1,41 +1,46 @@
-import { useCallback } from 'react';
+import { useCallback, useRef } from 'react';
 import { invoke } from '@tauri-apps/api/tauri';
 import { useUIStore } from '../store/useUIStore';
-import { setStart, setPause } from '../visuals';
+import { setStart, setStop, setRestart } from '../visuals';
 
 export function useMining() {
- const isLoading = useUIStore((s) => s.isMiningLoading);
  const setIsLoading = useUIStore((s) => s.setIsMiningLoading);
  const setBackground = useUIStore((s) => s.setBackground);
+ const hasStarted = useRef(false);
 
  const startMining = useCallback(async () => {
  setIsLoading(true);
  try {
  await invoke('start_mining', {});
- setStart();
  } catch (e) {
  console.error('Could not start mining', e);
  } finally {
  setIsLoading(false);
  setBackground('mining');
+ if (!hasStarted.current) {
+ hasStarted.current = true;
+ setStart();
+ } else {
+ setRestart();
+ }
  }
- }, []);
+ }, [setIsLoading, setIsLoading]);
+
  const stopMining = useCallback(async () => {
  setIsLoading(true);
  try {
  await invoke('stop_mining', {});
- setPause();
+ setStop();
  } catch (e) {
  console.error('Could not stop mining', e);
  } finally {
  setIsLoading(false);
  setBackground('idle');
  }
- }, []);
+ }, [setIsLoading, setIsLoading]);
 
  return {
  startMining,
  stopMining,
- isLoading,
  };
 }
diff --git a/src/visuals.js b/src/visuals.js
@@ -1,5 +1,5 @@
+/* eslint-disable no-undef */
 let time;
-
 export const preload = () => {
  const el = document.getElementById('canvas');
  if (el) {
@@ -43,43 +43,13 @@ function update(dt) {
  glApp.render(dt);
 }
 
-export const setStart = () => {
- properties.stateSignal.dispatch(STATUS.STARTED);
-};
-
-function setSuccess() {
- properties.resultSignal.dispatch(RESULT.COMPLETED);
-}
-
-function setFailure() {
- properties.resultSignal.dispatch(RESULT.FAILED);
-}
-
-export const setPause = () => {
- properties.resultSignal.dispatch(RESULT.PAUSE);
+export function setStop() {
  properties.stateSignal.dispatch(STATUS.NOT_STARTED);
-};
-
-function onNewSpawn(callback) {
- if (callback && typeof callback === 'function') {
- properties.spawnSignal.add(callback);
- }
-}
-
-function onGameEnd(callback) {
- if (callback && typeof callback === 'function') {
- properties.gameEndedSignal.add(callback);
- }
 }
-
-function onCycleEnd(callback) {
- if (callback && typeof callback === 'function') {
- properties.endCycleSignal.add(callback);
- }
+export function setRestart() {
+ properties.stateSignal.dispatch(STATUS.FREE);
 }
 
-function onStateChange(callback) {
- if (callback && typeof callback === 'function') {
- properties.stateSignal.add((newState) => callback(newState));
- }
-}
+export const setStart = () => {
+ properties.stateSignal.dispatch(STATUS.STARTED);
+};