Skip to content

Commit

Permalink
Merge pull request #52 from muzik-apps/main-app-dev
Browse files Browse the repository at this point in the history
Bringing changes downstream
  • Loading branch information
waveyboym authored Feb 14, 2024
2 parents 0e4c842 + 72e1670 commit c52115f
Show file tree
Hide file tree
Showing 62 changed files with 1,093 additions and 297 deletions.
160 changes: 157 additions & 3 deletions muzik-offline/package-lock.json

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
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

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
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
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
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
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

0 comments on commit c52115f

Please sign in to comment.