Commit po rebase z master

Signed-off-by: Kosieh Barter <[email protected]>

Author: KosiehBarter

apps/web/forms.py

@@ -36,11 +36,6 @@ class Meta:
 WaypointUpdateFormSetFactory = forms.inlineformset_factory(
     **wpt_update_factory_kwargs)
 
-    user_email = forms.CharField(max_length = 100, label = _("Your E-Mail address"))
-    user_email_confirm = forms.CharField(max_length = 100, label = _("Your E-Mail address - Confirmation"))
-    user_password = forms.CharField(widget = forms.PasswordInput(), label = _("Your Password"))
-    user_password_confirm = forms.CharField(widget = forms.PasswordInput(), label = _("Your Password - Confirmation"))
-
 
 class JourneyFormSet(forms.ModelForm):
     class Meta:

apps/web/models.py

@@ -5,12 +5,11 @@
 from django.db import models
 from django.conf import settings
 from django.db.models import signals
-<<<<<<< HEAD
-=======
+
 
 from django.contrib.auth.hashers import check_password
 #from django.contrib.gis.db import models as gis_models
->>>>>>> Commit pred rebasem
+
 from django.contrib.auth.models import User
 
 

apps/web/views/__init__.py

@@ -0,0 +1,4 @@
+from django.shortcuts import render
+
+def index(request):
+    return render(request, 'web/index.html')

apps/web/views/car.py

@@ -19,35 +19,6 @@ class Car(DetailView):
     has_highway_sign = False
     smoking_allowed = False
 
-    register_sign = None
-    reg_notice = ("NOTE", "If you really don't want to, you DO NOT have\
-                     to enter your national car sign. Hovever, if\
-                    you fill it, you will make it easier for\
-                     passengers to find you.")
-
-    form = forms.CarManageForm()
-    model = models.Vehicle
-
-    def get(self, request):
-        return render(request, 'web/cars.html', {"form": self.form,
-                                                 "header": self.header,
-                                                 "reg_notice": self.reg_notice,
-                                                 "cars": self.model})
-
-"""class Car(DetailView):
-    header = "Car Management page"
-
-    model = None
-    owner = None
-    name = None
-    color = None
-
-    air_conditioning = False
-    animals_allowed = False
-    has_wifi = False
-    has_highway_sign = False
-    smoking_allowed = False
-
     register_sign = None
     reg_notice = ("NOTE", "If you really don't want to, you DO NOT have\
                      to enter your national car sign. Hovever, if\
@@ -60,7 +31,6 @@ def get(self, request):
 
     def get(self, request):
         self.model = models.Vehicle.objects.filter(owner=request.user)
-        print (self.model)
         return render(request, 'web/cars.html', {"form": self.form,
                                                  "car_list": self.model,
                                                  "message": self.message,
@@ -109,4 +79,3 @@ def _check_required(self):
             return HttpResponseRedirect(".")
         else:
             return HttpResponse("FAILED TO SAVE, MISSING DATA!")
-"""

apps/web/views/journey.py

@@ -28,230 +28,15 @@
 from django.http import HttpResponse, HttpResponseRedirect
 
 ## Import forms
-from . import forms
-
-
-def index(request):
-    return render(request, 'web/index.html')
-
-def logout_user(request):
-    logout(request)
-    return HttpResponseRedirect('../../') ## TODO: OPRAVIT, vyvaruj se absolutnim adresam
-
-
-class LoginScreen(View):
-    header = "Login"
-
-    user_name = None
-    user_pass = None
-    login_form = forms.LoginForm()
-    redirect_bool = False
-    info_text = None
-
-    user = None
-
-    def get(self, request):
-        return render(request, 'web/login_screen.html', {"form": self.login_form,
-                                                         "header": self.header})
-
-    def post(self, request):
-        self.user_name = request.POST['user_name']
-        self.user_pass = request.POST['user_pass']
-        self._check_credentials()
-
-        if self.user:
-            login(request, self.user)
-            return HttpResponseRedirect('../../')
-        else:
-            return HttpResponse("INVALID CREDENTIALS!")
-
-    def _check_credentials(self):
-        if self.user_name and self.user_pass:
-            self.user = authenticate(email=self.user_name,
-                                     password=self.user_pass)
-        else:
-            return HttpResponse("MISSING CREDENTIALS!")
-
-
-class RegisterScreen(View):
-    header = "User Registration"
-
-    user_mail = None
-    user_mail_confirm = None
-    user_pass = None
-    user_pass_confirm = None
-    register_form = forms.RegisterForm()
-
-    correct_day = None
-    asked_day = None
-
-    question_ok = False
-    user_exists = False
-
-    correct_details = {}
-
-    request = None
-
-    def get(self, request):
-        return render(request, 'web/register.html', {"form": self.register_form,
-                                                     "header": self.header})
-
-    def post(self, request):
-        self.correct_day = self.register_form.correct_day
-        self.request = request
-
-        self._post_get_details()
-        self._check_security_question()
-        self._check_details()
-        self._check_existing_user()
-
-        if self.user_exists:
-            return HttpResponse("ERROR: USER ALREADY EXISTS!")
-        else:
-            new_user = create_user(email = self.user_mail, password = self.user_pass)
-            new_user.save()
-            return HttpResponse("SUCCESS: USER CREATED")
-
-        #return render(request, 'web/register.html', {"form": self.register_form})
-
-
-    def _post_get_details(self):
-        self.user_mail = self.request.POST['user_email']
-        self.user_mail_confirm = self.request.POST['user_email_confirm']
-        self.user_pass = self.request.POST['user_password']
-        self.user_pass_confirm = self.request.POST['user_password_confirm']
-
-        self.asked_day = self.request.POST['random_antibot']
-
-
-    def _check_security_question(self):
-        self.correct_day = self.register_form.correct_day
-        if self.correct_day == self.asked_day:
-            self.question_ok = True
-        else:
-            return HttpResponse("ERROR: INVALID CONTROL ANSWER!")
-
-
-    def _check_details(self):
-        self.correct_details.update({"correct_name": self.user_mail == self.user_mail_confirm})
-        self.correct_details.update({"correct_pass": self.user_pass == self.user_pass_confirm})
-
-        if False in self.correct_details:
-            return HttpResponse("ERROR: Some data you entered does not match")
-
-
-    def _check_existing_user(self):
-        test_auth = authenticate(username = self.user_mail,
-                                 password = self.user_pass,
-                                 email = self.user_mail)
-        if test_auth:
-            self.user_exists = True
-        else:
-            self.user_exists = False
-
-
-
-class Car(View):
-    header = "Car Management page"
-
-    model = None
-    owner = None
-    name = None
-    color = None
-
-    air_conditioning = False
-    animals_allowed = False
-    has_wifi = False
-    has_highway_sign = False
-    smoking_allowed = False
-
-    register_sign = None
-    reg_notice = ("NOTE", "If you really don't want to, you DO NOT have\
-                     to enter your national car sign. Hovever, if\
-                    you fill it, you will make it easier for\
-                     passengers to find you.")
-
-    form = forms.CarManageForm()
-    inp_method = None
-    message = None
-
-    def get(self, request):
-        self.model = models.Vehicle.objects.filter(owner=request.user)
-        return render(request, 'web/cars.html', {"form": self.form,
-                                                 "car_list": self.model,
-                                                 "message": self.message,
-                                                 "reg_notice": self.reg_notice,
-                                                 "header": self.header})
-
-    def post(self, request):
-        self.inp_method = request.POST.get('method')
-        if self.inp_method == 'add_vehicle':
-            return self._add_car(request)
-        elif self.inp_method == 'remove_vehicle':
-            return self._delete_car(request)
-        else:
-            return HttpResponse("UNKOWN ERROR WITH DATABASE.")
-
-    def _delete_car(self, in_request):
-        self.owner = in_request.user
-        remove_id = in_request.POST.get('car_id')
-        models.Vehicle.objects.filter(owner = self.owner, id = remove_id).delete()
-        return HttpResponseRedirect(".")
-
-    def _add_car(self, in_request):
-        self.owner = in_request.user
-        self.name = in_request.POST.get('car_name')
-        self.color = in_request.POST.get('color')
-
-        self.air_conditioning = in_request.POST.get('air_conditioning', False)
-        self.animals_allowed = in_request.POST.get('animals_allowed', False)
-        self.has_wifi = in_request.POST.get('has_wifi', False)
-        self.has_highway_sign = in_request.POST.get('has_highway_sign', False)
-        self.smoking_allowed = in_request.POST.get('smoking_allowed', False)
-
-        self.register_sign = in_request.POST.get('register_sign')
-        return self._check_required()
-
-    def _check_required(self):
-        if self.name and self.color:
-            new_car = models.Vehicle(owner=self.owner, name=self.name,
-                                     color=self.color, register=self.register_sign,
-                                     air_conditioning=self.air_conditioning,
-                                     animals_allowed=self.animals_allowed,
-                                     wifi_on_board=self.has_wifi,
-                                     smoking_allowed=self.smoking_allowed,
-                                     highway_mark=self.has_highway_sign)
-            new_car.save()
-            return HttpResponseRedirect(".")
-        else:
-            return HttpResponse("FAILED TO SAVE, MISSING DATA!")
-
-
-class User(View):
-    header = "User control panel and information page"
-    form = forms.ManageForm
+from .. import forms
 
-    def get(self, request):
-        return render(request, 'web/user.html', {"form": self.form,
-                                                 "header": self.header})
-    def post(self, request):
-        pass
 
 class WaypointNotFound(Exception):
     pass
 
 
 class JourneyList(ListView, FormView):
 
-from django.views.generic import ListView, DetailView
-from pprint import pprint
-
-# Import forms
-from .. import forms
-# Import models
-from .. import models
-
-
     model = models.Journey
     form_class = forms.SearchJourney
     success_url = '/'   # TODO: replace by generic URL of this page

apps/web/views/user.py

@@ -14,15 +14,15 @@ def logout_user(request):
     return HttpResponseRedirect('../../') ## TODO: OPRAVIT, vyvaruj se absolutnim adresam
 
 
-class UserSettings(DetailView):
-    header = "User control panel"
+class User(DetailView):
+    header = "User control panel and information page"
     form = forms.ManageForm
 
     def get(self, request):
-        return render(request, 'web/settings.html', {"form": self.form,
+        return render(request, 'web/user.html', {"form": self.form,
                                                  "header": self.header})
     def post(self, request):
-        password
+        pass
 
 
 class LoginScreen(DetailView):
@@ -44,8 +44,8 @@ def get(self, request):
                                                          "header": self.header})
 
     def post(self, request):
-        self.name = request.POST['name']
-        self.password = request.POST['password']
+        self.name = request.POST['user_name']
+        self.password = request.POST['user_pass']
         self._check_credentials()
         print (self.name, self.password)
 

jizdoteka/urls.py

@@ -15,37 +15,26 @@
 """
 from django.conf.urls import url, include
 from django.contrib import admin
-from apps.web.views import journey
+from apps.web.views import journey, index, user, car
 
 urlpatterns = [
+    ## Zaklady
     url(r'^admin/', admin.site.urls),
-    url(r'^$', journey.JourneyList.as_view(), name='home'),
-    url(r'^new/$', journey.JourneyCreate.as_view(), name='journey_new'),
-    url(r'^update/(?P<pk>[0-9]+)$', journey.JourneyUpdate.as_view(), name='journey_update'),
-    url(r'^(?P<pk>[0-9]+)$',
-        journey.JourneyDetail.as_view(),
-        name='journey_detail'
-    ),
+    url(r'^$', index, name='index'),
 
+    ## Nutne pro prihlasen
+    url(r'^login_screen/$', user.LoginScreen.as_view(), name="login_screen"),
+    url(r'^logout_user/$', user.logout_user, name="logout_user"),
+    url(r'^register/$', user.RegisterScreen.as_view(), name="register"),
+
+    ## Jizdy
     url(r'^journey/$', journey.JourneyList.as_view(), name='journey'),
     url(r'^journey/new/$', journey.JourneyCreate.as_view(), name='journey_new'),
     url(r'^journey/update/(?P<pk>[0-9]+)$', journey.JourneyUpdate.as_view(), name='journey_update'),
-    url(r'^jounrey/(?P<pk>[0-9]+)$',
-
     url(r'^journey/(?P<pk>[0-9]+)$', journey.JourneyDetail.as_view(), name='journey_detail'),
-    url(r'^$', views.index, name='index'),
-
-    ## Nutne pro prihlasen
-    url(r'^login_screen/$', views.LoginScreen.as_view(), name="login_screen"),
-    url(r'^logout_user/$', views.logout_user, name="logout_user"),
-    url(r'^register/$', views.RegisterScreen.as_view(), name="register"),
-    url(r'^user/$', views.User.as_view(), name="user"),
-
-    url(r'^cars/$', views.Car.as_view(), name="cars"),
-
-    #url(r'^user_mgmt/$', views.user_mgmt, name = "user_mgmt"),
-    url(r'^accounts/', include('allauth.urls')),
 
+    ## Managing
+    url(r'^user/$', user.User.as_view(), name="user"),
+    url(r'^cars/$', car.Car.as_view(), name="cars"),
 
-    #url(r'^(?P<pk>[0-9]+)$', views.JourneyDetail.as_view(), name='journey_detail'),
 ]