diff --git a/WebDisplay/src/App.vue b/WebDisplay/src/App.vue index 171bd44..53d0ed0 100644 --- a/WebDisplay/src/App.vue +++ b/WebDisplay/src/App.vue @@ -1,45 +1,7 @@ - + diff --git a/WebDisplay/src/pages/index.vue b/WebDisplay/src/pages/index.vue index 0fec970..3b5ac03 100644 --- a/WebDisplay/src/pages/index.vue +++ b/WebDisplay/src/pages/index.vue @@ -1,104 +1,68 @@ - - - + const { mdAndUp } = useDisplay(); + diff --git a/WebDisplay/src/pages/index/index.vue b/WebDisplay/src/pages/index/index.vue new file mode 100644 index 0000000..0fec970 --- /dev/null +++ b/WebDisplay/src/pages/index/index.vue @@ -0,0 +1,104 @@ + + + + + diff --git a/WebDisplay/src/pages/indoor.vue b/WebDisplay/src/pages/index/indoor.vue similarity index 98% rename from WebDisplay/src/pages/indoor.vue rename to WebDisplay/src/pages/index/indoor.vue index d5f3606..da51d6d 100644 --- a/WebDisplay/src/pages/indoor.vue +++ b/WebDisplay/src/pages/index/indoor.vue @@ -4,7 +4,7 @@ import { createIndoorStore } from '@/stores/indoorStore'; import { ConvertCToF } from '@/temperatureConverter'; import { ConvertMillibarToInchesOfMercury } from '@/pressureConverter'; - import ValueChart from '../components/ValueChart.vue'; + import ValueChart from '@/components/ValueChart.vue'; import TimeRange from '@/components/TimeRange.vue'; import TimeSpan from '@/models/time-span'; diff --git a/WebDisplay/src/pages/outdoor.vue b/WebDisplay/src/pages/index/outdoor.vue similarity index 99% rename from WebDisplay/src/pages/outdoor.vue rename to WebDisplay/src/pages/index/outdoor.vue index af562ca..cf69d78 100644 --- a/WebDisplay/src/pages/outdoor.vue +++ b/WebDisplay/src/pages/index/outdoor.vue @@ -3,7 +3,7 @@ import { subHours } from 'date-fns'; import { useWeatherStore } from '@/stores/weatherStore'; import { ConvertPascalToInchesOfMercury } from '@/pressureConverter'; - import ValueChart from '../components/ValueChart.vue'; + import ValueChart from '@/components/ValueChart.vue'; import TimeRange from '@/components/TimeRange.vue'; import TimeSpan from '@/models/time-span'; import { ConvertDegreesToShortLabel, ConvertWindDirectionToDegrees } from '@/windConverter'; diff --git a/WebDisplay/src/pages/power.vue b/WebDisplay/src/pages/index/power.vue similarity index 98% rename from WebDisplay/src/pages/power.vue rename to WebDisplay/src/pages/index/power.vue index 23576f0..59fce20 100644 --- a/WebDisplay/src/pages/power.vue +++ b/WebDisplay/src/pages/index/power.vue @@ -3,7 +3,7 @@ import { subHours } from 'date-fns'; import { usePowerStore } from '@/stores/powerStore'; import { useWeatherStore } from '@/stores/weatherStore'; - import ValueChart from '../components/ValueChart.vue'; + import ValueChart from '@/components/ValueChart.vue'; import TimeRange from '@/components/TimeRange.vue'; import WeatherValueType from '@/models/weather/weather-value-type'; import TimeSpan from '@/models/time-span'; diff --git a/WebDisplay/src/pages/summary.vue b/WebDisplay/src/pages/index/summary.vue similarity index 100% rename from WebDisplay/src/pages/summary.vue rename to WebDisplay/src/pages/index/summary.vue diff --git a/WebDisplay/src/pages/kiosk.vue b/WebDisplay/src/pages/kiosk.vue new file mode 100644 index 0000000..e02b84b --- /dev/null +++ b/WebDisplay/src/pages/kiosk.vue @@ -0,0 +1,176 @@ + + + + + diff --git a/WebDisplay/typed-router.d.ts b/WebDisplay/typed-router.d.ts index 852918f..5a59b90 100644 --- a/WebDisplay/typed-router.d.ts +++ b/WebDisplay/typed-router.d.ts @@ -40,10 +40,12 @@ import type { declare module 'vue-router/auto/routes' { export interface RouteNamedMap { '/': RouteRecordInfo<'/', '/', Record, Record>, - '/indoor': RouteRecordInfo<'/indoor', '/indoor', Record, Record>, - '/outdoor': RouteRecordInfo<'/outdoor', '/outdoor', Record, Record>, - '/power': RouteRecordInfo<'/power', '/power', Record, Record>, - '/summary': RouteRecordInfo<'/summary', '/summary', Record, Record>, + '//': RouteRecordInfo<'//', '/', Record, Record>, + '//indoor': RouteRecordInfo<'//indoor', '/indoor', Record, Record>, + '//outdoor': RouteRecordInfo<'//outdoor', '/outdoor', Record, Record>, + '//power': RouteRecordInfo<'//power', '/power', Record, Record>, + '//summary': RouteRecordInfo<'//summary', '/summary', Record, Record>, + '/kiosk': RouteRecordInfo<'/kiosk', '/kiosk', Record, Record>, } }