Skip to content

Commit

Permalink
Merge pull request #19 from HussainMojahid/Aayushi
Browse files Browse the repository at this point in the history
Aayushi
  • Loading branch information
HussainMojahid authored Jun 20, 2023
2 parents 15de43b + 246646c commit 083eb15
Show file tree
Hide file tree
Showing 30 changed files with 646 additions and 199 deletions.
3 changes: 2 additions & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"src/assets"
],
"styles": [
"src/styles.css"
"src/styles.css",
"node_modules/ngx-toastr/toastr.css"
],
"scripts": []
},
Expand Down
85 changes: 48 additions & 37 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^15.0.0",
"@angular/animations": "^15.2.9",
"@angular/common": "^15.0.0",
"@angular/compiler": "^15.0.0",
"@angular/core": "^15.0.0",
Expand All @@ -20,7 +20,7 @@
"@angular/platform-browser-dynamic": "^15.0.0",
"@angular/router": "^15.0.0",
"@fortawesome/angular-fontawesome": "^0.12.0",
"@fortawesome/fontawesome-free": "^6.2.1",
"@fortawesome/fontawesome-free": "^6.4.0",
"@fortawesome/fontawesome-svg-core": "^6.4.0",
"@fortawesome/free-brands-svg-icons": "^6.4.0",
"@fortawesome/free-regular-svg-icons": "^6.4.0",
Expand All @@ -33,6 +33,7 @@
"ng-multiselect-dropdown": "^0.3.9",
"ng-otp-input": "^1.9.2",
"ngx-otp-input": "^0.11.4",
"ngx-toastr": "^17.0.2",
"rxjs": "~7.5.0",
"sweetalert2": "^11.7.1",
"tslib": "^2.3.0",
Expand Down
7 changes: 6 additions & 1 deletion src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,19 @@ import { AddFoodComponent } from './admin-dashboard/add-food/add-food.component'
import { AddNewMenuComponent } from './shared/add-new-menu/add-new-menu.component';
import { AddNewItemComponent } from './shared/add-new-item/add-new-item.component';
import { AuthGuard } from './services/auth.guard';

import { FeedbackHistoryComponent } from './feedback-history/feedback-history.component';

const routes: Routes = [
{
path: '',
component: DashboardModalComponent,
canActivate: [AuthGuard]
},
{
path: 'feedback-history',
component: FeedbackHistoryComponent,
canActivate: [AuthGuard]
},
{
path: 'registerComponent',
component: RegisterComponent
Expand Down
14 changes: 12 additions & 2 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,11 @@ import { UserModule } from './user/user.module';
import { LoginComponent } from './user/login/login.component';
import { RegisterComponent } from './user/register/register.component';
import { FooterComponent } from './shared/footer/footer.component';
import { FeedbackHistoryComponent } from './feedback-history/feedback-history.component';
// import {FootersModule} from './footer/footers.module'

import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { ToastrModule } from 'ngx-toastr';
import { ErrorInterceptor } from './interceptor/error.interceptor';

@NgModule({
declarations: [
Expand All @@ -38,6 +41,7 @@ import { FooterComponent } from './shared/footer/footer.component';
SidebarComponent,
BookingComponent,
FeedbackComponent,
FeedbackHistoryComponent,
// ProfileComponent,
// AccountComponent,
// LoginComponent,
Expand All @@ -56,14 +60,20 @@ import { FooterComponent } from './shared/footer/footer.component';
NgxOtpInputModule,
SharedModule,
// FootersModule
BrowserAnimationsModule,

],exports:[],
providers: [
{
provide: HTTP_INTERCEPTORS,
useClass: InterceptorInterceptor,
multi: true,

},DatePipe
}, {
provide: HTTP_INTERCEPTORS,
useClass: ErrorInterceptor,
multi: true,
},DatePipe
],
bootstrap: [AppComponent],
})
Expand Down
Loading

0 comments on commit 083eb15

Please sign in to comment.