diff --git a/project/src/app/app.routes.ts b/project/src/app/app.routes.ts index c714e39..296012a 100644 --- a/project/src/app/app.routes.ts +++ b/project/src/app/app.routes.ts @@ -3,8 +3,8 @@ import {DashboardComponent} from "./components/dashboard/dashboard.component"; import {LoginComponent} from "./components/login/login.component"; import {loggedInGuard} from "./guards/loggedIn/logged-in.guard"; import {ProfileComponent} from "./components/dashboard/profile/profile.component"; -import {EditProfileComponent} from "./components/dashboard/edit-profile/edit-profile.component"; -import {ChangePasswordComponent} from "./components/dashboard/change-password/change-password.component"; +import {EditProfileComponent} from "./components/dashboard/profile/edit-profile/edit-profile.component"; +import {ChangePasswordComponent} from "./components/dashboard/profile/change-password/change-password.component"; import {ManageUsersComponent} from "./components/dashboard/manage-users/manage-users.component"; import {ShowDataComponent} from "./components/dashboard/show-data/show-data.component"; import {isAdminGuard} from "./guards/admin/is-admin.guard"; diff --git a/project/src/app/components/dashboard/change-password/change-password.component.scss b/project/src/app/components/dashboard/change-password/change-password.component.scss deleted file mode 100644 index b3f938d..0000000 --- a/project/src/app/components/dashboard/change-password/change-password.component.scss +++ /dev/null @@ -1 +0,0 @@ -@import '../../../../variables'; diff --git a/project/src/app/components/dashboard/edit-profile/edit-profile.component.scss b/project/src/app/components/dashboard/edit-profile/edit-profile.component.scss deleted file mode 100644 index 9f4067e..0000000 --- a/project/src/app/components/dashboard/edit-profile/edit-profile.component.scss +++ /dev/null @@ -1 +0,0 @@ -@import "../../../../variables"; diff --git a/project/src/app/components/dashboard/change-password/change-password.component.html b/project/src/app/components/dashboard/profile/change-password/change-password.component.html similarity index 96% rename from project/src/app/components/dashboard/change-password/change-password.component.html rename to project/src/app/components/dashboard/profile/change-password/change-password.component.html index 76fee10..a8f2e5a 100644 --- a/project/src/app/components/dashboard/change-password/change-password.component.html +++ b/project/src/app/components/dashboard/profile/change-password/change-password.component.html @@ -1,4 +1,5 @@ -
+ + + + نام و نام خانوادگی: {{ user?.firstName }} - {{ user?.lastName }} + {{ user?.lastName }}

@@ -32,14 +32,15 @@

}
    -
  • +
  • عوض کردن گذرواژه
  • ادیت کردن پروفایل
    • -
  • +
  • خروج از حساب
+ diff --git a/project/src/app/components/dashboard/profile/profile.component.ts b/project/src/app/components/dashboard/profile/profile.component.ts index ee3477c..92cdc7a 100644 --- a/project/src/app/components/dashboard/profile/profile.component.ts +++ b/project/src/app/components/dashboard/profile/profile.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; import User from "../../../interfaces/user"; -import {RouterLink, RouterLinkActive} from "@angular/router"; +import {RouterLink, RouterLinkActive, RouterOutlet} from "@angular/router"; import {UserService} from "../../../services/user/user.service"; import {NgIconComponent, provideIcons} from "@ng-icons/core"; import { heroMagnifyingGlassSolid, heroUserCircleSolid, heroCircleStackSolid } from '@ng-icons/heroicons/solid'; @@ -10,7 +10,7 @@ import { heroMagnifyingGlassSolid, heroUserCircleSolid, heroCircleStackSolid } f standalone: true, imports: [RouterLink, RouterLinkActive, - NgIconComponent ], + NgIconComponent, RouterOutlet], templateUrl: './profile.component.html', styleUrl: './profile.component.scss', providers: [provideIcons({heroUserCircleSolid, heroMagnifyingGlassSolid, heroCircleStackSolid})] diff --git a/project/src/app/components/dashboard/show-data/show-data.component.scss b/project/src/app/components/dashboard/show-data/show-data.component.scss index 9146dce..f88252c 100644 --- a/project/src/app/components/dashboard/show-data/show-data.component.scss +++ b/project/src/app/components/dashboard/show-data/show-data.component.scss @@ -54,7 +54,7 @@ } } .table-container { - @apply absolute p-6 justify-center items-center rounded-2xl hidden text-[1.5rem] overflow-auto; + @apply absolute p-6 justify-center items-center rounded-2xl hidden text-[1.5rem] overflow-auto z-20; background-color: $primary-color; color: $bg-color; @@ -83,10 +83,6 @@ border-color: $bg-color; } } - .xicon { - @apply absolute w-[4rem] h-[4rem] top-0 right-0; - color: $bg-color; - } .form-search-user { @apply text-[2rem] self-center border rounded-2xl transition-all duration-300 ease-in-out p-4 flex flex-row gap-4 items-center; @@ -101,7 +97,7 @@ background-color: $secondary-color; } .showUserContainer { - @apply hidden flex-row justify-center items-center absolute text-[2rem] rounded-2xl; + @apply hidden flex-row justify-center items-center absolute text-[2rem] rounded-2xl z-30; background-color: $primary-color; color: $bg-color; diff --git a/project/src/variables.scss b/project/src/variables.scss index 9583767..58875ba 100644 --- a/project/src/variables.scss +++ b/project/src/variables.scss @@ -9,12 +9,16 @@ $bg-color: #FDFDFD; $primary-color: #002B5B; $text-color : #172535; $secondary-color: #4F86C9; -$success-color: #4FBD70; +$success-color: #4FBD70; $accent-color: #E9B91B; $error-color: #F05A7E; // Base classes @layer components { + .xicon { + @apply absolute w-[4rem] h-[4rem] top-0 right-0; + color: $bg-color; + } .fullscreen { @apply flex flex-row justify-center items-center min-h-screen relative;