Skip to content

Commit

Permalink
Realised vuetify 2 doesnt support vue 3 :(£
Browse files Browse the repository at this point in the history
  • Loading branch information
Toby Twigger committed Jun 25, 2023
1 parent 937624e commit 6208eb4
Show file tree
Hide file tree
Showing 12 changed files with 799 additions and 776 deletions.
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ services:
dockerfile: Dockerfile.postgis
args:
POSTGIS_MAJOR: '3'
POSTGIS_VERSION: '3.3.2+dfsg-1.pgdg110+1'
POSTGIS_VERSION: '3.3.3+dfsg-1.pgdg120+1'
image: postgres-14/app
ports:
- '${FORWARD_DB_PORT:-5432}:5432'
Expand Down
1,315 changes: 671 additions & 644 deletions package-lock.json
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
"production": "mix --production"
},
"devDependencies": {
"@vue/compat": "^3.1.0",
"@vue/compiler-sfc": "^3.3.4",
"acorn": "^8.7.0",
"axios": "^0.21.4",
"chart.js": "^3.6.2",
Expand All @@ -26,9 +28,7 @@
"uuid": "^3.4.0",
"vue": "^3.3.4",
"vue-loader": "^16.0.0-rc.1",
"@vue/compiler-sfc": "^3.3.4",
"webpack-plugin-vuetify": "^2.0.1",
"@vue/compat": "^3.1.0"
"webpack-plugin-vuetify": "^2.0.1"
},
"dependencies": {
"@bruit/component": "^1.3.15",
Expand Down
21 changes: 10 additions & 11 deletions resources/js/app.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import {createInertiaApp, Link} from '@inertiajs/inertia-vue';
import { InertiaProgress } from '@inertiajs/progress';
import {createInertiaApp, Link} from '@inertiajs/vue3';
const appName = window.document.getElementsByTagName('title')[0]?.innerText || 'Laravel';
import { createApp, h } from 'vue';
import {createVuetify} from 'vuetify'
Expand All @@ -11,31 +10,31 @@ import JobStatus from '@tobytwigger/laravel-job-status-vue';
require('./bootstrap');
import { applyPolyfills, defineCustomElements } from '@bruit/component/loader';
Vue.config.ignoredElements = [/bruit-\w*/];
Vue.use(Settings, {
axios: axios
});
Vue.use(JobStatus, {
axios: axios,
url: '/_api'
});


applyPolyfills().then(() => {
defineCustomElements(window);
});

createInertiaApp({
progress: { color: '#4B5563' },
title: (title) => `${title} - ${appName}`,
resolve: (name) => require(`./pages/${name}.vue`),
setup({ el, app, props }) {
setup({ el, App, props }) {
createApp({ render: () => h(App, props) })
.use(createVuetify({
icons: {
iconfont: 'mdiSvg',
},
}))
.use(JobStatus, {
axios: axios,
url: '/_api'
})
.use(Settings, {
axios: axios
})
.mount(el)
},
})

InertiaProgress.init({ color: '#4B5563' });
2 changes: 1 addition & 1 deletion resources/js/bootstrap.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ window.axios.defaults.withCredentials = true;
*/
import VueEasyLightbox from 'vue-easy-lightbox'
import UiKit from 'ui/install';
import {Link} from '@inertiajs/inertia-vue';
import {Link} from '@inertiajs/vue3';

Vue.use(UiKit);
Vue.use(VueEasyLightbox);
Expand Down
215 changes: 107 additions & 108 deletions resources/js/pages/Activity/Show.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,112 +31,112 @@

<v-tabs-items v-model="tab">
<v-tab-item value="tab-summary">
<c-job-status job="load-strava-activity" :tags="{activity_id: activity.id}">
<template v-slot:incomplete>
<v-progress-circular
indeterminate
color="primary"
></v-progress-circular>
</template>
</c-job-status>
<!-- <c-job-status job="load-strava-activity" :tags="{activity_id: activity.id}">-->
<!-- <template v-slot:incomplete>-->
<!-- <v-progress-circular-->
<!-- indeterminate-->
<!-- color="primary"-->
<!-- ></v-progress-circular>-->
<!-- </template>-->
<!-- </c-job-status>-->

<v-row v-if="activity.stats.length === 0">
<v-col v-if="jobStatus === null || jobStatus.status === 'succeeded'">
<span v-if="activity.file_id">
Activity analysis incomplete. Please contact support at [email protected].
</span>
<span v-else>
No path data available. Please upload the recording of your activity.
</span>
</v-col>
<v-col v-else>
<c-loading-from-job-status title="Analysing activity" :job-status="jobStatus">
<!-- <v-row v-if="activity.stats.length === 0">-->
<!-- <v-col v-if="jobStatus === null || jobStatus.status === 'succeeded'">-->
<!-- <span v-if="activity.file_id">-->
<!-- Activity analysis incomplete. Please contact support at [email protected].-->
<!-- </span>-->
<!-- <span v-else>-->
<!-- No path data available. Please upload the recording of your activity.-->
<!-- </span>-->
<!-- </v-col>-->
<!-- <v-col v-else>-->
<!-- <c-loading-from-job-status title="Analysing activity" :job-status="jobStatus">-->

</c-loading-from-job-status>
</v-col>
</v-row>
<v-row v-else>
<v-col :sm="12" :md="6">
<!-- </c-loading-from-job-status>-->
<!-- </v-col>-->
<!-- </v-row>-->
<!-- <v-row v-else>-->
<!-- <v-col :sm="12" :md="6">-->

<v-list flat>
<v-list-item v-if="activity.description">
<v-list-item-icon>
<v-tooltip left>
<template v-slot:activator="{ on, attrs }">
<v-icon
v-bind="attrs"
v-on="on">
mdi-text
</v-icon>
</template>
<span>Activity description</span>
</v-tooltip>
</v-list-item-icon>
<v-list-item-content>
<v-list-item-title v-text="activity.description"></v-list-item-title>
</v-list-item-content>
</v-list-item>
<v-list-item v-if="startedAt">
<v-list-item-icon>
<v-tooltip left>
<template v-slot:activator="{ on, attrs }">
<v-icon
v-bind="attrs"
v-on="on">
mdi-calendar-clock
</v-icon>
</template>
<span>Started at</span>
</v-tooltip>
</v-list-item-icon>
<v-list-item-content>
<v-list-item-title v-text="startedAt.value"></v-list-item-title>
</v-list-item-content>
</v-list-item>
<v-list-item v-if="humanStartedAt && humanEndedAt">
<v-list-item-icon>
<v-tooltip left>
<template v-slot:activator="{ on, attrs }">
<v-icon
v-bind="attrs"
v-on="on">
mdi-map-marker
</v-icon>
</template>
<span>Activity start/end points</span>
</v-tooltip>
</v-list-item-icon>
<v-list-item-content>
<c-activity-location-summary v-if="hasStats" :started-at="humanStartedAt" :ended-at="humanEndedAt"></c-activity-location-summary>
</v-list-item-content>
</v-list-item>
</v-list>
</v-col>
<v-col>
<c-stats v-if="hasStats" :schema="statSchema" :limit="4"></c-stats>
<div v-else>
<c-stats-loading>
<!-- <v-list flat>-->
<!-- <v-list-item v-if="activity.description">-->
<!-- <v-list-item-icon>-->
<!-- <v-tooltip left>-->
<!-- <template v-slot:activator="{ on, attrs }">-->
<!-- <v-icon-->
<!-- v-bind="attrs"-->
<!-- v-on="on">-->
<!-- mdi-text-->
<!-- </v-icon>-->
<!-- </template>-->
<!-- <span>Activity description</span>-->
<!-- </v-tooltip>-->
<!-- </v-list-item-icon>-->
<!-- <v-list-item-content>-->
<!-- <v-list-item-title v-text="activity.description"></v-list-item-title>-->
<!-- </v-list-item-content>-->
<!-- </v-list-item>-->
<!-- <v-list-item v-if="startedAt">-->
<!-- <v-list-item-icon>-->
<!-- <v-tooltip left>-->
<!-- <template v-slot:activator="{ on, attrs }">-->
<!-- <v-icon-->
<!-- v-bind="attrs"-->
<!-- v-on="on">-->
<!-- mdi-calendar-clock-->
<!-- </v-icon>-->
<!-- </template>-->
<!-- <span>Started at</span>-->
<!-- </v-tooltip>-->
<!-- </v-list-item-icon>-->
<!-- <v-list-item-content>-->
<!-- <v-list-item-title v-text="startedAt.value"></v-list-item-title>-->
<!-- </v-list-item-content>-->
<!-- </v-list-item>-->
<!-- <v-list-item v-if="humanStartedAt && humanEndedAt">-->
<!-- <v-list-item-icon>-->
<!-- <v-tooltip left>-->
<!-- <template v-slot:activator="{ on, attrs }">-->
<!-- <v-icon-->
<!-- v-bind="attrs"-->
<!-- v-on="on">-->
<!-- mdi-map-marker-->
<!-- </v-icon>-->
<!-- </template>-->
<!-- <span>Activity start/end points</span>-->
<!-- </v-tooltip>-->
<!-- </v-list-item-icon>-->
<!-- <v-list-item-content>-->
<!-- <c-activity-location-summary v-if="hasStats" :started-at="humanStartedAt" :ended-at="humanEndedAt"></c-activity-location-summary>-->
<!-- </v-list-item-content>-->
<!-- </v-list-item>-->
<!-- </v-list>-->
<!-- </v-col>-->
<!-- <v-col>-->
<!-- <c-stats v-if="hasStats" :schema="statSchema" :limit="4"></c-stats>-->
<!-- <div v-else>-->
<!-- <c-stats-loading>-->

</c-stats-loading>
</div>
</v-col>
</v-row>
<v-row>
<v-col class="pa-8">
<c-job-status job="load-strava-stats" :tags="{activity_id: activity.id}">
<template v-slot:incomplete>
<v-progress-circular
indeterminate
color="primary"
></v-progress-circular>
</template>
</c-job-status>
<!-- <c-map v-if="hasStats && stats.linestring" :geojson="stats.linestring" :key="'map-' + stats.integration"></c-map>-->
<v-container>
<c-activity-map v-if="hasStats" :key="'map-' + stats.integration" :stats="stats"></c-activity-map>
</v-container>
</v-col>
</v-row>
<!-- </c-stats-loading>-->
<!-- </div>-->
<!-- </v-col>-->
<!-- </v-row>-->
<!-- <v-row>-->
<!-- <v-col class="pa-8">-->
<!-- <c-job-status job="load-strava-stats" :tags="{activity_id: activity.id}">-->
<!-- <template v-slot:incomplete>-->
<!-- <v-progress-circular-->
<!-- indeterminate-->
<!-- color="primary"-->
<!-- ></v-progress-circular>-->
<!-- </template>-->
<!-- </c-job-status>-->
<!--&lt;!&ndash; <c-map v-if="hasStats && stats.linestring" :geojson="stats.linestring" :key="'map-' + stats.integration"></c-map>&ndash;&gt;-->
<!-- <v-container>-->
<!-- <c-activity-map v-if="hasStats" :key="'map-' + stats.integration" :stats="stats"></c-activity-map>-->
<!-- </v-container>-->
<!-- </v-col>-->
<!-- </v-row>-->
</v-tab-item>
<v-tab-item value="tab-analysis">
<c-activity-analysis :activity="activity"></c-activity-analysis>
Expand Down Expand Up @@ -177,22 +177,21 @@

<v-col>
<v-list two-line v-if="hasComments">
<v-subheader>Comments
<v-subheader>
Comments
<v-badge :value="commentsCount" :content="commentsCount" inline></v-badge>
</v-subheader>

<template v-for="comment in comments">
<v-list-item
:key="comment.id"
>
<div v-for="comment in comments" :key="comment.id">
<v-list-item>
<v-list-item-content>
<v-list-item-title>{{ comment.name }}</v-list-item-title>
<v-list-item-subtitle>
<span class="text--primary">{{formatDateTime(comment.posted_at)}}</span>
&mdash; {{comment.text}} </v-list-item-subtitle>
</v-list-item-content>
</v-list-item>
</template>
</div>
</v-list>
</v-col>
</v-row>
Expand Down
2 changes: 1 addition & 1 deletion resources/js/pages/Auth/TwoFactorChallenge.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
</template>

<script>
import { Head } from '@inertiajs/inertia-vue';
import { Head } from '@inertiajs/vue3';
import CAuthWrapper from 'ui/layouts/CAuthWrapper';
export default {
Expand Down
2 changes: 0 additions & 2 deletions resources/js/pages/Place/Index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
</template>
</c-iterator>

</c-pagination-iterator>

<template #headerActions>
<c-place-form title="Add new place" button-text="Create">
<template v-slot:activator="{trigger, showing}">
Expand Down
4 changes: 2 additions & 2 deletions resources/js/ui/components/Settings/CStatsOrderSetting.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<draggable
v-model="schema"
>
<template v-for="(source, index) in schema">
<v-list-item :key="source.value">
<template v-for="(source, index) in schema" :key="source.value">
<v-list-item>
<v-list-item-icon>
<v-icon>mdi-menu</v-icon>
</v-list-item-icon>
Expand Down
2 changes: 1 addition & 1 deletion resources/js/ui/layouts/CAppWrapper.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
</template>

<script>
import {Head} from '@inertiajs/inertia-vue';
import {Head} from '@inertiajs/vue3';
import CAppNavBar from '../components/Page/CAppNavBar';
import CSidebar from '../components/Page/CSidebar';
import CBasePage from './CVuetifyWrapper';
Expand Down
2 changes: 1 addition & 1 deletion resources/js/ui/layouts/CAuthWrapper.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</template>

<script>
import { Head } from '@inertiajs/inertia-vue';
import { Head } from '@inertiajs/vue3';
import CPublicNavBar from '../components/Page/CPublicNavBar';
import CSidebar from '../components/Page/CSidebar';
import CBasePage from './CVuetifyWrapper';
Expand Down
2 changes: 1 addition & 1 deletion resources/js/ui/layouts/CPublicWrapper.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</template>

<script>
import { Head } from '@inertiajs/inertia-vue';
import { Head } from '@inertiajs/vue3';
import CPublicNavBar from '../components/Page/CPublicNavBar';
import CSidebar from '../components/Page/CSidebar';
import CBasePage from './CVuetifyWrapper';
Expand Down

0 comments on commit 6208eb4

Please sign in to comment.