Merge branch 'master' of https://github.com/ryoldash/module-zero-core-template into u-samet

Author: sametkabay

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/appsettings.json

@@ -5,7 +5,7 @@
     "App": {
         "ServerRootAddress": "http://localhost:21021/",
         "ClientRootAddress": "http://localhost:4200/",
-        "CorsOrigins": "http://localhost:4200,http://localhost:8080,http://localhost:8081"
+        "CorsOrigins": "http://localhost:4200,http://localhost:8080,http://localhost:8081,http://localhost:3000"
     },
     "Authentication": {
         "JwtBearer": {

reactjs/.env

@@ -0,0 +1 @@
+REACT_APP_API_URL="http://www.ryoldash.com/"

reactjs/.env.development

@@ -0,0 +1 @@
+REACT_APP_API_URL="http://localhost:21021/api/"

reactjs/.env.production

@@ -0,0 +1 @@
+REACT_APP_API_URL="http://www.ryoldash.com/"

reactjs/.gitignore

@@ -11,6 +11,7 @@
 
 # misc
 .DS_Store
+.env.development
 .env.local
 .env.development.local
 .env.test.local

reactjs/.prettierignore

@@ -0,0 +1,5 @@
+**/*.md
+**/*.svg
+**/*.ejs
+**/*.html
+package.json

reactjs/.prettierrc

@@ -0,0 +1,11 @@
+{
+    "singleQuote": true,
+    "trailingComma": "es5",
+    "printWidth": 150,
+    "overrides": [{
+        "files": ".prettierrc",
+        "options": {
+            "parser": "json"
+        }
+    }]
+}

reactjs/src/App.tsx

@@ -1,17 +1,27 @@
-import * as React from "react";
-import "./App.css";
+import * as React from 'react';
+import './App.css';
 
-import * as abpUserConfiguration from "./services/abpUserConfigurationService";
-import { withRouter } from "react-router-dom";
-import Layout from "./scenes/Layout";
+import * as abpUserConfiguration from './services/abpUserConfigurationService';
+import { withRouter, Switch, Route } from 'react-router-dom';
+import Layout from './scenes/Layout';
+
+import Login from "./scenes/Login"
 class App extends React.Component {
   componentDidMount() {
     console.log(abpUserConfiguration.initialize());
   }
   public render() {
     return (
-      <Layout />
-    );
+        <Switch>      
+          <Route path="/dashboard" component={Layout} />
+          <Route path="/users" component={Layout} />
+          <Route path="/tenants" component={Layout} />
+          <Route path="/roles" component={Layout} />
+          <Route path="/about" component={Layout} />
+          <Route path="/login" component={Login } /> 
+          <Route path="/" component={Login } />         
+        </Switch>
+     )
   }
 }
 

reactjs/src/components/AppComponentBase/index.tsx

@@ -0,0 +1,16 @@
+import * as React from 'react';
+import AppConsts from 'src/lib/appconst';
+
+class AppComponentBase<P = {}, S = {}, SS = any> extends React.Component<P, S, SS> {
+  localizationSourceName = AppConsts.localization.defaultLocalizationSourceName;
+
+  L(key: string, sourceName?: string): string {
+    return abp.localization.localize(key, sourceName ? sourceName : this.localizationSourceName);
+  }
+
+  isGranted(permissionName: string): boolean {
+    return abp.auth.isGranted(permissionName);
+  }
+}
+
+export default AppComponentBase;

reactjs/src/components/Header/index.tsx

@@ -0,0 +1,60 @@
+import * as React from 'react';
+import { Col, Icon, Layout, Avatar, Menu, Dropdown, Badge } from 'antd';
+import { Link } from 'react-router-dom';
+
+export interface LayoutHeaderProps {
+  collapsed?: any;
+  toggle?: any;
+}
+
+const userDropdownMenu = (
+  <Menu>
+    <Menu.Item key="2">
+      <Icon type="logout" />
+      <span> <Link to="/login">Logout</Link></span>
+    </Menu.Item>
+  </Menu>
+);
+
+const languageMenu = (
+  <Menu>
+    <Menu.Item key="1">
+      <span>English</span>
+    </Menu.Item>
+    <Menu.Item key="2">
+      <span>Deutsch</span>
+    </Menu.Item>
+    <Menu.Item key="3">
+      <span>Türkçe</span>
+    </Menu.Item>
+  </Menu>
+);
+
+export class LayoutHeader extends React.Component<LayoutHeaderProps> {
+  render() {
+    return (
+      <Layout.Header style={{ background: '#fff', minHeight: 83, padding: 0 }}>
+        <Col style={{ textAlign: 'left' }} span={12}>
+          <Icon
+            style={{ marginTop: 10, marginRight: 10, textAlign: 'left' }}
+            className="trigger"
+            type={this.props.collapsed ? 'menu-unfold' : 'menu-fold'}
+            onClick={this.props.toggle}
+          />
+        </Col>
+        <Col style={{ margin: 15, marginLeft: 10, textAlign: 'right' }}>
+          <Dropdown overlay={languageMenu} trigger={['click']}>
+            <Icon style={{ margin: 20 }} type="global" />
+          </Dropdown>
+          <Dropdown overlay={userDropdownMenu} trigger={['click']}>
+            <Badge style={{ margin: 10 }} count={3}>
+              <Avatar style={{ margin: 10 }} size={48} alt={'profile'} src="https://sametkabay.com/images/smtkby/smtkby240.png" />
+            </Badge>
+          </Dropdown>
+        </Col>
+      </Layout.Header>
+    );
+  }
+}
+
+export default LayoutHeader;