Merge branch 'master' into auth

1 files changed, 1 insertions, 26 deletions

diff --git a/db.js b/db.js
index cd76e0a..f2cf13d 100644
--- a/db.js
+++ b/db.js
@@ -29,31 +29,6 @@ class DB {
             for (const query of queries) await this.query(query);
             console.log("Tables created!");
         });
-
-        fs.readFile(__dirname + "/names.csv", "utf8", (err, data) => {
-            if (err) throw err;
-            const classes = data.split("--");
-            classes.forEach((clazz, classIndex) => {
-                const students = clazz.split("\n");
-                students.forEach(async (student) => {
-                    // Fix undefined
-                    if (student && student.length > 3) {
-                        const [_, surname, name] = student.split(",");
-                        const names = name.split(" ");
-                        const middlename = names.length > 1 && names[1] ? names.slice(1).join(" ") : null;
-                        let username = surname.toLowerCase().slice(0, 6);
-                        if (middlename) username += middlename[0].toLowerCase();
-                        username += names[0].toLowerCase().slice(0, 2);
-                        const pwd = nanoid.nanoid(8);
-                        const password = await bcrypt.hash(pwd, 12);
-                        await this.query(
-                            "INSERT INTO users (username, name, middlename, surname, password, class_id, type_id) VALUE (?,?,?,?,?,?,?)",
-                            [username, names[0], middlename, surname, password, classIndex + 1, 2]
-                        );
-                    }
-                });
-            });
-        });
     }
 
     initValues() {
@@ -75,7 +50,7 @@ class DB {
                         const password = await bcrypt.hash(pwd, 12);
                         await this.query(
                             "INSERT INTO users (username, name, middlename, surname, password, class_id, type_id) VALUE (?,?,?,?,?,?,?)",
-                            [username, names[0], middlename, surname, password, classIndex + 1, 2]
+                            [username, names[0].replace("\r", ""), middlename, surname, password, classIndex + 1, 2]
                         );
                     }
                 });