diff --git a/.swiftpm/xcode/package.xcworkspace/xcuserdata/mcarman.xcuserdatad/UserInterfaceState.xcuserstate b/.swiftpm/xcode/package.xcworkspace/xcuserdata/mcarman.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..a547d99 Binary files /dev/null and b/.swiftpm/xcode/package.xcworkspace/xcuserdata/mcarman.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/.swiftpm/xcode/xcuserdata/mcarman.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/.swiftpm/xcode/xcuserdata/mcarman.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist new file mode 100644 index 0000000..1101066 --- /dev/null +++ b/.swiftpm/xcode/xcuserdata/mcarman.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + diff --git a/.swiftpm/xcode/xcuserdata/mcarman.xcuserdatad/xcschemes/xcschememanagement.plist b/.swiftpm/xcode/xcuserdata/mcarman.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..f5003f8 --- /dev/null +++ b/.swiftpm/xcode/xcuserdata/mcarman.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,14 @@ + + + + + SchemeUserState + + Fueling.xcscheme_^#shared#^_ + + orderHint + 0 + + + + diff --git a/Sources/App/configure.swift b/Sources/App/configure.swift index fdf81e7..b4e0ecd 100755 --- a/Sources/App/configure.swift +++ b/Sources/App/configure.swift @@ -10,7 +10,15 @@ public func configure(_ app: Application) async throws { app.routes.defaultMaxBodySize = "128mb" // let timeout = HTTPClient.Configuration.Timeout(connect: .seconds(300), read: .seconds(300)) // app.http.client.configuration.timeout = timeout - app.databases.use(.postgres(hostname: "localhost", username: "mcarman", password: "@ng31F@rm0823262", database: "fueling"), as: .psql) + app.databases.use(.postgres(hostname: "127.0.0.1", port: 5433, username: "mcarman", password: "@ng31F@rm0823262", database: "fueling"), as: .psql) +// app.databases.use(DatabaseConfigurationFactory.postgres(configuration: .init( +// hostname: Environment.get("DATABASE_HOST") ?? "localhost", +// port: Environment.get("DATABASE_PORT").flatMap(Int.init(_:)) ?? 5433, +// username: Environment.get("DATABASE_USERNAME") ?? "mcarman", +// password: Environment.get("DATABASE_PASSWORD") ?? "@ng31F@rm0823262", +// database: Environment.get("DATABASE_NAME") ?? "fueling", +// tls: .disable) +// ), as: .psql) app.http.server.configuration.port = 3002 app.migrations.add(CreateFuelEntry()) app.migrations.add(AddLatitudeAndLongitudeAndRemoveGpsLocationAndImage()) diff --git a/Sources/App/routes.swift b/Sources/App/routes.swift index 787b8cc..6579183 100755 --- a/Sources/App/routes.swift +++ b/Sources/App/routes.swift @@ -9,6 +9,10 @@ func routes(_ app: Application) throws { try v2.register(collection: UserController()) let fuelEntryController = FuelEntryController() + app.get { + req in return "Fueling API v2" + } + app.get("fuel-entries") { req in try await fuelEntryController.index(req: req) } @@ -24,6 +28,8 @@ func routes(_ app: Application) throws { + + // V2 API routes with image upload // let v2Routes: () = app.group("api", "v2") { v2 in // let fuelEntryV2Controller = FuelEntryV2Controller()