Bonobo Git Server

WebFileServer

Добавлены условия наличия элементов в режиме отладки

12/7/2020 12:12:28 PM

WIN2019-SERVER\Admin

Commit: 8b1d871

Tree: 480d1e5

Parents: 8f8043e

Changes

FileServer/SPA/index.html 3(+1 -2)

FileServer/SPA/src/JS/React/Controls/FileExplorer/ExplorerActionsControl.jsx 1(+0 -1)

FileServer/SPA/src/JS/React/Controls/FileExplorer/UploaderControl.jsx 2(+1 -1)

FileServer/SPA/src/JS/React/Controls/Layout/Footer.jsx 9(+8 -1)

FileServer/SPA/src/JS/React/Controls/Layout/Header.jsx 20(+15 -5)

FileServer/SPA/src/JS/React/Pages/FileExplorerPage.jsx 14(+11 -3)

FileServer/SPA/src/JS/React/Pages/LayoutPage.jsx 2(+2 -0)

FileServer/Web/Config.xml 2(+1 -1)

FileServer/Web/Views/App/Index.cshtml 6(+5 -1)

Details

FileServer/SPA/index.html 3(+1 -2) 

diff --git a/FileServer/SPA/index.html b/FileServer/SPA/index.html
index 8c5897c..4b861f9 100644
--- a/FileServer/SPA/index.html
+++ b/FileServer/SPA/index.html
@@ -19,8 +19,7 @@
 
 </head>
 <body>
-    <div>SPA webpack dev server</div>
-    <a href="http://localhost:47780/">To asp.mvc api</a>
+    
     <div id="App"></div>
 
     <script src="SPA_Build\app_bundle.js"></script>

FileServer/SPA/src/JS/React/Controls/FileExplorer/ExplorerActionsControl.jsx 1(+0 -1) 

diff --git a/FileServer/SPA/src/JS/React/Controls/FileExplorer/ExplorerActionsControl.jsx b/FileServer/SPA/src/JS/React/Controls/FileExplorer/ExplorerActionsControl.jsx
index 620ac7b..165112e 100644
--- a/FileServer/SPA/src/JS/React/Controls/FileExplorer/ExplorerActionsControl.jsx
+++ b/FileServer/SPA/src/JS/React/Controls/FileExplorer/ExplorerActionsControl.jsx
@@ -158,7 +158,6 @@ export default class ExplorerActionsControl extends BaseControl {
 
         return (            
             <div className="jumbotron">
-                <h3>ExplorerControlPanel</h3>
 
                 <Row>                    
                     {

FileServer/SPA/src/JS/React/Controls/FileExplorer/UploaderControl.jsx 2(+1 -1) 

diff --git a/FileServer/SPA/src/JS/React/Controls/FileExplorer/UploaderControl.jsx b/FileServer/SPA/src/JS/React/Controls/FileExplorer/UploaderControl.jsx
index 33eee89..1d81606 100644
--- a/FileServer/SPA/src/JS/React/Controls/FileExplorer/UploaderControl.jsx
+++ b/FileServer/SPA/src/JS/React/Controls/FileExplorer/UploaderControl.jsx
@@ -117,7 +117,7 @@ export default class UploaderControl extends BaseControl {
             )
                 ?
                 <div className="jumbotron">
-                    <h2>Вы не моежете загрузить данные в эту папку</h2>
+                    <h2>Вы не можете загрузить данные в эту папку</h2>
                 </div>
                 :
                 <div className="jumbotron">

FileServer/SPA/src/JS/React/Controls/Layout/Footer.jsx 9(+8 -1) 

diff --git a/FileServer/SPA/src/JS/React/Controls/Layout/Footer.jsx b/FileServer/SPA/src/JS/React/Controls/Layout/Footer.jsx
index fc3bec1..a8e4db3 100644
--- a/FileServer/SPA/src/JS/React/Controls/Layout/Footer.jsx
+++ b/FileServer/SPA/src/JS/React/Controls/Layout/Footer.jsx
@@ -4,6 +4,7 @@ import { ButtonToolbar, Button } from 'react-bootstrap'
 
 
 import BaseControl from '../../BaseControl.jsx'
+import Configuration from '../../../Tools/Configuration'
 
 export default class Footer extends BaseControl {
 
@@ -15,7 +16,13 @@ export default class Footer extends BaseControl {
 
         return (
             <div id="AppFooter">
-                <p>Footer</p>
+                {
+                    (Configuration.EnviromentValue == 'Development')
+                        ?
+                        <p>Footer</p>
+                        : null
+                }
+                
             </div>
         );

FileServer/SPA/src/JS/React/Controls/Layout/Header.jsx 20(+15 -5) 

diff --git a/FileServer/SPA/src/JS/React/Controls/Layout/Header.jsx b/FileServer/SPA/src/JS/React/Controls/Layout/Header.jsx
index a2d3c80..45192b3 100644
--- a/FileServer/SPA/src/JS/React/Controls/Layout/Header.jsx
+++ b/FileServer/SPA/src/JS/React/Controls/Layout/Header.jsx
@@ -4,6 +4,7 @@ import { ButtonToolbar, Button } from 'react-bootstrap'
 
 import BaseControl from '../../BaseControl.jsx'
 import MenuControl from '../MenuControl.jsx'
+import Configuration from '../../../Tools/Configuration'
 
 
 export default class Header extends BaseControl {
@@ -27,11 +28,20 @@ export default class Header extends BaseControl {
 
         return (
             <div id="AppHeader">
-                <p>Header</p>
-
-                <button className="RedButton" onClick={this.OnRegistersClick}>
-                    Registers
-                </button>
+                {
+                    (Configuration.EnviromentValue == 'Development')
+                        ?
+                        <div>
+                            <p>Header</p>
+
+                            <button className="RedButton" onClick={this.OnRegistersClick}>
+                                Registers
+                            </button>
+                        </div>
+                        : null
+                }
+                
+                
 
                 <MenuControl ref="MenuControl" />                
             </div>

FileServer/SPA/src/JS/React/Pages/FileExplorerPage.jsx 14(+11 -3) 

diff --git a/FileServer/SPA/src/JS/React/Pages/FileExplorerPage.jsx b/FileServer/SPA/src/JS/React/Pages/FileExplorerPage.jsx
index cc88cea..7d97649 100644
--- a/FileServer/SPA/src/JS/React/Pages/FileExplorerPage.jsx
+++ b/FileServer/SPA/src/JS/React/Pages/FileExplorerPage.jsx
@@ -85,9 +85,17 @@ export default class FileExplorerPage extends BaseControl {
                         </Col>
                     </Row>
                 </div>
-                <hr />
-                <BootstrapControl />
-                <hr />
+                {
+                    (Configuration.EnviromentValue == 'Development')
+                        ?
+                        <div>
+                            <hr />
+                            <BootstrapControl />
+                            <hr />
+                        </div>
+                        : null
+                }
+                
 
             </div>
         );

FileServer/SPA/src/JS/React/Pages/LayoutPage.jsx 2(+2 -0) 

diff --git a/FileServer/SPA/src/JS/React/Pages/LayoutPage.jsx b/FileServer/SPA/src/JS/React/Pages/LayoutPage.jsx
index 12ed1e5..434d709 100644
--- a/FileServer/SPA/src/JS/React/Pages/LayoutPage.jsx
+++ b/FileServer/SPA/src/JS/React/Pages/LayoutPage.jsx
@@ -24,6 +24,8 @@ class LayoutPage extends BaseControl {
         return (
             <Router>
                 <div>
+                    <div>SPA webpack dev server</div>
+                    <a href="http://localhost:47780/">To asp.mvc api</a>
                     <Header/>
 
                     <RouteSystem/>

FileServer/Web/Config.xml 2(+1 -1) 

diff --git a/FileServer/Web/Config.xml b/FileServer/Web/Config.xml
index af4b629..d7e5902 100644
--- a/FileServer/Web/Config.xml
+++ b/FileServer/Web/Config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <ConfigData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <LastExportDate>2020-12-07T00:31:08.3003545+04:00</LastExportDate>
+  <LastExportDate>2020-12-07T12:10:48.7786779+04:00</LastExportDate>
   <WriteNewRootDir>true</WriteNewRootDir>
   <ClearDBWithStart>true</ClearDBWithStart>
   <RootDirs>

FileServer/Web/Views/App/Index.cshtml 6(+5 -1) 

diff --git a/FileServer/Web/Views/App/Index.cshtml b/FileServer/Web/Views/App/Index.cshtml
index 99f5dea..32d01e7 100644
--- a/FileServer/Web/Views/App/Index.cshtml
+++ b/FileServer/Web/Views/App/Index.cshtml
@@ -12,7 +12,11 @@
     <title>WebFileServer</title>
 </head>
 <body>
-    <a href="http://localhost:8081/">To webpack dev server</a>
+    @if (HttpContext.Current.IsDebuggingEnabled)
+    {
+        <a href="http://localhost:8081/">To webpack dev server</a>
+    }
+    
     <div id="App"> </div>
 
     @Scripts.RenderFormat("<script src='{0}' defer></script>",

Denis · Bonobo Git Server (6.3.0.632) © 2015 Jakub Chodounský · Official Page · Github