Merge pull request #9 from Brwnds/duda

Criação de novas páginas, Rotas, Estilização e Correção da página home
Brwnds · Sep 4, 2024 · 5ce9231 · 5ce9231
2 parents c961f80 + b6ef764
commit 5ce9231
Show file tree

Hide file tree

Showing 14 changed files with 102 additions and 30 deletions.
diff --git a/app/app/urls.py b/app/app/urls.py
@@ -20,6 +20,10 @@
 
 urlpatterns = [
     path('admin/', admin.site.urls),
-    path('', views.home, name='home'),
-    path('loja/login', views.login, name='login'),
+    path('home/', views.home, name='home'),
+    path('', views.login, name='login'),
+    path('cadastro/', views.cadastro, name='cadastro'),
+    path('catalogo/', views.catalogo, name='catalogo'),
+    path('basket/', views.basket, name='basket'),
+    path('adm/', views.admin, name='adm'),
 ]
diff --git a/app/loja/templates/admin.html b/app/loja/templates/admin.html
@@ -0,0 +1,15 @@
+{% extends 'base.html' %}
+
+{% load static %}
+
+{% block extra_css %}
+    <link rel="stylesheet" href="{% static 'css/admin.css' %}">
+{% endblock %}
+
+{% block content %}
+    <div> admin </div>
+{% endblock %}
+
+{% block extra_js %}
+
+{% endblock %}
diff --git a/app/loja/templates/base.html b/app/loja/templates/base.html
@@ -7,6 +7,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Projetinho duda</title>
     <link rel="stylesheet" href="{% static 'css/base.css' %}">
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap-icons/font/bootstrap-icons.css" rel="stylesheet">
+    <script src="https://cdn.lordicon.com/bhenfmcm.js"></script>
     {% block extra_css %}{% endblock %}
 </head>
 <body>
@@ -18,10 +20,25 @@
         </div>
         <nav class="header-navigation">
             <a href="{% url 'home' %}">Home</a>
-            <a href="{% url 'login' %}">Login</a>
-            <a href="#">Blog</a>
-            <a href="#">Contact Us</a>
-            <button>Menu</button>
+            <a href="{% url 'catalogo' %}">Catálogo</a>
+            <a href="{% url 'adm' %}" style="text-decoration: none;">
+                <lord-icon
+                    src="https://cdn.lordicon.com/bhfjfgqz.json"
+                    trigger="hover"
+                    colors="primary:#121331"
+                    state="hover"
+                    style="width:40px;height:40px">
+                </lord-icon>
+            </a>
+            <a href="{% url 'basket' %}">
+                <lord-icon
+                    src="https://cdn.lordicon.com/odavpkmb.json"
+                    trigger="hover"
+                    stroke="bold"
+                    colors="primary:#121331,secondary:#000000"
+                    style="width:40px;height:40px">
+                </lord-icon>
+            </a>
         </nav>
     </div>
 </header>

diff --git a/app/loja/templates/basket.html b/app/loja/templates/basket.html
@@ -0,0 +1,15 @@
+{% extends 'base.html' %}
+
+{% load static %}
+
+{% block extra_css %}
+    <link rel="stylesheet" href="{% static 'css/basket.css' %}">
+{% endblock %}
+
+{% block content %}
+    <div> basket </div>
+{% endblock %}
+
+{% block extra_js %}
+
+{% endblock %}
diff --git a/app/loja/templates/cadastro.html b/app/loja/templates/cadastro.html
@@ -0,0 +1 @@
+<div> cadastro </div>
diff --git a/app/loja/templates/catalogo.html b/app/loja/templates/catalogo.html
@@ -0,0 +1,16 @@
+<!-- minha_app/templates/minha_app/catalogo.html -->
+{% extends 'base.html' %}
+
+{% load static %}
+
+{% block extra_css %}
+    <link rel="stylesheet" href="{% static 'css/catalogo.css' %}">
+{% endblock %}
+
+{% block content %}
+    <div> catalogo </div>
+{% endblock %}
+
+{% block extra_js %}
+
+{% endblock %}
diff --git a/app/loja/templates/home.html b/app/loja/templates/home.html
@@ -8,16 +8,14 @@
 
 {% block content %}
 <div class="content">
-    <h1>La Pâtisserie Belle</h1>
+    <h1>La Boleria Belle</h1>
     <p>
-      Welcome to La Pâtisserie Belle, where every bite is a journey into the
-      exquisite world of finely crafted pastries. Our patisserie is
-      dedicated to bringing you the most delicious and beautifully designed
-      pastries that will delight your senses and elevate your taste
-      experience. Nestled in the heart of the city, our patisserie is a
-      haven for those who appreciate the finer things in life.
+      Bem-vindo à La Boleria Belle! Em nossa loja, cada fatia é uma jornada ao mundo requintado dos bolos finamente elaborados. 
+      Nossa missão é oferecer a você uma explosão de sabores irresistíveis que vão encantar
+      seu paladar e transformar suas celebrações em momentos inesquecíveis. 
+      Localizada no coração da cidade, nossa loja de bolos é o refúgio perfeito para quem valoriza a arte de saborear e celebrar a vida com os melhores sabores.
     </p>
-    <button class="btn">Explore More</button>
+    <button class="btn">Saiba Mais</button>
   </div>
 
   <div class="stack">

diff --git a/app/loja/views.py b/app/loja/views.py
@@ -6,3 +6,14 @@ def home(request):
 def login(request):
     return render(request, 'login.html')
 
+def cadastro(request):
+    return render(request, 'cadastro.html')
+
+def catalogo(request):
+    return render(request, 'catalogo.html')
+
+def basket(request):
+    return render(request, 'basket.html')
+
+def admin(request):
+    return render(request, 'admin.html')
diff --git a/app/static/css/admin.css b/app/static/css/admin.css
diff --git a/app/static/css/base.css b/app/static/css/base.css
@@ -1,10 +1,5 @@
-@import url("https://fonts.googleapis.com/css2?family=DM+Sans:wght@400;500;700&display=swap");
+@import url("https://fonts.googleapis.com/css2?family=Dancing+Script:wght@400..700&family=Quicksand:wght@300..700&display=swap");
 
-*,
-*:after,
-*:before {
-	box-sizing: border-box;
-}
 
 :root {
 	--header-outer-height: 110px;
@@ -16,13 +11,21 @@
 }
 
 body {
-	font-family: "DM Sans", sans-serif;
+	font-family: "Quicksand", sans-serif;
 	background-color: #f2f5f7;
 	line-height: 1.5;
 	min-height: 300vh;
 	position: relative;
 }
 
+header {
+    margin: 0;
+    padding: 0;
+	top: 0;
+	left: 0;
+	right: 0;
+}
+
 .responsive-wrapper {
 	width: 90%;
 	max-width: 1280px;
@@ -44,6 +47,7 @@ body {
 	/* Other */
 	background-color: var(--header-bg);
 	box-shadow: 0 2px 10px 0 rgba(0,0,0, 0.1);
+	z-index: 2; /*para que o header fique acima dos cards */
 }
 
 .header-inner {

diff --git a/app/static/css/basket.css b/app/static/css/basket.css
diff --git a/app/static/css/cadastro.css b/app/static/css/cadastro.css
diff --git a/app/static/css/catalogo.css b/app/static/css/catalogo.css
diff --git a/app/static/css/home.css b/app/static/css/home.css
@@ -1,14 +1,5 @@
 @import url("https://fonts.googleapis.com/css2?family=Dancing+Script:[email protected]&family=Quicksand:[email protected]&display=swap");
 
-*,
-*:before,
-*:after {
-  margin: 0;
-  padding: 0;
-  box-sizing: border-box;
-  font-family: "Quicksand", sans-serif;
-}
-
 body {
   background-color: #0d0a0b;
   background: linear-gradient(145deg, #55566a 0%, #131318 76%);