Skip to content

Commit 9431e5f

Browse files
thorstenthorsten
committed
fix: corrected e2e tests
1 parent 31fe6e5 commit 9431e5f

File tree

18 files changed

+69
-237
lines changed

18 files changed

+69
-237
lines changed

‎next.config.mjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const nextConfig = {
1010
},
1111
output: 'export',
1212
reactStrictMode: true,
13-
trailingSlash: true,
13+
trailingSlash: false,
1414
};
1515

1616
export default nextConfig;

‎src/app/documentation/page.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export default function DocumentationPage() {
2121
</div>
2222
<div className="row">
2323
<div className="col-lg-6 col-xs-12">
24-
<h2>Documentation for users</h2>
24+
<h2>Getting Started</h2>
2525
<ul className="list-unstyled">
2626
<li>
2727
<h3>
@@ -64,7 +64,7 @@ export default function DocumentationPage() {
6464
</ul>
6565
</div>
6666
<div className="col-lg-6 col-xs-12">
67-
<h2>Documentation for developers</h2>
67+
<h2>Developer Resources</h2>
6868
<ul className="list-unstyled">
6969
<li>
7070
<h3>

‎src/app/features/page.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export default function FeaturesPage() {
1717
{/* Core Features */}
1818
<div className="row mb-5">
1919
<div className="col-lg-8 offset-lg-2">
20-
<h2 className="text-center mb-4">Core features</h2>
20+
<h3 className="text-center mb-4">Core Features</h3>
2121
<ul className="list-unstyled">
2222
<li className="mb-2">
2323
<i className="fas fa-check text-success me-2"></i>
@@ -64,10 +64,10 @@ export default function FeaturesPage() {
6464
</div>
6565
</div>
6666

67-
{/* Feature Overview */}
67+
{/* Advanced Features */}
6868
<div className="row mb-4">
6969
<div className="col-12">
70-
<h2 className="text-center mb-5">Feature overview</h2>
70+
<h3 className="text-center mb-4">Advanced Features</h3>
7171
</div>
7272
</div>
7373

‎src/app/globals.scss‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
// Remove SCSS bootstrap import and set Bootstrap theme via CSS variables instead
2+
:root {
3+
--bs-primary: #ff6600;
4+
--bs-secondary: #667eea;
5+
--bs-success: #28a745;
6+
--bs-warning: #f39c12;
7+
--bs-danger: #dc3545;
8+
--bs-info: #17a2b8;
9+
}
10+
111
// Override Bootstrap's primary color with phpMyFAQ orange
212
$primary: #ff6600;
313
$secondary: #667eea;
@@ -6,15 +16,6 @@ $warning: #f39c12;
616
$danger: #dc3545;
717
$info: #17a2b8;
818

9-
@use "bootstrap/scss/bootstrap" with (
10-
$primary: #ff6600,
11-
$secondary: #667eea,
12-
$success: #28a745,
13-
$warning: #f39c12,
14-
$danger: #dc3545,
15-
$info: #17a2b8
16-
);
17-
1819
@font-face {
1920
font-family: 'Lato';
2021
font-style: normal;
@@ -184,10 +185,6 @@ h1, h2, h3, h4, h5, h6 {
184185
color: white;
185186
text-decoration: none;
186187
font-weight: 500;
187-
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);
188-
border-bottom: 2px solid rgba(255, 255, 255, 0.5);
189-
padding-bottom: 2px;
190-
transition: all 0.3s ease;
191188
}
192189

193190
.meta a:hover {

‎src/app/imprint/page.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import { generatePageMetadata } from '@/components/PageLayout'
33
import { Metadata } from 'next';
44

55
export const metadata: Metadata = generatePageMetadata(
6-
'Imprint / Impressum',
6+
'Imprint',
77
'Imprint for phpmyfaq.de'
88
)
99

1010
export default function ImprintPage() {
1111
return (
12-
<PageLayout title="Imprint / Impressum">
12+
<PageLayout title="Imprint">
1313
<div className="row">
1414
<div className="col-xs-12">
1515
<p>

‎src/app/layout.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import type { Metadata } from "next";
22
import ClientLayout from '@/components/ClientLayout'
33
import "@fortawesome/fontawesome-free/css/all.min.css"
4+
import "bootstrap/dist/css/bootstrap.min.css";
45
import "./globals.scss";
56

67
export const metadata: Metadata = {

‎src/app/news/[year]/page.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ function parseNewsContent(content: string): React.JSX.Element[] {
5555
// Process content - convert markdown links to JSX and clean up separators
5656
const processedContent = section
5757
.replace(/^\*\s*\*\s*\*/gm, '') // Remove separator lines
58-
.replace(/\[([^\]]+)\]\(([^)]+)\)/g, '<a href="$2" target="_blank" rel="noopener">$1</a>') // Convert links
58+
.replace(/\[([^\]]+)\]\(([^)]+)\)/g, (_m, text: string, href: string) => `<a href="${href}" target="_blank" rel="noopener">${text}</a>`) // Convert links
5959
.split('\n\n') // Split into paragraphs
6060
.filter(p => p.trim()) // Remove empty paragraphs
6161
.map(p => `<p>${p.trim()}</p>`) // Wrap in paragraph tags
@@ -76,9 +76,7 @@ function parseNewsContent(content: string): React.JSX.Element[] {
7676
export async function generateStaticParams() {
7777
// Generate params for all years from 2001 to 2025
7878
const years = Array.from({ length: 25 }, (_, i) => 2001 + i)
79-
return years.map((year) => ({
80-
year: year.toString()
81-
}))
79+
return years.map((year) => ({ year: year.toString() }))
8280
}
8381

8482
export async function generateMetadata({ params }: NewsYearPageProps): Promise<Metadata> {
@@ -121,7 +119,9 @@ export default async function NewsYearPage({ params }: NewsYearPageProps) {
121119
</ol>
122120
</nav>
123121

124-
{newsElements}
122+
<div id="news-content">
123+
{newsElements}
124+
</div>
125125
</div>
126126
</div>
127127
</PageLayout>

‎src/app/support/page.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export default function SupportPage() {
1111
<div className={styles.supportContainer}>
1212
<div className="container">
1313
<div className={styles.header}>
14-
<h1>Get Support</h1>
14+
<h1>Support</h1>
1515
<p className={styles.lead}>
1616
Whether you need help getting started or require professional assistance,
1717
we&apos;re here to support you every step of the way.
@@ -21,7 +21,7 @@ export default function SupportPage() {
2121
<div className={styles.supportGrid}>
2222
<div className={styles.supportCard}>
2323
<div className={styles.cardIcon}>💬</div>
24-
<h3>Community Support</h3>
24+
<h5>Community Support</h5>
2525
<p>Join our vibrant community and get help from fellow phpMyFAQ users and developers.</p>
2626
<ul>
2727
<li>
@@ -53,7 +53,7 @@ export default function SupportPage() {
5353

5454
<div className={styles.supportCard}>
5555
<div className={styles.cardIcon}>🚀</div>
56-
<h3>Professional Services</h3>
56+
<h5>Professional Support</h5>
5757
<p>Need expert help? Our professional services ensure your phpMyFAQ runs perfectly.</p>
5858
<ul>
5959
<li>Custom development & consulting</li>
@@ -69,7 +69,7 @@ export default function SupportPage() {
6969

7070
<div className={styles.supportCard}>
7171
<div className={styles.cardIcon}>📚</div>
72-
<h3>Documentation</h3>
72+
<h5>Documentation</h5>
7373
<p>Comprehensive guides and resources to help you master phpMyFAQ.</p>
7474
<ul>
7575
<li>

‎src/app/terms/page.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ import PageLayout from '@/components/PageLayout'
22
import { generatePageMetadata } from '@/components/PageLayout'
33

44
export const metadata = generatePageMetadata(
5-
'Terms of service',
5+
'Terms of Service',
66
'Terms of service for phpmyfaq.de'
77
)
88

99
export default function TermsPage() {
1010
return (
11-
<PageLayout title="Terms of service">
11+
<PageLayout title="Terms of Service">
1212
<div className="row">
1313
<div className="col-xs-12">
1414
<p>

‎src/app/thankyou/page.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ import PageLayout from '@/components/PageLayout'
22
import { generatePageMetadata } from '@/components/PageLayout'
33

44
export const metadata = generatePageMetadata(
5-
'Thank you!',
5+
'Thank You!',
66
'Thank you to all contributors and supporters of phpMyFAQ'
77
)
88

99
export default function ThankYouPage() {
1010
return (
11-
<PageLayout title="Thank you!">
11+
<PageLayout title="Thank You!">
1212
<div className="row">
1313
<div className="col-xs-12">
1414
<p>

0 commit comments

Comments
 (0)