Skip to content

Commit

Permalink
Closes #30, Merge pull request #36 from acremonezi/12-uiux-design
Browse files Browse the repository at this point in the history
Closes #30
  • Loading branch information
ioFormigoni committed Jun 2, 2022
2 parents 88418d5 + c1c3e1a commit 85dec3b
Show file tree
Hide file tree
Showing 31 changed files with 965 additions and 64 deletions.
82 changes: 28 additions & 54 deletions django_project/accounts/templates/account/base.html
Original file line number Diff line number Diff line change
@@ -1,70 +1,44 @@

{% load static %}
<!DOCTYPE html>
<html>
<head>

<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0-beta1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-0evHe/X+R7YkIZDRvuzKMRqM+OrBnVFBL6DOitfPri4tjfHxaWutUpFmBp4vmVor" crossorigin="anonymous">
<link rel="stylesheet" href="{% static '\css\base.css' %}">

</head>


<title>{% block head_title %}{% endblock %}</title>
{% block extra_head %}
{% endblock %}
</head>

<body>
{% block body %}
<div class="container-fluid bg-warning" >
<nav class="navbar navbar-expand-lg bg-warning">
<div class="container-fluid">
<a class="navbar-brand" href="#">bee.espertamente.com.br</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav me-auto mb-2 mb-lg-0">
<li class="nav-item">
<a class="nav-link active" aria-current="page" href="{% url 'project_index' %}">Home</a>
</li>
{% if request.user.is_authenticated %}
<li class="nav-item">
<h5> Hello {{ request.user }}</h5>
</li>
<li>
<a class="nav-link" href="{% url 'account_logout' %}">Sair</a>
</li>
{% else %}
<li class="nav-item">
<a class="nav-link" href="{% url 'account_signup' %}">Cadastre-se</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{% url 'account_login' %}">Login</a>
</li>
{% endif %}
<header>
<div>
<img src="{% static '/imgs/Hive logo.svg' %}" class=logo-img alt="">
<a href="#" class="logo"><span>bee</span></a>
</div>
<nav class="navbar">
<ul class="primary-nav">
<li><a class="home" aria-current="page" href="{% url 'project_index' %}">Home</a> </li>
</ul>
</nav>

<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
Dropdown
</a>
<ul class="dropdown-menu" aria-labelledby="navbarDropdown">
<li><a class="dropdown-item" href="#">Action</a></li>
<li><a class="dropdown-item" href="#">Another action</a></li>
<li><hr class="dropdown-divider"></li>
<li><a class="dropdown-item" href="#">Something else here</a></li>
</ul>
</li>
<li class="nav-item">
<a class="nav-link disabled">Disabled</a>
</li>
</ul>
<form class="d-flex" role="search">
<input class="form-control me-2" type="search" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success" type="submit">Search</button>
</form>
</div>
</div>
</nav>
{% if messages %}
<ul class="secondary-nav">
{% if request.user.is_authenticated %}
<li><a class="nav-link" href="{% url 'account_logout' %}">Sair</a></li>
{% else %}
<li></li><a class="nav-link" id="cadastro" href="{% url 'account_signup' %}">Cadastro</a></li>
<li></li><a class="nav-link" href="{% url 'account_login' %}">Login</a></li>
{% endif %}
</ul>

</header>

{% if messages %}
<div>
<strong>Messages:</strong>
<ul>
Expand All @@ -81,7 +55,7 @@ <h5> Hello {{ request.user }}</h5>
{% endblock %}
{% block extra_body %}
{% endblock %}
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0-beta1/dist/js/bootstrap.bundle.min.js" integrity="sha384-pprn3073KE6tl6bjs2QrFaJGz5/SUsLqktiwsUTF55Jfv3qYSDhgCecCxMW52nD2" crossorigin="anonymous"></script>

</div>
</body>
</html>
47 changes: 45 additions & 2 deletions django_project/accounts/templates/accounts/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,52 @@
{% block head_title %} Index {% endblock %}

{% block content %}
{% load static %}
<link rel="stylesheet" href="{% static '\css\index.css' %}">
<!--home section starts-->

<h1>Index</h1>
<section class="home" id="home">
<div class="content">
<h3>A plataforma para acompanhamento de metas que você procurava está aqui!</h3>
<p>Com a Bee, você e sua equipe serão capazes de alcançar suas metas de maneira mais eficiente. Faça seu cadastro gratuitamente e comece hoje a transformar seus objetivos em realidade!</p>
<a href="{% url 'account_signup' %}" class="btn">cadastre-se</a>
</div>

<h3>Hello {{ request.user }}</h3>
<div>
<img src="{% static '/imgs/hands.svg' %}" alt="">
</div>
</section>

<!--home section ends-->
<!--features section starts-->
<section class="features" id="features">
<h1 class="heading">Conheça como funciona a nossa solução:</h1>
<div class="box-container">
<div class="box">
<p>Com a Bee você é capaz de criar diversos projetos para sua empresa. Cada um deles precisa ter um objetivo bem definido.</p>
</div>
<div class="box">
<p>Em cada projeto, você pode definir quais serão os objetivos e métricas a serem utilizados durante o processo.</p>
</div>
<div class="box">
<p>O software oferece um relatório detalhado da progressão dos objetivos ao longo do tempo.</p>
</div>
</div>
</section>

<!--features section ends-->
<!--contact us section starts-->
<div class="contact">
<h3>Ficou com alguma dúvida?</h3>
<p>Deixe seus dados abaixo que em breve entraremos em contato:</p>
<form action="">
<input type="text" placeholder="Nome">
<input type="email" placeholder="E-mail">
<input type="submit" value="Enviar">
</form>
</div>
<!--contact us section ends-->
</body>
</html>

{% endblock %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
# Generated by Django 4.0.3 on 2022-05-30 02:31

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),
('main', '0001_initial'),
]

operations = [
migrations.CreateModel(
name='Account',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('createdDate', models.DateField(auto_now_add=True)),
('accountName', models.CharField(max_length=100)),
('userOwner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
),
migrations.CreateModel(
name='Metric',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('createdDate', models.DateField(auto_now_add=True)),
('metricName', models.CharField(max_length=200)),
('targetValue', models.FloatField()),
('targetUnit', models.CharField(max_length=3)),
('targetDate', models.DateField()),
],
),
migrations.CreateModel(
name='Objective',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('createdDate', models.DateField(auto_now_add=True)),
('objectiveName', models.CharField(max_length=200)),
('targetValue', models.FloatField()),
('targetUnit', models.CharField(max_length=3)),
('targetDate', models.DateField()),
],
),
migrations.CreateModel(
name='Project',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('createdDate', models.DateField(auto_now_add=True)),
('projectName', models.CharField(max_length=200)),
('account', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='main.account')),
('userOwner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
],
),
migrations.RemoveField(
model_name='objectives',
name='project',
),
migrations.RemoveField(
model_name='projects',
name='account',
),
migrations.RemoveField(
model_name='results',
name='objective',
),
migrations.DeleteModel(
name='Accounts',
),
migrations.DeleteModel(
name='Objectives',
),
migrations.DeleteModel(
name='Projects',
),
migrations.DeleteModel(
name='Results',
),
migrations.AddField(
model_name='objective',
name='project',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='main.project'),
),
migrations.AddField(
model_name='objective',
name='userOwner',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
migrations.AddField(
model_name='metric',
name='objective',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='main.objective'),
),
migrations.AddField(
model_name='metric',
name='userOwner',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
),
]
16 changes: 8 additions & 8 deletions django_project/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
asgiref==3.5.0
certifi==2021.10.8
asgiref==3.5.2
certifi==2022.5.18.1
cffi==1.15.0
charset-normalizer==2.0.12
cryptography==36.0.2
cryptography==37.0.2
defusedxml==0.7.1
Django==4.0.3
Django==4.0.4
django-allauth==0.50.0
django-environ==0.8.1
django-sendgrid-v5==1.2.0
gunicorn==20.1.0
idna==3.3
mysqlclient==2.1.0
oauthlib==3.2.0
pycparser==2.21
PyJWT==2.3.0
PyJWT==2.4.0
python-http-client==3.3.7
python3-openid==3.2.0
requests==2.27.1
requests-oauthlib==1.3.1
sendgrid==6.9.7
sendgrid==3.6.5
sendgrid-django==4.2.0
sqlparse==0.4.2
starkbank-ecdsa==2.0.3
tzdata==2022.1
urllib3==1.26.9
1 change: 1 addition & 0 deletions django_project/static/IMGS/Crown.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions django_project/static/IMGS/Hive logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions django_project/static/IMGS/edit.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions django_project/static/IMGS/hands.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions django_project/static/IMGS/report.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 85dec3b

Please sign in to comment.