Skip to content
This repository has been archived by the owner on Dec 3, 2020. It is now read-only.

refactor: modals #116

Merged
merged 1 commit into from Nov 6, 2020
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 0 additions & 8 deletions src/app/app-routing.module.ts
Expand Up @@ -24,18 +24,10 @@ const routes: Routes = [
path: 'infosite',
loadChildren: () => import('./pages/infosite/infosite.module').then((m) => m.InfositePageModule),
},
{
path: 'feedback',
loadChildren: () => import('./pages/feedback/feedback.module').then((m) => m.FeedbackPageModule),
},
{
path: 'impressum',
loadChildren: () => import('./pages/impressum/impressum.module').then((m) => m.ImpressumPageModule),
},
{
path: 'newsletter',
loadChildren: () => import('./pages/newsletter/newsletter.module').then((m) => m.NewsletterPageModule),
},
{
path: 'return',
loadChildren: () => import('./pages/return/return.module').then((m) => m.ReturnPageModule),
Expand Down
Expand Up @@ -4,12 +4,10 @@ import {FormsModule, ReactiveFormsModule} from '@angular/forms';

import {IonicModule} from '@ionic/angular';

import {FeedbackPageRoutingModule} from './feedback-routing.module';

import {FeedbackPage} from './feedback.page';

@NgModule({
imports: [CommonModule, FormsModule, IonicModule, FeedbackPageRoutingModule, ReactiveFormsModule],
imports: [CommonModule, FormsModule, IonicModule, ReactiveFormsModule],
declarations: [FeedbackPage],
})
export class FeedbackPageModule {}
@@ -1,16 +1,16 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import {IonicModule} from '@ionic/angular';

import { FeedbackPage } from './feedback.page';
import {FeedbackPage} from './feedback.page';

describe('FeedbackPage', () => {
let component: FeedbackPage;
let fixture: ComponentFixture<FeedbackPage>;

beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ FeedbackPage ],
imports: [IonicModule.forRoot()]
declarations: [FeedbackPage],
imports: [IonicModule.forRoot()],
}).compileComponents();

fixture = TestBed.createComponent(FeedbackPage);
Expand Down
@@ -1,15 +1,9 @@
import {Component, OnInit} from '@angular/core';
import {ModalController} from '@ionic/angular';
import {FormGroup, FormBuilder, Validators, ReactiveFormsModule} from '@angular/forms';
import {FormGroup, FormBuilder, Validators} from '@angular/forms';
import {ToastController} from '@ionic/angular';
import {NewsletterService} from '../../services/data/newsletter.service';

interface userData {
Name: string;
Email: string;
Funnel: string;
}

@Component({
selector: 'app-feedback',
templateUrl: './feedback.page.html',
Expand Down
13 changes: 13 additions & 0 deletions src/app/modals/newsletter/newsletter.module.ts
@@ -0,0 +1,13 @@
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';

import {IonicModule} from '@ionic/angular';

import {NewsletterPage} from './newsletter.page';

@NgModule({
imports: [CommonModule, FormsModule, IonicModule, ReactiveFormsModule],
declarations: [NewsletterPage],
})
export class NewsletterPageModule {}
@@ -1,16 +1,16 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { IonicModule } from '@ionic/angular';
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import {IonicModule} from '@ionic/angular';

import { NewsletterPage } from './newsletter.page';
import {NewsletterPage} from './newsletter.page';

describe('NewsletterPage', () => {
let component: NewsletterPage;
let fixture: ComponentFixture<NewsletterPage>;

beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ NewsletterPage ],
imports: [IonicModule.forRoot()]
declarations: [NewsletterPage],
imports: [IonicModule.forRoot()],
}).compileComponents();

fixture = TestBed.createComponent(NewsletterPage);
Expand Down
@@ -1,13 +1,8 @@
import {Component, OnInit} from '@angular/core';
import {ModalController} from '@ionic/angular';
import {FormGroup, FormBuilder, Validators, ReactiveFormsModule} from '@angular/forms';
import {FormGroup, FormBuilder, Validators} from '@angular/forms';
import {NewsletterService} from '../../services/data/newsletter.service';
import {ToastController} from '@ionic/angular';
interface userData {
Name: string;
Email: string;
Funnel: string;
}

@Component({
selector: 'app-newsletter',
Expand Down
17 changes: 0 additions & 17 deletions src/app/pages/feedback/feedback-routing.module.ts

This file was deleted.

4 changes: 2 additions & 2 deletions src/app/pages/home/home.module.ts
Expand Up @@ -2,13 +2,13 @@ import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {IonicModule} from '@ionic/angular';
import {FormsModule} from '@angular/forms';
import {ReactiveFormsModule} from '@angular/forms';

import {HomePage} from './home.page';

import {HomePageRoutingModule} from './home-routing.module';
import {ComponentsModule} from 'src/app/components/components.module';

import { ReactiveFormsModule } from "@angular/forms";

@NgModule({
imports: [CommonModule, FormsModule, IonicModule, HomePageRoutingModule, ComponentsModule, ReactiveFormsModule],
declarations: [HomePage],
Expand Down
7 changes: 4 additions & 3 deletions src/app/pages/home/home.page.ts
Expand Up @@ -2,9 +2,6 @@ import {Component} from '@angular/core';

import {IonRouterOutlet, ModalController} from '@ionic/angular';

import {FeedbackPage} from '../feedback/feedback.page';
import {NewsletterPage} from '../newsletter/newsletter.page';

@Component({
selector: 'app-home',
templateUrl: 'home.page.html',
Expand All @@ -14,6 +11,8 @@ export class HomePage {
constructor(private modalCtrl: ModalController, private routerOutlet: IonRouterOutlet) {}

async showNewsletter() {
const {NewsletterPage} = await import('../../modals/newsletter/newsletter.page');

const modal = await this.modalCtrl.create({
component: NewsletterPage,
swipeToClose: true,
Expand All @@ -23,6 +22,8 @@ export class HomePage {
}

async showFeedback() {
const {FeedbackPage} = await import('../../modals/feedback/feedback.page');

const modal = await this.modalCtrl.create({
component: FeedbackPage,
swipeToClose: true,
Expand Down
17 changes: 0 additions & 17 deletions src/app/pages/newsletter/newsletter-routing.module.ts

This file was deleted.

22 changes: 0 additions & 22 deletions src/app/pages/newsletter/newsletter.module.ts

This file was deleted.