final commit

aliasadolahi74 · Oct 24, 2021 · 56f9964 · 56f9964
1 parent 9da587a
commit 56f9964
Show file tree

Hide file tree

Showing 43 changed files with 1,196 additions and 291 deletions.
diff --git a/.env.development b/.env.development
@@ -1,3 +1,4 @@
-REACT_APP_CUSTOM_DIR = '/pcm'
-REACT_APP_API_ENDPOINT = 'http://localhost/pcm'
+REACT_APP_CUSTOM_DIR = ''
+REACT_APP_API_ENDPOINT = 'http://localhost/'
+REACT_APP_WEBSITE = 'http://tmb.co.ir'
 PORT=8080
diff --git a/.env.production b/.env.production
@@ -1,4 +1,4 @@
-REACT_APP_CUSTOM_DIR = '/pcm'
-REACT_APP_API_ENDPOINT = 'http://vidapro.ir/pcm-backend'
+REACT_APP_CUSTOM_DIR = ''
+REACT_APP_API_ENDPOINT = 'http://api.tmb.co.ir'
 REACT_APP_WEBSITE = 'http://tmb.co.ir'
-PORT=8080
+PORT=80
diff --git a/debug.log b/debug.log
@@ -27,3 +27,6 @@
 [1203/192752.833:ERROR:directory_reader_win.cc(43)] FindFirstFile: The system cannot find the path specified. (0x3)
 [1204/190124.255:ERROR:directory_reader_win.cc(43)] FindFirstFile: The system cannot find the path specified. (0x3)
 [1205/022004.772:ERROR:directory_reader_win.cc(43)] FindFirstFile: The system cannot find the path specified. (0x3)
+[1207/020825.100:ERROR:directory_reader_win.cc(43)] FindFirstFile: The system cannot find the path specified. (0x3)
+[1208/002529.440:ERROR:directory_reader_win.cc(43)] FindFirstFile: The system cannot find the path specified. (0x3)
+[1214/000424.442:ERROR:directory_reader_win.cc(43)] FindFirstFile: The system cannot find the path specified. (0x3)
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,8 @@
   "name": "pcm-app",
   "version": "0.1.0",
   "private": true,
-  "homepage": "http://vidapro.ir/pcm",
+  "homepage": "http://cloud.tmb.co.ir:8080",
+  "proxy": "http://cloud.tmb.co.ir:8080",
   "dependencies": {
     "@material-ui/core": "^4.11.1",
     "@testing-library/jest-dom": "^4.2.4",
@@ -19,7 +20,6 @@
     "query-string": "^6.13.7",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
-    "react-meta-tags": "^1.0.0",
     "react-router-dom": "^5.2.0",
     "react-scripts": "3.4.3"
   },

diff --git a/pcm-app.zip b/pcm-app.zip
diff --git a/public/index.html b/public/index.html
@@ -2,14 +2,13 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
+    <meta name="viewport" content="width=1300" />
     <meta
       name="description"
       content="Web site created using create-react-app"
     />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
@@ -24,10 +23,12 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>React App</title>
+    <title>سامانه تله‌متری طراحان مدار باختر</title>
   </head>
   <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <noscript
+      >شما برای کار کردن با این سامانه به جاوااسکریپت فعال نیاز دارید</noscript
+    >
     <div id="root"></div>
     <!--
       This HTML file is a template.

diff --git a/public/manifest.json b/public/manifest.json
@@ -1,23 +1,6 @@
 {
-  "short_name": "React App",
-  "name": "Create React App Sample",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    },
-    {
-      "src": "logo192.png",
-      "type": "image/png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "logo512.png",
-      "type": "image/png",
-      "sizes": "512x512"
-    }
-  ],
+  "short_name": "سامانه تله‌متری طراحان مدار باختر",
+  "name": "سامانه تله‌متری شرکت طراحان مدار باختر",
   "start_url": ".",
   "display": "standalone",
   "theme_color": "#000000",

diff --git a/src/App.css b/src/App.css
@@ -491,8 +491,13 @@ a:hover {
 .devices-box {
   color: #5c5c5c;
 }
-
 .checkbox-container > div {
+  display: grid;
+  grid-template-columns: auto auto auto;
+  row-gap: 20px;
+}
+
+.checkbox-container > div > div {
   display: grid;
   grid-template-columns: 150px 50px;
   row-gap: 10px;
@@ -594,7 +599,57 @@ a:hover {
 
 .info-container {
   display: grid;
-  grid-template-columns: 1fr 1fr;
+  grid-template-columns: 1fr 6fr;
   row-gap: 20px;
+  width: 70%;
+}
+
+.info-container > span:nth-child(2n) {
+  font-weight: bold;
+}
+
+.newDeviceFormInputContainer {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+}
+
+.dashboard-table-container {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: space-evenly;
+}
+
+.dashboard-table-container > div {
+  margin-bottom: 40px;
+}
+
+.dashboard-table-container .table thead th {
+  background-color: #008a6c;
+  border-color: #007e62;
+}
+
+.dashboard-table-container h6 {
+  white-space: pre-line;
+  line-height: 35px;
+}
+
+.numberOfStatisticsContainer {
+  border: 1px solid #008a6c;
+  padding: 10px 20px;
+  margin: 30px 30px 50px;
+  background: #ffffff;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  align-self: center;
+  border-radius: 10px;
+}
+
+.new-user-input-conatiner {
   width: 50%;
+  display: grid;
+  column-gap: 20px;
+  row-gap: 20px;
+  grid-template-columns: 1fr 1fr;
 }
diff --git a/src/App.js b/src/App.js
@@ -7,7 +7,10 @@ import NotFound from "./components/notFound";
 import { Route, Redirect, Switch } from "react-router-dom";
 import Login from "./components/login";
 import { MuiThemeProvider, createMuiTheme } from "@material-ui/core";
-import { MetaTags } from "react-meta-tags";
+import jwtDecode from "jwt-decode";
+import axios from "axios";
+import config from "./config.json";
+import qs from "qs";
 const dir = process.env.REACT_APP_CUSTOM_DIR;
 
 function App() {
@@ -17,22 +20,56 @@ function App() {
     },
   });
 
+  const token = localStorage.getItem("token");
+  const now = new Date().getTime();
+  let expireTimestamp = 0;
+  let routes;
+  try {
+    const decodedToken = jwtDecode(token);
+    expireTimestamp = decodedToken["expire"];
+  } catch (e) {}
+  if (token !== null && expireTimestamp > now) {
+    refreshToken(token);
+    routes = (
+      <Switch>
+        <Route path={`${dir}/admin`} component={AdminPanel} />
+        <Route path={`${dir}/not-found`} component={NotFound} />
+        <Route path={`${dir}/login`} component={Login} />
+        <Redirect from={`${dir}/`} exact to={`${dir}/login`} />
+        <Redirect to={`${dir}/not-found`} />
+      </Switch>
+    );
+  } else {
+    routes = (
+      <Switch>
+        <Route path={`${dir}/admin`} component={Login} />
+        <Route path={`${dir}/not-found`} component={NotFound} />
+        <Route path={`${dir}/login`} component={Login} />
+        <Redirect from={`${dir}/`} exact to={`${dir}/login`} />
+        <Redirect to={`${dir}/not-found`} />
+      </Switch>
+    );
+  }
   return (
     <MuiThemeProvider theme={theme}>
-      <MetaTags>
-        <meta name="viewport" content="width=1300" />
-      </MetaTags>
-      <div className="App">
-        <Switch>
-          <Route path={`${dir}/admin`} component={AdminPanel} />
-          <Route path={`${dir}/not-found`} component={NotFound} />
-          <Route path={`${dir}/login`} component={Login} />
-          <Redirect from={`${dir}/`} exact to={`${dir}/login`} />
-          <Redirect to={`${dir}/not-found`} />
-        </Switch>
-      </div>
+      <div className="App">{routes}</div>
     </MuiThemeProvider>
   );
 }
 
+async function refreshToken(oldToken) {
+  const loginOptions = {
+    method: "POST",
+    headers: { "content-type": "application/x-www-form-urlencoded" },
+    data: qs.stringify({ token: oldToken }),
+    url: `${config.apiBaseURL}/refresh-token.php`,
+  };
+  const loginInfo = await axios(loginOptions);
+  if (loginInfo.data.status) {
+    const token = loginInfo.data.body.token;
+    localStorage.removeItem("token");
+    localStorage.setItem("token", token);
+  }
+}
+
 export default App;