create re-usable components

This commit is contained in:
geoffrey45 2022-01-22 12:04:33 +03:00
parent f6787421c3
commit 7945c04a06
9 changed files with 283 additions and 181 deletions

View File

@ -32,35 +32,36 @@ def search_by_title():
albums = []
artists = []
tracks = []
s = []
albums_dicts = []
artists_dicts = []
for track in all_the_f_music:
if query.lower() in track['title'].lower():
s.append(track)
al = instances.songs_instance.search_songs_by_album(query)
ar = instances.songs_instance.search_songs_by_artist(query)
tracks.append(track)
for song in al:
if query.lower() in track['album'].lower():
albums.append(track)
if query.lower() in str(track['artists']).lower():
artists.append(track)
for song in albums:
album_obj = {
"name": song["album"],
"artists": song["artists"],
}
if album_obj not in albums:
albums.append(album_obj)
for album in albums:
# try:
# image = convert_one_to_json(instances.songs_instance.get_song_by_album(album['name'], album['artists']))['image']
# except:
# image: None
album['image'] = "image"
for song in ar:
if album_obj not in albums_dicts:
albums_dicts.append(album_obj)
for album in albums_dicts:
for track in albums:
if album['name'] == track['album']:
album['image'] = track['image']
for song in artists:
for artist in song["artists"]:
if query.lower() in artist.lower():
@ -68,11 +69,31 @@ def search_by_title():
"name": artist,
}
if artist_obj not in artists:
artists.append(artist_obj)
if artist_obj not in artists_dicts:
artists_dicts.append(artist_obj)
return {'songs': helpers.remove_duplicates(s), 'albums': albums, 'artists': artists}
tracks = helpers.remove_duplicates(tracks)
if len(tracks) > 5:
more_tracks = True
else:
more_tracks = False
if len(artists_dicts) > 5:
more_artists = True
else:
more_artists = False
if len(albums_dicts) > 5:
more_albums = True
else:
more_albums = False
return {'data': [
{'tracks': tracks[:5], 'more': more_tracks},
{'albums': albums_dicts[:10], 'more': more_albums},
{'artists': artists_dicts[:10], 'more': more_artists}
]}
@bp.route('/populate')
def x():
@ -282,11 +303,14 @@ def convert_images_to_webp():
if file.name.endswith(".jpg"):
print(file.name)
print(os.path.join(final_path, file.name.replace('.jpg', '.webp')))
img = helpers.Image.open(os.path.join(path, file.name)).resize((150, 150), helpers.Image.ANTIALIAS)
img.save(os.path.join(final_path, file.name.replace('.jpg', '.webp')), format='webp')
img = helpers.Image.open(os.path.join(path, file.name)).resize(
(150, 150), helpers.Image.ANTIALIAS)
img.save(os.path.join(final_path, file.name.replace(
'.jpg', '.webp')), format='webp')
return "Done"
@bp.route('/test')
def test_http_status_response():
return "OK", 200
return "OK", 200

View File

@ -211,10 +211,6 @@ def getTags(full_path: str) -> dict:
"length": round(audio.info.length),
"bitrate": audio.info.bitrate,
"image": img_path,
"type": {
"name": None,
"id": None
}
}
instances.songs_instance.insert_song(tags)
@ -228,7 +224,7 @@ def getAlbumBio(title: str, album_artist: str) -> dict:
try:
response = requests.get(last_fm_url)
data = response.json()
except requests.ConnectionError:
except:
return "None"
try:

View File

@ -75,6 +75,7 @@ export default {
};
const collapseSearch = () => {
console.log('hooooo')
search.value = false;
};
@ -131,6 +132,7 @@ export default {
}
.content {
width: 100%;
padding: 0 $small;
display: grid;
grid-template-rows: auto 1fr;

View File

@ -35,7 +35,7 @@
import { ref } from "@vue/reactivity";
import { onMounted } from "@vue/runtime-core";
import SongItem from "../SongItem.vue";
import SongItem from "../shared/SongItem.vue";
import routeLoader from "@/composables/routeLoader.js";
import perks from "@/composables/perks.js";
import state from "@/composables/state.js";

View File

@ -5,29 +5,24 @@
<div class="next border" @click="scrollRight"></div>
</div>
<div class="artists" ref="artists_dom">
<div class="artist border c1 image">
<div class="xartist border c1 image">
<div class="blur"></div>
<div class="s2"></div>
<p>Featured Artists</p>
</div>
<div class="artist border" v-for="artist in artists" :key="artist">
<div>
<div
class="artist-image image"
:style="{ backgroundImage: `url('${artist.image}')` }"
></div>
<p class="artist-name ellipsis">{{ artist.name }}</p>
<div class="a-circle"></div>
</div>
</div>
<ArtistCard v-for="artist in artists" :key="artist" :artist="artist" />
</div>
</div>
</template>
<script>
import { ref } from "@vue/reactivity";
import ArtistCard from "@/components/shared/ArtistCard.vue";
export default {
props: ["artists"],
components: {
ArtistCard
},
setup() {
const artists_dom = ref(null);
@ -121,52 +116,6 @@ export default {
}
}
.f-artists .artist {
flex: 0 0 auto;
overflow: hidden;
position: relative;
margin-left: $smaller;
margin-right: $smaller;
width: 9em;
height: 11em;
border-radius: $small;
background-color: #232452;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
.artist-image {
width: 7em;
height: 7em;
border-radius: 50%;
margin-bottom: $small;
background: url("../../assets/images/null.webp");
background-size: 7rem 7rem;
background-repeat: no-repeat;
background-position: center;
transition: all 0.5s ease-in-out;
border: solid 1px rgba(5, 5, 5, 0.055);
box-shadow: 0px 0px 80px rgb(0, 0, 0);
}
&:hover {
.artist-image {
background-position: 50% 20%;
border-radius: 20%;
background-size: 10rem 10rem;
}
}
.artist-name {
margin: 0;
text-align: center;
font-size: 0.9rem;
font-weight: 510;
max-width: 7rem;
}
}
.f-artists .c1 {
position: relative;
background-size: 400px 11rem;

View File

@ -12,16 +12,18 @@
{{ filter }}<span class="cancel image"></span>
</div>
</div>
<input
type="search"
id="search"
@focus="activateMagicFlag"
@blur="removeMagicFlag"
@keyup.backspace="removeLastFilter"
placeholder="find your music"
v-model="query"
/>
<div class="loader" v-if="loading"></div>
<div class="input-loader border">
<input
type="search"
id="search"
@focus="activateMagicFlag"
@blur="removeMagicFlag"
@keyup.backspace="removeLastFilter"
placeholder="find your music"
v-model="query"
/>
<div class="loader" v-if="loading"></div>
</div>
<div
class="suggestions v00"
:class="{
@ -45,38 +47,65 @@
</div>
</div>
<div class="scrollable" :class="{ v0: !is_hidden, v1: is_hidden }">
<div class="tracks-results">
<div class="heading">TRACKS<span class="more">SEE ALL</span></div>
<div class="tracks-results border" v-if="songs.tracks">
<div class="heading">TRACKS</div>
<div class="items">
<table>
<thead></thead>
<tbody>
<SongItem v-for="song in songs" :key="song" :song="song" />
<SongItem v-for="song in songs.tracks" :key="song" :song="song" />
</tbody>
</table>
<div class="more" v-if="songs.more">
<button>
<div class="text">Load All</div>
</button>
</div>
</div>
</div>
<!-- -->
<div class="albums-results">
<div class="albums-results border">
<div class="heading">ALBUMS <span class="more">SEE ALL</span></div>
<div class="grid">
<div class="result-item" v-for="album in albums" :key="album">
<div class="album-art image"></div>
<div class="title ellip">{{ album }}</div>
<div
class="result-item border"
v-for="album in albums.albums"
:key="album"
>
<div
class="album-art image"
:style="{
backgroundImage: `url('${album.image}')`,
}"
></div>
<div class="title ellip">{{ album.name }}</div>
<div class="artistsx ellipsis">
<span v-for="artist in putCommas(album.artists)" :key="artist">{{
artist
}}</span>
</div>
</div>
</div>
</div>
<div class="separator no-border"></div>
<!-- -->
<div class="artists-results" v-if="artists">
<!-- <div class="artists-results border" v-if="artists">
<div class="heading">ARTISTS <span class="more">SEE ALL</span></div>
<div class="grid">
<div class="result-item" v-for="artist in artists" :key="artist">
<div class="image"></div>
<div class="title ellip">{{ artist }}</div>
<div
class="result-item border"
v-for="artist in artists.artists"
:key="artist"
>
<div
class="image"
:style="{
backgroundImage: `url(${artist.image})`,
}"
></div>
<div class="title ellip">{{ artist.name }}</div>
</div>
</div>
</div>
</div> -->
</div>
</div>
</template>
@ -86,9 +115,10 @@ import { ref, toRefs } from "@vue/reactivity";
import { onMounted, watch } from "@vue/runtime-core";
import state from "@/composables/state.js";
import searchMusic from "../composables/searchMusic.js";
import searchMusic from "@/composables/searchMusic.js";
import useDebouncedRef from "@/composables/useDebouncedRef";
import SongItem from "@/components/SongItem.vue";
import SongItem from "@/components/shared/SongItem.vue";
import perks from "@/composables/perks.js";
export default {
emits: ["expandSearch", "collapseSearch"],
@ -118,34 +148,27 @@ export default {
title: "📁 Folder",
icon: "📁",
},
{
title: "🈁 This folder",
icon: "🈁",
},
];
const loading = ref(state.loading);
const searchComponent = ref(null);
const filters = ref(state.filters);
const albums = [
"Smooth Criminal like wtf ... and im serious",
"Xscape",
"USA for Africa",
];
const filters = ref([]);
const albums = ref([]);
const artists = ref([]);
const artists = ["Michael Jackson waihenya", "Jackson 5"];
const query = useDebouncedRef("", 400);
const magic_flag = ref(state.magic_flag);
const is_hidden = toRefs(props).search;
function addFilter(filter) {
if (!filters.value.includes(filter)) {
state.filters.value.push(filter);
filters.value.push(filter);
}
}
function removeFilter(filter) {
state.filters.value = filters.value.filter((f) => f !== filter);
filters.value = filters.value.filter((f) => f !== filter);
}
let counter = 0;
@ -155,7 +178,7 @@ export default {
counter++;
if (counter > 1 || query.value === null) {
state.filters.value.pop();
filters.value.pop();
}
}
}
@ -178,29 +201,30 @@ export default {
}
watch(query, (new_query) => {
searchMusic(new_query);
searchMusic(new_query).then((res) => {
albums.value = res.albums;
artists.value = res.artists;
state.search_tracks.value = res.tracks;
// console.log(albums.value)
});
state.search_query.value = new_query;
if (new_query !== "") {
if (new_query !== "" && new_query.length > 2) {
counter = 0;
if (!filters.value.includes("🈁")) {
emit("expandSearch");
}
emit("expandSearch");
} else {
emit("collapseSearch");
}
});
onMounted(() => {
const dom = document.getElementsByClassName("right-search")[0];
document.addEventListener("click", (e) => {
var isClickedInside = dom.contains(e.target);
if (!isClickedInside) {
emit("collapseSearch");
}
});
// const dom = document.getElementsByClassName("right-search")[0];
// document.addEventListener("click", (e) => {
// var isClickedInside = dom.contains(e.target);
// if (!isClickedInside) {
// emit("collapseSearch");
// }
// });
});
return {
@ -220,6 +244,7 @@ export default {
searchComponent,
loading,
searchMusic,
putCommas: perks.putCommas,
};
},
};
@ -228,14 +253,13 @@ export default {
<style lang="scss">
.loader {
position: absolute;
right: 0;
width: 2rem;
height: 2rem;
border: solid #fff;
right: 0.65rem;
top: 0.65rem;
width: 1.5rem;
height: 1.5rem;
border: dotted $blue;
border-radius: 50%;
border-bottom: solid rgb(255, 174, 0);
border-top: solid rgb(255, 174, 0);
animation: spin 0.3s linear infinite;
animation: spin 0.25s linear infinite;
@keyframes spin {
0% {
@ -263,6 +287,7 @@ export default {
padding: 1rem $small 0 0;
background-color: $card-dark;
overflow: hidden;
width: auto;
.item {
position: relative;
@ -319,7 +344,7 @@ export default {
.v11 {
opacity: 0;
transform: translateY(-3rem);
transform: translateY(-4rem);
transition: all 0.2s ease-in;
}
@ -373,29 +398,37 @@ export default {
}
.more:hover {
// background: $blue;
// border-radius: 0.5rem;
cursor: pointer;
}
}
.right-search input {
width: calc(100% - 6rem);
border: none;
border-radius: 0.5rem;
background-color: transparent;
color: rgb(255, 255, 255);
font-size: 1rem;
outline: none;
transition: all 0.5s ease;
}
.right-search input:focus {
transition: all 0.5s ease;
color: rgb(255, 255, 255);
outline: none;
.right-search {
.input-loader {
width: 100%;
border-radius: 0.4rem;
position: relative;
&::placeholder {
display: none;
input {
width: calc(100% - 6rem);
border: none;
line-height: 2.5rem;
background-color: transparent;
color: rgb(255, 255, 255);
font-size: 1rem;
outline: none;
transition: all 0.5s ease;
padding-left: $small;
&:focus {
transition: all 0.5s ease;
color: rgb(255, 255, 255);
outline: none;
&::placeholder {
display: none;
}
}
}
}
}
@ -403,10 +436,20 @@ export default {
.right-search .tracks-results {
border-radius: 0.5rem;
// background: #ca0377;
margin-left: $small;
padding: $small;
// border: solid;
.more {
display: grid;
place-items: center;
margin-top: $small;
button {
height: 2.5rem;
width: 10rem;
display: grid;
}
}
.items {
border-radius: $small;
@ -448,9 +491,10 @@ export default {
/* albums */
.right-search .albums-results {
width: calc(100% - $small);
border-radius: 0.5rem;
background: #011327;
background: #0f131b44;
margin-left: $small;
margin-top: $small;
@ -467,13 +511,13 @@ export default {
align-items: center;
padding: $small;
border-radius: $small;
background-color: $card-dark;
text-align: left !important;
margin-bottom: 1rem;
width: 9rem;
.album-art {
height: 7rem;
width: 7rem;
background-color: rgba(26, 26, 26, 0.452);
border-radius: 0.5rem;
margin-bottom: 0.5rem;
background-image: url("../assets/images/null.webp");
@ -481,10 +525,17 @@ export default {
.title {
width: 7rem;
text-align: center;
margin-bottom: 0.5rem;
font-size: 0.9rem;
}
.artistsx {
width: 7rem;
display: flex;
font-size: 0.8rem;
text-align: left;
color: rgba(40, 116, 216, 0.767);
}
}
}
}
@ -492,8 +543,10 @@ export default {
/* artits */
.right-search .artists-results {
width: calc(100% - $small);
border-radius: 0.5rem;
background: #381900;
background: #1214178c;
margin: 0 0 0 $small;
.grid {
@ -514,7 +567,6 @@ export default {
height: 7rem;
width: 7rem;
border-radius: 50%;
background-color: rgba(16, 65, 14, 0.356);
margin-bottom: 0.5rem;
background-size: 50%;
background-image: url("../assets/images/null.webp");

View File

@ -0,0 +1,66 @@
<template>
<div class="xartist border">
<div
class="artist-image image"
:style="{ backgroundImage: `url('${artist.image}')` }"
></div>
<div>
<p class="artist-name ellipsis">{{ artist.name }}</p>
</div>
<!-- <div class="a-circle"></div> -->
</div>
</template>
<script>
export default {
props: ["artist"],
};
</script>
<style lang="scss">
.xartist {
flex: 0 0 auto;
overflow: hidden;
position: relative;
margin: 0 $smaller 0 $smaller;
width: 9em;
height: 11em;
border-radius: $small;
background-color: #232452;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
cursor: pointer;
.artist-image {
width: 7em;
height: 7em;
border-radius: 50%;
margin-bottom: $small;
background: url("../../assets/images/null.webp");
background-size: 7rem 7rem;
background-repeat: no-repeat;
background-position: center;
transition: all 0.5s ease-in-out;
border: solid 1px rgba(5, 5, 5, 0.055);
box-shadow: 0px 0px 80px rgb(0, 0, 0);
}
&:hover {
.artist-image {
background-position: 50% 20%;
border-radius: 20%;
background-size: 10rem 10rem;
}
}
.artist-name {
margin: 0;
text-align: center;
font-size: 0.9rem;
font-weight: 510;
max-width: 7rem;
}
}
</style>

View File

@ -56,12 +56,14 @@ import state from "@/composables/state.js";
export default {
props: ["song"],
emits: ['updateQueue', 'loadAlbum'],
setup(props, { emit }) {
function emitUpdate(song) {
emit("updateQueue", song);
}
function emitLoadAlbum(title, artist) {
console.log('hii')
emit("loadAlbum", title, artist);
}
@ -90,7 +92,7 @@ export default {
.song-duration {
width: 5rem !important;
}
cursor: pointer;
.flex {

View File

@ -3,15 +3,26 @@ import state from "./state.js";
const base_url = "http://0.0.0.0:9876/search?q=";
async function search(query) {
state.loading.value = true;
const url = base_url + encodeURIComponent(query);
const res = await fetch(url);
const json = await res.json();
state.search_tracks.value = json.songs;
state.search_albums.value = json.albums;
state.search_artists.value = json.artists;
console.log(state.search_tracks.value);
if (!res.ok) {
const message = `An error has occured: ${res.status}`;
throw new Error(message);
}
const data = await res.json();
console.log(data.data[1]);
state.loading.value = false;
return {
tracks: data.data[0],
albums: data.data[1],
artists: data.data[2],
};
}
export default search;
export default search;