Добавьте файлы проекта.
This commit is contained in:
student
parent
b8e8922641
commit
00d9562873
30
.dockerignore
Normal file
30
.dockerignore
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
**/.classpath
|
||||||
|
**/.dockerignore
|
||||||
|
**/.env
|
||||||
|
**/.git
|
||||||
|
**/.gitignore
|
||||||
|
**/.project
|
||||||
|
**/.settings
|
||||||
|
**/.toolstarget
|
||||||
|
**/.vs
|
||||||
|
**/.vscode
|
||||||
|
**/*.*proj.user
|
||||||
|
**/*.dbmdl
|
||||||
|
**/*.jfm
|
||||||
|
**/azds.yaml
|
||||||
|
**/bin
|
||||||
|
**/charts
|
||||||
|
**/docker-compose*
|
||||||
|
**/Dockerfile*
|
||||||
|
**/node_modules
|
||||||
|
**/npm-debug.log
|
||||||
|
**/obj
|
||||||
|
**/secrets.dev.yaml
|
||||||
|
**/values.dev.yaml
|
||||||
|
LICENSE
|
||||||
|
README.md
|
||||||
|
!**/.gitignore
|
||||||
|
!.git/HEAD
|
||||||
|
!.git/config
|
||||||
|
!.git/packed-refs
|
||||||
|
!.git/refs/heads/**
|
||||||
6
package-lock.json
generated
Normal file
6
package-lock.json
generated
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
"name": "paws",
|
||||||
|
"lockfileVersion": 3,
|
||||||
|
"requires": true,
|
||||||
|
"packages": {}
|
||||||
|
}
|
||||||
9
paws.Server/CHANGELOG.md
Normal file
9
paws.Server/CHANGELOG.md
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
This file explains how Visual Studio created the project.
|
||||||
|
|
||||||
|
The following steps were used to generate this project:
|
||||||
|
- Create new ASP\.NET Core Web API project.
|
||||||
|
- Update project file to add a reference to the frontend project and set SPA properties.
|
||||||
|
- Update `launchSettings.json` to register the SPA proxy as a startup assembly.
|
||||||
|
- Add `dockerfile` to set up docker build.
|
||||||
|
- Add project to the startup projects list.
|
||||||
|
- Write this file.
|
||||||
32
paws.Server/Controllers/WeatherForecastController.cs
Normal file
32
paws.Server/Controllers/WeatherForecastController.cs
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
|
||||||
|
namespace paws.Server.Controllers;
|
||||||
|
|
||||||
|
[ApiController]
|
||||||
|
[Route("[controller]")]
|
||||||
|
public class WeatherForecastController : ControllerBase
|
||||||
|
{
|
||||||
|
private static readonly string[] Summaries = new[]
|
||||||
|
{
|
||||||
|
"Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
|
||||||
|
};
|
||||||
|
|
||||||
|
private readonly ILogger<WeatherForecastController> _logger;
|
||||||
|
|
||||||
|
public WeatherForecastController(ILogger<WeatherForecastController> logger)
|
||||||
|
{
|
||||||
|
_logger = logger;
|
||||||
|
}
|
||||||
|
|
||||||
|
[HttpGet(Name = "GetWeatherForecast")]
|
||||||
|
public IEnumerable<WeatherForecast> Get()
|
||||||
|
{
|
||||||
|
return Enumerable.Range(1, 5).Select(index => new WeatherForecast
|
||||||
|
{
|
||||||
|
Date = DateOnly.FromDateTime(DateTime.Now.AddDays(index)),
|
||||||
|
TemperatureC = Random.Shared.Next(-20, 55),
|
||||||
|
Summary = Summaries[Random.Shared.Next(Summaries.Length)]
|
||||||
|
})
|
||||||
|
.ToArray();
|
||||||
|
}
|
||||||
|
}
|
||||||
30
paws.Server/Program.cs
Normal file
30
paws.Server/Program.cs
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
var builder = WebApplication.CreateBuilder(args);
|
||||||
|
|
||||||
|
// Add services to the container.
|
||||||
|
|
||||||
|
builder.Services.AddControllers();
|
||||||
|
// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
|
||||||
|
builder.Services.AddEndpointsApiExplorer();
|
||||||
|
builder.Services.AddSwaggerGen();
|
||||||
|
|
||||||
|
var app = builder.Build();
|
||||||
|
|
||||||
|
app.UseDefaultFiles();
|
||||||
|
app.UseStaticFiles();
|
||||||
|
|
||||||
|
// Configure the HTTP request pipeline.
|
||||||
|
if (app.Environment.IsDevelopment())
|
||||||
|
{
|
||||||
|
app.UseSwagger();
|
||||||
|
app.UseSwaggerUI();
|
||||||
|
}
|
||||||
|
|
||||||
|
app.UseHttpsRedirection();
|
||||||
|
|
||||||
|
app.UseAuthorization();
|
||||||
|
|
||||||
|
app.MapControllers();
|
||||||
|
|
||||||
|
app.MapFallbackToFile("/index.html");
|
||||||
|
|
||||||
|
app.Run();
|
||||||
55
paws.Server/Properties/launchSettings.json
Normal file
55
paws.Server/Properties/launchSettings.json
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
{
|
||||||
|
"profiles": {
|
||||||
|
"http": {
|
||||||
|
"commandName": "Project",
|
||||||
|
"launchBrowser": true,
|
||||||
|
"launchUrl": "swagger",
|
||||||
|
"environmentVariables": {
|
||||||
|
"ASPNETCORE_ENVIRONMENT": "Development",
|
||||||
|
"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy"
|
||||||
|
},
|
||||||
|
"dotnetRunMessages": true,
|
||||||
|
"applicationUrl": "http://localhost:5025"
|
||||||
|
},
|
||||||
|
"https": {
|
||||||
|
"commandName": "Project",
|
||||||
|
"launchBrowser": true,
|
||||||
|
"launchUrl": "swagger",
|
||||||
|
"environmentVariables": {
|
||||||
|
"ASPNETCORE_ENVIRONMENT": "Development",
|
||||||
|
"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy"
|
||||||
|
},
|
||||||
|
"dotnetRunMessages": true,
|
||||||
|
"applicationUrl": "https://*:7252;http://*:5123"
|
||||||
|
},
|
||||||
|
"IIS Express": {
|
||||||
|
"commandName": "IISExpress",
|
||||||
|
"launchBrowser": true,
|
||||||
|
"launchUrl": "swagger",
|
||||||
|
"environmentVariables": {
|
||||||
|
"ASPNETCORE_ENVIRONMENT": "Development",
|
||||||
|
"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"Container (Dockerfile)": {
|
||||||
|
"commandName": "Docker",
|
||||||
|
"launchBrowser": true,
|
||||||
|
"launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
|
||||||
|
"environmentVariables": {
|
||||||
|
"ASPNETCORE_HTTPS_PORTS": "8081",
|
||||||
|
"ASPNETCORE_HTTP_PORTS": "8080"
|
||||||
|
},
|
||||||
|
"publishAllPorts": true,
|
||||||
|
"useSSL": true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"$schema": "http://json.schemastore.org/launchsettings.json",
|
||||||
|
"iisSettings": {
|
||||||
|
"windowsAuthentication": false,
|
||||||
|
"anonymousAuthentication": true,
|
||||||
|
"iisExpress": {
|
||||||
|
"applicationUrl": "http://localhost:18388",
|
||||||
|
"sslPort": 44391
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
13
paws.Server/WeatherForecast.cs
Normal file
13
paws.Server/WeatherForecast.cs
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
namespace paws.Server
|
||||||
|
{
|
||||||
|
public class WeatherForecast
|
||||||
|
{
|
||||||
|
public DateOnly Date { get; set; }
|
||||||
|
|
||||||
|
public int TemperatureC { get; set; }
|
||||||
|
|
||||||
|
public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
|
||||||
|
|
||||||
|
public string? Summary { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
8
paws.Server/appsettings.Development.json
Normal file
8
paws.Server/appsettings.Development.json
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"Logging": {
|
||||||
|
"LogLevel": {
|
||||||
|
"Default": "Information",
|
||||||
|
"Microsoft.AspNetCore": "Warning"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
9
paws.Server/appsettings.json
Normal file
9
paws.Server/appsettings.json
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"Logging": {
|
||||||
|
"LogLevel": {
|
||||||
|
"Default": "Information",
|
||||||
|
"Microsoft.AspNetCore": "Warning"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"AllowedHosts": "*"
|
||||||
|
}
|
||||||
28
paws.Server/paws.Server.csproj
Normal file
28
paws.Server/paws.Server.csproj
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
<UserSecretsId>dd63770f-72d3-4a7c-add8-c1884d90f41f</UserSecretsId>
|
||||||
|
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
|
||||||
|
<SpaRoot>..\paws.client</SpaRoot>
|
||||||
|
<SpaProxyLaunchCommand>npm run dev</SpaProxyLaunchCommand>
|
||||||
|
<SpaProxyServerUrl>https://localhost:62273</SpaProxyServerUrl>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.SpaProxy">
|
||||||
|
<Version>8.*-*</Version>
|
||||||
|
</PackageReference>
|
||||||
|
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
|
||||||
|
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\paws.client\paws.client.esproj">
|
||||||
|
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||||
|
</ProjectReference>
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
6
paws.Server/paws.Server.http
Normal file
6
paws.Server/paws.Server.http
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
@paws.Server_HostAddress = http://localhost:5025
|
||||||
|
|
||||||
|
GET {{paws.Server_HostAddress}}/weatherforecast/
|
||||||
|
Accept: application/json
|
||||||
|
|
||||||
|
###
|
||||||
24
paws.client/.gitignore
vendored
Normal file
24
paws.client/.gitignore
vendored
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
# Logs
|
||||||
|
logs
|
||||||
|
*.log
|
||||||
|
npm-debug.log*
|
||||||
|
yarn-debug.log*
|
||||||
|
yarn-error.log*
|
||||||
|
pnpm-debug.log*
|
||||||
|
lerna-debug.log*
|
||||||
|
|
||||||
|
node_modules
|
||||||
|
dist
|
||||||
|
dist-ssr
|
||||||
|
*.local
|
||||||
|
|
||||||
|
# Editor directories and files
|
||||||
|
.vscode/*
|
||||||
|
!.vscode/extensions.json
|
||||||
|
.idea
|
||||||
|
.DS_Store
|
||||||
|
*.suo
|
||||||
|
*.ntvs*
|
||||||
|
*.njsproj
|
||||||
|
*.sln
|
||||||
|
*.sw?
|
||||||
16
paws.client/CHANGELOG.md
Normal file
16
paws.client/CHANGELOG.md
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
This file explains how Visual Studio created the project.
|
||||||
|
|
||||||
|
The following tools were used to generate this project:
|
||||||
|
- create-vite
|
||||||
|
|
||||||
|
The following steps were used to generate this project:
|
||||||
|
- Create react project with create-vite: `npm init --yes vite@latest paws.client -- --template=react-ts`.
|
||||||
|
- Update `vite.config.ts` to set up proxying and certs.
|
||||||
|
- Add `@type/node` for `vite.config.js` typing.
|
||||||
|
- Update `App` component to fetch and display weather information.
|
||||||
|
- Create project file (`paws.client.esproj`).
|
||||||
|
- Create `launch.json` to enable debugging.
|
||||||
|
- Add project to solution.
|
||||||
|
- Update proxy endpoint to be the backend server endpoint.
|
||||||
|
- Add project to the startup projects list.
|
||||||
|
- Write this file.
|
||||||
54
paws.client/README.md
Normal file
54
paws.client/README.md
Normal file
@ -0,0 +1,54 @@
|
|||||||
|
# React + TypeScript + Vite
|
||||||
|
|
||||||
|
This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
|
||||||
|
|
||||||
|
Currently, two official plugins are available:
|
||||||
|
|
||||||
|
- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react) uses [Babel](https://babeljs.io/) for Fast Refresh
|
||||||
|
- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
|
||||||
|
|
||||||
|
## Expanding the ESLint configuration
|
||||||
|
|
||||||
|
If you are developing a production application, we recommend updating the configuration to enable type-aware lint rules:
|
||||||
|
|
||||||
|
```js
|
||||||
|
export default tseslint.config({
|
||||||
|
extends: [
|
||||||
|
// Remove ...tseslint.configs.recommended and replace with this
|
||||||
|
...tseslint.configs.recommendedTypeChecked,
|
||||||
|
// Alternatively, use this for stricter rules
|
||||||
|
...tseslint.configs.strictTypeChecked,
|
||||||
|
// Optionally, add this for stylistic rules
|
||||||
|
...tseslint.configs.stylisticTypeChecked,
|
||||||
|
],
|
||||||
|
languageOptions: {
|
||||||
|
// other options...
|
||||||
|
parserOptions: {
|
||||||
|
project: ['./tsconfig.node.json', './tsconfig.app.json'],
|
||||||
|
tsconfigRootDir: import.meta.dirname,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
```
|
||||||
|
|
||||||
|
You can also install [eslint-plugin-react-x](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-x) and [eslint-plugin-react-dom](https://github.com/Rel1cx/eslint-react/tree/main/packages/plugins/eslint-plugin-react-dom) for React-specific lint rules:
|
||||||
|
|
||||||
|
```js
|
||||||
|
// eslint.config.js
|
||||||
|
import reactX from 'eslint-plugin-react-x'
|
||||||
|
import reactDom from 'eslint-plugin-react-dom'
|
||||||
|
|
||||||
|
export default tseslint.config({
|
||||||
|
plugins: {
|
||||||
|
// Add the react-x and react-dom plugins
|
||||||
|
'react-x': reactX,
|
||||||
|
'react-dom': reactDom,
|
||||||
|
},
|
||||||
|
rules: {
|
||||||
|
// other rules...
|
||||||
|
// Enable its recommended typescript rules
|
||||||
|
...reactX.configs['recommended-typescript'].rules,
|
||||||
|
...reactDom.configs.recommended.rules,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
```
|
||||||
28
paws.client/eslint.config.js
Normal file
28
paws.client/eslint.config.js
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
import js from '@eslint/js'
|
||||||
|
import globals from 'globals'
|
||||||
|
import reactHooks from 'eslint-plugin-react-hooks'
|
||||||
|
import reactRefresh from 'eslint-plugin-react-refresh'
|
||||||
|
import tseslint from 'typescript-eslint'
|
||||||
|
|
||||||
|
export default tseslint.config(
|
||||||
|
{ ignores: ['dist'] },
|
||||||
|
{
|
||||||
|
extends: [js.configs.recommended, ...tseslint.configs.recommended],
|
||||||
|
files: ['**/*.{ts,tsx}'],
|
||||||
|
languageOptions: {
|
||||||
|
ecmaVersion: 2020,
|
||||||
|
globals: globals.browser,
|
||||||
|
},
|
||||||
|
plugins: {
|
||||||
|
'react-hooks': reactHooks,
|
||||||
|
'react-refresh': reactRefresh,
|
||||||
|
},
|
||||||
|
rules: {
|
||||||
|
...reactHooks.configs.recommended.rules,
|
||||||
|
'react-refresh/only-export-components': [
|
||||||
|
'warn',
|
||||||
|
{ allowConstantExport: true },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
)
|
||||||
13
paws.client/index.html
Normal file
13
paws.client/index.html
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
<!doctype html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8" />
|
||||||
|
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
|
<title>Vite + React + TS</title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<div id="root"></div>
|
||||||
|
<script type="module" src="/src/main.tsx"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
3325
paws.client/package-lock.json
generated
Normal file
3325
paws.client/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
30
paws.client/package.json
Normal file
30
paws.client/package.json
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
{
|
||||||
|
"name": "paws.client",
|
||||||
|
"private": true,
|
||||||
|
"version": "0.0.0",
|
||||||
|
"type": "module",
|
||||||
|
"scripts": {
|
||||||
|
"dev": "vite",
|
||||||
|
"build": "tsc -b && vite build",
|
||||||
|
"lint": "eslint .",
|
||||||
|
"preview": "vite preview"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"react": "^19.0.0",
|
||||||
|
"react-dom": "^19.0.0"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@eslint/js": "^9.22.0",
|
||||||
|
"@types/react": "^19.0.10",
|
||||||
|
"@types/react-dom": "^19.0.4",
|
||||||
|
"@vitejs/plugin-react": "^4.3.4",
|
||||||
|
"eslint": "^9.22.0",
|
||||||
|
"eslint-plugin-react-hooks": "^5.2.0",
|
||||||
|
"eslint-plugin-react-refresh": "^0.4.19",
|
||||||
|
"globals": "^16.0.0",
|
||||||
|
"typescript": "~5.7.2",
|
||||||
|
"typescript-eslint": "^8.26.1",
|
||||||
|
"vite": "^6.3.1",
|
||||||
|
"@types/node": "^22"
|
||||||
|
}
|
||||||
|
}
|
||||||
11
paws.client/paws.client.esproj
Normal file
11
paws.client/paws.client.esproj
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
<Project Sdk="Microsoft.VisualStudio.JavaScript.Sdk/1.0.2191419">
|
||||||
|
<PropertyGroup>
|
||||||
|
<StartupCommand>npm run dev</StartupCommand>
|
||||||
|
<JavaScriptTestRoot>src\</JavaScriptTestRoot>
|
||||||
|
<JavaScriptTestFramework>Vitest</JavaScriptTestFramework>
|
||||||
|
<!-- Allows the build (or compile) script located on package.json to run on Build -->
|
||||||
|
<ShouldRunBuildScript>false</ShouldRunBuildScript>
|
||||||
|
<!-- Folder where production build objects will be placed -->
|
||||||
|
<BuildOutputFolder>$(MSBuildProjectDirectory)\dist</BuildOutputFolder>
|
||||||
|
</PropertyGroup>
|
||||||
|
</Project>
|
||||||
1
paws.client/public/vite.svg
Normal file
1
paws.client/public/vite.svg
Normal file
@ -0,0 +1 @@
|
|||||||
|
<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="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
|
||||||
|
After Width: | Height: | Size: 1.5 KiB |
98
paws.client/src/App.css
Normal file
98
paws.client/src/App.css
Normal file
@ -0,0 +1,98 @@
|
|||||||
|
/* Сброс некоторых стилей по умолчанию для единообразия */
|
||||||
|
body {
|
||||||
|
margin: 0;
|
||||||
|
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
|
||||||
|
-webkit-font-smoothing: antialiased;
|
||||||
|
-moz-osx-font-smoothing: grayscale;
|
||||||
|
background-color: #f4f7f6; /* Светло-серый фон */
|
||||||
|
color: #333; /* Основной цвет текста */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Контейнер всего приложения */
|
||||||
|
.App {
|
||||||
|
max-width: 600px; /* Ограничиваем ширину для читаемости */
|
||||||
|
margin: 0 auto; /* Центрируем по горизонтали */
|
||||||
|
padding: 20px;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
min-height: 90vh; /* Занять почти всю высоту экрана */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Шапка */
|
||||||
|
.App-header {
|
||||||
|
text-align: center;
|
||||||
|
margin-bottom: 20px;
|
||||||
|
padding-bottom: 15px;
|
||||||
|
border-bottom: 1px solid #eee;
|
||||||
|
}
|
||||||
|
|
||||||
|
.App-header h1 {
|
||||||
|
margin: 0;
|
||||||
|
color: #2c3e50; /* Темно-синий для заголовка */
|
||||||
|
font-size: 2.2em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.App-header p {
|
||||||
|
color: #7f8c8d; /* Серый для подзаголовка */
|
||||||
|
margin-top: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Основное содержимое */
|
||||||
|
main {
|
||||||
|
flex-grow: 1; /* Занимает оставшееся место между header и footer */
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center; /* Центрируем контент внутри main */
|
||||||
|
}
|
||||||
|
|
||||||
|
.progress-info {
|
||||||
|
margin-top: 15px;
|
||||||
|
font-size: 1.1em;
|
||||||
|
color: #34495e;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.progress-info strong {
|
||||||
|
color: #3498db; /* Выделяем текущее количество */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Подвал */
|
||||||
|
.App-footer {
|
||||||
|
margin-top: 30px; /* Отступ перед футером */
|
||||||
|
text-align: center;
|
||||||
|
padding-top: 15px;
|
||||||
|
border-top: 1px solid #eee;
|
||||||
|
color: #95a5a6; /* Светло-серый текст */
|
||||||
|
font-size: 0.9em;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* --- Дополнительные общие стили (можно добавить) --- */
|
||||||
|
button {
|
||||||
|
font-family: inherit; /* Наследовать шрифт */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* --- Адаптивность (очень простая) --- */
|
||||||
|
@media (max-width: 640px) {
|
||||||
|
.App {
|
||||||
|
padding: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.App-header h1 {
|
||||||
|
font-size: 1.8em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.preset-buttons button {
|
||||||
|
font-size: 0.9em;
|
||||||
|
padding: 8px 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.custom-input input, .custom-input button {
|
||||||
|
font-size: 0.9em;
|
||||||
|
padding: 8px 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.custom-input input {
|
||||||
|
width: 140px; /* Уменьшить поле на мал. экранах */
|
||||||
|
}
|
||||||
|
}
|
||||||
62
paws.client/src/App.tsx
Normal file
62
paws.client/src/App.tsx
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
import React, { useState, useCallback } from 'react';
|
||||||
|
// import AnimatedPlant from './components/AnimatedPlant'; // <-- Удалить или закомментировать
|
||||||
|
import CircularProgress from './components/CircularProgress'; // <-- Добавить импорт диаграммы
|
||||||
|
import WaterControls from './components/WaterControls';
|
||||||
|
import './App.css';
|
||||||
|
|
||||||
|
function App() {
|
||||||
|
const [currentWater, setCurrentWater] = useState(0);
|
||||||
|
const dailyGoal = 2000;
|
||||||
|
|
||||||
|
const handleAddWater = useCallback((amount: number) => {
|
||||||
|
if (!isNaN(amount) && amount > 0) {
|
||||||
|
setCurrentWater((prevWater: number) => prevWater + amount);
|
||||||
|
} else {
|
||||||
|
console.warn("Попытка добавить некорректное количество воды:", amount);
|
||||||
|
}
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
// Рассчитываем процент выполнения цели
|
||||||
|
const percentage = dailyGoal > 0 ? (currentWater / dailyGoal) * 100 : 0;
|
||||||
|
|
||||||
|
// Можно добавить изменение цвета в зависимости от процента (опционально)
|
||||||
|
let progressColor = '#e74c3c'; // Красный по умолчанию (низкий процент)
|
||||||
|
if (percentage >= 100) {
|
||||||
|
progressColor = '#2ecc71'; // Зеленый (цель достигнута)
|
||||||
|
} else if (percentage >= 50) {
|
||||||
|
progressColor = '#f39c12'; // Оранжевый (половина и больше)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="App">
|
||||||
|
<header className="App-header">
|
||||||
|
<h1>АкваДруг</h1>
|
||||||
|
<p>Твой помощник в гидратации!</p>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<main>
|
||||||
|
{/* Отображаем круговую диаграмму вместо растения */}
|
||||||
|
<CircularProgress
|
||||||
|
percentage={percentage}
|
||||||
|
size={200} /* Можете настроить размер */
|
||||||
|
strokeWidth={15} /* И толщину линии */
|
||||||
|
color={progressColor} /* Передаем рассчитанный цвет */
|
||||||
|
showText={true} /* Показываем проценты */
|
||||||
|
/>
|
||||||
|
|
||||||
|
<div className="progress-info">
|
||||||
|
Выпито сегодня: <strong>{currentWater} мл</strong> / {dailyGoal} мл
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<WaterControls onAddWater={handleAddWater} />
|
||||||
|
</main>
|
||||||
|
|
||||||
|
<footer className="App-footer">
|
||||||
|
<p>Не забывай пить воду!</p>
|
||||||
|
</footer>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export default App;
|
||||||
1
paws.client/src/assets/react.svg
Normal file
1
paws.client/src/assets/react.svg
Normal file
@ -0,0 +1 @@
|
|||||||
|
<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>
|
||||||
|
After Width: | Height: | Size: 4.0 KiB |
28
paws.client/src/components/CircularProgress.css
Normal file
28
paws.client/src/components/CircularProgress.css
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
.circular-progress-container {
|
||||||
|
display: inline-block; /* Чтобы занимал место по размеру */
|
||||||
|
position: relative; /* Для возможного позиционирования */
|
||||||
|
margin: 20px auto; /* Центрирование и отступы */
|
||||||
|
}
|
||||||
|
|
||||||
|
.circular-progress-svg {
|
||||||
|
display: block; /* Убрать лишний отступ под SVG */
|
||||||
|
}
|
||||||
|
|
||||||
|
.progress-ring__background {
|
||||||
|
/* Стилей по умолчанию нет, они задаются атрибутами */
|
||||||
|
}
|
||||||
|
|
||||||
|
.progress-ring__progress {
|
||||||
|
/* Плавный переход для смещения штриха (анимация заполнения) */
|
||||||
|
transition: stroke-dashoffset 0.5s ease-out;
|
||||||
|
/* !! Начальное положение - 0% !! - повернут на -90 градусов */
|
||||||
|
/* transform-origin не нужен для круга, но transform важен в SVG */
|
||||||
|
}
|
||||||
|
|
||||||
|
.progress-ring__text {
|
||||||
|
font-size: 1.8em; /* Размер текста относительно контейнера */
|
||||||
|
font-weight: bold;
|
||||||
|
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
|
||||||
|
/* Плавный переход для цвета текста */
|
||||||
|
transition: fill 0.5s ease-out;
|
||||||
|
}
|
||||||
82
paws.client/src/components/CircularProgress.tsx
Normal file
82
paws.client/src/components/CircularProgress.tsx
Normal file
@ -0,0 +1,82 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import './CircularProgress.css'; // Стили для диаграммы
|
||||||
|
|
||||||
|
interface CircularProgressProps {
|
||||||
|
percentage: number; // Процент заполнения (от 0 до 100)
|
||||||
|
size?: number; // Размер диаграммы (ширина и высота)
|
||||||
|
strokeWidth?: number; // Толщина линии
|
||||||
|
color?: string; // Цвет линии прогресса
|
||||||
|
showText?: boolean; // Показывать ли текст с процентами в центре
|
||||||
|
}
|
||||||
|
|
||||||
|
const CircularProgress: React.FC<CircularProgressProps> = ({
|
||||||
|
percentage,
|
||||||
|
size = 180, // Размер по умолчанию
|
||||||
|
strokeWidth = 12, // Толщина линии по умолчанию
|
||||||
|
color = '#3498db', // Цвет по умолчанию (синий)
|
||||||
|
showText = true, // Показывать текст по умолчанию
|
||||||
|
}) => {
|
||||||
|
// Ограничиваем процент от 0 до 100
|
||||||
|
const pct = Math.max(0, Math.min(100, percentage));
|
||||||
|
|
||||||
|
// Расчеты для SVG круга/дуги
|
||||||
|
const radius = (size - strokeWidth) / 2; // Радиус до центра линии
|
||||||
|
const circumference = 2 * Math.PI * radius; // Длина окружности
|
||||||
|
// Рассчитываем смещение штриха (сколько "скрыть" от полной окружности)
|
||||||
|
const offset = circumference - (pct / 100) * circumference;
|
||||||
|
|
||||||
|
// Центр круга
|
||||||
|
const center = size / 2;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="circular-progress-container" style={{ width: size, height: size }}>
|
||||||
|
<svg
|
||||||
|
className="circular-progress-svg"
|
||||||
|
width={size}
|
||||||
|
height={size}
|
||||||
|
viewBox={`0 0 ${size} ${size}`} // viewBox равен размеру
|
||||||
|
>
|
||||||
|
{/* Фоновый круг (трек) */}
|
||||||
|
<circle
|
||||||
|
className="progress-ring__background"
|
||||||
|
stroke="#e6e6e6" // Цвет фона
|
||||||
|
strokeWidth={strokeWidth}
|
||||||
|
fill="transparent" // Без заливки
|
||||||
|
r={radius} // Радиус
|
||||||
|
cx={center} // Центр X
|
||||||
|
cy={center} // Центр Y
|
||||||
|
/>
|
||||||
|
{/* Круг прогресса (дуга) */}
|
||||||
|
<circle
|
||||||
|
className="progress-ring__progress"
|
||||||
|
stroke={color} // Цвет прогресса
|
||||||
|
strokeWidth={strokeWidth}
|
||||||
|
strokeDasharray={`${circumference} ${circumference}`} // Делаем "штрих" равным всей окружности
|
||||||
|
style={{ strokeDashoffset: offset }} // Смещение показывает нужную часть
|
||||||
|
strokeLinecap="round" // Скруглённые концы линии
|
||||||
|
fill="transparent"
|
||||||
|
r={radius}
|
||||||
|
cx={center}
|
||||||
|
cy={center}
|
||||||
|
// Поворачиваем круг, чтобы 0% был сверху
|
||||||
|
transform={`rotate(-90 ${center} ${center})`}
|
||||||
|
/>
|
||||||
|
{/* Текст с процентами в центре */}
|
||||||
|
{showText && (
|
||||||
|
<text
|
||||||
|
className="progress-ring__text"
|
||||||
|
x="50%" // Центр по X
|
||||||
|
y="50%" // Центр по Y
|
||||||
|
dominantBaseline="middle" // Вертикальное выравнивание по центру
|
||||||
|
textAnchor="middle" // Горизонтальное выравнивание по центру
|
||||||
|
fill={color} // Цвет текста такой же, как у прогресса
|
||||||
|
>
|
||||||
|
{`${Math.round(pct)}%`}
|
||||||
|
</text>
|
||||||
|
)}
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default CircularProgress;
|
||||||
84
paws.client/src/components/WaterControls.css
Normal file
84
paws.client/src/components/WaterControls.css
Normal file
@ -0,0 +1,84 @@
|
|||||||
|
.water-controls {
|
||||||
|
margin-top: 30px; /* Îòñòóï ñâåðõó */
|
||||||
|
padding: 20px;
|
||||||
|
border: 1px solid #e0e0e0;
|
||||||
|
border-radius: 8px;
|
||||||
|
background-color: #ffffff;
|
||||||
|
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
|
||||||
|
}
|
||||||
|
|
||||||
|
.controls-title {
|
||||||
|
text-align: center;
|
||||||
|
font-weight: 600;
|
||||||
|
margin-bottom: 20px;
|
||||||
|
color: #333;
|
||||||
|
font-size: 1.1em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.preset-buttons {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap; /* Ïåðåíîñ êíîïîê íà íîâóþ ñòðîêó, åñëè íå âëåçàþò */
|
||||||
|
justify-content: center; /* Öåíòðèðóåì êíîïêè */
|
||||||
|
gap: 10px; /* Ðàññòîÿíèå ìåæäó êíîïêàìè */
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.preset-buttons button {
|
||||||
|
padding: 10px 15px;
|
||||||
|
font-size: 1em;
|
||||||
|
background-color: #3498db; /* Ñèíèé öâåò */
|
||||||
|
color: white;
|
||||||
|
border: none;
|
||||||
|
border-radius: 5px;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: background-color 0.3s ease, transform 0.1s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.preset-buttons button:hover {
|
||||||
|
background-color: #2980b9; /* Òåìíåå ïðè íàâåäåíèè */
|
||||||
|
}
|
||||||
|
|
||||||
|
.preset-buttons button:active {
|
||||||
|
transform: scale(0.95); /* Íåìíîãî óìåíüøèòü ïðè íàæàòèè */
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.custom-input {
|
||||||
|
display: flex;
|
||||||
|
justify-content: center; /* Öåíòðèðóåì ïîëå ââîäà è êíîïêó */
|
||||||
|
align-items: center; /* Âûðàâíèâàåì ïî âåðòèêàëè */
|
||||||
|
gap: 10px; /* Ðàññòîÿíèå ìåæäó ïîëåì è êíîïêîé */
|
||||||
|
}
|
||||||
|
|
||||||
|
.custom-input input {
|
||||||
|
padding: 10px;
|
||||||
|
border: 1px solid #ccc;
|
||||||
|
border-radius: 5px;
|
||||||
|
width: 180px; /* Èëè äðóãàÿ ïîäõîäÿùàÿ øèðèíà */
|
||||||
|
font-size: 1em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.custom-input input:focus {
|
||||||
|
border-color: #3498db; /* Ïîäñâåòêà ïðè ôîêóñå */
|
||||||
|
outline: none; /* Óáðàòü ñòàíäàðòíóþ îáâîäêó */
|
||||||
|
box-shadow: 0 0 0 2px rgba(52, 152, 219, 0.2);
|
||||||
|
}
|
||||||
|
|
||||||
|
.custom-input button {
|
||||||
|
padding: 10px 20px;
|
||||||
|
font-size: 1em;
|
||||||
|
background-color: #2ecc71; /* Çåëåíûé öâåò */
|
||||||
|
color: white;
|
||||||
|
border: none;
|
||||||
|
border-radius: 5px;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: background-color 0.3s ease, transform 0.1s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.custom-input button:hover {
|
||||||
|
background-color: #27ae60; /* Òåìíåå ïðè íàâåäåíèè */
|
||||||
|
}
|
||||||
|
|
||||||
|
.custom-input button:active {
|
||||||
|
transform: scale(0.95); /* Íåìíîãî óìåíüøèòü ïðè íàæàòèè */
|
||||||
|
}
|
||||||
70
paws.client/src/components/WaterControls.tsx
Normal file
70
paws.client/src/components/WaterControls.tsx
Normal file
@ -0,0 +1,70 @@
|
|||||||
|
import React, { useState } from 'react';
|
||||||
|
import './WaterControls.css'; // Стили для кнопок
|
||||||
|
|
||||||
|
// Интерфейс для пропсов
|
||||||
|
interface WaterControlsProps {
|
||||||
|
// Функция, которая будет вызываться при добавлении воды
|
||||||
|
// Она принимает количество миллилитров как аргумент
|
||||||
|
onAddWater: (amount: number) => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
const WaterControls: React.FC<WaterControlsProps> = ({ onAddWater }) => {
|
||||||
|
// Состояние для хранения значения в поле кастомного ввода
|
||||||
|
const [customAmount, setCustomAmount] = useState<string>('');
|
||||||
|
|
||||||
|
// Обработчик клика по кнопкам с предопределенным количеством
|
||||||
|
const handlePresetClick = (amount: number) => {
|
||||||
|
onAddWater(amount);
|
||||||
|
};
|
||||||
|
|
||||||
|
// Обработчик изменения в поле кастомного ввода
|
||||||
|
const handleCustomChange = (event: React.ChangeEvent<HTMLInputElement>) => {
|
||||||
|
// Позволяем вводить только цифры
|
||||||
|
const value = event.target.value.replace(/[^0-9]/g, '');
|
||||||
|
setCustomAmount(value);
|
||||||
|
};
|
||||||
|
|
||||||
|
// Обработчик клика по кнопке "Добавить" для кастомного значения
|
||||||
|
const handleCustomSubmit = () => {
|
||||||
|
const amount = parseInt(customAmount, 10);
|
||||||
|
if (!isNaN(amount) && amount > 0) {
|
||||||
|
onAddWater(amount);
|
||||||
|
setCustomAmount(''); // Очищаем поле после добавления
|
||||||
|
} else {
|
||||||
|
console.warn("Пожалуйста, введите корректное число миллилитров");
|
||||||
|
// Можно добавить уведомление для пользователя здесь
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Обработчик нажатия Enter в поле ввода
|
||||||
|
const handleKeyPress = (event: React.KeyboardEvent<HTMLInputElement>) => {
|
||||||
|
if (event.key === 'Enter') {
|
||||||
|
handleCustomSubmit();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="water-controls">
|
||||||
|
<p className="controls-title">Сколько воды выпили?</p>
|
||||||
|
<div className="preset-buttons">
|
||||||
|
<button onClick={() => handlePresetClick(150)} title="Маленький стакан">💧 150 мл</button>
|
||||||
|
<button onClick={() => handlePresetClick(250)} title="Стандартный стакан">💧 250 мл</button>
|
||||||
|
<button onClick={() => handlePresetClick(500)} title="Бутылка">💧 500 мл</button>
|
||||||
|
<button onClick={() => handlePresetClick(750)} title="Большая бутылка">💧 750 мл</button>
|
||||||
|
</div>
|
||||||
|
<div className="custom-input">
|
||||||
|
<input
|
||||||
|
type="number" // Используем type="number", но также фильтруем ввод выше
|
||||||
|
value={customAmount}
|
||||||
|
onChange={handleCustomChange}
|
||||||
|
onKeyPress={handleKeyPress} // Добавляем обработчик Enter
|
||||||
|
placeholder="Или введите свое (мл)"
|
||||||
|
min="1" // Минимальное значение для валидации браузера
|
||||||
|
/>
|
||||||
|
<button onClick={handleCustomSubmit}>Добавить</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export default WaterControls;
|
||||||
68
paws.client/src/index.css
Normal file
68
paws.client/src/index.css
Normal file
@ -0,0 +1,68 @@
|
|||||||
|
:root {
|
||||||
|
font-family: system-ui, Avenir, Helvetica, Arial, sans-serif;
|
||||||
|
line-height: 1.5;
|
||||||
|
font-weight: 400;
|
||||||
|
|
||||||
|
color-scheme: light dark;
|
||||||
|
color: rgba(255, 255, 255, 0.87);
|
||||||
|
background-color: #242424;
|
||||||
|
|
||||||
|
font-synthesis: none;
|
||||||
|
text-rendering: optimizeLegibility;
|
||||||
|
-webkit-font-smoothing: antialiased;
|
||||||
|
-moz-osx-font-smoothing: grayscale;
|
||||||
|
}
|
||||||
|
|
||||||
|
a {
|
||||||
|
font-weight: 500;
|
||||||
|
color: #646cff;
|
||||||
|
text-decoration: inherit;
|
||||||
|
}
|
||||||
|
a:hover {
|
||||||
|
color: #535bf2;
|
||||||
|
}
|
||||||
|
|
||||||
|
body {
|
||||||
|
margin: 0;
|
||||||
|
display: flex;
|
||||||
|
place-items: center;
|
||||||
|
min-width: 320px;
|
||||||
|
min-height: 100vh;
|
||||||
|
}
|
||||||
|
|
||||||
|
h1 {
|
||||||
|
font-size: 3.2em;
|
||||||
|
line-height: 1.1;
|
||||||
|
}
|
||||||
|
|
||||||
|
button {
|
||||||
|
border-radius: 8px;
|
||||||
|
border: 1px solid transparent;
|
||||||
|
padding: 0.6em 1.2em;
|
||||||
|
font-size: 1em;
|
||||||
|
font-weight: 500;
|
||||||
|
font-family: inherit;
|
||||||
|
background-color: #1a1a1a;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: border-color 0.25s;
|
||||||
|
}
|
||||||
|
button:hover {
|
||||||
|
border-color: #646cff;
|
||||||
|
}
|
||||||
|
button:focus,
|
||||||
|
button:focus-visible {
|
||||||
|
outline: 4px auto -webkit-focus-ring-color;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (prefers-color-scheme: light) {
|
||||||
|
:root {
|
||||||
|
color: #213547;
|
||||||
|
background-color: #ffffff;
|
||||||
|
}
|
||||||
|
a:hover {
|
||||||
|
color: #747bff;
|
||||||
|
}
|
||||||
|
button {
|
||||||
|
background-color: #f9f9f9;
|
||||||
|
}
|
||||||
|
}
|
||||||
10
paws.client/src/main.tsx
Normal file
10
paws.client/src/main.tsx
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
import { StrictMode } from 'react'
|
||||||
|
import { createRoot } from 'react-dom/client'
|
||||||
|
import './index.css'
|
||||||
|
import App from './App.tsx'
|
||||||
|
|
||||||
|
createRoot(document.getElementById('root')!).render(
|
||||||
|
<StrictMode>
|
||||||
|
<App />
|
||||||
|
</StrictMode>,
|
||||||
|
)
|
||||||
1
paws.client/src/vite-env.d.ts
vendored
Normal file
1
paws.client/src/vite-env.d.ts
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
/// <reference types="vite/client" />
|
||||||
26
paws.client/tsconfig.app.json
Normal file
26
paws.client/tsconfig.app.json
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
|
||||||
|
"target": "ES2020",
|
||||||
|
"useDefineForClassFields": true,
|
||||||
|
"lib": ["ES2020", "DOM", "DOM.Iterable"],
|
||||||
|
"module": "ESNext",
|
||||||
|
"skipLibCheck": true,
|
||||||
|
|
||||||
|
/* Bundler mode */
|
||||||
|
"moduleResolution": "bundler",
|
||||||
|
"allowImportingTsExtensions": true,
|
||||||
|
"isolatedModules": true,
|
||||||
|
"moduleDetection": "force",
|
||||||
|
"noEmit": true,
|
||||||
|
"jsx": "react-jsx",
|
||||||
|
|
||||||
|
/* Linting */
|
||||||
|
"strict": true,
|
||||||
|
"noUnusedLocals": true,
|
||||||
|
"noUnusedParameters": true,
|
||||||
|
"noFallthroughCasesInSwitch": true,
|
||||||
|
"noUncheckedSideEffectImports": true
|
||||||
|
},
|
||||||
|
"include": ["src"]
|
||||||
|
}
|
||||||
7
paws.client/tsconfig.json
Normal file
7
paws.client/tsconfig.json
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"files": [],
|
||||||
|
"references": [
|
||||||
|
{ "path": "./tsconfig.app.json" },
|
||||||
|
{ "path": "./tsconfig.node.json" }
|
||||||
|
]
|
||||||
|
}
|
||||||
24
paws.client/tsconfig.node.json
Normal file
24
paws.client/tsconfig.node.json
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
|
||||||
|
"target": "ES2022",
|
||||||
|
"lib": ["ES2023"],
|
||||||
|
"module": "ESNext",
|
||||||
|
"skipLibCheck": true,
|
||||||
|
|
||||||
|
/* Bundler mode */
|
||||||
|
"moduleResolution": "bundler",
|
||||||
|
"allowImportingTsExtensions": true,
|
||||||
|
"isolatedModules": true,
|
||||||
|
"moduleDetection": "force",
|
||||||
|
"noEmit": true,
|
||||||
|
|
||||||
|
/* Linting */
|
||||||
|
"strict": true,
|
||||||
|
"noUnusedLocals": true,
|
||||||
|
"noUnusedParameters": true,
|
||||||
|
"noFallthroughCasesInSwitch": true,
|
||||||
|
"noUncheckedSideEffectImports": true
|
||||||
|
},
|
||||||
|
"include": ["vite.config.ts"]
|
||||||
|
}
|
||||||
61
paws.client/vite.config.ts
Normal file
61
paws.client/vite.config.ts
Normal file
@ -0,0 +1,61 @@
|
|||||||
|
import { fileURLToPath, URL } from 'node:url';
|
||||||
|
|
||||||
|
import { defineConfig } from 'vite';
|
||||||
|
import plugin from '@vitejs/plugin-react';
|
||||||
|
import fs from 'fs';
|
||||||
|
import path from 'path';
|
||||||
|
import child_process from 'child_process';
|
||||||
|
import { env } from 'process';
|
||||||
|
|
||||||
|
const baseFolder =
|
||||||
|
env.APPDATA !== undefined && env.APPDATA !== ''
|
||||||
|
? `${env.APPDATA}/ASP.NET/https`
|
||||||
|
: `${env.HOME}/.aspnet/https`;
|
||||||
|
|
||||||
|
const certificateName = "paws.client";
|
||||||
|
const certFilePath = path.join(baseFolder, `${certificateName}.pem`);
|
||||||
|
const keyFilePath = path.join(baseFolder, `${certificateName}.key`);
|
||||||
|
|
||||||
|
if (!fs.existsSync(baseFolder)) {
|
||||||
|
fs.mkdirSync(baseFolder, { recursive: true });
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!fs.existsSync(certFilePath) || !fs.existsSync(keyFilePath)) {
|
||||||
|
if (0 !== child_process.spawnSync('dotnet', [
|
||||||
|
'dev-certs',
|
||||||
|
'https',
|
||||||
|
'--export-path',
|
||||||
|
certFilePath,
|
||||||
|
'--format',
|
||||||
|
'Pem',
|
||||||
|
'--no-password',
|
||||||
|
], { stdio: 'inherit', }).status) {
|
||||||
|
throw new Error("Could not create certificate.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const target = env.ASPNETCORE_HTTPS_PORT ? `https://localhost:${env.ASPNETCORE_HTTPS_PORT}` :
|
||||||
|
env.ASPNETCORE_URLS ? env.ASPNETCORE_URLS.split(';')[0] : 'https://localhost:7252';
|
||||||
|
|
||||||
|
// https://vitejs.dev/config/
|
||||||
|
export default defineConfig({
|
||||||
|
plugins: [plugin()],
|
||||||
|
resolve: {
|
||||||
|
alias: {
|
||||||
|
'@': fileURLToPath(new URL('./src', import.meta.url))
|
||||||
|
}
|
||||||
|
},
|
||||||
|
server: {
|
||||||
|
proxy: {
|
||||||
|
'^/weatherforecast': {
|
||||||
|
target,
|
||||||
|
secure: false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
port: parseInt(env.DEV_SERVER_PORT || '62273'),
|
||||||
|
https: {
|
||||||
|
key: fs.readFileSync(keyFilePath),
|
||||||
|
cert: fs.readFileSync(certFilePath),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
33
paws.sln
Normal file
33
paws.sln
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
|
||||||
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
|
# Visual Studio Version 17
|
||||||
|
VisualStudioVersion = 17.13.35828.75 d17.13
|
||||||
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
|
Project("{54A90642-561A-4BB1-A94E-469ADEE60C69}") = "paws.client", "paws.client\paws.client.esproj", "{92CF8BF1-56B4-B144-C2A6-11F41F6B2D5A}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "paws.Server", "paws.Server\paws.Server.csproj", "{2FE32792-7CBE-417D-9AB8-E717E2255709}"
|
||||||
|
EndProject
|
||||||
|
Global
|
||||||
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
|
Debug|Any CPU = Debug|Any CPU
|
||||||
|
Release|Any CPU = Release|Any CPU
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
|
{92CF8BF1-56B4-B144-C2A6-11F41F6B2D5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{92CF8BF1-56B4-B144-C2A6-11F41F6B2D5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{92CF8BF1-56B4-B144-C2A6-11F41F6B2D5A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
|
||||||
|
{92CF8BF1-56B4-B144-C2A6-11F41F6B2D5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{92CF8BF1-56B4-B144-C2A6-11F41F6B2D5A}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{92CF8BF1-56B4-B144-C2A6-11F41F6B2D5A}.Release|Any CPU.Deploy.0 = Release|Any CPU
|
||||||
|
{2FE32792-7CBE-417D-9AB8-E717E2255709}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{2FE32792-7CBE-417D-9AB8-E717E2255709}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{2FE32792-7CBE-417D-9AB8-E717E2255709}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{2FE32792-7CBE-417D-9AB8-E717E2255709}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
|
HideSolutionNode = FALSE
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||||
|
SolutionGuid = {9F690FF6-4C69-47E2-8E88-B30375FBBF70}
|
||||||
|
EndGlobalSection
|
||||||
|
EndGlobal
|
||||||
Loading…
x
Reference in New Issue
Block a user