fixed duration text

salimia40 · Aug 2, 2020 · d201de4 · d201de4
1 parent 8a985af
commit d201de4
Show file tree

Hide file tree

Showing 15 changed files with 85 additions and 1,027 deletions.
diff --git a/package.json b/package.json
@@ -14,14 +14,14 @@
     "fs-extra": "^9.0.1",
     "keygrip": "^1.1.0",
     "moment": "^2.27.0",
+    "moment-duration-format": "^2.3.2",
     "mongoose": "^5.9.26",
     "next": "^9.5.1",
     "qs": "^6.9.4",
     "ramda": "^0.27.1",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-faq-component": "^1.0.8",
-    "react-loading-screen": "^0.0.17",
     "shortid": "^2.2.15",
     "swr": "^0.3.0",
     "tabler-react": "^1.30.1"

diff --git a/server/api/former.js b/server/api/former.js
diff --git a/server/api/index.js b/server/api/index.js
@@ -1,6 +1,5 @@
 const { Router } = require("express");
 const User = require("../models/User");
-const Commition = require("../models/Commition");
 const Deposit = require("../models/Deposit");
 const Transaction = require("../models/Transaction");
 const cashStore = require("../cashStore");
@@ -67,6 +66,7 @@ router.post("/deposit", async (req, res) => {
   });
   tr = await tr.save();
 
+
   var result = await papi.makeInvoice(amount, tr.id);
   var { url } = result;
   res.redirect(url);

diff --git a/server/index.js b/server/index.js
@@ -3,13 +3,14 @@ var express = require("express");
 var Keygrip = require("keygrip");
 var bodyParser = require("body-parser");
 var cors = require("cors");
+var config = require("../config.json");
 var payeerControler = require("./payeerControler");
 var api = require("./api");
 var { auth } = require("./middlewares");
 var mongoose = require("mongoose");
 
 mongoose
-  .connect("mongodb://localhost:27017/moneyy", {
+  .connect(config.db, {
     useNewUrlParser: true,
     useCreateIndex: true,
     useFindAndModify: false,
@@ -40,10 +41,7 @@ app.prepare().then(() => {
     cookieSession({
       name: "session",
       keys: new Keygrip(
-        [
-          ".lKhQ.[+Xduwp1rt|>>'*(!kutLAAXXGunO^Cx!1<P`y^ST0)%f}lb50/@F$h)N",
-          "Pu{/>dYOoxJa/HN;7$(OaDK{}qjmjXnd4>0xt&#;bYMY1:5U,HC/S|w0Yb^ol#X",
-        ],
+        config.keys ,
         "SHA384",
         "base64"
       ),

diff --git a/src/components/accountdetails.js b/src/components/accountdetails.js
@@ -5,7 +5,6 @@ import { Form, Card, Grid, Button } from "tabler-react";
 import moment from "moment";
 
 function Widget({ user }) {
-  console.log(user);
   return (
     <Grid.Col>
       <Card title="Account Details">

diff --git a/src/components/site.js b/src/components/site.js
@@ -1,18 +1,17 @@
-import React, { useState, useEffect } from "react";
+import { useState } from "react";
 import { Site, Alert } from "tabler-react";
+import Head from 'next/head'
 
-function App({ children, loggedin = true, user = undefined, message = undefined }) {
+function App({ children, loggedin = true, user = undefined, message = undefined , title = ""}) {
   var [collapsed, setCollapsed] = useState(true);
 
-  // useEffect(() => {
-  //   if(message)
-  //     setTimeout(()=>{
-  //       dispatch(setMessage(undefined))
-  //     }, 5000)
-  // }, [message, dispatch])
-
   return (
     <Site>
+
+      <Head>
+        <title>{title}</title>
+      </Head>
+
       <Site.Header
         alt="Puya Crypto"
         imageURL="./logo.svg"