Skip to content

Commit

Permalink
Merge pull request #50 from amosproj/feat/xd-48
Browse files Browse the repository at this point in the history
feat: install tailwind
  • Loading branch information
KonsumGandalf authored May 9, 2024
2 parents 06a7d61 + 8e2a33c commit 407c878
Show file tree
Hide file tree
Showing 9 changed files with 19,355 additions and 15,213 deletions.
17 changes: 16 additions & 1 deletion apps/frontend/src/app/app.component.html
Original file line number Diff line number Diff line change
@@ -1 +1,16 @@
<app-nx-welcome></app-nx-welcome> <router-outlet></router-outlet>
<ix-application>
<ix-application-header name="My Application">
<div class="placeholder-logo" slot="logo"></div>
</ix-application-header>
<ix-menu>
<ix-menu-item>Item 1</ix-menu-item>
<ix-menu-item>Item 2</ix-menu-item>
</ix-menu>
<ix-content>
<ix-content-header slot="header" header-title="My Content Page"> </ix-content-header>
<div class="text-4xl">This text ist big because of a tailwind class</div>
<div class="bg-custom-pink">The background is pink because of a custom color</div>
<div class="test-custom-class">This text is centered because of a custom class</div>
<router-outlet></router-outlet>
</ix-content>
</ix-application>
10 changes: 1 addition & 9 deletions apps/frontend/src/app/app.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,14 @@ import { TestBed } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';

import { AppComponent } from './app.component';
import { NxWelcomeComponent } from './nx-welcome.component';

describe('AppComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [AppComponent, NxWelcomeComponent, RouterTestingModule],
imports: [AppComponent, RouterTestingModule],
}).compileComponents();
});

it('should render title', () => {
const fixture = TestBed.createComponent(AppComponent);
fixture.detectChanges();
const compiled = fixture.nativeElement as HTMLElement;
expect(compiled.querySelector('h1')?.textContent).toContain('Welcome frontend');
});

it(`should have as title 'frontend'`, () => {
const fixture = TestBed.createComponent(AppComponent);
const app = fixture.componentInstance;
Expand Down
5 changes: 2 additions & 3 deletions apps/frontend/src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import { Component } from '@angular/core';
import { RouterModule } from '@angular/router';

import { NxWelcomeComponent } from './nx-welcome.component';
import { IxModule } from '@siemens/ix-angular';

@Component({
standalone: true,
imports: [NxWelcomeComponent, RouterModule],
imports: [RouterModule, IxModule],
selector: 'app-root',
templateUrl: './app.component.html',
styleUrl: './app.component.scss',
Expand Down
5 changes: 3 additions & 2 deletions apps/frontend/src/app/app.config.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { ApplicationConfig } from '@angular/core';
import { ApplicationConfig, importProvidersFrom } from '@angular/core';
import { provideRouter } from '@angular/router';
import { IxModule } from '@siemens/ix-angular';

import { appRoutes } from './app.routes';

export const appConfig: ApplicationConfig = {
providers: [provideRouter(appRoutes)],
providers: [provideRouter(appRoutes), importProvidersFrom(IxModule.forRoot())],
};
Loading

0 comments on commit 407c878

Please sign in to comment.