-
- Home
-
+
+ Home
+
{% show_menu_below_id "digital-glarus-page" 0 %}
Supporters
diff --git a/digitalglarus/test_views.py b/digitalglarus/test_views.py
index 1c5824f5..5658a73c 100644
--- a/digitalglarus/test_views.py
+++ b/digitalglarus/test_views.py
@@ -1,10 +1,13 @@
+import json
+
from django.test import TestCase
from django.core.urlresolvers import reverse
from django.core.urlresolvers import resolve
+from cms.test_utils.testcases import CMSTestCase
+from cms.api import create_page
class ContactViewTest(TestCase):
-
def setUp(self):
self.url = reverse('digitalglarus:contact')
self.data = {
@@ -21,3 +24,28 @@ class ContactViewTest(TestCase):
def test_any_user_should_contact_us(self):
response = self.client.post(self.url, self.data, follow=True)
self.assertEqual(response.status_code, 200)
+
+
+class ViewsTest(CMSTestCase):
+ def setUp(self):
+ self.page1 = create_page('home', 'home_digitalglarus.html', published=True, language='en-us')
+ self.page2 = create_page('about', 'about.html', published=True, language='en-us', slug='about')
+
+ def test_digitalglarus_templates(self):
+ res1 = self.client.get('/en-us/')
+ self.assertContains(res1, 'Digital Glarus', status_code=200)
+ res2 = self.client.get('/en-us/about/')
+ self.assertEqual(res2.status_code, 200)
+
+
+class CalendarApiTestCase(TestCase):
+ def test_api_response(self):
+ calendar_api_url_1 = reverse('digitalglarus:calendar_api_1', kwargs={'month': '3', 'year': '2016'})
+ res1 = self.client.get(calendar_api_url_1)
+ pd = json.loads(res1.content.decode('utf-8'))
+ self.assertEqual(pd['month'], '3')
+ self.assertEqual(pd['year'], '2016')
+
+ # TODO:check post
+ # calendar_api_url = reverse('digitalglarus:calendar_api')
+ # res = self.client.get(calendar_api_url)
diff --git a/digitalglarus/urls.py b/digitalglarus/urls.py
index b5329bab..7f08190c 100644
--- a/digitalglarus/urls.py
+++ b/digitalglarus/urls.py
@@ -1,17 +1,14 @@
from django.conf.urls import url
-
from django.utils.translation import ugettext_lazy as _
+
from . import views
from .views import ContactView, IndexView, AboutView
urlpatterns = [
-# url(r'^$', IndexView.as_view(), name='home'),
-# url(_(r'home/?$'), IndexView.as_view(), name='home'),
-# url(_(r'about/?$'), AboutView.as_view(), name='about'),
url(_(r'contact/?$'), ContactView.as_view(), name='contact'),
url(_(r'supporters/?$'), views.supporters, name='supporters'),
- url(r'calendar_api/(?P\d+)/(?P\d+)?$',views.CalendarApi.as_view()),
- url(r'calendar_api/',views.CalendarApi.as_view()),
+ url(r'calendar_api/(?P\d+)/(?P\d+)?$', views.CalendarApi.as_view(),name='calendar_api_1'),
+ url(r'calendar_api/', views.CalendarApi.as_view(),name='calendar_api'),
url(_(r'support-us/?$'), views.support, name='support'),
url(r'^blog/(?P\w[-\w]*)/$', views.blog_detail, name='blog-detail'),
url(r'blog/$', views.blog, name='blog'),
diff --git a/dynamicweb/settings-test/__init__.py b/dynamicweb/settings-test/__init__.py
index 752b949e..22ef8531 100644
--- a/dynamicweb/settings-test/__init__.py
+++ b/dynamicweb/settings-test/__init__.py
@@ -175,13 +175,8 @@ USE_L10N = True
USE_TZ = True
LANGUAGES = (
-<<<<<<< HEAD:dynamicweb/settings-test/__init__.py
- ('en-us', _('English')),
- ('de', _('Deutsch')),
-=======
('en-us', _('US English')),
('de', _('German')),
->>>>>>> remotes/origin/feature/digital.glarus.german:dynamicweb/settings.py
)
LANGUAGE_CODE = 'en-us'
diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py
index 6daec940..69e708d2 100644
--- a/dynamicweb/settings/base.py
+++ b/dynamicweb/settings/base.py
@@ -30,6 +30,7 @@ dotenv.read_dotenv("{0}/.env".format(PROJECT_DIR))
SITE_ID = 1
APP_ROOT_ENDPOINT = "/"
+APPEND_SLASH=True
LOGIN_URL = None
LOGOUT_URL = None
@@ -445,7 +446,7 @@ AUTH_USER_MODEL = 'membership.CustomUser'
# PAYMENT
-STRIPE_API_PUBLIC_KEY = 'pk_test_uvWyHNJgVL2IB8kjfgJkGjg4' # used in frontend to call from user browser
+STRIPE_API_PUBLIC_KEY = 'pk_test_ZRg6P8g5ybiHE6l2RW5pSaYV' # used in frontend to call from user browser
STRIPE_API_PRIVATE_KEY = 'sk_test_uIPMdgXoRGydrcD7fkwcn7dj' # used in backend payment
STRIPE_DESCRIPTION_ON_PAYMENT = "Payment for ungleich GmbH services"
diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py
index 10fa0536..d6fb4a52 100644
--- a/dynamicweb/urls.py
+++ b/dynamicweb/urls.py
@@ -5,12 +5,14 @@ from django.conf.urls.i18n import i18n_patterns
from django.conf.urls.static import static
from django.conf import settings
-from hosting.views import RailsHostingView
+from hosting.views import RailsHostingView, DjangoHostingView, NodeJSHostingView
from membership import urls as membership_urls
urlpatterns = [
url(r'^hosting/', include('hosting.urls', namespace="hosting")),
url(r'^railshosting/', RailsHostingView.as_view(), name="rails.hosting"),
+ url(r'^nodehosting/', NodeJSHostingView.as_view(), name="node.hosting"),
+ url(r'^djangohosting/', DjangoHostingView.as_view(), name="django.hosting"),
url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
url(r'^jsi18n/(?P\S+?)/$',
'django.views.i18n.javascript_catalog'),
@@ -18,16 +20,16 @@ urlpatterns = [
# note the django CMS URLs included via i18n_patterns
urlpatterns += i18n_patterns('',
- # url(r'^$',include('ungleich.urls')),
url(r'^admin/', include(admin.site.urls)),
- url(r'^login/',include(membership_urls)),
-
-
+ url(r'^digitalglarus/login/', include(membership_urls)),
url(r'^digitalglarus/', include('digitalglarus.urls',
- namespace="digitalglarus"),name='digitalglarus'),
+ namespace="digitalglarus")),
+ url(r'^blog/', include('ungleich.urls', namespace='ungleich')),
+ url(r'^ungleich_page/',
+ include('ungleich_page.urls', namespace='ungleich_page'),
+ name='ungleich_page'),
url(r'^blog/',include('ungleich.urls',namespace='ungleich')),
- url(r'^ungleich_page/',include('ungleich_page.urls',namespace='ungleich_page'),name='ungleich_page'),
- url(r'^', include('cms.urls')),
+ url(r'^', include('cms.urls'))
)
if settings.DEBUG:
diff --git a/hosting/migrations/0008_virtualmachineplan.py b/hosting/migrations/0008_virtualmachineplan.py
new file mode 100644
index 00000000..a06d76b2
--- /dev/null
+++ b/hosting/migrations/0008_virtualmachineplan.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2016-04-23 07:10
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ('hosting', '0007_auto_20160418_0103'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='VirtualMachinePlan',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('cores', models.IntegerField()),
+ ('memory', models.IntegerField()),
+ ('disk_size', models.IntegerField()),
+ ('price', models.FloatField()),
+ ('client', models.ManyToManyField(to=settings.AUTH_USER_MODEL)),
+ ('vm_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='hosting.VirtualMachineType')),
+ ],
+ ),
+ ]
diff --git a/hosting/migrations/0009_auto_20160426_0444.py b/hosting/migrations/0009_auto_20160426_0444.py
new file mode 100644
index 00000000..fdc51b6e
--- /dev/null
+++ b/hosting/migrations/0009_auto_20160426_0444.py
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2016-04-26 04:44
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('utils', '0002_billingaddress'),
+ ('membership', '0004_stripecustomer'),
+ ('hosting', '0008_virtualmachineplan'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='HostingOrder',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('created_at', models.DateTimeField(auto_now_add=True)),
+ ],
+ ),
+ migrations.RemoveField(
+ model_name='virtualmachineplan',
+ name='client',
+ ),
+ migrations.AddField(
+ model_name='hostingorder',
+ name='VMPlan',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='hosting.VirtualMachinePlan'),
+ ),
+ migrations.AddField(
+ model_name='hostingorder',
+ name='billing_address',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='utils.BillingAddress'),
+ ),
+ migrations.AddField(
+ model_name='hostingorder',
+ name='customer',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='membership.StripeCustomer'),
+ ),
+ ]
diff --git a/hosting/migrations/0010_auto_20160426_0530.py b/hosting/migrations/0010_auto_20160426_0530.py
new file mode 100644
index 00000000..756c1446
--- /dev/null
+++ b/hosting/migrations/0010_auto_20160426_0530.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2016-04-26 05:30
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('hosting', '0009_auto_20160426_0444'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='hostingorder',
+ name='approved',
+ field=models.BooleanField(default=False),
+ ),
+ migrations.AddField(
+ model_name='hostingorder',
+ name='stripe_charge_id',
+ field=models.CharField(max_length=100, null=True),
+ ),
+ ]
diff --git a/hosting/migrations/0011_auto_20160426_0555.py b/hosting/migrations/0011_auto_20160426_0555.py
new file mode 100644
index 00000000..2eedbcc9
--- /dev/null
+++ b/hosting/migrations/0011_auto_20160426_0555.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2016-04-26 05:55
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('hosting', '0010_auto_20160426_0530'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='hostingorder',
+ name='VMPlan',
+ field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='hosting.VirtualMachinePlan'),
+ ),
+ ]
diff --git a/hosting/mixins.py b/hosting/mixins.py
new file mode 100644
index 00000000..1f6366ab
--- /dev/null
+++ b/hosting/mixins.py
@@ -0,0 +1,21 @@
+from django.shortcuts import redirect
+from django.core.urlresolvers import reverse
+
+
+class ProcessVMSelectionMixin(object):
+
+ def post(self, request, *args, **kwargs):
+ vm_specs = {
+ 'cores': request.POST.get('cores'),
+ 'memory': request.POST.get('memory'),
+ 'disk_size': request.POST.get('disk_space'),
+ 'hosting_company': request.POST.get('hosting_company'),
+ 'hosting_company_name': request.POST.get('hosting_company_name'),
+ 'final_price': request.POST.get('final_price')
+ }
+ request.session['vm_specs'] = vm_specs
+ if not request.user.is_authenticated():
+ request.session['vm_specs'] = vm_specs
+ request.session['next'] = reverse('hosting:payment')
+ return redirect(reverse('hosting:login'))
+ return redirect(reverse('hosting:payment'))
diff --git a/hosting/models.py b/hosting/models.py
index 59ba8521..f3e2a178 100644
--- a/hosting/models.py
+++ b/hosting/models.py
@@ -1,7 +1,10 @@
+import json
+
from django.db import models
from django.utils.translation import ugettext_lazy as _
from django.core import serializers
-import json
+from membership.models import StripeCustomer
+from utils.models import BillingAddress
class RailsBetaUser(models.Model):
@@ -42,7 +45,13 @@ class VirtualMachineType(models.Model):
def get_serialized_vm_types(cls):
return [vm.get_serialized_data()
for vm in cls.objects.all()]
- # return serializers.serialize("json",)
+
+ def calculate_price(self, specifications):
+ price = float(specifications['cores']) * self.core_price
+ price += float(specifications['memory']) * self.memory_price
+ price += float(specifications['disk_size']) * self.disk_size_price
+ price += self.base_price
+ return price
def defeault_price(self):
price = self.base_price
@@ -63,3 +72,51 @@ class VirtualMachineType(models.Model):
'default_price': self.defeault_price(),
'id': self.id,
}
+
+
+class VirtualMachinePlan(models.Model):
+ cores = models.IntegerField()
+ memory = models.IntegerField()
+ disk_size = models.IntegerField()
+ vm_type = models.ForeignKey(VirtualMachineType)
+ price = models.FloatField()
+
+ @classmethod
+ def create(cls, data, user):
+ instance = cls.objects.create(**data)
+ return instance
+
+
+class HostingOrder(models.Model):
+ VMPlan = models.OneToOneField(VirtualMachinePlan)
+ customer = models.ForeignKey(StripeCustomer)
+ billing_address = models.ForeignKey(BillingAddress)
+ created_at = models.DateTimeField(auto_now_add=True)
+ approved = models.BooleanField(default=False)
+ stripe_charge_id = models.CharField(max_length=100, null=True)
+
+ @classmethod
+ def create(cls, VMPlan=None, customer=None, billing_address=None):
+ instance = cls.objects.create(VMPlan=VMPlan, customer=customer,
+ billing_address=billing_address)
+ return instance
+
+ def set_approved(self):
+ self.approved = True
+ self.save()
+
+ def set_stripe_charge(self, stripe_charge):
+ self.stripe_charge_id = stripe_charge.id
+ self.save()
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/hosting/static/hosting/css/landing-page.css b/hosting/static/hosting/css/landing-page.css
index 24be9dec..cbbc5898 100644
--- a/hosting/static/hosting/css/landing-page.css
+++ b/hosting/static/hosting/css/landing-page.css
@@ -31,8 +31,7 @@ h6 {
}
.intro-header {
- height: 85%;
- padding-top: 10%; /* If you're making other pages, make sure there is 50px of padding to make sure the navbar doesn't overlap content! */
+ padding-top: 50px; /* If you're making other pages, make sure there is 50px of padding to make sure the navbar doesn't overlap content! */
padding-bottom: 50px;
text-align: center;
color: #f8f8f8;
@@ -48,8 +47,7 @@ h6 {
background-size: cover;
}
.intro-header-2 {
- height: 85%;
- padding-top: 100px; /* If you're making other pages, make sure there is 50px of padding to make sure the navbar doesn't overlap content! */
+ padding-top: 50px; /* If you're making other pages, make sure there is 50px of padding to make sure the navbar doesn't overlap content! */
padding-bottom: 50px;
text-align: center;
color: #f8f8f8;
@@ -61,10 +59,23 @@ h6 {
padding-top: 20%;
padding-bottom: 20%;
}
-.intro-signup {
+
+.intro-auth {
+ text-align: center;
+ color: #f8f8f8;
position: relative;
- padding-top: 20%;
- padding-bottom: 20%;
+ padding-bottom: 25%;
+ padding-top: 10%;
+}
+
+.intro-login {
+ background: url(../img/intro-bg.jpg) no-repeat center center;
+ background-size: cover;
+}
+
+.intro-signup {
+ background: url(../img/configure.jpg) no-repeat center center;
+ background-size: cover;
}
.intro-message > h1 {
@@ -202,4 +213,12 @@ a#forgotpassword {
line-height: 1;
font-weight: 700;
color: #6db97c;
+}
+
+a.unlink {
+ color: inherit;
+}
+
+a.unlink:hover {
+ color: inherit;
}
\ No newline at end of file
diff --git a/hosting/static/hosting/css/payment.css b/hosting/static/hosting/css/payment.css
new file mode 100644
index 00000000..57e830f4
--- /dev/null
+++ b/hosting/static/hosting/css/payment.css
@@ -0,0 +1,28 @@
+
+.payment-container {padding-top:5%; padding-bottom: 11%;}
+.creditcard-box .panel-title {display: inline;font-weight: bold; font-size:17px;}
+.creditcard-box .checkbox.pull-right { margin: 0; }
+.creditcard-box .pl-ziro { padding-left: 0px; }
+.creditcard-box .form-control.error {
+ border-color: red;
+ outline: 0;
+ box-shadow: inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(255,0,0,0.6);
+}
+.creditcard-box label.error {
+ font-weight: bold;
+ color: red;
+ padding: 2px 8px;
+ margin-top: 2px;
+}
+.creditcard-box .payment-errors {
+ font-weight: bold;
+ color: red;
+ padding: 2px 8px;
+ margin-top: 2px;
+}
+
+.summary-box .content {
+
+ padding-top: 15px;
+
+}
\ No newline at end of file
diff --git a/hosting/static/hosting/css/pricing.css b/hosting/static/hosting/css/pricing.css
index 870b3cf9..7fb6f51f 100644
--- a/hosting/static/hosting/css/pricing.css
+++ b/hosting/static/hosting/css/pricing.css
@@ -1,3 +1,7 @@
+.pricing-container{
+ margin-left: 5%;
+}
+
.pricing {
text-align: center;
border: 1px solid #f0f0f0;
@@ -7,6 +11,8 @@
margin-bottom: 30px;
font-family: 'Lato';
}
+
+
.pricing img {
display: block;
margin: auto;
@@ -23,6 +29,13 @@
.pricing li + li {
border-top: 1px solid #f0f0f0;
}
+
+.pricing li.type {
+ list-style: none;
+ padding: 13px;
+ height: 200px;
+}
+
.pricing big {
font-size: 32px;
}
@@ -81,6 +94,7 @@
.pricing .short-input{
min-width: 0;
width: 90px;
+ display: inline;
}
.p-red button {
diff --git a/hosting/static/hosting/js/payment.js b/hosting/static/hosting/js/payment.js
new file mode 100644
index 00000000..dd6c64d4
--- /dev/null
+++ b/hosting/static/hosting/js/payment.js
@@ -0,0 +1,124 @@
+$( document ).ready(function() {
+
+ $.ajaxSetup({
+ beforeSend: function(xhr, settings) {
+ function getCookie(name) {
+ var cookieValue = null;
+ if (document.cookie && document.cookie != '') {
+ var cookies = document.cookie.split(';');
+ for (var i = 0; i < cookies.length; i++) {
+ var cookie = jQuery.trim(cookies[i]);
+ // Does this cookie string begin with the name we want?
+ if (cookie.substring(0, name.length + 1) == (name + '=')) {
+ cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
+ break;
+ }
+ }
+ }
+ return cookieValue;
+ }
+ if (!(/^http:.*/.test(settings.url) || /^https:.*/.test(settings.url))) {
+ // Only send the token to relative URLs i.e. locally.
+ xhr.setRequestHeader("X-CSRFToken", getCookie('csrftoken'));
+ }
+ }
+ });
+
+
+ var $form = $('#payment-form');
+ $form.submit(payWithStripe);
+
+ /* If you're using Stripe for payments */
+ function payWithStripe(e) {
+ e.preventDefault();
+
+ /* Visual feedback */
+ $form.find('[type=submit]').html('Validating Rails Hosting.ch - Ruby on Rails as easy as possible
+ Payment
-
+
-
-
-
-
+ {% block content %}
+ {% endblock %}
- How it works
+ How it works
- Your infrastructure
+ Your infrastructure
⋅
- Our infrastructure
+ Our infrastructure
- Pricing
+ Pricing
- Contact
+ Contact
-
Copyright © ungleich GmbH 2015. All Rights Reserved
+
Copyright © ungleich GmbH {% now "Y" %}. All Rights Reserved