Solved conflict of style between PrimeNG and Tailwind, both work together now

This commit is contained in:
AdamBtech
2025-05-19 23:30:56 +02:00
parent a57e6ba1f2
commit 28089215f2
24 changed files with 828 additions and 869 deletions

View File

@@ -26,9 +26,10 @@
"input": "public" "input": "public"
} }
], ],
"styles": [ "styles": ["src/styles.css"],
"src/styles.css" "stylePreprocessorOptions": {
], "includePaths": ["node_modules"]
},
"scripts": [] "scripts": []
}, },
"configurations": { "configurations": {
@@ -85,7 +86,8 @@
} }
], ],
"styles": [ "styles": [
"src/styles.css" "src/styles.css",
"./node_modules/tailwindcss-primeui/v4/index.css"
], ],
"scripts": [] "scripts": []
} }
@@ -94,6 +96,7 @@
} }
}, },
"cli": { "cli": {
"analytics": "4f33e7fa-04db-4ebd-b6fd-8b5438dbb3ff" "analytics": "4f33e7fa-04db-4ebd-b6fd-8b5438dbb3ff",
"root": ""
} }
} }

1483
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -18,7 +18,6 @@
"@angular/platform-browser-dynamic": "^19.2.0", "@angular/platform-browser-dynamic": "^19.2.0",
"@angular/router": "^19.2.0", "@angular/router": "^19.2.0",
"@primeng/themes": "^19.1.3", "@primeng/themes": "^19.1.3",
"@tailwindcss/postcss": "^4.1.7",
"prettier": "^3.5.3", "prettier": "^3.5.3",
"primeicons": "^7.0.0", "primeicons": "^7.0.0",
"primeng": "^19.1.3", "primeng": "^19.1.3",
@@ -31,10 +30,12 @@
"@angular-devkit/build-angular": "^19.2.12", "@angular-devkit/build-angular": "^19.2.12",
"@angular/cli": "^19.2.12", "@angular/cli": "^19.2.12",
"@angular/compiler-cli": "^19.2.0", "@angular/compiler-cli": "^19.2.0",
"@tailwindcss/postcss": "^4.1.7",
"@types/jasmine": "~5.1.0", "@types/jasmine": "~5.1.0",
"@types/jest": "^29.5.14", "@types/jest": "^29.5.14",
"@typescript-eslint/eslint-plugin": "^8.32.1", "@typescript-eslint/eslint-plugin": "^8.32.1",
"@typescript-eslint/parser": "^8.32.1", "@typescript-eslint/parser": "^8.32.1",
"autoprefixer": "^10.4.21",
"eslint": "^9.27.0", "eslint": "^9.27.0",
"jasmine-core": "~5.6.0", "jasmine-core": "~5.6.0",
"jest": "^29.7.0", "jest": "^29.7.0",
@@ -43,6 +44,8 @@
"karma-coverage": "~2.2.0", "karma-coverage": "~2.2.0",
"karma-jasmine": "~5.1.0", "karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.1.0", "karma-jasmine-html-reporter": "~2.1.0",
"postcss": "^8.5.3",
"tailwindcss": "^4.1.7",
"typescript": "~5.7.2" "typescript": "~5.7.2"
} }
} }

View File

@@ -0,0 +1 @@
<p>header-contact-links works!</p>

View File

@@ -0,0 +1,23 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { HeaderContactLinksComponent } from './header-contact-links.component';
describe('HeaderContactLinksComponent', () => {
let component: HeaderContactLinksComponent;
let fixture: ComponentFixture<HeaderContactLinksComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [HeaderContactLinksComponent]
})
.compileComponents();
fixture = TestBed.createComponent(HeaderContactLinksComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@@ -0,0 +1,11 @@
import { Component } from '@angular/core';
@Component({
selector: 'app-header-contact-links',
imports: [],
templateUrl: './header-contact-links.component.html',
styleUrl: './header-contact-links.component.css'
})
export class HeaderContactLinksComponent {
}

View File

@@ -0,0 +1 @@
<p class="!bg-red-500">Adam Logo</p>

View File

@@ -0,0 +1,23 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { HeaderLogoComponent } from './header-logo.component';
describe('HeaderLogoComponent', () => {
let component: HeaderLogoComponent;
let fixture: ComponentFixture<HeaderLogoComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [HeaderLogoComponent]
})
.compileComponents();
fixture = TestBed.createComponent(HeaderLogoComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@@ -0,0 +1,9 @@
import { Component } from '@angular/core';
@Component({
selector: 'app-header-logo',
imports: [],
templateUrl: './header-logo.component.html',
styleUrl: './header-logo.component.css',
})
export class HeaderLogoComponent {}

View File

@@ -0,0 +1,20 @@
<nav>
<section>
<p-button
label="Neural Profile"
(onClick)="onClick()"
></p-button>
<p-button
label="Execute//Directory"
(onClick)="onClick()"
></p-button>
<p-button
label="Operative History"
(onClick)="onClick()"
></p-button>
<p-button
label="Transmission Link"
(onClick)="onClick()"
></p-button>
</section>
</nav>

View File

@@ -0,0 +1,16 @@
import { Component } from '@angular/core';
import { ButtonModule } from 'primeng/button';
@Component({
selector: 'app-header-nav-links',
imports: [ButtonModule],
templateUrl: './header-nav-links.component.html',
styleUrl: './header-nav-links.component.css'
})
export class HeaderNavLinksComponent {
onClick(){
console.log('click');
}
}

View File

@@ -0,0 +1,3 @@
<p-button
label="Switch Theme"
></p-button>

View File

@@ -0,0 +1,23 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { HeaderSwitchThemeButtonComponent } from './header-switch-theme-button.component';
describe('HeaderSwitchThemeButtonComponent', () => {
let component: HeaderSwitchThemeButtonComponent;
let fixture: ComponentFixture<HeaderSwitchThemeButtonComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [HeaderSwitchThemeButtonComponent]
})
.compileComponents();
fixture = TestBed.createComponent(HeaderSwitchThemeButtonComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@@ -0,0 +1,10 @@
import { Component } from '@angular/core';
import { ButtonModule } from 'primeng/button';
@Component({
selector: 'app-header-switch-theme-button',
imports: [ButtonModule],
templateUrl: './header-switch-theme-button.component.html',
styleUrl: './header-switch-theme-button.component.css',
})
export class HeaderSwitchThemeButtonComponent {}

View File

@@ -0,0 +1 @@
<p>header-text-animate-section works!</p>

View File

@@ -0,0 +1,11 @@
import { Component } from '@angular/core';
@Component({
selector: 'app-header-text-animate-section',
imports: [],
templateUrl: './header-text-animate-section.component.html',
styleUrl: './header-text-animate-section.component.css'
})
export class HeaderTextAnimateSectionComponent {
}

View File

@@ -1,3 +1,6 @@
<header> <header>
<p>header works!</p> <app-header-logo />
<app-header-text-animate-section />
<app-header-nav-links />
<app-header-contact-links />
</header> </header>

View File

@@ -1,11 +1,18 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { HeaderNavLinksComponent } from '../../../features/header-display/header-nav-links/header-nav-links.component';
import { HeaderLogoComponent } from '../../../features/header-display/header-logo/header-logo.component';
import { HeaderContactLinksComponent } from '../../../features/header-display/header-contact-links/header-contact-links.component';
import { HeaderTextAnimateSectionComponent } from '../../../features/header-display/header-text-animate-section/header-text-animate-section.component';
@Component({ @Component({
selector: 'app-header', selector: 'app-header',
imports: [], imports: [
HeaderNavLinksComponent,
HeaderLogoComponent,
HeaderContactLinksComponent,
HeaderTextAnimateSectionComponent,
],
templateUrl: './header.component.html', templateUrl: './header.component.html',
styleUrl: './header.component.css' styleUrl: './header.component.css',
}) })
export class HeaderComponent { export class HeaderComponent {}
}

View File

@@ -1,21 +1,11 @@
@import "tailwindcss"; @layer theme, tailwind-base, primeng, tailwind-utilities;
@import "tailwindcss-primeui"; @import "tailwindcss-primeui";
@import "primeicons/primeicons.css";
@layer tailwind-base, primeng, tailwind-utilities;
@config "./tailwind.config.js"; @import "tailwindcss/theme.css" layer(theme);
@import "tailwindcss/preflight.css" layer(tailwind-base);
@import "tailwindcss/utilities.css" layer(tailwind-utilities);
@layer tailwind-base {
}
@layer primeng { @layer primeng {
} };
@layer tailwind-utilities {
}