Merge pull request #41 from fga-gpp-mds/devel

TS04-PatientPages

medical_prescription/dashboardHealthProfessional/templates/healthprofessional.html

@@ -0,0 +1,4 @@
+{% extends "dashboardHealthProfessional/template.html" %} {% block content %} {% load staticfiles %} {% load static %}
+
+<p>Em breve!</p>
+{%endblock %}

medical_prescription/dashboard/urls.py → medical_prescription/dashboardHealthProfessional/urls.py

@@ -1,6 +1,6 @@
 # Django
 from django.conf.urls import url
-from dashboard.views import (home)
+from dashboardHealthProfessional.views import (home)
 
 
 urlpatterns = (

medical_prescription/dashboardPatient/admin.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

medical_prescription/dashboardPatient/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class PatientDashboardConfig(AppConfig):
+    name = 'patient_dashboard'

medical_prescription/dashboardPatient/models.py

@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.

medical_prescription/dashboardPatient/templates/patient_dashboard.html

@@ -0,0 +1,4 @@
+{% extends "dashboardPatient/template.html" %} {% block content %} {% load staticfiles %} {% load static %}
+
+<p>Em breve!</p>
+{%endblock %}

medical_prescription/dashboardPatient/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

medical_prescription/dashboardPatient/urls.py

@@ -0,0 +1,9 @@
+# Django
+from django.conf.urls import url
+from dashboardPatient.views import (home)
+
+
+urlpatterns = (
+    url(r'^patient/$', home, name='dashboard_hp'),
+
+)

medical_prescription/dashboardPatient/views.py

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.contrib.auth.decorators import login_required
+from django.shortcuts import render
+
+
+@login_required()
+def home(request):
+    return render(request, 'patient_dashboard.html')

medical_prescription/landing/templates/landing.html

@@ -5,7 +5,7 @@
             <!--========== SWIPER SLIDER ==========-->
             <div class="s-swiper js__swiper-slider">
                 <!-- Swiper Wrapper -->
-                <div class="swiper-wrapper">  
+                <div class="swiper-wrapper">
                     <div class="s-promo-block-v4 g-fullheight--xs g-bg-position--center swiper-slide" style="background-image: url({% static 'landing/img/1920x1080/14.jpg' %})" >
                         <div class="container g-ver-center--xs">
                             <div class="row">
@@ -15,7 +15,7 @@ <h1 class="g-font-size-32--xs g-font-size-45--sm g-font-size-60--md g-color--whi
                                         <div class="row">
                                             <div class="col-md-6">
                                                 <p class="g-font-size-18--xs g-font-size-22--sm g-color--white-opacity">Já possui uma conta?</p>
-                                                <a href="{% url 'login' %}" class="text-uppercase s-btn s-btn--md s-btn--white-brd g-radius--50 g-padding-x-50--xs">Logue-se Agora</a>
+                                                <a href="{% url 'login_healthprofessional' %}" class="text-uppercase s-btn s-btn--md s-btn--white-brd g-radius--50 g-padding-x-50--xs">Logue-se Agora</a>
                                             </div>
                                             <div class="col-md-6">
                                                 <p class="g-font-size-18--xs g-font-size-22--sm g-color--white-opacity">Não possui?</p>
@@ -25,7 +25,7 @@ <h1 class="g-font-size-32--xs g-font-size-45--sm g-font-size-60--md g-color--whi
                                     </div>
                                 </div>
                             </div>
-                        </div>  
+                        </div>
                     </div>
                     <div class="s-promo-block-v4 g-fullheight--xs g-bg-position--center swiper-slide" style="background: url({% static 'landing/img/1920x1080/13.jpg' %})" >
                         <div class="container g-text-right--xs g-ver-center--xs">
@@ -37,12 +37,12 @@ <h1 class="g-font-size-32--xs g-font-size-45--sm g-font-size-60--md g-color--whi
                                             <div class="col-md-6">
                                                 <p class="g-font-size-18--xs g-font-size-22--sm g-color--w
                                                 hite-opacity">Já possui uma conta?</p>
-                                                <a href="{% url 'login' %}" class="text-uppercase s-btn s-btn--md s-btn--white-brd g-radius--50 g-padding-x-50--xs">Logue-se Agora</a>
+                                                <a href="{% url 'login_healthprofessional' %}" class="text-uppercase s-btn s-btn--md s-btn--white-brd g-radius--50 g-padding-x-50--xs">Logue-se Agora</a>
                                             </div>
                                             <div class="col-md-6">
                                                 <p class="g-font-size-18--xs g-font-size-22--sm g-color--white-opacity">Não possui?</p>
                                                 <p class="g-font-size-14--xs g-font-size-18--sm g-color--white-opacity">Converse com seu médico agora para receber seu convite de acesso!</p>
-                                                
+
                                             </div>
                                         </div>
                                     </div>
@@ -150,7 +150,7 @@ <h3 class="g-font-size-18--xs">Parallax Support</h3>
                     <!-- // end row  -->
                 <!-- </div> -->
                 <!-- End Features -->
-    
+
 
             <!-- Mockup -->
             <!-- <div id="js__scroll-to-section" class="container g-padding-y-80--xs g-padding-y-125--xsm">
@@ -186,8 +186,8 @@ <h2 class="g-font-size-32--xs g-font-size-36--sm g-margin-b-25--xs">É um pacien
             </div> -->
             <!-- End Mockup -->
 
-            
-    
+
+
 </div>
 
-{% endblock %}
+{% endblock %}

medical_prescription/landing/views.py

@@ -5,5 +5,4 @@
 
 
 def home(request):
-
-    return render(request, 'landing.html')
+    return render(request, 'landing.html')

medical_prescription/medical_prescription/settings.py

@@ -40,7 +40,8 @@
     'django.contrib.staticfiles',
     'user',
     'landing',
-    'dashboard',
+    'dashboardPatient',
+    'dashboardHealthProfessional',
 ]
 
 # ====== DONT REMOVE -ME
@@ -77,7 +78,14 @@
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [os.path.join(BASE_DIR, 'templates'), 'medical_prescription/templates', 'landing/templates', 'user/templates', 'dashboard/templates'],
+        'DIRS': [
+            os.path.join(BASE_DIR, 'templates'),
+            'medical_prescription/templates',
+            'landing/templates',
+            'user/templates',
+            'dashboardPatient/templates',
+            'dashboardHealthProfessional/templates',
+        ],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors':
@@ -109,7 +117,7 @@
     }
 elif 'DYNO' in os.environ:
     default_dburl = 'sqlite:///' + os.path.join(BASE_DIR, 'db.sqlite3')
-    DATABASES = { 'default': config('DATABASE_URL', default=default_dburl, cast=dburl), }
+    DATABASES = {'default': config('DATABASE_URL', default=default_dburl, cast=dburl), }
 else:
     DATABASES = {
         'default': {

medical_prescription/medical_prescription/urls.py

@@ -5,7 +5,8 @@
 
 urlpatterns = [
     url(r'^user/', include('user.urls')),
-    url(r'^dashboard/', include('dashboard.urls')),
+    url(r'^dashboard_health_professional/', include('dashboardHealthProfessional.urls')),
+    url(r'^dashboard_patient/', include('dashboardPatient.urls')),
     url(r'^admin/', admin.site.urls),
     url(r'^$', home, name='landing_page'),
 ]

medical_prescription/static/dashboard_patient/css/demo.css

@@ -0,0 +1,65 @@
+@media (min-width: 992px) {
+    .typo-line {
+        padding-left: 140px;
+        margin-bottom: 40px;
+        position: relative;
+    }
+    .typo-line .category {
+        transform: translateY(-50%);
+        top: 50%;
+        left: 0px;
+        position: absolute;
+    }
+    .sidebar .nav>li.active-pro {
+        position: absolute;
+        width: 100%;
+        bottom: 10px;
+    }
+}
+
+#map {
+    position: relative;
+    width: 100%;
+    height: calc(100% - 60px);
+    margin-top: 70px;
+}
+
+.places-buttons .btn {
+    margin-bottom: 30px
+}
+
+.space-70 {
+    height: 70px;
+    display: block;
+}
+
+.tim-row {
+    margin-bottom: 20px;
+}
+
+.tim-typo {
+    padding-left: 25%;
+    margin-bottom: 40px;
+    position: relative;
+}
+
+.tim-typo .tim-note {
+    bottom: 10px;
+    color: #c0c1c2;
+    display: block;
+    font-weight: 400;
+    font-size: 13px;
+    line-height: 13px;
+    left: 0;
+    margin-left: 20px;
+    position: absolute;
+    width: 260px;
+}
+
+.tim-row {
+    padding-top: 50px;
+}
+
+.tim-row h3 {
+    margin-top: 0;
+}