Skip to content

Commit

Permalink
2401 fix domain (#2404)
Browse files Browse the repository at this point in the history
* 2401 fix domain
* fix admin test
* fix lint

Co-authored-by: Elena Moshnikova <elena_moshnikova@epam.com>
Co-authored-by: Mikhail.Moshnikov <Mikhail.Moshnikov@wolterskluwer.com>
  • Loading branch information
3 people authored Dec 7, 2022
1 parent 81557b4 commit 5ac29b7
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,10 @@ export class WeekTimeTrackComponent {
}

public isAllowNextMonth(): boolean {
/// for December
if (this.selectedMonth.add(1, 'month').month() === 0 ) {
return this.selectedMonth.month() <= dayjs().subtract(1, 'month').month();
}
return this.selectedMonth.add(1, 'month').month() <= dayjs().month();
}

Expand Down
2 changes: 1 addition & 1 deletion frontend-angular/src/proxy.conf.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"/api": {
"target": "https://brainup.site",
"target": "https://brainup.fun",
"secure": false
}
}
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"local": "ember s --secure-proxy=false --proxy=http://localhost:8081",
"develop": "cross-env FIREBASE_PROJECT_ID=brainup-spb-dev-bb6d0 FIREBASE_AUTH_DOMAIN=brainup-spb-dev-bb6d0.firebaseapp.com FIREBASE_API_KEY=AIzaSyB03Q4ZCxdqaKuN7cJqCQGhkibYD4Q-qsc ember s --secure-proxy=false --proxy=http://localhost:8081",
"remote": "ember s --secure-proxy=false --proxy=http://ecse005003f1.epam.com/",
"remote:prod": "ember s --secure-proxy=true --proxy=https://brainup.site/",
"remote:prod": "ember s --secure-proxy=true --proxy=https://brainup.fun/",
"mirage": "ember s",
"postinstall": "patch-package"
},
Expand Down

0 comments on commit 5ac29b7

Please sign in to comment.