Merge pull request #3 from gobeam/dev

Dev

Author: gobeam

README.md

@@ -1,8 +1,13 @@
+<div align="center">
+<img src="./app/assets/images/logo/short-logo.svg" alt="Truthy Logo">
+</div><br>
 <h1 align="center">
   Truthy CMS (ReactJS Starter)
 </h1>
 
-<div align="center"> This repository is frontend part of Truthy CMS written in ReactJS & Redux-Saga. [Ant design](https://ant.design/) is used as a UI library. This project includes User Management, Role Management, Permission Management, Email Module, Account Settings, OTP, RBAC support, Localization, and many more. </div>
+<div align="center"> This repository is frontend part of Truthy CMS written in ReactJS & Redux-Saga. For Backend API please visit https://github.com/gobeam/truthy. Ant design (https://ant.design/) is used as a UI library. This project includes User Management, Role Management, Permission Management, Email Module, Account Settings, OTP, RBAC support, Localization, and many more. Hope you like it.<br>
+If you love it don't forget to share your experience. If you want to contribute to the Truthy CMS in any way like API, Frontend, Design, Logo you're more than welcome to do so. Our plan is to make this no. 1 CMS maintained by opensource community.
+ </div>
 
 <br>
 <div align="center">
@@ -33,27 +38,27 @@ https://nodejs.org/en/
 
 In the project directory, you can run:
 
-### `npm start`
+### `yarn start`
 
 Runs the app in the development mode.<br>
 Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
 
 Hot reload is supported on the development environment page will reload if you make edits.<br>
 You will also see any lint errors in the console.
 
-### `npm run build`
+### `yarn build`
 
 Builds the app for production to the `build` folder.<br>
 It correctly bundles React in production mode and optimizes the build for the best performance.
 
 The build is minified and the filenames include the hashes.<br>
 Your app is ready to be deployed!
 
-### `npm run lint`
+### `yarn lint`
 
 Lints all the files inside `./src` and shows the result without fixing.
 
-### `lint:js:fix`
+### `yarn lint:js:fix`
 
 Lints all the files inside `./src`.
 
@@ -116,11 +121,11 @@ app
 │   └── helpers                             * Common Helper functions.
 │   └── hooks                               * Feature to use state and other React functionalities without writing class.
 │   └── i18n                                * Translation files.
-│   └── reducers                            * Pure function that takes an action and the previous state of the application and returns the new state.
+│   └── reducers                            * Pure function that takes an action and the previous state of the application and returns the 
 │   └── routes                              * Routes list.
 │   └── scss                                * Scss files for the project.
 │   └── services                            * Common services file.
-│   └── store                               * The Redux action types in action-type.js, reducers, selectors, and main store in the sub-folders.
+│   └── store                               * The Redux action types in action-type.js, reducers, selectors, and main store in the 
 │   └── utils                               * Common utils.
 │   └── app.js                              * Main app component.
 │   └── global-style.js                     * Global styles.
@@ -139,6 +144,8 @@ app
 ├── .env                                    * Environment variables (env.production, env.local, env.uat, etc).
 ├── .eslintrc.json                          * ESLint configuration and rules.
 ├── .prettierrc                             * Formatting Prettier options.
+├── Dockerfile                              * Docker file for prod environment.
+├── Dockerfile.dev                          * Docker file for dev environment.
 ```
 
 ## Contributing

app/assets/sass/layout/_navbar.scss

@@ -27,6 +27,19 @@
 .home-page {
   .navbar{
     width: 100%;
+    .logos{
+      width: 250px;
+      @include d-y-center;
+      flex-grow: 1;
+      font-weight: 900;
+      color: $primary;
+      font-size: 24px;
+      text-shadow: #e0e0e0 1px 1px 0;
+    }
+    .header-main{
+      width: calc(100% - 250px);
+      @include d-y-center;
+    }
   }
   .ant-layout-header {
     background: #ececec;

app/assets/sass/pages/_home.scss

@@ -1,6 +1,6 @@
 @import url('https://fonts.googleapis.com/css2?family=Public+Sans:wght@100;300;400;500;60;7000&display=swap');
 .home-wrapper {
-  @include d-center;
+  @include d-x-center;
   flex-direction: column;
   background-color: $bg-color;
 }
@@ -185,7 +185,7 @@
 
 
 .layout-page-content > :nth-child(2){
-  flex: initial;
+  flex: initial !important;
 }
 
 .ant-card {
@@ -194,6 +194,9 @@
 
 .banner{
   background-color: #ececec;
+  min-height: calc(100vh - 230px);
+  display: flex;
+  align-items: center;
 }
 
 img{
@@ -265,14 +268,16 @@ img{
   background: url('assets/images/helps-bg.jpg') no-repeat center center fixed;
   background-size: cover;
   // height: 200px;
-  
+  padding: 60px 0;
+  h3{
+    margin-bottom: 50px;
+  }
   .card-inner{
     text-align: center;
     .img-wrap{
       svg{
         font-size: 50px;
-        color: #3875e3;
-        margin-bottom: 40px;
+        margin-bottom: 20px;
       }
     }
     h4{
@@ -290,19 +295,23 @@ img{
   .ant-card{
     background-color: rgb(244, 246, 248);
     padding: 25px;
+    box-shadow: rgba(145, 158, 171, 0.40) -6px 7px 20px 0px;
+    margin-bottom: 40px;
+    .img-wrap{
+      svg{
+        color: $primary;
+      }
+    }
+    min-height: 350px;
   }
   .card-one{
 
-    margin-top: -40px;
+    // margin-top: -40px;
   }
   .card-two{
     background-color: rgb(255, 255, 255);
     box-shadow: rgba(145, 158, 171, 0.40) -6px 7px 20px 0px;
-    .img-wrap{
-      svg{
-        color: $primary;
-      }
-    }
+    
   }
   .card-three{
     margin-top: 80px;
@@ -325,7 +334,7 @@ img{
   margin: 40px 0;
   width: 100%;
   .ant-card{
-    padding: 20px 40px;
+    padding: 20px 40px 60px;
     width: 100%;
     cursor: pointer;
     // background-color: transparent;
@@ -336,39 +345,39 @@ img{
     box-shadow: 0px 8px 45px rgba(210, 210, 215, 0.9);
     &:hover{
       .designation{
-        opacity: 1;
+        // opacity: 1;
       }
     }
   }
+  .ant-card-body{
+    padding: 20px 0 5px;
+  }
   .card-inner{
     display: flex;
     align-items: center;
     justify-content: center;
     flex-direction: column;
-    .img-wrap{
-      height: 100px;
-      width: 100px;
-      background: #ffffff;
-      border-radius: 8px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
+    h4{
+      font-size: 22px;
+      font-weight: 600;
+      text-align: center;
     }
     .designation{
       position: absolute;
       bottom: 0;
-      opacity: 0;
-      padding-bottom: 20px;
+      opacity: 1;
+      padding-bottom: 25px;
       transition: all ease .5s;
+      @include d-y-center;
       .icon{
         cursor: pointer;
         svg{
-          font-size: 20px;
+         margin-right: 10px;
+          font-size: 23px;
           color: #000000;
         }
       }
       .linked{
-        margin-left: 10px;
         svg{
           color: #0084be;
         }

app/assets/sass/pages/_user-account.scss

@@ -56,4 +56,3 @@
     }
   }
 
-  

app/common/layout/Navbar.js

@@ -11,23 +11,21 @@ function Navbar() {
       <Header className="d-flex w-100 headers">
         <div className="container-fluid d-flex w-100">
           <div className="logos"> Truthy</div>
-          <div className="w-100">
-            <Menu
-              mode="horizontal"
-              defaultSelectedKeys={['1']}
-              className="ml-auto"
-            >
-              <Menu.Item key="1">
-                <Link className="login-form-forgot" to="/">
-                  <FormattedMessage {...messages.home} />
-                </Link>
-              </Menu.Item>
-              <Menu.Item key="2">
-                <Link className="login-form-forgot" to="/login">
-                  <FormattedMessage {...messages.login} />
-                </Link>
-              </Menu.Item>
-            </Menu>
+          <div className="header-main">
+            <div className="ml-auto">
+              <Menu mode="horizontal" defaultSelectedKeys={['1']}>
+                <Menu.Item key="1">
+                  <Link className="login-form-forgot" to="/">
+                    <FormattedMessage {...messages.home} />
+                  </Link>
+                </Menu.Item>
+                <Menu.Item key="2">
+                  <Link className="login-form-forgot" to="/login">
+                    <FormattedMessage {...messages.login} />
+                  </Link>
+                </Menu.Item>
+              </Menu>
+            </div>
           </div>
         </div>
       </Header>

app/containers/HomePage/contributors.js

@@ -32,9 +32,9 @@ const Contributors = ({ contributors, loading = true }) => {
                   }
                 >
                   <div className="card-inner">
-                    <div className="img-wrap">
+                    {/* <div className="img-wrap">
                       <h4 className="text-center">{item.author}</h4>
-                    </div>
+                    </div> */}
                     <h4>{item.author}</h4>
                     <p className="mb-3">{item.designation}</p>
 

app/containers/HomePage/truthyHelp.js

@@ -57,7 +57,7 @@ const TruthyHelps = () => {
           <Row gutter={20}>
             {functionalities.map((functionality) => (
               <Col lg={8} key={functionality.title}>
-                <Card className="card-one">
+                <Card>
                   <div className="card-inner">
                     <div className="img-wrap">{functionality.icon}</div>
                     <h4>{functionality.title}</h4>

bin/cli.js

@@ -0,0 +1,52 @@
+#!/usr/bin/env node
+const { execSync } = require('child_process');
+
+const RESET = '\x1b[0m';
+const GREEN = '\x1b[32m';
+const YELLOW = '\x1b[33m';
+const WHITE = '\x1b[37m';
+const RED = '\x1b[31m';
+const CYAN = '\x1b[36m';
+const MAGENTA = '\x1b[35m';
+
+const getColoredText = (text, color) => {
+  if (color == null) {
+    // eslint-disable-next-line no-param-reassign
+    color = WHITE;
+  }
+  return color + text + RESET;
+};
+
+const runCommand = (command) => {
+  try {
+    execSync(`${command}`, { stdio: 'inherit' });
+  } catch (e) {
+    console.error(
+      getColoredText(`Failed to execute ${command}. Error: ${e}`, RED),
+    );
+    return false;
+  }
+  return true;
+};
+
+const repoName = process.argv[2];
+const gitCheckoutCommand = `git clone --depth 1 https://github.com/gobeam/truthy-react-frontend ${repoName}`;
+const installDepsCommand = `cd ${repoName} && yarn install`;
+
+console.log(
+  getColoredText(`Cloning the repository with name ${repoName}`, CYAN),
+);
+const checkedOut = runCommand(gitCheckoutCommand);
+if (!checkedOut) process.exit(-1);
+
+console.log(getColoredText(`Installing dependencies for ${repoName}`, YELLOW));
+const installedDeps = runCommand(installDepsCommand);
+if (!installedDeps) process.exit(-1);
+
+console.log(
+  getColoredText(
+    'Congratulations! You are ready. Follow the following commands to start',
+    MAGENTA,
+  ),
+);
+console.log(getColoredText(`cd ${repoName} && yarn start`, GREEN));

package.json

@@ -1,6 +1,6 @@
 {
   "name": "truthy-react-cms",
-  "description": "",
+  "description": "Truthy CMS starter template for React",
   "version": "0.1.0",
   "license": "MIT",
   "author": "gobeam <[email protected]>",
@@ -18,9 +18,12 @@
     "react dashboard",
     "react admin template",
     "free react",
-    "react ui library"
+    "react ui library",
+    "antd",
+    "react-antd",
+    "opensource cms"
   ],
-  "private": true,
+  "bin": "./bin/cli.js",
   "scripts": {
     "prebuild": "npm run build:clean",
     "build": "cross-env NODE_ENV=production webpack --config internals/webpack/webpack.prod.babel.js --color --progress",