Feature/user-auth-and-media

.gitignore

@@ -3,3 +3,4 @@
 src/settings.js
 build/settings.js
 node_modules
+src/contents/bower_components

build/Dockerfile

@@ -1,4 +1,4 @@
-FROM nginx:1.17.1-alpine
+FROM nginx:1.25-alpine
 
 WORKDIR /usr/share/nginx/html
 

build/contents/locales/locale-en.json

@@ -1,21 +1,21 @@
 {
     "LANGUAGE": "en",
-    "APP_NAME": "CodyColor Multiplayer",
+    "APP_NAME": "Multiplayer CodyColor",
     "APP_NAME_SHORT": "CodyColor",
-    "APP_SUBTITLE": "A multiplayer mini game.",
+    "APP_SUBTITLE": "A multiplayer coding game.",
     "PRESS_TO_CONTINUE": "Press to continue",
     "SPLASH_FOOTER": "Developed by <a href=\"https://www.riccardomaldini.it/\">Riccardo Maldini</a><br>Music by <a href=\"https://www.instagram.com/el.favelas\">ElFavelas</a><br>© Digit S.r.l. 2019 for <a href=\"https://codemooc.net\">CodeMOOC.net</a>",
     "HOW_TO_PLAY": "How to play",
     "RANDOM_MATCH": "Random match",
     "CUSTOM_MATCH": "Custom match",
     "AGA_MATCH": "Battle Royale",
-    "BOOT_CAMP": "Boot camp",
+    "BOOT_CAMP": "Bootccamp",
     "RANKINGS": "Rankings",
     "LOGIN": "Login",
     "PROFILE": "Profile",
     "OTHERWISE": "- otherwise -",
-    "NOT_LOGGED": "Not logged",
-    "LANG_DESC": "Choose the language you wish to use for CodyColor",
+    "NOT_LOGGED": "Not logged-in",
+    "LANG_DESC": "Choose the language you wish to use",
     "LANG_ITALIAN": "Italian",
     "LANG_ENGLISH": "English",
     "LANG_HUNGARIAN": "Hungarian",
@@ -25,9 +25,9 @@
     "NO_CONNECT_DESC": "You have to connect to the server to use online features. Check your Internet connection.",
     "OUTDATED_VERSION_DESC": "You have to update CodyColor to use online features. Quit your browser, re-open it and refresh the page to update.",
     "OK": "Ok",
-    "SEARCH_MATCH_INFO": "Searching match info…",
+    "SEARCH_MATCH_INFO": "Looking for match info…",
     "CODE_NOT_VALID": "The code is not valid anymore.",
-    "NOTIF_OFFLINE": "You are offline. Trying to connect to the server...",
+    "NOTIF_OFFLINE": "You are offline. Trying to connect to the server…",
     "NOTIF_GENERAL": "{{totalMatches}} matches played, {{connectedPlayers}} players connected now",
     "404": "404",
     "PAGE_NOT_FOUND": "Page not found",
@@ -45,10 +45,10 @@
     "PLAYERS_40": "40 players",
     "PLAYERS_60": "60 players",
     "PLAYERS_100": "100 players",
-    "MAX_PLAYERS": "Maximum players number",
-    "WINNER": "{{winner}} wins the {{matchCount}}° match!",
+    "MAX_PLAYERS": "Maximum player number",
+    "WINNER": "{{winner}} wins match number {{matchCount}}!",
     "ENEMY_REQUEST_NM": "Your opponent wants to play again!",
-    "ENEMY_WAIT": "Wait for the opponent to confirm his participation…",
+    "ENEMY_WAIT": "Wait for the opponent to confirm their participation…",
     "STATS_MOVES": "Moves: ",
     "STATS_TIME": "Time to choose: ",
     "STATS_POINTS": "Points: ",
@@ -62,7 +62,7 @@
     "MODAL_EXIT_DESC": "Are you sure you want to leave the match?",
     "PLAY_AGAIN": "Play again",
     "SKIP": "Skip",
-    "BOOTCAMPMAKING_DESC": "In this game mode you have the possibility to train in single player. You can choose the duration of each game, and possibly, whether to use a bot as an opponent.",
+    "BOOTCAMPMAKING_DESC": "In this game mode you will train in a single-player match. You can choose the length of each match and whether to use a bot as an opponent.",
     "MATCH_TIME": "Match duration",
     "CREATE_MATCH": "Create match",
     "CUSTOM_MATCH_DESC": "This mode allows you to create custom private matches: you can choose the various game options, and invite who you want through the code generated by the program!",
@@ -74,12 +74,12 @@
     "NEW_CUSTOM_EXT": "New custom match",
     "JOIN_BATTLE": "Join Battle",
     "AGA_FOUND": "Battle found! Choose a nickname to join.",
-    "BATTLE_WELCOME": "Welcome to the Battle \"{{ gameName }}\"! Every match will last {{ battleTime }}; it can host a maximum of {{ maxPlayers }} players. Remember: in INSTANT games, the organizer cannot leave the game during the matchmaking phase. Otherwise, the game will be canceled.",
+    "BATTLE_WELCOME": "Welcome to the Battle “{{ gameName }}”! Every match will last {{ battleTime }}; it can host a maximum of {{ maxPlayers }} players. Remember: in INSTANT games, the organizer cannot leave the game during the matchmaking phase. Otherwise, the game will be canceled.",
     "WHEN_START": "When will the match start?",
     "WHEN_TIMER": "All users connected at the end of the countdown will fight:",
     "WHEN_INSTANT": "The match will start when the organiser will click the start button.",
     "INVITE_YOUR_FRIENDS": "Invite your friends",
-    "INVITE_DESC": "You can invite other opponents by sending them the code below, to be inserted in the \"Battle Royale\" screen of the game, or directly via the link. Press one of the two items to copy them to the clipboard.",
+    "INVITE_DESC": "You can invite other opponents by sending them the code below, to be inserted in the “Battle Royale” screen of the game, or directly via the link. Press one of the two items to copy them to the clipboard.",
     "ABORT_MATCH": "Abort battle",
     "CONNECTED_PLAYERS": "Connected players",
     "NEW_ROYALE_DESC": "From this screen you can customise the various aspects of the battle you are creating. You can also decide whether to start the tournament on a certain date-time, or start it manually when you wish.",
@@ -95,11 +95,10 @@
     "POSITIONED_COMPOSITE": "Positioned: {{numPositioned}}",
     "TIME_OUT": "Time out! You didn't place Roby before the deadline!",
     "TIME_PLAYER": "Roby placed in time {{time}}!",
-    "DRAW": "It's a draw!",
+    "DRAW": "It’s a draw!",
     "NUM_PLAYERS_AFTERMATCH": "{{numPlayers}} players already in this game",
     "NUM_READY_AFTERMATCH": "{{numReady}} players want to play another match!",
     "SHARE": "Share your score!",
-
     "NEW_CUSTOM_MATCH_DESC": "Choose the nickname with which to appear to the opponent, and the various game options. CodyColor will generate a new private game in which you can invite your friend.",
     "CREATING_MATCH": "Preparing the match…",
     "ENEMY_INVITATION_DESC": "Your match is ready! You can invite the opponent by sending him the code below, to be inserted in the \"custom game\" screen. Click on the code to copy it to the clipboard.",
@@ -110,18 +109,34 @@
     "RANDOM_MMAKING_DESC": "Choose the nickname with which to appear in the next game; CodyColor will find a random opponent among those waiting to play.",
     "FIND_ENEMY": "Find an<br>opponent",
     "ENEMIES_WAITING": "{{randomWaitingPlayers}} players are waiting for an opponent now",
-    "WAITING_NEW_PLAYERS": "Waiting an enemy…",
+    "WAITING_NEW_PLAYERS": "Waiting for an opponent…",
     "NEW_CUSTOM_MATCH": "New custom<br>match",
     "CODE": "Match code",
     "CODE_EXAMPLE": "ex. 1234",
     "NICKNAME": "Nickname",
     "NICKNAME_EXAMPLE": "ex. johnAppleSeed96",
     "LOGIN_DESC": "Login to get detailed statistics on the games played, and to have the chance to compete in the global CodyColor ranking!",
+    "LOGIN_SIGNUP":" Sign up / Log in",
+    "PROVIDER_REGISTRATION":"The email {{email}} is registered with {{provider}}. \nReset your password to convert your account to an email/password account.",
+    "CONVERT_PROVIDER":"Convert",
+    "BACK_TO_LOGIN":"Back to login",
+    "VERIFY_EMAIL":"Please verify your email before logging in",
+    "VERIFY_EMAIL_SENT":"Email Verification Sent. Please confirm before continuing.",
+    "VERIFY_EMAIL_DESCR_SENT":"A verification email has been sent to {{email}}.Please check your inbox and click the verification link to continue.\nIf you don’t see the email, check your spam folder.",
+    "VERIFICATION_EMAIL_FAILED":"Failed to send verification email: {{error}}",
+    "FORGOT_PASSWORD":"Forgot your password?",
+    "PASSWORD_LINK_SENT":"Password Reset Email Sent",
+    "PASSWORD_MISMATCH":"The passwords do not match.",
+    "NO_ACCOUNT_FOUND": "No account found for {{email}}. Create a new one.",
+    "CHOOSE_PASSWORD": "Choose a password",
+    "CONFIRM_PASSWORD": "Confirm password",
+    "REGISTER_BTN":"Register",
     "ENDING_LOGIN": "Finishing the login procedure…",
     "LOGIN_SETNICK": "Almost done!",
     "LOGIN_SETNICK_DESC": "Enter a nickname to display to your opponents to complete the registration.",
     "LOGIN_SETNICK_CONFIRM": "Complete registration",
-    "WELCOME_USER": "Welcome, {{ user }}!",
+    "WELCOME_USER": "Nickname: ",
+    "EMAIL_USER":"The email associated with this account is: ",
     "USER_STATS": "User stats",
     "TOTAL_POINTS": "Total points: ",
     "TOTAL_WINS": "Total wins: ",
@@ -161,17 +176,17 @@
     "HI": "Hi",
     "WELCOME": "Welcome!",
     "I_FEEL_STRONG_TODAY": "I feel strong today",
-    "I_M_READY": "I'm ready to start",
-    "HAPPY_TO_PLAY_WITH_YOU": "I'm happy to play with you",
+    "I_M_READY": "I’m ready to start",
+    "HAPPY_TO_PLAY_WITH_YOU": "I’m happy to play with you",
     "ARE_YOU_READY": "Are you ready?",
-    "PLAYING_WITH_FRIENDS": "I'm playing with many friends",
-    "FROM_NORTH": "I'm from North",
-    "FROM_SOUTH": "I'm from South",
-    "FROM_WEST": "I'm from West",
-    "FROM_EAST": "I'm from East",
+    "PLAYING_WITH_FRIENDS": "I’m playing with many friends",
+    "FROM_NORTH": "I’m from the North",
+    "FROM_SOUTH": "I’m from the South",
+    "FROM_WEST": "I’m from the West",
+    "FROM_EAST": "I’m from the East",
     "WELLDONE": "Well done!",
     "YOU_MADE_A_GREAT_SCORE": "Wow, you made a great score!",
-    "IT_WAS_FUN": "It was fun!",
+    "IT_WAS_FUN": "That was fun!",
     "DO_BETTER_NEXT_TIME": "I'll do better next time…",
     "THANKS": "Thanks!",
     "LET_S_PLAY_AGAIN": "Let's play again!",

build/contents/locales/locale-hu.json

@@ -118,11 +118,27 @@
     "NICKNAME": "Becenév",
     "NICKNAME_EXAMPLE": "pl. PistaBela96",
     "LOGIN_DESC": "Lépj be, hogy részletes statisztikákat kapj a meccseidről és versenyezhess a CodyColor világranglistán!",
+    "LOGIN_SIGNUP":"Regisztráció / Belépés",
+    "PROVIDER_REGISTRATION":"Az {{email}} e-mail cím a {{provider}} szolgáltatónál van regisztrálva.\nÁllítsa vissza a jelszót, hogy fiókját e-mail/jelszó fiókká alakítsa.",
+    "CONVERT_PROVIDER":"Konvertálás",
+    "BACK_TO_LOGIN":"Vissza a belépéshez",
+    "VERIFY_EMAIL":"Kérjük, regisztráció előtt ellenőrizze e-mail címét.",
+    "VERIFY_EMAIL_SENT":"E-mail ellenőrzés elküldve. Mielőtt továbbhaladna, kérjük, erősítse meg",
+    "VERIFY_EMAIL_DESCR_SENT":"Ellenőrző e-mailt küldtünk a {{email}} címre.<br>Kérjük, ellenőrizze a beérkező levelek mappáját, és kattintson az ellenőrző linkre a folytatáshoz.<br>Ha nem látja az e-mailt, ellenőrizze a spam mappát.",
+    "VERIFICATION_EMAIL_FAILED": "A hitelesítő e-mail küldése sikertelen: {{error}}",
+    "FORGOT_PASSWORD":"Elfelejtett jelszó",
+    "PASSWORD_LINK_SENT":"Jelszó visszaállító link elküldve",
+    "PASSWORD_MISMATCH":"A jelszavak nem egyeznek",
+    "NO_ACCOUNT_FOUND":"Nincs fiókja a {{email}} címhez. Készítsen újat!",
+    "CHOOSE_PASSWORD":"Válassz jelszót",
+    "CONFIRM_PASSWORD":"Jelszó megerősítése",
+    "REGISTER_BTN":"Regisztrálj",
     "ENDING_LOGIN": "A belépési folyamat befejezése…",
     "LOGIN_SETNICK": "Majdnem kész!",
     "LOGIN_SETNICK_DESC": "Add meg a játékban használt beceneved a regisztráció befejezéséhez!",
     "LOGIN_SETNICK_CONFIRM": "Regisztráció befejezése",
-    "WELCOME_USER": "Légy üdvözölve, {{ user }}!",
+    "WELCOME_USER": "Becenév: ",
+    "EMAIL_USER":"A fiókhoz tartozó e-mail cím: ",
     "USER_STATS": "Játékos statisztika",
     "TOTAL_POINTS": "Összes pontszám: ",
     "TOTAL_WINS": "Összes győzelem: ",

build/contents/locales/locale-it.json

@@ -119,11 +119,27 @@
     "MAT_RANKING": "Classifica match",
     "NICKNAME_EXAMPLE": "es. marioRossi96",
     "LOGIN_DESC": "Effettua il login per avere dettagliate statistiche sulle partite giocate, e per avere la possibilità di competere nel ranking globale di CodyColor!",
+    "LOGIN_SIGNUP":"Accedi / Registrati",
+    "PROVIDER_REGISTRATION":"L'indirizzo e-mail {{email}} è registrato presso {{provider}}.\nResetta la password per convertire il tuo account in un account email/password.",
+    "CONVERT_PROVIDER":"Converti",
+    "BACK_TO_LOGIN":"Torna al login",
+    "VERIFY_EMAIL":"Verifica il tuo indirizzo email",
+    "VERIFY_EMAIL_SENT":"Email di verifica inviata. Conferma prima di continuare",
+    "VERIFY_EMAIL_DESCR_SENT":"È stata inviata un'e-mail di verifica a {{email}}. Controlla la tua casella di posta e clicca sul link di verifica per continuare.\nSe non vedi l'e-mail, controlla la cartella dello spam.",
+    "VERIFICATION_EMAIL_FAILED":"Fallito invio dell'email di verifica: {{error}}",
+    "FORGOT_PASSWORD":"Password dimenticata?",
+    "PASSWORD_LINK_SENT":"Ti abbiamo inviato un link per reimpostare la password.",
+    "PASSWORD_MISMATCH":"Le password non corrispondono",
+    "NO_ACCOUNT_FOUND": "Nessun account trovato per {{email}}. Creane uno nuovo",
+    "CHOOSE_PASSWORD": "Scegli una password",
+    "CONFIRM_PASSWORD": "Conferma password",
+    "REGISTER_BTN":"Registra",
     "ENDING_LOGIN": "Terminando la procedura di login…",
     "LOGIN_SETNICK": "Ci siamo quasi!",
     "LOGIN_SETNICK_DESC": "Inserisci un nickname con il quale venire visualizzato ai tuoi avversari per completare la registrazione.",
     "LOGIN_SETNICK_CONFIRM": "Completa registrazione",
-    "WELCOME_USER": "Welcome, {{ user }}!",
+    "WELCOME_USER": "Nickname: ",
+    "EMAIL_USER":"L'email associata a questo account è: ",
     "USER_STATS": "Statistiche utente",
     "TOTAL_POINTS": "Punti totali: ",
     "TOTAL_WINS": "Vittorie totali: ",

build/contents/pages/bootmp-mmaking.html

@@ -14,8 +14,11 @@
                     <li class="list--spaced-element">
                         <input type="text" name="nickname" ng-maxlength="22" ng-model="nickname" id="nickname"
                                placeholder="{{'NICKNAME_EXAMPLE' | translate}}" class="standard-input"
-                               ng-disabled="userLogged" required autofocus/>
+                                required autofocus/>
+
                     </li>
+
+
                     <li class="list--simple-element">
                         {{ 'ENEMY' | translate }}
                     </li>

build/contents/pages/custom-new-match.html

@@ -17,7 +17,7 @@ <h2>{{ 'NEW_CUSTOM_EXT' | translate }}</h2>
                     <li class="list--spaced-element">
                         <input type="text" name="nickname" ng-maxlength="22" ng-model="nickname" id="nickname"
                                placeholder="{{'NICKNAME_EXAMPLE' | translate}}" class="standard-input"
-                               ng-disabled="userLogged" required autofocus/>
+                               ng-disabled="false" required autofocus/>
                     </li>
                     <li class="list--simple-element">
                         {{ 'MATCH_TIME' | translate }}