Skip to content

feat(concierge): reduce sidebar items #467

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

Draft
MrYuion wants to merge 13 commits into
base: develop
Choose a base branch
from
Draft

feat(concierge): reduce sidebar items #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
02b2574
feat(concierge): consolidate rooms, desks, parking spaces and lockers…
MrYuion Nov 14, 2025
93a6179
chore(concierge): consolidate reports sidebar item into one
MrYuion Nov 14, 2025
0613252
chore(concierge): tweaks to resource mangement
MrYuion Nov 14, 2025
8fe2720
chore(concierge): combine most of the booking sidebar items
MrYuion Nov 14, 2025
ce0ac09
chore(concierge): consolidate email, poi, urls and contacts
MrYuion Nov 14, 2025
7d7f513
chore(concierge): tweaks to sidebar feature handling
MrYuion Nov 17, 2025
3b2904e
chore(concierge): add feature checks to tabs for booking, resource an…
MrYuion Nov 17, 2025
37d9a7b
Merge branch 'develop' into feat/reduce-concierge-sidebar-items
MrYuion Nov 17, 2025
8b682b6
Merge branch 'develop' into feat/reduce-concierge-sidebar-items
MrYuion Nov 19, 2025
adcb8a0
chore(concierge): tweaks
MrYuion Nov 19, 2025
cc7673c
Merge branch 'develop' into feat/reduce-concierge-sidebar-items
MrYuion Dec 12, 2025
2c0587c
Merge branch 'develop' into feat/reduce-concierge-sidebar-items
MrYuion Dec 22, 2025
273d58c
chore: fix build errors
MrYuion Dec 22, 2025
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
32 changes: 22 additions & 10 deletions apps/concierge/src/app/app-routing.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,15 @@ const routes: Routes = [
canActivate: [AuthorisedUserGuard],
canLoad: [AuthorisedUserGuard],
},
{
path: 'bookings',
loadChildren: () =>
import('./booking-manager/booking-manager.module').then(
(m) => m.BookingManagerModule,
),
canActivate: [AuthorisedUserGuard],
canLoad: [AuthorisedUserGuard],
},
{
path: 'book/desks',
loadChildren: () =>
Expand Down Expand Up @@ -106,9 +115,13 @@ const routes: Routes = [
},
{
path: 'room-management',
redirectTo: 'resource-management',
},
{
path: 'resource-management',
loadChildren: () =>
import('./room-manager/room-manager.module').then(
(m) => m.RoomManagerModule,
import('./resource-manager/resource-manager.module').then(
(m) => m.ResourceManagerModule,
),
canActivate: [AuthorisedUserGuard],
canLoad: [AuthorisedUserGuard],
Expand Down Expand Up @@ -148,18 +161,17 @@ const routes: Routes = [
},
{
path: 'points-of-interest',
loadChildren: () =>
import('./poi-manager/poi-manager.module').then(
(m) => m.POIManagerModule,
),
canActivate: [AuthorisedUserGuard],
canLoad: [AuthorisedUserGuard],
redirectTo: 'settings-management',
},
{
path: 'url-management',
redirectTo: 'settings-management',
},
{
path: 'settings-management',
loadChildren: () =>
import('./url-management/url-manager.module').then(
(m) => m.UrlManagerModule,
import('./settings-manager/settings-manager.module').then(
(m) => m.SettingsManagerModule,
),
canActivate: [AuthorisedUserGuard],
canLoad: [AuthorisedUserGuard],
Expand Down
144 changes: 62 additions & 82 deletions apps/concierge/src/app/asset-manager/asset-request-list.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,94 +15,75 @@ import {
} from '@placeos/components';
import { startOfDay } from 'date-fns';
import { map } from 'rxjs/operators';
import { DateOptionsComponent } from '../ui/date-options.component';
import { AssetManagerStateService } from './asset-manager-state.service';
import { AssetRequestDetailsComponent } from './asset-request-details.component';
import { SplitJoinPipe } from './split-join.pipe';

@Component({
selector: 'app-asset-request-list',
template: `
<div class="relative flex h-[calc(100%-1rem)] w-full flex-col">
<div class="flex items-center justify-between">
<div class="p-4 text-sm opacity-60">
{{
'APP.CONCIERGE.ASSETS_REQUESTS_COUNT'
| translate: { count: (requests | async)?.length }
}}
</div>
<date-options
[date]="(filters | async)?.date"
(dateChange)="setDate($event)"
></date-options>
</div>
<div class="h-1/2 w-full flex-1 overflow-auto pt-2">
<simple-table
class="block min-w-328 text-sm"
asset-requests
[data]="requests"
[filter]="(filters | async)?.search"
[columns]="[
{
key: 'user_name',
name:
'APP.CONCIERGE.ASSETS_REQUESTS_USER'
| translate,
content: user_template,
},
{
key: 'date',
name:
'APP.CONCIERGE.ASSETS_REQUESTS_TIME'
| translate,
content: date_template,
size: '8rem',
},
{
key: 'assets',
name: 'RESOURCE.ASSETS' | translate,
content: assets_template,
sortable: false,
},
{
key: 'level_code',
name: 'RESOURCE.LEVEL' | translate,
content: level_template,
size: '9rem',
},
{
key: 'description',
name: 'COMMON.LOCATION' | translate,
},
{
key: 'status',
name:
'APP.CONCIERGE.ASSETS_REQUESTS_APPROVAL'
| translate,
content: approval_template,
size: '11rem',
},
{
key: 'tracking',
name:
'APP.CONCIERGE.ASSETS_REQUESTS_TRACKING'
| translate,
content: tracking_template,
size: '12rem',
sortable: false,
},
]"
[empty_message]="
((filters | async)?.search
? 'APP.CONCIERGE.ASSETS_REQUESTS_SEARCH_EMPTY'
: 'APP.CONCIERGE.ASSETS_REQUESTS_EMPTY'
) | translate
"
[sortable]="true"
(row_clicked)="request = $event"
></simple-table>
<div class="h-20 w-full"></div>
</div>
<div class="absolute inset-0 overflow-auto px-8">
<simple-table
class="block min-w-[82rem] text-sm"
asset-requests
[data]="requests"
[filter]="(filters | async)?.search"
[columns]="[
{
key: 'user_name',
name: 'APP.CONCIERGE.ASSETS_REQUESTS_USER' | translate,
content: user_template,
},
{
key: 'date',
name: 'APP.CONCIERGE.ASSETS_REQUESTS_TIME' | translate,
content: date_template,
size: '8rem',
},
{
key: 'assets',
name: 'RESOURCE.ASSETS' | translate,
content: assets_template,
sortable: false,
},
{
key: 'level_code',
name: 'RESOURCE.LEVEL' | translate,
content: level_template,
size: '9rem',
},
{
key: 'description',
name: 'COMMON.LOCATION' | translate,
},
{
key: 'status',
name:
'APP.CONCIERGE.ASSETS_REQUESTS_APPROVAL'
| translate,
content: approval_template,
size: '11rem',
},
{
key: 'tracking',
name:
'APP.CONCIERGE.ASSETS_REQUESTS_TRACKING'
| translate,
content: tracking_template,
size: '12rem',
sortable: false,
},
]"
[empty_message]="
((filters | async)?.search
? 'APP.CONCIERGE.ASSETS_REQUESTS_SEARCH_EMPTY'
: 'APP.CONCIERGE.ASSETS_REQUESTS_EMPTY'
) | translate
"
[sortable]="true"
(row_clicked)="request = $event"
></simple-table>
<div class="h-8 w-full"></div>
</div>
<ng-template #user_template let-row="row">
<div class="flex flex-col px-4 py-2 text-left">
Expand Down Expand Up @@ -275,7 +256,6 @@ import { SplitJoinPipe } from './split-join.pipe';
imports: [
CommonModule,
MatRippleModule,
DateOptionsComponent,
SimpleTableComponent,
AssetRequestDetailsComponent,
MatMenuModule,
Expand Down
Loading
Loading