refactor: dtos

Author: Angular2Guy

frontend/src/components/Chart.tsx

@@ -18,7 +18,8 @@ import FormControlLabel from '@mui/material/FormControlLabel';
 import FormControl from '@mui/material/FormControl';
 import GlobalState, { FuelType } from '../GlobalState';
 import { useRecoilState } from 'recoil';
-import { GsPoint, TimeSlot } from '../service/dtos';
+import { TimeSlot } from '../model/time-slot-response';
+import { GsPoint } from '../model/gs-point';
 
 export interface ChartProps {
   timeSlots: TimeSlot[];

frontend/src/components/GsMap.tsx

@@ -23,7 +23,8 @@ import myStyle from './gsmap.module.scss';
 import { Icon, Style } from 'ol/style.js';
 import { useEffect } from 'react';
 import { nanoid } from 'nanoid';
-import { CenterLocation, GsValue } from '../service/dtos';
+import { CenterLocation } from '../model/location';
+import { GsValue } from '../model/gs-point';
 
 interface InputProps {
   center: CenterLocation;

frontend/src/components/LocationModal.tsx

@@ -16,8 +16,9 @@ import {UserDataState} from "../GlobalState";
 import { useMemo,useEffect,useState,FormEvent,ChangeEvent,SyntheticEvent } from "react";
 import {Box,TextField,Button,Dialog,DialogContent, Autocomplete} from '@mui/material';
 import styles from './modal.module.scss';
-import { PostCodeLocation, UserRequest } from "../service/dtos";
 import { fetchLocation, postLocationRadius } from "../service/http-client";
+import { PostCodeLocation } from "../model/location";
+import { UserRequest } from "../model/user";
 
 const LocationModal = () => {
     let controller: AbortController | null = null;

frontend/src/components/LoginModal.tsx

@@ -17,8 +17,8 @@ import { UserDataState } from "../GlobalState";
 import { useState, ChangeEventHandler, FormEvent, BaseSyntheticEvent } from "react";
 import { Box, TextField, Button, Tab, Tabs, Dialog, DialogContent } from '@mui/material';
 import { useNavigate } from "react-router";
-import { UserResponse } from "../service/dtos";
 import { postLogin, postSignin } from "../service/http-client";
+import { UserResponse } from "../model/user";
 
 interface MsgData {
   jwtToken?: string;

frontend/src/components/Main.tsx

@@ -19,9 +19,10 @@ import GlobalState from '../GlobalState';
 //import styles from './main.module.scss';
 import Chart from './Chart';
 import { useNavigate } from 'react-router';
-import { MyDataJson, GsValue, TimeSlot } from '../service/dtos';
 import { fetchGasStations, fetchPriceAvgs, fetchTimeSlots, fetchUserNotifications } from '../service/http-client';
-
+import { TimeSlot } from '../model/time-slot-response';
+import { GsValue } from '../model/gs-point';
+import { MyDataJson } from '../model/my-data-json';
 
 export default function Main() {
   const navigate = useNavigate();

frontend/src/components/TargetPriceModal.tsx

@@ -14,8 +14,8 @@ import { useRecoilState, useRecoilValue } from "recoil";
 import GlobalState from "../GlobalState";
 import { Box, TextField, Button, Dialog, DialogContent } from '@mui/material';
 import { useState, useMemo, ChangeEventHandler, FormEvent } from "react";
-import { UserRequest } from "../service/dtos";
 import { postTargetPrices } from "../service/http-client";
+import { UserRequest } from "../model/user";
 
 
 const TargetPriceModal = () => {

frontend/src/model/gas-price-avg.ts

@@ -0,0 +1,23 @@
+/*
+  - Copyright 2022 Sven Loesekann
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+export interface GasPriceAvgs {
+	Postcode:        string
+	County:          string
+	State:           string
+	CountyAvgDiesel: number
+	CountyAvgE10:    number
+	CountyAvgE5:     number
+	StateAvgDiesel:  number
+	StateAvgE10:     number
+	StateAvgE5:      number
+}

frontend/src/model/gas-price.ts

@@ -0,0 +1,19 @@
+/*
+  - Copyright 2022 Sven Loesekann
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+export interface GasPrice {
+  E5: number;
+  E10: number;
+  Diesel: number;
+  Date: string;
+  Changed: number;
+}

frontend/src/model/gas-station.ts

@@ -0,0 +1,28 @@
+/*
+  - Copyright 2022 Sven Loesekann
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+import { GasPrice } from "./gas-price";
+
+export interface GasStation {  
+  StationName: string;
+  Brand: string;
+  Street: string;
+  Place: string;
+  HouseNumber: string;
+  PostCode: string;
+  Latitude: number;
+  Longitude: number;
+  PublicHolidayIdentifier: string;
+  OtJson: string;
+  FirstActive: Date;
+  GasPrices: GasPrice[];
+}

frontend/src/model/gs-point.ts

@@ -0,0 +1,26 @@
+/*
+  - Copyright 2022 Sven Loesekann
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+export interface GsPoint {
+  timestamp: string;
+  price: number;
+}
+
+export interface GsValue {
+  location: string;
+  e5: number;
+  e10: number;
+  diesel: number;
+  date: Date;
+  longitude: number;
+  latitude: number;
+}