Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
957e4a5
swapping python version to 3.11
BryonLewis Mar 4, 2024
df808b4
add libgdal-dev to CI
BryonLewis Mar 6, 2024
953fc91
gdal dependency adjustment
BryonLewis Mar 6, 2024
d8ff930
initial 3.11 python version
BryonLewis May 8, 2024
c99fd45
initial vue 2.7 upgrade working
BryonLewis May 9, 2024
f5564d3
resolving build issues
BryonLewis May 10, 2024
cf53fd5
Merge branch 'main' into python-311-update
BryonLewis May 10, 2024
bf01a70
updating tests
BryonLewis May 10, 2024
8a9f79f
reverting node builder
BryonLewis May 10, 2024
265fb46
removing vue template checker (vuetify issues)
BryonLewis May 10, 2024
f884901
removing template linting
BryonLewis May 10, 2024
d1be46a
updating vuetify version
BryonLewis May 14, 2024
2e8343f
linting
BryonLewis May 14, 2024
bae7baf
revert linting
BryonLewis May 20, 2024
6f159aa
lockfile
BryonLewis May 20, 2024
7ea1ab0
Merge branch 'main' into python-311-update
BryonLewis May 22, 2024
207a11e
initial vite conversion, vuetify plugin GWC issues
BryonLewis May 23, 2024
6cb0a93
Merge branch 'main' into python-311-update
BryonLewis May 24, 2024
e6cc9e3
linting
BryonLewis May 24, 2024
7b18e5c
resolving integration tests
BryonLewis May 28, 2024
6128c68
Merge branch 'main' into python-311-update
BryonLewis May 28, 2024
e99a578
Merge branch 'main' into python-311-update
BryonLewis Jun 3, 2024
d133dbe
adding getUsers script
BryonLewis Jun 3, 2024
04096f3
lint
BryonLewis Jun 3, 2024
654ef07
Merge branch 'python-311-update' into vite-process
BryonLewis Jun 4, 2024
5d75b7b
vite unplugin update
BryonLewis Jun 4, 2024
e9d3591
addressing review comments
BryonLewis Jun 4, 2024
f47717c
Merge branch 'python-311-update' into vite-process
BryonLewis Jun 4, 2024
928b5df
forgot to enable default-param-last eslint config
BryonLewis Jun 4, 2024
0b69342
Merge branch 'main' into vite-process
BryonLewis Jun 5, 2024
d9f945d
Merge branch 'vite-process' of github.com:Kitware/dive into vite-process
BryonLewis Jun 5, 2024
768caaf
Merge branch 'main' into vite-process
BryonLewis Jun 13, 2024
3ef084c
starting to utilize different vite configs for different builds
BryonLewis Jun 18, 2024
1769129
building updated
BryonLewis Jun 19, 2024
33a49c6
update base for the static paths
BryonLewis Jun 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions client/.env.production
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
VUE_APP_STATIC_PATH=./static/viame/
VUE_APP_GTAG=UA-6042509-43
VUE_APP_SENTRY_DSN=https://0ec02775cc734df98134cecf5c91f782@o267860.ingest.sentry.io/5436001
VITE_APP_STATIC_PATH=/static/viame/
VITE_APP_GTAG=UA-6042509-43
VITE_APP_SENTRY_DSN=https://0ec02775cc734df98134cecf5c91f782@o267860.ingest.sentry.io/5436001
1 change: 0 additions & 1 deletion client/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ node_modules
# local env files
.env.local
.env.*.local

# Log files
npm-debug.log*
yarn-debug.log*
Expand Down
8 changes: 4 additions & 4 deletions client/vue.config.js → client/_vue.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ const SentryPlugin = require('@sentry/webpack-plugin');

const keepAliveAgent = new http.Agent({ keepAlive: true });

process.env.VUE_APP_GIT_HASH = gitDescribeSync().hash;
process.env.VUE_APP_VERSION = packagejson.version;
process.env.VITE_APP_GIT_HASH = gitDescribeSync().hash;
process.env.VITE_APP_VERSION = packagejson.version;

function chainWebpack(config) {
config.output.strictModuleExceptionHandling(true);
Expand All @@ -30,7 +30,7 @@ function chainWebpack(config) {
include: './dist',
org: 'kitware-data',
project: 'viame-web-client',
release: process.env.VUE_APP_GIT_HASH
release: process.env.VITE_APP_GIT_HASH
}]);
}
config.module
Expand All @@ -57,7 +57,7 @@ module.exports = {
},
},
productionSourceMap: true,
publicPath: process.env.VUE_APP_STATIC_PATH,
publicPath: process.env.VITE_APP_STATIC_PATH,
chainWebpack,
pluginOptions: {
electronBuilder: {
Expand Down
3 changes: 0 additions & 3 deletions client/babel.config.js

This file was deleted.

113 changes: 113 additions & 0 deletions client/components.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
/* eslint-disable */
/* prettier-ignore */
// @ts-nocheck
// Generated by unplugin-vue-components
// Read more: https://github.com/vuejs/core/pull/3399
export {}

declare module 'vue' {
export interface GlobalComponents {
AttributeFilters: typeof import('./src/components/AttributeFilters.vue')['default']
AttributeKeyFilter: typeof import('./src/components/AttributeFilter/AttributeKeyFilter.vue')['default']
AttributeKeyFilterSettings: typeof import('./src/components/AttributeFilter/AttributeKeyFilterSettings.vue')['default']
AttributeNumberFilter: typeof import('./src/components/AttributeFilter/AttributeNumberFilter.vue')['default']
AttributeNumberFilterSettings: typeof import('./src/components/AttributeFilter/AttributeNumberFilterSettings.vue')['default']
AttributeStringFilter: typeof import('./src/components/AttributeFilter/AttributeStringFilter.vue')['default']
AttributeStringFilterSettings: typeof import('./src/components/AttributeFilter/AttributeStringFilterSettings.vue')['default']
AttributeTimeline: typeof import('./src/components/AttributeTimeline.vue')['default']
AttributeTrackFilters: typeof import('./src/components/AttributeTrackFilters.vue')['default']
Controls: typeof import('./src/components/controls/Controls.vue')['default']
EventChart: typeof import('./src/components/controls/EventChart.vue')['default']
FileNameTimeDisplay: typeof import('./src/components/controls/FileNameTimeDisplay.vue')['default']
FilterList: typeof import('./src/components/FilterList.vue')['default']
GroupEditor: typeof import('./src/components/GroupEditor.vue')['default']
GroupItem: typeof import('./src/components/GroupItem.vue')['default']
GroupList: typeof import('./src/components/GroupList.vue')['default']
ImageAnnotator: typeof import('./src/components/annotators/ImageAnnotator.vue')['default']
ImageEnhancements: typeof import('./src/components/ImageEnhancements.vue')['default']
LargeImageAnnotator: typeof import('./src/components/annotators/LargeImageAnnotator.vue')['default']
LayerManager: typeof import('./src/components/LayerManager.vue')['default']
LineChart: typeof import('./src/components/controls/LineChart.vue')['default']
RangeEditor: typeof import('./src/components/RangeEditor.vue')['default']
RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView']
Timeline: typeof import('./src/components/controls/Timeline.vue')['default']
TooltipButton: typeof import('./src/components/TooltipButton.vue')['default']
TrackItem: typeof import('./src/components/TrackItem.vue')['default']
TrackList: typeof import('./src/components/TrackList.vue')['default']
TypeEditor: typeof import('./src/components/TypeEditor.vue')['default']
TypeItem: typeof import('./src/components/TypeItem.vue')['default']
TypePicker: typeof import('./src/components/TypePicker.vue')['default']
VAlert: typeof import('vuetify/lib')['VAlert']
VApp: typeof import('vuetify/lib')['VApp']
VAppBar: typeof import('vuetify/lib')['VAppBar']
VBadge: typeof import('vuetify/lib')['VBadge']
VBanner: typeof import('vuetify/lib')['VBanner']
VBreadcrumbs: typeof import('vuetify/lib')['VBreadcrumbs']
VBreadcrumbsItem: typeof import('vuetify/lib')['VBreadcrumbsItem']
VBtn: typeof import('vuetify/lib')['VBtn']
VCard: typeof import('vuetify/lib')['VCard']
VCardActions: typeof import('vuetify/lib')['VCardActions']
VCardSubtitle: typeof import('vuetify/lib')['VCardSubtitle']
VCardText: typeof import('vuetify/lib')['VCardText']
VCardTitle: typeof import('vuetify/lib')['VCardTitle']
VCheckbox: typeof import('vuetify/lib')['VCheckbox']
VChip: typeof import('vuetify/lib')['VChip']
VCol: typeof import('vuetify/lib')['VCol']
VColorPicker: typeof import('vuetify/lib')['VColorPicker']
VCombobox: typeof import('vuetify/lib')['VCombobox']
VContainer: typeof import('vuetify/lib')['VContainer']
VDataTable: typeof import('vuetify/lib')['VDataTable']
VDialog: typeof import('vuetify/lib')['VDialog']
VDivider: typeof import('vuetify/lib')['VDivider']
VExpansionPanel: typeof import('vuetify/lib')['VExpansionPanel']
VExpansionPanelContent: typeof import('vuetify/lib')['VExpansionPanelContent']
VExpansionPanelHeader: typeof import('vuetify/lib')['VExpansionPanelHeader']
VExpansionPanels: typeof import('vuetify/lib')['VExpansionPanels']
VFileInput: typeof import('vuetify/lib')['VFileInput']
VForm: typeof import('vuetify/lib')['VForm']
VIcon: typeof import('vuetify/lib')['VIcon']
VideoAnnotator: typeof import('./src/components/annotators/VideoAnnotator.vue')['default']
VList: typeof import('vuetify/lib')['VList']
VListItem: typeof import('vuetify/lib')['VListItem']
VListItemAction: typeof import('vuetify/lib')['VListItemAction']
VListItemActionText: typeof import('vuetify/lib')['VListItemActionText']
VListItemContent: typeof import('vuetify/lib')['VListItemContent']
VListItemIcon: typeof import('vuetify/lib')['VListItemIcon']
VListItemSubtitle: typeof import('vuetify/lib')['VListItemSubtitle']
VListItemTitle: typeof import('vuetify/lib')['VListItemTitle']
VMain: typeof import('vuetify/lib')['VMain']
VMenu: typeof import('vuetify/lib')['VMenu']
VProgressCircular: typeof import('vuetify/lib')['VProgressCircular']
VProgressLinear: typeof import('vuetify/lib')['VProgressLinear']
VRadio: typeof import('vuetify/lib')['VRadio']
VRadioGroup: typeof import('vuetify/lib')['VRadioGroup']
VRangeSlider: typeof import('vuetify/lib')['VRangeSlider']
VRow: typeof import('vuetify/lib')['VRow']
VSelect: typeof import('vuetify/lib')['VSelect']
VSlider: typeof import('vuetify/lib')['VSlider']
VSlideXTransition: typeof import('vuetify/lib')['VSlideXTransition']
VSlideYReverseTransition: typeof import('vuetify/lib')['VSlideYReverseTransition']
VSlideYTransition: typeof import('vuetify/lib')['VSlideYTransition']
VSpacer: typeof import('vuetify/lib')['VSpacer']
VStepper: typeof import('vuetify/lib')['VStepper']
VStepperContent: typeof import('vuetify/lib')['VStepperContent']
VStepperHeader: typeof import('vuetify/lib')['VStepperHeader']
VStepperItems: typeof import('vuetify/lib')['VStepperItems']
VStepperStep: typeof import('vuetify/lib')['VStepperStep']
VSubheader: typeof import('vuetify/lib')['VSubheader']
VSwitch: typeof import('vuetify/lib')['VSwitch']
VTab: typeof import('vuetify/lib')['VTab']
VTabItem: typeof import('vuetify/lib')['VTabItem']
VTabs: typeof import('vuetify/lib')['VTabs']
VTabsItems: typeof import('vuetify/lib')['VTabsItems']
VTabsSlider: typeof import('vuetify/lib')['VTabsSlider']
VTextarea: typeof import('vuetify/lib')['VTextarea']
VTextField: typeof import('vuetify/lib')['VTextField']
VToolbar: typeof import('vuetify/lib')['VToolbar']
VToolbarItems: typeof import('vuetify/lib')['VToolbarItems']
VToolbarTitle: typeof import('vuetify/lib')['VToolbarTitle']
VTooltip: typeof import('vuetify/lib')['VTooltip']
VVirtualScroll: typeof import('vuetify/lib')['VVirtualScroll']
}
}
2 changes: 1 addition & 1 deletion client/dive-common/components/NavigationTitle.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default {
},
computed: {
version() {
return process.env.VUE_APP_GIT_HASH;
return process.env.VITE_APP_GIT_HASH;
},
},
};
Expand Down
18 changes: 18 additions & 0 deletions client/electron-builder.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"appId": "com.example.yourapp",
"files": [
"dist/**/*",
"node_modules/**/*",
"package.json"
],
"mac": {
"category": "public.app-category.utilities"
},
"win": {
"target": "nsis"
},
"linux": {
"target": "AppImage"
}
}

13 changes: 13 additions & 0 deletions client/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!DOCTYPE html>
<html lang="en" style="overflow-y:hidden">
<head>
<meta charset="UTF-8" />
<link rel="icon" href="./favicon.ico">
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>DIVE</title>
</head>
<body>
<div id="app"></div>
<script type="module" src="/platform/desktop/main.ts"></script>
</body>
</html>
13 changes: 13 additions & 0 deletions client/index.web.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!DOCTYPE html>
<html lang="en" style="overflow-y:hidden">
<head>
<meta charset="UTF-8" />
<link rel="icon" href="./favicon.ico">
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>DIVE</title>
</head>
<body>
<div id="app"></div>
<script type="module" src="/platform/web-girder/main.ts"></script>
</body>
</html>
Loading