From e585a53f3503fd052ea405f903b358a63e2d7759 Mon Sep 17 00:00:00 2001 From: Nenad Radovanovic Date: Mon, 20 Nov 2017 17:57:45 +0100 Subject: [PATCH 01/13] Set theme jekyll-theme-cayman --- _config.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 _config.yml diff --git a/_config.yml b/_config.yml new file mode 100644 index 0000000..c419263 --- /dev/null +++ b/_config.yml @@ -0,0 +1 @@ +theme: jekyll-theme-cayman \ No newline at end of file From ac6b65b1995b21da72b57907882efdc2f0e18c31 Mon Sep 17 00:00:00 2001 From: Nenad Radovanovic Date: Mon, 20 Nov 2017 17:58:40 +0100 Subject: [PATCH 02/13] Create CNAME --- CNAME | 1 + 1 file changed, 1 insertion(+) create mode 100644 CNAME diff --git a/CNAME b/CNAME new file mode 100644 index 0000000..66c164c --- /dev/null +++ b/CNAME @@ -0,0 +1 @@ +nenad.radovanovic.me \ No newline at end of file From 3fc5cc92420e402bf89cb7d41a039f22b29cce76 Mon Sep 17 00:00:00 2001 From: Nenad Radovanovic Date: Mon, 20 Nov 2017 17:59:02 +0100 Subject: [PATCH 03/13] Delete CNAME --- CNAME | 1 - 1 file changed, 1 deletion(-) delete mode 100644 CNAME diff --git a/CNAME b/CNAME deleted file mode 100644 index 66c164c..0000000 --- a/CNAME +++ /dev/null @@ -1 +0,0 @@ -nenad.radovanovic.me \ No newline at end of file From aec6b3ce607117788faaecbb0c8486cffa15f516 Mon Sep 17 00:00:00 2001 From: Nenad Radovanovic Date: Tue, 21 Nov 2017 11:01:21 +0100 Subject: [PATCH 04/13] Set theme jekyll-theme-cayman From dd7418ff3fc1459ee0a2ab74fe2d7edb7b1e59e7 Mon Sep 17 00:00:00 2001 From: BIT Student Date: Tue, 21 Nov 2017 12:13:29 +0100 Subject: [PATCH 05/13] issue has been potentionally resolved --- src/components/common/fetchService.js | 35 +++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 src/components/common/fetchService.js diff --git a/src/components/common/fetchService.js b/src/components/common/fetchService.js new file mode 100644 index 0000000..4eed815 --- /dev/null +++ b/src/components/common/fetchService.js @@ -0,0 +1,35 @@ +import fetch from "fetch"; + +export default class FetchService { + + headers() { + return { + "Content-Type": "application/json", + "SessionId": "jTAAZCA5", + }; + } + + get(url, handler) { + + fetch(url, { + method: "GET", + headers: this.headers() + }) + .then(response => response.json()) + .then(jsonData => handler(jsonData)) + .catch(error => handler(error)); + } + + post(url, postData) { + + fetch(url, { + method: "POST", + body: JSON.stringify(postData), + headers: this.headers() + }) + .then(response => response.json()) + .then(jsonData => console.log(jsonData)) + .catch(error => console.log(error)); + } + +} \ No newline at end of file From d865db8ba8d7fb664f7cdccd922fff000e6697dc Mon Sep 17 00:00:00 2001 From: BIT Student Date: Tue, 21 Nov 2017 12:39:42 +0100 Subject: [PATCH 06/13] api and storage key constants, headers with storage modified --- src/components/common/fetchService.js | 20 ++++++++++++++++---- src/constants.js | 5 ++++- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/components/common/fetchService.js b/src/components/common/fetchService.js index 4eed815..b9bb317 100644 --- a/src/components/common/fetchService.js +++ b/src/components/common/fetchService.js @@ -1,23 +1,35 @@ import fetch from "fetch"; +import { SESSION_STORAGE_KEY, API_KEY } from "../../constants"; export default class FetchService { headers() { + + let sessionId = sessionStorage.getItem(SESSION_STORAGE_KEY); + if (sessionId) { + + return { + "Content-Type": "application/json", + "SessionId": sessionId, + "API": API_KEY + }; + } + return { "Content-Type": "application/json", - "SessionId": "jTAAZCA5", + "API": API_KEY }; } - get(url, handler) { + get(url, successHandler, errorHandler) { fetch(url, { method: "GET", headers: this.headers() }) .then(response => response.json()) - .then(jsonData => handler(jsonData)) - .catch(error => handler(error)); + .then(jsonData => successHandler(jsonData)) + .catch(error => errorHandler(error)); } post(url, postData) { diff --git a/src/constants.js b/src/constants.js index ca54aec..1252822 100644 --- a/src/constants.js +++ b/src/constants.js @@ -1 +1,4 @@ -// export const SOME_GLOBAL_CONFIG = "value"; \ No newline at end of file +// export const SOME_GLOBAL_CONFIG = "value"; + +export const API_KEY = "jTAAZCA5"; +export const SESSION_STORAGE_KEY = "SESSION_ID"; \ No newline at end of file From 6c0645a8652cea0716d8e3be936b4a177f78cbc4 Mon Sep 17 00:00:00 2001 From: BIT Student Date: Tue, 21 Nov 2017 12:47:16 +0100 Subject: [PATCH 07/13] finished routing and JSX --- src/components/app.js | 4 +-- src/components/helloWorld/helloWorld.js | 13 ---------- src/components/login-page/login-page.js | 28 ++++++++++++++++++++ src/components/login-page/login.js | 34 +++++++++++++++++++++++++ src/components/login-page/register.js | 34 +++++++++++++++++++++++++ src/components/login-page/welcome.js | 17 +++++++++++++ src/index.js | 6 ++--- 7 files changed, 118 insertions(+), 18 deletions(-) delete mode 100644 src/components/helloWorld/helloWorld.js create mode 100644 src/components/login-page/login-page.js create mode 100644 src/components/login-page/login.js create mode 100644 src/components/login-page/register.js create mode 100644 src/components/login-page/welcome.js diff --git a/src/components/app.js b/src/components/app.js index 688ddcc..9afafce 100644 --- a/src/components/app.js +++ b/src/components/app.js @@ -1,6 +1,6 @@ import React from "react"; -import HelloWorld from "./helloWorld/helloWorld"; +import LoginPage from "./login-page/login-page"; class App extends React.Component { constructor(props) { @@ -8,7 +8,7 @@ class App extends React.Component { } render() { - return ; + return ; } } diff --git a/src/components/helloWorld/helloWorld.js b/src/components/helloWorld/helloWorld.js deleted file mode 100644 index c0ba8a7..0000000 --- a/src/components/helloWorld/helloWorld.js +++ /dev/null @@ -1,13 +0,0 @@ -import React from "react"; - -class HelloWorld extends React.Component { - constructor(props) { - super(props); - } - - render() { - return

Hello World!

; - } -} - -export default HelloWorld; diff --git a/src/components/login-page/login-page.js b/src/components/login-page/login-page.js new file mode 100644 index 0000000..3e8a86a --- /dev/null +++ b/src/components/login-page/login-page.js @@ -0,0 +1,28 @@ +import React from "react"; +import Welcome from "./welcome"; +import Login from "./login"; +import Register from "./register"; + +import { Switch, Route } from "react-router-dom"; + +class LoginPage extends React.Component { + constructor(props) { + super(props); + } + + render() { + return ( +
+ + + + + + +
+ + ); + } +} + +export default LoginPage; diff --git a/src/components/login-page/login.js b/src/components/login-page/login.js new file mode 100644 index 0000000..5c90109 --- /dev/null +++ b/src/components/login-page/login.js @@ -0,0 +1,34 @@ +import React from "react"; +import { Link } from "react-router-dom"; + +class Login extends React.Component { + constructor(props){ + super(props); + } + + render(){ + + return( +
+
+

Login

+

Register

+
+
+ email: +
+ + pass: +
+ + +
+ +
+ +
+ ); + } +} + +export default Login; \ No newline at end of file diff --git a/src/components/login-page/register.js b/src/components/login-page/register.js new file mode 100644 index 0000000..9cad436 --- /dev/null +++ b/src/components/login-page/register.js @@ -0,0 +1,34 @@ +import React from "react"; +import { Link } from "react-router-dom"; + +class Register extends React.Component { + constructor(props) { + super(props); + } + + render() { + + return ( +
+
+

Login

+

Register

+
+
+ Name: + + email: + + pass: + + +
+ +
+ +
+ ); + } +} + +export default Register; diff --git a/src/components/login-page/welcome.js b/src/components/login-page/welcome.js new file mode 100644 index 0000000..25fd864 --- /dev/null +++ b/src/components/login-page/welcome.js @@ -0,0 +1,17 @@ +import React from "react"; + +const Welcome = ()=>{ + + return( +
+

+ Welcome to BitBook +

+

+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam consequat dignissim luctus. Sed eu rutrum purus. Morbi augue arcu, blandit nec ante sed, finibus tempor ex. Aenean vel arcu a eros fringilla facilisis in in lectus. Nam at ex posuere, pretium neque vel, tempor velit. Maecenas eget justo nec leo aliquet mollis. Sed ac luctus ipsum. Pellentesque tincidunt mauris urna. Morbi vitae tortor maximus, dignissim neque ut, mollis ipsum. Morbi nisl nibh, elementum non velit ut, sollicitudin consectetur eros. Quisque ac leo auctor, vehicula tellus sed, varius nulla. Aliquam ornare interdum consequat. In tincidunt ex a sagittis congue. Phasellus lacinia sit amet magna sit amet efficitur. Vivamus lobortis sem a bibendum iaculis. Fusce ut imperdiet justo. +

+
+ ); +}; + +export default Welcome; \ No newline at end of file diff --git a/src/index.js b/src/index.js index 80d7d1b..7cb4896 100644 --- a/src/index.js +++ b/src/index.js @@ -1,13 +1,13 @@ import React from "react"; import ReactDOM from "react-dom"; -import { BrowserRouter } from "react-router-dom"; +import { HashRouter } from "react-router-dom"; import "babel-polyfill"; import App from "./components/app"; ReactDOM.render( - + - , + , document.querySelector(".container") ); From 8d58410e247d034c951f1927f787bc8c4cef6a30 Mon Sep 17 00:00:00 2001 From: BIT Student Date: Tue, 21 Nov 2017 14:24:22 +0100 Subject: [PATCH 08/13] added Materialize --- src/components/login-page/login-page.js | 2 +- src/components/login-page/login.js | 12 ++++++------ src/components/login-page/register.js | 4 ++-- src/components/login-page/welcome.js | 2 +- src/index.html | 7 +++++-- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/components/login-page/login-page.js b/src/components/login-page/login-page.js index 3e8a86a..d3e7e35 100644 --- a/src/components/login-page/login-page.js +++ b/src/components/login-page/login-page.js @@ -12,7 +12,7 @@ class LoginPage extends React.Component { render() { return ( -
+
diff --git a/src/components/login-page/login.js b/src/components/login-page/login.js index 5c90109..f3cab3b 100644 --- a/src/components/login-page/login.js +++ b/src/components/login-page/login.js @@ -9,10 +9,10 @@ class Login extends React.Component { render(){ return( -
-
-

Login

-

Register

+
+
+

Login

+

Register

email: @@ -21,8 +21,8 @@ class Login extends React.Component { pass:
- -
+ +
diff --git a/src/components/login-page/register.js b/src/components/login-page/register.js index 9cad436..dbf3bed 100644 --- a/src/components/login-page/register.js +++ b/src/components/login-page/register.js @@ -9,7 +9,7 @@ class Register extends React.Component { render() { return ( -
+

Login

Register

@@ -21,7 +21,7 @@ class Register extends React.Component { pass: - +
diff --git a/src/components/login-page/welcome.js b/src/components/login-page/welcome.js index 25fd864..658d284 100644 --- a/src/components/login-page/welcome.js +++ b/src/components/login-page/welcome.js @@ -3,7 +3,7 @@ import React from "react"; const Welcome = ()=>{ return( -
+

Welcome to BitBook

diff --git a/src/index.html b/src/index.html index ac437dd..32255ab 100644 --- a/src/index.html +++ b/src/index.html @@ -4,12 +4,15 @@ - + + + My React App
- + + From 72188ef3a42a0ad8bd6fab95121229877f0b5ad5 Mon Sep 17 00:00:00 2001 From: BIT Student Date: Tue, 21 Nov 2017 14:24:50 +0100 Subject: [PATCH 09/13] new folder structure --- src/components/app.js | 1 + src/constants.js | 3 ++- src/{components/common => services}/fetchService.js | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) rename src/{components/common => services}/fetchService.js (87%) diff --git a/src/components/app.js b/src/components/app.js index 688ddcc..0526f50 100644 --- a/src/components/app.js +++ b/src/components/app.js @@ -7,6 +7,7 @@ class App extends React.Component { super(props); } + render() { return ; } diff --git a/src/constants.js b/src/constants.js index 1252822..cbb26ea 100644 --- a/src/constants.js +++ b/src/constants.js @@ -1,4 +1,5 @@ // export const SOME_GLOBAL_CONFIG = "value"; export const API_KEY = "jTAAZCA5"; -export const SESSION_STORAGE_KEY = "SESSION_ID"; \ No newline at end of file +export const SESSION_STORAGE_KEY = "SESSION_ID"; +export const BASE_URL = ""; \ No newline at end of file diff --git a/src/components/common/fetchService.js b/src/services/fetchService.js similarity index 87% rename from src/components/common/fetchService.js rename to src/services/fetchService.js index b9bb317..e7fe4b8 100644 --- a/src/components/common/fetchService.js +++ b/src/services/fetchService.js @@ -1,5 +1,5 @@ import fetch from "fetch"; -import { SESSION_STORAGE_KEY, API_KEY } from "../../constants"; +import { SESSION_STORAGE_KEY, API_KEY, BASE_URL } from "../../constants"; export default class FetchService { @@ -23,7 +23,7 @@ export default class FetchService { get(url, successHandler, errorHandler) { - fetch(url, { + fetch(`${BASE_URL}${url}`, { method: "GET", headers: this.headers() }) @@ -34,7 +34,7 @@ export default class FetchService { post(url, postData) { - fetch(url, { + fetch(`${BASE_URL}${url}`, { method: "POST", body: JSON.stringify(postData), headers: this.headers() From 08926a629ac821ccea704abd61bbde6f31015887 Mon Sep 17 00:00:00 2001 From: BIT Student Date: Tue, 21 Nov 2017 15:59:13 +0100 Subject: [PATCH 10/13] redirec service using window location completed --- src/components/login-page/register.js | 6 +++--- src/components/login-page/welcome.js | 11 +++++++---- src/services/redirectService.js | 7 +++++++ 3 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 src/services/redirectService.js diff --git a/src/components/login-page/register.js b/src/components/login-page/register.js index dbf3bed..aa989e2 100644 --- a/src/components/login-page/register.js +++ b/src/components/login-page/register.js @@ -10,9 +10,9 @@ class Register extends React.Component { return (
-
-

Login

-

Register

+
+

Login

+

Register

Name: diff --git a/src/components/login-page/welcome.js b/src/components/login-page/welcome.js index 658d284..6d8a3d0 100644 --- a/src/components/login-page/welcome.js +++ b/src/components/login-page/welcome.js @@ -1,14 +1,17 @@ import React from "react"; +import RedirectService from "../../services/redirectService"; -const Welcome = ()=>{ +const Welcome = () => { - return( + const redi = new RedirectService(); + + return (
-

+

redi.goTo("test")}> Welcome to BitBook

- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam consequat dignissim luctus. Sed eu rutrum purus. Morbi augue arcu, blandit nec ante sed, finibus tempor ex. Aenean vel arcu a eros fringilla facilisis in in lectus. Nam at ex posuere, pretium neque vel, tempor velit. Maecenas eget justo nec leo aliquet mollis. Sed ac luctus ipsum. Pellentesque tincidunt mauris urna. Morbi vitae tortor maximus, dignissim neque ut, mollis ipsum. Morbi nisl nibh, elementum non velit ut, sollicitudin consectetur eros. Quisque ac leo auctor, vehicula tellus sed, varius nulla. Aliquam ornare interdum consequat. In tincidunt ex a sagittis congue. Phasellus lacinia sit amet magna sit amet efficitur. Vivamus lobortis sem a bibendum iaculis. Fusce ut imperdiet justo. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam consequat dignissim luctus. Sed eu rutrum purus. Morbi augue arcu, blandit nec ante sed, finibus tempor ex. Aenean vel arcu a eros fringilla facilisis in in lectus. Nam at ex posuere, pretium neque vel, tempor velit. Maecenas eget justo nec leo aliquet mollis. Sed ac luctus ipsum. Pellentesque tincidunt mauris urna. Morbi vitae tortor maximus, dignissim neque ut, mollis ipsum. Morbi nisl nibh, elementum non velit ut, sollicitudin consectetur eros. Quisque ac leo auctor, vehicula tellus sed, varius nulla. Aliquam ornare interdum consequat. In tincidunt ex a sagittis congue. Phasellus lacinia sit amet magna sit amet efficitur. Vivamus lobortis sem a bibendum iaculis. Fusce ut imperdiet justo.

); diff --git a/src/services/redirectService.js b/src/services/redirectService.js new file mode 100644 index 0000000..5ffb880 --- /dev/null +++ b/src/services/redirectService.js @@ -0,0 +1,7 @@ +export default class RedirectService { + + goTo(path) { + window.location.assign(`#/${path}`); + // this.props.history.push(`/${path}`); + } +}; \ No newline at end of file From 50092deb90268fde129644d6dda350dcf733f6f3 Mon Sep 17 00:00:00 2001 From: BIT Student Date: Tue, 21 Nov 2017 16:05:29 +0100 Subject: [PATCH 11/13] redirect service resolved --- src/components/login-page/welcome.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/login-page/welcome.js b/src/components/login-page/welcome.js index 6d8a3d0..a6d6d65 100644 --- a/src/components/login-page/welcome.js +++ b/src/components/login-page/welcome.js @@ -1,13 +1,11 @@ import React from "react"; -import RedirectService from "../../services/redirectService"; const Welcome = () => { - const redi = new RedirectService(); return (
-

redi.goTo("test")}> +

Welcome to BitBook

From 0a7ecc5ab0214d1c5323e264311a487980659818 Mon Sep 17 00:00:00 2001 From: BIT Student Date: Tue, 21 Nov 2017 17:22:59 +0100 Subject: [PATCH 12/13] main and header created, switch ready to be deployed --- src/components/app.js | 11 ++++++++++- src/components/common/header.js | 19 +++++++++++++++++++ src/components/mainPage.js | 20 ++++++++++++++++++++ 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 src/components/common/header.js create mode 100644 src/components/mainPage.js diff --git a/src/components/app.js b/src/components/app.js index 85fc494..ff55185 100644 --- a/src/components/app.js +++ b/src/components/app.js @@ -1,6 +1,8 @@ import React from "react"; +import { Switch, Route } from "react-router-dom"; import LoginPage from "./login-page/login-page"; +import MainPage from "./mainPage"; class App extends React.Component { constructor(props) { @@ -9,7 +11,14 @@ class App extends React.Component { render() { - return ; + return ( +

+ + + + +
+ ); } } diff --git a/src/components/common/header.js b/src/components/common/header.js new file mode 100644 index 0000000..c7ff564 --- /dev/null +++ b/src/components/common/header.js @@ -0,0 +1,19 @@ +import React, { Component } from "react"; + +class Header extends Component { + render() { + return ( +
+ +
+ ); + } +} + +export default Header; \ No newline at end of file diff --git a/src/components/mainPage.js b/src/components/mainPage.js new file mode 100644 index 0000000..5922ddd --- /dev/null +++ b/src/components/mainPage.js @@ -0,0 +1,20 @@ +import React, { Component } from "react"; +import Header from "./common/header"; + + +class MainPage extends Component { + constructor(props) { + super(props); + } + + render() { + return ( +
+
+
Dobrodosli na main
+
+ ); + } +} + +export default MainPage; \ No newline at end of file From 9e4d319b03ef70bb2533e7cb809b2a278e9564ea Mon Sep 17 00:00:00 2001 From: BIT Student Date: Wed, 22 Nov 2017 09:21:56 +0100 Subject: [PATCH 13/13] ready for injection --- src/components/app.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/components/app.js b/src/components/app.js index ff55185..8853ff4 100644 --- a/src/components/app.js +++ b/src/components/app.js @@ -3,20 +3,22 @@ import React from "react"; import { Switch, Route } from "react-router-dom"; import LoginPage from "./login-page/login-page"; import MainPage from "./mainPage"; +// import AuthenticationService from '../services/authenticationService'; class App extends React.Component { constructor(props) { super(props); + + // this.isAuth = new AuthenticationService().isAuthenticated(); } render() { + // this.isAuth ? : return ( +
- - - - +
); }