diff --git a/backend-weekly-report/Dockerfile b/backend-weekly-report/node_modules/Dockerfile
similarity index 100%
rename from backend-weekly-report/Dockerfile
rename to backend-weekly-report/node_modules/Dockerfile
diff --git a/backend-weekly-report/app.js b/backend-weekly-report/node_modules/app.js
similarity index 92%
rename from backend-weekly-report/app.js
rename to backend-weekly-report/node_modules/app.js
index 2d83f17..86276ad 100644
--- a/backend-weekly-report/app.js
+++ b/backend-weekly-report/node_modules/app.js
@@ -109,7 +109,7 @@ app.post("/sendResetEmail", (req, res) => {
   let sql = "select * from workers where worker_email = ? ";
 
   con.query(sql, [email], (err, worker) => {
-    if (worker.length > 0) {  
+    if (worker.length > 0) {
       crypto.randomBytes(127, (err, buf) => {
         let worker_name = worker[0].worker_name;
         let worker_surname = worker[0].worker_surname;
@@ -121,23 +121,18 @@ app.post("/sendResetEmail", (req, res) => {
 
         con.query(update, data, (err, row) => {
           if (err) {
-            res.json({
-              message: err,
-              resCode: 399,
-            });
-            res.end()
+            res.json(err);
           } else {
             let mailSended = mailer.sendMailToWorker(
               email,
               `${worker_name} ${worker_surname} Şifre sıfırlama talebi`,
-              `Şifre sıfırlama talebiniz alınmıştır. Şifrenizi sıfırlamak için <a href="http://localhost:4200/#/set-password/${token}"> TIKLAYINIZ</a>`
+              `Şifre sıfırlama talebiniz alınmıştır. Şifrenizi sıfırlamak için <a href="http://localhost/#/set-password/${token}"> TIKLAYINIZ</a>`
             );
 
             res.json({
               message: "Şifre sıfırlamanız için email gönderildi",
               resCode: 200,
             });
-            res.end();
           }
         });
       });
@@ -146,7 +141,6 @@ app.post("/sendResetEmail", (req, res) => {
         message: "E mailiniz sistemimizde kayıtlı değildir",
         resCode: 400,
       });
-      res.end();
     }
   });
 });
@@ -180,27 +174,35 @@ app.put("/setpassword", (req, res) => {
     resCode: 0,
   };
 
-  let datenow = Date();
+  let date = (new Date ((new Date((new Date(new Date())).toISOString() )).getTime() - ((new Date()).getTimezoneOffset()*60000))).toISOString().slice(0, 19).replace('T', ' ');
 
   if (password == repassword) {
     password = crypto.createHash("md5").update(password).digest("hex");
-    let data = [password, token, datenow];
+    let data = [password, token, date];
     let sql = `UPDATE workers SET password = ? WHERE token = ? AND ? < token_expire `;
     con.query(sql, data, (err, rows, fields) => {
       if (err) {
+        console.log("111111111111");
         responseModel.resCode = 400;
         responseModel.message = err.message;
-        res.send(responseModel);
+        res.json(responseModel);
+        res.end();
+      } else {
+        console.log("222222222");
+
+        responseModel.message =
+          "Şifre değiştirme başarılı. Lütfen giriş yapınız.";
+        responseModel.resCode = 200;
+        res.json(responseModel);
+        res.end();
       }
-      responseModel.message =
-        "Şifre değiştirme başarılı. Lütfen giriş yapınız.";
-      responseModel.resCode = 200;
-      res.send(responseModel);
     });
   } else {
+    console.log("3333333333333");
     responseModel.message = "Şifreler uyuşmamaktadır.";
     responseModel.resCode = 400;
     res.json(responseModel);
+    res.end();
   }
 });
 
@@ -226,7 +228,7 @@ app.post("/api/workers", checkAuth, function (req, res) {
 
     let subject = "Katana Reporting Kaydı!";
     let html = `Değerli çalışanımız, katana reporting uygulamasına davet edildiniz. Dilerseniz aşağıdaki linke tıklayark şifrenizi belirleyebilirsiniz
-    <br>Kullanıcı adı: ${username} <br>şifre:belirlemek için bu linke <a href="http://10.41.150.82/#/set-password/${token}">tıklayınız</a>`;
+    <br>Kullanıcı adı: ${username} <br>şifre:belirlemek için bu linke <a href="http://localhost/#/set-password/${token}">tıklayınız</a>`;
     // ${req.headers.host}
     let data = [
       worker_name,
@@ -239,7 +241,6 @@ app.post("/api/workers", checkAuth, function (req, res) {
     ];
     let sql = `INSERT INTO workers (worker_name, worker_surname, job_title, worker_email, username, token, token_expire) VALUES (?, ? , ?, ?, ?, ?, ?)`;
     con.query(sql, data, function (error, results, fields) {
- 
       res.send({
         message: "Kullanıcıya kaydolması için e-posta gönderilmiştir.",
         resCode: 200,
@@ -314,7 +315,7 @@ app.post("/gmauth", function (request, response) {
             muuid: gm.worker_name,
             memail: gm.worker_email,
             cid: gm.id,
-            is_gm: true
+            is_gm: true,
           },
           "dvurising",
           {
diff --git a/backend-weekly-report/config/db.js b/backend-weekly-report/node_modules/config/db.js
similarity index 100%
rename from backend-weekly-report/config/db.js
rename to backend-weekly-report/node_modules/config/db.js
diff --git a/backend-weekly-report/package-lock.json b/backend-weekly-report/node_modules/package-lock.json
similarity index 100%
rename from backend-weekly-report/package-lock.json
rename to backend-weekly-report/node_modules/package-lock.json
diff --git a/backend-weekly-report/package.json b/backend-weekly-report/node_modules/package.json
similarity index 100%
rename from backend-weekly-report/package.json
rename to backend-weekly-report/node_modules/package.json
diff --git a/backend-weekly-report/readme.rst b/backend-weekly-report/node_modules/readme.rst
similarity index 100%
rename from backend-weekly-report/readme.rst
rename to backend-weekly-report/node_modules/readme.rst
diff --git a/backend-weekly-report/src/middleware/checkAuth.js b/backend-weekly-report/src/middleware/checkAuth.js
index 992881a..bc93408 100644
--- a/backend-weekly-report/src/middleware/checkAuth.js
+++ b/backend-weekly-report/src/middleware/checkAuth.js
@@ -2,6 +2,7 @@ const jwt = require("jsonwebtoken");
 
 module.exports = (req, res, next) => {
   try {
+    console.log("👑👑👑👑👑👑", req.body);
     const token = req.headers.authorization;
     const decodedToken = jwt.verify(token, "dvurising");
     req.userData = decodedToken;
diff --git a/backend-weekly-report/src/middleware/checkGmAuth.js b/backend-weekly-report/src/middleware/checkGmAuth.js
index bed398a..4afda09 100644
--- a/backend-weekly-report/src/middleware/checkGmAuth.js
+++ b/backend-weekly-report/src/middleware/checkGmAuth.js
@@ -4,6 +4,8 @@ module.exports = (req, res, next) => {
   try {
     const token = req.headers.authorization;
     const decodedToken = jwt.verify(token, "dvurising");
+    console.log("🚀 🚀🚀🚀~ file: checkGmAuth.js ~ line 8 ~ req.body.gm_id", req.body)
+    console.log("🚀 🚀🚀🚀~ file: checkGmAuth.js ~ line 8 ~ decodedToken.gm_id", decodedToken)
     if (decodedToken.is_gm == true) {
       next();
     }
diff --git a/weekly-report-app/src/app/reports/report-detaill/report-detail.component.html b/weekly-report-app/src/app/reports/report-detaill/report-detail.component.html
index 839a3c7..8ba2412 100644
--- a/weekly-report-app/src/app/reports/report-detaill/report-detail.component.html
+++ b/weekly-report-app/src/app/reports/report-detaill/report-detail.component.html
@@ -126,7 +126,7 @@ <h1 *ngIf="rows" class="jumbotron-heading">{{ rows[0]? rows[0].week_id + ". Haft
                         class="form-control"
                         [ngClass]="{ 'is-invalid': f.actions.errors && (f.actions.touched || f.actions.dirty) }">
                       </textarea>
-                      <mat-error *ngIf="f.actions.errors && (f.actions.touched || f.actions.dirty)">Alınan aksiyonlar en az 20 karakter içermelidir.</mat-error>
+                      <mat-error *ngIf="f.actions.errors && (f.actions.touched || f.actions.dirty)">Alınan aksiyonlar en az 30 karakter içermelidir.</mat-error>
                     </div>
                   </div>
                 </td>
@@ -165,7 +165,7 @@ <h1 *ngIf="rows" class="jumbotron-heading">{{ rows[0]? rows[0].week_id + ". Haft
                         class="form-control"></textarea>
                     </div>
                   </div>
-                  <div class="form-group row float-right mt-4 mr-1">
+                  <div style="background-color: #f44336;" class="form-group row float-right mt-4 mr-1">
                     <button (click)="addRow()" [disabled]="!rowForm.valid" name="submit" type="submit"
                       class="btn btn-primary">Satırı Ekle</button>
                   </div>
@@ -232,7 +232,7 @@ <h6>HAFTALIK FAALİYETLER</h6>
       <td>{{row.actions}}</td>
       <td>{{row.comments}}</td>
       <!-- <td>{{row.code | vatAdded: 10 | currency:'₺'}}</td> -->
-      <td [style.color]="setColor(row.matter+1)" class="font-weight-bolder">{{row.matter+1}}</td>
+      <td [style.color]="setColor(row.matter+1)" class="font-weight-bolder">{{colorName(row.matter+1)}}</td>
       <td>{{row.start_date | date: 'dd/MM/yyyy'}}</td>
       <td>{{row.finish_date | date: 'dd/MM/yyyy'}}</td>
       <td>{{row.is_timeout ? "Var":"Yok"}}</td>
diff --git a/weekly-report-app/src/app/reports/report-detaill/report-detail.component.ts b/weekly-report-app/src/app/reports/report-detaill/report-detail.component.ts
index 257b557..24a4440 100644
--- a/weekly-report-app/src/app/reports/report-detaill/report-detail.component.ts
+++ b/weekly-report-app/src/app/reports/report-detaill/report-detail.component.ts
@@ -124,14 +124,14 @@ export class ReportDetailComponent implements OnInit {
     this.pasteModel.finish_date = row.finish_date;
     this.pasteModel.actions = row.actions;
     this.pasteModel.weekly_time_spent = row.weekly_time_spent;
-    this.pasteModel.is_timeout = row.is_timeout ? 'Var' : 'Yok';
+    this.pasteModel.is_timeout = row.is_timeout==true ? 'Var' : 'Yok';
     this.pasteModel.comments = row.comments;
   }
 
   CheckAllOptions() {
-    let boxes = this.checkBoxes
-    
-    if (boxes.every(val => val.checked == true))
+    let boxes = this.checkBoxes;
+
+    if (boxes.every((val) => val.checked == true))
       for (let i = 0; i < boxes.length; i++) {
         boxes[i].checked = false;
       }
@@ -139,7 +139,25 @@ export class ReportDetailComponent implements OnInit {
       for (let i = 0; i < boxes.length; i++) {
         boxes[i].checked = true;
       }
+  }
 
+  colorName(matter_number) {
+    switch (matter_number) {
+      case 1:
+        return 'çok düşük';
+      case 1:
+        return 'düşük';
+      case 3:
+        return 'normal';
+      case 4:
+        return 'yüksek';
+      case 5:
+        return 'çok yüksek';
+      case 6:
+        return 'çok düşük';
+      default:
+        return 'belirtilmemiş';
+    }
   }
 
   setColor(matter: string): string {
@@ -194,7 +212,11 @@ export class ReportDetailComponent implements OnInit {
       : 'yapılan işler eklenmeden gönderildi. ';
     let subject = `<${week_id}>.Hafta<${worker_name}>`;
 
-    let html = `<h3><${week_id?week_id+".Hafta":"Rapor Numarası: "+this.reportId}><${worker_name}></h3>${week_id}. Hafta raporu ${worker_name} tarafından gönderildi.<br>Raporu hemen görüntülemek için<a href="http://localhost:4200/report-detail/${this.reportId}">tıklayınız</a>`;
+    let html = `<h3><${
+      week_id ? week_id + '.Hafta' : 'Rapor Numarası: ' + this.reportId
+    }><${worker_name}></h3>${week_id}. Hafta raporu ${worker_name} tarafından gönderildi.<br>Raporu hemen görüntülemek için<a href="http://localhost:4200/report-detail/${
+      this.reportId
+    }">tıklayınız</a>`;
 
     let mailPacket = {
       general_manager_email: general_manager_email,
@@ -202,8 +224,7 @@ export class ReportDetailComponent implements OnInit {
       html: html,
     };
 
-    this.mailService.sentToGm(mailPacket).subscribe((data) => {
-    });
+    this.mailService.sentToGm(mailPacket).subscribe((data) => {});
   }
 
   sendMailToWorker() {
@@ -222,13 +243,11 @@ export class ReportDetailComponent implements OnInit {
       subject: subject,
       html: html,
     };
-    this.mailService.sentToGm(mailPacket).subscribe((data) => {
-    });
+    this.mailService.sentToGm(mailPacket).subscribe((data) => {});
   }
 
   sendMailToWorker2(mailPacket) {
-    this.mailService.sentToWorker(mailPacket).subscribe((data) => {
-    });
+    this.mailService.sentToWorker(mailPacket).subscribe((data) => {});
   }
 
   getRows(report_id: any) {
@@ -237,7 +256,9 @@ export class ReportDetailComponent implements OnInit {
         if (response.resCode == 200) {
           this.toastrService.success(response.message);
           this.rows = response.data; //sadece rowları değil yanında week idyi de getirir
-          this.week_id = response.data[0].week_id?response.data[0].week_id:"boş";
+          this.week_id = response.data[0].week_id
+            ? response.data[0].week_id
+            : 'boş';
           response.data.forEach((row) => {
             this.checkBoxes.push({
               checked: row.checked_by_admin,
@@ -302,7 +323,7 @@ export class ReportDetailComponent implements OnInit {
     if (checkBoxes.length > 0) {
       const dialogRef = this.dialog.open(PopupEditComponent, {
         width: '400px',
-        data: { name: this.name, claimant_comment: this.claimant_comment},
+        data: { name: this.name, claimant_comment: this.claimant_comment },
       });
 
       checkBoxes.forEach((item) => {
@@ -353,11 +374,10 @@ export class ReportDetailComponent implements OnInit {
               };
 
               this.sendMailToWorker2(mailPacket);
-              debugger
+              debugger;
               this.toastrService.success('kullanıcıya e posta gönderildi');
             });
-        } 
-        else {
+        } else {
           this.toastrService.info('Rapor gönderim işlemi iptal edildi');
         }
       });
@@ -371,22 +391,25 @@ export class ReportDetailComponent implements OnInit {
       dialogRef.afterClosed().subscribe((result) => {
         this.claimant_comment = result;
         if (this.claimant_comment.length > 0) {
-          
-        this.workerService.getByReport(this.reportId).subscribe((worker) => {
-          this.worker_name = worker[0].worker_name;
-          this.worker_surname = worker[0].worker_surname;
-          this.worker_email = worker[0].worker_email;
-          this.week_id? worker[0].week_id: 0;
-
-          this.reportService.sendBackReport(this.reportId).subscribe((data) => {
-            this.toastrService.info(
-              `${this.reportId} numaralı rapor gönderilmedi olarak işaretlenmiştir`
-            );
-          });
-          let mailPacket = {
-            worker_email: this.worker_email,
-            subject: `<${this.week_id?this.week_id : "Boş"}>.Rapor.Düzeltme Talebi`,
-            html: `
+          this.workerService.getByReport(this.reportId).subscribe((worker) => {
+            this.worker_name = worker[0].worker_name;
+            this.worker_surname = worker[0].worker_surname;
+            this.worker_email = worker[0].worker_email;
+            this.week_id ? worker[0].week_id : 0;
+
+            this.reportService
+              .sendBackReport(this.reportId)
+              .subscribe((data) => {
+                this.toastrService.info(
+                  `${this.reportId} numaralı rapor gönderilmedi olarak işaretlenmiştir`
+                );
+              });
+            let mailPacket = {
+              worker_email: this.worker_email,
+              subject: `<${
+                this.week_id ? this.week_id : 'Boş'
+              }>.Rapor.Düzeltme Talebi`,
+              html: `
           <table>
               <tr>
                   <td>Başlık</td>
@@ -394,26 +417,30 @@ export class ReportDetailComponent implements OnInit {
                   <td>Yönetici Yorumu</td>
               </tr>
               <tr>
-                  <td>${this.worker_name} ${this.worker_surname} Rapor düzenleme talebi</td>
+                  <td>${this.worker_name} ${
+                this.worker_surname
+              } Rapor düzenleme talebi</td>
                   <td>
                   
-                  Sn. ${this.worker_name} ${this.worker_surname}, <br>${this.week_id?this.week_id:""}. haftalık raporunuzu boş olarak gönderdiniz. Tekrar   <br> düzenlemelisiniz.  <b>raporunuz gönderilmedi olarak </b> işaretlendi
+                  Sn. ${this.worker_name} ${this.worker_surname}, <br>${
+                this.week_id ? this.week_id : ''
+              }. haftalık raporunuzu boş olarak gönderdiniz. Tekrar   <br> düzenlemelisiniz.  <b>raporunuz gönderilmedi olarak </b> işaretlendi
               <br>
-              <b>raporu düzenlemek için</b><a href="http://localhost:4200/report-detail/${this.reportId}">tıklayınız</a>
+              <b>raporu düzenlemek için</b><a href="http://localhost:4200/report-detail/${
+                this.reportId
+              }">tıklayınız</a>
                   </td>
                   <td>${this.claimant_comment}</td>
               </tr>
               
               </table>
           `,
-          };
+            };
 
-          this.sendMailToWorker2(mailPacket);
-          this.toastrService.success('kullanıcıya e posta gönderildi');
-        });
-      }
-      else
-        this.toastrService.info("Rapor revizyon işlemi iptal edildi")
+            this.sendMailToWorker2(mailPacket);
+            this.toastrService.success('kullanıcıya e posta gönderildi');
+          });
+        } else this.toastrService.info('Rapor revizyon işlemi iptal edildi');
       });
     }
   }
diff --git a/weekly-report-app/src/app/reset-password/reset-password.component.html b/weekly-report-app/src/app/reset-password/reset-password.component.html
index abaa076..af7a61c 100644
--- a/weekly-report-app/src/app/reset-password/reset-password.component.html
+++ b/weekly-report-app/src/app/reset-password/reset-password.component.html
@@ -14,7 +14,7 @@ <h2 class="h2">Şifre sıfırlama</h2>
     <p *ngIf="message=='Şifreler uyuşmuyor.'" class="alert alert-warning">{{message}}</p>
         <div class="form-group row">
             <div class="offset-4 col-8">
-                <button (click)="sendResetPasswordEmail()" class="btn btn-primary">E posta gönder</button>
+                <button (click)="setPassword()" class="btn btn-primary">E posta gönder</button>
             </div>
         </div>
     </form>
diff --git a/weekly-report-app/src/app/reset-password/reset-password.component.ts b/weekly-report-app/src/app/reset-password/reset-password.component.ts
index d9e9b6d..e946900 100644
--- a/weekly-report-app/src/app/reset-password/reset-password.component.ts
+++ b/weekly-report-app/src/app/reset-password/reset-password.component.ts
@@ -11,13 +11,13 @@ import { WorkerService } from '../services/worker.service';
   styleUrls: ['./reset-password.component.css'],
 })
 export class ResetPasswordComponent implements OnInit {
-  message = '';
+  message = ""
   constructor(
     private activatedRoute: ActivatedRoute,
     private formBuilder: FormBuilder,
     private workerService: WorkerService,
     private toastr: ToastrService,
-    private emailService: MailService
+    private emailService: MailService,
   ) {}
   resetPasswordForm: FormGroup;
 
@@ -31,19 +31,32 @@ export class ResetPasswordComponent implements OnInit {
     this.createRowForm();
   }
 
-  sendResetPasswordEmail(): void {
+  setPassword(): void {
     let email = this.resetPasswordForm.value.email;
     let regexEmail = /^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/;
-
+    
     if (email.match(regexEmail)) {
-      this.workerService.sendResetEmail(email).subscribe((data) => {
-        if ((data.resCode == 200)) {
+      this.workerService.sendResetEmail(email).subscribe(data => {
+        console.log(data)
+        if (data.resCode = 200) {
           this.toastr.success(data.message);
         }
-        else if ((data.resCode == 400)) {
-          this.toastr.error(data.message);
+        if (data.resCode = 400) {
+          // this.toastr.error(data.message);         
         }
-      });
-    } else this.toastr.error('E posta hatalıdır.');
+      })
+ 
+      // let mailPacket = {
+      //   worker_email: email,
+      //   subject: "Şifre sıfırlama talebi",
+      //   html: "html",
+      // };
+
+
+      // this.emailService.sentToWorker(mailPacket)
+
+    
+    }
+    else this.toastr.error("E posta hatalıdır.")
   }
 }
diff --git a/weekly-report-app/src/app/set-password/set-password.component.ts b/weekly-report-app/src/app/set-password/set-password.component.ts
index 114e3b1..d856f4b 100644
--- a/weekly-report-app/src/app/set-password/set-password.component.ts
+++ b/weekly-report-app/src/app/set-password/set-password.component.ts
@@ -46,8 +46,7 @@ export class SetPasswordComponent implements OnInit {
     let repassword = this.setPasswordForm.value.repassword;
     if (password != repassword) {
       this.message = 'Şifreler uyuşmuyor.';
-    } 
-    else if(password === repassword) {
+    } else {
       const data = {
         token: this.token,
         password: password,
@@ -56,8 +55,8 @@ export class SetPasswordComponent implements OnInit {
       this.workerService.updatePassword(data).subscribe((data) => {
         if (data.resCode == 200) {
           this.router.navigate(['/login']).then((b) => {
-            this.toastr.success(data.message);
             window.location.reload();
+            this.toastr.success(data.message);
           });
         }
         if (data.resCode == 400) this.toastr.error(data.message);