Merge pull request #170 from stanleyowen/next

Version 1.0.0

.env

@@ -1,5 +1,6 @@
 # Node Configuration
 NODE_VERSION                = 14
+SKIP_PREFLIGHT_CHECK        = true
 
 # Beta Section Configuration
 # Configure `REACT_APP_STABLE` and `REACT_APP_BETA` variables
@@ -8,6 +9,14 @@ REACT_APP_ALLOW_BETA        = false
 REACT_APP_STABLE            = false
 REACT_APP_BETA              = false
 
+# Host Configuration
+# Set the `HOST_DOMAIN` variable to the aseets' domain where the assets are loaded
+# Usage example:
+# Image URL: https://user-images.githubusercontent.com/69080584/129326294-4bf476c2-b57a-46d4-b960-28fa2f461610.png
+# Set the `HOST_DOMAIN` variable to https://user-images.githubusercontent.com
+# In the server, set the image URL to /69080584/129326294-4bf476c2-b57a-46d4-b960-28fa2f461610.png
+REACT_APP_HOST_DOMAIN       = https://example.com
+
 # Firebase Configuration
 # For more information, visit https://firebase.google.com/docs/database/web/start#initialize_the_javascript_sdk
 REACT_APP_API_KEY           = ******************

.eslintignore

@@ -0,0 +1 @@
+node_modules

.eslintrc.yml

@@ -0,0 +1,17 @@
+env:
+  browser: true
+  es2021: true
+extends:
+  - 'eslint:recommended'
+  - 'plugin:react/recommended'
+  - 'plugin:@typescript-eslint/recommended'
+parser: '@typescript-eslint/parser'
+parserOptions:
+  ecmaFeatures:
+    jsx: true
+  ecmaVersion: 12
+  sourceType: module
+plugins:
+  - react
+  - '@typescript-eslint'
+rules: {}

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,5 +1,5 @@
 name: Bug Report
-description: Report an LoFi Player bug
+description: Report an issue to help us improve
 labels: [bug]
 body:
   - type: textarea
@@ -30,7 +30,7 @@ body:
     attributes:
       label: LoFi Player Version
       description: What version of LoFi Player are you using?
-      placeholder: v0.4.5
+      placeholder: v1.0.0
     validations:
       required: true
   - type: input

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -2,7 +2,7 @@ name: Feature Request
 description: Suggest an idea for LoFi Player
 labels: [enhancement]
 body:
-  - type: input
+  - type: textarea
     attributes:
       label: Problem Description
       description: Please add a clear and concise description of the problem you are seeking to solve with this feature request.
@@ -48,7 +48,7 @@ body:
     attributes:
       label: LoFi Player Version
       description: What version of LoFi Player are you using?
-      placeholder: v0.4.5
+      placeholder: v1.0.0
     validations:
       required: true
   - type: input

.github/workflows/lint.yml

@@ -0,0 +1,24 @@
+name: Lint
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [14.x, 15.x]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: rm -rf node_modules && yarn install
+      - run: yarn lint

.gitignore

@@ -15,6 +15,7 @@ debug.log
 .env.production
 .env.production.local
 
+App.min.css
 **/img/*[.png][.jpg]
 dist
 docs

.prettierignore

@@ -0,0 +1,4 @@
+build
+dist
+node_modules
+*.min.

.prettierrc.json

@@ -0,0 +1,6 @@
+{
+    "trailingComma": "es5",
+    "tabWidth": 4,
+    "semi": true,
+    "singleQuote": true
+}

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 LoFi Player
+Copyright (c) 2022 LoFi Player
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package.json

@@ -1,46 +1,46 @@
 {
   "name": "lofi-player",
-  "version": "0.6.4",
+  "version": "1.0.0-beta",
   "private": true,
   "author": "Stanley Owen <stanleyowen06@gmail.com>",
   "dependencies": {
-    "@emotion/react": "^11.4.1",
-    "@emotion/styled": "^11.3.0",
-    "@mui/material": "^5.0.1",
-    "@types/node": "^16.10.1",
-    "@types/react": "^17.0.24",
-    "@types/react-dom": "^17.0.9",
-    "@types/react-router-dom": "^5.3.0",
+    "@emotion/react": "^11.10.0",
+    "@emotion/styled": "^11.10.0",
+    "@mui/material": "^5.10.0",
+    "@types/node": "^18.6.5",
+    "@types/react": "^18.0.17",
+    "@types/react-dom": "^18.0.6",
+    "@types/react-router-dom": "^5.3.3",
+    "@typescript-eslint/eslint-plugin": "^5.33.0",
+    "@typescript-eslint/parser": "^5.33.0",
+    "axios": "^0.27.2",
     "electron-is-dev": "^2.0.0",
-    "firebase": "^9.1.0",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-router-dom": "^5.3.0",
-    "react-scripts": "^4.0.3",
-    "web-vitals": "^2.1.0"
+    "firebase": "^9.9.2",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-router-dom": "^6.3.0",
+    "react-scripts": "^5.0.1",
+    "web-vitals": "^2.1.4"
   },
-  "main": "public/electron.js",
   "homepage": "./",
   "scripts": {
+    "tauri": "tauri",
     "start": "react-scripts start",
-    "build": "GENERATE_SOURCEMAP=false react-scripts build",
-    "build:win": "cross-env GENERATE_SOURCEMAP=false react-scripts build",
+    "build": "GENERATE_SOURCEMAP=false yarn react-scripts build",
+    "build:win": "yarn cross-env GENERATE_SOURCEMAP=false react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
     "release": "yarn build && electron-builder --publish=always",
-    "build:electron": "node ./scripts/prebuild.js && yarn build && electron-builder && node ./scripts/postbuild.js",
-    "build:win:electron": "node ./scripts/prebuild.js && yarn build:win && electron-builder && node ./scripts/postbuild.js",
-    "start:electron": "concurrently \"cross-env BROWSER=none yarn start\" \"wait-on http://localhost:3000 && electron .\""
+    "build:desktop": "node ./scripts/prebuild.js && yarn build && tauri build && node ./scripts/postbuild.js",
+    "build:win:desktop": "node ./scripts/prebuild.js && yarn build:win && tauri build && node ./scripts/postbuild.js",
+    "dev": "concurrently \"cross-env BROWSER=none yarn start\" \"wait-on http://localhost:3000 && tauri dev\"",
+    "lint": "eslint -c .eslintrc.yml --ext .tsx ./src"
   },
   "build": {
     "win": {
       "target": [
         {
-          "target": "nsis",
-          "arch": [
-            "ia32",
-            "x64"
-          ]
+          "target": "nsis"
         }
       ]
     },
@@ -70,15 +70,16 @@
     ]
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "^5.14.1",
-    "@testing-library/react": "^12.1.1",
-    "@testing-library/user-event": "^13.2.1",
-    "concurrently": "^6.2.2",
+    "@tauri-apps/cli": "^1.0.5",
+    "@testing-library/jest-dom": "^5.16.5",
+    "@testing-library/react": "^13.3.0",
+    "@testing-library/user-event": "^14.4.2",
+    "concurrently": "^7.3.0",
     "cross-env": "^7.0.3",
-    "dotenv": "^10.0.0",
-    "electron": "^15.0.0",
-    "electron-builder": "^22.11.7",
-    "typescript": "^4.4.3",
-    "wait-on": "^6.0.0"
+    "dotenv": "^16.0.1",
+    "eslint": "^8.21.0",
+    "eslint-plugin-react": "^7.30.1",
+    "typescript": "^4.7.4",
+    "wait-on": "^6.0.1"
   }
-}
+}

public/index.html

@@ -11,10 +11,36 @@
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
     <title>LoFi Player</title>
   </head>
-  <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
+  <body style="-webkit-app-region: drag">
+    <noscript>
+      <style>
+        .content {
+          position: absolute;
+          left: 50%;
+          top: 50%;
+          -webkit-transform: translate(-50%, -50%);
+          transform: translate(-50%, -50%);
+        }
+        .align-center { text-align: center }
+        .warning-icon svg path { fill: rgb(255, 0, 0) }
+      </style>
+
+      <div class="content">
+        <div class="align-center warning-icon">
+          <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>
+        </div>
+        <h3>JavaScript Required</h3>
+        <hr>
+        <p>We're sorry, but LoFi Player doesn't work appropriately without JavaScript enabled.</p>
+      </div>
+    </noscript>
+
     <div class="backdrop-overlay"></div>
-    <div class="backdrop"><div class="acrylic-material"></div><div class="backdrop-image" id="backdrop-image"></div></div>
+    <div class="backdrop">
+      <div class="acrylic-material"></div>
+      <div class="backdrop-image" id="backdrop-image"></div>
+    </div>
+
     <div id="root"></div>
   </body>
-</html>
+</html>

public/manifest.json

@@ -1,6 +1,6 @@
 {
-  "short_name": "React App",
-  "name": "Create React App Sample",
+  "short_name": "LoFi Player",
+  "name": "LoFi Streaming",
   "icons": [
     {
       "src": "favicon.ico",

public/robots.txt

@@ -1,3 +1,3 @@
 # https://www.robotstxt.org/robotstxt.html
 User-agent: *
-Disallow:
+Allow: /

scripts/postbuild.js

@@ -4,7 +4,11 @@ const package = require('../package.json')
 let data = package
 
 Object.keys(data.devDependencies).map(dep => {
-    if(dep.startsWith('@types/')) {
+    if(
+        dep.startsWith('@types/') ||
+        dep.startsWith('@typescript-eslint/') ||
+        dep.startsWith('clean')
+    ) {
         data.dependencies = { ...data.dependencies, [dep]: data.devDependencies[dep] };
         delete data.devDependencies[dep]
     }

scripts/prebuild.js

@@ -4,7 +4,11 @@ const package = require('../package.json')
 let data = package
 
 Object.keys(data.dependencies).map(dep => {
-    if(dep.startsWith('@types/')) {
+    if(
+        dep.startsWith('@types/') ||
+        dep.startsWith('@typescript-eslint/') ||
+        dep.startsWith('clean')
+    ) {
         data.devDependencies = { ...data.devDependencies, [dep]: data.dependencies[dep] }
         delete data.dependencies[dep]
     }

src-tauri/.gitignore

@@ -0,0 +1,4 @@
+# Generated by Cargo
+# will have compiled files and executables
+/target/
+WixTools