diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..3dbbcf3 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,25 @@ +**/.classpath +**/.dockerignore +**/.env +**/.git +**/.gitignore +**/.project +**/.settings +**/.toolstarget +**/.vs +**/.vscode +**/*.*proj.user +**/*.dbmdl +**/*.jfm +**/bin +**/charts +**/docker-compose* +**/compose* +**/Dockerfile* +**/node_modules +**/npm-debug.log +**/obj +**/secrets.dev.yaml +**/values.dev.yaml +LICENSE +README.md diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..b3b2957 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,4 @@ +FROM docker/whalesay:latest +LABEL Name=cucumber Version=0.0.1 +RUN apt-get -y update && apt-get install -y fortunes +CMD ["sh", "-c", "/usr/games/fortune -a | cowsay"] diff --git a/cucumber-frontend/package-lock.json b/cucumber-frontend/package-lock.json index 8afc532..5e96759 100644 --- a/cucumber-frontend/package-lock.json +++ b/cucumber-frontend/package-lock.json @@ -18,7 +18,9 @@ "antd": "^5.21.6", "axios": "^1.7.7", "react": "^18.3.1", + "react-avatar": "^5.0.3", "react-dom": "^18.2.0", + "react-dropzone": "^14.3.5", "react-router-dom": "^6.27.0", "react-scripts": "^5.0.1", "typescript": "^4.9.5", @@ -5250,6 +5252,14 @@ "node": ">= 4.0.0" } }, + "node_modules/attr-accept": { + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/attr-accept/-/attr-accept-2.2.5.tgz", + "integrity": "sha512-0bDNnY/u6pPwHDMoF0FieU354oBi0a8rD9FcsLwzcGWbc8KS8KPIi7y+s13OlVY+gMWc/9xEMUgNE6Qm8ZllYQ==", + "engines": { + "node": ">=4" + } + }, "node_modules/autoprefixer": { "version": "10.4.20", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.20.tgz", @@ -5917,6 +5927,14 @@ "node": ">=10" } }, + "node_modules/charenc": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz", + "integrity": "sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==", + "engines": { + "node": "*" + } + }, "node_modules/check-types": { "version": "11.2.3", "resolved": "https://registry.npmjs.org/check-types/-/check-types-11.2.3.tgz", @@ -6394,6 +6412,14 @@ "node": ">= 8" } }, + "node_modules/crypt": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz", + "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==", + "engines": { + "node": "*" + } + }, "node_modules/crypto-random-string": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", @@ -8508,6 +8534,17 @@ "url": "https://opencollective.com/webpack" } }, + "node_modules/file-selector": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/file-selector/-/file-selector-2.1.2.tgz", + "integrity": "sha512-QgXo+mXTe8ljeqUFaX3QVHc5osSItJ/Km+xpocx0aSqWGMSCf6qYs/VnzZgS864Pjn5iceMRFigeAV7AfTlaig==", + "dependencies": { + "tslib": "^2.7.0" + }, + "engines": { + "node": ">= 12" + } + }, "node_modules/filelist": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", @@ -9788,6 +9825,11 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" + }, "node_modules/is-callable": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", @@ -10041,6 +10083,11 @@ "node": ">=0.10.0" } }, + "node_modules/is-retina": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-retina/-/is-retina-1.0.3.tgz", + "integrity": "sha512-/tCmbIETZwCd8uHWO+GvbRa7jxwHFHdfetHfiwoP0aN9UDf3prUJMtKn7iBFYipYhqY1bSTjur8hC/Dakt8eyw==" + }, "node_modules/is-root": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-root/-/is-root-2.1.0.tgz", @@ -11712,6 +11759,16 @@ "tmpl": "1.0.5" } }, + "node_modules/md5": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz", + "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==", + "dependencies": { + "charenc": "0.0.2", + "crypt": "0.0.2", + "is-buffer": "~1.1.6" + } + }, "node_modules/mdn-data": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz", @@ -14813,6 +14870,21 @@ "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==", "license": "MIT" }, + "node_modules/react-avatar": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/react-avatar/-/react-avatar-5.0.3.tgz", + "integrity": "sha512-DNc+qkWH9QehSEZqHBhqpXWsPY+rU9W7kD68QFHfu8Atfsvx/3ML0DzAePgTUd96nCXQQ3KZMcC3LKYT8FiBIg==", + "dependencies": { + "is-retina": "^1.0.3", + "md5": "^2.0.0" + }, + "peerDependencies": { + "@babel/runtime": ">=7", + "core-js-pure": ">=3", + "prop-types": "^15.0.0 || ^16.0.0", + "react": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0" + } + }, "node_modules/react-dev-utils": { "version": "12.0.1", "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-12.0.1.tgz", @@ -14931,6 +15003,22 @@ "react": "^18.3.1" } }, + "node_modules/react-dropzone": { + "version": "14.3.5", + "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-14.3.5.tgz", + "integrity": "sha512-9nDUaEEpqZLOz5v5SUcFA0CjM4vq8YbqO0WRls+EYT7+DvxUdzDPKNCPLqGfj3YL9MsniCLCD4RFA6M95V6KMQ==", + "dependencies": { + "attr-accept": "^2.2.4", + "file-selector": "^2.1.0", + "prop-types": "^15.8.1" + }, + "engines": { + "node": ">= 10.13" + }, + "peerDependencies": { + "react": ">= 16.8 || 18.0.0" + } + }, "node_modules/react-error-overlay": { "version": "6.0.11", "resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz", diff --git a/cucumber-frontend/package.json b/cucumber-frontend/package.json index 3f98a71..491a361 100644 --- a/cucumber-frontend/package.json +++ b/cucumber-frontend/package.json @@ -13,7 +13,9 @@ "antd": "^5.21.6", "axios": "^1.7.7", "react": "^18.3.1", + "react-avatar": "^5.0.3", "react-dom": "^18.2.0", + "react-dropzone": "^14.3.5", "react-router-dom": "^6.27.0", "react-scripts": "^5.0.1", "typescript": "^4.9.5", diff --git a/cucumber-frontend/src/API/api.ts b/cucumber-frontend/src/API/api.ts index 0b5d17d..6ea811f 100644 --- a/cucumber-frontend/src/API/api.ts +++ b/cucumber-frontend/src/API/api.ts @@ -4,7 +4,7 @@ import IFarm from '../models/IFarm'; import LoginRequest from '../Requests/LoginRequest'; import IRegisterRequest from '../Requests/RegisterRequest'; -const API_BASE_URL = 'https://localhost:7113/api'; +const API_BASE_URL = 'https://localhost:5124/api'; const getHeaders = (): { [key: string]: string } => { return { diff --git a/cucumber-frontend/src/App.tsx b/cucumber-frontend/src/App.tsx index f22ff4f..3f11fb8 100644 --- a/cucumber-frontend/src/App.tsx +++ b/cucumber-frontend/src/App.tsx @@ -6,17 +6,19 @@ import {RegisterPage} from './pages/Register'; import {AppLayout} from './components/Layout'; import { ProfilePage } from './pages/Profile'; import { GreenHouseListPage } from './pages/GreenHouseListPage'; +import { ReportPage } from './pages/ReportPage'; function App() { return (
}> - } /> + } /> } /> } /> } /> } /> + } /> diff --git a/cucumber-frontend/src/components/Header.tsx b/cucumber-frontend/src/components/Header.tsx index ae0200d..47731f4 100644 --- a/cucumber-frontend/src/components/Header.tsx +++ b/cucumber-frontend/src/components/Header.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { Link } from 'react-router-dom'; import Title from 'antd/es/typography/Title'; -import { LoginOutlined, ProfileOutlined } from '@ant-design/icons'; +import { HomeOutlined, LoginOutlined, ProfileOutlined } from '@ant-design/icons'; export function Header () { return ( @@ -15,7 +15,10 @@ export function Header () {
  • - + +
    • +
  • +
    • diff --git a/cucumber-frontend/src/pages/GreenHouseListPage.tsx b/cucumber-frontend/src/pages/GreenHouseListPage.tsx index e68ea81..92cbe00 100644 --- a/cucumber-frontend/src/pages/GreenHouseListPage.tsx +++ b/cucumber-frontend/src/pages/GreenHouseListPage.tsx @@ -56,8 +56,13 @@ export function GreenHouseListPage() { }, { title: 'Температура', - dataIndex: 'recommendedTemperature', - key: 'recommendedTemperature', + dataIndex: 'Temperature', + key: 'Temperature', + }, + { + title: 'Процент влажности', + dataIndex: 'Humidity', + key: 'Humidity', }, { title: 'Режим полива', @@ -71,11 +76,25 @@ export function GreenHouseListPage() { key: 'heatingMode', render: (text: string) => text === 'Manual' ? 'Вручную' : 'Автоматически', }, + { + title: 'Статус вентиля', + dataIndex: 'ventilationStatus', + key: 'ventilationStatus', + render: (text: string) => text === 'Manual' ? 'Вручную' : 'Автоматически', + }, + { + title: 'Статус нагревателя', + dataIndex: 'heatingStatus', + key: 'heatingStatus', + render: (text: string) => text === 'Manual' ? 'Вручную' : 'Автоматически', + }, { title: 'Действия', key: 'action', render: (_: any, record: IGreenhouse) => ( + + @@ -106,7 +125,10 @@ export function GreenHouseListPage() { - + + + + @@ -121,6 +143,18 @@ export function GreenHouseListPage() { Автоматически + + + + + +
    diff --git a/cucumber-frontend/src/pages/Profile.tsx b/cucumber-frontend/src/pages/Profile.tsx index 3435a2e..22fb6da 100644 --- a/cucumber-frontend/src/pages/Profile.tsx +++ b/cucumber-frontend/src/pages/Profile.tsx @@ -1,15 +1,97 @@ -import { Navigate } from "react-router-dom"; +import { Link, Navigate } from "react-router-dom"; +import { Form, Avatar, Button, Input, Typography } from "antd"; +import { useId, useState } from "react"; +import React from "react"; + + export function ProfilePage () { const token = localStorage.getItem('token'); + const [hidden, setHidden] = useState(true); + const [name, setName] = useState('Пользователь'); + const [email, setEmail] = useState('user@gmail.com'); - if (!token) { - return ; + + const Title = () => Ваш профиль; + + const StyledText = ({ children }: { children: React.ReactNode }) => {children}; + const StyledValue = ({ children }: { children: React.ReactNode }) => {children}; + + const User = { + id: 1, + name: name, + email: "user@gmail.com", + password: "12345", + } + + + function onFinish(name: string, email: string) { + setName(name); + setEmail(email); + } + + function onLogout() { + localStorage.removeItem('token'); + window.location.href = '/login'; } return ( -
    -

    Profile

    +
    + + <div className="container mx-auto flex" style={{ maxWidth: '40%', marginTop: '100px', flexDirection: 'column'}}> + + <div className="container mx-auto flex" style={{ flexDirection: 'column', justifyContent: 'left', alignItems: 'flex-start' }}> + + <span style={{ marginLeft: '20px' }}> + <StyledText>Почта:</StyledText> + <StyledValue> {User.email}</StyledValue> + </span> + <span style={{ marginLeft: '20px' }}> + <StyledText>Имя пользователя:</StyledText> + <StyledValue> {User.name}</StyledValue> + </span> + <span style={{ marginLeft: '20px' }}> + <StyledText>Количество теплиц:</StyledText> + <StyledValue> 2</StyledValue> + <Link style={{ marginLeft: '10px', fontSize: '24px', textDecorationLine: 'underline', color: 'blue'}} to="/greenhouses">[Перейти]</Link> + </span> + + + </div> + + <div className="container mx-auto flex" style={{ flexDirection: 'row', justifyContent: 'center', marginTop: '20px'}}> + <Button style={{ marginRight: '10px'}} onClick={() => setHidden(!hidden)}>{hidden ? 'Редактировать' : 'Закончить редактирование'} </Button> + <Button>Выйти</Button> + </div> + + <Form style={{ marginTop: '20px', width: '70%' }} layout="vertical" hidden={hidden}> + + <Form.Item style={{ width: '100%', justifySelf: 'end', textAlign: 'right' }} name="name" rules={[{ required: false }]}> + Новое имя пользователя: <Input style={{ width: '200px', marginLeft: '10px' }} placeholder={User.name}></Input> + </Form.Item> + + <Form.Item style={{ width: '100%', justifySelf: 'end', textAlign: 'right' }} name="email" rules={[{ required: false }]}> + Новая почта: <Input style={{ width: '200px', marginLeft: '10px' }} placeholder={User.email}></Input> + </Form.Item> + + <div style={{ textAlign: 'right' }}> + <Button htmlType="submit" onClick={() => onFinish(name, email)}>Сохранить изменения</Button> + </div> + + </Form> </div> + + + <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '20px'}}> + <Button style={{ width: '160px', backgroundColor: 'red', color: 'white'}} onClick={onLogout}>Выйти из аккаунта</Button> + </div> + </div> + ) } + + function async<T>(file: any, File: { new(fileBits: BlobPart[], fileName: string, options?: FilePropertyBag): File; prototype: File; }, url: any, string: any, arg4: any) { + throw new Error("Function not implemented."); + } + + \ No newline at end of file diff --git a/cucumber-frontend/src/pages/ReportPage.tsx b/cucumber-frontend/src/pages/ReportPage.tsx new file mode 100644 index 0000000..eb3a915 --- /dev/null +++ b/cucumber-frontend/src/pages/ReportPage.tsx @@ -0,0 +1,25 @@ +import Title from "antd/es/typography/Title"; + +export function ReportPage() { + return ( + <div style={{ display: 'flex', flexDirection: 'column', marginTop: '200px', marginLeft: '550px' }}> + <Title style={{ marginBottom: '20px', fontSize: '42px', fontWeight: 'bold' }}>Отчеты по теплицам +
    +
    +

    Температура

    + temperature-report +
    +
    +

    Влажность

    + humidity-report +
    +
    +

    Теплицы

    + greenhouses-report +
    +
    +
    + ); +}; +export default ReportPage; +