Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bringing changes downstream #52

Merged
merged 32 commits into from
Feb 14, 2024
Merged

Bringing changes downstream #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
68252c9
Merge pull request #36 from muzik-apps/main-app-dev
waveyboym Feb 5, 2024
d703f8f
Fix styling and add new drag and drop feature for upcoming songs
waveyboym Feb 5, 2024
aac3482
Add RectangleSongBoxDraggable component and update onDragEndInPlaylis…
waveyboym Feb 5, 2024
050c90d
Update playlist metadata structure
waveyboym Feb 5, 2024
ccb46f4
Merge pull request #37 from muzik-apps/playlistview-bug-patch
waveyboym Feb 5, 2024
aff80a5
Merge branch 'drag-and-drop-song-feature' into main-app-dev
waveyboym Feb 5, 2024
d2eed58
Merge pull request #39 from muzik-apps/main-app-dev
waveyboym Feb 5, 2024
a2230a8
Revert "Merge branch 'drag-and-drop-song-feature' into main-app-dev"
waveyboym Feb 5, 2024
11c6675
Added edge case where playlist metadata may be null
waveyboym Feb 5, 2024
5605427
Add loading state and fix image display in CreatePlaylistModal and Ed…
waveyboym Feb 6, 2024
3a403ef
Merge pull request #40 from muzik-apps/create-playlist-bug-fix
waveyboym Feb 6, 2024
95d7aa9
Merge pull request #41 from muzik-apps/main-app-dev
waveyboym Feb 6, 2024
ac6678f
Fix playlist title validation and add cancel and delete playlist button
waveyboym Feb 6, 2024
1fef563
added a deletion modal on playlist page
waveyboym Feb 6, 2024
0b14354
Add delete song modal and related changes
waveyboym Feb 6, 2024
da5fd01
Update version to 0.4.0
waveyboym Feb 6, 2024
f4cced6
Merge pull request #42 from muzik-apps/playlist-modal-redesign
waveyboym Feb 6, 2024
187ffbe
Merge branch 'main-app-dev' into drag-and-drop-song-feature
waveyboym Feb 6, 2024
8b6b1e0
Merge pull request #43 from muzik-apps/drag-and-drop-song-feature
waveyboym Feb 6, 2024
0e41298
Revert "Revert "Merge branch 'drag-and-drop-song-feature' into main-a…
waveyboym Feb 6, 2024
84df5d5
Merge pull request #44 from muzik-apps/drag-and-drop-song-feature
waveyboym Feb 6, 2024
b14a694
Merge pull request #45 from muzik-apps/main-app-dev
waveyboym Feb 6, 2024
407a1a7
Update search page routing and add cursor style to PlayIcon
waveyboym Feb 6, 2024
a782a7a
Refactor window controls section in HeaderWindows component
waveyboym Feb 6, 2024
f2f5c34
Merge pull request #46 from muzik-apps/0.4.0-bug-patch
waveyboym Feb 7, 2024
024ef15
Update styles and some functionality
waveyboym Feb 8, 2024
66ab4bf
Merge pull request #47 from muzik-apps/0.4.0-bug-patch
waveyboym Feb 8, 2024
a961572
Update SearchPage.tsx
waveyboym Feb 12, 2024
b907429
Update AppMusicPlayer.tsx
waveyboym Feb 12, 2024
41a4aa0
Update DirectoriesModal.tsx
waveyboym Feb 12, 2024
ce108a9
Update Settings.tsx
waveyboym Feb 12, 2024
72e1670
Merge pull request #49 from muzik-apps/v0.4.0-bug-patching
waveyboym Feb 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
160 changes: 157 additions & 3 deletions muzik-offline/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion muzik-offline/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "muzik-offline",
"private": true,
"version": "0.3.1",
"version": "0.4.0",
"type": "module",
"scripts": {
"dev": "vite",
Expand All @@ -10,6 +10,7 @@
"tauri": "tauri"
},
"dependencies": {
"@hello-pangea/dnd": "^16.5.0",
"@tauri-apps/api": "^1.5.1",
"dexie": "^3.2.4",
"dexie-react-hooks": "^1.1.7",
Expand All @@ -24,6 +25,7 @@
"devDependencies": {
"@tauri-apps/cli": "^1.5.6",
"@types/react": "^18.2.15",
"@types/react-beautiful-dnd": "^13.1.8",
"@types/react-dom": "^18.2.7",
"@types/react-virtualized": "^9.21.29",
"@vitejs/plugin-react": "^4.0.3",
Expand Down
19 changes: 12 additions & 7 deletions muzik-offline/src-tauri/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion muzik-offline/src-tauri/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "muzik-offline"
version = "0.3.1"
version = "0.4.0"
description = "A desktop music player for listening to music offline."
authors = ["Michael"]
license = ""
Expand Down
2 changes: 1 addition & 1 deletion muzik-offline/src-tauri/tauri.conf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
},
"package": {
"productName": "muzik-offline",
"version": "0.3.1"
"version": "0.4.0"
},
"tauri": {
"allowlist": {
Expand Down
9 changes: 9 additions & 0 deletions muzik-offline/src/assets/icons/General/AlertTriangle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
const AlertTriangle = () => {
return (
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M12 12.9708V8.13251M12 16.5571V16.5996M18.0479 20.6292H5.9521C4.29987 20.6292 2.90554 19.525 2.46685 18.0143C2.27959 17.3694 2.50969 16.6977 2.86163 16.1257L8.90956 5.09779C10.3265 2.7952 13.6735 2.7952 15.0905 5.0978L21.1384 16.1257C21.4904 16.6977 21.7205 17.3694 21.5332 18.0143C21.0945 19.525 19.7002 20.6292 18.0479 20.6292Z" stroke="#FF6B00" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
</svg>
)
}

export default AlertTriangle
9 changes: 9 additions & 0 deletions muzik-offline/src/assets/icons/General/Trash.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
const Trash = () => {
return (
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M2.40002 5.40005H21.6M8.40002 1.80005H15.6M9.60002 17.4V10.2M14.4 17.4V10.2M16.2 22.2H7.80002C6.47454 22.2 5.40002 21.1255 5.40002 19.8L4.85211 6.65001C4.8237 5.96826 5.36872 5.40005 6.05106 5.40005H17.949C18.6313 5.40005 19.1763 5.96826 19.1479 6.65001L18.6 19.8001C18.6 21.1255 17.5255 22.2 16.2 22.2Z" stroke="#ECECEC" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
</svg>
)
}

export default Trash
Loading