Páginas adicionadas novamente

Wooo589 · Oct 28, 2023 · 13f43f8 · 13f43f8
1 parent 15e22bc
commit 13f43f8
Show file tree

Hide file tree

Showing 15 changed files with 177 additions and 99 deletions.
diff --git a/inicial/static/css_criarconta_2.css b/inicial/static/css_criarconta_2.css
@@ -3,7 +3,7 @@
 }
 
 body{
-    background-image:url('bg_criarconta.jpg');
+    background-image:url("{% static 'img/bg_criarconta.jpg' %}");
     background-size:cover;
 }
 

diff --git a/inicial/urls.py b/inicial/urls.py
@@ -11,4 +11,6 @@
     path("duvidas_frequentes", duvidas_frequentes, name='duvidas_frequentes'),
     path("cadastro", cadastro, name='cadastro'),
     path("login", loginsite, name='login'),
+    path("login/senha", esqueci_senha, name="esqueci_senha"),
+    path("login/confirmacao", confirma_email, name="confirma_email")
 ]
diff --git a/inicial/views.py b/inicial/views.py
@@ -85,13 +85,13 @@ def avaliar_hospital(request, hospital_cnes):
     return render(request, "inicial/avaliarhospital.html", context)
 
 def sobre_nos(request):
-    return render(request, ('inicial/SobreNos.html'))
+    return render(request, 'inicial/SobreNos.html')
 
 def duvidas_frequentes(request):
-    return render(request, ('inicial/duvidas_frequentes.html'))
+    return render(request, 'inicial/duvidas_frequentes.html')
 
 def cadastro(request):
-    return render(request, ('inicial/criar_conta_2.html'))
+    return render(request, 'inicial/criar_conta_2.html')
 
 def loginsite(request):
 
@@ -108,4 +108,10 @@ def loginsite(request):
         else:
             return redirect('login')
 
-    return render(request, ('inicial/FazerLogin.html'))
+    return render(request, 'inicial/FazerLogin.html')
+
+def esqueci_senha(request):
+    return render(request, 'inicial/esqueciSenha.html')
+
+def confirma_email(request):
+    return render(request, 'inicial/ConfirmaEmail.html')
diff --git a/setup/__pycache__/settings.cpython-311.pyc b/setup/__pycache__/settings.cpython-311.pyc
diff --git a/setup/settings.py b/setup/settings.py
@@ -124,7 +124,7 @@
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/4.2/howto/static-files/
 
-STATIC_URL = 'static/'
+STATIC_URL = '/static/'
 
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field

diff --git a/templates/inicial/ConfirmaEmail.html b/templates/inicial/ConfirmaEmail.html
@@ -1,15 +1,17 @@
+{% load static %}
+
 <!DOCTYPE html>
 <html lang="en">
     <head>
         <meta charset="UTF-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <title>modal</title>
-        <link rel="stylesheet" href="ConfirmaEmail.css"> <!--reciclei ocodigo do esqueci minha senha-->
+        <title>MedConnect</title>
+        <link rel="stylesheet" href="{% static 'ConfirmaEmail.css'%}"> <!--reciclei ocodigo do esqueci minha senha-->
     </head>
     <body>
         <div class="modal_box_notification">
             <div class="modal_notification">
-                <a href="esqueciSenha.html"><img class="modal_icon_back" src="MIDIA/IMG/voltar (1).png" alt="icone voltar"></a>
+                <a href="{% url "esqueci_senha" %}"><img class="modal_icon_back" src="{% static 'img/icone-voltar-overlay.png'%}" alt="icone voltar"></a>
 
                 <h1 class="modal_title">Confirmar email</h1>
                 <p class="modal_phrase">

diff --git a/templates/inicial/FazerLogin.html b/templates/inicial/FazerLogin.html
@@ -5,20 +5,20 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Modal</title>
+    <title>MedConnect</title>
     <link rel="stylesheet" href="{% static 'FazerLogin.css'%}">
 </head>
 <body>
     <div class="modal_box_login">
         <div class="modal_login">
-            <a href="{% url "sobre_nos" %}"><img style="width: 20px; position: relative; bottom:20px; left: -15px;" src="MIDIA/IMG/voltar (1).png" alt="icone voltar"></a>
+            <a href="{% url "sobre_nos" %}"><img style="width: 20px; position: relative; bottom:20px; left: -15px;" src="{% static 'img/icone-voltar-overlay.png'%}" alt="icone voltar"></a>
             <h1 class="titule"> Fazer login</h1>
             <a style="text-decoration: none" href="{% url "cadastro" %}"><p class="CriarConta" >Criar conta</p></a>
             <form action="{% url "login" %}" method="POST">
             {% csrf_token %}
                 <input name="email" class="email_login" style="display: block;" type="email" placeholder="EMAIL">
                 <input name="senha" class="password_login" style="display: block;" type="password" placeholder="SENHA">
-                <a style="text-decoration: none;" href="esqueciSenha.html"><p class="link_esqueciSenha">esqueci a senha</p></a>
+                <a style="text-decoration: none;" href="{% url "esqueci_senha" %}"><p class="link_esqueciSenha">esqueci a senha</p></a>
                 <button style="display: block;" type="submit" id="button_login">REALIZAR LOGIN</button>
                 <p style="text-align: center;"> OU </p>
                 <input class="login_google" type="button" value="CONTINUAR COM O GOOGLE">

diff --git a/templates/inicial/avaliarhospital.html b/templates/inicial/avaliarhospital.html
@@ -5,7 +5,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Página - Avaliar hospital</title>
+    <title>MedConnect</title>
     <link rel="shortcut icon" href="../img/favicon_io/favicon.ico" type="image/x-icon">
     <link rel="stylesheet" href="{% static "avaliarhospital.css" %}">
     <link rel="stylesheet" href="https://unicons.iconscout.com/release/v4.0.0/css/line.css">
@@ -38,10 +38,17 @@ <h2 id="titulo">MedConnect</h2>
                 </form>
             </span>
                 <!-- <a href="FazerLogin.html"> -->
-            <button type="button" class="login_box">
-                <span style="font-size: 11px;">JOSEFO ALENCAR</span>
-                <span class="material-symbols-outlined">account_circle</span>
-            </button>
+            {% if user.is_authenticated %}
+                <button type="button" class="login_box">
+                    <span style="font-size: 11px;">{{ user.username }}</span>
+                    <span class="material-symbols-outlined">account_circle</span>
+                </button>
+            {% else %}
+                <button type="button" class="login_box">
+                    <span  style="font-size: 11px;"><a href="{% url "login" %}">Realizar Login</a></span>
+                    <span class="material-symbols-outlined">account_circle</span>
+                </button>
+            {% endif %}
                 <!--</a>-->
 
             <div class="content_account">
@@ -187,7 +194,7 @@ <h3><strong>{{ hospital.nome }}</strong></h3>
     </form>
     </div>
     </main>
-        <script type="text/javascript" src="{% static "js/script-login-box.js" %}"></script> 
+        <script type="text/javascript" src="{% static "js/script-select-menu-e-login-box.js" %}"></script> 
     <footer>
         <p>MedConnect, c2023.</p>
         <p>Site criado por feudo 9 - "Verde Pântano".</p>

diff --git a/templates/inicial/base.html b/templates/inicial/base.html
diff --git a/templates/inicial/buscar.html b/templates/inicial/buscar.html
@@ -5,11 +5,11 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Página - Locais de atendimento</title>
+    <title>MedConnect</title>
     <link rel="shortcut icon" href="../img/favicon_io/favicon.ico" type="image/x-icon">
     <link rel="stylesheet" href="{% static "locaisdeatendimento.css"%}">
     <link rel="stylesheet" href="https://unicons.iconscout.com/release/v4.0.0/css/line.css">
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,[email protected],100..700,0..1,-50..200" />
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,[email protected],100..700,0..1,-50..200"/>
     <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/select2.min.css" rel="stylesheet" />
     <style>
         .material-symbols-outlined {
@@ -22,9 +22,37 @@
             font-size: 36px;
             color: gray;
             font-family: 'Material Symbols Outlined';
-        }      
+        }
     </style>
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js"></script>
+    <script>
+        $(document).ready(function(){
+            $("#btnPesquisar").click(function(){
+                $("#top-bar1").show("fast");
+                $("#fechar_aba").show("fast");
+            });
+            $("#locais_de_atendimento").click(function(){
+                $("#top-bar2").toggle("fast");
+                $("#top-bar1").hide();
+                $("#top-bar3").hide();
+            });
+            $("#outras_duvidas").click(function(){
+                $("#top-bar3").toggle("fast");
+                $("#top-bar1").hide();
+                $("#top-bar2").hide();
+            });
+            $("#fechar_aba").click(function(){
+                $("#top-bar1").hide();
+                $("#top-bar2").hide();
+                $("#top-bar3").hide();
+            });
+            $(".voltar").click(function(){
+                $("#top-bar1").show();
+                $("#top-bar2").hide();
+                $("#top-bar3").hide();
+            }); 
+        });
+    </script>
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/select2.min.js"></script>
     <script src="{% static "js/select.js"%}"></script>
 </head>
@@ -35,17 +63,37 @@
             <img id="icone" src="{% static "img/estetoscopio32px.png" %}" alt="MedConnect logo." />
             <span id="titulo">MedConnect</span>
         </div>
-        <span id="spanPesquisar">
-            <form action="{% url 'buscar' %}">
-                <img src="{% static "img/botao-lupa-pesquisa20px.png"%}" alt="ìcone de pesquisa (lupa)."/>
-                {{ buscar }}
-            </form>
-        </span>
+        <nav>         
+            <a href="{% url "index" %}" rel="prev" target="_self">INÍCIO</a>
+            <span class="divisor">|</span>
+            <a href="{% url "locais_de_atendimento" %}" target="_self">LOCAIS DE ATENDIMENTO</a>
+            <span class="divisor">|</span>
+            <a href="area_do_paciente.html" target="_self">PRÉ-TRIAGEM</a>
+            <!--<a href="area_do_colaborador.html" target="_self">ÁREA DO COLABORADOR</a>-->
+            <span class="divisor">|</span>
+            <a href="{% url "duvidas_frequentes" %}" target="_self">DÚVIDAS FREQUENTES</a>
+            <!-- 'target="_self"': continua na mesma aba. --> 
+        </nav>
+        <!-- <span id="spanPesquisar">
+            <img src="../img/botao-lupa-pesquisa20px.png" alt="ìcone de pesquisa (lupa)."/>
+            <input type="text" id="txtPesquisar" placeholder="PESQUISAR..."/>
+        </span> -->
             <!-- <a href="FazerLogin.html"> -->
-        <button type="button" class="login_box">
-            <span style="font-size: 11px;">JOSEFO ALENCAR</span>
-            <span class="material-symbols-outlined">account_circle</span>
+        <button id="btnPesquisar">
+            <p style="font-size: 15px; font-weight: 500; margin-right: 7px;">PESQUISAR</p>
+            <span class="material-symbols-outlined" style="color: black; font-size: 25px;">search</span>
         </button>
+        {% if user.is_authenticated %}
+            <button type="button" class="login_box">
+                <span style="font-size: 11px;">{{ user.username }}</span>
+                <span class="material-symbols-outlined">account_circle</span>
+            </button>
+        {% else %}
+            <button type="button" class="login_box">
+                <span  style="font-size: 11px;"><a href="{% url "login" %}">Realizar Login</a></span>
+                <span class="material-symbols-outlined">account_circle</span>
+            </button>
+        {% endif %}
             <!--</a>-->
 
         <div class="content_account">
@@ -54,38 +102,64 @@
             <button style="border-radius: 0px 0px 20px 20px;"><p style="font-size: 11px; padding: 9px 0;">SAIR DO PERFIL</p></button>
         </div>
 
-        <nav>         
-            <a href="{% url "index" %}" rel="prev" target="_self">INÍCIO</a>
+        <!-- <nav>         
+            <a href="index.html" rel="prev" target="_self">INÍCIO</a>
             <span class="divisor">|</span>
-            <a href="{% url "locais_de_atendimento" %}" target="_self">LOCAIS DE ATENDIMENTO</a>
+            <a href="locais_de_atendimento.html" target="_self">LOCAIS DE ATENDIMENTO</a>
             <span class="divisor">|</span>
             <a href="area_do_paciente.html" target="_self">PRÉ-TRIAGEM</a>
-            <!--<a href="area_do_colaborador.html" target="_self">ÁREA DO COLABORADOR</a>-->
+            <!-<a href="area_do_colaborador.html" target="_self">ÁREA DO COLABORADOR</a>--
             <span class="divisor">|</span>
-            <a href="{% url "duvidas_frequentes" %}" target="_self">DÚVIDAS FREQUENTES</a>
-            <!-- 'target="_self"': continua na mesma aba. --> 
-        </nav>
+            <a href="duvidas_frequentes.html" target="_self">DÚVIDAS FREQUENTES</a>
+            <!- 'target="_self"': continua na mesma aba. -- 
+        </nav> -->
     </header>
 
     <main>
-        <section id="seletores">
-            <form action="{% url 'buscar' %}">
-                <div class="wrapper">
-                    {{ filter.uf }}
-                </div>
-                <div class="wrapper">
-                    {{ filter.municipio }}
-                </div>
-                <div class="wrapper">
-                    {{ filter.especialidade }}
-                </div>
-                <div class="wrapper">
-                    {{ filter.categoria }}
-                </div>
-
-                <button type="submit" id="btnProcurar"><img src="{% static 'img/botao-lupa-pesquisa35px.png'%}" alt="Botão de pesquisa."></button>
-            </form>
-        </section>
+        <!-- <section id="pesquisa"> -->
+            <div id="top-bar1" style="display: none;">
+                <span>Selecione o tipo de pesquisa:</span>
+                <button id="locais_de_atendimento">Locais de atendimento</button>
+                <button id="outras_duvidas">Outras dúvidas</button>
+                <button id="fechar_aba" style="display: none;"><span class="material-symbols-outlined" style="font-size: 25px; height: 20px;">
+                    close
+                    </span></button>
+                <!-- <input type="radio" name="..." id="procurar_locais">
+                <label for="procurar_locais" title="text" style="font-weight: 400;">Locais de atendimento</label>
+                <input type="radio" name="..." id="outras_duvidas">
+                <label for="outras_duvidas" title="text" style="font-weight: 400;">Outras dúvidas</label> -->
+            </div>
+            <div id="top-bar2" style="display: none;">
+                <button class="voltar"><i class="uil uil-angle-left" style="font-size: 30px; color: gray;"></i></button>
+                <form action="{% url 'buscar' %}">
+                <span class="spanPesquisar">
+                    <span class="material-symbols-outlined" style="color: black; font-size: 25px">search</span>
+                    <input name="buscar" type="text" id="txt_outras_duvidas" placeholder="PESQUISAR..."/>
+                </span>
+                    <div class="wrapper">
+                        {{ filter.uf }}
+                    </div>
+                    <div class="wrapper">
+                        {{ filter.municipio }}
+                    </div>
+                    <div class="wrapper">
+                        {{ filter.especialidade }}
+                    </div>
+                    <div class="wrapper">
+                        {{ filter.categoria }}
+                    </div>
+
+                    <button type="submit" id="btnProcurar"><span class="material-symbols-outlined" style="color: black; font-size: 30px">search</span></button>
+                </form>
+            </div>
+            <div id="top-bar3" style="display: none;">
+                <button class="voltar"><i class="uil uil-angle-left" style="font-size: 30px; color: gray; margin-left: 25px;"></i></button>
+                <span class="spanPesquisar">
+                    <span class="material-symbols-outlined" style="color: black; font-size: 25px">search</span>
+                    <input type="text" id="txt_pesquisar_locais" placeholder="PESQUISAR..."/>
+                </span>
+            </div>
+        <!-- </section> -->
         <section id="resultados-da-pesquisa">
             <h1><strong>RESULTADOS DA PESQUISA:</strong></h1>
             <hr/>
@@ -122,9 +196,9 @@ <h3><strong>{{ hospital.nome }}</strong></h3>
             </ul>
         </section> 
     </main>
-        <script type="text/javascript" src="{% static "js/script-select-menu-e-login-box.js"%}"></script>
+        <script src="{% static 'js/script-select-menu-e-login-box.js'%}"></script> 
     <footer>
-        <p>MedConnect, c2023.</p>
+        <p>©MedConnect 2023</p>
         <p>Site criado por feudo 9 - "Verde Pântano".</p>
     </footer>
 </body>

diff --git a/templates/inicial/criar_conta_2.html b/templates/inicial/criar_conta_2.html
@@ -5,7 +5,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Criar Conta | MedConnect</title>
+    <title>MedConnect</title>
     <link rel="stylesheet" href="{% static 'css_criarconta_2.css' %}">
 </head>
 <body>

diff --git a/templates/inicial/duvidas_frequentes.html b/templates/inicial/duvidas_frequentes.html
@@ -5,7 +5,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Document</title>
+    <title>MedConnect</title>
     <link rel="stylesheet" href="{% static 'css002.css' %}">
 </head>
 <body>
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ @@
     }
     body{
-        background-image:url('bg_criarconta.jpg');
+        background-image:url("{% static 'img/bg_criarconta.jpg' %}");
         background-size:cover;
     }
@@ Expand Down @@