Skip to content

Commit 4e17cbd

Browse files
vividroyjeongvividroyjeong
authored
Merge pull request #94 from bcgov/feature/frontend
Implement Reporting Tabs and their Storybook
2 parents c206e36 + e81d5ff commit 4e17cbd

40 files changed

+1399
-1585
lines changed

‎frontend/.storybook/StoryWrapper.vue

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
<template>
2-
<v-app :theme="themeName">
2+
<v-app>
33
<v-main>
44
<slot name="story"></slot>
55
</v-main>
66
</v-app>
77
</template>
88

9-
<script>
10-
export default {
11-
props: {
12-
themeName: String,
13-
},
14-
}
15-
</script>
9+
<script></script>

‎frontend/.storybook/preview.ts

Lines changed: 6 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@ import type { Preview } from '@storybook/vue3'
22
import { setup } from '@storybook/vue3'
33
import { registerPlugins } from '../src/plugins'
44
import { withVuetifyTheme } from './withVeutifyTheme.decorator'
5-
import type { App } from 'vue'
6-
import '@bcgov/bc-sans/css/BCSans.css'
75
import '../src/styles/style.scss'
86

7+
setup((app) => {
8+
registerPlugins(app)
9+
})
10+
11+
export const decorators = [withVuetifyTheme]
12+
913
const preview: Preview = {
1014
parameters: {
1115
controls: {
@@ -15,37 +19,6 @@ const preview: Preview = {
1519
},
1620
},
1721
},
18-
// Add global theme types
19-
globalTypes: {
20-
theme: {
21-
name: 'Theme',
22-
description: 'Global theme for components',
23-
toolbar: {
24-
icon: 'paintbrush',
25-
items: [
26-
{ value: 'light', title: 'Light', left: '🌞' },
27-
{ value: 'dark', title: 'Dark', left: '🌛' },
28-
],
29-
dynamicTitle: true,
30-
},
31-
},
32-
},
33-
decorators: [
34-
withVuetifyTheme,
35-
(story) => ({
36-
components: { story },
37-
template: `
38-
<div style="font-family: 'BCSans', 'Noto Sans', Verdana, Arial, sans-serif;">
39-
<story />
40-
</div>
41-
`,
42-
}),
43-
],
4422
}
4523

4624
export default preview
47-
48-
// Setup function to register plugins
49-
setup((app: App) => {
50-
registerPlugins(app)
51-
})

‎frontend/.storybook/withVeutifyTheme.decorator.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
import { h } from 'vue'
22
import StoryWrapper from './StoryWrapper.vue'
33

4-
export const DEFAULT_THEME = 'light'
5-
64
export const withVuetifyTheme = (storyFn, context) => {
7-
const themeName = context.globals.theme || DEFAULT_THEME
85
const story = storyFn()
96

107
return () => {
118
return h(
129
StoryWrapper,
13-
{ themeName },
10+
{},
1411
{
1512
story: () => h(story, { ...context.args }),
1613
},

‎frontend/package-lock.json

Lines changed: 13 additions & 37 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎frontend/package.json

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
"@tsconfig/node20": "20.1.4",
2626
"@vitejs/plugin-vue": "5.0.5",
2727
"@vue/tsconfig": "0.5.1",
28-
"@vuepic/vue-datepicker": "8.8.0",
2928
"axios": "1.7.7",
3029
"file-saver": "2.0.5",
3130
"http-status-codes": "2.3.0",
@@ -41,25 +40,25 @@
4140
"vuetify": "3.6.14"
4241
},
4342
"devDependencies": {
44-
"@chromatic-com/storybook": "^3.2.2",
43+
"@chromatic-com/storybook": "3.2.2",
4544
"@rushstack/eslint-patch": "1.8.0",
46-
"@storybook/addon-essentials": "^8.4.7",
47-
"@storybook/addon-interactions": "^8.4.7",
48-
"@storybook/addon-onboarding": "^8.4.7",
49-
"@storybook/blocks": "^8.4.7",
50-
"@storybook/test": "^8.4.7",
51-
"@storybook/vue3": "^8.4.7",
52-
"@storybook/vue3-vite": "^8.4.7",
45+
"@storybook/addon-essentials": "8.4.7",
46+
"@storybook/addon-interactions": "8.4.7",
47+
"@storybook/addon-onboarding": "8.4.7",
48+
"@storybook/blocks": "8.4.7",
49+
"@storybook/test": "8.4.7",
50+
"@storybook/vue3": "8.4.7",
51+
"@storybook/vue3-vite": "8.4.7",
5352
"@types/node": "20.14.5",
5453
"@vue/eslint-config-prettier": "9.0.0",
5554
"@vue/eslint-config-typescript": "13.0.0",
5655
"eslint": "8.57.0",
57-
"eslint-plugin-storybook": "^0.11.1",
56+
"eslint-plugin-storybook": "0.11.1",
5857
"npm-run-all2": "6.2.0",
5958
"prettier": "3.3.3",
6059
"sass": "1.77.6",
6160
"sass-loader": "14.2.1",
62-
"storybook": "^8.4.7",
61+
"storybook": "8.4.7",
6362
"typescript": "5.6.3",
6463
"vite": "5.4.8",
6564
"vite-plugin-vuetify": "2.0.3",

‎frontend/public/test-data/ErrorLog.txt

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
- I SUCCESS - Substitution of Supplied BA/TPH as Projected values has been disabled.
2+
092H014 0 0 600 (Rcrd ID: 2493719 ) 1 - I INVALIDSITEINFO - Height 0.0 at Projection Year 1876 is too short to generate yields for species 'FDC'
3+
092H014 0 0 600 (Rcrd ID: 2493719 ) 1 - I SPECIESNOTFOUND - Projected data for species 'FDC' was not generated at stand age 0.0 (Calendar Year: 1876)
4+
092H014 0 0 600 (Rcrd ID: 2493719 ) 1 - I INVALIDSITEINFO - Height 0.0 at Projection Year 1876 is too short to generate yields for species 'PLI'
5+
092H073 0 0 2185 (Rcrd ID: 2558002 ) 1 - I SUCCESS - Directly assigning Estimated SI of 20.00 to Species 'BA' and recomputing input height.
6+
092H073 0 0 2185 (Rcrd ID: 2558002 ) 1 - I SUCCESS - Assigning converted Estimated SI of 20.00 to Species 'HW' and recomputing input height.
7+
092H073 0 0 2185 (Rcrd ID: 2558002 ) 1 - I SUCCESS - Based on Estimated SI of 20.00, recomputed input height for species 'BA' at reference age 20.0 to be 4.93m
8+
092H073 0 0 2185 (Rcrd ID: 2558002 ) 1 - I SUCCESS - Based on Estimated SI of 22.28, recomputed input height for species 'HW' at reference age 20.0 to be 7.01m
9+
092H073 0 0 2185 (Rcrd ID: 2558002 ) 1 - I INVALIDSITEINFO - Height 0.0 at Projection Year 1976 is too short to generate yields for species 'BA'
10+
092H073 0 0 2185 (Rcrd ID: 2558002 ) 1 - I SPECIESNOTFOUND - Projected data for species 'BA' was not generated at stand age 0.0 (Calendar Year: 1976)
11+
092H073 0 0 2185 (Rcrd ID: 2558002 ) 1 - I INVALIDSITEINFO - Height 0.0 at Projection Year 1976 is too short to generate yields for species 'HW'
12+
092H025 0 0 388 (Rcrd ID: 6212668 ) 1 - I INVALIDSITEINFO - Height 0.0 at Projection Year 1876 is too short to generate yields for species 'FDC'
13+
092H025 0 0 388 (Rcrd ID: 6212668 ) 1 - I SPECIESNOTFOUND - Projected data for species 'FDC' was not generated at stand age 0.0 (Calendar Year: 1876)
14+
092H025 0 0 388 (Rcrd ID: 6212668 ) 1 - I INVALIDSITEINFO - Height 0.0 at Projection Year 1876 is too short to generate yields for species 'HW'
15+
092G089 0 0 51042508 (Rcrd ID: 8489172 ) 1 - I INVALIDSITEINFO - Height 0.0 at Projection Year 1755 is too short to generate yields for species 'FDC'
16+
092G089 0 0 51042508 (Rcrd ID: 8489172 ) 1 - I SPECIESNOTFOUND - Projected data for species 'FDC' was not generated at stand age 0.0 (Calendar Year: 1755)
17+
092G089 0 0 51042508 (Rcrd ID: 8489172 ) 1 - I INVALIDSITEINFO - Height 0.0 at Projection Year 1755 is too short to generate yields for species 'HW'
18+
083D056 0 0 30790200 (Rcrd ID: 9884561 ) 1 - I INVALIDSITEINFO - Height 0.0 at Projection Year 1761 is too short to generate yields for species 'SX'
19+
083D056 0 0 30790200 (Rcrd ID: 9884561 ) 1 - I SPECIESNOTFOUND - Projected data for species 'SX' was not generated at stand age 0.0 (Calendar Year: 1761)
20+
083D056 0 0 30790200 (Rcrd ID: 9884561 ) 1 - I INVALIDSITEINFO - Height 0.0 at Projection Year 1761 is too short to generate yields for species 'BL'
21+
093C085 0 0 3402903 (Rcrd ID: 13727877 ) 1 - I INVALIDSITEINFO - Height 0.0 at Projection Year 1853 is too short to generate yields for species 'SX'
22+
093C085 0 0 3402903 (Rcrd ID: 13727877 ) 1 - I SPECIESNOTFOUND - Projected data for species 'SX' was not generated at stand age 0.0 (Calendar Year: 1853)
23+
093G045 0 0 85306886 (Rcrd ID: 14330826 ) 1 - I INVALIDSITEINFO - Height 0.0 at Projection Year 1913 is too short to generate yields for species 'SB'
24+
093G045 0 0 85306886 (Rcrd ID: 14330826 ) 1 - I SPECIESNOTFOUND - Projected data for species 'SB' was not generated at stand age 0.0 (Calendar Year: 1913)
25+
092G028 0 0 7489355 (Rcrd ID: 14473383 ) 1 - I INVALIDSITEINFO - Height 0.0 at Projection Year 1907 is too short to generate yields for species 'CW'
26+
092G028 0 0 7489355 (Rcrd ID: 14473383 ) 1 - I SPECIESNOTFOUND - Projected data for species 'CW' was not generated at stand age 0.0 (Calendar Year: 1907)
27+
092G028 0 0 7489355 (Rcrd ID: 14473383 ) 1 - I INVALIDSITEINFO - Height 0.0 at Projection Year 1907 is too short to generate yields for species 'HW'
28+
093C080 0 0 42373828 (Rcrd ID: 15138818 ) 1 - I INVALIDSITEINFO - Height 0.0 at Projection Year 1913 is too short to generate yields for species 'PLI'
29+
093C080 0 0 42373828 (Rcrd ID: 15138818 ) 1 - I SPECIESNOTFOUND - Projected data for species 'PLI' was not generated at stand age 0.0 (Calendar Year: 1913)

‎frontend/public/test-data/ProgressLog.txt

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
2+
VDYP7 Console version: '7.17d'
3+
4+
INI File: 'C:\Data_YC\VDYP7\ver7.33b\VDYP7\VDYP.ini'
5+
Input Path: ''
6+
HCSV Poly Inp: 'C:\Data_YC\VDYP7\console_instruction\virtual_tour\VDYP7_INPUT_POLY.csv'
7+
HCSV Layer Inp: 'C:\Data_YC\VDYP7\console_instruction\virtual_tour\VDYP7_INPUT_LAYER.csv'
8+
Output Path: 'C:\Data_YC\VDYP7\console_instruction\virtual_tour\VDYP7_OUTPUT_YLDTBL.csv'
9+
Error File: 'C:\Data_YC\VDYP7\console_instruction\virtual_tour\VDYP7_OUTPUT_ERRMSG.txt'
10+
Log File: 'C:\Data_YC\VDYP7\console_instruction\virtual_tour\VDYP7_OUTPUT_LOG.txt'
11+
Debug Folder: ''
12+
Debug Mode: 'Inactive'
13+
Start Age: 0
14+
End Age: 250
15+
Start Year: N/A
16+
End Year: N/A
17+
Increment: 10
18+
Inc. Ref Year: No
19+
Inc. Crnt Year: No
20+
Inc. Spcl Year: Yes (-9)
21+
Back Grow Enabled: Yes
22+
Forward Grow Enabled: Yes
23+
24+
Processing Polygon 2493719: '' '092H014'-600
25+
Processing Polygon 2558002: '' '092H073'-2185
26+
Processing Polygon 6212668: '' '092H025'-388
27+
Processing Polygon 8489172: '' '092G089'-51042508
28+
Processing Polygon 9884561: '' '083D056'-30790200
29+
Processing Polygon 13727877: '' '093C085'-3402903
30+
Processing Polygon 14330826: '' '093G045'-85306886
31+
Processing Polygon 14473383: '' '092G028'-7489355
32+
Processing Polygon 15138818: '' '093C080'-42373828
33+
34+
Processing Summary:
35+
Polygons Processed: 9
36+
Polygons Skipped: 0
37+
-------
38+
9
39+

0 commit comments

Comments
 (0)