Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
H
HIAST-Clinics
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
almohanad.hafez
HIAST-Clinics
Commits
92c4497b
Commit
92c4497b
authored
Aug 22, 2024
by
Almouhannad
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(F) Add error pages
parent
ba3c5ec5
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
81 additions
and
9 deletions
+81
-9
app-routing.module.ts
Clinics.Frontend/src/app/app-routing.module.ts
+13
-0
app.module.ts
Clinics.Frontend/src/app/app.module.ts
+5
-1
forbidden.component.css
...c/app/components/errors/forbidden/forbidden.component.css
+0
-0
forbidden.component.html
.../app/components/errors/forbidden/forbidden.component.html
+4
-0
forbidden.component.ts
...rc/app/components/errors/forbidden/forbidden.component.ts
+10
-0
not-found.component.css
...c/app/components/errors/not-found/not-found.component.css
+0
-0
not-found.component.html
.../app/components/errors/not-found/not-found.component.html
+4
-0
not-found.component.ts
...rc/app/components/errors/not-found/not-found.component.ts
+10
-0
layout.component.css
...d/src/app/components/template/layout/layout.component.css
+12
-0
layout.component.html
.../src/app/components/template/layout/layout.component.html
+6
-3
role-guard.ts
...tend/src/app/services/authentication/guards/role-guard.ts
+17
-5
No files found.
Clinics.Frontend/src/app/app-routing.module.ts
View file @
92c4497b
...
@@ -3,6 +3,8 @@ import { RouterModule, Routes } from '@angular/router';
...
@@ -3,6 +3,8 @@ import { RouterModule, Routes } from '@angular/router';
import
{
HomeComponent
}
from
'./components/home/home.component'
;
import
{
HomeComponent
}
from
'./components/home/home.component'
;
import
{
RoleGuard
}
from
'./services/authentication/guards/role-guard'
;
import
{
RoleGuard
}
from
'./services/authentication/guards/role-guard'
;
import
{
Roles
}
from
'./classes/Authentication/roles'
;
import
{
Roles
}
from
'./classes/Authentication/roles'
;
import
{
ForbiddenComponent
}
from
'./components/errors/forbidden/forbidden.component'
;
import
{
NotFoundComponent
}
from
'./components/errors/not-found/not-found.component'
;
const
routes
:
Routes
=
[
const
routes
:
Routes
=
[
{
{
...
@@ -16,6 +18,17 @@ const routes: Routes = [
...
@@ -16,6 +18,17 @@ const routes: Routes = [
component
:
HomeComponent
,
component
:
HomeComponent
,
canActivate
:
[
RoleGuard
],
canActivate
:
[
RoleGuard
],
data
:
{
role
:
Roles
.
NotRegistered
}
data
:
{
role
:
Roles
.
NotRegistered
}
},
{
path
:
'errors/forbidden'
,
component
:
ForbiddenComponent
,
canActivate
:
[
RoleGuard
],
data
:
{
role
:
Roles
.
NotRegistered
}
},
// Everything else
{
path
:
'**'
,
component
:
NotFoundComponent
}
}
];
];
@
NgModule
({
@
NgModule
({
...
...
Clinics.Frontend/src/app/app.module.ts
View file @
92c4497b
...
@@ -16,6 +16,8 @@ import { FormsModule } from '@angular/forms';
...
@@ -16,6 +16,8 @@ import { FormsModule } from '@angular/forms';
import
{
HTTP_INTERCEPTORS
,
HttpClientModule
}
from
'@angular/common/http'
;
import
{
HTTP_INTERCEPTORS
,
HttpClientModule
}
from
'@angular/common/http'
;
import
{
AuthenticationService
}
from
'./services/authentication/authentication.service'
;
import
{
AuthenticationService
}
from
'./services/authentication/authentication.service'
;
import
{
AuthenticationInterceptor
}
from
'./services/authentication/interceptor/authentication.interceptor'
;
import
{
AuthenticationInterceptor
}
from
'./services/authentication/interceptor/authentication.interceptor'
;
import
{
ForbiddenComponent
}
from
'./components/errors/forbidden/forbidden.component'
;
import
{
NotFoundComponent
}
from
'./components/errors/not-found/not-found.component'
;
@
NgModule
({
@
NgModule
({
...
@@ -46,7 +48,9 @@ import { AuthenticationInterceptor } from './services/authentication/interceptor
...
@@ -46,7 +48,9 @@ import { AuthenticationInterceptor } from './services/authentication/interceptor
HeaderComponent
,
HeaderComponent
,
FooterComponent
,
FooterComponent
,
HomeComponent
,
HomeComponent
,
LoginFormComponent
LoginFormComponent
,
ForbiddenComponent
,
NotFoundComponent
],
],
// identifies the root component that Angular should
// identifies the root component that Angular should
...
...
Clinics.Frontend/src/app/components/errors/forbidden/forbidden.component.css
0 → 100644
View file @
92c4497b
Clinics.Frontend/src/app/components/errors/forbidden/forbidden.component.html
0 → 100644
View file @
92c4497b
<div
class=
"cutom-child text-center"
style=
"padding: 6em;"
>
<i
class=
"bi bi-exclamation-triangle-fill text-danger"
style=
"font-size: 4em;"
></i>
<h1
class=
"text-danger text-center"
style=
"font-family: Cairo;"
>
خطأ: لا يمكنك الوصول إلى الصفحة التي طلبتها
</h1>
</div>
\ No newline at end of file
Clinics.Frontend/src/app/components/errors/forbidden/forbidden.component.ts
0 → 100644
View file @
92c4497b
import
{
Component
}
from
'@angular/core'
;
@
Component
({
selector
:
'app-forbidden'
,
templateUrl
:
'./forbidden.component.html'
,
styleUrl
:
'./forbidden.component.css'
})
export
class
ForbiddenComponent
{
}
Clinics.Frontend/src/app/components/errors/not-found/not-found.component.css
0 → 100644
View file @
92c4497b
Clinics.Frontend/src/app/components/errors/not-found/not-found.component.html
0 → 100644
View file @
92c4497b
<div
class=
"cutom-child text-center"
style=
"padding: 6em;"
>
<i
class=
"bi bi-exclamation-triangle-fill text-danger"
style=
"font-size: 4em;"
></i>
<h1
class=
"text-danger text-center"
style=
"font-family: Cairo;"
>
خطأ: الصفحة المطلوبة غير موجودة
</h1>
</div>
\ No newline at end of file
Clinics.Frontend/src/app/components/errors/not-found/not-found.component.ts
0 → 100644
View file @
92c4497b
import
{
Component
}
from
'@angular/core'
;
@
Component
({
selector
:
'app-not-found'
,
templateUrl
:
'./not-found.component.html'
,
styleUrl
:
'./not-found.component.css'
})
export
class
NotFoundComponent
{
}
Clinics.Frontend/src/app/components/template/layout/layout.component.css
View file @
92c4497b
/* #region Custom */
.custom-parent
{
display
:
flex
;
flex-direction
:
column
;
min-height
:
100vh
;
}
app-footer
{
margin-top
:
auto
;
}
/* #endregion */
/* #region General */
/* #region General */
::ng-deep
.custom-child
{
::ng-deep
.custom-child
{
color
:
var
(
--default-color
);
color
:
var
(
--default-color
);
...
...
Clinics.Frontend/src/app/components/template/layout/layout.component.html
View file @
92c4497b
<app-header
class=
"sticky-top"
[
userData
]="
userData
"
></app-header>
<div
class=
"custom-parent"
>
<app-header
class=
"sticky-top"
[
userData
]="
userData
"
></app-header>
<router-outlet></router-outlet>
<router-outlet></router-outlet>
<app-footer></app-footer>
</div>
<app-footer></app-footer>
\ No newline at end of file
Clinics.Frontend/src/app/services/authentication/guards/role-guard.ts
View file @
92c4497b
import
{
Injectable
}
from
'@angular/core'
;
import
{
Injectable
}
from
'@angular/core'
;
import
{
CanActivate
,
ActivatedRouteSnapshot
,
RouterStateSnapshot
}
from
'@angular/router'
;
import
{
CanActivate
,
ActivatedRouteSnapshot
,
RouterStateSnapshot
,
Router
}
from
'@angular/router'
;
import
{
AuthenticationService
}
from
'../authentication.service'
;
import
{
AuthenticationService
}
from
'../authentication.service'
;
import
{
Roles
}
from
'../../../classes/Authentication/roles'
;
import
{
Roles
}
from
'../../../classes/Authentication/roles'
;
import
{
UserData
}
from
'../../../classes/Authentication/user-data'
;
import
{
UserData
}
from
'../../../classes/Authentication/user-data'
;
...
@@ -9,22 +9,34 @@ import { UserData } from '../../../classes/Authentication/user-data';
...
@@ -9,22 +9,34 @@ import { UserData } from '../../../classes/Authentication/user-data';
})
})
export
class
RoleGuard
implements
CanActivate
{
export
class
RoleGuard
implements
CanActivate
{
constructor
(
private
authenticationService
:
AuthenticationService
)
{
}
constructor
(
private
authenticationService
:
AuthenticationService
,
private
router
:
Router
)
{
}
canActivate
(
route
:
ActivatedRouteSnapshot
,
state
:
RouterStateSnapshot
):
boolean
{
canActivate
(
route
:
ActivatedRouteSnapshot
,
state
:
RouterStateSnapshot
):
boolean
{
const
userData
:
UserData
|
null
=
this
.
authenticationService
.
getUserData
();
const
userData
:
UserData
|
null
=
this
.
authenticationService
.
getUserData
();
const
requiredRole
:
string
=
route
.
data
[
'role'
];
const
requiredRole
:
string
=
route
.
data
[
'role'
];
// No required role
if
(
!
requiredRole
)
if
(
!
requiredRole
)
return
true
;
return
true
;
// No required role
if
(
requiredRole
===
Roles
.
NotRegistered
)
if
(
requiredRole
===
Roles
.
NotRegistered
)
return
true
;
return
true
;
// Reauired role, but not registered user
if
(
!
userData
)
if
(
!
userData
)
{
this
.
router
.
navigate
([
"errors/forbidden"
]);
return
false
;
return
false
;
}
return
userData
.
role
===
requiredRole
;
if
(
userData
.
role
!==
requiredRole
)
{
this
.
router
.
navigate
([
"errors/forbidden"
]);
return
false
;
}
return
true
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment