all done!!!!!!

Author: harshbaldwa

backend/Archive.zip

@@ -9,8 +9,8 @@ const app = express();
 
 mongoose
   .connect(
-    // "mongodb://localhost:27017/myapp"
-    "mongodb://ladder:YnwLdH8guBV9EOam@cluster0-shard-00-00-cvuiq.mongodb.net:27017,cluster0-shard-00-01-cvuiq.mongodb.net:27017,cluster0-shard-00-02-cvuiq.mongodb.net:27017/myLadder?ssl=true&replicaSet=Cluster0-shard-0&authSource=admin&retryWrites=true&w=majority"
+    "mongodb://localhost:27017/myapp"
+    // "mongodb://ladder:YnwLdH8guBV9EOam@cluster0-shard-00-00-cvuiq.mongodb.net:27017,cluster0-shard-00-01-cvuiq.mongodb.net:27017,cluster0-shard-00-02-cvuiq.mongodb.net:27017/myLadder?ssl=true&replicaSet=Cluster0-shard-0&authSource=admin&retryWrites=true&w=majority"
   )
   .then(() => {
     console.log("Connected to database!");
@@ -58,16 +58,16 @@ function predicateBy(prop) {
 // Squash Data
 app.get('/api/table/squash', (req, res, next) => {
   const squashData = [];
-  Player.find().then(documents => {
+  Player.find({ preferred: { $regex: "squash" } }).then(documents => {
     for (let i = 0; i < documents.length; i++) {
       squashData.push({
         id: documents[i]["_id"],
         rank: null,
         username: documents[i]["name"],
         points: documents[i]["squash_score"],
         category: documents[i]["category"],
-        matchPlayed: documents[i]['match_played_squash'],
-        matchWon: documents[i]['match_won_squash']
+        matchPlayed: documents[i]["match_played_squash"],
+        matchWon: documents[i]["match_won_squash"]
       });
     }
     squashData.sort(predicateBy("points"));
@@ -82,7 +82,7 @@ app.get('/api/table/squash', (req, res, next) => {
 // Table Tennis Data
 app.get('/api/table/tt', (req, res, next) => {
   const ttData = [];
-  Player.find().then(documents => {
+  Player.find({ preferred: { $regex: "tt" } }).then(documents => {
     for (let i = 0; i < documents.length; i++) {
       ttData.push({
         id: documents[i]["_id"],
@@ -106,7 +106,7 @@ app.get('/api/table/tt', (req, res, next) => {
 // Lawn Tennis Data
 app.get('/api/table/tennis', (req, res, next) => {
   const tennisData = [];
-  Player.find().then(documents => {
+  Player.find({ preferred: { $regex: "tennis" } }).then(documents => {
     for (let i = 0; i < documents.length; i++) {
       tennisData.push({
         id: documents[i]["_id"],
@@ -131,7 +131,7 @@ app.get('/api/table/tennis', (req, res, next) => {
 app.get('/api/table/badminton', (req, res, next) => {
 
   const badmintonData = [];
-  Player.find().then(documents => {
+  Player.find({ preferred: { $regex: "badminton" } }).then(documents => {
     for (let i = 0; i < documents.length; i++) {
       badmintonData.push({
         id: documents[i]["_id"],
@@ -713,7 +713,7 @@ app.post("/api/login", (req, res, next) => {
       }
       const token = jwt.sign(
         { roll: fetchedPlayer.roll, playerId: fetchedPlayer._id },
-        process.env.JWT_KEY
+        'harsh_is_god_he_is_invincible'
       );
       res.status(200).json({
         token: token,

backend/app.js

@@ -42,7 +42,7 @@
     </mat-form-field>
     <mat-form-field>
       <mat-label>Preferred Sport</mat-label>
-      <mat-select name="preferred" [(ngModel)]="preferred" required>
+      <mat-select name="preferred" [(ngModel)]="preferred" required multiple>
         <mat-option value="squash">Squash</mat-option>
         <mat-option value="tt">Table Tennis</mat-option>
         <mat-option value="tennis">Lawn Tennis</mat-option>

src/app/auth/signup/signup.component.html

@@ -20,6 +20,11 @@ export class SignupComponent {
   constructor(public authService: AuthService) {}
 
   onSignup(form: NgForm) {
+    console.log(this.preferred);
+    let sports = '';
+    for (const sport of this.preferred) {
+      sports = sports + sport;
+    }
     if (form.invalid) {
       return;
     }
@@ -29,7 +34,7 @@ export class SignupComponent {
       form.value.hostel,
       form.value.gender,
       form.value.category,
-      form.value.preferred,
+      sports,
       form.value.contact,
       form.value.password
       );

src/app/auth/signup/signup.component.ts

@@ -18,5 +18,5 @@ <h1 style="margin-left: 20%;">Update Result</h1>
     <h2>How to enter score?</h2>
   </div>
   <p>Enter the match score in first one <br>
-    Enter set score like <br> 11-0; 11-10; 11-9  </p>
+    Enter set score like this<br> 11-0 11-10 11-9  </p>
 </mat-card>

src/app/confirmation/update-result/updateResult.component.html

@@ -1,4 +1,4 @@
 export const environment = {
   production: true,
-  apiUrl: 'http://ladderranking-env.qmh2e8famw.us-east-2.elasticbeanstalk.com/api/'
+  apiUrl: 'http://13.232.113.230/api/'
 };

src/environments/environment.prod.ts

@@ -4,7 +4,7 @@
 
 export const environment = {
   production: false,
-  apiUrl: 'http://ladderranking-env.qmh2e8famw.us-east-2.elasticbeanstalk.com/api/'
+  apiUrl: 'http://13.232.113.230/api/'
 };
 
 /*