Merge branch 'main' into remove-used-ingredients
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -96,3 +96,5 @@ frontend/src/index.js
|
||||
.env
|
||||
|
||||
.DS_Store
|
||||
|
||||
backend/src/resources/application.yml
|
||||
|
||||
@@ -3,10 +3,10 @@ server:
|
||||
|
||||
spring:
|
||||
datasource:
|
||||
url: jdbc:h2:mem:whattocook
|
||||
username: sa
|
||||
url:
|
||||
username:
|
||||
password:
|
||||
driverClassName: org.h2.Driver
|
||||
driver-class-name:
|
||||
data:
|
||||
rest:
|
||||
base-path: /api/v1
|
||||
@@ -29,6 +29,9 @@ dependencies {
|
||||
// https://mvnrepository.com/artifact/com.h2database/h2
|
||||
implementation group: 'com.h2database', name: 'h2', version: '1.3.148'
|
||||
|
||||
// https://mvnrepository.com/artifact/org.postgresql/postgresql
|
||||
implementation group: 'org.postgresql', name: 'postgresql', version: '42.4.0'
|
||||
|
||||
// okhttp
|
||||
implementation("com.squareup.okhttp3:okhttp:4.10.0")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user