Skip to content

Commit c04fbe9

Browse files
authored
Merge pull request #187 from stanleyowen/next
v1.1
2 parents 3d28b8e + e20e276 commit c04fbe9

35 files changed

+4906
-3345
lines changed
File renamed without changes.

.eslintrc.yml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
env:
2-
browser: true
3-
es2021: true
2+
browser: true
3+
es2021: true
44
extends:
5-
- 'eslint:recommended'
6-
- 'plugin:react/recommended'
7-
- 'plugin:@typescript-eslint/recommended'
5+
- 'eslint:recommended'
6+
- 'plugin:react/recommended'
7+
- 'plugin:@typescript-eslint/recommended'
88
parser: '@typescript-eslint/parser'
99
parserOptions:
10-
ecmaFeatures:
11-
jsx: true
12-
ecmaVersion: 12
13-
sourceType: module
10+
ecmaFeatures:
11+
jsx: true
12+
ecmaVersion: 12
13+
sourceType: module
1414
plugins:
15-
- react
16-
- '@typescript-eslint'
15+
- '@typescript-eslint'
1716
rules: {}

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ body:
2828
- type: input
2929
id: app-version
3030
attributes:
31-
label: LoFi Player Version
32-
description: What version of LoFi Player are you using?
31+
label: Loofi Version
32+
description: What version of Loofi are you using?
3333
placeholder: v1.0.0
3434
validations:
3535
required: true

.vscode/settings.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"eslint.format.enable": true,
3+
"editor.codeActionsOnSave": {
4+
"source.fixAll.eslint": true
5+
},
6+
"editor.defaultFormatter": "esbenp.prettier-vscode",
7+
"editor.formatOnSave": true
8+
}

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2022 LoFi Player
3+
Copyright (c) 2023 Loofi
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

Privacy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
*Personal Information Collection*
44

5-
LoFi Player does not collect, store, share or publish any personal information.
5+
Loofi does not collect, store, share or publish any personal information.
66

77
*Non-Personal Information Collection*
88

9-
LoFi Player does not collect, store, share or publish any non-personal information.
9+
Loofi does not collect, store, share or publish any non-personal information.

README.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
# 🎶 LoFi Player
2-
![LoFi Player](https://user-images.githubusercontent.com/69080584/132951327-a22710aa-106a-4699-ab5d-940fbe4b0a3c.png)
1+
# 🎶 Loofi
2+
![Loofi](https://user-images.githubusercontent.com/69080584/233798174-acdad5e8-fe93-414d-95a1-db321ab5323c.png)
33

44
<div align="center">
55

6-
[![Version](https://img.shields.io/github/package-json/v/stanleyowen/lofi-player/master?color=61dafb&label=version)](https://github.com/stanleyowen/lofi-player/releases)
7-
[![GitHub Forks](https://img.shields.io/github/forks/stanleyowen/lofi-player?color=61dafb)](https://github.com/stanleyowen/lofi-player/network)
8-
[![Github Stars](https://img.shields.io/github/stars/stanleyowen/lofi-player?color=61dafb)](https://github.com/stanleyowen/lofi-player/stargazers)
9-
[![MIT License](https://img.shields.io/github/license/stanleyowen/lofi-player?color=61dafb)](https://github.com/stanleyowen/lofi-player/blob/master/LICENSE)
6+
[![Version](https://img.shields.io/github/package-json/v/stanleyowen/loofi/master?color=61dafb&label=version)](https://github.com/stanleyowen/loofi/releases)
7+
[![GitHub Forks](https://img.shields.io/github/forks/stanleyowen/loofi?color=61dafb)](https://github.com/stanleyowen/loofi/network)
8+
[![Github Stars](https://img.shields.io/github/stars/stanleyowen/loofi?color=61dafb)](https://github.com/stanleyowen/loofi/stargazers)
9+
[![MIT License](https://img.shields.io/github/license/stanleyowen/loofi?color=61dafb)](https://github.com/stanleyowen/loofi/blob/master/LICENSE)
1010

11-
[![CodeQL](https://github.com/stanleyowen/lofi-player/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/stanleyowen/lofi-player/actions/workflows/codeql-analysis.yml)
12-
[![Semgrep](https://github.com/stanleyowen/lofi-player/actions/workflows/semgrep.yml/badge.svg)](https://github.com/stanleyowen/lofi-player/actions/workflows/semgrep.yml)
13-
[![Netlify Status](https://api.netlify.com/api/v1/badges/c98ea39b-1a9f-4a9a-ac68-f6b9a162422f/deploy-status)](https://app.netlify.com/sites/lofi-players/deploys)
11+
[![CodeQL](https://github.com/stanleyowen/loofi/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/stanleyowen/loofi/actions/workflows/codeql-analysis.yml)
12+
[![Semgrep](https://github.com/stanleyowen/loofi/actions/workflows/semgrep.yml/badge.svg)](https://github.com/stanleyowen/loofi/actions/workflows/semgrep.yml)
13+
[![Netlify Status](https://api.netlify.com/api/v1/badges/4ce8d1c2-6e6d-482f-93e3-b1c824c14944/deploy-status)](https://app.netlify.com/sites/loofi/deploys)
1414
</div>
1515
<hr />
1616

17-
Lofi Player is an **open source** LoFi Streaming of application built with **Typescript, Electron, React, Firebase**. Lofi Player is currently in **development progress**.
17+
Loofi is an **open source** LoFi Streaming of application built with **Typescript, Electron, React, Firebase**.
1818

1919
If you find this project useful, leave a 🌟 to keep a beginner motivated 😊.
2020

2121
## Stargazers and Contributors
22-
[![Stargazers for @stanleyowen/lofi-player](https://reporoster.com/stars/dark/stanleyowen/lofi-player)](https://github.com/stanleyowen/lofi-player/stargazers)
23-
[![Forkers for @stanleyowen/lofi-player](https://reporoster.com/forks/dark/stanleyowen/lofi-player)](https://github.com/stanleyowen/lofi-player/network/members)
22+
[![Stargazers for @stanleyowen/loofi](https://reporoster.com/stars/dark/stanleyowen/loofi)](https://github.com/stanleyowen/loofi/stargazers)
23+
[![Forkers for @stanleyowen/loofi](https://reporoster.com/forks/dark/stanleyowen/loofi)](https://github.com/stanleyowen/loofi/network/members)
2424

2525
## LICENSE
2626
[MIT](LICENSE)

package.json

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
{
2-
"name": "lofi-player",
3-
"version": "1.0.0-beta",
2+
"name": "loofi",
3+
"version": "1.1.0",
44
"private": true,
55
"author": "Stanley Owen <stanleyowen06@gmail.com>",
66
"dependencies": {
7-
"@emotion/react": "^11.10.0",
8-
"@emotion/styled": "^11.10.0",
9-
"@mui/material": "^5.10.0",
10-
"@types/node": "^18.6.5",
11-
"@types/react": "^18.0.17",
12-
"@types/react-dom": "^18.0.6",
7+
"@emotion/react": "^11.10.6",
8+
"@emotion/styled": "^11.10.6",
9+
"@mui/material": "^5.12.1",
10+
"@types/node": "^18.16.0",
11+
"@types/react": "^18.0.38",
12+
"@types/react-dom": "^18.0.11",
1313
"@types/react-router-dom": "^5.3.3",
14-
"@typescript-eslint/eslint-plugin": "^5.33.0",
15-
"@typescript-eslint/parser": "^5.33.0",
16-
"axios": "^0.27.2",
14+
"@typescript-eslint/eslint-plugin": "^5.59.0",
15+
"@typescript-eslint/parser": "^5.59.0",
16+
"axios": "^1.3.6",
1717
"electron-is-dev": "^2.0.0",
18-
"firebase": "^9.9.2",
18+
"firebase": "^9.20.0",
1919
"react": "^18.2.0",
2020
"react-dom": "^18.2.0",
21-
"react-router-dom": "^6.3.0",
21+
"react-router-dom": "^6.10.0",
2222
"react-scripts": "^5.0.1",
23-
"web-vitals": "^2.1.4"
23+
"web-vitals": "^3.3.1"
2424
},
2525
"homepage": "./",
2626
"scripts": {
2727
"tauri": "tauri",
2828
"start": "react-scripts start",
29-
"build": "node ./scripts/prebuild.js && GENERATE_SOURCEMAP=false CI='' yarn react-scripts build && node ./scripts/postbuild.js",
30-
"build:win": "node ./scripts/prebuild.js && yarn cross-env GENERATE_SOURCEMAP=false CI='' react-scripts build && node ./scripts/postbuild.js",
29+
"build": "node ./scripts/prebuild.js && GENERATE_SOURCEMAP=false CI='' REACT_APP_ENV='tauri' yarn react-scripts build && node ./scripts/postbuild.js",
30+
"build:win": "node ./scripts/prebuild.js && yarn cross-env GENERATE_SOURCEMAP=false CI='' REACT_APP_ENV='tauri' react-scripts build && node ./scripts/postbuild.js",
3131
"build:web": "GENERATE_SOURCEMAP=false CI='' yarn react-scripts build",
3232
"build:web:win": "yarn cross-env GENERATE_SOURCEMAP=false CI='' react-scripts build",
3333
"test": "react-scripts test",
3434
"eject": "react-scripts eject",
3535
"release": "yarn build && electron-builder --publish=always",
36-
"dev": "concurrently \"cross-env BROWSER=none yarn start\" \"wait-on http://localhost:3000 && tauri dev\"",
36+
"dev": "concurrently \"cross-env BROWSER=none yarn start\" \"yarn tauri dev\"",
3737
"lint": "eslint -c .eslintrc.yml --ext .tsx ./src"
3838
},
3939
"build": {
@@ -70,16 +70,15 @@
7070
]
7171
},
7272
"devDependencies": {
73-
"@tauri-apps/cli": "^1.0.5",
73+
"@tauri-apps/cli": "^1.2.3",
7474
"@testing-library/jest-dom": "^5.16.5",
75-
"@testing-library/react": "^13.3.0",
76-
"@testing-library/user-event": "^14.4.2",
77-
"concurrently": "^7.3.0",
75+
"@testing-library/react": "^14.0.0",
76+
"@testing-library/user-event": "^14.4.3",
77+
"concurrently": "^8.0.1",
7878
"cross-env": "^7.0.3",
79-
"dotenv": "^16.0.1",
80-
"eslint": "^8.21.0",
81-
"eslint-plugin-react": "^7.30.1",
82-
"typescript": "^4.7.4",
83-
"wait-on": "^6.0.1"
79+
"dotenv": "^16.0.3",
80+
"eslint": "^8.39.0",
81+
"eslint-plugin-react": "^7.32.2",
82+
"typescript": "^5.0.4"
8483
}
8584
}

public/index.html

Lines changed: 79 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,84 @@
11
<!DOCTYPE html>
22
<html lang="en">
3-
<head>
4-
<meta charset="utf-8" />
5-
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
6-
<meta name="viewport" content="width=device-width, initial-scale=1" />
7-
<meta name="theme-color" content="#000000" />
8-
<meta name="description" content="Open Source LoFi Streaming for Web and Desktop App" />
9-
<meta name="google-site-verification" content="z8pDSIMD1Z-Hgt6SxaTJdqq6ISvook8pgVK677P_6J0" />
10-
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
11-
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
12-
<title>LoFi Player</title>
13-
</head>
14-
<body style="-webkit-app-region: drag">
15-
<noscript>
16-
<style>
17-
.content {
18-
position: absolute;
19-
left: 50%;
20-
top: 50%;
21-
-webkit-transform: translate(-50%, -50%);
22-
transform: translate(-50%, -50%);
23-
}
24-
.align-center { text-align: center }
25-
.warning-icon svg path { fill: rgb(255, 0, 0) }
26-
</style>
3+
<head>
4+
<meta charset="utf-8" />
5+
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
6+
<meta name="viewport" content="width=device-width, initial-scale=1" />
7+
<meta name="theme-color" content="#000000" />
8+
<meta
9+
name="description"
10+
content="Open Source LoFi Streaming for Web and Desktop App"
11+
/>
12+
<meta
13+
name="google-site-verification"
14+
content="z8pDSIMD1Z-Hgt6SxaTJdqq6ISvook8pgVK677P_6J0"
15+
/>
16+
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
17+
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
18+
<title>Loofi | LoFi Streaming</title>
19+
</head>
20+
<body style="-webkit-app-region: drag">
21+
<noscript>
22+
<style>
23+
.content {
24+
position: absolute;
25+
left: 50%;
26+
top: 50%;
27+
-webkit-transform: translate(-50%, -50%);
28+
transform: translate(-50%, -50%);
29+
}
30+
.align-center {
31+
text-align: center;
32+
}
33+
.warning-icon svg path {
34+
fill: rgb(255, 0, 0);
35+
}
36+
</style>
2737

28-
<div class="content">
29-
<div class="align-center warning-icon">
30-
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--fluent" width="80" height="80" preserveAspectRatio="xMidYMid meet" viewBox="0 0 12 12"><g fill="none"><path d="M5.25 8.25a.75.75 0 1 1 1.5 0a.75.75 0 0 1-1.5 0z" fill="currentColor"></path><path d="M5.508 3.41a.5.5 0 0 1 .984 0l.008.09V6l-.008.09a.5.5 0 0 1-.984 0L5.5 6V3.5l.008-.09z" fill="currentColor"></path><path d="M11 6A5 5 0 1 1 1 6a5 5 0 0 1 10 0zm-1 0a4 4 0 1 0-8 0a4 4 0 0 0 8 0z" fill="currentColor"></path></g></svg>
38+
<div class="content">
39+
<div class="align-center warning-icon">
40+
<svg
41+
xmlns="http://www.w3.org/2000/svg"
42+
xmlns:xlink="http://www.w3.org/1999/xlink"
43+
aria-hidden="true"
44+
role="img"
45+
class="iconify iconify--fluent"
46+
width="80"
47+
height="80"
48+
preserveAspectRatio="xMidYMid meet"
49+
viewBox="0 0 12 12"
50+
>
51+
<g fill="none">
52+
<path
53+
d="M5.25 8.25a.75.75 0 1 1 1.5 0a.75.75 0 0 1-1.5 0z"
54+
fill="currentColor"
55+
></path>
56+
<path
57+
d="M5.508 3.41a.5.5 0 0 1 .984 0l.008.09V6l-.008.09a.5.5 0 0 1-.984 0L5.5 6V3.5l.008-.09z"
58+
fill="currentColor"
59+
></path>
60+
<path
61+
d="M11 6A5 5 0 1 1 1 6a5 5 0 0 1 10 0zm-1 0a4 4 0 1 0-8 0a4 4 0 0 0 8 0z"
62+
fill="currentColor"
63+
></path>
64+
</g>
65+
</svg>
66+
</div>
67+
<h3>JavaScript Required</h3>
68+
<hr />
69+
<p>
70+
We're sorry, but Loofi doesn't work appropriately without
71+
JavaScript enabled.
72+
</p>
73+
</div>
74+
</noscript>
75+
76+
<div class="backdrop-overlay"></div>
77+
<div class="backdrop">
78+
<div class="acrylic-material"></div>
79+
<div class="backdrop-image" id="backdrop-image"></div>
3180
</div>
32-
<h3>JavaScript Required</h3>
33-
<hr>
34-
<p>We're sorry, but LoFi Player doesn't work appropriately without JavaScript enabled.</p>
35-
</div>
36-
</noscript>
3781

38-
<div class="backdrop-overlay"></div>
39-
<div class="backdrop">
40-
<div class="acrylic-material"></div>
41-
<div class="backdrop-image" id="backdrop-image"></div>
42-
</div>
43-
44-
<div id="root"></div>
45-
</body>
46-
</html>
82+
<div id="root"></div>
83+
</body>
84+
</html>

public/logo192.png

644 Bytes
Loading

0 commit comments

Comments
 (0)