Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
b57a928
Setting up GitHub Classroom Feedback
github-classroom[bot] Mar 7, 2024
2840987
add deadline
github-classroom[bot] Mar 7, 2024
c63d988
initial commit
mfg1985 Mar 8, 2024
34b96db
Planning
mfg1985 Mar 8, 2024
acbf374
Format plannig
mfg1985 Mar 8, 2024
52c1110
User Story Y user journey
mfg1985 Mar 18, 2024
8c839d3
Enlace a Figma
mfg1985 Mar 19, 2024
01c8968
inicializacion del proyecto frontend y backend
mfg1985 Mar 23, 2024
4946a59
Header
mfg1985 Mar 25, 2024
aae903d
Card Recipe
mfg1985 Mar 25, 2024
05fb08d
CardLastSeen
mfg1985 Mar 26, 2024
3aa1c74
CardLastSeen
mfg1985 Mar 26, 2024
957fb89
AddButton
mfg1985 Mar 27, 2024
6c8d612
Conteiner and Link
mfg1985 Mar 27, 2024
a9c8bf6
AddModal
mfg1985 Mar 28, 2024
1fe8450
AddModal funcion
mfg1985 Mar 28, 2024
db2faee
form
mfg1985 Mar 29, 2024
2466403
format form
mfg1985 Mar 29, 2024
492ca6f
form new recite
mfg1985 Mar 30, 2024
c72f5ac
SavedModal
mfg1985 Mar 30, 2024
34da379
Saved Modal funcional
mfg1985 Mar 30, 2024
3b2b34a
campos requeridos
mfg1985 Apr 1, 2024
95f8abd
Ajustes texto textarea
mfg1985 Apr 2, 2024
edff97e
cambion add modal
mfg1985 Apr 2, 2024
151b211
ImportRecipe componet
mfg1985 Apr 2, 2024
9cd80f8
recitepage, recipe component
mfg1985 Apr 3, 2024
1ae6b1b
ajuste boton import
mfg1985 Apr 3, 2024
a292a64
Cambios css recipe
mfg1985 Apr 8, 2024
5c8e514
controllery persisten
mfg1985 Apr 8, 2024
4744614
Cambios baceknd
mfg1985 Apr 9, 2024
02f5f99
Add react-hook-form y corregidos estilos y layout
jsrois Apr 12, 2024
ecd0a86
Arreglar modal
jsrois Apr 12, 2024
5c98362
Add sample data
jsrois Apr 12, 2024
b9436f3
Error en el nombre del controller
jsrois Apr 12, 2024
70d7611
Conectar backend y frontend
jsrois Apr 12, 2024
bd97a05
Merge pull request #2 from jsrois/main
jsrois Apr 12, 2024
1e3e995
post
mfg1985 Apr 17, 2024
0769350
cambios backend
mfg1985 Apr 17, 2024
08e5b55
datajson y enlaces imagenes
mfg1985 Apr 17, 2024
b6f6da8
Ajustes css y logo
mfg1985 Apr 18, 2024
ace8950
Cambios Data.sql
mfg1985 Apr 18, 2024
09386e0
modificacion addmodal
mfg1985 Apr 18, 2024
24e0e3e
cambios font-family
mfg1985 Apr 18, 2024
4354f6c
cambios secction collection
mfg1985 Apr 18, 2024
31915fc
cambios collection
mfg1985 Apr 18, 2024
3183d1e
reseteo del form
mfg1985 Apr 18, 2024
adcd175
creado get id
mfg1985 Apr 18, 2024
c4ac5aa
pagina receta
mfg1985 Apr 19, 2024
4c93d1f
tiempo
mfg1985 Apr 19, 2024
24536e6
paginas
mfg1985 Apr 19, 2024
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
21 changes: 21 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
// Use IntelliSense para saber los atributos posibles.
// Mantenga el puntero para ver las descripciones de los existentes atributos.
// Para más información, visite: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "java",
"name": "Current File",
"request": "launch",
"mainClass": "${file}"
},
{
"type": "java",
"name": "BackendApplication",
"request": "launch",
"mainClass": "org.factoriaf5.backend.BackendApplication",
"projectName": "backend"
}
]
}
28 changes: 27 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,27 @@
# rc2-template-proyecto-individual-final

#"Rescata los sabores de la memoria. Cocina con las recetas de la abuela, ahora en una app."

## Cómo lanzar el proyecto

### Frontend

```
cd frontend
npm install
npm run dev
```

### Backend

- Se utiliza una base de datos H2 (en memoria)

```
cd backend
mvn spring-boot:run
```

### TODO

- Usar plantillas (layouts) para las partes comunes del router
- Meter una capa de datos para acceder al backend (por ejemplo usand axios)
- Renombrar componentes ?
33 changes: 33 additions & 0 deletions backend/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
HELP.md
target/
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
!**/src/test/**/target/

### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache

### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr

### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
build/
!**/src/main/**/build/
!**/src/test/**/build/

### VS Code ###
.vscode/
Binary file added backend/.mvn/wrapper/maven-wrapper.jar
Binary file not shown.
2 changes: 2 additions & 0 deletions backend/.mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
308 changes: 308 additions & 0 deletions backend/mvnw

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading