Skip to content

Commit cf6a9d4

Browse files
femansfemans
committed
organize directories, fixes #173 
1 parent a44bbd5 commit cf6a9d4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+79
-240
lines changed

‎src/App.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
</template>
1515

1616
<script>
17-
import AudioPlayer from '@/components/AudioPlayer.vue';
18-
import AppFooter from '@/components/AppFooter.vue';
17+
import AudioPlayer from '@/components/pageLayout/AudioPlayer.vue';
18+
import AppFooter from '@/components/pageLayout/AppFooter.vue';
1919
2020
export default {
2121
components: {

‎src/views/DetailView.vue renamed to ‎src/components/DetailView.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<script setup>
2-
import SettingsMenu from '@/components/SettingsMenu.vue';
2+
import SettingsMenu from '@/components/pageLayout/SettingsMenu.vue';
33
4-
import AudioDetail from '@/components/results/detail/AudioDetail.vue';
5-
import DocumentDetail from '@/components/results/detail/DocumentDetail.vue';
6-
import ImageDetail from '@/components/results/detail/ImageDetail.vue';
7-
import VideoDetail from '@/components/results/detail/VideoDetail.vue';
8-
import DirectoryDetail from '@/components/results/detail/DirectoryDetail.vue';
9-
import OtherDetail from '@/components/results/detail/OtherDetail.vue';
4+
import AudioDetail from '@/components/detailViewComponents/AudioDetail.vue';
5+
import DocumentDetail from '@/components/detailViewComponents/DocumentDetail.vue';
6+
import ImageDetail from '@/components/detailViewComponents/ImageDetail.vue';
7+
import VideoDetail from '@/components/detailViewComponents/VideoDetail.vue';
8+
import DirectoryDetail from '@/components/detailViewComponents/DirectoryDetail.vue';
9+
import OtherDetail from '@/components/detailViewComponents/OtherDetail.vue';
1010
1111
import { Types } from '@/helpers/typeHelper';
1212

‎src/views/HomeView.vue renamed to ‎src/components/HomeView.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<script setup>
22
import { useDisplay } from 'vuetify'
3-
import HomeViewCard from '@/views/HomeViewCard.vue';
4-
import SearchBar from '@/components/SearchBar.vue';
5-
import SettingsMenu from '@/components/SettingsMenu.vue';
3+
import HomeViewCard from '@/components/homeViewComponents/HomeViewCard.vue';
4+
import SearchBar from '@/components/pageLayout/SearchBar.vue';
5+
import SettingsMenu from '@/components/pageLayout/SettingsMenu.vue';
66
const { mdAndUp } = useDisplay()
77
</script>
88

‎src/views/SearchView.vue renamed to ‎src/components/SearchView.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<script setup>
2-
import SearchBar from '@/components/SearchBar.vue';
3-
import SearchFilters from '@/components/SearchFilters.vue';
4-
import SettingsMenu from '@/components/SettingsMenu.vue';
5-
import GenericList from '@/components/results/list/BaseList.vue';
6-
import ImageList from '@/components/results/list/ImageList.vue';
7-
import AudioList from '@/components/results/list/AudioList.vue';
8-
import VideoList from '@/components/results/list/VideoList.vue';
2+
import SearchBar from '@/components/pageLayout/SearchBar.vue';
3+
import SearchFilters from '@/components/searchViewComponents/subcomponents/SearchFilters.vue';
4+
import SettingsMenu from '@/components/pageLayout/SettingsMenu.vue';
5+
import GenericList from '@/components/searchViewComponents/BaseList.vue';
6+
import ImageList from '@/components/searchViewComponents/ImageList.vue';
7+
import AudioList from '@/components/searchViewComponents/AudioList.vue';
8+
import VideoList from '@/components/searchViewComponents/VideoList.vue';
99
1010
import { Types } from '@/helpers/typeHelper';
1111
@@ -16,7 +16,7 @@ const { smAndDown, mdAndUp } = useDisplay()
1616
<template>
1717
<div class="result">
1818
<!-- App bar with nested container, row and col component
19-
for layout logo and search bar using flex-->
19+
for layout logo and searchViewComponents bar using flex-->
2020
<v-app-bar
2121
app
2222
class="px-4"

‎src/components/results/detail/AudioDetail.vue renamed to ‎src/components/detailViewComponents/AudioDetail.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<script setup>
2-
import MediaHeader from '@/components/results/detail/SubComponents/MediaHeader.vue';
3-
import MetaDataPanel from '@/components/results/detail/SubComponents/MetaDataPanel.vue';
4-
import AudioDetailButton from '@/components/helpers/AudioDetailButton.vue';
2+
import MediaHeader from '@/components/detailViewComponents/SubComponents/MediaHeader.vue';
3+
import MetaDataPanel from '@/components/detailViewComponents/SubComponents/MetaDataPanel.vue';
4+
import AudioDetailButton from './SubComponents/AudioDetailButton.vue';
55
66
import { useDisplay } from 'vuetify'
77
const { mdAndUp } = useDisplay()
88
9-
import { useDetail, detailProps } from '@/components/results/detail/useDetail';
9+
import { useDetail, detailProps } from '@/composables/useDetail';
1010
const props = defineProps(detailProps)
1111
const { resourceUrl, file, active } = useDetail(props)
1212

‎src/components/results/detail/DirectoryDetail.vue renamed to ‎src/components/detailViewComponents/DirectoryDetail.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<script setup>
2-
import MetaDataPanel from '@/components/results/detail/SubComponents/MetaDataPanel.vue';
3-
import MediaHeader from '@/components/results/detail/SubComponents/MediaHeader.vue';
2+
import MetaDataPanel from '@/components/detailViewComponents/SubComponents/MetaDataPanel.vue';
3+
import MediaHeader from '@/components/detailViewComponents/SubComponents/MediaHeader.vue';
44
55
import { useDisplay } from 'vuetify'
66
const { mdAndUp } = useDisplay()
77
8-
import { useDetail, detailProps } from '@/components/results/detail/useDetail';
8+
import { useDetail, detailProps } from '@/composables/useDetail';
99
const props = defineProps(detailProps)
1010
const { resourceUrl, file, active } = useDetail(props)
1111
</script>

‎src/components/results/detail/DocumentDetail.vue renamed to ‎src/components/detailViewComponents/DocumentDetail.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<script setup>
2-
import MediaHeader from '@/components/results/detail/SubComponents/MediaHeader.vue';
3-
import DocumentViewer from '@/components/results/detail/SubComponents/DocumentViewer.vue';
4-
import MetaDataPanel from '@/components/results/detail/SubComponents/MetaDataPanel.vue';
2+
import MediaHeader from '@/components/detailViewComponents/SubComponents/MediaHeader.vue';
3+
import DocumentViewer from '@/components/detailViewComponents/SubComponents/DocumentViewer.vue';
4+
import MetaDataPanel from '@/components/detailViewComponents/SubComponents/MetaDataPanel.vue';
55
66
import { useDisplay } from 'vuetify'
77
const { mdAndUp } = useDisplay()
88
9-
import { useDetail, detailProps } from '@/components/results/detail/useDetail';
9+
import { useDetail, detailProps } from '@/composables/useDetail';
1010
const props = defineProps(detailProps)
1111
const { resourceUrl, file, active } = useDetail(props)
1212
</script>

‎src/components/results/detail/ImageDetail.vue renamed to ‎src/components/detailViewComponents/ImageDetail.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<script setup>
2-
import MediaHeader from '@/components/results/detail/SubComponents/MediaHeader.vue';
3-
import MetaDataPanel from '@/components/results/detail/SubComponents/MetaDataPanel.vue';
2+
import MediaHeader from '@/components/detailViewComponents/SubComponents/MediaHeader.vue';
3+
import MetaDataPanel from '@/components/detailViewComponents/SubComponents/MetaDataPanel.vue';
44
import '@/scss/blurExplicitImages.scss';
55
66
import { useDisplay } from 'vuetify'
77
const { mdAndUp } = useDisplay()
88
9-
import { useDetail, detailProps } from '@/components/results/detail/useDetail';
9+
import { useDetail, detailProps } from '@/composables/useDetail';
1010
const props = defineProps(detailProps)
1111
const { resourceUrl, file, active } = useDetail(props)
1212

‎src/components/results/detail/OtherDetail.vue renamed to ‎src/components/detailViewComponents/OtherDetail.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<script setup>
2-
import MediaHeader from '@/components/results/detail/SubComponents/MediaHeader.vue';
3-
import MetaDataPanel from '@/components/results/detail/SubComponents/MetaDataPanel.vue';
2+
import MediaHeader from '@/components/detailViewComponents/SubComponents/MediaHeader.vue';
3+
import MetaDataPanel from '@/components/detailViewComponents/SubComponents/MetaDataPanel.vue';
44
55
import { useDisplay } from 'vuetify'
66
const { mdAndUp } = useDisplay()
77
8-
import { useDetail, detailProps } from '@/components/results/detail/useDetail';
8+
import { useDetail, detailProps } from '@/composables/useDetail';
99
const props = defineProps(detailProps)
1010
const { resourceUrl, file, active } = useDetail(props)
1111
</script>

‎src/components/helpers/AudioDetailButton.vue renamed to ‎src/components/detailViewComponents/SubComponents/AudioDetailButton.vue

File renamed without changes.

‎src/components/results/detail/SubComponents/CopyHashButton.vue renamed to ‎src/components/detailViewComponents/SubComponents/CopyHashButton.vue

File renamed without changes.

‎src/components/results/detail/SubComponents/DocumentViewer.vue renamed to ‎src/components/detailViewComponents/SubComponents/DocumentViewer.vue

File renamed without changes.

‎src/components/results/detail/SubComponents/DownloadButton.vue renamed to ‎src/components/detailViewComponents/SubComponents/DownloadButton.vue

File renamed without changes.

‎src/components/results/detail/SubComponents/MediaHeader.vue renamed to ‎src/components/detailViewComponents/SubComponents/MediaHeader.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<script setup>
2-
import DownloadButton from '@/components/results/detail/SubComponents/DownloadButton.vue';
3-
import CopyHashButton from '@/components/results/detail/SubComponents/CopyHashButton.vue';
2+
import DownloadButton from '@/components/detailViewComponents/SubComponents/DownloadButton.vue';
3+
import CopyHashButton from '@/components/detailViewComponents/SubComponents/CopyHashButton.vue';
44
import prettyBytes from 'pretty-bytes';
5-
import { detailProps, useDetail } from '@/components/results/detail/useDetail';
5+
import { detailProps, useDetail } from '@/composables/useDetail';
66
77
const props = defineProps(detailProps)
88
const { resourceUrl, file, active } = useDetail(props)

‎src/components/results/detail/SubComponents/MetaDataPanel.vue renamed to ‎src/components/detailViewComponents/SubComponents/MetaDataPanel.vue

File renamed without changes.

‎src/components/VideoPlayer.vue renamed to ‎src/components/detailViewComponents/SubComponents/VideoPlayer.vue

File renamed without changes.

‎src/components/results/detail/VideoDetail.vue renamed to ‎src/components/detailViewComponents/VideoDetail.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<script setup>
2-
import MediaHeader from '@/components/results/detail/SubComponents/MediaHeader.vue';
3-
import MetaDataPanel from '@/components/results/detail/SubComponents/MetaDataPanel.vue';
2+
import MediaHeader from '@/components/detailViewComponents/SubComponents/MediaHeader.vue';
3+
import MetaDataPanel from '@/components/detailViewComponents/SubComponents/MetaDataPanel.vue';
44
import 'video.js/dist/video-js.css';
55
66
import { useDisplay } from 'vuetify'
77
const { mdAndUp } = useDisplay()
88
9-
import { useDetail, detailProps } from '@/components/results/detail/useDetail';
9+
import { useDetail, detailProps } from '@/composables/useDetail';
1010
const props = defineProps(detailProps)
1111
const { resourceUrl, file, active } = useDetail(props)
1212
</script>
@@ -67,7 +67,7 @@ const { resourceUrl, file, active } = useDetail(props)
6767
</template>
6868

6969
<script>
70-
import VideoPlayer from '@/components/VideoPlayer.vue';
70+
import VideoPlayer from '@/components/detailViewComponents/SubComponents/VideoPlayer.vue';
7171
7272
export default {
7373
components: {

‎src/views/HomeViewCard.vue renamed to ‎src/components/homeViewComponents/HomeViewCard.vue

File renamed without changes.

‎src/components/AppFooter.vue renamed to ‎src/components/pageLayout/AppFooter.vue

File renamed without changes.

‎src/components/AudioPlayer.vue renamed to ‎src/components/pageLayout/AudioPlayer.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ const { mdAndUp } = useDisplay()
5858
</v-icon>
5959
</v-img>
6060
</v-list-item-avatar>
61-
<!-- <v-list-item-content>-->
61+
<!-- <v-searchViewComponents-item-content>-->
6262
<v-list-item-title v-html="sourceFile.title" />
6363
<v-list-item-subtitle>
6464
<span v-html="sourceFile.author" />
6565
<span>{{ timer }} / {{ duration }}</span>
6666
</v-list-item-subtitle>
67-
<!-- </v-list-item-content>-->
67+
<!-- </v-searchViewComponents-item-content>-->
6868

6969
<div
7070
style="height: 100%;"

‎src/components/SearchBar.vue renamed to ‎src/components/pageLayout/SearchBar.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ export default {
137137
enterSearchPhrase() {
138138
if (this.$route.query.q !== this.searchPhraseProxy) {
139139
enterSearchQuery({ q: this.searchPhraseProxy });
140-
// We want to hide the keyboard after search has been done on Android
140+
// We want to hide the keyboard after searchViewComponents has been done on Android
141141
if (/android/i.test(navigator.userAgent)) {
142142
this.hideKeyBoardOnAndroid();
143143
}

‎src/components/SettingsMenu.vue renamed to ‎src/components/pageLayout/SettingsMenu.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ export default {
5454
},
5555
computed: {
5656
cogwheelColor() {
57-
// On detail page, in light theme, the top bar is white. So a dark icon is needed.
58-
// The detail page primary color is grey
57+
// On detailViewComponents page, in light theme, the top bar is white. So a dark icon is needed.
58+
// The detailViewComponents page primary color is grey
5959
if (this.$route.name === 'Detail' && !this.$store.state.localStorage.darkMode) {
6060
return theme.primary;
6161
}

‎src/components/results/list/infiniteComposable.js

Lines changed: 0 additions & 68 deletions
This file was deleted.

‎src/components/results/list/mixins/InfiniteScrollingMixin.js

Lines changed: 0 additions & 93 deletions
This file was deleted.

‎src/components/results/list/AudioList.vue renamed to ‎src/components/searchViewComponents/AudioList.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script setup>
2-
import { fileListComposable, fileListProps, imports } from './fileListComposable';
2+
import { fileListComposable, fileListProps, imports } from '../../composables/fileListComposable';
33
import ListBase from './BaseList.vue'
4-
import MediaCenterIcon from '@/components/results/list/subcomponents/MediaCenterIcon.vue';
4+
import MediaCenterIcon from '@/components/searchViewComponents/subcomponents/MediaCenterIcon.vue';
55
66
const { durationToColor, mime, prettyBytes } = imports;
77
const props = defineProps(fileListProps)

0 commit comments

Comments
 (0)