Skip to content

Tta 181 change husky help message #936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 21 commits into from
Closed

Tta 181 change husky help message #936

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
57d1766
feat: TT-174 pop-up message for redirect to b2 from legacy
andresacg30 Sep 28, 2022
3ff3998
change variable from let to const
andresacg30 Sep 28, 2022
4b5a5ad
v2-redirect component
Sep 28, 2022
2287a31
create html for figma design
andresacg30 Sep 29, 2022
e29510f
erase images bg
Sep 29, 2022
043cbe2
Montserrat Font
mmaquina Sep 29, 2022
aad71a6
add media screen for responsiveness
andresacg30 Sep 30, 2022
27e0181
fix: TT-174 css
mmaquina Sep 30, 2022
4ce0c3d
final styling
andresacg30 Sep 30, 2022
1290253
fix sonarcloud problems
andresacg30 Sep 30, 2022
7a6c535
fix tests errors
andresacg30 Sep 30, 2022
af6952d
fix bad naming for css
andresacg30 Sep 30, 2022
bc8453e
fix import errors
mmaquina Sep 30, 2022
90b51e2
abigails comments
andresacg30 Sep 30, 2022
dbf944c
adding test for conditional env checking
andresacg30 Sep 30, 2022
6c95748
add title for html
andresacg30 Sep 30, 2022
3198561
remove app-routing-module from test
Sep 30, 2022
2d29095
solve conflicts
Sep 30, 2022
086b86d
exclude test files
Sep 30, 2022
b7f1c43
fix: TTA-12 initial commit
mmaquina Oct 4, 2022
5276a6f
fix: TTA-181 change husky help message for git commit
mmaquina Oct 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
feat: TT-174 pop-up message for redirect to b2 from legacy
  • Loading branch information
@andresacg30
andresacg30 committed Sep 28, 2022
commit 57d17661c92e92d18df02ba69d12dbd1ae18c709
50 changes: 33 additions & 17 deletions src/app/app-routing.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,41 @@ import { HomeComponent } from './modules/home/home.component';
import { LoginComponent } from './modules/login/login.component';
import { CustomerComponent } from './modules/customer-management/pages/customer.component';
import { UsersComponent } from './modules/users/pages/users.component';
import { EnvironmentType } from 'src/environments/enum';
import { environment } from 'src/environments/environment';

const routes: Routes = [
{
path: '',
component: HomeComponent,
canActivate: [LoginGuard],
children: [
{ path: 'reports', canActivate: [AdminGuard], component: ReportsComponent },
{ path: 'time-clock', component: TimeClockComponent },
{ path: 'time-entries', component: TimeEntriesComponent },
{ path: 'activities-management', component: ActivitiesManagementComponent },
{ path: 'customers-management', canActivate: [AdminGuard], component: CustomerComponent },
{ path: 'users', canActivate: [AdminGuard], component: UsersComponent },
{ path: '', pathMatch: 'full', redirectTo: 'time-clock' },
],
},
{ path: 'login', component: LoginComponent },
];
let isLegacyProd: boolean = environment.production === EnvironmentType.TT_PROD_LEGACY;
let routes: Routes;

if (isLegacyProd) {
routes = [
{
path: '',
children: [
{ path: '**', redirectTo: 'redirect-message' },
],
},
]

} else {
routes = [
{
path: '',
component: HomeComponent,
canActivate: [LoginGuard],
children: [
{ path: 'reports', canActivate: [AdminGuard], component: ReportsComponent },
{ path: 'time-clock', component: TimeClockComponent },
{ path: 'time-entries', component: TimeEntriesComponent },
{ path: 'activities-management', component: ActivitiesManagementComponent },
{ path: 'customers-management', canActivate: [AdminGuard], component: CustomerComponent },
{ path: 'users', canActivate: [AdminGuard], component: UsersComponent },
{ path: '', pathMatch: 'full', redirectTo: 'time-clock' },
],
},
{ path: 'login', component: LoginComponent }
];
}
@NgModule({
imports: [RouterModule.forRoot(routes)],
exports: [RouterModule],
Expand Down