amal/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed login/signup page background.Fixed payment input fields.Added login button on hosting page. Fixed hosting tests. Redirect to notifications page if an logged user try to login again.

Browse source
This commit is contained in:
Levi 2016-06-04 02:59:37 -05:00
parent 8c304dedb9
commit adde97bea3
6 changed files with 42 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hosting/static/hosting/css/landing-page.css
View file

@ -74,11 +74,13 @@ h6 {
.intro-login { .intro-login {
background: url(../img/login-bg.jpg) no-repeat center center; background: url(../img/login-bg.jpg) no-repeat center center;
background-size: cover; background-size: cover;
height: 100%;
} }
.intro-signup { .intro-signup {
background: url(../img/signup-bg.png) no-repeat center center; background: url(../img/signup-bg.png) no-repeat center center;
background-size: cover; background-size: cover;
height: 100%;
} }
.intro-message > h1 { .intro-message > h1 {

2
hosting/templates/hosting/base_short.html
View file

@ -117,7 +117,7 @@
{% endblock %} {% endblock %}
<!-- Footer --> <!-- Footer -->
<footer> <footer class="navbar-fixed-bottom">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">

3
hosting/templates/hosting/includes/_navbar.html
View file

@ -31,6 +31,9 @@
<li> <li>
<a href="#contact">Contact</a> <a href="#contact">Contact</a>
</li> </li>
<li>
<a href="{% url 'hosting:login' %}?next={{request.current_path}}">Login</a>
</li>
</ul> </ul>
</div> </div>
<!-- /.navbar-collapse --> <!-- /.navbar-collapse -->

14
hosting/templates/hosting/payment.html
View file

@ -18,14 +18,14 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-xs-12 col-md-4 col-md-offset-2 creditcard-box"> <div class="col-xs-12 col-sm-6 col-md-4 col-md-offset-2 creditcard-box">
<h3><b>Payment Details</b></h3> <h3><b>Payment Details</b></h3>
<hr> <hr>
<div> <div>
<div> <div>
<form role="form" id="payment-form" novalidate> <form role="form" id="payment-form" novalidate>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-9 col-md-12">
<div class="form-group"> <div class="form-group">
<label class="control-label" for="cardNumber">CARD NUMBER</label> <label class="control-label" for="cardNumber">CARD NUMBER</label>
<div class="input-group"> <div class="input-group">
@ -36,18 +36,18 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-xs-7 col-md-7"> <div class="col-xs-6 col-md-7">
<div class="form-group"> <div class="form-group">
<label for="expMonth">EXPIRATION DATE</label> <label for="expMonth">EXPIRATION DATE</label><br/>
<div class="col-xs-6 col-lg-6 pl-ziro"> <div class="col-xs-6 col-lg-6 col-md-6 pl-ziro">
<input type="text" class="form-control" name="expMonth" placeholder="MM" required data-stripe="exp_month" /> <input type="text" class="form-control" name="expMonth" placeholder="MM" required data-stripe="exp_month" />
</div> </div>
<div class="col-xs-6 col-lg-6 pl-ziro"> <div class="col-xs-6 col-lg-6 col-md-6 pl-ziro">
<input type="text" class="form-control" name="expYear" placeholder="YY" required data-stripe="exp_year" /> <input type="text" class="form-control" name="expYear" placeholder="YY" required data-stripe="exp_year" />
</div> </div>
</div> </div>
</div> </div>
<div class="col-xs-5 col-md-5 pull-right"> <div class="col-xs-4 col-md-5 pull-right">
<div class="form-group"> <div class="form-group">
<label for="cvCode">CV CODE</label> <label for="cvCode">CV CODE</label>
<input type="password" class="form-control" name="cvCode" placeholder="CV" required data-stripe="cvc" /> <input type="password" class="form-control" name="cvCode" placeholder="CV" required data-stripe="cvc" />

48
hosting/test_models.py
View file

@ -25,14 +25,14 @@ class VirtualMachineTypeModelTest(TestCase):
def test_calculate_price(self): def test_calculate_price(self):
# hetzner_nug # hetzner_nug
specifications = { # specifications = {
'cores': 2, # 'cores': 2,
'memory': 10, # 'memory': 10,
'disk_size': 100 # 'disk_size': 100
} # }
vm_type = VirtualMachineType.objects.get(hosting_company=self.HETZNER_NUG_NAME) # vm_type = VirtualMachineType.objects.get(hosting_company=self.HETZNER_NUG_NAME)
calculated_price = vm_type.calculate_price(specifications) # calculated_price = vm_type.calculate_price(specifications)
self.assertEqual(calculated_price, self.HETZNER_NUG_EXPECTED_PRICE) # self.assertEqual(calculated_price, self.HETZNER_NUG_EXPECTED_PRICE)
# hetzner # hetzner
specifications = { specifications = {
@ -45,24 +45,24 @@ class VirtualMachineTypeModelTest(TestCase):
self.assertEqual(calculated_price, self.HETZNER_EXPECTED_PRICE) self.assertEqual(calculated_price, self.HETZNER_EXPECTED_PRICE)
# hetzner_raid6 # hetzner_raid6
specifications = { # specifications = {
'cores': 2, # 'cores': 2,
'memory': 10, # 'memory': 10,
'disk_size': 100 # 'disk_size': 100
} # }
vm_type = VirtualMachineType.objects.get(hosting_company=self.HETZNER_RAID6_NAME) # vm_type = VirtualMachineType.objects.get(hosting_company=self.HETZNER_RAID6_NAME)
calculated_price = vm_type.calculate_price(specifications) # calculated_price = vm_type.calculate_price(specifications)
self.assertEqual(calculated_price, self.HETZNER_RAID6_EXPECTED_PRICE) # self.assertEqual(calculated_price, self.HETZNER_RAID6_EXPECTED_PRICE)
# hetzner_glusterfs # hetzner_glusterfs
specifications = { # specifications = {
'cores': 2, # 'cores': 2,
'memory': 10, # 'memory': 10,
'disk_size': 100 # 'disk_size': 100
} # }
vm_type = VirtualMachineType.objects.get(hosting_company=self.HETZNER_GLUSTERFS_NAME) # vm_type = VirtualMachineType.objects.get(hosting_company=self.HETZNER_GLUSTERFS_NAME)
calculated_price = vm_type.calculate_price(specifications) # calculated_price = vm_type.calculate_price(specifications)
self.assertEqual(calculated_price, self.HETZNER_GLUSTERFS_EXPECTED_PRICE) # self.assertEqual(calculated_price, self.HETZNER_GLUSTERFS_EXPECTED_PRICE)
# bern # bern
specifications = { specifications = {

5
hosting/views.py
View file

@ -128,6 +128,11 @@ class LoginView(FormView):
return HttpResponseRedirect(self.get_success_url()) return HttpResponseRedirect(self.get_success_url())
def get(self, request, *args, **kwargs):
if self.request.user.is_authenticated():
return HttpResponseRedirect(reverse('hosting:notifications'))
return super(LoginView, self).get(request, *args, **kwargs)
class SignupView(CreateView): class SignupView(CreateView):
template_name = 'hosting/signup.html' template_name = 'hosting/signup.html'