Alexander/FitTrackee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ui-minor-fix' into dev

Browse Source
This commit is contained in:
Sam 2021-11-14 21:13:18 +01:00
commit ffed7d64db
15 changed files with 40 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fittrackee/dist/index.html vendored
View File

@ -1 +1 @@
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><!--[if IE]><link rel="icon" href="/favicon.ico"><![endif]--><link rel="stylesheet" href="/static/css/fork-awesome.min.css"><link rel="stylesheet" href="/static/css/leaflet.css"><title>FitTrackee</title><link href="/static/css/admin.babfd43e.css" rel="prefetch"><link href="/static/css/main.f9856c63.css" rel="prefetch"><link href="/static/css/main~workouts.0edb3403.css" rel="prefetch"><link href="/static/css/profile.05400f70.css" rel="prefetch"><link href="/static/css/reset.46776e72.css" rel="prefetch"><link href="/static/css/workouts.84cbed34.css" rel="prefetch"><link href="/static/js/admin.2f1d393d.js" rel="prefetch"><link href="/static/js/chunk-2d0c9189.c81458cc.js" rel="prefetch"><link href="/static/js/chunk-2d0cf391.020c75ea.js" rel="prefetch"><link href="/static/js/chunk-2d0da8f3.c8c3e7e8.js" rel="prefetch"><link href="/static/js/chunk-2d2248b6.d84473c1.js" rel="prefetch"><link href="/static/js/chunk-2d22523a.4b710d99.js" rel="prefetch"><link href="/static/js/main.23f4d3a6.js" rel="prefetch"><link href="/static/js/main~workouts.6afa0411.js" rel="prefetch"><link href="/static/js/profile.62578012.js" rel="prefetch"><link href="/static/js/reset.518e646f.js" rel="prefetch"><link href="/static/js/workouts.ca9449b1.js" rel="prefetch"><link href="/static/css/app.2b8c39ab.css" rel="preload" as="style"><link href="/static/js/app.28d0829a.js" rel="preload" as="script"><link href="/static/js/chunk-vendors.caa4fc1c.js" rel="preload" as="script"><link href="/static/css/app.2b8c39ab.css" rel="stylesheet"><link rel="icon" type="image/png" sizes="32x32" href="/img/icons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/img/icons/favicon-16x16.png"><link rel="manifest" href="/manifest.json"><meta name="theme-color" content="#4DBA87"><meta name="apple-mobile-web-app-capable" content="no"><meta name="apple-mobile-web-app-status-bar-style" content="default"><meta name="apple-mobile-web-app-title" content="fittrackee_client"><link rel="apple-touch-icon" href="/img/icons/apple-touch-icon-152x152.png"><link rel="mask-icon" href="/img/icons/safari-pinned-tab.svg" color="#4DBA87"><meta name="msapplication-TileImage" content="/img/icons/msapplication-icon-144x144.png"><meta name="msapplication-TileColor" content="#000000"></head><body><noscript><strong>We're sorry but FitTrackee doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/static/js/chunk-vendors.caa4fc1c.js"></script><script src="/static/js/app.28d0829a.js"></script></body></html>
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><!--[if IE]><link rel="icon" href="/favicon.ico"><![endif]--><link rel="stylesheet" href="/static/css/fork-awesome.min.css"><link rel="stylesheet" href="/static/css/leaflet.css"><title>FitTrackee</title><link href="/static/css/admin.babfd43e.css" rel="prefetch"><link href="/static/css/main.7f7a365e.css" rel="prefetch"><link href="/static/css/main~workouts.0edb3403.css" rel="prefetch"><link href="/static/css/profile.05400f70.css" rel="prefetch"><link href="/static/css/reset.46776e72.css" rel="prefetch"><link href="/static/css/workouts.84cbed34.css" rel="prefetch"><link href="/static/js/admin.2f1d393d.js" rel="prefetch"><link href="/static/js/chunk-2d0c9189.c81458cc.js" rel="prefetch"><link href="/static/js/chunk-2d0cf391.020c75ea.js" rel="prefetch"><link href="/static/js/chunk-2d0da8f3.c8c3e7e8.js" rel="prefetch"><link href="/static/js/chunk-2d2248b6.d84473c1.js" rel="prefetch"><link href="/static/js/chunk-2d22523a.4b710d99.js" rel="prefetch"><link href="/static/js/main.aa7fcffc.js" rel="prefetch"><link href="/static/js/main~workouts.6afa0411.js" rel="prefetch"><link href="/static/js/profile.62578012.js" rel="prefetch"><link href="/static/js/reset.518e646f.js" rel="prefetch"><link href="/static/js/workouts.ca9449b1.js" rel="prefetch"><link href="/static/css/app.2b8c39ab.css" rel="preload" as="style"><link href="/static/js/app.6471a147.js" rel="preload" as="script"><link href="/static/js/chunk-vendors.caa4fc1c.js" rel="preload" as="script"><link href="/static/css/app.2b8c39ab.css" rel="stylesheet"><link rel="icon" type="image/png" sizes="32x32" href="/img/icons/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/img/icons/favicon-16x16.png"><link rel="manifest" href="/manifest.json"><meta name="theme-color" content="#4DBA87"><meta name="apple-mobile-web-app-capable" content="no"><meta name="apple-mobile-web-app-status-bar-style" content="default"><meta name="apple-mobile-web-app-title" content="fittrackee_client"><link rel="apple-touch-icon" href="/img/icons/apple-touch-icon-152x152.png"><link rel="mask-icon" href="/img/icons/safari-pinned-tab.svg" color="#4DBA87"><meta name="msapplication-TileImage" content="/img/icons/msapplication-icon-144x144.png"><meta name="msapplication-TileColor" content="#000000"></head><body><noscript><strong>We're sorry but FitTrackee doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/static/js/chunk-vendors.caa4fc1c.js"></script><script src="/static/js/app.6471a147.js"></script></body></html>

16
fittrackee/dist/precache-manifest.d81ab1e239beb2ec33c92fe076422816.js → fittrackee/dist/precache-manifest.b2fffe2480dec51855b1b6caf598a8e0.js vendored
View File

@ -64,7 +64,7 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "/img/workouts/mountains.svg"
},
{
"revision": "a83d95cb780cb551f9c6e0257addee7a",
"revision": "f34e801fbe4c2fd5b262da59fa3396f2",
"url": "/index.html"
},
{
@ -80,7 +80,7 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "/static/css/admin.babfd43e.css"
},
{
"revision": "580dbac1a3cc1ff6f809",
"revision": "34b8f17a1f53ad3f88b0",
"url": "/static/css/app.2b8c39ab.css"
},
{
@ -92,8 +92,8 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "/static/css/leaflet.css"
},
{
"revision": "3e2dd5ce7fd86f47e0e5",
"url": "/static/css/main.f9856c63.css"
"revision": "1832b6aed4a370727f35",
"url": "/static/css/main.7f7a365e.css"
},
{
"revision": "ac1280c03a31a5894834",
@ -196,8 +196,8 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "/static/js/admin.2f1d393d.js"
},
{
"revision": "580dbac1a3cc1ff6f809",
"url": "/static/js/app.28d0829a.js"
"revision": "34b8f17a1f53ad3f88b0",
"url": "/static/js/app.6471a147.js"
},
{
"revision": "bd7d183c9f68e5f4027d",
@ -224,8 +224,8 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
"url": "/static/js/chunk-vendors.caa4fc1c.js"
},
{
"revision": "3e2dd5ce7fd86f47e0e5",
"url": "/static/js/main.23f4d3a6.js"
"revision": "1832b6aed4a370727f35",
"url": "/static/js/main.aa7fcffc.js"
},
{
"revision": "ac1280c03a31a5894834",

2
fittrackee/dist/service-worker.js vendored
View File

@ -14,7 +14,7 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
importScripts(
"/precache-manifest.d81ab1e239beb2ec33c92fe076422816.js"
"/precache-manifest.b2fffe2480dec51855b1b6caf598a8e0.js"
);
workbox.core.setCacheNameDetails({prefix: "fittrackee_client"});

1
fittrackee/dist/static/css/main.7f7a365e.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
fittrackee/dist/static/css/main.f9856c63.css vendored
View File

File diff suppressed because one or more lines are too long

2
fittrackee/dist/static/js/app.28d0829a.js vendored
View File

File diff suppressed because one or more lines are too long

1
fittrackee/dist/static/js/app.28d0829a.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
fittrackee/dist/static/js/app.6471a147.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
fittrackee/dist/static/js/app.6471a147.js.map vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
fittrackee/dist/static/js/main.23f4d3a6.js vendored
View File

File diff suppressed because one or more lines are too long

2
fittrackee/dist/static/js/main.aa7fcffc.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
fittrackee/dist/static/js/main.23f4d3a6.js.map → fittrackee/dist/static/js/main.aa7fcffc.js.map vendored
View File

File diff suppressed because one or more lines are too long

34
fittrackee_client/src/components/Administration/AppStatsCards.vue
View File

@ -2,18 +2,18 @@
<div id="user-stats">
<StatCard
icon="users"
:value="usersCount"
:text="$t('admin.USER', usersCount)"
:value="appStatistics.users"
:text="$t('admin.USER', appStatistics.users)"
/>
<StatCard
icon="tags"
:value="sportsCount"
:text="$t('workouts.SPORT', sportsCount)"
:value="appStatistics.sports"
:text="$t('workouts.SPORT', appStatistics.sports)"
/>
<StatCard
icon="calendar"
:value="workoutCount"
:text="$t('workouts.WORKOUT', workoutCount)"
:value="appStatistics.workouts"
:text="$t('workouts.WORKOUT', appStatistics.workouts)"
/>
<StatCard
icon="folder-open"
@ -24,32 +24,20 @@
</template>
<script setup lang="ts">
import { computed, withDefaults } from 'vue'
import { computed, toRefs } from 'vue'
import StatCard from '@/components/Common/StatCard.vue'
import { IAppStatistics } from '@/types/application'
import { getReadableFileSize } from '@/utils/files'
interface Props {
appStatistics?: IAppStatistics
appStatistics: IAppStatistics
}
const props = withDefaults(defineProps<Props>(), {
appStatistics: () => ({} as IAppStatistics),
})
const props = defineProps<Props>()
const { appStatistics } = toRefs(props)
const uploadDirSize = computed(() =>
props.appStatistics.uploads_dir_size
? getReadableFileSize(props.appStatistics.uploads_dir_size, false)
: { size: 0, suffix: 'bytes' }
)
const usersCount = computed(() =>
props.appStatistics.users ? props.appStatistics.users : 0
)
const sportsCount = computed(() =>
props.appStatistics.sports ? props.appStatistics.sports : 0
)
const workoutCount = computed(() =>
props.appStatistics.workouts ? props.appStatistics.workouts : 0
getReadableFileSize(appStatistics.value.uploads_dir_size, false)
)
</script>

4
fittrackee_client/src/components/Workout/WorkoutCard.vue
View File

@ -188,6 +188,7 @@
.workout-user-date {
display: flex;
justify-content: space-between;
align-items: flex-start;
padding: $default-padding * 0.5 $default-padding;
.workout-user {
display: flex;
@ -201,15 +202,18 @@
}
}
.workout-user-name {
white-space: nowrap;
padding-left: 5px;
}
}
.workout-date {
font-size: 0.85em;
font-style: italic;
white-space: nowrap;
}
.workout-title {
display: block;
text-align: center;
padding: 0 $default-padding;
@media screen and (max-width: $x-small-limit) {
display: none;

9
fittrackee_client/src/store/modules/root/state.ts
View File

@ -8,6 +8,13 @@ export const state: IRootState = {
language: 'en',
locale: enUS,
errorMessages: null,
application: <IApplication>{},
application: <IApplication>{
statistics: {
sports: 0,
uploads_dir_size: 0,
users: 0,
workouts: 0,
},
},
appLoading: false,
}