diff --git a/src/FLAD/App.tsx b/src/FLAD/App.tsx
index 84a6c29..444c82f 100644
--- a/src/FLAD/App.tsx
+++ b/src/FLAD/App.tsx
@@ -4,12 +4,11 @@ import AuthNavigation from './navigation/AuthNavigation';
import * as SplashScreen from 'expo-splash-screen';
SplashScreen.preventAutoHideAsync();
-
export default function App() {
-
return (
);
}
+
diff --git a/src/FLAD/Model/factory/MusicFactory.ts b/src/FLAD/Model/factory/MusicFactory.ts
index c634082..9b548e0 100644
--- a/src/FLAD/Model/factory/MusicFactory.ts
+++ b/src/FLAD/Model/factory/MusicFactory.ts
@@ -5,7 +5,7 @@ export default class MusicFactory {
const music = new Music(
jsonMusic.id,
jsonMusic.name,
- "",
+ jsonMusic.artists[0].name,
jsonMusic.album.images[0].url,
jsonMusic.preview_url
);
diff --git a/src/FLAD/lib/index.js b/src/FLAD/lib/index.js
new file mode 100644
index 0000000..14f24b2
--- /dev/null
+++ b/src/FLAD/lib/index.js
@@ -0,0 +1,7 @@
+Object.defineProperty(exports, '__esModule', {value: true});
+require('./mqttLib');
+const storage = require('./storage');
+function initialize() {
+ global.localStorage = storage;
+}
+exports.default = initialize;
\ No newline at end of file
diff --git a/src/FLAD/lib/mqtt.js b/src/FLAD/lib/mqtt.js
new file mode 100644
index 0000000..beb8d65
--- /dev/null
+++ b/src/FLAD/lib/mqtt.js
@@ -0,0 +1,2395 @@
+/*******************************************************************************
+ * Copyright (c) 2013 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ * Andrew Banks - initial API and implementation and initial documentation
+ *******************************************************************************/
+
+
+// Only expose a single object name in the global namespace.
+// Everything must go through this module. Global Paho module
+// only has a single public function, client, which returns
+// a Paho client object given connection details.
+
+/**
+ * Send and receive messages using web browsers.
+ *
+ * This programming interface lets a JavaScript client application use the MQTT V3.1 or
+ * V3.1.1 protocol to connect to an MQTT-supporting messaging server.
+ *
+ * The function supported includes:
+ *
+ * - Connecting to and disconnecting from a server. The server is identified by its host name and port number.
+ *
- Specifying options that relate to the communications link with the server,
+ * for example the frequency of keep-alive heartbeats, and whether SSL/TLS is required.
+ *
- Subscribing to and receiving messages from MQTT Topics.
+ *
- Publishing messages to MQTT Topics.
+ *
+ *
+ * The API consists of two main objects:
+ *
+ * - {@link Paho.Client}
+ * - This contains methods that provide the functionality of the API,
+ * including provision of callbacks that notify the application when a message
+ * arrives from or is delivered to the messaging server,
+ * or when the status of its connection to the messaging server changes.
+ * - {@link Paho.Message}
+ * - This encapsulates the payload of the message along with various attributes
+ * associated with its delivery, in particular the destination to which it has
+ * been (or is about to be) sent.
+ *
+ *
+ * The programming interface validates parameters passed to it, and will throw
+ * an Error containing an error message intended for developer use, if it detects
+ * an error with any parameter.
+ *
+ * Example:
+ *
+ *
+var client = new Paho.MQTT.Client(location.hostname, Number(location.port), "clientId");
+client.onConnectionLost = onConnectionLost;
+client.onMessageArrived = onMessageArrived;
+client.connect({onSuccess:onConnect});
+
+function onConnect() {
+ // Once a connection has been made, make a subscription and send a message.
+ console.log("onConnect");
+ client.subscribe("/World");
+ var message = new Paho.MQTT.Message("Hello");
+ message.destinationName = "/World";
+ client.send(message);
+};
+function onConnectionLost(responseObject) {
+ if (responseObject.errorCode !== 0)
+ console.log("onConnectionLost:"+responseObject.errorMessage);
+};
+function onMessageArrived(message) {
+ console.log("onMessageArrived:"+message.payloadString);
+ client.disconnect();
+};
+ *
+ * The send, subscribe and unsubscribe methods are implemented as asynchronous JavaScript methods
+ * (even though the underlying protocol exchange might be synchronous in nature).
+ * This means they signal their completion by calling back to the application,
+ * via Success or Failure callback functions provided by the application on the method in question.
+ * Such callbacks are called at most once per method invocation and do not persist beyond the lifetime
+ * of the script that made the invocation.
+ *
+ * In contrast there are some callback functions, most notably onMessageArrived,
+ * that are defined on the {@link Paho.Client} object.
+ * These may get called multiple times, and aren't directly related to specific method invocations made by the client.
+ *
+ * @name Paho.Client
+ *
+ * @constructor
+ *
+ * @param {string} host - the address of the messaging server, as a fully qualified WebSocket URI, as a DNS name or dotted decimal IP address.
+ * @param {number} port - the port number to connect to - only required if host is not a URI
+ * @param {string} path - the path on the host to connect to - only used if host is not a URI. Default: '/mqtt'.
+ * @param {string} clientId - the Messaging client identifier, between 1 and 23 characters in length.
+ *
+ * @property {string} host - read only the server's DNS hostname or dotted decimal IP address.
+ * @property {number} port - read only the server's port.
+ * @property {string} path - read only the server's path.
+ * @property {string} clientId - read only used when connecting to the server.
+ * @property {function} onConnectionLost - called when a connection has been lost.
+ * after a connect() method has succeeded.
+ * Establish the call back used when a connection has been lost. The connection may be
+ * lost because the client initiates a disconnect or because the server or network
+ * cause the client to be disconnected. The disconnect call back may be called without
+ * the connectionComplete call back being invoked if, for example the client fails to
+ * connect.
+ * A single response object parameter is passed to the onConnectionLost callback containing the following fields:
+ *
+ * - errorCode
+ *
- errorMessage
+ *
+ * @property {function} onMessageDelivered - called when a message has been delivered.
+ * All processing that this Client will ever do has been completed. So, for example,
+ * in the case of a Qos=2 message sent by this client, the PubComp flow has been received from the server
+ * and the message has been removed from persistent storage before this callback is invoked.
+ * Parameters passed to the onMessageDelivered callback are:
+ *
+ * - {@link Paho.Message} that was delivered.
+ *
+ * @property {function} onMessageArrived - called when a message has arrived in this Paho.client.
+ * Parameters passed to the onMessageArrived callback are:
+ *
+ * - {@link Paho.Message} that has arrived.
+ *
+ * @property {function} onConnected - called when a connection is successfully made to the server.
+ * after a connect() method.
+ * Parameters passed to the onConnected callback are:
+ *
+ * - reconnect (boolean) - If true, the connection was the result of a reconnect.
+ * - URI (string) - The URI used to connect to the server.
+ *
+ * @property {boolean} disconnectedPublishing - if set, will enable disconnected publishing in
+ * in the event that the connection to the server is lost.
+ * @property {number} disconnectedBufferSize - Used to set the maximum number of messages that the disconnected
+ * buffer will hold before rejecting new messages. Default size: 5000 messages
+ * @property {function} trace - called whenever trace is called. TODO
+ */
+ var Client = function (host, port, path, clientId) {
+
+ var uri;
+
+ if (typeof host !== "string")
+ throw new Error(format(ERROR.INVALID_TYPE, [typeof host, "host"]));
+
+ if (arguments.length == 2) {
+ // host: must be full ws:// uri
+ // port: clientId
+ clientId = port;
+ uri = host;
+ var match = uri.match(/^(wss?):\/\/((\[(.+)\])|([^\/]+?))(:(\d+))?(\/.*)$/);
+ if (match) {
+ host = match[4]||match[2];
+ port = parseInt(match[7]);
+ path = match[8];
+ } else {
+ throw new Error(format(ERROR.INVALID_ARGUMENT,[host,"host"]));
+ }
+ } else {
+ if (arguments.length == 3) {
+ clientId = path;
+ path = "/mqtt";
+ }
+ if (typeof port !== "number" || port < 0)
+ throw new Error(format(ERROR.INVALID_TYPE, [typeof port, "port"]));
+ if (typeof path !== "string")
+ throw new Error(format(ERROR.INVALID_TYPE, [typeof path, "path"]));
+
+ var ipv6AddSBracket = (host.indexOf(":") !== -1 && host.slice(0,1) !== "[" && host.slice(-1) !== "]");
+ uri = "ws://"+(ipv6AddSBracket?"["+host+"]":host)+":"+port+path;
+ }
+
+ var clientIdLength = 0;
+ for (var i = 0; i 65535)
+ throw new Error(format(ERROR.INVALID_ARGUMENT, [clientId, "clientId"]));
+
+ var client = new ClientImpl(uri, host, port, path, clientId);
+
+ //Public Properties
+ Object.defineProperties(this,{
+ "host":{
+ get: function() { return host; },
+ set: function() { throw new Error(format(ERROR.UNSUPPORTED_OPERATION)); }
+ },
+ "port":{
+ get: function() { return port; },
+ set: function() { throw new Error(format(ERROR.UNSUPPORTED_OPERATION)); }
+ },
+ "path":{
+ get: function() { return path; },
+ set: function() { throw new Error(format(ERROR.UNSUPPORTED_OPERATION)); }
+ },
+ "uri":{
+ get: function() { return uri; },
+ set: function() { throw new Error(format(ERROR.UNSUPPORTED_OPERATION)); }
+ },
+ "clientId":{
+ get: function() { return client.clientId; },
+ set: function() { throw new Error(format(ERROR.UNSUPPORTED_OPERATION)); }
+ },
+ "onConnected":{
+ get: function() { return client.onConnected; },
+ set: function(newOnConnected) {
+ if (typeof newOnConnected === "function")
+ client.onConnected = newOnConnected;
+ else
+ throw new Error(format(ERROR.INVALID_TYPE, [typeof newOnConnected, "onConnected"]));
+ }
+ },
+ "disconnectedPublishing":{
+ get: function() { return client.disconnectedPublishing; },
+ set: function(newDisconnectedPublishing) {
+ client.disconnectedPublishing = newDisconnectedPublishing;
+ }
+ },
+ "disconnectedBufferSize":{
+ get: function() { return client.disconnectedBufferSize; },
+ set: function(newDisconnectedBufferSize) {
+ client.disconnectedBufferSize = newDisconnectedBufferSize;
+ }
+ },
+ "onConnectionLost":{
+ get: function() { return client.onConnectionLost; },
+ set: function(newOnConnectionLost) {
+ if (typeof newOnConnectionLost === "function")
+ client.onConnectionLost = newOnConnectionLost;
+ else
+ throw new Error(format(ERROR.INVALID_TYPE, [typeof newOnConnectionLost, "onConnectionLost"]));
+ }
+ },
+ "onMessageDelivered":{
+ get: function() { return client.onMessageDelivered; },
+ set: function(newOnMessageDelivered) {
+ if (typeof newOnMessageDelivered === "function")
+ client.onMessageDelivered = newOnMessageDelivered;
+ else
+ throw new Error(format(ERROR.INVALID_TYPE, [typeof newOnMessageDelivered, "onMessageDelivered"]));
+ }
+ },
+ "onMessageArrived":{
+ get: function() { return client.onMessageArrived; },
+ set: function(newOnMessageArrived) {
+ if (typeof newOnMessageArrived === "function")
+ client.onMessageArrived = newOnMessageArrived;
+ else
+ throw new Error(format(ERROR.INVALID_TYPE, [typeof newOnMessageArrived, "onMessageArrived"]));
+ }
+ },
+ "trace":{
+ get: function() { return client.traceFunction; },
+ set: function(trace) {
+ if(typeof trace === "function"){
+ client.traceFunction = trace;
+ }else{
+ throw new Error(format(ERROR.INVALID_TYPE, [typeof trace, "onTrace"]));
+ }
+ }
+ },
+ });
+
+ /**
+ * Connect this Messaging client to its server.
+ *
+ * @name Paho.Client#connect
+ * @function
+ * @param {object} connectOptions - Attributes used with the connection.
+ * @param {number} connectOptions.timeout - If the connect has not succeeded within this
+ * number of seconds, it is deemed to have failed.
+ * The default is 30 seconds.
+ * @param {string} connectOptions.userName - Authentication username for this connection.
+ * @param {string} connectOptions.password - Authentication password for this connection.
+ * @param {Paho.Message} connectOptions.willMessage - sent by the server when the client
+ * disconnects abnormally.
+ * @param {number} connectOptions.keepAliveInterval - the server disconnects this client if
+ * there is no activity for this number of seconds.
+ * The default value of 60 seconds is assumed if not set.
+ * @param {boolean} connectOptions.cleanSession - if true(default) the client and server
+ * persistent state is deleted on successful connect.
+ * @param {boolean} connectOptions.useSSL - if present and true, use an SSL Websocket connection.
+ * @param {object} connectOptions.invocationContext - passed to the onSuccess callback or onFailure callback.
+ * @param {function} connectOptions.onSuccess - called when the connect acknowledgement
+ * has been received from the server.
+ * A single response object parameter is passed to the onSuccess callback containing the following fields:
+ *
+ * - invocationContext as passed in to the onSuccess method in the connectOptions.
+ *
+ * @param {function} connectOptions.onFailure - called when the connect request has failed or timed out.
+ * A single response object parameter is passed to the onFailure callback containing the following fields:
+ *
+ * - invocationContext as passed in to the onFailure method in the connectOptions.
+ *
- errorCode a number indicating the nature of the error.
+ *
- errorMessage text describing the error.
+ *
+ * @param {array} connectOptions.hosts - If present this contains either a set of hostnames or fully qualified
+ * WebSocket URIs (ws://iot.eclipse.org:80/ws), that are tried in order in place
+ * of the host and port paramater on the construtor. The hosts are tried one at at time in order until
+ * one of then succeeds.
+ * @param {array} connectOptions.ports - If present the set of ports matching the hosts. If hosts contains URIs, this property
+ * is not used.
+ * @param {boolean} connectOptions.reconnect - Sets whether the client will automatically attempt to reconnect
+ * to the server if the connection is lost.
+ *
+ *- If set to false, the client will not attempt to automatically reconnect to the server in the event that the
+ * connection is lost.
+ *- If set to true, in the event that the connection is lost, the client will attempt to reconnect to the server.
+ * It will initially wait 1 second before it attempts to reconnect, for every failed reconnect attempt, the delay
+ * will double until it is at 2 minutes at which point the delay will stay at 2 minutes.
+ *
+ * @param {number} connectOptions.mqttVersion - The version of MQTT to use to connect to the MQTT Broker.
+ *
+ *- 3 - MQTT V3.1
+ *- 4 - MQTT V3.1.1
+ *
+ * @param {boolean} connectOptions.mqttVersionExplicit - If set to true, will force the connection to use the
+ * selected MQTT Version or will fail to connect.
+ * @param {array} connectOptions.uris - If present, should contain a list of fully qualified WebSocket uris
+ * (e.g. ws://iot.eclipse.org:80/ws), that are tried in order in place of the host and port parameter of the construtor.
+ * The uris are tried one at a time in order until one of them succeeds. Do not use this in conjunction with hosts as
+ * the hosts array will be converted to uris and will overwrite this property.
+ * @throws {InvalidState} If the client is not in disconnected state. The client must have received connectionLost
+ * or disconnected before calling connect for a second or subsequent time.
+ */
+ this.connect = function (connectOptions) {
+ connectOptions = connectOptions || {} ;
+ validate(connectOptions, {timeout:"number",
+ userName:"string",
+ password:"string",
+ willMessage:"object",
+ keepAliveInterval:"number",
+ cleanSession:"boolean",
+ useSSL:"boolean",
+ invocationContext:"object",
+ onSuccess:"function",
+ onFailure:"function",
+ hosts:"object",
+ ports:"object",
+ reconnect:"boolean",
+ mqttVersion:"number",
+ mqttVersionExplicit:"boolean",
+ uris: "object"});
+
+ // If no keep alive interval is set, assume 60 seconds.
+ if (connectOptions.keepAliveInterval === undefined)
+ connectOptions.keepAliveInterval = 60;
+
+ if (connectOptions.mqttVersion > 4 || connectOptions.mqttVersion < 3) {
+ throw new Error(format(ERROR.INVALID_ARGUMENT, [connectOptions.mqttVersion, "connectOptions.mqttVersion"]));
+ }
+
+ if (connectOptions.mqttVersion === undefined) {
+ connectOptions.mqttVersionExplicit = false;
+ connectOptions.mqttVersion = 4;
+ } else {
+ connectOptions.mqttVersionExplicit = true;
+ }
+
+ //Check that if password is set, so is username
+ if (connectOptions.password !== undefined && connectOptions.userName === undefined)
+ throw new Error(format(ERROR.INVALID_ARGUMENT, [connectOptions.password, "connectOptions.password"]));
+
+ if (connectOptions.willMessage) {
+ if (!(connectOptions.willMessage instanceof Message))
+ throw new Error(format(ERROR.INVALID_TYPE, [connectOptions.willMessage, "connectOptions.willMessage"]));
+ // The will message must have a payload that can be represented as a string.
+ // Cause the willMessage to throw an exception if this is not the case.
+ connectOptions.willMessage.stringPayload = null;
+
+ if (typeof connectOptions.willMessage.destinationName === "undefined")
+ throw new Error(format(ERROR.INVALID_TYPE, [typeof connectOptions.willMessage.destinationName, "connectOptions.willMessage.destinationName"]));
+ }
+ if (typeof connectOptions.cleanSession === "undefined")
+ connectOptions.cleanSession = true;
+ if (connectOptions.hosts) {
+
+ if (!(connectOptions.hosts instanceof Array) )
+ throw new Error(format(ERROR.INVALID_ARGUMENT, [connectOptions.hosts, "connectOptions.hosts"]));
+ if (connectOptions.hosts.length <1 )
+ throw new Error(format(ERROR.INVALID_ARGUMENT, [connectOptions.hosts, "connectOptions.hosts"]));
+
+ var usingURIs = false;
+ for (var i = 0; i
+ * @param {object} subscribeOptions - used to control the subscription
+ *
+ * @param {number} subscribeOptions.qos - the maximum qos of any publications sent
+ * as a result of making this subscription.
+ * @param {object} subscribeOptions.invocationContext - passed to the onSuccess callback
+ * or onFailure callback.
+ * @param {function} subscribeOptions.onSuccess - called when the subscribe acknowledgement
+ * has been received from the server.
+ * A single response object parameter is passed to the onSuccess callback containing the following fields:
+ *
+ * - invocationContext if set in the subscribeOptions.
+ *
+ * @param {function} subscribeOptions.onFailure - called when the subscribe request has failed or timed out.
+ * A single response object parameter is passed to the onFailure callback containing the following fields:
+ *
+ * - invocationContext - if set in the subscribeOptions.
+ *
- errorCode - a number indicating the nature of the error.
+ *
- errorMessage - text describing the error.
+ *
+ * @param {number} subscribeOptions.timeout - which, if present, determines the number of
+ * seconds after which the onFailure calback is called.
+ * The presence of a timeout does not prevent the onSuccess
+ * callback from being called when the subscribe completes.
+ * @throws {InvalidState} if the client is not in connected state.
+ */
+ this.subscribe = function (filter, subscribeOptions) {
+ if (typeof filter !== "string" && filter.constructor !== Array)
+ throw new Error("Invalid argument:"+filter);
+ subscribeOptions = subscribeOptions || {} ;
+ validate(subscribeOptions, {qos:"number",
+ invocationContext:"object",
+ onSuccess:"function",
+ onFailure:"function",
+ timeout:"number"
+ });
+ if (subscribeOptions.timeout && !subscribeOptions.onFailure)
+ throw new Error("subscribeOptions.timeout specified with no onFailure callback.");
+ if (typeof subscribeOptions.qos !== "undefined" && !(subscribeOptions.qos === 0 || subscribeOptions.qos === 1 || subscribeOptions.qos === 2 ))
+ throw new Error(format(ERROR.INVALID_ARGUMENT, [subscribeOptions.qos, "subscribeOptions.qos"]));
+ client.subscribe(filter, subscribeOptions);
+ };
+
+ /**
+ * Unsubscribe for messages, stop receiving messages sent to destinations described by the filter.
+ *
+ * @name Paho.Client#unsubscribe
+ * @function
+ * @param {string} filter - describing the destinations to receive messages from.
+ * @param {object} unsubscribeOptions - used to control the subscription
+ * @param {object} unsubscribeOptions.invocationContext - passed to the onSuccess callback
+ or onFailure callback.
+ * @param {function} unsubscribeOptions.onSuccess - called when the unsubscribe acknowledgement has been received from the server.
+ * A single response object parameter is passed to the
+ * onSuccess callback containing the following fields:
+ *
+ * - invocationContext - if set in the unsubscribeOptions.
+ *
+ * @param {function} unsubscribeOptions.onFailure called when the unsubscribe request has failed or timed out.
+ * A single response object parameter is passed to the onFailure callback containing the following fields:
+ *
+ * - invocationContext - if set in the unsubscribeOptions.
+ *
- errorCode - a number indicating the nature of the error.
+ *
- errorMessage - text describing the error.
+ *
+ * @param {number} unsubscribeOptions.timeout - which, if present, determines the number of seconds
+ * after which the onFailure callback is called. The presence of
+ * a timeout does not prevent the onSuccess callback from being
+ * called when the unsubscribe completes
+ * @throws {InvalidState} if the client is not in connected state.
+ */
+ this.unsubscribe = function (filter, unsubscribeOptions) {
+ if (typeof filter !== "string" && filter.constructor !== Array)
+ throw new Error("Invalid argument:"+filter);
+ unsubscribeOptions = unsubscribeOptions || {} ;
+ validate(unsubscribeOptions, {invocationContext:"object",
+ onSuccess:"function",
+ onFailure:"function",
+ timeout:"number"
+ });
+ if (unsubscribeOptions.timeout && !unsubscribeOptions.onFailure)
+ throw new Error("unsubscribeOptions.timeout specified with no onFailure callback.");
+ client.unsubscribe(filter, unsubscribeOptions);
+ };
+
+ /**
+ * Send a message to the consumers of the destination in the Message.
+ *
+ * @name Paho.Client#send
+ * @function
+ * @param {string|Paho.Message} topic - mandatory The name of the destination to which the message is to be sent.
+ * - If it is the only parameter, used as Paho.Message object.
+ * @param {String|ArrayBuffer} payload - The message data to be sent.
+ * @param {number} qos The Quality of Service used to deliver the message.
+ *
+ * - 0 Best effort (default).
+ *
- 1 At least once.
+ *
- 2 Exactly once.
+ *
+ * @param {Boolean} retained If true, the message is to be retained by the server and delivered
+ * to both current and future subscriptions.
+ * If false the server only delivers the message to current subscribers, this is the default for new Messages.
+ * A received message has the retained boolean set to true if the message was published
+ * with the retained boolean set to true
+ * and the subscrption was made after the message has been published.
+ * @throws {InvalidState} if the client is not connected.
+ */
+ this.send = function (topic,payload,qos,retained) {
+ var message ;
+
+ if(arguments.length === 0){
+ throw new Error("Invalid argument."+"length");
+
+ }else if(arguments.length == 1) {
+
+ if (!(topic instanceof Message) && (typeof topic !== "string"))
+ throw new Error("Invalid argument:"+ typeof topic);
+
+ message = topic;
+ if (typeof message.destinationName === "undefined")
+ throw new Error(format(ERROR.INVALID_ARGUMENT,[message.destinationName,"Message.destinationName"]));
+ client.send(message);
+
+ }else {
+ //parameter checking in Message object
+ message = new Message(payload);
+ message.destinationName = topic;
+ if(arguments.length >= 3)
+ message.qos = qos;
+ if(arguments.length >= 4)
+ message.retained = retained;
+ client.send(message);
+ }
+ };
+
+ /**
+ * Publish a message to the consumers of the destination in the Message.
+ * Synonym for Paho.Mqtt.Client#send
+ *
+ * @name Paho.Client#publish
+ * @function
+ * @param {string|Paho.Message} topic - mandatory The name of the topic to which the message is to be published.
+ * - If it is the only parameter, used as Paho.Message object.
+ * @param {String|ArrayBuffer} payload - The message data to be published.
+ * @param {number} qos The Quality of Service used to deliver the message.
+ *
+ * - 0 Best effort (default).
+ *
- 1 At least once.
+ *
- 2 Exactly once.
+ *
+ * @param {Boolean} retained If true, the message is to be retained by the server and delivered
+ * to both current and future subscriptions.
+ * If false the server only delivers the message to current subscribers, this is the default for new Messages.
+ * A received message has the retained boolean set to true if the message was published
+ * with the retained boolean set to true
+ * and the subscrption was made after the message has been published.
+ * @throws {InvalidState} if the client is not connected.
+ */
+ this.publish = function(topic,payload,qos,retained) {
+ var message ;
+
+ if(arguments.length === 0){
+ throw new Error("Invalid argument."+"length");
+
+ }else if(arguments.length == 1) {
+
+ if (!(topic instanceof Message) && (typeof topic !== "string"))
+ throw new Error("Invalid argument:"+ typeof topic);
+
+ message = topic;
+ if (typeof message.destinationName === "undefined")
+ throw new Error(format(ERROR.INVALID_ARGUMENT,[message.destinationName,"Message.destinationName"]));
+ client.send(message);
+
+ }else {
+ //parameter checking in Message object
+ message = new Message(payload);
+ message.destinationName = topic;
+ if(arguments.length >= 3)
+ message.qos = qos;
+ if(arguments.length >= 4)
+ message.retained = retained;
+ client.send(message);
+ }
+ };
+
+ /**
+ * Normal disconnect of this Messaging client from its server.
+ *
+ * @name Paho.Client#disconnect
+ * @function
+ * @throws {InvalidState} if the client is already disconnected.
+ */
+ this.disconnect = function () {
+ client.disconnect();
+ };
+
+ /**
+ * Get the contents of the trace log.
+ *
+ * @name Paho.Client#getTraceLog
+ * @function
+ * @return {Object[]} tracebuffer containing the time ordered trace records.
+ */
+ this.getTraceLog = function () {
+ return client.getTraceLog();
+ };
+
+ /**
+ * Start tracing.
+ *
+ * @name Paho.Client#startTrace
+ * @function
+ */
+ this.startTrace = function () {
+ client.startTrace();
+ };
+
+ /**
+ * Stop tracing.
+ *
+ * @name Paho.Client#stopTrace
+ * @function
+ */
+ this.stopTrace = function () {
+ client.stopTrace();
+ };
+
+ this.isConnected = function() {
+ return client.connected;
+ };
+ };
+
+ /**
+ * An application message, sent or received.
+ *
+ * All attributes may be null, which implies the default values.
+ *
+ * @name Paho.Message
+ * @constructor
+ * @param {String|ArrayBuffer} payload The message data to be sent.
+ *
+ * @property {string} payloadString read only The payload as a string if the payload consists of valid UTF-8 characters.
+ * @property {ArrayBuffer} payloadBytes read only The payload as an ArrayBuffer.
+ *
+ * @property {string} destinationName mandatory The name of the destination to which the message is to be sent
+ * (for messages about to be sent) or the name of the destination from which the message has been received.
+ * (for messages received by the onMessage function).
+ *
+ * @property {number} qos The Quality of Service used to deliver the message.
+ *
+ * - 0 Best effort (default).
+ *
- 1 At least once.
+ *
- 2 Exactly once.
+ *
+ *
+ * @property {Boolean} retained If true, the message is to be retained by the server and delivered
+ * to both current and future subscriptions.
+ * If false the server only delivers the message to current subscribers, this is the default for new Messages.
+ * A received message has the retained boolean set to true if the message was published
+ * with the retained boolean set to true
+ * and the subscrption was made after the message has been published.
+ *
+ * @property {Boolean} duplicate read only If true, this message might be a duplicate of one which has already been received.
+ * This is only set on messages received from the server.
+ *
+ */
+ var Message = function (newPayload) {
+ var payload;
+ if ( typeof newPayload === "string" ||
+ newPayload instanceof ArrayBuffer ||
+ (ArrayBuffer.isView(newPayload) && !(newPayload instanceof DataView))
+ ) {
+ payload = newPayload;
+ } else {
+ throw (format(ERROR.INVALID_ARGUMENT, [newPayload, "newPayload"]));
+ }
+
+ var destinationName;
+ var qos = 0;
+ var retained = false;
+ var duplicate = false;
+
+ Object.defineProperties(this,{
+ "payloadString":{
+ enumerable : true,
+ get : function () {
+ if (typeof payload === "string")
+ return payload;
+ else
+ return parseUTF8(payload, 0, payload.length);
+ }
+ },
+ "payloadBytes":{
+ enumerable: true,
+ get: function() {
+ if (typeof payload === "string") {
+ var buffer = new ArrayBuffer(UTF8Length(payload));
+ var byteStream = new Uint8Array(buffer);
+ stringToUTF8(payload, byteStream, 0);
+
+ return byteStream;
+ } else {
+ return payload;
+ }
+ }
+ },
+ "destinationName":{
+ enumerable: true,
+ get: function() { return destinationName; },
+ set: function(newDestinationName) {
+ if (typeof newDestinationName === "string")
+ destinationName = newDestinationName;
+ else
+ throw new Error(format(ERROR.INVALID_ARGUMENT, [newDestinationName, "newDestinationName"]));
+ }
+ },
+ "qos":{
+ enumerable: true,
+ get: function() { return qos; },
+ set: function(newQos) {
+ if (newQos === 0 || newQos === 1 || newQos === 2 )
+ qos = newQos;
+ else
+ throw new Error("Invalid argument:"+newQos);
+ }
+ },
+ "retained":{
+ enumerable: true,
+ get: function() { return retained; },
+ set: function(newRetained) {
+ if (typeof newRetained === "boolean")
+ retained = newRetained;
+ else
+ throw new Error(format(ERROR.INVALID_ARGUMENT, [newRetained, "newRetained"]));
+ }
+ },
+ "topic":{
+ enumerable: true,
+ get: function() { return destinationName; },
+ set: function(newTopic) {destinationName=newTopic;}
+ },
+ "duplicate":{
+ enumerable: true,
+ get: function() { return duplicate; },
+ set: function(newDuplicate) {duplicate=newDuplicate;}
+ }
+ });
+ };
+
+ // Module contents.
+ return {
+ Client: Client,
+ Message: Message
+ };
+ // eslint-disable-next-line no-nested-ternary
+ })(typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {});
+ return PahoMQTT;
+});
\ No newline at end of file
diff --git a/src/FLAD/lib/storage.js b/src/FLAD/lib/storage.js
new file mode 100644
index 0000000..809ba35
--- /dev/null
+++ b/src/FLAD/lib/storage.js
@@ -0,0 +1,10 @@
+const storage = {
+ setItem: (key, item) => {
+ storage[key] = item;
+ },
+ getItem: key => storage[key],
+ removeItem: key => {
+ delete storage[key];
+ },
+ };
+ export default storage;
\ No newline at end of file
diff --git a/src/FLAD/navigation/AuthNavigation.tsx b/src/FLAD/navigation/AuthNavigation.tsx
index e8c2e32..5f32fc1 100644
--- a/src/FLAD/navigation/AuthNavigation.tsx
+++ b/src/FLAD/navigation/AuthNavigation.tsx
@@ -8,8 +8,12 @@ import * as SplashScreen from 'expo-splash-screen';
import { ChangeMode, getRefreshToken } from '../redux/thunk/authThunk';
import * as Location from 'expo-location';
import SpotifyService from '../services/spotify/spotify.service';
-import { getCurrentUserMusic } from '../redux/thunk/spotThunk';
+import { getCurrentUserMusic, getSpotList } from '../redux/thunk/spotThunk';
import Music from '../Model/Music';
+import axios from 'axios';
+import qs from 'qs';
+import * as SecureStore from 'expo-secure-store';
+import { MY_SECURE_AUTH_STATE_KEY } from '../screens/Register';
export default function AuthNavigation() {
//@ts-ignore
@@ -18,6 +22,8 @@ export default function AuthNavigation() {
const isLogin: boolean = useSelector(state => state.userReducer.isLogedIn);
//@ts-ignore
const currentMusic: Music = useSelector(state => state.appReducer.userCurrentMusic);
+ //@ts-ignore
+ const tokenSend: string = useSelector(state => state.userReducer.userFladToken);
const [appIsReady, setAppIsReady] = useState(false);
const dispatch = useDispatch();
@@ -45,37 +51,67 @@ export default function AuthNavigation() {
console.log(`Une erreur s'est produite lors de la mise à jour de la valeur booléenne pour la clé 'dark': `, error);
}
}
-
+ const requestLocationPermission = async () => {
+ const { status } = await Location.requestForegroundPermissionsAsync();
+ if (status !== 'granted') {
+ console.log('Permission to access location was denied');
+ } else {
+ console.log('Permission to access location was granted');
+ }
+ }
+ console.log(currentMusic + 'luuuuuuuiii')
useEffect(() => {
ChangeDarkMode();
prepare();
- }, [appIsReady, tokenProcesed]);
- useEffect(() => {
-
+ requestLocationPermission();
const sendLocationUpdate = async () => {
try {
+
+ let tmpKey: string = await SecureStore.getItemAsync(MY_SECURE_AUTH_STATE_KEY) ;
//@ts-ignore
- await dispatch(getCurrentUserMusic(theService))
+ await dispatch(getCurrentUserMusic(new SpotifyService(tmpKey)))
let { status } = await Location.requestForegroundPermissionsAsync();
-
if (status == 'granted') {
- console.log(appIsReady)
- if (true) {// should app is ready
+ // should app is ready
const locationresp = await Location.getCurrentPositionAsync({});
- setLocation(locationresp);
// send location to server
- console.log(locationresp);
- console.log(location);
- const body: Record = {
- longitude: locationresp.coords.longitude,
- latitude: locationresp.coords.latitude,
- currentMusic: currentMusic.id
+ if(currentMusic){
+
+ const body: Record = {
+ longitude: locationresp.coords.longitude,
+ latitude: locationresp.coords.latitude,
+ currentMusic: currentMusic.id
+ }
+ console.log('===========================================================================================================')
+ console.log(body)
+ console.log('===========================================================================================================')
+
+ const resp = await axios({
+ url: 'https://flad-api-production.up.railway.app/api/users/nextTo?' + qs.stringify(body),
+ method: 'GET',
+ headers: {
+ Authorization: `Bearer ${tokenSend}`,
+ },
+ });
+ const datat: Record = resp.data.listUser2;
+ //@ts-ignore
+ dispatch(getSpotList(datat, new SpotifyService(tmpKey)))
}
- }
+ else{
+ return;
+ }
+
+
}
else {
- setErrorMsg('Permission to access location was denied');
+ //@ts-ignore
+ let {status} = Location.requestForegroundPermissionsAsync();
+ if (status !== 'granted') {
+ setErrorMsg('Permission to access location was denied');
+ return;
+ }
return;
+
}
} catch (error) {
console.log(error);
@@ -85,21 +121,21 @@ export default function AuthNavigation() {
return () => {
clearInterval(interval);
};
- }, []);
+ }, [appIsReady, tokenProcesed, currentMusic]);
+
+
if (tokenProcesed == false) {
return null;
}
return (
+
setAppIsReady(true)}>
{isLogin ? (
) :
-
+
}
)
}
-
-const theService = new SpotifyService('BQC0rAGJvxTt4-24P-nda6qP9iXYCql2eApnUAoEbZZkKemJ11cU3Nx-I_tKVX0FwEgFbIbSIuaVvxOapRVJq2z1Htyy3XQ5jIYNsrhrnp3KTCfppamAjxgDTf6khBrNGTxe6CNKBsMhc5IRnphey5Td2zJPvGMwnFFfMQdCtVAVsCNK7kPKlCAaf_kRMAoPn30Qk4RD45XmwtZIwQg7X0J4beGuHSiBf0MRjhsnFEW89GxVm8YuIVwgrDbF3izfPR0AlqS4IMJT5m4pEA72lYEwp1JnSDVsafILzmksaqG-11H3WAsWIENrOIu_j7qNgbvYwmUWXOrYmeWBkQ');
-
diff --git a/src/FLAD/navigation/SpotNavigation.tsx b/src/FLAD/navigation/SpotNavigation.tsx
index 4b46b08..af8a5ac 100644
--- a/src/FLAD/navigation/SpotNavigation.tsx
+++ b/src/FLAD/navigation/SpotNavigation.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import { createStackNavigator } from '@react-navigation/stack';
-import SpotPage from '../screens/Spot'
+import SpotPage from '../screens/spot'
import MusicDetail from '../screens/MusicDetail';
diff --git a/src/FLAD/package.json b/src/FLAD/package.json
index f036a5a..0cc7b14 100644
--- a/src/FLAD/package.json
+++ b/src/FLAD/package.json
@@ -49,7 +49,8 @@
"react-native-web": "~0.18.9",
"react-navigation-shared-element": "^3.1.3",
"react-redux": "^8.0.5",
- "redux": "^4.2.1"
+ "redux": "^4.2.1",
+ "expo-linking": "~3.3.1"
},
"devDependencies": {
"@babel/core": "^7.12.9",
diff --git a/src/FLAD/redux/actions/spotActions.tsx b/src/FLAD/redux/actions/spotActions.tsx
index 2bbdf45..6276b10 100644
--- a/src/FLAD/redux/actions/spotActions.tsx
+++ b/src/FLAD/redux/actions/spotActions.tsx
@@ -9,6 +9,19 @@ export const setSpotList = (spotList: Spot[]) => {
payload: spotList,
};
}
+export const removeFromSpotList = (spot: Spot) => {
+ return {
+ type: spotTypes.REMOVE_SPOT,
+ payload: spot
+ }
+}
+
+export const addSpotListMock = (spotList: Spot[]) => {
+ return {
+ type: spotTypes.ADD_SPOT_MOCK,
+ payload: spotList,
+ };
+}
export const setUserCurrentMusic = (currentMusic: Music) => {
return {
diff --git a/src/FLAD/redux/reducers/appReducer.tsx b/src/FLAD/redux/reducers/appReducer.tsx
index 41faf1c..95db813 100644
--- a/src/FLAD/redux/reducers/appReducer.tsx
+++ b/src/FLAD/redux/reducers/appReducer.tsx
@@ -5,15 +5,9 @@ import { favoritesTypes } from "../types/favoritesTypes";
import { spotifyTypes } from "../types/spotifyTypes";
import { spotTypes } from "../types/spotTypes";
-let tmpMusic: Music[] = [
- new Music("03o8WSqd2K5rkGvn9IsLy2", "Autobahn", "Sch", "https://images.genius.com/83b6c98680d38bde1571f6b4093244b5.1000x1000x1.jpg", "https://p.scdn.co/mp3-preview/c55f95de81b8c3d0df04148da1b03bd38db56e8f?cid=774b29d4f13844c495f206cafdad9c86"),
- new Music("6DPrYPPGYK218iVIZDix3i", "Freeze Raël", "Freeze Corleone", "https://intrld.com/wp-content/uploads/2020/08/freeze-corleone-la-menace-fanto%CC%82me.png", "https://p.scdn.co/mp3-preview/a9f9cb19ac1fe6db0d06b67decf8edbb25895a33?cid=774b29d4f13844c495f206cafdad9c86"),
- new Music("5GFHFEASZeJF0gyWuDDjGE", "Kratos", "PNL", "https://upload.wikimedia.org/wikipedia/en/a/a0/PNL_-_Dans_la_l%C3%A9gende.png", "https://p.scdn.co/mp3-preview/9e854f4905c1228482e390169eb76d8520076b8f?cid=774b29d4f13844c495f206cafdad9c86"),
-];
-
const initialState = {
spot: [] as Spot[],
- favoriteMusic: tmpMusic,
+ favoriteMusic: [] as Music[],
userCurrentMusic: null
}
@@ -26,7 +20,13 @@ const appReducer = (state = initialState, action: any) => {
case favoritesTypes.REMOVE_FAVORITE_MUSICS:
return { ...state, favoriteMusic: state.favoriteMusic };
case spotTypes.FETCH_SPOT:
- return { ...state, spot: action.payload };
+ const uniqueSpots = action.payload.filter((spot) => {
+ return !state.spot.some((s) => s.userSpotifyId === spot.userSpotifyId && s.music.id === spot.music.id);
+ });
+ const updatedSpotList = [...uniqueSpots, ...state.spot];
+ return { ...state, spot: updatedSpotList };
+ case spotTypes.REMOVE_SPOT:
+ return { ...state, spot: state.spot.filter((spot) => spot.userSpotifyId !== action.payload.userSpotifyId && spot.music.id !== action.payload.music.id) };
case discoveriesTypes.FETCH_DISCOVERIES:
return;
case spotifyTypes.GET_USER_CURRENT_MUSIC:
diff --git a/src/FLAD/redux/thunk/authThunk.tsx b/src/FLAD/redux/thunk/authThunk.tsx
index 4780249..82ee547 100644
--- a/src/FLAD/redux/thunk/authThunk.tsx
+++ b/src/FLAD/redux/thunk/authThunk.tsx
@@ -10,13 +10,17 @@ export const registerUser = (resgisterCredential: CredentialsRegister) => {
//@ts-ignore
return async dispatch => {
try {
+ console.log("rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr")
+
+ console.log(resgisterCredential);
+ console.log("rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr")
const config = {
headers: {
'Content-Type': 'application/json',
},
}
const resp = await axios.post(
- `${API_URL}/api/users/register`,
+ 'https://flad-api-production.up.railway.app/api/users/register',
resgisterCredential,
config
)
@@ -37,6 +41,7 @@ export const registerUser = (resgisterCredential: CredentialsRegister) => {
}
} catch (error) {
+ console.log('Login Failed'+ error.message + "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
dispatch(ChangeErrorSignup())
}
}
diff --git a/src/FLAD/redux/thunk/spotThunk.tsx b/src/FLAD/redux/thunk/spotThunk.tsx
index 6b944ef..383aeea 100644
--- a/src/FLAD/redux/thunk/spotThunk.tsx
+++ b/src/FLAD/redux/thunk/spotThunk.tsx
@@ -12,26 +12,16 @@ export type CreateSpotReqBody = {
linkCover: string;
user: string;
}
-export const getSpotList = (resuestHandler: SpotifyService) => {
+export const getSpotList = (spotsData : Record , resuestHandler: SpotifyService) => {
+
+ console.log('oooooooooooooooooooooooooooostrat2oooooooooooooooooooooooooooooooooooo')
//@ts-ignore
return async dispatch => {
try {
//@ts-ignore
- const userToken: string = await SecureStore.getItemAsync(key);
- const headers = {
- 'Authorization': 'Bearer ' + userToken
- };
- const data = await axios.get(
- "https://flad-api-production.up.railway.app/api/users/nextTo",
- { headers }
- )
- if (data.data.token) {
- const spotsData: { [userId: string]: string } = {};
-
- for (const item of data.data) {
- spotsData[item.user] = item.music;
- }
+ if (spotsData) {
+
const spots = await Promise.all(
Object.entries(spotsData).map(async ([userId, value]) => {
const completeMusic = await resuestHandler.getMusicById(value);
@@ -64,6 +54,9 @@ export const getCurrentUserMusic = (resuestHandler: SpotifyService) => {
}
}
const completeMusic = await resuestHandler.getMusicById(currentTrackResponse);
+ if(!completeMusic){
+ return;
+ }
dispatch(setUserCurrentMusic(completeMusic));
}
catch (error) {
diff --git a/src/FLAD/redux/types/spotTypes.tsx b/src/FLAD/redux/types/spotTypes.tsx
index 559d2f0..8a8f70b 100644
--- a/src/FLAD/redux/types/spotTypes.tsx
+++ b/src/FLAD/redux/types/spotTypes.tsx
@@ -1,3 +1,5 @@
export const spotTypes = {
FETCH_SPOT: 'FETCH_SPOT',
+ ADD_SPOT_MOCK: 'ADD_SPOT_MOCK',
+ REMOVE_SPOT: 'REMOVE_SPOT',
}
\ No newline at end of file
diff --git a/src/FLAD/screens/Register.tsx b/src/FLAD/screens/Register.tsx
index ef087f5..1e675ba 100644
--- a/src/FLAD/screens/Register.tsx
+++ b/src/FLAD/screens/Register.tsx
@@ -18,20 +18,15 @@ const DismissKeyboard = ({ children }) => (
)
-export const MY_SECURE_AUTH_STATE_KEY = 'MySecureAuthStateKey';
+export const MY_SECURE_AUTH_STATE_KEY = 'MySecureAuthStateKeySpotify';
+export const MY_SECURE_AUTH_STATE_KEY_REFRESH = 'MySecureAuthStateKeySpotifyREFRESH';
WebBrowser.maybeCompleteAuthSession();
-// Endpoint
-const discovery = {
- authorizationEndpoint: 'https://accounts.spotify.com/authorize',
- tokenEndpoint: 'https://accounts.spotify.com/api/token',
-};
// save the spotifyToken
async function save(key: string, value: string) {
await SecureStore.setItemAsync(key, value);
}
-
export default function InscriptionPage() {
const [sound, setSound] = useState();
const navigation = useNavigation();
@@ -46,34 +41,10 @@ export default function InscriptionPage() {
setSound(sound);
await sound.playAsync();
}
-
const [username, setUsername] = useState('');
const [email, setEmail] = useState('');
const [password, setPassword] = useState('');
- //spotify auth
- const [response] = useAuthRequest(
- {
- responseType: AuthSession.ResponseType.Token,
- clientId: '1f1e34e4b6ba48b388469dba80202b10',
- scopes: ['user-read-private', 'user-read-email', 'user-read-playback-state', 'user-read-currently-playing', 'user-read-recently-played', 'playlist-modify-public', 'ugc-image-upload', 'user-modify-playback-state'],
- redirectUri: makeRedirectUri({
- scheme: 'flad'
- }),
- },
- discovery
- );
- useEffect(() => {
- if (response && response.type === 'success') {
- const auth = response.params.access_token;
- const storageValue = JSON.stringify(auth);
-
- if (Platform.OS !== 'web') {
- // Securely store the auth on your device
- save(MY_SECURE_AUTH_STATE_KEY, storageValue);
- }
- }
- }, [response]);
const dispatch = useDispatch();
@@ -83,7 +54,7 @@ export default function InscriptionPage() {
password: password,
idSpotify: spotifyToken,
name: username,
- idFlad: "3030"
+ idFlad: "9835698"
};
//@ts-ignore
dispatch(registerUser(credentials))
@@ -91,19 +62,24 @@ export default function InscriptionPage() {
}
const getTokens2 = async () => {
try {
- const response = await fetch('https://flad-api-production.up.railway.app/api/spotify/callback');
- const responseJson = await response.json();
+ const redirectUri = AuthSession.makeRedirectUri();
+ const result = await AuthSession.startAsync({
+ authUrl: 'https://flad-api-production.up.railway.app/api/spotify/exchange?' + '&redirectUrl=' +
+ encodeURIComponent(redirectUri)
+ })
const {
- access_token: accessToken,
- } = responseJson;
-
- await setSpotifyToken(accessToken);
-
- console.log(spotifyToken);
+ access_token: access_token,
+ refresh_token: refresh_token,
+ } = result.params
+ save(MY_SECURE_AUTH_STATE_KEY, access_token);
+ setSpotifyToken(access_token)
+ save(MY_SECURE_AUTH_STATE_KEY_REFRESH, refresh_token);
} catch (err) {
console.error(err);
}
}
+
+
return (
diff --git a/src/FLAD/screens/Setting.tsx b/src/FLAD/screens/Setting.tsx
index 1c152ad..d312ee0 100644
--- a/src/FLAD/screens/Setting.tsx
+++ b/src/FLAD/screens/Setting.tsx
@@ -332,7 +332,7 @@ export default function Setting() {
-
+
diff --git a/src/FLAD/screens/login.tsx b/src/FLAD/screens/login.tsx
index 318cdaa..f3ebdb2 100644
--- a/src/FLAD/screens/login.tsx
+++ b/src/FLAD/screens/login.tsx
@@ -6,8 +6,6 @@ import { makeRedirectUri, useAuthRequest } from 'expo-auth-session';
import { Buffer } from 'buffer';
import * as SecureStore from 'expo-secure-store';
-export const MY_SECURE_AUTH_STATE_KEY = 'MySecureAuthStateKey'
-
WebBrowser.maybeCompleteAuthSession()
const discovery = {
diff --git a/src/FLAD/screens/spot.tsx b/src/FLAD/screens/spot.tsx
index c2cc953..e0fbf1e 100644
--- a/src/FLAD/screens/spot.tsx
+++ b/src/FLAD/screens/spot.tsx
@@ -1,5 +1,5 @@
import { View, Text, Dimensions, StyleSheet, ImageBackground, Pressable, TouchableOpacity, SafeAreaView } from 'react-native'
-import React, { useCallback, useRef, useState } from 'react'
+import React, { useCallback, useEffect, useRef, useState } from 'react'
import { LinearGradient } from 'expo-linear-gradient';
import * as Haptics from 'expo-haptics';
import Animated from 'react-native-reanimated';
@@ -13,30 +13,39 @@ import FladLoading from '../components/FladLoadingScreen';
import { useNavigation } from '@react-navigation/native';
import Music from '../Model/Music';
import { addFavoritesMusic } from '../redux/actions/appActions';
-import { useDispatch } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
import { Spot } from '../Model/Spot';
+import { removeFromSpotList, setSpotList } from '../redux/actions/spotActions';
export default function SpotPage() {
- const [cards, setCards] = useState(spotArray2);
+ //@ts-ignore
+ const spotReducer = useSelector(state => state.appReducer.spot)
+ const [cards, setCards] = useState(spotReducer);
+
const [currentCard, setcurrentCard] = useState(cards[cards.length - 1]);
+ useEffect(() => {
+ console.log(cards.length + "================================== cards");
+ console.log(spotReducer.length + "================================== spotReducer")
+ setCards(spotReducer);
+ // update the state of the cards state variable
+ setcurrentCard(spotReducer[spotReducer.length - 1]);
+ }, [spotReducer]);
+
const onSwipe = (index: number, direction: 'left' | 'right' | 'down') => {
if (direction === 'right') {
// Swiped right
- addLike(currentCard.music);
+ addLike(currentCard);
} else if (direction === 'left') {
// Swiped left
console.log('Swiped left');
+ removeSpots(currentCard);
}
else if (direction === 'down') {
// Swiped down
+ addMockSpots();
console.log('Swiped down');
}
- // update the state of the cards state when it remove this
- setTimeout(() => {
- setCards(cards.filter((_, i) => i !== index));
- setcurrentCard(cards[index - 1]);
- }, 3);
};
const likeButtonref = useRef(null);
@@ -46,12 +55,23 @@ export default function SpotPage() {
likeButtonref.current?.play(55, 0);
}, [])
const dispatch = useDispatch();
-
- function addLike(music: Music) {
+
+ function addLike(spot: Spot) {
onLike();
- dispatch(addFavoritesMusic(music))
+ dispatch(addFavoritesMusic(spot.music))
+ dispatch(removeFromSpotList(spot));
+ }
+ function removeSpots(spot: Spot) {
+ dispatch(removeFromSpotList(spot));
+ }
+
+ function addMockSpots() {
+ //@ts-ignore
+ dispatch(setSpotList(spotArray2))
}
+
+
const navigator = useNavigation();
const { width: wWidht } = Dimensions.get("window");
@@ -106,7 +126,6 @@ export default function SpotPage() {
{cards.map((card, index) => (
-
{ hapti(card) }} >
-
+
diff --git a/src/FLAD/services/message/chatService.ts b/src/FLAD/services/message/chatService.ts
new file mode 100644
index 0000000..40c8fcc
--- /dev/null
+++ b/src/FLAD/services/message/chatService.ts
@@ -0,0 +1,11 @@
+// function onSubscribeHandler() {
+// MqttClient.onSubscribe(subscribeTopic, onSubscribe);
+// }
+
+// function onPublishHandler() {
+// MqttClient.onPublish(publishTopic, publishPayload);
+// }
+
+// function unSubscribeHandler() {
+// MqttClient.unsubscribe(subscribeTopic);
+// }
\ No newline at end of file
diff --git a/src/FLAD/services/spotify/spotifyRequestHandler/utils.tsx b/src/FLAD/services/spotify/spotifyRequestHandler/utils.tsx
index 102114e..34c67be 100644
--- a/src/FLAD/services/spotify/spotifyRequestHandler/utils.tsx
+++ b/src/FLAD/services/spotify/spotifyRequestHandler/utils.tsx
@@ -1,4 +1,6 @@
import axios, { AxiosResponse } from "axios";
+import { MY_SECURE_AUTH_STATE_KEY, MY_SECURE_AUTH_STATE_KEY_REFRESH } from "../../../screens/Register";
+import * as SecureStore from 'expo-secure-store';
export type Methods = 'GET' | 'POST' | 'DELETE' | 'PUT' | 'PATCH';
@@ -32,10 +34,45 @@ export class RequestHandler {
},
data: options.body
});
+
return resp;
}
- catch(error : any){}
+ catch(error : any){
+ const errorMessage = error.response.data?.error?.message;
+ if (errorMessage === "Invalid access token" || errorMessage === "The access token expired" ) {
+ console.log('### Warning ! ### try refresh token Request Handler ' +error);
+
+ const newToken = await this.refreshToken();
+ console.log('### GOOD Warning ! ### new token Request Handler ' +newToken);
+ // Mettez à jour le token dans le store ou le reducer ici
+ return this.spotifyFetch(url, options, newToken);
+ }
+ else {
+ console.log('### Error ! ### while fetching Data in the SPotify Request Handler ' +error);
+ throw error;
+ }
+ }
+ }
+ private async refreshToken(): Promise {
+
+ // Faites une demande à votre API pour obtenir un nouveau token Spotify
+ let refreshToken = await SecureStore.getItemAsync(MY_SECURE_AUTH_STATE_KEY_REFRESH);
+ console.log('refresh token : ' + refreshToken);
+ const response = await axios.get(`https://flad-api-production.up.railway.app/api/spotify/refresh?refresh_token=${refreshToken}`);
+ // Renvoie le nouveau token
+ const {
+ access_token : access_token,
+ refresh_token: refresh_token,
+ } = response.data as SpotifyAuthResponse
+ console.log('new access token : ' + access_token);
+ console.log('new refresh token : ' + refresh_token);
+ await SecureStore.setItemAsync(MY_SECURE_AUTH_STATE_KEY, access_token);
+ return access_token;
}
}
-export class AuthHandler{}
+
+interface SpotifyAuthResponse {
+ access_token: string;
+ refresh_token: string;
+ }
\ No newline at end of file
diff --git a/src/FLAD/services/user/userService.service.tsx b/src/FLAD/services/user/userService.service.tsx
index 4ebf0af..8c9cee9 100644
--- a/src/FLAD/services/user/userService.service.tsx
+++ b/src/FLAD/services/user/userService.service.tsx
@@ -1,13 +1,5 @@
-import { AuthentificationService } from "../Auth/authentificationService.service";
export class UserService {
- constructor(private auth: AuthentificationService) { }
-
- getUserProfile() {
- const user = this.auth.currentUser;
- const userDocRef = doc(this.firestore, `User/${user.uid}`);
- return docData(userDocRef);
- }
}
diff --git a/src/FLAD/utils/MqttClient.js b/src/FLAD/utils/MqttClient.js
new file mode 100644
index 0000000..59c3d25
--- /dev/null
+++ b/src/FLAD/utils/MqttClient.js
@@ -0,0 +1,80 @@
+import initialize from '../lib';
+
+initialize();
+class MqttClient {
+
+ constructor() {
+ const clientId = 'ReactNativeMqtt';
+ this.client = new Paho.MQTT.Client('127.0.0.1', 9001, clientId);
+ this.client.onMessageArrived = this.onMessageArrived;
+ this.callbacks = {};
+ this.onSuccessHandler = undefined;
+ this.onConnectionLostHandler = undefined;
+ this.isConnected = false;
+ }
+
+ onConnect = (onSuccessHandler, onConnectionLostHandler) => {
+ this.onSuccessHandler = onSuccessHandler;
+ this.onConnectionLostHandler = onConnectionLostHandler;
+ this.client.onConnectionLost = () => {
+ this.isConnected = false;
+ onConnectionLostHandler();
+ };
+
+ this.client.connect({
+ timeout: 10,
+ onSuccess: () => {
+ this.isConnected = true;
+ onSuccessHandler();
+ },
+ useSSL: false,
+ onFailure: this.onError,
+ reconnect: true,
+ keepAliveInterval: 20,
+ cleanSession: true,
+ });
+ };
+
+ onError = ({errorMessage}) => {
+ console.log(errorMessage);
+ this.isConnected = false;
+ Alert.alert('Failed', 'Failed to connect to MQTT', [
+ {
+ text: 'Cancel',
+ onPress: () => console.log('Cancel Pressed'),
+ style: 'cancel',
+ },
+ {
+ text: 'Try Again',
+ onPress: () =>
+ this.onConnect(
+ this.onSuccessHandler,
+ this.onConnectionLostHandler,
+ ),
+ },
+ ]);
+ };
+
+ onMessageArrived = message => {
+ const {payloadString, topic} = message;
+ console.log('onMessageArrived:', payloadString);
+ this.callbacks[topic](payloadString);
+ };
+
+ onPublish = (topic, message) => {
+ this.client.publish(topic, message);
+ };
+
+ onSubscribe = (topic, callback) => {
+ this.callbacks[topic] = callback;
+ this.client.subscribe(topic);
+ };
+
+ unsubscribe = topic => {
+ delete this.callbacks[topic];
+ this.client.unsubscribe(topic);
+ };
+}
+
+let client = new MqttClient();
+export {client as MqttClient};
\ No newline at end of file