diff --git a/.docker/Dockerfile.devenv b/.docker/Dockerfile.devenv new file mode 100644 index 0000000..dcbe10c --- /dev/null +++ b/.docker/Dockerfile.devenv @@ -0,0 +1,9 @@ +FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:latest + +RUN useradd -s /bin/bash -m vscode \ + && groupadd docker \ + && usermod -aG docker vscode + +USER vscode + + diff --git a/.docker/config.json b/.docker/config.json new file mode 100644 index 0000000..5f937e0 --- /dev/null +++ b/.docker/config.json @@ -0,0 +1,3 @@ +{ + "dockerfile": "Dockerfile.devenv" +} \ No newline at end of file diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index eb23bfb..d622647 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.emmkay.delivery"> @@ -34,7 +34,7 @@ android:requestLegacyExternalStorage="true" android:icon="@mipmap/ic_launcher"> + android:value="AIzaSyDs7PkTKOmzPIYH5UDOAY_E8kD-QxYHRrQ"/> + package="com.emmkay.delivery"> diff --git a/flutter b/flutter new file mode 160000 index 0000000..f3717d7 --- /dev/null +++ b/flutter @@ -0,0 +1 @@ +Subproject commit f3717d70d7d2660ed830835c8ee33a01af71ce08 diff --git a/lib/Controller/MapBoxController.dart b/lib/Controller/MapBoxController.dart index 5ec2d34..f5b3888 100644 --- a/lib/Controller/MapBoxController.dart +++ b/lib/Controller/MapBoxController.dart @@ -7,7 +7,7 @@ import 'package:restaurant/Models/MapBox/DrivingResponse.dart'; class MapBoxController { final _url = 'https://api.mapbox.com/directions/v5'; - final _apikey = 'pk.eyJ1IjoiZnJhdmVkZXYiLCJhIjoiY2t0NTkxem1qMDZhcTJwcW52ZGtkcWpxdyJ9.6_n8u4xkS-FZ7bbgfWRulw'; + final _apikey = 'pk.eyJ1IjoiYXhlN2JyYXZvIiwiYSI6ImNsNThobjQycjBrdDMzZHVrYWJlbzU3ZG4ifQ.DSVwglNydQDaNEpBharuqA'; Future getCoordsOriginAndDestinationDelivery(LatLng origin, LatLng destination) async { diff --git a/lib/Services/GoogleServices.dart b/lib/Services/GoogleServices.dart index abb785d..d456f3b 100644 --- a/lib/Services/GoogleServices.dart +++ b/lib/Services/GoogleServices.dart @@ -1,3 +1,3 @@ library restaurant.googlemapsapi; -String googleMapsAPI = "AIzaSyAA6NAaCO_wqNsUjjp86q8JcTBoQZRtW20"; \ No newline at end of file +String googleMapsAPI = "AIzaSyDs7PkTKOmzPIYH5UDOAY_E8kD-QxYHRrQ"; \ No newline at end of file diff --git a/lib/main.dart b/lib/main.dart index 2f02b0d..dcf6457 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -70,7 +70,7 @@ class _MyAppState extends State { ], child: MaterialApp( debugShowCheckedModeBanner: false, - title: 'Food - Fraved', + title: 'Emmkay Delivery', home: CheckingLoginPage(), ), );