Merge pull request #30 from DhiWise/code-refactor

Code refactor

Author: saloni-dhiwise

LICENSE

@@ -175,18 +175,7 @@
 
    END OF TERMS AND CONDITIONS
 
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2021 DhiWise Pvt. Ltd.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -22,8 +22,7 @@ Most importantly, the Node.js code generator gives developers total code ownersh
 
 ## Get started 
 After a successful run, a user can configure different settings using UI, and build an app to generate the code.
-1. To run 
-  ```npm i && npm run start```
+1. To run ```npm i && npm run start```
 2. With ```npm run start``` project will run on 3000 port.
 3. Run http://localhost:3000 and you will see "create application" form. After creating an application you can configure modules and build the app to get the source code.
 <img src="https://development-dhvs.s3.ap-south-1.amazonaws.com/uploads/user-profile/open-source.gif" alt="create-application"/>

packages/client/public/favicon.ico

@@ -1 +0,0 @@
-

packages/client/src/assets/css/main.css

@@ -65,7 +65,7 @@ IconBox.propTypes = {
 
 IconBox.defaultProps = {
   variant: 'primary',
-  icon: null,
+  // icon: null,
   size: 'normal',
   // iconSize: 'normal',
   className: '',

packages/client/src/assets/images/gif/logo-loader.gif

@@ -1,24 +1,16 @@
 // import Loadable from 'react-loadable';
 import React from 'react';
-import Lottie from 'react-lottie';
-import animationData from '../../config/loaderdata.json';
+// import Lottie from 'react-lottie';
+// import animationData from '../../config/loaderdata.json';
+import logoLoader from '../../assets/images/gif/logo-loader.gif';
 
-export const Loader = ({ style, className }) => {
-  const defaultOptions = {
-    loop: true,
-    autoplay: true,
-    animationData,
-    rendererSettings: {
-      preserveAspectRatio: 'xMidYMid slice',
-    },
-  };
-  return (
-    <div className={`min-h-screen flex items-center justify-center ${className}`} style={style}>
-      <Lottie
+export const Loader = ({ style, className }) => (
+  <div className={`min-h-screen flex items-center justify-center ${className}`} style={style}>
+    {/* <Lottie
         options={defaultOptions}
         height={200}
         width={200}
-      />
-    </div>
-  );
-};
+      /> */}
+    <img width="200" height="200" src={logoLoader} alt="loader" />
+  </div>
+);

packages/client/src/components/IconBox/index.js

@@ -1,25 +1,19 @@
 import Loadable from 'react-loadable';
 import React from 'react';
-import Lottie from 'react-lottie';
-import animationData from './loaderdata.json';
+// import Lottie from 'react-lottie';
+// import animationData from './loaderdata.json';
+import logoLoader from '../assets/images/gif/logo-loader.gif';
 
 export default function LazyLoader(opts) {
-  const defaultOptions = {
-    loop: true,
-    autoplay: true,
-    animationData,
-    rendererSettings: {
-      preserveAspectRatio: 'xMidYMid slice',
-    },
-  };
   return Loadable({
     loading: () => (
       <div className="min-h-screen flex items-center justify-center">
-        <Lottie
+        {/* <Lottie
           options={defaultOptions}
           height={200}
           width={200}
-        />
+        /> */}
+        <img width="200" height="200" src={logoLoader} alt="loader" />
       </div>
     ),
     delay: 200,

packages/client/src/components/Loader/index.js

@@ -13,8 +13,6 @@ const path = require('path');
   mongoose.connect(mongoServer.getUri(), {
     useNewUrlParser: true,
     useUnifiedTopology: true,
-    useFindAndModify: false,
-    useCreateIndex: true,
   });
   const db = mongoose.connection;
 

packages/client/src/config/LazyLoader.js

@@ -106,7 +106,7 @@ module.exports = {
       DEVICE_SECRET: 'myjwtdevicesecret',
       CLIENT_SECRET: 'myjwtclientsecret',
       DESKTOP_SECRET: 'myjwtdesktopsecret',
-      EXPIRESIN: 10000,
+      EXPIRES_IN: 10000,
     },
     USER_ROLE: {
       Admin: 1,