diff --git a/Pipfile b/Pipfile new file mode 100644 index 0000000..5d44a48 --- /dev/null +++ b/Pipfile @@ -0,0 +1,11 @@ +[[source]] +url = "https://pypi.python.org/simple" +verify_ssl = true +name = "pypi" + +[packages] + +[dev-packages] + +[requires] +python_version = "3.8" diff --git a/src/App.vue b/src/App.vue index b9316c5..f4b0d6b 100644 --- a/src/App.vue +++ b/src/App.vue @@ -36,7 +36,7 @@ import { ref } from "@vue/reactivity"; import Navigation from "./components/LeftSidebar/Navigation.vue"; import PinnedStuff from "./components/LeftSidebar/PinnedStuff.vue"; -import Search from "./components/RightSideBar/Search.vue"; +import Search from "./components/Search.vue"; import NowPlaying from "./components/RightSideBar/NowPlaying.vue"; import UpNext from "./components/RightSideBar/UpNext.vue"; import RecommendedArtist from "./components/RightSideBar/Recommendation.vue"; diff --git a/src/components/RightSideBar/Search.vue b/src/components/Search.vue similarity index 94% rename from src/components/RightSideBar/Search.vue rename to src/components/Search.vue index a46b9f5..9c747da 100644 --- a/src/components/RightSideBar/Search.vue +++ b/src/components/Search.vue @@ -133,6 +133,7 @@ export default { "Xscape", "USA for Africa", ]; + const artists = ["Michael Jackson waihenya", "Jackson 5"]; const query = ref(null); const magic_flag = ref(false); @@ -148,9 +149,14 @@ export default { filters.value = filters.value.filter((f) => f !== filter); } + let counter = 0; + function removeLastFilter() { - if (query.value === '') { - if (filters.value.length) { + console.log("removeLastFilter"); + if (query.value === "" || query.value === null) { + counter ++; + + if (counter > 1 || query.value === null){ filters.value.pop(); } } @@ -163,7 +169,8 @@ export default { } watch(query, (new_query) => { - if (new_query) { + if (new_query !== "") { + counter = 0; emit("expandSearch"); } else { emit("collapseSearch"); @@ -241,7 +248,7 @@ export default { right: 0.5rem; width: 1.5rem; height: 1.5rem; - background-image: url(../../assets/icons/a.svg); + background-image: url(../assets/icons/a.svg); background-size: 70%; } } @@ -253,7 +260,7 @@ export default { position: absolute; height: 2.5rem; width: 2.5rem; - background-image: url(../../assets/icons/search.svg); + background-image: url(../assets/icons/search.svg); background-size: 70%; } @@ -359,7 +366,7 @@ export default { background-color: rgb(27, 150, 74); border-radius: 0.5rem; margin: 0 $small 0 $small; - background-image: url(../../assets/images/thriller.jpg); + background-image: url(../assets/images/thriller.jpg); } .tags .artist { @@ -411,7 +418,7 @@ export default { background-color: rgba(26, 26, 26, 0.452); border-radius: 0.5rem; margin-bottom: 0.5rem; - background-image: url(../../assets/images/thriller.jpg); + background-image: url(../assets/images/thriller.jpg); } .title { @@ -451,7 +458,7 @@ export default { background-color: rgba(16, 65, 14, 0.356); margin-bottom: 0.5rem; background-size: 50%; - background-image: url(../../assets/images/thriller.jpg); + background-image: url(../assets/images/thriller.jpg); background-size: cover; }