Merge branch 'master' of ssh://ssh.hesge.ch:10572/frederic.ney/quizz_contest

0d4f0167 · estalella · abf0fdb5 · 98ba93a4 · 0d4f0167 · 0d4f0167
Commit 0d4f0167 authored 7 years ago by estalella
--- a/client_android/app/src/main/java/hepia/client_android/Jeu.java
+++ b/client_android/app/src/main/java/hepia/client_android/Jeu.java
@@ -96,6 +96,34 @@ public class Jeu extends AppCompatActivity {
        final String gameMode = intent.getStringExtra("mode");
        final int gameCategory = intent.getIntExtra("categorie", 1);

+        // if user is connected, register to the game and start game
+        if(ServiceRest.isConnected()){
+            username = ServiceRest.getConnectedUsername();
+            ServiceRest.registerToQuiz(activity, gameMode, gameCategory, username, new RestResponseHandler() {
+                @Override
+                public void onFailure(int statusCode, Header[] headers, byte[] errorResponse, Throwable e) {
+                    Toast.makeText(Jeu.this, new String(errorResponse), Toast.LENGTH_SHORT).show();
+                }
+
+                @Override
+                public void onSuccess(int statusCode, Header[] headers, byte[] response, JSONObject jsonResponse) {
+                    Log.e("asdf", jsonResponse.toString());
+                    try{
+                        gameId = jsonResponse.getInt("gameid");
+                        Log.e("asdf", "Jeu: registerToQuiz: start quiz time str = "+jsonResponse.getString("start_quiz_time")+", end_quiz_time str = "+jsonResponse.getString("end_quiz_time"));
+                        startQuizTimeStamp = Timestamp.valueOf(jsonResponse.getString("start_quiz_time").replace("T", " ").replace("Z", "")).getTime();
+                        endQuizTimeStamp = Timestamp.valueOf(jsonResponse.getString("end_quiz_time").replace("T", " ").replace("Z", "")).getTime();
+                        Log.e("asdf", "Jeu: registerToQuiz: start quiz time = "+String.valueOf(startQuizTimeStamp)+", end_quiz_time = "+String.valueOf(endQuizTimeStamp));
+
+                        startWaitForStartGameTimer();
+                    }catch(JSONException e){
+                        e.printStackTrace();
+                    }
+                }
+            });
+            return;
+        }
+
        // get a correct username and register and start game
        usernameInput = new EditText(this);
        dialog = new AlertDialog.Builder(this)

--- a/client_android/app/src/main/java/hepia/client_android/rest_service/ServiceRest.java
+++ b/client_android/app/src/main/java/hepia/client_android/rest_service/ServiceRest.java
@@ -58,6 +58,7 @@ public final class ServiceRest {

    private static String authToken = null;
    private static String csrfToken = null;
+    private static String connectedUsername = null;
    private static AsyncHttpClient client = new AsyncHttpClient();
    public static final String API_BASE_URL = "http://quizcontest.nomdedomainesuisse.ch/";
 //    public static final String API_BASE_URL = "http://52.27.136.157/";
@@ -161,6 +162,7 @@ public final class ServiceRest {
    public static void createAccount(Activity context, String email, String username, String password1, String password2, final RestResponseHandler responseHandler){
        String restMethod = "rest-auth/registration/";
        JSONObject params = new JSONObject();
+        connectedUsername = username;
        try{
            params.put("email", email);
            params.put("username", username);
@@ -203,6 +205,7 @@ public final class ServiceRest {
            @Override
            public void onFailure(int i, Header[] headers, byte[] bytes, Throwable throwable) {
                Log.e("asdf", "Error: "+new String(bytes));
+                connectedUsername = null;
                responseHandler.onFailure(i, headers, bytes, throwable);
            }
        });
@@ -221,6 +224,7 @@ public final class ServiceRest {
        try{
            params.put("username", username);
            params.put("password", password);
+            connectedUsername = username;
        }catch(JSONException e){
            e.printStackTrace();
        }
@@ -233,6 +237,7 @@ public final class ServiceRest {

        // send request
        client.post(context, API_BASE_URL + restMethod, strParams, "application/json", new AsyncHttpResponseHandler() {
+
            @Override
            public void onSuccess(int i, Header[] headers, byte[] bytes) {
                // get json response
@@ -247,6 +252,7 @@ public final class ServiceRest {
                // save the tokens for further calls
                try {
                    authToken =  jsonResponse.getString("token");
+                    connectedUsername = jsonResponse.getString("username");;
                } catch (JSONException e) {
                    e.printStackTrace();
                }
@@ -259,6 +265,7 @@ public final class ServiceRest {
            @Override
            public void onFailure(int i, Header[] headers, byte[] bytes, Throwable throwable) {
                Log.e("asdf", "Error: "+new String(bytes));
+                connectedUsername = null;
                responseHandler.onFailure(i, headers, bytes, throwable);
            }
        });
@@ -289,6 +296,7 @@ public final class ServiceRest {
            public void onSuccess(int i, Header[] headers, byte[] bytes) {
                // remove user token
                authToken = null;
+                connectedUsername = null;

                // launch the response handler
                responseHandler.onSuccess(i, headers, bytes, null);
@@ -501,6 +509,17 @@ public final class ServiceRest {
        });
    }

+        public static boolean isConnected(){
+            if(authToken != null){
+                return true;
+            }
+            return false;
+        }
+
+        public static String getConnectedUsername(){
+            return connectedUsername;
+        }
+
 //    /**
 //     * JSON will be null
 //     * @param username

--- a/project.rsa
+++ b/project.rsa
+-----BEGIN RSA PRIVATE KEY-----
+MIIJKAIBAAKCAgEAw2OZLXnxA4gBO2VRnCnfwQVBD0/gIOIsjPrn5lfOH7O69zY5
+HY1esqpuinhNKYqpD9pQ9NbiLnnEQ21VsNw6H/MkoKWgCWkpOe6ZIOHSkjcnMeLf
+0DPtN6WDGUgxmCgr3ogsSK7eTzQEPgCOc7H5jFuIhFpGjgycyu53y7qU5rR46hta
+2CPxB/7k/9EULuiAJzQljc5OHZbIeegLRhberAvCzrxM41K9fIf2fBR1vdGtZyq/
+AN61om90+Jq1UC75SGfEg8Z/F42m9IDOJX87T9GG2a/9HCRygHR+rZcugzYJ2MdO
+txWkbmJQj9q97xsTTT2Kdc39gP4sAw23gGp8GRQde5YJeYIPvOCzt33jBSRqsmKR
+e6I19XGTBXZ6stQhPvnrEtjNGcbrX7H9EvO51Moyz4RL0nm4ZkieeynW7LpkBlxm
+v8bOiq/HHBEVAbc0eNhMJvSkV6A0DVRmDo6WqEiqTKmhuRS+IRW7lue7DnN97Nxy
+5bE8VBhBgjxFxoYo7IBoMQASjN372Csc/6gRErseV0Df38YLL8YwtGxL2bkZsqlg
+NmRAY8UcBVx8uclk0/Dzn3ryuemgSeLvaqhJtUExYaC2W+zYiKszA9Ps29qqd8bv
+sOglGVru84Jb95b4pc8Hly6aM5Khvf8EObMct6xe6kqlrvSthfWinvwwt00CAwEA
+AQKCAgAUz1LNKSOmQKIA9XWPsFYIdMrNGrDAT9Z23XI9cjSd48KR+dBzeU8QsF49
+mTp+pioDajkdGpXUZVul4ssxnwMBzB+mjH1TA0REy0i729FViVI/We6EekNVnecs
+lifSENU7Sj2NMDK1NNEO2XhSki4F6OnNTuAc2PMKGgPgSur491e5d1hhlNJjC57Q
+MDB6HoEnq8IkLEjdleWcNj6dJGpq4IXLBvsZawKLdN+nr3Yq1V4mksLtEMs/ladb
+ov6Un6wlLggcENQQaiHSALX0AG0Mv0Ahh0Dp8mfPjpi/XE6z4tmBoRidH0z4BLiX
+2bBI+xU/MMLCcUICrw9488kLgEvfIC3b8TzVVTPGxUFJa2a32mCxWbuFuPX+cgS3
+zbHRa3haSYKI6h0ATvA9Wmgobd6+K+7yAK0YsCSOztFi2rjRH/feZ3nzbsGQSb1O
+tHyObGjBvJ8kkAHva6RdRY2NZ/NNnPD3olUXn/0Ol8R0v88eh+wZ3v9ZBbOaIzSy
+Gmowdtp3jMif8ywrje66dFcYjpp2pzDALyHFwwHsKGRgehOF3tZQ3fLvemoWrArb
+gFb1uqvYrz8SjjmBYWTwgOFGL63vqMN4JyaGjJxx33ZyhpYkFEOwC5cGeO2wFm7e
+ALUi71gk2zZ9sp1Z6njLUEMs4DgZXOUvwMvKWZZmYZmgCow0AQKCAQEA7fp7Mpaa
+3Ohp46zjorsct5KNJ7ukz4qiOW5G7uiGup9Zsvaj8TbBkhvvdNW6BLsIhNc3HlAD
+vZfLt5YzE2aR7mgBOx16WmjO2LLD78+wcT5rztiFgqSH4XgRDlgPGVje7abrImb7
+u2lh4e44NnvrQp+7IYz6OOmQvzICjMs4O8hMEoiePEI5IIQdh2YNcy3IrkUgr2sS
+dsKYG7BkV9ZDW2Z0iN7cmbvP2LTwwYiIBBVnsuSuoF2YBaCP8zXRuFMI1RLLMK6W
+Uz8wzr3/3szh6Q85kTcs2khcdQmFW2Nc+0IMTxubZpSx3YOqTmPp7DY+SrzhBbaE
+LKxPU0BDvVcHwQKCAQEA0i93i8OcHPiGvMSQyWZI6rJzxlHTIzh6GHxoLbpm4Yw/
+SSAP9nsdhsxY0NSAeDHZhd3x5vhiILig5dIWDqzzDDRqFkU0FhkwWXELoYSWVftm
+efEqpUEdu/Ru7THVAVGIy+GeJJ38r5GI5C0mM4Z/NcJmuT1a7V7yCzP68z7jV1Og
+5ZP+TpeZWQmvq7n+d6yrQT52Y5zR1DWyuLZEsZSLRs6v9dJHjNgo5b6uFokrsi5K
+iJflqB0kbMocA+eybdT0phmQ6dgHy6mJTdkkV2SJVTpCfaPmyckKyzv4XSMDxyv0
+xhIX6HppNtoWSrjFBC/qTsLf02bDTcWnAp9TUS3yjQKCAQA1q1O1aPmr8E5RJmCA
+BqrHS6nB2DOnCqDjStd8cbxQwjc8gRsf/zVQejRaqQi2oGefbdnkYC83xtAOqzUB
+nxQyLAp7Bn7dfN2JSWee4bvtDiLKF1Kkz+5FDwrprTpagQxllEtbCtaiwXVtuoe6
+4d+Auv0858pWo3YdaG3iysH32YguddkZxeWUS7dNHdrSqvSjOLvSU9dqKSCcvf8j
+QBMYvdZyN7CQiyaovMW/H8dtBFbKpYAscm8idb+BHhYZ97/6La7dX8JPK+UZ+weF
+e7dHFEPrWAIpiEAxtN/6aEJD9/VGsfct/0LNri/uVeIff2w09rvYyfytBn8tS0T7
+onEBAoIBAEaIyVxsy3HpcQXeDRyZJ7UjJ7kQ8oLqTAb1kNxvpmDgeMhoaxLzI+h9
+oPyLo4UybWYAIlK5XezPKKeXRfGs1m9tE4DfvmgAEfqh9h5A6VZ3ZF9dsEr+vCS8
+FZGh3HJx0y9gSnrNTeP5OfAguqYl54C5+VEGpwHrj9x0mC2TGCXRGbiRXpEvTLXV
+i09cvmmY12uws3ggQ0YsswpLmGfjio27hM9AvuQkEi1vPOqxI6nK4RZPqzEsfnHH
+rXkeAwHaqjMndzsSVSNihIJMcWamhXPFdlTFcQicX/Pt7x4KRxVKyfzCS6WnlrFi
+pIJ02SDbl4zQ1t4RqU7rGm3F2+btPW0CggEBAOZAUwE/ssJGqU1IKvtKSMsrGoDw
+mlbhupa/o2fRgYjJ/squ2MMz5/GhmllPgs+xeVZiS2JtrZEe9urLsuxNenPP5U0N
+7YAsFSzQfsLkaamucUFCr0kF2IyM8B6CdgwGYEpVP3bA2c2kU81gvkAAEwS9RFtT
+/5+NlyBsyFz66lW2CNuwWASNHCawlvyUfb3F2IqBnDhNgKP/4Y0rZLtqydUqNvCg
+t0xWv2Mo3mxUdLFn6FevGJ+2jY7T/tB+ftzl7m4DCWiDfGivTiXfptNXsL1io08z
+PvKGzrkNEPaSUD/NAP/gbA4NLbPNwdo7zNbotcxLa3w5fyJV76swbiBBQBU=
+-----END RSA PRIVATE KEY-----
--- a/sources/django/Dockerfile
+++ b/sources/django/Dockerfile
@@ -24,4 +24,6 @@ RUN apt-get install gunicorn -y
 ADD . /var/www/django/
 RUN mkdir -p mysite/static/admin

+RUN cd /var/www/django/mysite && python manage.py collectstatic && cd /var/www/django/
+
 ENTRYPOINT /entrypoint.sh
--- a/sources/django/entrypoint.sh
+++ b/sources/django/entrypoint.sh
@@ -48,6 +48,11 @@ start_migration() {
 	return 0
 }

+collect_static() {
+    echo "collecting static files"
+    python manage.py collectstatic --no-input
+}
+
 CMD="/bin/bash"
 if [ $1 ]
 then
@@ -58,6 +63,7 @@ then
 		echo "Stopping"
 		exit -1
 	fi
+	collect_static
 	echo "Running: $@"
 	$@
 else