Enable pull request for reviewing

review_please/README.md

@@ -0,0 +1,11 @@
+# flash-typer
+Flash Typer
+
+## To play in production
+Visit https://flash-typer.firebaseapp.com/.
+
+## To play in development
+1. Clone the repo.
+2. Do `npm install`.
+3. Do `npx webpack`.
+4. Do `npx firebase serve`.

review_please/firebase.json

@@ -0,0 +1,10 @@
+{
+  "hosting": {
+    "public": "dist",
+    "ignore": [
+      "firebase.json",
+      "**/.*",
+      "**/node_modules/**"
+    ]
+  }
+}

review_please/package.json

@@ -0,0 +1,29 @@
+{
+  "name": "flash-typer",
+  "version": "1.0.0",
+  "description": "Flash Typer",
+  "main": "index.js",
+  "dependencies": {
+    "firebase-tools": "^6.4.0",
+    "phaser": "^3.16.2",
+    "phaser3-rex-plugins": "git+https://github.com/rexrainbow/phaser3-rex-notes.git"
+  },
+  "devDependencies": {
+    "file-loader": "^3.0.1",
+    "webpack": "^4.29.6",
+    "webpack-cli": "^3.2.3"
+  },
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/minicatsCB/flash-typer.git"
+  },
+  "author": "",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/minicatsCB/flash-typer/issues"
+  },
+  "homepage": "https://github.com/minicatsCB/flash-typer#readme"
+}

review_please/src/app.js

@@ -0,0 +1,28 @@
+import Phaser from "phaser";
+import UIPlugin from 'phaser3-rex-plugins/templates/ui/ui-plugin.js';
+import Main from "./scenes/main.js";
+import Game from "./scenes/game.js";
+import Ranking from "./scenes/ranking.js";
+
+let config = {
+    type: Phaser.CANVAS,
+    width: 800,
+    heigth: 600,
+    physics: {
+        default: "arcade",
+        arcade: {
+            gravity: {y: 0},
+            debug: true
+        }
+    },
+    plugins: {
+        scene: [{
+            key: 'rexUI',
+            plugin: UIPlugin,
+            mapping: 'rexUI'
+        }]
+    },
+    scene: [Main, Game, Ranking]
+};
+
+let game = new Phaser.Game(config);

review_please/src/gameService.js

@@ -0,0 +1,65 @@
+class GameService {
+    constructor(){
+        let easyWords = [ "cat", "ghost", "cow", "bug", "snake", "lips", "socks", "coat", "heart", "kite", "milk", "skateboard", "apple", "mouse", "star", "whale", "hippo", "face", "spoon", "sun", "flower", "banana", "book", "light", "apple", "smile", "shoe", "hat", "dog", "duck", "bird", "person", "ball", "nose", "jacket", "beach", "cookie", "drum", "worm", "cup", "pie", "snowflake", "jar", "tree", "slide", "swing", "water", "ocean", "mouth", "eyes", "boy", "girl", "house", "bed", "shirt", "egg", "cheese", "circle"];
+        let mediumWords = [ "horse", "trip", "round", "park", "state", "baseball", "dominoes", "hockey", "whisk", "mattress", "circus", "cowboy", "skate", "thief", "spring", "toast", "half", "door", "backbone", "treasure", "pirate", "whistle", "coal", "photograph", "aircraft", "key", "frog", "pinwheel", "battery", "password", "electricity", "teapot", "nature", "outside", "spare", "platypus", "song", "bomb", "garbage", "ski", "palace", "queen", "computer", "lawnmower", "cake", "mailman", "bicycle", "lightsaber", "deep", "shallow", "America", "bowtie", "wax", "music"];
+        let difficultWords = [ "snag", "mime", "hail", "password", "newsletter", "dripping", "catalog", "laser", "myth", "hydrogen", "darkness", "vegetarian", "ditch", "neighborhood", "retail", "fabric", "jazz", "commercial", "double", "landscape", "jungle", "peasant", "clog", "bookend", "pharmacist", "ringleader", "diagonal", "dorsal", "macaroni", "yolk", "shrew", "wobble", "dizzy", "drawback", "mirror", "migrate", "dashboard", "download", "important", "bargain", "scream", "professor", "landscape", "husband", "comfy", "biscuit", "rubber", "exercise", "chestnut", "glitter", "fireside", "logo", "barber", "drought", "bargain", "professor", "vitamin"] ;
+
+        this.levels = {
+            easy: {
+                name: "easy",
+                posterVelocity: 50,
+                wordList: easyWords,
+                nextLevel: {
+                    name: "medium",
+                    neededScore: 30
+                },
+                isLastLevel: false
+            },
+            medium: {
+                name: "medium",
+                posterVelocity: 100,
+                wordList: mediumWords,
+                nextLevel: {
+                    name: "difficult",
+                    neededScore: 60
+                },
+                isLastLevel: false
+            },
+            difficult: {
+                name: "difficult",
+                posterVelocity: 200,
+                wordList: difficultWords,
+                isLastLevel: true
+            }
+        }
+
+        this.score = 0;
+        this.lives = 3;
+    }
+
+    getLevelByDifficulty(difficulty) {
+        return this.levels[difficulty];
+    }
+
+    getNextLevel(currentLevel) {
+        return this.levels[currentLevel.nextLevel.name];
+    }
+
+    getCurrentScore() {
+        return this.score;
+    }
+
+    setScore(score) {
+        this.score = score;
+    }
+
+    getCurrentLives(){
+        return this.lives;
+    }
+
+    setLives(lives){
+        this.lives = lives;
+    }
+}
+
+export default GameService;

review_please/src/login.js

@@ -0,0 +1,168 @@
+let instance = null;
+
+class Login {
+    constructor(){
+        if (!instance) {
+            this.loggedInUsername = "Not logged in";
+            this.isUserLoggedIn = false;
+            this.hasAuthStateChanged = false;
+
+            this.initFirebase();
+            this.setAuthStateObserver();
+
+            instance = this;
+        }
+
+        return instance;
+    }
+
+    get loggedInUsername() {
+        return this._loggedInUsername;
+    }
+
+    set loggedInUsername(username) {
+        this._loggedInUsername = username;
+    }
+
+    get isUserLoggedIn() {
+      return this._isUserLoggedIn;
+    }
+
+    set isUserLoggedIn(loginState) {
+        this._isUserLoggedIn = loginState;
+    }
+
+    get hasAuthStateChanged() {
+        return this._hasAuthStateChanged;
+    }
+
+    set hasAuthStateChanged(authState) {
+        this._hasAuthStateChanged = authState;
+    }
+
+    initFirebase() {
+        var config = {
+            apiKey: "AIzaSyDhZLEfkH6ydtLOEBzjQKjCIjnIwtLooQs",
+            authDomain: "flash-typer.firebaseapp.com",
+            databaseURL: "https://flash-typer.firebaseio.com",
+            projectId: "flash-typer",
+        };
+
+        firebase.initializeApp(config);
+    }
+
+    setAuthStateObserver() {
+        firebase.auth().onAuthStateChanged(this.authStateObserver.bind(this));
+    }
+
+    authStateObserver(user) {
+        this.hasAuthStateChanged = true;
+        if (user) {
+            this.loggedInUsername = user.displayName|| "No name";
+            this.isUserLoggedIn = true;
+            console.log("User is signed in as:", this.loggedInUsername);
+        } else {
+            this.loggedInUsername = "Not logged in";
+            this.isUserLoggedIn = false;
+            console.log("User is signed out as:", this.loggedInUsername);
+        }
+    }
+
+    signInWithGithub() {
+        var provider = new firebase.auth.GithubAuthProvider();
+        firebase.auth().signInWithPopup(provider).then(result => {
+            console.log("User signed up with Github succesfully");
+            if (result.additionalUserInfo.isNewUser) {
+                let userData = {
+                    email: result.user.email,
+                    displayName: result.additionalUserInfo.profile.login,
+                    photoURL: result.additionalUserInfo.profile.avatar_url
+                };
+                this.updateCurrentUserAuthProfile(userData);
+                this.saveUserDataInDatabase(userData);
+            }
+
+            this.loggedInUsername = result.additionalUserInfo.profile.login;
+        }).catch(function(error) {
+            console.log("An error ocurred while signing in with Github. Error:", error);
+        });
+    }
+
+    updateCurrentUserAuthProfile(userData) {
+        firebase.auth().currentUser.updateProfile({
+            email: userData.email,
+            displayName: userData.displayName,
+            photoURL: userData.photoURL
+        }).then(() => {
+            console.log("Profile update succesful");
+        }).catch(error => {
+            console.log("An error ocurrer while updating user profile. Error:", error);
+        });
+    }
+
+    saveUserDataInDatabase(userData) {
+        firebase.database().ref().child('users').push(userData).then(() => {
+            console.log("User data saved in database succesfully");
+        }).catch(error => {
+            console.log("An error ocurred while saving user data in database. Error:", error);
+        });;
+
+    }
+
+    saveUserScoreInDatabase(achievedScore) {
+        let user = firebase.auth().currentUser;
+
+        if(user != null) {
+            return this.getUserByEmail(user.email).then(foundUser => {
+                if(foundUser) {
+                    let update = {};
+                    update["users/" + foundUser.key + "/achievedScore"] = achievedScore;
+                    return firebase.database().ref().update(update).then(() => {
+                        console.log("User score updated succesfully");
+                    }).catch(error => {
+                        console.log("An error ocurred while updating user score. Error:", error);
+                    });
+                } else {
+                    console.log("User not found in database. Can't save its score");
+                }
+            });
+        }
+    }
+
+    getUserByEmail(email) {
+        let user;
+        return firebase.database().ref().child("users")
+            .orderByChild("email")
+            .equalTo(email)
+            .once("value")
+            .then(snapshot => {
+                snapshot.forEach((childSnapshot) => {
+                    user = childSnapshot;
+                });
+
+                return user;
+            }).catch(error => {
+                console.log("An error ocurred while searching user in database. Error:", error);
+            });
+    }
+
+    getUsersRanking() {
+        let users = [];
+        return firebase.database().ref().child("users")
+            .orderByChild("achievedScore")
+            .once("value")
+            .then(snapshot => {
+                snapshot.forEach((childSnapshot) => {
+                    users.push(childSnapshot.val());
+                });
+
+                return users.reverse(); // We want the users ordered in descending order
+            });
+    }
+
+    signOut() {
+        firebase.auth().signOut();
+    }
+}
+
+export default Login;