Page namespace

src/main.jsx

@@ -3,21 +3,23 @@ import './view/page/account/WelcomePage.jsx';
 import './view/page/account/Account.jsx';
 import './view/page/tmp/Fields.jsx';
 
-import './view/cmp/switch/Switch.jsx';
 import Header from './view/block/header/Header.jsx';
 import "/global-styles/base.scss";
 
+import { Switch } from "./view/cmp/switch/Switch";
+import {Page} from "./view/page/Page";
+
 export default function() {
   let tagField, exportEl;
 
   let dom = <div renderTo={document.body} cls="page-content">
     <view.block.Header/>
-    {Switch({cls: 'page-content__inner', key: 'navigation.current'}, {
-      login: new view.page.Login(),
-      welcome: new view.page.WelcomePage(),
-      fields: new view.page.tmp.Fields(),
-      account: new view.page.Account()
-    })}
+    {Switch({cls: 'page-content__inner', key: 'navigation.current'},
+      Object.keys(Page).reduce((store, pageName)=>{
+        store[pageName] = new Page[pageName]();
+        return store;
+      }, {})
+    )}
   </div>;
 };
 

src/view/block/header/Header.jsx

@@ -3,6 +3,7 @@ import Button from "/view/cmp/button/Button.jsx";
 import Logo  from '/svg/logo.svg';
 import User from "/svg/user.svg";
 import Logout from "/svg/logout.svg";
+import { Page } from "../../page/Page";
 
 const {IF, NOT} = Store;
 export default D.declare('view.block.Header', () => {
@@ -12,10 +13,7 @@ export default D.declare('view.block.Header', () => {
         })}   >
         <div class="button-temp">
             {
-                [
-                    'login',
-                    'welcome','fields', 'account'
-                ].map(name=>
+                Object.keys(Page).map(name=>
                     <button type={'button'} onClick={() => store.set('navigation.current', name)}>{name}</button>
                 )
             }

src/view/cmp/switch/Switch.jsx

@@ -44,4 +44,5 @@ Switch.Item = function(cfg, children) {
 
 
 export const Item = Switch.Item;
-export default Switch;
+export default Switch;
\ No newline at end of file
+export {Switch};
\ No newline at end of file

src/view/page/Page.jsx

+import * as Pages from './index';
+
+export {Pages as Page};
\ No newline at end of file

src/view/page/account/Account.jsx

 import './accountPage.scss';
 import User from "/svg/user.svg";
 
-export default D.declare('view.page.Account', () => {
+const Account = D.declare('view.page.Account', () => {
     return <div class="account-page">
         <div class="account-page__wrapper">
             <div class="account-page__menu">
@@ -22,4 +22,7 @@ export default D.declare('view.page.Account', () => {
             </div>
         </div>
     </div>
-})
+});
+
+export default Account;
+export {Account};
\ No newline at end of file

src/view/page/account/WelcomePage.jsx

@@ -3,7 +3,7 @@ import Button from '/view/cmp/button/Button.jsx';
 import Arr from '/svg/arr.svg';
 import './welcomePage.scss';
 
-export default D.declare('view.page.WelcomePage', () =>
+const WelcomePage = D.declare('view.page.WelcomePage', () =>
     <div class="welcome-page">
         <div class="welcome-page__wrapper">
             <Info
@@ -199,4 +199,8 @@ export default D.declare('view.page.WelcomePage', () =>
             </Info>
         </div>
     </div>
-)
+);
+
+export default WelcomePage;
+export {WelcomePage};
+

src/view/page/index.jsx

+export {Account} from "./account/Account";
+export {WelcomePage} from "./account/WelcomePage";
+
+export {Login} from "./login/Login";
+//export {LoginPhone} from "./login/LoginPhone";
+//export {LoginCode} from "./login/LoginCode";
+
+export {Fields} from "./tmp/Fields";
+export {TestRequests} from "./tmp/TestRequests";
\ No newline at end of file

src/view/page/login/Login.jsx

@@ -9,7 +9,7 @@ import LoginPhone from './LoginPhone.jsx';
 import LoginCode from './LoginCode.jsx';
 
 const {AND, OR, IF} = Store;
-export default D.declare('view.page.Login', () => {
+const Login = D.declare('view.page.Login', () => {
     const loginStore = new Store({
         phone: '79999877415',
         code: '',
@@ -46,4 +46,7 @@ export default D.declare('view.page.Login', () => {
             </form>
         </IF>
     </div>
-})
+});
+
+export default Login;
+export {Login};

src/view/page/login/LoginCode.jsx

@@ -4,7 +4,7 @@ import { API } from "/dict/Consts.jsx";
 import Arr  from '/svg/arr.svg';
 
 const {AND, OR, IF} = Store;
-export default D.declare('view.page.LoginCode', ({loginStore}) => {
+const LoginCode = D.declare('view.page.LoginCode', ({loginStore}) => {
   const checkCode = function () {
     loginStore.set('codeChecking', true);
     loginStore.set('codeError', false);
@@ -43,3 +43,6 @@ export default D.declare('view.page.LoginCode', ({loginStore}) => {
       </Button>
   </>
 });
+
+export default LoginCode;
+export {LoginCode};
\ No newline at end of file

src/view/page/login/LoginPhone.jsx

@@ -4,7 +4,7 @@ import { API } from "/dict/Consts.jsx";
 import Arr  from '/svg/arr.svg';
 
 const {AND, OR, IF} = Store;
-export default D.declare('view.page.LoginPhone', ({loginStore}) => {
+const LoginPhone = D.declare('view.page.LoginPhone', ({loginStore}) => {
 
   const checkPhone = async function() {
     loginStore.set('phoneChecking', true);
@@ -56,3 +56,6 @@ export default D.declare('view.page.LoginPhone', ({loginStore}) => {
       </Button>
   </>
 });
+
+export default LoginPhone;
+export {LoginPhone};
\ No newline at end of file

src/view/page/tmp/Fields.jsx

@@ -2,7 +2,8 @@ import Button from "/view/cmp/button/Button.jsx";
 import LabeledField from "../../cmp/field/LabeledField.jsx";
 import PhoneInput from "../../cmp/field/PhoneInput.jsx";
 import Input from "../../cmp/field/Input";
-export default D.declare('view.page.tmp.Fields', () => {
+
+const Fields = D.declare('view.page.tmp.Fields', () => {
   var data = new Store({
     phone: '',
     phone3: '7',
@@ -50,3 +51,6 @@ export default D.declare('view.page.tmp.Fields', () => {
     </div>
   </div>
 });
+
+export default Fields;
+export {Fields};
\ No newline at end of file

src/view/page/tmp/TestRequests.jsx

+import Button from "/view/cmp/button/Button.jsx";
+import LabeledField from "../../cmp/field/LabeledField.jsx";
+import PhoneInput from "../../cmp/field/PhoneInput.jsx";
+import Input from "../../cmp/field/Input";
+const TestRequests = D.declare('view.page.tmp.TestRequests', () => {
+  var data = new Store({
+    phone: '',
+    phone3: '7',
+    phone4: '8',
+    phone5: '79132251365',
+    phone2: '894',
+  });
+  return <div>
+    <div>
+      <h5>Labeled field</h5>
+      <LabeledField label={'Label'}/>
+    </div>
+
+        Курвалол
+  </div>
+});
+
+export default TestRequests;
+export {TestRequests};
\ No newline at end of file