diff --git a/ijl.config.js b/ijl.config.js index 8932df5..47eff81 100644 --- a/ijl.config.js +++ b/ijl.config.js @@ -9,8 +9,11 @@ module.exports = { }, navigations: { 'enterfront.main': '/enterfront', - 'link.enterfront.auth': '/enterfront/auth', - 'link.enterfront.account': '/enterfront/account', + 'enterfront.home': '/enterfront/home', + 'enterfront.auth': '/enterfront/auth', + 'enterfront.reg': '/enterfront/reg', + 'enterfront.account': '/enterfront/account', + 'enterfront.chat': '/enterfront/chat', }, features: { 'undefined': { diff --git a/src/__data__/urls.ts b/src/__data__/urls.ts index 5a951bd..0a3f26b 100644 --- a/src/__data__/urls.ts +++ b/src/__data__/urls.ts @@ -3,14 +3,22 @@ import pkg from '../../package.json'; const baseUrl = getNavigationsValue(`${(pkg as any).name}.main`); const navs = getNavigations(); -const makeUrl = url => url; export const URLs = { - baseUrl, + baseUrl, // init + home: { + url: navs[`${(pkg as any).name}.home`], + }, + chat: { + url: navs[`${(pkg as any).name}.chat`], + }, auth: { - url: makeUrl(navs[`link.${(pkg as any).name}.auth`]), + url: navs[`${(pkg as any).name}.auth`], // sign in + }, + reg: { + url: navs[`${(pkg as any).name}.reg`], // sign up }, account: { - url: makeUrl(navs[`link.${(pkg as any).name}.account`]), - } + url: navs[`${(pkg as any).name}.account`], + }, }; diff --git a/src/app.tsx b/src/app.tsx index b303497..467c778 100644 --- a/src/app.tsx +++ b/src/app.tsx @@ -1,12 +1,16 @@ import React from 'react'; import { BrowserRouter } from 'react-router-dom'; +import "./index.css" import { Dashboard } from './dashboard'; +import Interlocutor from './backend/interlocutor/Interlocutor.js' +import User from './backend/user/User.js' + const App = () => { return( - + ) } diff --git a/src/backend/interlocutor/Interlocutor.js b/src/backend/interlocutor/Interlocutor.js new file mode 100644 index 0000000..3931c36 --- /dev/null +++ b/src/backend/interlocutor/Interlocutor.js @@ -0,0 +1,8 @@ +export default class Interlocutor { + constructor(id, name) { + this.name = name + this.id = id + } + static name; + static id; +} \ No newline at end of file diff --git a/src/backend/user/User.js b/src/backend/user/User.js new file mode 100644 index 0000000..b3732a3 --- /dev/null +++ b/src/backend/user/User.js @@ -0,0 +1,3 @@ +export default class User { + +} \ No newline at end of file diff --git a/src/components/css/index.css b/src/components/css/index.css new file mode 100644 index 0000000..390db60 --- /dev/null +++ b/src/components/css/index.css @@ -0,0 +1 @@ +@import "../reg/css/index.css"; \ No newline at end of file diff --git a/src/components/reg/InputField.jsx b/src/components/reg/InputField.jsx new file mode 100644 index 0000000..b3158f6 --- /dev/null +++ b/src/components/reg/InputField.jsx @@ -0,0 +1,12 @@ +import React from 'react'; + +const InputField = (props) => { + return ( + props.setValue(e.target.value)} + value={props.value} + /> + ); +}; + +export default InputField; diff --git a/src/components/reg/css/index.css b/src/components/reg/css/index.css new file mode 100644 index 0000000..e69de29 diff --git a/src/dashboard.tsx b/src/dashboard.tsx index f52fb3f..8fc2275 100644 --- a/src/dashboard.tsx +++ b/src/dashboard.tsx @@ -1,18 +1,25 @@ import React from 'react'; -import { Routes, Route, Navigate } from 'react-router-dom'; +import { Routes, Route } from 'react-router-dom'; import { URLs } from './__data__/urls'; -import HomePage from './pages/HomePage.jsx' -import Hello from './pages/Hello.jsx' +import Home from './pages/Home.jsx' +import Init from './pages/Init.jsx' import Account from './pages/Account.jsx' +import Chat from './pages/Chat.jsx' +import SignIn from './pages/SignIn.jsx' +import SignUp from './pages/SignUp.jsx' export const Dashboard = () => { return ( - }/> - } /> + }/> + }/> + }/> + }/> + }/> }/> + 404 page not found}/> ); }; diff --git a/src/header/Header.jsx b/src/header/Header.jsx new file mode 100644 index 0000000..dbad24f --- /dev/null +++ b/src/header/Header.jsx @@ -0,0 +1,9 @@ +import React from 'react'; + +const Header = () => { + return ( +
Header
+ ); +}; + +export default Header; diff --git a/src/header/css/index.css b/src/header/css/index.css new file mode 100644 index 0000000..e69de29 diff --git a/src/index.css b/src/index.css new file mode 100644 index 0000000..3a49ef3 --- /dev/null +++ b/src/index.css @@ -0,0 +1,14 @@ +@import "pages/css/index.css"; +@import "header/css/index.css"; +@import "components/css/index.css"; + + +body { + margin: 0; + font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', + 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', + sans-serif; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + diff --git a/src/pages/Chat.jsx b/src/pages/Chat.jsx new file mode 100644 index 0000000..367750b --- /dev/null +++ b/src/pages/Chat.jsx @@ -0,0 +1,9 @@ +import React from 'react'; + +const Chat = () => { + return ( +

Chat with ...

+ ); +}; + +export default Chat; diff --git a/src/pages/Hello.jsx b/src/pages/Hello.jsx deleted file mode 100644 index 4633c3c..0000000 --- a/src/pages/Hello.jsx +++ /dev/null @@ -1,9 +0,0 @@ -import React from "react"; - -const Hello = () => { - return ( -

Hello!

- ) -} - -export default Hello; \ No newline at end of file diff --git a/src/pages/Home.jsx b/src/pages/Home.jsx new file mode 100644 index 0000000..4500864 --- /dev/null +++ b/src/pages/Home.jsx @@ -0,0 +1,9 @@ +import React from "react"; + +const Home = () => { + return ( +

Home

+ ) +} + +export default Home \ No newline at end of file diff --git a/src/pages/HomePage.jsx b/src/pages/HomePage.jsx deleted file mode 100644 index 7882196..0000000 --- a/src/pages/HomePage.jsx +++ /dev/null @@ -1,9 +0,0 @@ -import React from "react"; - -const HomePage = () => { - return ( -

Home

- ) -} - -export default HomePage \ No newline at end of file diff --git a/src/pages/Init.jsx b/src/pages/Init.jsx new file mode 100644 index 0000000..f01a620 --- /dev/null +++ b/src/pages/Init.jsx @@ -0,0 +1,9 @@ +import React from "react"; + +const Init = () => { + return ( +

Init page

+ ) +} + +export default Init; \ No newline at end of file diff --git a/src/pages/SignIn.jsx b/src/pages/SignIn.jsx new file mode 100644 index 0000000..a462a4c --- /dev/null +++ b/src/pages/SignIn.jsx @@ -0,0 +1,13 @@ +import React from 'react'; +import InputField from "../components/reg/InputField.jsx"; + +const SignIn = () => { + return ( +
+

SignIn

+ +
+ ); +}; + +export default SignIn; diff --git a/src/pages/SignUp.jsx b/src/pages/SignUp.jsx new file mode 100644 index 0000000..8acab9d --- /dev/null +++ b/src/pages/SignUp.jsx @@ -0,0 +1,13 @@ +import React from 'react'; +import InputField from "../components/reg/InputField.jsx"; + +const SignUp = () => { + return ( +
+

SignUp

+ +
+ ); +}; + +export default SignUp; diff --git a/src/pages/css/index.css b/src/pages/css/index.css new file mode 100644 index 0000000..9e773c3 --- /dev/null +++ b/src/pages/css/index.css @@ -0,0 +1,5 @@ +@import "init.css"; + +.TestClass { + color: red; +} \ No newline at end of file diff --git a/src/pages/css/init.css b/src/pages/css/init.css new file mode 100644 index 0000000..e607486 --- /dev/null +++ b/src/pages/css/init.css @@ -0,0 +1,3 @@ +.TestInit { + color: blue; +} \ No newline at end of file diff --git a/versions.md b/versions.md new file mode 100644 index 0000000..e6a8942 --- /dev/null +++ b/versions.md @@ -0,0 +1,18 @@ +# Instruction to create tags and versions + +``` +npm version +``` + +Here can be: +- `patch` - the smallest update, 1.2.3 -> 1.2.**4** +- `minor` - 1.**2**.3 -> 1.**3**.0 +- `major` - the greatest, **1**.2.3 -> **2**.0.0 + +To submit tag (previous command is treated as a commit): +``` +git push --tags +``` + +The version in `package.json` will be updated automatically\ +After that add new version to *brojs-admin*