diff --git a/front-end/src/app/tabs/connections.service.ts b/front-end/src/app/tabs/connections/connections.service.ts similarity index 100% rename from front-end/src/app/tabs/connections.service.ts rename to front-end/src/app/tabs/connections/connections.service.ts diff --git a/front-end/src/app/tabs/menu/menu.module.ts b/front-end/src/app/tabs/menu/menu.module.ts new file mode 100644 index 0000000..a60acc8 --- /dev/null +++ b/front-end/src/app/tabs/menu/menu.module.ts @@ -0,0 +1,21 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { IonicModule } from '@ionic/angular'; +import { FormsModule } from '@angular/forms'; +import { IDEATranslationsModule } from '@idea-ionic/common'; + +import { MenuRoutingModule } from './menu.routing.module'; +import { MenuPage } from './menu.page'; + + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + IDEATranslationsModule, + MenuRoutingModule + ], + declarations: [MenuPage] +}) +export class MenuModule {} diff --git a/front-end/src/app/tabs/menu/menu.page.html b/front-end/src/app/tabs/menu/menu.page.html new file mode 100644 index 0000000..a4ce74a --- /dev/null +++ b/front-end/src/app/tabs/menu/menu.page.html @@ -0,0 +1,30 @@ + + + + {{ 'TABS.MENU' | translate }} + + + + + + + {{ 'MENU.PAGES' | translate }} + + + + {{ 'MENU.HOME' | translate }} + + + + {{ 'MENU.AGENDA' | translate }} + + + + {{ 'MENU.VENUES' | translate }} + + + + {{ 'MENU.ORGANIZATIONS' | translate }} + + + \ No newline at end of file diff --git a/front-end/src/app/tabs/menu/menu.page.scss b/front-end/src/app/tabs/menu/menu.page.scss new file mode 100644 index 0000000..e69de29 diff --git a/front-end/src/app/tabs/menu/menu.page.ts b/front-end/src/app/tabs/menu/menu.page.ts new file mode 100644 index 0000000..6bcc9b2 --- /dev/null +++ b/front-end/src/app/tabs/menu/menu.page.ts @@ -0,0 +1,12 @@ +import { Component } from '@angular/core'; + +import { AppService } from 'src/app/app.service'; + +@Component({ + selector: 'app-menu', + templateUrl: './menu.page.html', + styleUrls: ['./menu.page.scss'] +}) +export class MenuPage { + constructor(public app: AppService) {} +} \ No newline at end of file diff --git a/front-end/src/app/tabs/menu/menu.routing.module.ts b/front-end/src/app/tabs/menu/menu.routing.module.ts new file mode 100644 index 0000000..9699dd6 --- /dev/null +++ b/front-end/src/app/tabs/menu/menu.routing.module.ts @@ -0,0 +1,14 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { MenuPage } from './menu.page'; + +const routes: Routes = [ + { path: '', component: MenuPage } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class MenuRoutingModule {} diff --git a/front-end/src/app/tabs/organizations/organizations.page.html b/front-end/src/app/tabs/organizations/organizations.page.html index a23af6b..995e75c 100644 --- a/front-end/src/app/tabs/organizations/organizations.page.html +++ b/front-end/src/app/tabs/organizations/organizations.page.html @@ -1,8 +1,8 @@ - + {{ 'ORGANIZATIONS.LIST' | translate }} - + diff --git a/front-end/src/app/tabs/tabs.component.html b/front-end/src/app/tabs/tabs.component.html index 8c3cc7a..d82ad15 100644 --- a/front-end/src/app/tabs/tabs.component.html +++ b/front-end/src/app/tabs/tabs.component.html @@ -3,9 +3,23 @@ + + + {{ 'TABS.HOME' | translate }} + + + {{ 'TABS.AGENDA' | translate }} + + + {{ 'TABS.VENUES' | translate }} + + {{ 'TABS.USER' | translate }} + + {{ 'TABS.MENU' | translate }} + {{ 'TABS.MANAGE' | translate }} @@ -14,9 +28,23 @@ + + + + + + + + + + + + + + diff --git a/front-end/src/app/tabs/tabs.routing.module.ts b/front-end/src/app/tabs/tabs.routing.module.ts index 55df25e..50c8108 100644 --- a/front-end/src/app/tabs/tabs.routing.module.ts +++ b/front-end/src/app/tabs/tabs.routing.module.ts @@ -17,6 +17,10 @@ const routes: Routes = [ path: 'manage', loadChildren: (): Promise => import('./manage/manage.module').then(m => m.ManageModule) }, + { + path: 'menu', + loadChildren: (): Promise => import('./menu/menu.module').then(m => m.MenuModule) + }, { path: 'venues', loadChildren: (): Promise => import('./venues/venues.module').then(m => m.VenuesModule) diff --git a/front-end/src/assets/i18n/en.json b/front-end/src/assets/i18n/en.json index 636ed74..3d67763 100644 --- a/front-end/src/assets/i18n/en.json +++ b/front-end/src/assets/i18n/en.json @@ -117,9 +117,20 @@ "NEW_PASSWORD": "New password" }, "TABS": { + "HOME": "Home", + "AGENDA": "Agenda", + "VENUES": "Venues", "USER": "You", + "MENU": "Menu", "MANAGE": "Manage" }, + "MENU": { + "PAGES": "Pages", + "HOME": "Home", + "AGENDA": "Agenda", + "VENUES": "Venues", + "ORGANIZATIONS": "Organizations" + }, "USER": { "ESN_ACCOUNTS": "ESN Accounts", "FIRST_NAME": "First name", diff --git a/front-end/src/global.scss b/front-end/src/global.scss index d112e30..b153ccb 100644 --- a/front-end/src/global.scss +++ b/front-end/src/global.scss @@ -297,12 +297,6 @@ ion-list { ion-list-header { padding-left: 0; } -ion-item ion-label p { - color: var(--ion-color-step-600) !important; -} -ion-item ion-label p a { - color: var(--ion-color-step-450) !important; -} ion-item-divider { border-bottom: none !important; margin-top: 10px !important;