Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion frontend/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,14 @@
"output": "./assets/monaco"
}
],
"styles": ["src/custom-theme.scss", "src/styles.scss"],
"styles": [
"node_modules/@fontsource/noto-sans/300.css",
"node_modules/@fontsource/noto-sans/400.css",
"node_modules/@fontsource/noto-sans/500.css",
"node_modules/@material-symbols/font-400/outlined.css",
"src/custom-theme.scss",
"src/styles.scss"
],
"stylePreprocessorOptions": {
"includePaths": ["node_modules/@brumeilde/ngx-theme/presets/material"]
},
Expand Down
2 changes: 2 additions & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@
"@angular/platform-browser-dynamic": "~20.3.16",
"@angular/router": "~20.3.16",
"@brumeilde/ngx-theme": "^1.2.1",
"@fontsource/noto-sans": "^5.2.10",
"@jsonurl/jsonurl": "^1.1.8",
"@material-symbols/font-400": "^0.40.2",
"@ngstack/code-editor": "^9.0.0",
"@sentry-internal/rrweb": "^2.31.0",
"@sentry/angular": "^10.33.0",
Expand Down
8 changes: 4 additions & 4 deletions frontend/src/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@
<div matListItemTitle>Zapier</div>
</a>
<a mat-list-item href="https://docs.rocketadmin.com/" target="_blank">
<mat-icon matListItemIcon class="connection-navigation__icon" fontSet="material-icons-outlined">help_outlined</mat-icon>
<mat-icon matListItemIcon class="connection-navigation__icon" fontSet="material-symbols-outlined">help</mat-icon>
<div matListItemTitle>Help center</div>
</a>
<mat-list-item (click)="logOut()" data-testid="logout-button-account-menu">
<mat-icon matListItemIcon class="connection-navigation__icon">exit_to_app</mat-icon>
<mat-icon matListItemIcon class="connection-navigation__icon">logout</mat-icon>
<div matListItemTitle>Log out</div>
</mat-list-item>
</mat-nav-list>
Expand Down Expand Up @@ -195,11 +195,11 @@
<span>Zapier</span>
</a>
<a mat-menu-item href="https://docs.rocketadmin.com/" target="_blank">
<mat-icon fontSet="material-icons-outlined">help_outlined</mat-icon>
<mat-icon fontSet="material-symbols-outlined">help</mat-icon>
<span>Help center</span>
</a>
<button mat-menu-item (click)="logOut()" data-testid="logout-button-account-menu">
<mat-icon>exit_to_app</mat-icon>
<mat-icon>logout</mat-icon>
<span>Log out</span>
</button>
</mat-menu>
Expand Down
12 changes: 6 additions & 6 deletions frontend/src/app/components/company/company.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ <h2 class="heading-2 tableHeader__heading">Members <span *ngIf="currentPlan ===
[disabled]="currentPlan === 'free' && usersCount >= 3 && isSaas">
Invite member
<mat-icon *ngIf="currentPlan === 'free' && usersCount >= 3 && isSaas">
info_outline
info
</mat-icon>
</button>
</div>
Expand All @@ -101,7 +101,7 @@ <h2 class="heading-2 tableHeader__heading">Members <span *ngIf="currentPlan ===
<mat-icon *ngIf="element.externalRegistrationProvider === null"
class="company-member-cell_email-icon"
matTooltip="Email registration">
mail_outline
mail
</mat-icon>
<mat-icon *ngIf="element.externalRegistrationProvider !== null"
class="company-member-cell_email-icon"
Expand Down Expand Up @@ -236,8 +236,8 @@ <h2 class="heading-2 tableHeader__heading">Members <span *ngIf="currentPlan ===
<td mat-cell *matCellDef="let element; let i = index"
data-label="Access"
class="company-member-cell company-member-cell_content-center">
<mat-icon *ngIf="element.has_groups" class="company-member-cell_accessed" fontSet="material-icons-outlined">check_circle</mat-icon>
<mat-icon *ngIf="!element.has_groups" class="company-member-cell_not-accessed" fontSet="material-icons-outlined">cancel</mat-icon>
<mat-icon *ngIf="element.has_groups" class="company-member-cell_accessed" fontSet="material-symbols-outlined">check_circle</mat-icon>
<mat-icon *ngIf="!element.has_groups" class="company-member-cell_not-accessed" fontSet="material-symbols-outlined">cancel</mat-icon>
</td>
</ng-container>

Expand Down Expand Up @@ -324,7 +324,7 @@ <h2 class="heading-2 tableHeader__heading">Branding</h2>
<form #uploadLogoForm="ngForm" class="upload-logo-form">
<div class="file-uploader-appearance">
<button mat-stroked-button type="button" (click)="logoInput.click()">
<mat-icon fontSet="material-icons-outlined">upload</mat-icon>
<mat-icon fontSet="material-symbols-outlined">upload</mat-icon>
Company logo
</button>
<input #logoInput type="file" class="file-input" name="company-logo-uploader" (change)="onCompanyLogoSelected($event)" hidden>
Expand All @@ -338,7 +338,7 @@ <h2 class="heading-2 tableHeader__heading">Branding</h2>
<form #uploadFaviconForm="ngForm" class="upload-logo-form">
<div class="file-uploader-appearance">
<button mat-stroked-button type="button" (click)="faviconInput.click()">
<mat-icon fontSet="material-icons-outlined">upload</mat-icon>
<mat-icon fontSet="material-symbols-outlined">upload</mat-icon>
Favicon
</button>
<input #faviconInput type="file" class="file-input" name="company-favicon-uploader" (change)="onFaviconSelected($event)" hidden>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ <h2 class="mat-heading-2 row-preview-sidebar__title">Preview</h2>
[queryParams]="getDedicatedPageLinkParams()"
matTooltip="Open the record"
(click)="stashUrlParams()">
<mat-icon fontSet="material-icons-outlined">create</mat-icon>
<mat-icon fontSet="material-symbols-outlined">create</mat-icon>
</a>
</div>
<button mat-icon-button (click)="handleClose()">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ <h2 class="mat-h2 table-name">{{ displayName }}</h2>
<button *ngIf="tableData.displayedColumns && tableData.columns" mat-button [matMenuTriggerFor]="menu"
angulartics2On="click"
angularticsAction="Dashboard: columns multiselect is clicked">
<mat-icon fontSet="material-icons-outlined">view_week</mat-icon>
<mat-icon fontSet="material-symbols-outlined">view_week</mat-icon>
Columns
<span class="db-table-manage-columns-button__count">
({{ tableData.displayedDataColumns.length }}
Expand Down Expand Up @@ -334,7 +334,7 @@ <h2 class="mat-h2 table-name">{{ displayName }}</h2>
class="db-table-cell-action-button"
[matTooltip]="action.title"
(click)="handleAction($event, action, element)">
<mat-icon fontSet="material-icons-outlined">
<mat-icon fontSet="material-symbols-outlined">
{{action.icon}}
</mat-icon>
</button>
Expand All @@ -350,7 +350,7 @@ <h2 class="mat-h2 table-name">{{ displayName }}</h2>
angularticsAction="Dashboard: edit row is clicked"
matTooltip="Edit row"
(click)="stashUrlParams()">
<mat-icon fontSet="material-icons-outlined">create</mat-icon>
<mat-icon fontSet="material-symbols-outlined">create</mat-icon>
</a>
<a mat-icon-button *ngIf="tableData.permissions.add"
routerLink="/dashboard/{{connectionID}}/{{name}}/entry"
Expand All @@ -363,7 +363,7 @@ <h2 class="mat-h2 table-name">{{ displayName }}</h2>
angularticsAction="Dashboard: duplicate row is clicked"
matTooltip="Duplicate row"
(click)="stashUrlParams()">
<mat-icon fontSet="material-icons-outlined">difference</mat-icon>
<mat-icon fontSet="material-symbols-outlined">difference</mat-icon>
</a>
<button type="button" mat-icon-button *ngIf="tableData.permissions.delete && tableData.canDelete"
class="db-table-cell-action-button"
Expand All @@ -372,7 +372,7 @@ <h2 class="mat-h2 table-name">{{ displayName }}</h2>
angularticsAction="Dashboard: delete row is clicked"
matTooltip="Delete row"
(click)="handleDeleteRow($event, element)">
<mat-icon fontSet="material-icons-outlined">delete</mat-icon>
<mat-icon fontSet="material-symbols-outlined">delete</mat-icon>
</button>
</mat-cell>
</ng-container>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,5 @@
<button mat-icon-button type="button" class="widget-delete-button"
matTooltip="Delete widget"
(click)="onWidgetDelete.emit(widget.field_name)">
<mat-icon>delete_outline</mat-icon>
<mat-icon>delete</mat-icon>
</button>
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@
</mat-chip-listbox>
<mat-menu #filterMenu="matMenu">
<button mat-menu-item (click)="handleEditFilter(currentFilterForMenu)">
<mat-icon fontSet="material-icons-outlined">create</mat-icon>
<mat-icon fontSet="material-symbols-outlined">create</mat-icon>
<span>Edit</span>
</button>
<button mat-menu-item (click)="handleDeleteFilter(currentFilterForMenu)">
<mat-icon fontSet="material-icons-outlined">delete</mat-icon>
<mat-icon fontSet="material-symbols-outlined">delete</mat-icon>
<span>Delete</span>
</button>
</mat-menu>
Expand Down
Loading
Loading