Skip to content
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.

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

POC sidemenu #64

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
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
10 changes: 9 additions & 1 deletion source/ios/App/App/capacitor.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,13 @@
"appId": "com.gueopic.gueopic",
"appName": "Gueopic",
"webDir": "www",
"bundledWebRuntime": false
"bundledWebRuntime": false,
"plugins": {
"SplashScreen": {
"launchAutoHide": false,
"showSpinner": true,
"androidSpinnerStyle": "small",
"iosSpinnerStyle": "small"
}
}
}
4 changes: 4 additions & 0 deletions source/ios/App/App/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,9 @@
<widget version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<access origin="*" />

<feature name="SQLitePlugin">
<param name="ios-package" value="SQLitePlugin"/>
</feature>


</widget>
5 changes: 5 additions & 0 deletions source/ios/App/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,14 @@ def capacitor_pods
pod 'Capacitor', :path => '../../node_modules/@capacitor/ios'
pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios'
pod 'CapacitorApp', :path => '../../node_modules/@capacitor/app'
pod 'CapacitorCamera', :path => '../../node_modules/@capacitor/camera'
pod 'CapacitorFilesystem', :path => '../../node_modules/@capacitor/filesystem'
pod 'CapacitorHaptics', :path => '../../node_modules/@capacitor/haptics'
pod 'CapacitorKeyboard', :path => '../../node_modules/@capacitor/keyboard'
pod 'CapacitorSplashScreen', :path => '../../node_modules/@capacitor/splash-screen'
pod 'CapacitorStatusBar', :path => '../../node_modules/@capacitor/status-bar'
pod 'CapacitorVoiceRecorder', :path => '../../node_modules/capacitor-voice-recorder'
pod 'CordovaPlugins', :path => '../capacitor-cordova-ios-plugins'
end

target 'App' do
Expand Down
10 changes: 10 additions & 0 deletions source/src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,16 @@ const routes: Routes = [
(m) => m.PlaygroundPageModule,
),
},
// Sidebar outlet
{
path: '',
loadChildren: () =>
import('./menu/menu.module').then((m) => m.MenuPageModule),
outlet: 'sidebar',
data: {
isSidebar: true,
},
},
];

@NgModule({
Expand Down
16 changes: 15 additions & 1 deletion source/src/app/app.component.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
<ion-app>
<ion-router-outlet></ion-router-outlet>
<ion-split-pane contentId="main-content" when="md">
<ion-menu
contentId="main-content"
menuId="detail-evaluation"
type="overlay"
side="start"
swipe-gesture="false"
[disabled]="isMobile"
>
<ion-content>
<router-outlet name="sidebar"></router-outlet>
</ion-content>
</ion-menu>
<ion-router-outlet id="main-content"></ion-router-outlet>
</ion-split-pane>
</ion-app>
8 changes: 8 additions & 0 deletions source/src/app/app.component.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
ion-menu {
--side-min-width: 50%;
--side-max-width: 50%;
}
ion-router-outlet.split-pane-side {
--side-min-width: 50%;
--side-max-width: 50%;
}
4 changes: 4 additions & 0 deletions source/src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ export class AppComponent implements OnInit {
private router: Router,
) {}

get isMobile() {
return window.innerWidth < 768;
}

ngOnInit() {
this.platform.ready().then((res) => {
console.debug('Platform initialized:', res);
Expand Down
2 changes: 1 addition & 1 deletion source/src/app/menu/menu.page.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<ion-header>
<ion-toolbar>
<ion-buttons slot="start">
<ion-buttons *ngIf="!routeData?.isSidebar" slot="start">
<ion-button [routerLink]="['/home']" routerDirection="back">
{{ 'common.actions.back' | translate }}
</ion-button>
Expand Down
6 changes: 6 additions & 0 deletions source/src/app/menu/menu.page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
OnDestroy,
OnInit,
} from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { ModalController } from '@ionic/angular';
import { ItemWithFilesModel } from '../../core/models/item-with-files.model';
import { VerbWithFilesModel } from '../../core/models/verb-with-files.model';
Expand Down Expand Up @@ -33,9 +34,14 @@ export class MenuPage implements OnInit, OnDestroy {
public modalController: ModalController,
private audioService: AudioService,
public appTranslateService: AppTranslateService,
private route: ActivatedRoute,
) {}

get routeData() {
return this.route.snapshot.data;
}
ngOnInit() {
console.log('tset', this.route.snapshot.data);
this.itemsStateService.loadAll();
this.verbsStateService.loadAll();
this.settingsStateService.loadAll(true);
Expand Down