feat: rename and re-order

johannesjo · Aug 13, 2024 · 5d67655 · 5d67655
1 parent 132f73e
commit 5d67655
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 56 deletions.
diff --git a/src/app/core-ui/side-nav/side-nav.component.html b/src/app/core-ui/side-nav/side-nav.component.html
@@ -253,8 +253,9 @@
     routerLink="scheduled"
     routerLinkActive="isActiveRoute"
   >
-    <mat-icon>list</mat-icon>
-    <span class="text">{{ T.MH.SCHEDULED|translate }}</span>
+    <mat-icon svgIcon="repeat"></mat-icon>
+    <!--    <span class="text">{{ T.MH.SCHEDULED|translate }}</span>-->
+    <span class="text">Repeat/Scheduled</span>
   </button>
   <button
     #menuEntry

diff --git a/src/app/pages/schedule-page/schedule-page.component.html b/src/app/pages/schedule-page/schedule-page.component.html
@@ -3,6 +3,60 @@
 </ng-template>
 
 <div class="page-wrapper">
+  <section
+    *ngIf=" (taskRepeatCfgs$|async) as taskRepeatCfgs; else spinner"
+    class="component-wrapper"
+    style="margin-top: 24px"
+  >
+    <h2>{{ T.SCHEDULE.REPEATED_TASKS|translate }}</h2>
+
+    <p
+      *ngIf="!taskRepeatCfgs?.length"
+      class="no-scheduled-tasks"
+    >
+      {{ T.SCHEDULE.NO_REPEATABLE_TASKS|translate }}
+    </p>
+
+    <div
+      [@standardList]="taskRepeatCfgs?.length"
+      class="repeat-task-cfgs"
+    >
+      <mat-card
+        appearance="outlined"
+        *ngFor="let taskRepeatCfg of taskRepeatCfgs; trackBy: trackByFn;"
+        class="repeat-task-cfg"
+      >
+        <mat-card-content>
+          <div class="repeat-task-cfg-content">
+            <div class="task-info">
+              <div class="title">
+                <inline-multiline-input
+                  (valueEdited)="updateRepeatableTitleIfChanged($event.wasChanged, $event.newVal, taskRepeatCfg)"
+                  [value]="taskRepeatCfg.title"
+                  class="task-title"
+                ></inline-multiline-input>
+
+                <tag-list
+                  [isShowProjectTagAlways]="true"
+                  [task]="taskRepeatCfg"
+                ></tag-list>
+              </div>
+
+              <div
+                (click)="editTaskRepeatCfg(taskRepeatCfg)"
+                class="repeat-text-and-icon"
+                mat-ripple
+              >
+                <div class="repeat-text">{{ getRepeatInfoText(taskRepeatCfg) }}</div>
+                <mat-icon svgIcon="repeat"></mat-icon>
+              </div>
+            </div>
+          </div>
+        </mat-card-content>
+      </mat-card>
+    </div>
+  </section>
+
   <section
     *ngIf="(reminderService.isRemindersLoaded$|async) && (scheduledTaskService.allScheduledTasks$|async) as allScheduledTasks; else spinner"
     class="component-wrapper"
@@ -112,58 +166,4 @@ <h2>{{T.SCHEDULE.SCHEDULED_TASKS|translate}}</h2>
       </mat-card>
     </div>
   </section>
-
-  <section
-    *ngIf=" (taskRepeatCfgs$|async) as taskRepeatCfgs; else spinner"
-    class="component-wrapper"
-    style="margin-top: 24px"
-  >
-    <h2>{{T.SCHEDULE.REPEATED_TASKS|translate}}</h2>
-
-    <p
-      *ngIf="!taskRepeatCfgs?.length"
-      class="no-scheduled-tasks"
-    >
-      {{T.SCHEDULE.NO_REPEATABLE_TASKS|translate}}
-    </p>
-
-    <div
-      [@standardList]="taskRepeatCfgs?.length"
-      class="repeat-task-cfgs"
-    >
-      <mat-card
-        appearance="outlined"
-        *ngFor="let taskRepeatCfg of taskRepeatCfgs; trackBy: trackByFn;"
-        class="repeat-task-cfg"
-      >
-        <mat-card-content>
-          <div class="repeat-task-cfg-content">
-            <div class="task-info">
-              <div class="title">
-                <inline-multiline-input
-                  (valueEdited)="updateRepeatableTitleIfChanged($event.wasChanged, $event.newVal, taskRepeatCfg)"
-                  [value]="taskRepeatCfg.title"
-                  class="task-title"
-                ></inline-multiline-input>
-
-                <tag-list
-                  [isShowProjectTagAlways]="true"
-                  [task]="taskRepeatCfg"
-                ></tag-list>
-              </div>
-
-              <div
-                (click)="editTaskRepeatCfg(taskRepeatCfg)"
-                class="repeat-text-and-icon"
-                mat-ripple
-              >
-                <div class="repeat-text">{{ getRepeatInfoText(taskRepeatCfg)}}</div>
-                <mat-icon svgIcon="repeat"></mat-icon>
-              </div>
-            </div>
-          </div>
-        </mat-card-content>
-      </mat-card>
-    </div>
-  </section>
 </div>