diff --git a/.drone.yml b/.drone.yml
index bc3505d..7ba4a1b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -2,6 +2,7 @@ kind: pipeline
type: docker
name: DAFLPipeline
+
trigger:
event:
- push
@@ -52,3 +53,55 @@ steps:
COMMAND: create
OVERWRITE: true
depends_on: [ web-server ]
+
+# docker image build
+- name: php_script
+ image: plugins/docker
+ settings:
+ dockerfile: ./Sources/php_script/Dockerfile
+ context: Sources/php_script
+ registry: hub.codefirst.iut.uca.fr
+ repo: hub.codefirst.iut.uca.fr/dorian.hodin/dafl_music
+ username:
+ from_secret: SECRET_USERNAME
+ password:
+ from_secret: SECRET_PASSWD
+
+# container deployment
+- name: deploy-php
+ image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest
+ environment:
+ IMAGENAME: hub.codefirst.iut.uca.fr/dorian.hodin/dafl_music:latest
+ CONTAINERNAME: php_script
+ COMMAND: create
+ OVERWRITE: true
+ CODEFIRST_CLIENTDRONE_ENV_HOST:
+ from_secret: db_host
+ CODEFIRST_CLIENTDRONE_ENV_DATABASE:
+ from_secret: db_database
+ CODEFIRST_CLIENTDRONE_ENV_USER:
+ from_secret: db_user
+ CODEFIRST_CLIENTDRONE_ENV_PASSWORD:
+ from_secret: db_password
+ CODEFIRST_CLIENTDRONE_ENV_ROOT_PASSWORD:
+ from_secret: db_root_password
+ depends_on: [ php_script ]
+
+# database container deployment
+- name: db_location
+ image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest
+ environment:
+ IMAGENAME: mariadb:10.5
+ CONTAINERNAME: mysql_location
+ COMMAND: create
+ # OVERWRITE: true
+ PRIVATE: true
+ CODEFIRST_CLIENTDRONE_ENV_MARIADB_ROOT_PASSWORD:
+ from_secret: db_root_password
+ CODEFIRST_CLIENTDRONE_ENV_MARIADB_DATABASE:
+ from_secret: db_database
+ CODEFIRST_CLIENTDRONE_ENV_MARIADB_USER:
+ from_secret: db_user
+ CODEFIRST_CLIENTDRONE_ENV_MARIADB_PASSWORD:
+ from_secret: db_password
+ depends_on: [ deploy-php ]
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 7643783..6db4707 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -98,7 +98,6 @@
http://schemas.android.com/apk/res/android
- ANDROID_ATTRIBUTE_ORDER
diff --git a/.idea/dafl_music.iml b/.idea/dafl_music.iml
new file mode 100644
index 0000000..98db980
--- /dev/null
+++ b/.idea/dafl_music.iml
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
new file mode 100644
index 0000000..e794de1
--- /dev/null
+++ b/.idea/dataSources.local.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+ forget
+
+
+
+
\ No newline at end of file
diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
new file mode 100644
index 0000000..dfa1771
--- /dev/null
+++ b/.idea/dataSources.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ mariadb
+ true
+ org.mariadb.jdbc.Driver
+ jdbc:mariadb://localhost:3306
+ $ProjectFileDir$
+
+
+
\ No newline at end of file
diff --git a/.idea/dataSources/f334e98a-3c30-4412-8c71-35fe124ed605.xml b/.idea/dataSources/f334e98a-3c30-4412-8c71-35fe124ed605.xml
new file mode 100644
index 0000000..b6cbbc9
--- /dev/null
+++ b/.idea/dataSources/f334e98a-3c30-4412-8c71-35fe124ed605.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/dataSources/f334e98a-3c30-4412-8c71-35fe124ed605/storage_v2/_src_/schema/information_schema.FNRwLQ.meta b/.idea/dataSources/f334e98a-3c30-4412-8c71-35fe124ed605/storage_v2/_src_/schema/information_schema.FNRwLQ.meta
new file mode 100644
index 0000000..1ff3db2
--- /dev/null
+++ b/.idea/dataSources/f334e98a-3c30-4412-8c71-35fe124ed605/storage_v2/_src_/schema/information_schema.FNRwLQ.meta
@@ -0,0 +1,2 @@
+#n:information_schema
+! [null, 0, null, null, -2147483648, -2147483648]
diff --git a/.idea/dataSources/f334e98a-3c30-4412-8c71-35fe124ed605/storage_v2/_src_/schema/mysql.osA4Bg.meta b/.idea/dataSources/f334e98a-3c30-4412-8c71-35fe124ed605/storage_v2/_src_/schema/mysql.osA4Bg.meta
new file mode 100644
index 0000000..86a53f1
--- /dev/null
+++ b/.idea/dataSources/f334e98a-3c30-4412-8c71-35fe124ed605/storage_v2/_src_/schema/mysql.osA4Bg.meta
@@ -0,0 +1,2 @@
+#n:mysql
+! [null, 0, null, null, -2147483648, -2147483648]
diff --git a/.idea/dataSources/f334e98a-3c30-4412-8c71-35fe124ed605/storage_v2/_src_/schema/performance_schema.kIw0nw.meta b/.idea/dataSources/f334e98a-3c30-4412-8c71-35fe124ed605/storage_v2/_src_/schema/performance_schema.kIw0nw.meta
new file mode 100644
index 0000000..9394db1
--- /dev/null
+++ b/.idea/dataSources/f334e98a-3c30-4412-8c71-35fe124ed605/storage_v2/_src_/schema/performance_schema.kIw0nw.meta
@@ -0,0 +1,2 @@
+#n:performance_schema
+! [null, 0, null, null, -2147483648, -2147483648]
diff --git a/.idea/dbnavigator.xml b/.idea/dbnavigator.xml
new file mode 100644
index 0000000..04cbe55
--- /dev/null
+++ b/.idea/dbnavigator.xml
@@ -0,0 +1,417 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
new file mode 100644
index 0000000..fc497d8
--- /dev/null
+++ b/.idea/libraries/Dart_Packages.xml
@@ -0,0 +1,724 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..639900d
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 85c8ded..c753441 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
-
+
\ No newline at end of file
diff --git a/.idea/php.xml b/.idea/php.xml
new file mode 100644
index 0000000..97a38d7
--- /dev/null
+++ b/.idea/php.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml
new file mode 100644
index 0000000..e2a1e75
--- /dev/null
+++ b/.idea/sqldialects.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Documentation/Images/MQTT.png b/Documentation/Images/MQTT.png
new file mode 100644
index 0000000..d1014c8
Binary files /dev/null and b/Documentation/Images/MQTT.png differ
diff --git a/Sources/dafl_project_flutter/lib/services/position/area.dart b/Sources/dafl_project_flutter/lib/services/position/area.dart
index fbf102a..506f0ab 100644
--- a/Sources/dafl_project_flutter/lib/services/position/area.dart
+++ b/Sources/dafl_project_flutter/lib/services/position/area.dart
@@ -2,41 +2,53 @@ import 'package:geolocator/geolocator.dart';
import 'package:http/http.dart' as http;
import 'dart:convert';
import 'dart:async';
-
import '../../main.dart';
import '../../model/spot.dart';
-class Area {
- late List spots;
+class Location {
+ static Future> sendCurrentLocation() async {
- sendCurrentLocation() async {
- Uri uri = Uri.parse("http://89.83.53.34/phpmyadmin/dafldev/insert.php");
+ Uri uri = Uri.parse("https://codefirst.iut.uca.fr/containers/php_script-dorianhodin/insertAndMakeListUser.php");
+ Map spot = {};
LocationPermission permission;
+
permission = await Geolocator.checkPermission();
+
if (permission == LocationPermission.denied) {
+
permission = await Geolocator.requestPermission();
+
if (permission == LocationPermission.deniedForever) {
//TODO : handle this case
}
}
- String actualUser = MyApp.controller.getIdSpotify();
- String actualSong = await MyApp.controller.getCurrentMusic();
+
+ String actualUser = MyApp.controller.currentUser.usernameDafl;
+ String actualSong = await MyApp.api.getCurrentlyPlayingTrack();
Position current = await Geolocator.getCurrentPosition();
- await http.post(uri, body: {
- "id": actualUser,
+
+ http.Response response = await http.post(uri, body: {
+ "id": actualUser.toString(),
"latitude": current.latitude.toString(),
"longitude": current.longitude.toString(),
- "idMusic": actualSong
+ "idMusic": actualSong.toString(),
});
- }
- getData() async {
- String actualUser = MyApp.controller.getIdDafl().toString();
- Uri uri = Uri.parse("http://89.83.53.34/phpmyadmin/dafldev/distance.php");
- http.Response response = await http.post(uri, body: {
- "id": actualUser,
- });
var data = jsonDecode(response.body);
- data.forEach((s) => spots.add(Spot(s['user'], s['music'])));
+
+ if (data == 2){
+
+ return Future.error("Failed to connect, connection timeout");
+
+ }else if (data == 3) {
+
+ return Future.error("POST method failed");
+
+ }else{
+
+ data.forEach((s) => spot.putIfAbsent(s['user'], () => s['music']));
+ return spot;
+
+ }
}
-}
+}
\ No newline at end of file
diff --git a/Sources/dafl_project_flutter/lib/views/pages/main/w_profile.dart b/Sources/dafl_project_flutter/lib/views/pages/main/w_profile.dart
index 5e78ab7..80b8e4e 100644
--- a/Sources/dafl_project_flutter/lib/views/pages/main/w_profile.dart
+++ b/Sources/dafl_project_flutter/lib/views/pages/main/w_profile.dart
@@ -1,3 +1,5 @@
+import 'package:text_scroll/text_scroll.dart';
+import 'package:scroll_loop_auto_scroll/scroll_loop_auto_scroll.dart';
import '../../../main.dart';
import '../../../model/music.dart';
import './w_settings.dart';
@@ -27,8 +29,13 @@ class MainPageProfil extends StatefulWidget {
}
class _MainPageProfilState extends State {
- late String username;
- late Music currentmusic;
+ String? username = MyApp.controller.currentUser.usernameDafl;
+ late Future