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

Docker build #5

Open
wants to merge 3 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
9 changes: 9 additions & 0 deletions .docker/Dockerfile.devenv
Original file line number Diff line number Diff line change
@@ -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


3 changes: 3 additions & 0 deletions .docker/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"dockerfile": "Dockerfile.devenv"
}
4 changes: 2 additions & 2 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.fraved.restaurant">
package="com.emmkay.delivery">

<!-- Permissions Internet -->
<uses-permission android:name="android.permission.INTERNET"/>
Expand Down Expand Up @@ -34,7 +34,7 @@
android:requestLegacyExternalStorage="true"
android:icon="@mipmap/ic_launcher">
<meta-data android:name="com.google.android.geo.API_KEY"
android:value="AIzaSyAA6NAaCO_wqNsUjjp86q8JcTBoQZRtW20"/>
android:value="AIzaSyDs7PkTKOmzPIYH5UDOAY_E8kD-QxYHRrQ"/>

<activity
android:name=".MainActivity"
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/profile/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.fraved.restaurant">
package="com.emmkay.delivery">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
Expand Down
1 change: 1 addition & 0 deletions flutter
Submodule flutter added at f3717d
2 changes: 1 addition & 1 deletion lib/Controller/MapBoxController.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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<DrivingResponse> getCoordsOriginAndDestinationDelivery(LatLng origin, LatLng destination) async {
Expand Down
2 changes: 1 addition & 1 deletion lib/Services/GoogleServices.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
library restaurant.googlemapsapi;

String googleMapsAPI = "AIzaSyAA6NAaCO_wqNsUjjp86q8JcTBoQZRtW20";
String googleMapsAPI = "AIzaSyDs7PkTKOmzPIYH5UDOAY_E8kD-QxYHRrQ";
2 changes: 1 addition & 1 deletion lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class _MyAppState extends State<MyApp> {
],
child: MaterialApp(
debugShowCheckedModeBanner: false,
title: 'Food - Fraved',
title: 'Emmkay Delivery',
home: CheckingLoginPage(),
),
);
Expand Down