Merge pull request #45 from coder-mind-project/develop

Master integration

Author: allanalves23

.circleci/config.yml

@@ -0,0 +1,18 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: node:11.10.1
+    working_directory: ~/repo
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+            - v1-dependencies-{{ checksum "package.json" }}
+            - v1-dependencies-
+      - run: yarn install
+      - save_cache:
+          paths:
+            - node_modules
+          key: v1-dependencies-{{ checksum "package.json" }}
+      - run: yarn build

README.md

@@ -1,6 +1,7 @@
 ![Coder Mind Panel](https://i.imgur.com/Y84oYzJ.png)
 
 [![code-style-airbnb](https://badgen.net/badge/codestyle/airbnb/ff5a5f.svg?icon=airbnb&color=green)](https://github.com/airbnb/javascript)
+[![panel-ci](https://circleci.com/gh/coder-mind-project/panel.svg?style=shield)](https://circleci.com/gh/coder-mind-project/coder-mind-panel)
 ![contributions-welcome](https://img.shields.io/badge/contributions-welcome-brightgreen)
 ![license-BS3](https://img.shields.io/badge/license-BSD%203-green)
 
@@ -11,21 +12,14 @@ Owner: Coder Mind
 E-mail: allan@codermind.com.br
 ___
 
-## Docs:
-
-Coming Soon...
-
-___
 
 ## Workflow
 
 Install dependencies with:
 
 `yarn install`
 
-> Disclaimer: use `npm install` it probably won't work, its recommended use just `yarn install`
-
-Run the application with: 
+Run the application with:
 
 `yarn start`
 

package-lock.json

@@ -1,10 +1,13 @@
 {
-  "name": "app-coder-mind",
+  "name": "coder-mind-panel",
   "version": "2.0.0",
-  "description": "App Coder Mind",
+  "description": "Coder Mind Panel",
   "author": "Allan Wanderley Alves",
   "license": "BSD-3-Clause",
   "private": true,
+  "engines": {
+    "yarn": "1.x"
+  },
   "dependencies": {
     "@craco/craco": "^5.6.3",
     "@date-io/moment": "^1.3.7",
@@ -16,24 +19,23 @@
     "@material-ui/lab": "^4.0.0-alpha.40",
     "@material-ui/pickers": "^3.1.1",
     "axios": "^0.19.0",
-    "chart.js": "^2.9.3",
+    "material-table": "^1.59.0",
     "material-ui-image": "^3.2.3",
     "material-ui-search-bar": "^1.0.0-beta.13",
     "moment": "^2.24.0",
     "prop-types": "^15.7.2",
     "react": "^16.8.6",
     "react-avatar": "^3.6.0",
-    "react-chartjs-2": "^2.8.0",
     "react-custom-scrollbars": "^4.2.1",
     "react-dom": "^16.8.6",
     "react-google-invisible-recaptcha": "^0.2.11",
     "react-icons": "^3.7.0",
     "react-infinite-scroller": "^1.2.4",
-    "react-quill": "^1.3.3",
     "react-redux": "^7.1.0",
     "react-router-dom": "^5.0.1",
     "react-scripts": "^3.3.0",
     "react-select": "^3.0.4",
+    "react-showdown": "^2.1.0",
     "redux": "^4.0.1"
   },
   "scripts": {

package.json

@@ -1,4 +1,7 @@
 import React, { useState, useEffect } from 'react';
+import PropTypes from 'prop-types';
+import { userType, appTheme, toastConfig } from '@/types';
+
 import {
   BrowserRouter as Router,
   Route,
@@ -16,18 +19,13 @@ import axios from 'axios';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 
-// Error Boundary
 import ErrorBoundary from '@/components/Errors/ErrorBoundary.jsx';
 
-
 import { MuiThemeProvider } from '@material-ui/core/styles';
 import { standard } from '@/config/themes';
-import { WHITE_LIST_ROUTES } from './config/dataProperties';
-// Requests imports
-import { backendUrl } from './config/backend';
 
+import { WHITE_LIST_ROUTES } from './config/dataProperties';
 
-// Redux imports
 import { setUser as defineUser } from './redux/user/userActions';
 import { setError as dispatchError } from './redux/error/errorActions';
 import { setMenu as callMenu } from './redux/menu/menuActions';
@@ -50,15 +48,12 @@ import Users from './components/Users/Management/Users';
 import UserForm from './components/Users/Management/UserForm';
 import Categories from './components/Categories/Categories';
 import CommentList from './components/Comments/CommentList';
-import Articles from './pages/articles-section/Articles';
-import Article from './pages/articles-section/Article';
-import Stats from './pages/statistics-section/Stats';
+import Articles from './components/Articles/Articles';
+import Article from './components/Articles/Article/Article';
 import MyAccount from './components/Users/MyAccount/MyAccount';
 
-// Css imports
 import './index.css';
-import { AppContent } from './styles';
-
+import { AppContent, AppContainer } from './styles';
 
 function App(props) {
   const {
@@ -70,9 +65,9 @@ function App(props) {
     error,
     user,
     theme,
-  } = { ...props };
+  } = props;
 
-  const appTheme = standard(theme);
+  const themeConfig = standard(user && user._id ? theme : 'light');
 
   const [validatingToken, setValidatingToken] = useState(true);
   const [path, setPath] = useState('');
@@ -106,7 +101,7 @@ function App(props) {
       const token = await JSON.parse(localStorage.getItem('user'));
 
       if (token) {
-        const url = `${backendUrl}/auth/logged`;
+        const url = '/auth/logged';
         await axios.post(url, token).then((res) => {
           if (res.data.user) {
             setUser(res.data);
@@ -130,8 +125,8 @@ function App(props) {
   }, [setMenu, setUser, setError, validatingToken]);
 
   return (
-    <MuiThemeProvider theme={appTheme}>
-      <Grid>
+    <MuiThemeProvider theme={themeConfig}>
+      <AppContainer theme={theme}>
         { !validatingToken
             && (
               <Router>
@@ -151,7 +146,11 @@ function App(props) {
                   { error
                     && <Redirect to="/error" />
                   }
-                  <AppContent user={getPath() === '/confirm-email' ? {} : user} isvalidating={validatingToken ? 'true' : ''}>
+                  <AppContent
+                    user={getPath() === '/confirm-email' ? {} : user}
+                    isvalidating={validatingToken ? 'true' : ''}
+                    theme={theme}
+                  >
                     <Switch>
                       <Route path="/" exact component={Articles} />
                       <Route path="/auth" exact component={Auth} />
@@ -163,16 +162,14 @@ function App(props) {
                       <Route path="/user" exact component={UserForm} />
                       <Route path="/user/:id" exact component={UserForm} />
                       <Route path="/users" exact component={Users} />
-                      <Route path="/article" exact component={Article} />
-                      <Route path="/article/:id" exact component={Article} />
                       <Route path="/articles" exact component={Articles} />
+                      <Route path="/articles/:key" exact component={Article} />
                       <Route path="/management" exact component={Management} />
                       <Route path="/themes" exact component={Themes} />
                       <Route path="/categories" exact component={Categories} />
                       <Route path="/my-account" exact component={MyAccount} />
                       <Route path="/comments" exact component={CommentList} />
                       <Route path="/error" exact component={Error} />
-                      <Route path="/stats" exact component={Stats} />
                       <Route component={RouteNotFound} />
                     </Switch>
                   </AppContent>
@@ -189,11 +186,25 @@ function App(props) {
             </Fade>
             )
           }
-      </Grid>
+      </AppContainer>
     </MuiThemeProvider>
   );
 }
 
+App.propTypes = {
+  user: userType.isRequired,
+  error: PropTypes.bool,
+  theme: appTheme.isRequired,
+  setMenu: PropTypes.func.isRequired,
+  setUser: PropTypes.func.isRequired,
+  setError: PropTypes.func.isRequired,
+  callToast: PropTypes.func.isRequired,
+  toast: toastConfig.isRequired,
+};
+
+App.defaultProps = {
+  error: false,
+};
 
 const mapStateToProps = (state) => ({
   user: state.user,
@@ -202,12 +213,12 @@ const mapStateToProps = (state) => ({
   toast: state.toast,
   theme: state.theme,
 });
+
 const mapDispatchToProps = (dispatch) => bindActionCreators({
   setUser: defineUser,
   setError: dispatchError,
   setMenu: callMenu,
   callToast: toastEmitter,
 }, dispatch);
 
-
 export default connect(mapStateToProps, mapDispatchToProps)(App);