Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop into main #9

Open
wants to merge 110 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
f526b07
Django init
GabZamba Sep 30, 2022
b31aebb
🚀 Create first HTML template
GabZamba Sep 30, 2022
87414c5
docs: update README.md [skip ci]
allcontributors[bot] Sep 30, 2022
1321139
docs: create .all-contributorsrc [skip ci]
allcontributors[bot] Sep 30, 2022
feb655f
docs: update README.md [skip ci]
allcontributors[bot] Sep 30, 2022
3cbec0e
docs: create .all-contributorsrc [skip ci]
allcontributors[bot] Sep 30, 2022
c1ccb9a
docs: update README.md [skip ci]
allcontributors[bot] Sep 30, 2022
13d3be3
docs: create .all-contributorsrc [skip ci]
allcontributors[bot] Sep 30, 2022
e3bba1a
Merge branch 'aula1' into all-contributors/add-PedroDeSanti
PedroDeSanti Sep 30, 2022
8014bf2
Merge pull request #2 from PedroDeSanti/all-contributors/add-PedroDeS…
PedroDeSanti Sep 30, 2022
8c3a180
Merge branch 'aula1' into all-contributors/add-GabZamba
PedroDeSanti Sep 30, 2022
3e49cfa
Merge pull request #4 from PedroDeSanti/all-contributors/add-GabZamba
PedroDeSanti Sep 30, 2022
cd58054
Merge branch 'aula1' into all-contributors/add-jvtdegelo
PedroDeSanti Sep 30, 2022
36e0f07
Merge pull request #3 from PedroDeSanti/all-contributors/add-jvtdegelo
PedroDeSanti Sep 30, 2022
d0fe0d4
📝 Added project documentation
GabZamba Sep 30, 2022
3371f9f
📝 refactor: corrected some ReadME sections based on the teacher's fee…
GabZamba Oct 7, 2022
4b77991
📝 refactor: update project LICENCE
GabZamba Oct 7, 2022
507b834
add line
jvtdegelo Oct 7, 2022
03d34e1
add line
jvtdegelo Oct 7, 2022
b063dab
remove space
jvtdegelo Oct 7, 2022
67877de
remove space
jvtdegelo Oct 7, 2022
9056732
Merge pull request #1 from PedroDeSanti/aula1
GabZamba Oct 7, 2022
9be8fb7
✨feat: added Django Models
GabZamba Oct 7, 2022
e99e078
✅ feat: added Django Model tests
GabZamba Oct 7, 2022
a4dbc88
Add tests: Add initial tests
jvtdegelo Oct 8, 2022
f245ff7
Added O/R diagram
jvtdegelo Oct 8, 2022
4027efc
Add line
PedroDeSanti Oct 10, 2022
c34ee8a
Merge pull request #5 from PedroDeSanti/feature/aula6
jvtdegelo Oct 10, 2022
1c9c6ac
✨ Addition of Bootstrap
GabZamba Oct 14, 2022
2adf1bf
✨ Addition of HTML pages
GabZamba Oct 14, 2022
1685020
Adiciona uma versao inicial da pagina de geracao de relatorios
jvtdegelo Oct 17, 2022
f318dca
Merge pull request #6 from PedroDeSanti/feature/aula6
GabZamba Oct 17, 2022
7cb86d7
🎨 Refactor of the HTML files
GabZamba Oct 17, 2022
6e6633e
Added Relatorio page
jvtdegelo Oct 17, 2022
126bdec
🎨 Updated HomePage and ReadMe
GabZamba Oct 17, 2022
1b69265
🎨 Updated HTML related to CRUD
GabZamba Oct 17, 2022
28c1efe
🎨 Updated HTML related to Monitoring
GabZamba Oct 17, 2022
431c10a
🚀 Added creation of PDF files for reports
GabZamba Oct 17, 2022
17cc339
Merge pull request #7 from PedroDeSanti/'feature/aula7'
GabZamba Oct 17, 2022
ea10aeb
📝 Removal of unnecessary files and addition of requirements.txt
GabZamba Oct 21, 2022
1558739
📝 Updated ReadMe
GabZamba Oct 21, 2022
230f4db
✨ Addition of new classes
GabZamba Oct 21, 2022
1faccbe
✨ Initial creation of the new login page
GabZamba Oct 21, 2022
666b3a9
✨ Adiciona login funcional
jvtdegelo Nov 3, 2022
b4c974d
🔥 Retira pagina de login antiga
jvtdegelo Nov 3, 2022
b384cd3
Merge pull request #8 from PedroDeSanti/feature/aula8
GabZamba Nov 4, 2022
39914de
📝 Fix formatting
GabZamba Nov 4, 2022
b7ccb9e
🎨 Extend HTML from base
GabZamba Nov 4, 2022
e2bca79
🎨 Prettify HTML pages
GabZamba Nov 4, 2022
f00e9f2
🎨 Change button colors
GabZamba Nov 4, 2022
0146494
🎨 Change icon
GabZamba Nov 4, 2022
0481d00
🎨 Spacing
GabZamba Nov 4, 2022
f1334f0
✨ Adiciona pagina de cadastro de voos com impacto no bd
jvtdegelo Nov 6, 2022
6523079
🐛 Adiciona o estado criado à relacao entre voo e estado
jvtdegelo Nov 6, 2022
9648c11
✨ Adiciona tela de consulta sem tabela
jvtdegelo Nov 7, 2022
3d6645b
✨ Adiciona tabela à tela de consulta
jvtdegelo Nov 7, 2022
f134240
✨ Adiciona campo companhia aerea à entidade voo
jvtdegelo Nov 7, 2022
07d5fdf
✨ Adiciona Atualizar funcional
jvtdegelo Nov 7, 2022
f60848d
✨ Adiciona delete funcional
jvtdegelo Nov 7, 2022
eff8b95
✨ Adiciona Monitoracao funcional
jvtdegelo Nov 7, 2022
b5ddc5d
✨ Adiciona geracao de relatorio com menos detalhes
jvtdegelo Nov 7, 2022
7d639c8
✨ Adiciona relatorio detalhado bem feio
jvtdegelo Nov 7, 2022
e77f9b0
Adiciona testes para views
jvtdegelo Nov 8, 2022
e5a5f30
Merge pull request #10 from PedroDeSanti/feature/aula8
PedroDeSanti Nov 8, 2022
ebfd15f
🎨 Implementação inicial do Painel
GabZamba Nov 11, 2022
9053129
🎨 Fix formatting
GabZamba Nov 11, 2022
dd519b9
🔥 Remove unused files
GabZamba Nov 11, 2022
494f03a
✨ Add max login attempt
GabZamba Nov 11, 2022
3919277
🐛 Fix return button
GabZamba Nov 12, 2022
51f83c5
🎨 Improve readability
GabZamba Nov 12, 2022
a6989bf
✨ Define 'PDF' class
GabZamba Nov 14, 2022
81eb2cc
🎨 Improve simple report
GabZamba Nov 14, 2022
80c3b17
🎨 Improve detailed report
GabZamba Nov 14, 2022
c41485c
🐛 Corrige erros do comando createusers quando os usuarios ja foram cr…
jvtdegelo Nov 15, 2022
a59de14
✨ Adiciona chegadas e partidas
jvtdegelo Nov 15, 2022
9e32661
✨ Implementa novas permissoes para o monitoramento
jvtdegelo Nov 15, 2022
4fc2c39
✨ Add logout button
GabZamba Nov 15, 2022
3f2fe08
🎨 Refactor on HTML components
GabZamba Nov 15, 2022
15df724
✨ Addition of error checking
GabZamba Nov 17, 2022
0ca7a93
✨ Added error checking on missing pages
GabZamba Nov 17, 2022
1eb8af1
🐛 Fix 'Cancelado' and 'Aterrisado' error
GabZamba Nov 17, 2022
6a12e3d
🎨 Improve how tables are displayed
GabZamba Nov 17, 2022
1a25f57
Adiciona tela para a pagina de bloqueio
jvtdegelo Nov 18, 2022
273f163
Merge pull request #11 from PedroDeSanti/feature/aula10
GabZamba Nov 18, 2022
fbbd9c3
🐛 Fix bugs
GabZamba Nov 18, 2022
48f5838
🎨 Improve login page
GabZamba Nov 25, 2022
62eb12a
⚡️ Improve test users
GabZamba Nov 25, 2022
dacc7dc
🎨 Improve styling
GabZamba Nov 25, 2022
9423f92
🎨 Improve styling
GabZamba Nov 27, 2022
acb9368
✨ Add error validation on GerarRelatorios
GabZamba Nov 27, 2022
d19e3a0
📝 Adiciona relatorio de testes
jvtdegelo Nov 28, 2022
ec5ae59
Merge pull request #12 from PedroDeSanti/feature/aula10
GabZamba Nov 28, 2022
21e3ae8
🐛 Corrige bug no settings.py para deploy
jvtdegelo Dec 8, 2022
f52cfcf
♻️ Altera os nomes de usuários criados
jvtdegelo Dec 8, 2022
7bb1cab
Merge pull request #13 from PedroDeSanti/feature/aula10
PedroDeSanti Dec 8, 2022
fcec750
🐛 Ajusta caminha para arquivos estáticos
jvtdegelo Dec 8, 2022
ed7f11c
Merge pull request #14 from PedroDeSanti/feature/aula10
PedroDeSanti Dec 8, 2022
3ec7c3e
🐛 Corrige URL's para arquivos estaticos
jvtdegelo Dec 8, 2022
87660fa
Merge pull request #15 from PedroDeSanti/feature/aula10
GabZamba Dec 8, 2022
f524f86
✨ retira login para o painel de voos
jvtdegelo Dec 8, 2022
8211da6
Merge pull request #16 from PedroDeSanti/feature/aula10
jvtdegelo Dec 8, 2022
dec79b4
📝 Atualiza documentação
jvtdegelo Dec 11, 2022
58d8577
Merge pull request #17 from PedroDeSanti/feature/aula10
GabZamba Dec 12, 2022
c50a503
🐛 Corrige erro pythonanywhere
jvtdegelo Dec 12, 2022
34ae54f
Merge pull request #18 from PedroDeSanti/feature/aula10
PedroDeSanti Dec 12, 2022
78f58d7
🐛 Corrige arquivos estáticos locais
jvtdegelo Dec 12, 2022
71b5878
Merge pull request #19 from PedroDeSanti/feature/aula10
PedroDeSanti Dec 12, 2022
d48096b
📝 Update ReadME
GabZamba Dec 12, 2022
55542cf
📝 Update documents
GabZamba Dec 12, 2022
a547c5c
Merge pull request #20 from PedroDeSanti/feature/finalDocumentation
jvtdegelo Dec 12, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"files": [
"README.md"
],
"imageSize": 100,
"commit": false,
"commitConvention": "angular",
"contributors": [
{
"login": "jvtdegelo",
"name": "jvtdegelo",
"avatar_url": "https://avatars.githubusercontent.com/u/64590453?v=4",
"profile": "https://github.com/jvtdegelo",
"contributions": [
"code",
"doc"
]
},
{
"login": "GabZamba",
"name": "Gabriel Zambelli",
"avatar_url": "https://avatars.githubusercontent.com/u/98465378?v=4",
"profile": "https://github.com/GabZamba",
"contributions": [
"code",
"doc"
]
},
{
"login": "PedroDeSanti",
"name": "Pedro de Santi",
"avatar_url": "https://avatars.githubusercontent.com/u/62271285?v=4",
"profile": "https://github.com/PedroDeSanti",
"contributions": [
"code",
"doc"
]
}
],
"contributorsPerLine": 7,
"skipCi": true,
"repoType": "github",
"repoHost": "https://github.com",
"projectName": "FlightOps",
"projectOwner": "PedroDeSanti"
}
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -127,3 +127,7 @@ dmypy.json

# Pyre type checker
.pyre/

# Scripts
Scripts/
relatorio.pdf
Empty file added FlightOps/FlightOps/__init__.py
Empty file.
16 changes: 16 additions & 0 deletions FlightOps/FlightOps/asgi.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
"""
ASGI config for FlightOps project.

It exposes the ASGI callable as a module-level variable named ``application``.

For more information on this file, see
https://docs.djangoproject.com/en/4.1/howto/deployment/asgi/
"""

import os

from django.core.asgi import get_asgi_application

os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'FlightOps.settings')

application = get_asgi_application()
143 changes: 143 additions & 0 deletions FlightOps/FlightOps/settings.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
"""
Django settings for FlightOps project.

Generated by 'django-admin startproject' using Django 4.1.1.

For more information on this file, see
https://docs.djangoproject.com/en/4.1/topics/settings/

For the full list of settings and their values, see
https://docs.djangoproject.com/en/4.1/ref/settings/
"""
import os
from pathlib import Path

# Build paths inside the project like this: BASE_DIR / 'subdir'.
BASE_DIR = Path(__file__).resolve().parent.parent


# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/4.1/howto/deployment/checklist/

# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = 'django-insecure-qf#+92eg^o5pd+o-mn+-bjowpp4o#+4sj@nk*ht^c-y-_r%u^a'

# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True

ALLOWED_HOSTS = ["degelo.pythonanywhere.com", "localhost", "127.0.0.1"]


# Application definition

INSTALLED_APPS = [
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
'book',
'axes',
]

AUTHENTICATION_BACKENDS = [
# AxesStandaloneBackend should be the first backend in the AUTHENTICATION_BACKENDS list.
'axes.backends.AxesStandaloneBackend',

# Django ModelBackend is the default authentication backend.
'django.contrib.auth.backends.ModelBackend',
]


MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'axes.middleware.AxesMiddleware',
]

ROOT_URLCONF = 'FlightOps.urls'

TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [os.path.join(BASE_DIR, 'template')],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
'django.template.context_processors.debug',
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
],
},
},
]

WSGI_APPLICATION = 'FlightOps.wsgi.application'


# Database
# https://docs.djangoproject.com/en/4.1/ref/settings/#databases

DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': BASE_DIR / 'db.sqlite3',
}
}


# Password validation
# https://docs.djangoproject.com/en/4.1/ref/settings/#auth-password-validators

AUTH_PASSWORD_VALIDATORS = [
{
'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
},
{
'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
},
]


# Internationalization
# https://docs.djangoproject.com/en/4.1/topics/i18n/

LANGUAGE_CODE = 'en-us'

TIME_ZONE = 'UTC'

USE_I18N = True

USE_TZ = True


# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/4.1/howto/static-files/

STATIC_URL = '/static/'

STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static')]

# Default primary key field type
# https://docs.djangoproject.com/en/4.1/ref/settings/#default-auto-field

DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'

LOGIN_REDIRECT_URL = '/'

AXES_LOCKOUT_CALLABLE = "book.views.lockout"

AXES_META_PRECEDENCE_ORDER = ("HTTP_X_REAL_IP", "REMOTE_ADDR", )
37 changes: 37 additions & 0 deletions FlightOps/FlightOps/urls.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
"""FlightOps URL Configuration

The `urlpatterns` list routes URLs to views. For more information please see:
https://docs.djangoproject.com/en/4.1/topics/http/urls/
Examples:
Function views
1. Add an import: from my_app import views
2. Add a URL to urlpatterns: path('', views.home, name='home')
Class-based views
1. Add an import: from other_app.views import Home
2. Add a URL to urlpatterns: path('', Home.as_view(), name='home')
Including another URLconf
1. Import the include() function: from django.urls import include, path
2. Add a URL to urlpatterns: path('blog/', include('blog.urls'))
"""
from book import views
from django.conf.urls import include
from django.contrib import admin
from django.urls import path

urlpatterns = [
path('admin/', admin.site.urls),
path('FIRST/', views.bookview),
path('', views.home),
path('administrar/', views.administrarVoos),
path('administrar/cadastrar/', views.cadastrarVoo),
path('administrar/cadastrar/partida/', views.cadastrarPartida),
path('administrar/cadastrar/chegada/', views.cadastrarChegada),
path('administrar/atualizar/', views.atualizarVoo),
path('administrar/consultar/', views.consultarVoo),
path('administrar/remover/', views.removerVoo),
path('monitorar/', views.monitorarVoos),
path('relatorio/', views.gerarRelatorios),
path('relatorio/pdf/', views.visualizarRelatorios),
path('accounts/', include('django.contrib.auth.urls')),
path('painel/', views.visualizarPainel),
]
16 changes: 16 additions & 0 deletions FlightOps/FlightOps/wsgi.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
"""
WSGI config for FlightOps project.

It exposes the WSGI callable as a module-level variable named ``application``.

For more information on this file, see
https://docs.djangoproject.com/en/4.1/howto/deployment/wsgi/
"""

import os

from django.core.wsgi import get_wsgi_application

os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'FlightOps.settings')

application = get_wsgi_application()
Empty file added FlightOps/book/__init__.py
Empty file.
3 changes: 3 additions & 0 deletions FlightOps/book/admin.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from django.contrib import admin

# Register your models here.
6 changes: 6 additions & 0 deletions FlightOps/book/apps.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from django.apps import AppConfig


class BookConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'book'
Loading