senaduka/old-ribica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added links to registration and login page, added utf8 charset meta tag, added viewport metatag to prevent zoom on mobile devices

Browse Source
This commit is contained in:
Edin Dazdarevic
2015-02-17 21:58:39 +01:00
parent a9249c7ad8
commit b635246e83
6 changed files with 57 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
front-ui/app/components/account/login.js Normal file
View File

@@ -0,0 +1,10 @@
var React = require("react");
var Login = React.createClass({
render : function() {
return (<div>
<span className="h3">Login page</span>
</div>);
}
})
module.exports = Login;

10
front-ui/app/components/account/register.js Normal file
View File

@@ -0,0 +1,10 @@
var React = require("react");
var Register = React.createClass({
render : function() {
return (<div>
<span className="h3">Register page</span>
</div>);
}
})
module.exports = Register;

9
front-ui/app/components/rootApp.js
View File

@@ -1,7 +1,8 @@
var React = require('react'), var React = require('react'),
SectionsListComponent = require('./shared/sectionsListComponent'), SectionsListComponent = require('./shared/sectionsListComponent'),
Router = require('react-router'), Router = require('react-router'),
RouteHandler = Router.RouteHandler; RouteHandler = Router.RouteHandler,
LoginStatus = require('./shared/loginStatus');
var CartIcon = require('./cart/cartIcon'); var CartIcon = require('./cart/cartIcon');
@@ -15,10 +16,13 @@ var RootApp = React.createClass({
<div className='page-header'> <div className='page-header'>
<h1 className="main-heading"><a href="#" style={{color: "#cd3071"}}>ribica.ba</a></h1> <CartIcon /> <h1 className="main-heading"><a href="#" style={{color: "#cd3071"}}>ribica.ba</a></h1> <CartIcon />
<div style={{float:'right'}}>
<LoginStatus />
</div>
</div> </div>
<div className='row'> <div className='row'>
<div className='col-md-12' id='header'> <div className='col-md-12' id='header'>
<SectionsListComponent /> <SectionsListComponent />
</div> </div>
</div> </div>
<div className='row'> <div className='row'>
@@ -26,7 +30,6 @@ var RootApp = React.createClass({
<RouteHandler /> <RouteHandler />
</div> </div>
</div> </div>
); );

12
front-ui/app/components/shared/loginStatus.js Normal file
View File

@@ -0,0 +1,12 @@
var React = require("react"),
Router = require("react-router"),
Link = Router.Link;
var LoginStatus = React.createClass({
render : function() {
return (<div>
<Link to="registracija">Registracija</Link> | <Link to="login">Prijava</Link>
</div>);
}
})
module.exports = LoginStatus;

5
front-ui/app/router.js
View File

@@ -14,12 +14,17 @@ var StartPage = require('./components/startPage/startPage');
var ByCategory = require('./components/browsing/byCategory'); var ByCategory = require('./components/browsing/byCategory');
var BySection = require('./components/browsing/bySection'); var BySection = require('./components/browsing/bySection');
var Register = require('./components/account/register');
var Login = require('./components/account/login');
var routes = ( var routes = (
<Route name='app' path='/' handler={RootApp}> <Route name='app' path='/' handler={RootApp}>
<Route name='sekcija' path='sekcija/:id/:name' handler={BySection} /> <Route name='sekcija' path='sekcija/:id/:name' handler={BySection} />
<Route name='artikal' path="artikal/:id/*" handler={ItemWithDetailsPage} /> <Route name='artikal' path="artikal/:id/*" handler={ItemWithDetailsPage} />
<Route name='korpa' path="/korpa" handler={CartPage} /> <Route name='korpa' path="/korpa" handler={CartPage} />
<Route name='registracija' path="/registracija" handler={Register} />
<Route name='login' path="/login" handler={Login} />
<Route name='byCat' path="sekcija/:sekcijaName/kategorija/:id/*" handler={ByCategory} /> <Route name='byCat' path="sekcija/:sekcijaName/kategorija/:id/*" handler={ByCategory} />
<DefaultRoute handler={StartPage}/> <DefaultRoute handler={StartPage}/>
</Route> </Route>

48
front-ui/build/index.html
View File

@@ -1,37 +1,17 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css"> <title>ribica.ba - sve za vas evlad</title>
<link rel='stylesheet' type='text/css' href='ribica.css'> <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
<meta name="fragment" content="!"> <link rel='stylesheet' type='text/css' href='ribica.css'>
<meta name="viewport" content="initial-scale=0.9"> <meta charset="UTF-8">
</head> <meta name="fragment" content="!">
<body> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, minimum-scale=1" />
<!-- </head>
<div class="container"> <body>
<script src='ribica.js' type='text/javascript'></script>
<div class='page-header'> <script>
<h1>Ribica.ba</h1> RIBICA.App.bootstrap();
</div> </script>
<div class='row'> </body>
<div class='col-md-12' id='header'></div>
</div>
<div class='row'>
<div class='col-md-2' style='border: 1px solid red;'>
this comes herer
</div>
<div class='col-md-10' style='border: 1px solid blue;'>
<div id='content'>
</div>
</div>
</div>
</div>
-->
<script src='ribica.js' type='text/javascript'></script>
<script>
RIBICA.App.bootstrap();
</script>
</body>
</html> </html>