Remove unused React logo SVG and add new API client and layouts

The React logo SVG file was removed as it was no longer needed. Introduced an auto-generated API client class (`ApiClient.ts`) for handling server communication and added new components for the navigation menu and higher-order layouts (`NavMenu`, `with_main_layout.ts.tsx`). Updated `yarn.lock` to replace legacy URL references.
This commit is contained in:
2025-02-09 00:00:05 +01:00
parent 7b1c4c27fe
commit 72b7902b55
15 changed files with 1443 additions and 688 deletions

View File

@@ -0,0 +1,146 @@
//----------------------
// <auto-generated>
// Generated using the NSwag toolchain v14.2.0.0 (NJsonSchema v11.1.0.0 (Newtonsoft.Json v13.0.0.0)) (http://NSwag.org)
// </auto-generated>
//----------------------
/* tslint:disable */
/* eslint-disable */
// ReSharper disable InconsistentNaming
export class Client {
private http: { fetch(url: RequestInfo, init?: RequestInit): Promise<Response> };
private baseUrl: string;
protected jsonParseReviver: ((key: string, value: any) => any) | undefined = undefined;
constructor(baseUrl?: string, http?: { fetch(url: RequestInfo, init?: RequestInit): Promise<Response> }) {
this.http = http ? http : window as any;
this.baseUrl = baseUrl ?? "http://localhost:5175";
}
getWeatherForecast(): Promise<WeatherForecast[]> {
let url_ = this.baseUrl + "/weatherforecast";
url_ = url_.replace(/[?&]$/, "");
let options_: RequestInit = {
method: "GET",
headers: {
"Accept": "application/json"
}
};
return this.http.fetch(url_, options_).then((_response: Response) => {
return this.processGetWeatherForecast(_response);
});
}
protected processGetWeatherForecast(response: Response): Promise<WeatherForecast[]> {
const status = response.status;
let _headers: any = {}; if (response.headers && response.headers.forEach) { response.headers.forEach((v: any, k: any) => _headers[k] = v); };
if (status === 200) {
return response.text().then((_responseText) => {
let result200: any = null;
let resultData200 = _responseText === "" ? null : JSON.parse(_responseText, this.jsonParseReviver);
if (Array.isArray(resultData200)) {
result200 = [] as any;
for (let item of resultData200)
result200!.push(WeatherForecast.fromJS(item));
}
else {
result200 = <any>null;
}
return result200;
});
} else if (status !== 200 && status !== 204) {
return response.text().then((_responseText) => {
return throwException("An unexpected server error occurred.", status, _responseText, _headers);
});
}
return Promise.resolve<WeatherForecast[]>(null as any);
}
}
export class WeatherForecast implements IWeatherForecast {
date?: Date;
temperatureC?: number;
summary?: string | undefined;
temperatureF?: number;
constructor(data?: IWeatherForecast) {
if (data) {
for (var property in data) {
if (data.hasOwnProperty(property))
(<any>this)[property] = (<any>data)[property];
}
}
}
init(_data?: any) {
if (_data) {
this.date = _data["date"] ? new Date(_data["date"].toString()) : <any>undefined;
this.temperatureC = _data["temperatureC"];
this.summary = _data["summary"];
this.temperatureF = _data["temperatureF"];
}
}
static fromJS(data: any): WeatherForecast {
data = typeof data === 'object' ? data : {};
let result = new WeatherForecast();
result.init(data);
return result;
}
toJSON(data?: any) {
data = typeof data === 'object' ? data : {};
data["date"] = this.date ? formatDate(this.date) : <any>undefined;
data["temperatureC"] = this.temperatureC;
data["summary"] = this.summary;
data["temperatureF"] = this.temperatureF;
return data;
}
}
export interface IWeatherForecast {
date?: Date;
temperatureC?: number;
summary?: string | undefined;
temperatureF?: number;
}
function formatDate(d: Date) {
return d.getFullYear() + '-' +
(d.getMonth() < 9 ? ('0' + (d.getMonth()+1)) : (d.getMonth()+1)) + '-' +
(d.getDate() < 10 ? ('0' + d.getDate()) : d.getDate());
}
export class SwaggerException extends Error {
message: string;
status: number;
response: string;
headers: { [key: string]: any; };
result: any;
constructor(message: string, status: number, response: string, headers: { [key: string]: any; }, result: any) {
super();
this.message = message;
this.status = status;
this.response = response;
this.headers = headers;
this.result = result;
}
protected isSwaggerException = true;
static isSwaggerException(obj: any): obj is SwaggerException {
return obj.isSwaggerException === true;
}
}
function throwException(message: string, status: number, response: string, headers: { [key: string]: any; }, result?: any): any {
if (result !== null && result !== undefined)
throw result;
else
throw new SwaggerException(message, status, response, headers, null);
}

View File

@@ -1,77 +1,22 @@
import {useEffect, useState} from 'react'
import './App.css' // Ensure a declaration for CSS is added in a .d.ts file
import {ColumnDirective, ColumnsDirective, GridComponent} from '@syncfusion/ej2-react-grids';
import {handleDarkMode} from "./theme_helpers/ThemeHelpers.ts";
function App() {
const [count, setCount] = useState(0)
useEffect(() => {
return handleDarkMode();
}, []);
const data = [
{
OrderID: 10248, CustomerID: 'VINET', EmployeeID: 5, ShipCountry: 'France', Freight: 32.38
},
{
OrderID: 10249, CustomerID: 'TOMSP', EmployeeID: 6, ShipCountry: 'Germany', Freight: 11.61
},
{
OrderID: 10250, CustomerID: 'HANAR', EmployeeID: 4, ShipCountry: 'Brazil', Freight: 65.83
}
];
// App.tsx
import React from 'react';
import {BrowserRouter as Router, Route, Routes} from 'react-router-dom';
import HomePage from './pages/HomePage';
import AboutPage from './pages/AboutPage';
import WeatherPage from "./pages/WeatherPage.tsx";
const App: React.FC = () => {
return (
<>
<h1>Vite, React, Syncfusion, Daisyui Demo</h1>
<div className="card shadow-md w-2/3 mt-5 bg-auto-50">
<div className="card-body">
<button className="btn w-full m-2" onClick={() => setCount((count) => count + 1)}>
count is {count}
</button>
</div>
</div>
<Router>
<Routes>
<Route path="/" element={<HomePage/>}/>
<Route path="/about" element={<AboutPage/>}/>
<Route path="/weather" element={<WeatherPage/>}/>
{/* Other routes */}
</Routes>
</Router>
);
};
<div className="badge badge-secondary m-4">primary</div>
<div role="alert" className="alert alert-error">
<svg
xmlns="http://www.w3.org/2000/svg"
className="h-6 w-6 shrink-0 stroke-current"
fill="none"
viewBox="0 0 24 24">
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z"/>
</svg>
<span>Error! Task failed successfully.</span>
</div>
<p>
Edit <code>src/App.tsx</code> and save to test HMR
</p>
<p className="font-bold underline">
Click on the Vite and React logos to learn more
</p>
<GridComponent dataSource={data}>
<ColumnsDirective>
<ColumnDirective field='OrderID' width='100' textAlign="Right"/>
<ColumnDirective field='CustomerID' width='100'/>
<ColumnDirective field='EmployeeID' width='100' textAlign="Right"/>
<ColumnDirective field='Freight' width='100' format="C2" textAlign="Right"/>
<ColumnDirective field='ShipCountry' width='100'/>
</ColumnsDirective>
</GridComponent>
</>
)
}
export default App
export default App;

View File

@@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>

Before

Width:  |  Height:  |  Size: 4.0 KiB

View File

@@ -0,0 +1,110 @@
// Layout.tsx
import React, {useEffect, useState} from 'react';
import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
import {faBars} from '@fortawesome/free-solid-svg-icons';
import {handleDarkMode} from "../theme_helpers/ThemeHelpers";
import NavMenu from "./NavMenue.tsx";
interface LayoutProps {
children: React.ReactNode;
}
const Layout: React.FC<LayoutProps> = ({children}) => {
// Determine if we are on mobile (below 768px)
const [isMobile, setIsMobile] = useState<boolean>(() => {
if (typeof window !== 'undefined') {
return window.innerWidth < 768;
}
return false;
});
// Sidebar open state: default open on desktop, closed on mobile.
const [isSidebarOpen, setSidebarOpen] = useState<boolean>(() => {
if (typeof window !== 'undefined') {
return window.innerWidth >= 768;
}
return false;
});
// Setup dark mode theme.
useEffect(() => {
return handleDarkMode();
}, []);
// Update mobile flag and sidebar state on resize.
useEffect(() => {
const handleResize = () => {
const mobile = window.innerWidth < 768;
setIsMobile(mobile);
// Set sidebar open to false on mobile, true on desktop.
setSidebarOpen(!mobile);
};
window.addEventListener('resize', handleResize);
// Initial check.
handleResize();
return () => window.removeEventListener('resize', handleResize);
}, []);
return (
<div className="flex flex-col min-h-screen relative">
{/* Header */}
<header className="bg-primary text-primary-content p-4 flex">
<div className="container flex">
<button
className="btn btn-square btn-ghost mr-4"
onClick={() => setSidebarOpen(!isSidebarOpen)}
>
<FontAwesomeIcon icon={faBars} className="fa-2xl"/>
</button>
<h1 className="text-3xl font-bold">My React Site</h1>
</div>
</header>
{/* For mobile, add an overlay backdrop when the sidebar is open.
The overlay now starts below the header (top-16) */}
{isMobile && isSidebarOpen && (
<div
className="fixed top-16 left-0 right-0 bottom-0 bg-black opacity-50 z-40"
onClick={() => setSidebarOpen(false)}
></div>
)}
{/* Content Area */}
<div className="flex flex-1">
{/* Sidebar Navigation */}
<aside className={`bg-base-200 transition-transform duration-300
${isMobile
? "fixed top-16 left-0 bottom-0 w-44 max-w-xs p-3 z-50"
: "min-w-36 max-w-52 w-1/5"
}
${isMobile
? (isSidebarOpen ? "translate-x-0" : "-translate-x-full")
: (isSidebarOpen ? "block" : "hidden")
}
`}
>
<NavMenu/>
</aside>
{/* Main Content */}
<main className="flex-grow container mx-auto p-4">
{children}
</main>
</div>
{/* Footer */}
<footer className="bg-neutral text-neutral-content p-4">
<div className="container mx-auto text-center">
<p>&copy; 2025 My React Site. All rights reserved.</p>
</div>
</footer>
</div>
);
};
export default Layout;

View File

@@ -0,0 +1,43 @@
import React from 'react';
import {Link} from 'react-router-dom';
import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
import {faCloudSun, faConciergeBell, faEnvelope, faHouse, faInfoCircle} from '@fortawesome/free-solid-svg-icons';
const NavMenu: React.FC = () => {
return (
<ul className="menu gap-y-1">
<li className="flex">
<Link to="/">
<FontAwesomeIcon icon={faHouse}/>
Home
</Link>
</li>
<li className="flex">
<Link to="/weather">
<FontAwesomeIcon icon={faCloudSun}/>
Weather
</Link>
</li>
<li className="flex">
<Link to="/about">
<FontAwesomeIcon icon={faInfoCircle}/>
About
</Link>
</li>
<li className="flex">
<Link to="/services">
<FontAwesomeIcon icon={faConciergeBell}/>
Services
</Link>
</li>
<li className="flex">
<Link to="/contact">
<FontAwesomeIcon icon={faEnvelope}/>
Contact
</Link>
</li>
</ul>
);
};
export default NavMenu;

View File

@@ -0,0 +1,15 @@
// withLayout.tsx
import React from 'react';
import Layout from './MainLayout';
const withLayout = <P extends object>(
WrappedComponent: React.ComponentType<P>
): React.FC<P> => {
return (props: P) => (
<Layout>
<WrappedComponent {...props} />
</Layout>
);
};
export default withLayout;

View File

@@ -0,0 +1,23 @@
// AboutPage.tsx
import React from 'react';
import withLayout from '../layouts/with_main_layout.ts.tsx'; // Adjust the path based on your project structure
const AboutPage: React.FC = () => {
return (
<div className="p-4">
<h2 className="text-2xl font-bold mb-4">About Us</h2>
<p className="mb-2">
Welcome to our website! We are committed to providing you with the best experience possible.
</p>
<p className="mb-2">
Our mission is to build high-quality applications that are fast, responsive, and user-friendly.
</p>
<p>
Whether you're here to learn more about our team or explore our services, we hope you enjoy your visit.
</p>
</div>
);
};
const NamedAboutPage = withLayout(AboutPage);
export default NamedAboutPage;

View File

@@ -0,0 +1,73 @@
import {useState} from 'react'
import '../App.css' // Ensure a declaration for CSS is added in a .d.ts file
import {ColumnDirective, ColumnsDirective, GridComponent} from '@syncfusion/ej2-react-grids';
import with_main_layout from '../layouts/with_main_layout.ts.tsx'; // adjust the path as necessary
function HomePage() {
const [count, setCount] = useState(0)
const data = [
{
OrderID: 10248, CustomerID: 'VINET', EmployeeID: 5, ShipCountry: 'France', Freight: 32.38
},
{
OrderID: 10249, CustomerID: 'TOMSP', EmployeeID: 6, ShipCountry: 'Germany', Freight: 11.61
},
{
OrderID: 10250, CustomerID: 'HANAR', EmployeeID: 4, ShipCountry: 'Brazil', Freight: 65.83
}
];
return (
<>
<h1>Vite, React, Syncfusion, Daisyui Demo</h1>
<div className="card shadow-md w-2/3 mt-5 bg-auto-50">
<div className="card-body">
<button className="btn w-full m-2" onClick={() => setCount((count) => count + 1)}>
count is {count}
</button>
</div>
</div>
<div className="badge badge-secondary m-4">primary</div>
<div role="alert" className="alert alert-error">
<svg
xmlns="http://www.w3.org/2000/svg"
className="h-6 w-6 shrink-0 stroke-current"
fill="none"
viewBox="0 0 24 24">
<path
strokeLinecap="round"
strokeLinejoin="round"
strokeWidth="2"
d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z"/>
</svg>
<span>Error! Task failed successfully.</span>
</div>
<p>
Edit <code>src/App.tsx</code> and save to test HMR
</p>
<p className="font-bold underline">
Click on the Vite and React logos to learn more
</p>
<GridComponent dataSource={data}>
<ColumnsDirective>
<ColumnDirective field='OrderID' width='100' textAlign="Right"/>
<ColumnDirective field='CustomerID' width='100'/>
<ColumnDirective field='EmployeeID' width='100' textAlign="Right"/>
<ColumnDirective field='Freight' width='100' format="C2" textAlign="Right"/>
<ColumnDirective field='ShipCountry' width='100'/>
</ColumnsDirective>
</GridComponent>
</>
)
}
export const PageWithLayout = with_main_layout(HomePage)
export default PageWithLayout

View File

@@ -0,0 +1,61 @@
import with_main_layout from "../layouts/with_main_layout.ts.tsx";
import useLocalStorageState from 'use-local-storage-state'; // install via npm
import {Client, WeatherForecast} from "../ApiCient.ts";
import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
import {faDownload, faTrash} from "@fortawesome/free-solid-svg-icons";
import {ColumnDirective, ColumnsDirective, Filter, GridComponent, Inject, Page, Reorder, Resize, Sort} from '@syncfusion/ej2-react-grids';
function WeatherPage() {
// Use the hook to persist your weather data. It will default to null.
const [weatherData, setWeatherData] = useLocalStorageState<WeatherForecast[] | null>('WeatherPage-Forecast', {
defaultValue: null,
});
const fetchWeatherData = async () => {
const apiClient = new Client();
try {
const data = await apiClient.getWeatherForecast();
setWeatherData(data);
} catch (error) {
console.error("Error fetching weather data:", error);
}
};
return (
<div className="card shadow-md card-sm w-full bg-auto-50">
<div className="card-header text-2xl ml-5 mt-1">Weather Data</div>
<div className="card-body">
<div className="row-auto flex gap-x-2 ">
<button className="btn w-48" onClick={fetchWeatherData}>
<FontAwesomeIcon className="mr-1" icon={faDownload}/>
Fetch Weather Data
</button>
<button className="btn w-48" onClick={() => setWeatherData(null)}>
<FontAwesomeIcon className="mr-1" icon={faTrash}/>
Clear Weather
</button>
</div>
<div className="mt-5">
{!weatherData ? (
<p>No weather data, please request it!</p>
) : (
<GridComponent dataSource={weatherData || []} allowPaging={true} pageSettings={{pageCount: 5}} allowReordering={true} allowSorting={true}
allowFiltering={true} allowResizing={true}>
<ColumnsDirective>
<ColumnDirective field="date" format="dd.MM.yy" headerText="Date" width="150"/>
<ColumnDirective field="temperatureC" headerText="Temp. (C)" width="60"/>
<ColumnDirective field="temperatureF" headerText="Temp. (F)" width="60"/>
<ColumnDirective field="summary" headerText="Summary"/>
</ColumnsDirective>
<Inject services={[Page, Sort, Filter, Reorder, Resize]}/>
</GridComponent>
)}
</div>
</div>
</div>
);
}
export const PageWithLayout = with_main_layout(WeatherPage);
export default PageWithLayout;