From c85cabac4537d101eb48b3f8d18b78bea71ce6f0 Mon Sep 17 00:00:00 2001
From: Mik <miksoft.tm@gmail.com>
Date: Mon, 17 Jan 2022 09:49:17 +0500
Subject: [PATCH 1/6] Change API host path for photos and skymap, add global
 ENV

---
 frontend/src/components/objectTable/renderTableRow.tsx | 2 +-
 frontend/src/components/photoGrid/index.tsx            | 4 ++--
 frontend/src/components/photoItemHeader/index.tsx      | 4 ++--
 frontend/src/components/photoTable/renderTableRow.tsx  | 2 +-
 frontend/src/components/skyMap/config.ts               | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/objectTable/renderTableRow.tsx b/frontend/src/components/objectTable/renderTableRow.tsx
index 8f74b2f..0649e0e 100644
--- a/frontend/src/components/objectTable/renderTableRow.tsx
+++ b/frontend/src/components/objectTable/renderTableRow.tsx
@@ -27,7 +27,7 @@ const RenderTableRow: React.FC<TTableRowProps> = (props) => {
                     <Image
                         className={'photo ' + (isOutdated(photoItem.date, item.date) ? 'outdated' : 'actual')}
                         size='tiny'
-                        src={`https://api.miksoft.pro/public/photo/${photoItem.file}_thumb.${photoItem.ext}`}
+                        src={`${process.env.REACT_APP_API_HOST}public/photo/${photoItem.file}_thumb.${photoItem.ext}`}
                     />
                 </Link>
             }
diff --git a/frontend/src/components/photoGrid/index.tsx b/frontend/src/components/photoGrid/index.tsx
index 64b58fd..2d0c4d9 100644
--- a/frontend/src/components/photoGrid/index.tsx
+++ b/frontend/src/components/photoGrid/index.tsx
@@ -41,7 +41,7 @@ const PhotoGrid: React.FC<TPhotoGridProps> = (props) => {
                         {photo.title ?
                             <Reveal animated='small fade'>
                                 <Reveal.Content visible>
-                                    <Image src={`https://api.miksoft.pro/public/photo/${photo.file}_thumb.${photo.ext}`} className='photo' />
+                                    <Image src={`${process.env.REACT_APP_API_HOST}public/photo/${photo.file}_thumb.${photo.ext}`} className='photo' />
                                 </Reveal.Content>
                                 <Reveal.Content hidden>
                                     <div className='info'>
@@ -51,7 +51,7 @@ const PhotoGrid: React.FC<TPhotoGridProps> = (props) => {
                                 </Reveal.Content>
                             </Reveal>
                         :
-                            <Image src={`https://api.miksoft.pro/public/photo/${photo.file}_thumb.${photo.ext}`} className='photo' />
+                            <Image src={`${process.env.REACT_APP_API_HOST}public/photo/${photo.file}_thumb.${photo.ext}`} className='photo' />
                         }
                     </Link>
                 )
diff --git a/frontend/src/components/photoItemHeader/index.tsx b/frontend/src/components/photoItemHeader/index.tsx
index 2de4a08..dfe87ba 100644
--- a/frontend/src/components/photoItemHeader/index.tsx
+++ b/frontend/src/components/photoItemHeader/index.tsx
@@ -41,7 +41,7 @@ const PhotoItemHeader: React.FC<TPhotoItemHeaderProps> = (props) => {
                 <Grid.Column computer={9} tablet={8} mobile={16}>
                     <Image
                         className='photo'
-                        src={(photo ? `https://api.miksoft.pro/public/photo/${photo.file}_thumb.${photo.ext}` : defaultPhoto)}
+                        src={(photo ? `${process.env.REACT_APP_API_HOST}public/photo/${photo.file}_thumb.${photo.ext}` : defaultPhoto)}
                         onClick={() => {
                             if (photo) {
                                 setPhotoLightbox(`${photo.file}.${photo.ext}`)
@@ -88,7 +88,7 @@ const PhotoItemHeader: React.FC<TPhotoItemHeaderProps> = (props) => {
             </Grid>
             {showLightbox &&
                 <Lightbox
-                    mainSrc={`https://api.miksoft.pro/public/photo/${photoLightbox}`}
+                    mainSrc={`${process.env.REACT_APP_API_HOST}public/photo/${photoLightbox}`}
                     onCloseRequest={() => setShowLightbox(false)}
                 />
             }
diff --git a/frontend/src/components/photoTable/renderTableRow.tsx b/frontend/src/components/photoTable/renderTableRow.tsx
index a4d2723..7e1e6b2 100644
--- a/frontend/src/components/photoTable/renderTableRow.tsx
+++ b/frontend/src/components/photoTable/renderTableRow.tsx
@@ -21,7 +21,7 @@ const RenderTableRow: React.FC<TTableRowProps> = (props) => {
                     <Image
                         className='photo'
                         size='tiny'
-                        src={`https://api.miksoft.pro/public/photo/${photo.file}_thumb.${photo.ext}`}
+                        src={`${process.env.REACT_APP_API_HOST}public/photo/${photo.file}_thumb.${photo.ext}`}
                     />
                 </Link>
             </Table.Cell>
diff --git a/frontend/src/components/skyMap/config.ts b/frontend/src/components/skyMap/config.ts
index 364e516..41e74e4 100644
--- a/frontend/src/components/skyMap/config.ts
+++ b/frontend/src/components/skyMap/config.ts
@@ -13,7 +13,7 @@ const config = {
     // overrides center
     follow: [10.68,41.267],   // on which coordinates to center the map, default: zenith, if location enabled,
     // otherwise center
-    datapath: "https://api.miksoft.pro/skymap/",
+    datapath: `${process.env.REACT_APP_API_HOST}public/skymap`,
     zoomlevel: 5,    // initial zoom level 0...zoomextend; 0|null = default, 1 = 100%, 0 < x <= zoomextend
     zoomextend: 10,     // maximum zoom level
     adaptable: true,    // Sizes are increased with higher zoom-levels

From e1f38390d7b2f7bc1bdfab884f7d7cd3deea5c8b Mon Sep 17 00:00:00 2001
From: Mik <miksoft.tm@gmail.com>
Date: Wed, 9 Feb 2022 10:59:42 +0500
Subject: [PATCH 2/6] issue #37 - Add author parametr for astro photography
 page

---
 backend/app/Entities/PhotoListItem.php            | 8 ++++++--
 backend/app/Libraries/Photos.php                  | 7 +++++++
 backend/app/Models/Photos.php                     | 9 +++++++--
 frontend/package.json                             | 2 +-
 frontend/src/app/types.ts                         | 6 ++++++
 frontend/src/components/photoItemHeader/index.tsx | 7 ++++++-
 6 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/backend/app/Entities/PhotoListItem.php b/backend/app/Entities/PhotoListItem.php
index f1d5e06..a902c38 100644
--- a/backend/app/Entities/PhotoListItem.php
+++ b/backend/app/Entities/PhotoListItem.php
@@ -6,8 +6,9 @@ interface IPhotoListItem
     const date   = '';
     const file   = '';
     const ext    = '';
+    const author = [];
 
-    function __construct(string $object, string $date, string $file, string $ext);
+    function __construct(string $object, string $date, string $file, string $ext, $author);
 }
 
 class PhotoListItem implements IPhotoListItem {
@@ -15,18 +16,21 @@ class PhotoListItem implements IPhotoListItem {
     public string $date   = '';
     public string $file   = '';
     public string $ext    = '';
+    public ?array $author = [];
 
     /**
      * @param string $object
      * @param string $date
      * @param string $file
      * @param string $ext
+     * @param array | null $author
      */
-    function __construct(string $object, string $date, string $file, string $ext)
+    function __construct(string $object, string $date, string $file, string $ext, $author)
     {
         $this->object = $object;
         $this->date   = $date;
         $this->file   = $file;
         $this->ext    = $ext;
+        $this->author = $author;
     }
 }
\ No newline at end of file
diff --git a/backend/app/Libraries/Photos.php b/backend/app/Libraries/Photos.php
index f36e9ff..3ae4363 100644
--- a/backend/app/Libraries/Photos.php
+++ b/backend/app/Libraries/Photos.php
@@ -67,11 +67,18 @@ protected function _make_list($data): array
 
         foreach ($data as $item)
         {
+            $author = isset($item->author_name) ?
+                [
+                    'name' => $item->author_name,
+                    'link' => $item->author_link,
+                ] : null;
+
             $photos[] = new PhotoListItem(
                 $item->photo_obj,
                 $item->photo_date,
                 $item->photo_file,
                 $item->photo_file_ext,
+                $author,
             );
         }
 
diff --git a/backend/app/Models/Photos.php b/backend/app/Models/Photos.php
index 45787bb..2a6adb6 100644
--- a/backend/app/Models/Photos.php
+++ b/backend/app/Models/Photos.php
@@ -6,13 +6,15 @@
 
 class Photos extends Model
 {
-    protected $table = '';
+    protected $table  = '';
+    protected $author = '';
 
     protected string $key_id     = 'photo_id';
     protected string $key_object = 'photo_obj';
     protected string $key_date   = 'photo_date';
     protected string $key_file   = 'photo_file';
     protected string $key_ext    = 'photo_file_ext';
+    protected string $key_author = 'photo_author';
 
     protected $db;
 
@@ -20,7 +22,8 @@ function __construct(ConnectionInterface &$db = null, ValidationInterface $valid
     {
         parent::__construct($db, $validation);
 
-        $this->table = getenv('database.table.astro_photos');
+        $this->table  = getenv('database.table.astro_photos');
+        $this->author = getenv('database.table.astro_authors');
     }
 
     /**
@@ -31,6 +34,7 @@ function get_list()
     {
         return $this->db
             ->table($this->table)
+            ->join($this->author, "$this->author.author_id = $this->table.$this->key_author", 'left')
             ->orderBy($this->key_date, 'DESC')
             ->get()
             ->getResult();
@@ -45,6 +49,7 @@ function get_by_object(string $name)
     {
         return $this->db
             ->table($this->table)
+            ->join($this->author, "$this->author.author_id = $this->table.$this->key_author", 'left')
             ->orderBy($this->key_date, 'DESC')
             ->getWhere([$this->key_object => $name])
             ->getResult();
diff --git a/frontend/package.json b/frontend/package.json
index 2b32c2b..7b70df6 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "observatory",
-  "update": "14.01.2022",
+  "update": "09.02.2022",
   "version": "2.0.1",
   "private": true,
   "dependencies": {
diff --git a/frontend/src/app/types.ts b/frontend/src/app/types.ts
index 1fe1fbc..44b93fd 100644
--- a/frontend/src/app/types.ts
+++ b/frontend/src/app/types.ts
@@ -117,9 +117,15 @@ export type TPhoto = {
     date: string
     file: string
     ext: string
+    author: TPhotoAuthor | null
     parameters?: TObject
 }
 
+export type TPhotoAuthor = {
+    name: string
+    link: string
+}
+
 export type TCatalog = {
     name: string
     title: string
diff --git a/frontend/src/components/photoItemHeader/index.tsx b/frontend/src/components/photoItemHeader/index.tsx
index dfe87ba..865dfb7 100644
--- a/frontend/src/components/photoItemHeader/index.tsx
+++ b/frontend/src/components/photoItemHeader/index.tsx
@@ -2,7 +2,7 @@ import React, { useState } from 'react'
 import moment from 'moment'
 import { Link } from 'react-router-dom'
 import { Grid, Image, Dimmer, Loader } from 'semantic-ui-react'
-import { TPhoto, TCatalog } from '../../app/types'
+import { TPhoto, TPhotoAuthor, TCatalog } from '../../app/types'
 import { getTimeFromSec } from '../../functions/helpers'
 
 import defaultPhoto from './images/default-photo.png'
@@ -18,6 +18,10 @@ type TPhotoItemHeaderProps = {
     catalog: TCatalog | null | undefined
 }
 
+const Author = (data: TPhotoAuthor) =>
+    data.link ?
+        <a href={data.link} title={data.name} target='_blank' rel='noreferrer'>{data.name}</a> : data.name
+
 const PhotoItemHeader: React.FC<TPhotoItemHeaderProps> = (props) => {
     const { loader, photo, catalog } = props
     const [ showLightbox , setShowLightbox ] = useState<boolean>(false)
@@ -64,6 +68,7 @@ const PhotoItemHeader: React.FC<TPhotoItemHeaderProps> = (props) => {
                                 </div>
                                 <div><span className='second-color'>Размер файлов:</span> {filesize} Гб</div>
                                 <div><span className='second-color'>Категория:</span> {category}</div>
+                                {photo?.author && <div><span className='second-color'>Обработка:</span> {Author(photo.author)}</div>}
                             </Grid.Column>
                             <Grid.Column computer={9} tablet={9} mobile={16}>
                                 {(! loader && photo?.parameters?.filters) && <FilterList filters={photo.parameters?.filters} />}

From 2298ea920a87594cf03b55f9897abb20911925ed Mon Sep 17 00:00:00 2001
From: Mik <miksoft.tm@gmail.com>
Date: Wed, 9 Feb 2022 11:08:30 +0500
Subject: [PATCH 3/6] fix #41: Add Yandex.Metrika

---
 frontend/public/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/public/index.html b/frontend/public/index.html
index 61a65fc..3ddca0f 100644
--- a/frontend/public/index.html
+++ b/frontend/public/index.html
@@ -13,5 +13,6 @@
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
+    %REACT_APP_METRIKA%
   </body>
 </html>

From c871db8120e3751b6bc58ecbdeb2f7ac44b630cd Mon Sep 17 00:00:00 2001
From: Mik <miksoft.tm@gmail.com>
Date: Thu, 10 Feb 2022 10:38:19 +0500
Subject: [PATCH 4/6] fix #42: Fix multiple photo updates on home page

---
 frontend/src/components/photoGrid/index.tsx |  2 +-
 frontend/src/features/main.tsx              | 12 +++++++++---
 frontend/src/features/objectItem.tsx        |  4 +++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/photoGrid/index.tsx b/frontend/src/components/photoGrid/index.tsx
index 2d0c4d9..24353ca 100644
--- a/frontend/src/components/photoGrid/index.tsx
+++ b/frontend/src/components/photoGrid/index.tsx
@@ -33,7 +33,7 @@ const PhotoGrid: React.FC<TPhotoGridProps> = (props) => {
 
     return <div className={`box photo-gird ${className ? className : ''}`}>
         {
-            loading ?
+            loading || !photoList ?
                 PhotosLoader(loaderCount ? loaderCount : 12)
                 :
                 photoList.map((photo: TPhoto & TCatalog, key: number) =>
diff --git a/frontend/src/features/main.tsx b/frontend/src/features/main.tsx
index 47327e5..a6cf78e 100644
--- a/frontend/src/features/main.tsx
+++ b/frontend/src/features/main.tsx
@@ -1,5 +1,6 @@
 import React, { useState, useEffect } from 'react'
 import { useGetStatisticQuery, useGetPhotoListQuery, useGetWeatherMonthMutation, useGetFilesMonthMutation } from '../app/observatoryApi'
+import { TPhoto, TCatalog } from '../app/types'
 import { shuffle } from '../functions/helpers'
 import moment, { Moment } from 'moment'
 
@@ -9,15 +10,20 @@ import Calendar from '../components/calendar'
 
 const Main: React.FC = () => {
     const [ date, setDate ] = useState<Moment>(moment())
+    const [ photos, setPhotos ] = useState<TPhoto[] & TCatalog[] | undefined>(undefined)
     const { data: statisticData, isLoading: statisticLoading } = useGetStatisticQuery()
     const { data: photoData, isLoading: photosLoading } = useGetPhotoListQuery()
     const [ getWeatherMonth, { data: weatherData, isLoading: weatherLoading } ] = useGetWeatherMonthMutation()
     const [ getFilesMonth, { data: filesData, isLoading: filesLoading } ] = useGetFilesMonthMutation()
 
-    const randomPhotos = photoData?.payload ? shuffle(photoData.payload.slice()).slice(0, 4) : undefined
-
     document.title = 'Главная страница - Обсерватория'
 
+    if (photoData?.payload && photos === undefined) {
+        const randomPhotos = shuffle(photoData.payload.slice()).slice(0, 4)
+
+        setPhotos(randomPhotos);
+    }
+
     useEffect(() => {
         const getWeather = async () => {
             try {
@@ -45,7 +51,7 @@ const Main: React.FC = () => {
             <PhotoGrid
                 loading={photosLoading}
                 loaderCount={4}
-                photoList={randomPhotos}
+                photoList={photos}
                 className='photoRow-4'
             />
             <br />
diff --git a/frontend/src/features/objectItem.tsx b/frontend/src/features/objectItem.tsx
index 6b8a329..cb837a4 100644
--- a/frontend/src/features/objectItem.tsx
+++ b/frontend/src/features/objectItem.tsx
@@ -27,6 +27,8 @@ const ObjectItem: React.FC = () => {
     const { data: dataFiles, isFetching: fileLoading } = useGetObjectFilesQuery(params.name)
     const { data: dataNames, isFetching: namesLoading } = useGetObjectNamesQuery()
 
+    const title = dataCatalog && dataCatalog?.payload.title ? dataCatalog?.payload.title : params.name
+
     const chartData: any[] = []
     const chartRa: any[] = []
     const chartDec: any[] = []
@@ -34,7 +36,7 @@ const ObjectItem: React.FC = () => {
     let deviationRa: number = 0;
     let deviationDec: number = 0;
 
-    document.title = `${dataCatalog ? dataCatalog?.payload.title : ''} - Обсерватория`
+    document.title = `${title} - Обсерватория`
 
     if (isError) {
         return <div>Возникла ошибка на сервер</div>

From 25944206ad6b7472aa887060acd02a45a4f7cbb7 Mon Sep 17 00:00:00 2001
From: Mik <miksoft.tm@gmail.com>
Date: Sun, 13 Feb 2022 13:21:52 +0500
Subject: [PATCH 5/6] Add helmet component, write some API methods in readme,
 fix error in API

---
 README.md                           | 200 ++++++++++++++++++++++++++++
 backend/app/Controllers/Weather.php |  22 +--
 frontend/package-lock.json          |  74 ++++++++--
 frontend/package.json               |   1 +
 4 files changed, 269 insertions(+), 28 deletions(-)

diff --git a/README.md b/README.md
index 73c8007..ed9065e 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,206 @@ The observatory controller is based on Ardunio (AVR) and connects to the observa
 - DHT22
 - DS18B20
 
+### API methods
+The response format is JSON, the response structure is always the same, only payload will change in different APIs
+```json
+{
+  "status": true,
+  "payload": []
+}
+```
+
+#### FITS files controller
+``/api/get/file/list?object=${string}``
+```json
+{
+  "id": "fe03bc1c2cfd97de1f97edbdd57e3acb",
+  "name": "M33_Light_Red_300_secs_2020-08-27T03-45-00_010.fits",
+  "date": "2020-08-26 22:39:59",
+  "filter": "Red",
+  "exposure": 300,
+  "temp": -10,
+  "offset": 10,
+  "gain": 120,
+  "dec": 30.5457,
+  "ra": 23.4641
+}
+```
+#### Photo controller
+``/api/get/photo/list``
+```json
+{
+  "object": "NGC_896",
+  "date": "2022-02-09",
+  "file": "NGC_896-710m-2022.02.09",
+  "ext": "jpg",
+  "author": {
+    "name": "Author name",
+    "link": ""
+  }
+}
+```
+
+``/api/get/photo/list?object=${string}``
+```json
+{
+  "object": "M_33",
+  "date": "2020-12-25",
+  "file": "M33-630m-2020.12.25",
+  "ext": "jpg",
+  "author": {
+    "name": "Author name",
+    "link": ""
+  },
+  "parameters": {
+    "date": "2020-08-26 23:10:55",
+    "exposure": 45367,
+    "frames": 214,
+    "filesizes": 7016,
+    "filters": {
+      "Luminance": {
+        "exposure": 13203,
+        "frames": 45
+      },
+      "Red": {
+        "exposure": 11138,
+        "frames": 75
+      },
+      "Green": {
+        "exposure": 8722,
+        "frames": 51
+      },
+      "Blue": {
+        "exposure": 7500,
+        "frames": 25
+      },
+      "Ha": {
+        "exposure": 4804,
+        "frames": 18
+      },
+      "OIII": {
+        "exposure": 0,
+        "frames": 0
+      },
+      "SII": {
+        "exposure": 0,
+        "frames": 0
+      }
+    }
+  }
+}
+```
+
+#### Object controller
+``/api/get/object/list``
+```json
+{
+  "name": "NGC_925",
+  "date": "2021-10-10 00:51:07",
+  "exposure": 51300,
+  "frames": 171,
+  "Luminance": 12900,
+  "Red": 14700,
+  "Green": 13500,
+  "Blue": 10200,
+  "Ha": 0,
+  "OIII": 0,
+  "SII": 0
+}
+```
+
+``/api/get/object/names``
+```json
+[
+  "Vesta_A807_FA",
+  "V1405_Cas",
+  "UGC_6930",
+  "Sh2_132",
+  "Sh2_109",
+  "Sh2_103",
+  "Sh2-168"
+]
+```
+
+``/api/get/object/item?object=${string}``
+```json
+{
+  "date": "2020-08-26 23:10:55",
+  "exposure": 45367,
+  "frames": 214,
+  "filesizes": 7016,
+  "filters": {
+    "Luminance": {
+      "exposure": 13203,
+      "frames": 45
+    },
+    "Red": {
+      "exposure": 11138,
+      "frames": 75
+    },
+    "Green": {
+      "exposure": 8722,
+      "frames": 51
+    },
+    "Blue": {
+      "exposure": 7500,
+      "frames": 25
+    },
+    "Ha": {
+      "exposure": 4804,
+      "frames": 18
+    },
+    "OIII": {
+      "exposure": 0,
+      "frames": 0
+    },
+    "SII": {
+      "exposure": 0,
+      "frames": 0
+    }
+  }
+}
+```
+
+#### Catalog controller
+``/api/get/catalog/list``
+```json
+[
+  {
+    "name": "V1405_Cas",
+    "title": "Новая Кассиопеи (V1405 Cas)",
+    "text": "Вспышка классической новой звезды, представляющая собой взрыв на поверхности белого карлика.",
+    "category": "Сверхновые",
+    "ra": 351.147,
+    "dec": 61.1585
+  }
+]
+```
+
+``/api/get/catalog/item?object=${string}``
+```json
+{
+  "name": "V1405_Cas",
+  "title": "Новая Кассиопеи (V1405 Cas)",
+  "text": "Вспышка классической новой звезды, представляющая собой взрыв на поверхности белого карлика.",
+  "category": "Сверхновые",
+  "ra": 351.147,
+  "dec": 61.1585
+}
+```
+
+#### Statistic controller
+``/api/get/statistic/summary``
+```json
+{
+  "photos": 63,
+  "objects": 89,
+  "frames": 5987,
+  "exposure": 1785611,
+  "filesize": 196289
+}
+```
+
 ----------------------
 ### Project structure
 
diff --git a/backend/app/Controllers/Weather.php b/backend/app/Controllers/Weather.php
index cec97d8..ef26743 100644
--- a/backend/app/Controllers/Weather.php
+++ b/backend/app/Controllers/Weather.php
@@ -26,6 +26,8 @@ function month()
         $period = $this->request->getGet('date', FILTER_SANITIZE_STRING);
         $client = \Config\Services::curlrequest();
 
+        if (!$period) { $period = date('Y-m'); }
+
         $start = $period . '-01';
         $end = date('Y-m-t', strtotime($period));
 
@@ -41,24 +43,15 @@ function month()
             $sunrise = $sunData['astronomical_twilight_end'];
             $sunset  = $sunData['astronomical_twilight_begin'];
 
-            if ($item->date > $sunset && $item->date < $sunrise)
-            {
-                continue;
-            }
+            if ($item->date > $sunset && $item->date < $sunrise) { continue; }
 
             $day = date('Y-m-d', $item->date);
 
-            if (!isset($days[$day]))
-            {
-                $days[$day] = (object) ['count' => 0];
-            }
+            if (!isset($days[$day])) { $days[$day] = (object) ['count' => 0]; }
 
             foreach ($item as $var => $val)
             {
-                if ($var === 'date')
-                {
-                    continue;
-                }
+                if ($var === 'date') { continue; }
 
                 if ($val === null)
                 {
@@ -82,10 +75,7 @@ function month()
 
             foreach ($item as $var => $value)
             {
-                if ($var === 'count')
-                {
-                    continue;
-                }
+                if ($var === 'count') { continue; }
 
                 if ($value !== null)
                 {
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 1fc2955..049d912 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "observatory",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "observatory",
-      "version": "2.0.0",
+      "version": "2.0.1",
       "dependencies": {
         "@reduxjs/toolkit": "^1.6.2",
         "@types/jest": "^26.0.24",
@@ -22,6 +22,7 @@
         "node-sass": "^6.0.1",
         "react": "^17.0.2",
         "react-dom": "^17.0.2",
+        "react-helmet": "^6.1.0",
         "react-icons": "^4.3.1",
         "react-image-lightbox": "^5.1.4",
         "react-photo-gallery": "^8.0.0",
@@ -18002,6 +18003,20 @@
         "react-dom": "^15.5.0 || ^16.0.0 || ^17.0.0-0"
       }
     },
+    "node_modules/react-helmet": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-6.1.0.tgz",
+      "integrity": "sha512-4uMzEY9nlDlgxr61NL3XbKRy1hEkXmKNXhjbAIOVw5vcFrsdYbH2FEwcNyWvWinl103nXgzYNlns9ca+8kFiWw==",
+      "dependencies": {
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.7.2",
+        "react-fast-compare": "^3.1.1",
+        "react-side-effect": "^2.1.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.3.0"
+      }
+    },
     "node_modules/react-icons": {
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.3.1.tgz",
@@ -18247,6 +18262,14 @@
         }
       }
     },
+    "node_modules/react-side-effect": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.1.tgz",
+      "integrity": "sha512-2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ==",
+      "peerDependencies": {
+        "react": "^16.3.0 || ^17.0.0"
+      }
+    },
     "node_modules/read-pkg": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
@@ -26632,7 +26655,8 @@
     "acorn-jsx": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "requires": {}
     },
     "acorn-walk": {
       "version": "7.2.0",
@@ -26684,12 +26708,14 @@
     "ajv-errors": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
-      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ=="
+      "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
+      "requires": {}
     },
     "ajv-keywords": {
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "requires": {}
     },
     "alphanum-sort": {
       "version": "1.0.2",
@@ -27188,7 +27214,8 @@
     "babel-plugin-named-asset-import": {
       "version": "0.3.7",
       "resolved": "https://registry.npmjs.org/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.7.tgz",
-      "integrity": "sha512-squySRkf+6JGnvjoUtDEjSREJEBirnXi9NqP6rjSYsylxQxqBTz+pkmf395i9E2zsvmYUaI40BHo6SqZUdydlw=="
+      "integrity": "sha512-squySRkf+6JGnvjoUtDEjSREJEBirnXi9NqP6rjSYsylxQxqBTz+pkmf395i9E2zsvmYUaI40BHo6SqZUdydlw==",
+      "requires": {}
     },
     "babel-plugin-polyfill-corejs2": {
       "version": "0.2.2",
@@ -30006,7 +30033,8 @@
     "eslint-plugin-react-hooks": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz",
-      "integrity": "sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ=="
+      "integrity": "sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ==",
+      "requires": {}
     },
     "eslint-plugin-testing-library": {
       "version": "3.10.2",
@@ -31324,7 +31352,8 @@
     "highcharts-react-official": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/highcharts-react-official/-/highcharts-react-official-3.1.0.tgz",
-      "integrity": "sha512-CkWJHrVMOc6CT8KFu1dR+a0w5OxCVKKgZUNWtEi5TmR0xqBDIDe+RyM652MAN/jBYppxMo6TCUVlRObCyWAn0Q=="
+      "integrity": "sha512-CkWJHrVMOc6CT8KFu1dR+a0w5OxCVKKgZUNWtEi5TmR0xqBDIDe+RyM652MAN/jBYppxMo6TCUVlRObCyWAn0Q==",
+      "requires": {}
     },
     "history": {
       "version": "4.10.1",
@@ -33097,7 +33126,8 @@
     "jest-pnp-resolver": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
-      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w=="
+      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
+      "requires": {}
     },
     "jest-regex-util": {
       "version": "26.0.0",
@@ -37251,10 +37281,22 @@
         "prop-types": "^15.6.0"
       }
     },
+    "react-helmet": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-6.1.0.tgz",
+      "integrity": "sha512-4uMzEY9nlDlgxr61NL3XbKRy1hEkXmKNXhjbAIOVw5vcFrsdYbH2FEwcNyWvWinl103nXgzYNlns9ca+8kFiWw==",
+      "requires": {
+        "object-assign": "^4.1.1",
+        "prop-types": "^15.7.2",
+        "react-fast-compare": "^3.1.1",
+        "react-side-effect": "^2.1.0"
+      }
+    },
     "react-icons": {
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.3.1.tgz",
-      "integrity": "sha512-cB10MXLTs3gVuXimblAdI71jrJx8njrJZmNMEMC+sQu5B/BIOmlsAjskdqpn81y8UBVEGuHODd7/ci5DvoSzTQ=="
+      "integrity": "sha512-cB10MXLTs3gVuXimblAdI71jrJx8njrJZmNMEMC+sQu5B/BIOmlsAjskdqpn81y8UBVEGuHODd7/ci5DvoSzTQ==",
+      "requires": {}
     },
     "react-image-lightbox": {
       "version": "5.1.4",
@@ -37441,6 +37483,12 @@
         "workbox-webpack-plugin": "5.1.4"
       }
     },
+    "react-side-effect": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.1.tgz",
+      "integrity": "sha512-2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ==",
+      "requires": {}
+    },
     "read-pkg": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
@@ -37527,7 +37575,8 @@
     "redux-thunk": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.0.tgz",
-      "integrity": "sha512-/y6ZKQNU/0u8Bm7ROLq9Pt/7lU93cT0IucYMrubo89ENjxPa7i8pqLKu6V4X7/TvYovQ6x01unTeyeZ9lgXiTA=="
+      "integrity": "sha512-/y6ZKQNU/0u8Bm7ROLq9Pt/7lU93cT0IucYMrubo89ENjxPa7i8pqLKu6V4X7/TvYovQ6x01unTeyeZ9lgXiTA==",
+      "requires": {}
     },
     "regenerate": {
       "version": "1.4.2",
@@ -41635,7 +41684,8 @@
     "ws": {
       "version": "7.5.5",
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
-      "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w=="
+      "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==",
+      "requires": {}
     },
     "xml-name-validator": {
       "version": "3.0.0",
diff --git a/frontend/package.json b/frontend/package.json
index 7b70df6..9a0eae5 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -18,6 +18,7 @@
     "node-sass": "^6.0.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
+    "react-helmet": "^6.1.0",
     "react-icons": "^4.3.1",
     "react-image-lightbox": "^5.1.4",
     "react-photo-gallery": "^8.0.0",

From 9b2c4768c6e2100aca5edf72d8284040ae3f1046 Mon Sep 17 00:00:00 2001
From: Mik <miksoft.tm@gmail.com>
Date: Tue, 15 Feb 2022 08:37:50 +0500
Subject: [PATCH 6/6] close #35: Add new MySQL dump

---
 backend/MySQL_dump_15.02.2022.sql | 211 ++++++++++++++++++++++++++++++
 backend/api-backend-mysql.sql.gz  | Bin 2357 -> 0 bytes
 2 files changed, 211 insertions(+)
 create mode 100644 backend/MySQL_dump_15.02.2022.sql
 delete mode 100644 backend/api-backend-mysql.sql.gz

diff --git a/backend/MySQL_dump_15.02.2022.sql b/backend/MySQL_dump_15.02.2022.sql
new file mode 100644
index 0000000..3fec182
--- /dev/null
+++ b/backend/MySQL_dump_15.02.2022.sql
@@ -0,0 +1,211 @@
+-- phpMyAdmin SQL Dump
+-- version 4.9.7
+-- https://www.phpmyadmin.net/
+--
+-- Хост: 10.0.0.231:3319
+-- Время создания: Фев 15 2022 г., 03:36
+-- Версия сервера: 10.3.30-MariaDB-log
+-- Версия PHP: 7.4.11
+
+SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
+SET AUTOCOMMIT = 0;
+START TRANSACTION;
+SET time_zone = "+00:00";
+
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8mb4 */;
+
+--
+-- База данных: `mik_astro`
+--
+
+-- --------------------------------------------------------
+
+--
+-- Структура таблицы `astro_authors`
+--
+
+CREATE TABLE `astro_authors` (
+  `author_id` smallint(6) NOT NULL,
+  `author_name` varchar(200) DEFAULT NULL,
+  `author_link` varchar(200) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Структура таблицы `astro_fits`
+--
+
+CREATE TABLE `astro_fits` (
+  `file_id` varchar(40) NOT NULL COMMENT 'ID записи',
+  `item_file_name` varchar(80) NOT NULL COMMENT 'Наименование файла',
+  `item_ypixsz` float NOT NULL DEFAULT 0 COMMENT 'Физический размер Y пикселей датчика в микронах',
+  `item_xpixsz` float NOT NULL DEFAULT 0 COMMENT 'Физический размер X пикселей датчика в микронах',
+  `item_naxis1` smallint(5) NOT NULL DEFAULT 4656 COMMENT 'Количество точек по оси X',
+  `item_naxis2` smallint(5) NOT NULL DEFAULT 3520 COMMENT 'Количество точек по оси Y',
+  `item_naxis` tinyint(1) NOT NULL DEFAULT 2 COMMENT 'Количество осей в массиве данных',
+  `item_bscale` tinyint(2) NOT NULL DEFAULT 1,
+  `item_simple` varchar(1) NOT NULL DEFAULT 'T' COMMENT 'Указывает заголовок FITS',
+  `item_bitpix` tinyint(2) NOT NULL DEFAULT 16 COMMENT 'Указывает формат массива',
+  `item_xbinning` tinyint(1) NOT NULL DEFAULT 1 COMMENT 'Коэффициент биннинга, используемый на оси X',
+  `item_ybinning` tinyint(1) NOT NULL DEFAULT 1 COMMENT 'Коэффициент биннинга, используемый на оси Y',
+  `item_exptime` int(5) NOT NULL DEFAULT 0 COMMENT 'Длительность выдержки в секундах',
+  `item_frame` varchar(40) NOT NULL COMMENT 'Тип кадра',
+  `item_aptdia` smallint(5) NOT NULL DEFAULT 200 COMMENT 'Диаметр телескопа в миллиметрах',
+  `item_focallen` smallint(5) NOT NULL DEFAULT 1000 COMMENT 'Фокусное расстояние',
+  `item_comment` text NOT NULL COMMENT 'Комментарий',
+  `item_telescop` varchar(100) NOT NULL COMMENT 'Введенная пользователем информация об используемом телескопе',
+  `item_observer` varchar(200) NOT NULL COMMENT 'Имя наблюдателя',
+  `item_instrume` varchar(200) NOT NULL COMMENT 'Информация о камере',
+  `item_pixsize1` float NOT NULL DEFAULT 0 COMMENT 'Размер пикселя X',
+  `item_pixsize2` float NOT NULL DEFAULT 0 COMMENT 'Размер пикселя Y',
+  `item_ccd_temp` tinyint(3) NOT NULL DEFAULT 0 COMMENT 'Температура сенсора матрицы',
+  `item_offset` tinyint(3) NOT NULL DEFAULT 10 COMMENT 'Параметр "Offset"',
+  `item_gain` smallint(3) NOT NULL DEFAULT 90 COMMENT 'Электронное усиление в фотоэлектронах на ADU',
+  `item_scale` varchar(100) NOT NULL,
+  `item_date_obs` datetime NOT NULL COMMENT 'Дата и время съемки',
+  `item_equinox` varchar(200) NOT NULL,
+  `item_filter` varchar(40) NOT NULL COMMENT 'Название выбранного фильтра',
+  `item_dec` float NOT NULL DEFAULT 0 COMMENT 'Склонение отображаемого объекта',
+  `item_ra` float NOT NULL DEFAULT 0 COMMENT 'Восхождение отображаемого объекта',
+  `item_objctdec` varchar(40) NOT NULL COMMENT 'Склонение отображаемого объекта',
+  `item_objctra` varchar(40) NOT NULL COMMENT ' Восхождение отображаемого объекта ',
+  `item_sitelong` float NOT NULL COMMENT 'Долгота места съемки в градусах',
+  `item_sitelat` float NOT NULL COMMENT 'Широта места съемки в градусах',
+  `item_bzero` int(5) NOT NULL DEFAULT 32768,
+  `item_extend` varchar(50) NOT NULL,
+  `item_object` varchar(200) NOT NULL COMMENT 'Имя или каталожный номер отображаемого объекта',
+  `item_airmass` float NOT NULL COMMENT 'Относительная длина оптического пути через атмосферу',
+  `item_hfr` float DEFAULT NULL,
+  `item_fwhm` float DEFAULT NULL,
+  `item_sigma` float DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Структура таблицы `astro_objects`
+--
+
+CREATE TABLE `astro_objects` (
+  `object_name` varchar(20) NOT NULL,
+  `object_title` varchar(100) NOT NULL,
+  `object_text` text NOT NULL,
+  `object_category` varchar(100) NOT NULL,
+  `object_ra` float NOT NULL,
+  `object_dec` float NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Структура таблицы `astro_photos`
+--
+
+CREATE TABLE `astro_photos` (
+  `photo_id` smallint(5) NOT NULL,
+  `photo_obj` varchar(40) NOT NULL,
+  `photo_date` date DEFAULT NULL,
+  `photo_author` smallint(6) DEFAULT NULL COMMENT 'Author ID',
+  `photo_file` varchar(50) NOT NULL,
+  `photo_file_ext` varchar(5) NOT NULL DEFAULT 'jpg'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+-- --------------------------------------------------------
+
+--
+-- Структура таблицы `astro_sensors`
+--
+
+CREATE TABLE `astro_sensors` (
+  `item_id` varchar(20) NOT NULL COMMENT 'Unique item ID',
+  `item_data_json` tinytext NOT NULL COMMENT 'Client raw data JSON',
+  `item_timestamp` timestamp NOT NULL DEFAULT current_timestamp() COMMENT 'Insert datetime'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Обработанные данные устройств';
+
+-- --------------------------------------------------------
+
+--
+-- Структура таблицы `astro_users`
+--
+
+CREATE TABLE `astro_users` (
+  `user_token` varchar(100) NOT NULL DEFAULT '',
+  `user_name` varchar(50) DEFAULT NULL,
+  `user_last_activity` datetime NOT NULL DEFAULT current_timestamp(),
+  `user_ip` varchar(25) DEFAULT '0.0.0.0'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+--
+-- Индексы сохранённых таблиц
+--
+
+--
+-- Индексы таблицы `astro_authors`
+--
+ALTER TABLE `astro_authors`
+  ADD PRIMARY KEY (`author_id`);
+
+--
+-- Индексы таблицы `astro_fits`
+--
+ALTER TABLE `astro_fits`
+  ADD PRIMARY KEY (`file_id`),
+  ADD UNIQUE KEY `file_id` (`file_id`),
+  ADD KEY `item_object` (`item_object`),
+  ADD KEY `item_date_obs` (`item_date_obs`);
+
+--
+-- Индексы таблицы `astro_objects`
+--
+ALTER TABLE `astro_objects`
+  ADD PRIMARY KEY (`object_name`),
+  ADD UNIQUE KEY `object_name` (`object_name`);
+
+--
+-- Индексы таблицы `astro_photos`
+--
+ALTER TABLE `astro_photos`
+  ADD PRIMARY KEY (`photo_id`),
+  ADD UNIQUE KEY `photo_id` (`photo_id`),
+  ADD KEY `photo_obj` (`photo_obj`);
+
+--
+-- Индексы таблицы `astro_sensors`
+--
+ALTER TABLE `astro_sensors`
+  ADD PRIMARY KEY (`item_id`),
+  ADD UNIQUE KEY `item_id` (`item_id`),
+  ADD KEY `item_timestamp` (`item_timestamp`);
+
+--
+-- Индексы таблицы `astro_users`
+--
+ALTER TABLE `astro_users`
+  ADD PRIMARY KEY (`user_token`),
+  ADD UNIQUE KEY `user_token` (`user_token`);
+
+--
+-- AUTO_INCREMENT для сохранённых таблиц
+--
+
+--
+-- AUTO_INCREMENT для таблицы `astro_authors`
+--
+ALTER TABLE `astro_authors`
+  MODIFY `author_id` smallint(6) NOT NULL AUTO_INCREMENT;
+
+--
+-- AUTO_INCREMENT для таблицы `astro_photos`
+--
+ALTER TABLE `astro_photos`
+  MODIFY `photo_id` smallint(5) NOT NULL AUTO_INCREMENT;
+COMMIT;
+
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
diff --git a/backend/api-backend-mysql.sql.gz b/backend/api-backend-mysql.sql.gz
deleted file mode 100644
index 249775773b6547eeb8abb706b6fa3ea2cc04124f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2357
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
b8sArLBp9S`)%d+{L+Aesu0+9AekA|^_(Xb*