Skip to content

Commit 3036d01

Browse files
committed
remove drag and drop code: prep for next release
1 parent d8693f1 commit 3036d01

File tree

8 files changed

+28
-82
lines changed

8 files changed

+28
-82
lines changed

src/assets/scss/Global/basic.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ button {
8282
background-color: $gray4;
8383
border: solid 1px $gray3;
8484
font-weight: 700;
85+
cursor: pointer;
8586

8687
svg {
8788
transition: all 0.2s;

src/assets/scss/Global/index.scss

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
html {
1414
cursor: default !important;
1515
overflow: hidden;
16-
16+
1717
& > * {
1818
overflow: visible !important;
1919
}
@@ -41,8 +41,4 @@ body {
4141
width: 100%;
4242
height: 100%;
4343
}
44-
45-
a {
46-
cursor: default !important;
47-
}
4844
}

src/components/ArtistView/Header.vue

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,11 @@ function handleFav() {
102102
103103
.artist-page-header {
104104
display: grid;
105-
grid-template-columns: 50% 50%;
105+
grid-template-columns: 1fr minmax(min-content, 50%);
106106
position: relative;
107107
108108
.artist-img {
109-
width: 100%;
109+
// width: 100%;
110110
111111
img {
112112
height: 100%;
@@ -119,12 +119,7 @@ function handleFav() {
119119
120120
.gradient {
121121
position: absolute;
122-
background-image: linear-gradient(
123-
to left,
124-
transparent 10%,
125-
$gray 50%,
126-
$gray 100%
127-
);
122+
background-image: linear-gradient(to left, transparent 10%, $gray 50%, $gray 100%);
128123
height: 100%;
129124
width: 100%;
130125
}

src/components/FolderView/BreadCrumbNav.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ onUpdated(() => {
4343
.path {
4444
white-space: nowrap;
4545
margin: auto 0;
46+
cursor: pointer;
4647
4748
.text {
4849
padding: $smaller;

src/components/FolderView/FolderItem.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ function handleClick(e: MouseEvent) {
7373
grid-template-columns: max-content 1fr;
7474
align-items: center;
7575
background-color: $gray;
76-
transition: all 0.2s ease;
7776
border-radius: $medium;
7877
position: relative;
7978

src/components/FolderView/FolderList.vue

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<template>
2-
<div class="f-container rounded">
3-
<div
4-
id="f-items"
5-
class="rounded"
6-
:class="{ 'list-mode': settings.folder_list_mode }"
7-
>
2+
<div
3+
class="f-container rounded-sm"
4+
:class="{ 'list-mode': settings.folder_list_mode }"
5+
>
6+
<div id="f-items" class="rounded">
87
<FolderItem
98
v-for="folder in folders"
109
:key="folder.path"
@@ -28,18 +27,29 @@ const settings = useSettingsStore();
2827
</script>
2928

3029
<style lang="scss">
30+
.f-container {
31+
padding-bottom: 1.25rem;
32+
}
33+
3134
#f-items {
3235
display: grid;
3336
grid-template-columns: repeat(auto-fill, minmax(10rem, 1fr));
3437
gap: 1.5rem;
35-
padding-bottom: 1.25rem;
3638
}
3739
38-
#f-items.list-mode {
40+
.f-item:hover {
41+
// cursor: pointer;
42+
background-color: $gray5;
43+
}
44+
45+
.f-container.list-mode > #f-items {
3946
grid-template-columns: 1fr;
4047
gap: 0;
48+
// border: solid 1px $gray;
49+
// padding: 1rem;
4150
4251
.f-item {
52+
transition: none;
4353
height: 3.25rem;
4454
border-radius: $small;
4555
background-color: transparent;
@@ -50,10 +60,10 @@ const settings = useSettingsStore();
5060
bottom: 50%;
5161
translate: 0 50%;
5262
}
53-
}
5463
55-
.f-item:hover {
56-
background-color: $gray !important;
64+
&:hover {
65+
background-color: $gray !important;
66+
}
5767
}
5868
}
5969
</style>

src/components/shared/SongItem.vue

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -6,34 +6,7 @@
66
:class="[{ current: isCurrent() }, { contexton: context_menu_showing }]"
77
@dblclick.prevent="emitUpdate"
88
@contextmenu.prevent="showMenu"
9-
@dragstart="(e) => showDragStart(e, track, (index as number) - 1 , source)"
10-
@dragend.prevent="showDragEnd"
11-
draggable="true"
129
>
13-
<div
14-
v-if="droppable"
15-
class="top-drop"
16-
:class="{ active: dropTop }"
17-
@dragenter="
18-
dropTop = true;
19-
dropBottom = false;
20-
"
21-
@dragleave="dropTop = false"
22-
@dragover.prevent
23-
@drop="(e) => dropHere(e, true)"
24-
></div>
25-
<div
26-
v-if="droppable && is_last"
27-
class="bottom-drop"
28-
:class="{ active: dropBottom }"
29-
@dragenter="
30-
dropBottom = true;
31-
dropTop = false;
32-
"
33-
@dragleave="dropBottom = false"
34-
@dragover.prevent
35-
@drop="(e) => dropHere(e, false)"
36-
></div>
3710
<div
3811
class="index t-center ellip"
3912
@click.prevent="addToFav(track.trackhash)"
@@ -107,17 +80,13 @@ import { paths } from "@/config";
10780
import { Track } from "@/interfaces";
10881
import useQueueStore from "@/stores/queue";
10982
import { formatSeconds } from "@/utils";
110-
import { showDragStart, handleDrop } from "@/utils/songItemMethods";
11183
11284
import OptionSvg from "@/assets/icons/more.svg";
11385
import ArtistName from "./ArtistName.vue";
11486
import HeartSvg from "./HeartSvg.vue";
11587
import MasterFlag from "./MasterFlag.vue";
11688
import { dropSources } from "@/composables/enums";
11789
118-
const dropTop = ref(false);
119-
const dropBottom = ref(false);
120-
12190
const imguri = paths.images.thumb.small;
12291
const context_menu_showing = ref(false);
12392
const queue = useQueueStore();
@@ -132,8 +101,6 @@ const props = defineProps<{
132101
source: dropSources;
133102
}>();
134103
135-
// -------------
136-
137104
const is_fav = ref(props.track.is_favorite);
138105
139106
const emit = defineEmits<{
@@ -151,29 +118,6 @@ function emitUpdate() {
151118
emit("playThis");
152119
}
153120
154-
// ==== DRAG AND DROP ==== //
155-
function resetFlags() {
156-
dropTop.value = false;
157-
dropBottom.value = false;
158-
}
159-
160-
function showDragEnd(e: DragEvent) {
161-
resetFlags();
162-
}
163-
164-
function dropHere(e: DragEvent, top: boolean) {
165-
e.preventDefault();
166-
resetFlags();
167-
168-
const dropData = handleDrop(e, props.index as number, top);
169-
if (!dropData) return;
170-
171-
const { track, newIndex, oldIndex } = dropData;
172-
emit("trackDropped", props.source, track, newIndex, oldIndex);
173-
}
174-
175-
// ==== DRAG AND DROP END ==== //
176-
177121
function showMenu(e: MouseEvent) {
178122
showContext(e, props.track, context_menu_showing);
179123
}

src/components/shared/SongList.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
:is_queue_track="is_queue"
2020
@playThis="handlePlay(index)"
2121
:is_last="index == tracks.length - 1"
22-
:droppable="true"
22+
:droppable="false"
2323
@trackDropped="dropHandler"
2424
:source="source"
2525
/>

0 commit comments

Comments
 (0)