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

Forms Baños #1

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
130 changes: 130 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
pip-wheel-metadata/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
.python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# PEP 582; used by e.g. github.com/David-OConnor/pyflow
__pypackages__/

# Celery stuff
celerybeat-schedule
celerybeat.pid

# SageMath parsed files
*.sage.py

# Environments
myvenv/
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/
14 changes: 14 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Released under MIT License

Copyright (c) 2024 Cristóbal Pereira.
Copyright (c) 2024 Diego Tapia.
Copyright (c) 2024 Fernanda Contreras.
Copyright (c) 2024 Ignacio Gajardo.
Copyright (c) 2024 Ignacio Humire.
Copyright (c) 2024 Julieta Ayelli.

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
58 changes: 54 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,54 @@
# holi
#ALO
Prueba commit
#ALO2
# 2024-2-Grupo-6: PROYECTO WC FINDER
# Ingeniería de Software CC4401-2 Otoño 2024
**Integrantes**:
- Ignacio Humire
- Ignacio Gajardo
- Julieta Ayelli
- Fernanda Contreras
- Cristóbal Pereira
- Diego Tapia
---
## El proyecto
WC FINDER es una aplicación web móvil (pricipamente), que permite a los estudiantes encontrar un baño de acuerdo a sus necesidades o preferencias.
## Para iniciar el proyecto
### Repositorio
Para comenzar debemos clonar el repositorio o descargarlo.
```bash
git clone https://github.com/DCC-CC4401/2024-1-CC4401-2-grupo-6.git
```
Luego se debe acceder a la carpeta ya sea esta clonada o descargada.
### Creación del ambiente virtual
Creamos un ambiente virtual de python y lo incializamos.
```bash
python -m venv env
env\Scripts\activate
```
### Configuración del ambiente virtual
Actualizamos pip.
```bash
python -m pip install --upgrade pip
```

Instalamos las librerías requeridas para el funcionamiento del proyecto.

```bash
pip install -r requirements.txt
```

Para iniciar
```bash
python manage.py runserver
```
## Sprint 1
Fecha de término: 22-05-2024
### Notas de versión:
- Se implementó el esqueleto de una aplicación web con django
- Se implementaron las vistas /register , /login y /tareas.
- Se implementó la funcionalidad para que usuario se pueda registrar
- Se implementó la funcionalidad para que un usuario se logee.
- Se implementó la funcionalidad para que un usuario logeado pueda enviar un formulario.

### Implementaciones futuras
- Acción de aceptar solicitudes de formularios en el perfil de administrador.
- Agregar opciones y características al formulario.
- Cambios en diseño registro y formulario
Binary file modified TODOproject/__pycache__/settings.cpython-311.pyc
Binary file not shown.
Binary file modified TODOproject/__pycache__/urls.cpython-311.pyc
Binary file not shown.
4 changes: 4 additions & 0 deletions TODOproject/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,10 @@

STATIC_URL = '/static/'

# En desarrollo, para servir archivos estáticos directamente
if DEBUG:
STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static')]

PROJECT_ROOT = os.path.dirname(os.path.abspath(__file__))
STATIC_ROOT = os.path.join(PROJECT_ROOT, 'static')
# Simplified static file serving.
Expand Down
Binary file modified categorias/__pycache__/admin.cpython-311.pyc
Binary file not shown.
Binary file modified categorias/__pycache__/models.cpython-311.pyc
Binary file not shown.
Binary file modified categorias/migrations/__pycache__/0001_initial.cpython-311.pyc
Binary file not shown.
Binary file modified categorias/migrations/__pycache__/__init__.cpython-311.pyc
Binary file not shown.
Binary file modified db.sqlite3
Binary file not shown.
Binary file modified todoapp/__pycache__/admin.cpython-311.pyc
Binary file not shown.
Binary file modified todoapp/__pycache__/forms.cpython-311.pyc
Binary file not shown.
Binary file modified todoapp/__pycache__/models.cpython-311.pyc
Binary file not shown.
Binary file modified todoapp/__pycache__/urls.cpython-311.pyc
Binary file not shown.
Binary file modified todoapp/__pycache__/views.cpython-311.pyc
Binary file not shown.
4 changes: 4 additions & 0 deletions todoapp/admin.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#user: wcadmin
#mail: [email protected]
#pass: wcadmin

from django.contrib import admin
from todoapp.models import User, Tarea
#from categorias.models import Categoria
Expand Down
13 changes: 9 additions & 4 deletions todoapp/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@ class NuevaTareaModelForm(forms.ModelForm):
class Meta:
model = Tarea
fields = ['titulo', 'contenido', 'categoria']
widgets = {
'titulo': forms.TextInput(attrs={'class': 'form-control', 'placeholder': 'Baño DCC Torre Norte Tercer Piso Mujeres'}),
'contenido': forms.Textarea(attrs={'class': 'form-control', 'placeholder': 'Buena señal de wifi, limpio, posee perfumadores en cada cabina, etc.'}),
'categoria': forms.Select(attrs={'class': 'form-control'}),
}

def clean_titulo(self):
def clean_titulo(self):
field = self.cleaned_data.get("titulo")
if not "Tarea" in field:
raise forms.ValidationError("Debe incluir el texto 'Tarea'")
return field
if not "Baño" in field:
raise forms.ValidationError("Debe incluir el texto 'Baño' en el título")
return field
Binary file modified todoapp/migrations/__pycache__/0001_initial.cpython-311.pyc
Binary file not shown.
Binary file modified todoapp/migrations/__pycache__/0002_tarea_owner.cpython-311.pyc
Binary file not shown.
Binary file modified todoapp/migrations/__pycache__/__init__.cpython-311.pyc
Binary file not shown.
142 changes: 142 additions & 0 deletions todoapp/static/css/style copy 2.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
/* styles.css */

/* Definición de la fuente personalizada */
@font-face {
font-family: 'Nexa-Heavy';
src: url('{% static "fonts/Nexa-Heavy.ttf" %}') format('truetype');
}

@font-face {
font-family: 'Nexa-ExtraLight';
src: url('{% static "fonts/Nexa-ExtraLight.ttf" %}') format('truetype');
}

/* Estilos para el diseño */
body {
font-family: "Mulish", sans-serif;
margin: 0;
padding: 0;
}

.container {
display: flex;
height: 100vh;
}

.slider {
flex: 1;
background-color: #f0f0f0;
overflow: hidden;
position: relative;
}

.slider img {
width: 100%;
height: 100%;
object-fit: cover;
}

.login-form {
flex: 1;
display: flex;
justify-content: center;
align-items: center;
padding: 20px;
}

.form-container {
max-width: 300px;
width: 100%;
background-color: #ffffff;
border-radius: 8px;
padding: 20px;
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.1);
}

.form-container h2 {
font-family: "Mulish", sans-serif;
text-align: center;
margin-bottom: 20px;
}

.form-container input {
width: 100%;
margin-bottom: 15px;
padding: 10px;
border: 1px solid #ccc;
border-radius: 5px;
box-sizing: border-box;
}

.form-container button, .register-button a {
width: 100%;
padding: 10px;
color: #fff;
border: none;
border-radius: 5px;
cursor: pointer;
font-family: "Mulish", sans-serif;
font-size: 16px;
}

.form-container button {
background-color: #007bff;
}

.form-container button:hover {
background-color: #0056b3;
}

.register-button a {
background-color: #28a745;
text-align: center;
text-decoration: none;
display: block;
}

.register-button a:hover {
background-color: #218838;
}

.form-container hr {
margin: 15px 0;
border: 0;
border-top: 1px solid #ccc;
}

.form-control {
font-family: 'Mulish', sans-serif;
}

.register-button {
text-align: center;
margin-top: 10px;
font-family: "Mulish", sans-serif;
}

/* Media queries para pantallas pequeñas */
@media (max-width: 768px) {
.container {
flex-direction: column;
}

.slider {
height: 25vh;
}

.login-form {
height: 75vh;
justify-content: flex-start;
padding-top: 20px;
}

.form-container {
max-width: 100%;
padding: 10px;
}

.form-container input, .form-container button, .register-button a {
font-size: 14px;
padding: 8px;
}
}
Loading