Client version

client/package.json

@@ -1,4 +1,5 @@
 {
+  "homepage": "https://mhmighani.github.io/chortkeh",
   "name": "chortkeh-client",
   "version": "0.1.0",
   "private": true,
@@ -35,6 +36,8 @@
     "web-vitals": "^1.1.2"
   },
   "scripts": {
+    "predeploy": "npm run build",
+    "deploy": "gh-pages -d build",
     "start": "react-scripts start",
     "build": "react-scripts build",
     "test": "react-scripts test",
@@ -57,5 +60,8 @@
       "last 1 firefox version",
       "last 1 safari version"
     ]
+  },
+  "devDependencies": {
+    "gh-pages": "^4.0.0"
   }
 }

client/src/App.js

@@ -1,5 +1,5 @@
+import { Redirect, Route, Switch } from "react-router-dom";
 import { useEffect } from "react";
-import { Route, Switch } from "react-router-dom";
 import GoldCurrencyForm from "./components/forms/goldCurrencyForm";
 import { ToastContainer } from "react-toastify";
 import NavbarT from "./components/layout/navbar";
@@ -9,6 +9,7 @@ import AssetDetails from "./components/tables/assetsTable/assetDetails";
 import PortfolioDetails from "./components/portfolio/portfolioDetails";
 import Portfolio from "./components/portfolio/portfolio";
 import Footer from "./components/layout/footer";
+import OpeningModal from "./components/common/openingModal";
 import { fetchAll } from "./actions";
 import { useDispatch } from "react-redux";
 import "react-toastify/dist/ReactToastify.css";
@@ -22,8 +23,10 @@ function App() {
 
   return (
     <div className="App">
+      <OpeningModal />
       <NavbarT />
       <Switch>
+        <Redirect from="/chortkeh" to="/" />
         <Route exact path="/" component={Portfolio} />
         <Route path="/portfolio-details" component={PortfolioDetails} />
         <Route path="/assets/details/" component={AssetDetails} />

client/src/actions/index.js

@@ -1,36 +1,38 @@
-import {
-  getAssets,
-  addAsset as addAssetApi,
-  editAsset as editAssetApi,
-} from "../services/assetsServices";
-import { getPrices } from "../services/pricesServices";
-import { getHistoryRecord } from "../services/historyService";
-import { deleteAssetBySubClass as deleteAssetBySubClassApi } from "../services/assetsServices";
-import { deleteAsset } from "../services/assetsServices";
-
+import data from "../data.json";
 import * as actions from "./actionTypes";
+import fakeHistoryBuilder from "../utils/fakeHistoryBuilder";
+import getDateId from "../utils/getDateId";
+import dateOperation from "../utils/dateOperation";
+import { getTotalsByAssetClass } from "../utils";
+
+const assets = [];
 
 export const fetchAssets = () => async (dispatch) => {
-  const response = await getAssets();
-  dispatch({ type: actions.FETCH_ASSETS, payload: response.data });
+  dispatch({ type: actions.FETCH_ASSETS, payload: assets });
 };
 
 export const fetchPrices = () => async (dispatch) => {
-  const { data: goldCurrency } = await getPrices("goldcurrency");
-  const { data: stock } = await getPrices("stock");
+  const goldCurrency = data.goldcurrency || [];
+  const stock = (await data.stock) || [];
 
   dispatch({
     type: actions.FETCH_PRICES,
     payload: { goldCurrency, stock },
   });
 };
 
-export const fetchHistoryRecord = () => async (dispatch) => {
-  const { data: historyRecord } = await getHistoryRecord();
+export const fetchHistoryRecord = () => async (dispatch, getState) => {
+  let totals = getTotalsByAssetClass(getState().assets);
+
+  totals["overall"] = totals["total"];
+  delete totals["total"];
+  totals = { ...totals, id: dateOperation(getDateId(), 1) };
+
+  const payload = totals.overall === 0 ? [] : fakeHistoryBuilder(60, totals);
 
   dispatch({
     type: actions.FETCH_HISTORY,
-    payload: historyRecord,
+    payload,
   });
 };
 
@@ -39,23 +41,18 @@ export const deleteAssetBySubClass = (toDeleteAsset) => async (dispatch) => {
     type: actions.DELETE_ASSET_BY_SUBCLASS,
     payload: toDeleteAsset,
   });
-
-  await deleteAssetBySubClassApi(toDeleteAsset.assetSubClass);
 };
 
 export const deleteAssetById = (id) => async (dispatch) => {
   dispatch({ type: actions.DELETE_ASSET_BY_ID, payload: id });
-  await deleteAsset(id);
 };
 
 export const addAsset = (asset) => async (dispatch) => {
-  dispatch({ type: actions.ADD_ASSET, payload: asset });
-  await addAssetApi(asset);
+  dispatch({ type: actions.ADD_ASSET, payload: { ...asset, id: Date.now() } });
 };
 
 export const editAsset = (assetId, newValue) => async (dispatch) => {
   dispatch({ type: actions.EDIT_ASSET, payload: { assetId, newValue } });
-  await editAssetApi(assetId, newValue);
 };
 
 export const updateHistoryRecord = (newHistoryRecord) => async (dispatch) => {

client/src/components/common/openingModal.jsx

@@ -0,0 +1,29 @@
+import { useState } from "react";
+import CustomModal from "./modal";
+
+const OpeningModal = () => {
+  const [messageDisplay, setMessageDisplay] = useState(true);
+  const body = (
+    <ul>
+      <li>نسخه‌ای که در حال مشاهده‌اش هستید، نسخه کلاینت پروژه است</li>
+      <li>
+        اعداد در قسمت تاریخچه ارزش با ارزش منابع در تاریخ مربوطه هماهنگ نیستند و
+        برای نمایش دمو به صورت رندوم با اضافه کردن به پورتفولیو ساخته می‌شوند
+      </li>
+      <li>
+        قیمت‌ها‌ی درج شده در فرم‌ها به روز نیستند و از فایل data.json خوانده
+        می‌شوند
+      </li>
+    </ul>
+  );
+  return (
+    <CustomModal
+      show={messageDisplay}
+      handleClose={() => setMessageDisplay(false)}
+      title={"توجه"}
+      body={body}
+    />
+  );
+};
+
+export default OpeningModal;

client/src/components/portfolio/portfolioHistory.jsx

@@ -66,20 +66,20 @@ const PortfolioHistory = ({ mappedAssets }) => {
 
     let newData = [...historyRecord];
     const normalizedOverall = getNormalizedOverallValue(mappedAssets);
-    let isNewRecord = true;
+    // let isNewRecord = true;
 
     // checks if there is change in history
     if (JSON.stringify(sortedData[0]) === JSON.stringify(normalizedOverall))
       return;
 
     // today's history was recorded before
     if (sortedData[0]?.id === normalizedOverall.id) {
-      isNewRecord = false;
+      // isNewRecord = false;
       newData[newData.length - 1] = { ...normalizedOverall };
     } else {
       newData = [...newData, normalizedOverall];
     }
-    saveOverallHistory(normalizedOverall, isNewRecord);
+    // saveOverallHistory(normalizedOverall, isNewRecord);
     dispatch(updateHistoryRecord(newData));
   }, [mappedAssets, historyRecord, dispatch, sortedData]);