Merge pull request #21 from Cattn/next

Maple Web Redesign

Author: Cattn

.eslintignore

@@ -1,12 +1,32 @@
 /** @type { import("eslint").Linter.Config } */
 module.exports = {
 	root: true,
-	extends: ['eslint:recommended', 'plugin:svelte/recommended', 'prettier'],
+	extends: [
+		'eslint:recommended',
+		'plugin:@typescript-eslint/recommended',
+		'plugin:svelte/recommended',
+		'prettier'
+	],
+	plugins: ['@typescript-eslint'],
 	parserOptions: {
 		sourceType: 'module',
-		ecmaVersion: 2020,
+		ecmaVersion: 'latest',
 		extraFileExtensions: ['.svelte']
 	},
+	overrides: [
+		{
+			files: ['*.svelte'],
+			parser: 'svelte-eslint-parser',
+			parserOptions: {
+				parser: '@typescript-eslint/parser',
+				extraFileExtensions: ['.svelte']
+			}
+		},
+		{
+			files: ['*.ts'],
+			parser: '@typescript-eslint/parser'
+		}
+	],
 	env: {
 		browser: true,
 		es2017: true,

.eslintrc.cjs

@@ -0,0 +1,29 @@
+name: Lint and Format
+
+on:
+  push:
+    branches:
+      - '**'
+
+jobs:
+  lint_format:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.GH_TOKEN }}
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: npm
+      - run: npm ci
+      - run: npm run format
+      - name: Commit and push formatting changes
+        run: |
+          git config --local user.email "github-actions[bot]@users.noreply.github.com"
+          git config --local user.name "github-actions[bot]"
+          git add -A
+          git diff --staged --quiet || git commit -m "style: auto-format code"
+          git push
+      - run: npm run lint
+        continue-on-error: true

.github/workflows/lint-format.yml

@@ -2,4 +2,5 @@
 pnpm-lock.yaml
 package-lock.json
 yarn.lock
-src\lib\components\BottomBar.svelte
+api
+src/sitemap.ts

.prettierignore

@@ -12,6 +12,8 @@
 
 > Need Help? Join our [Development Server](https://discord.gg/Wxrp73HVj4)
 
+https://github.com/user-attachments/assets/83778c71-c67c-4830-9b1e-c57177d8fa05
+
 <p align="center">
     Maple is a music library and organization tool. It allows you to upload your music library and watch it be organized into albums, artists, playlists, and more! You are given robust controls to play and organize your music. In the future, it will include optional social and stat-tracking features.
 </p>
@@ -52,19 +54,22 @@ If you have any other questions, feel free to DM `cattn.` on discord, or email m
 
 > API Link: https://api.maple.music/
 
-### ``GET`` - ``/public/get/user/:username``
+### `GET` - `/public/get/user/:username`
+
 Returns a user based on the given username.
 
 Request Example:
+
 ```js
 const response = await fetch(`${this.SERVER}/public/get/user/${username}`, {
-    credentials: 'include',
-    method: 'GET'
+	credentials: 'include',
+	method: 'GET'
 });
 const data = await response.json();
 ```
 
 Response:
+
 ```
 {
     id: id,
@@ -73,18 +78,21 @@ Response:
 }
 ```
 
-### ``GET`` - ``/public/get/user/id/:id``
+### `GET` - `/public/get/user/id/:id`
+
 Returns a user based on the given id.
 
 Request Example:
+
 ```js
 const response = await fetch(`${this.SERVER}/public/get/user/id/${id}`, {
-    method: 'GET'
+	method: 'GET'
 });
 const data = await response.json();
 ```
 
 Response:
+
 ```
 {
     id: id,
@@ -98,52 +106,65 @@ Response:
 }
 ```
 
-### ``GET`` - ``/public/get/pfp/:id``
+### `GET` - `/public/get/pfp/:id`
+
 Returns a profile picture based on the given id.
 
 Request Example:
+
 ```js
 const response = await fetch(`${this.SERVER}/public/get/pfp/${id}`, {
-    method: 'GET'
+	method: 'GET'
 });
 const data = await response;
 ```
 
 Response:
+
 ```
 File Object
 ```
 
-### ``POST`` - ``/user/friends/add/:id``
+### `POST` - `/user/friends/add/:id`
+
 Add a given user to your friends list by ID.
 
-REQUIRED: ``Login Token``*
+REQUIRED: `Login Token`\*
 
 Request Example:
+
 ```js
 const response = await fetch(`${this.SERVER}/user/friends/add/${id}`, {
-    credentials: 'include',
-    method: 'POST'
+	credentials: 'include',
+	method: 'POST'
 });
 const data = await response.json();
 ```
 
-Response: ``200``
+Response: `200`
+
 ```
 { message: 'Request sent successfully' }
 ```
 
-Response: ``500``
+Response: `500`
+
 ```
 { error: 'Error adding friend' }
 ```
 
-### * How do I get login token?
+### \* How do I get login token?
+
 > Typically you can only get a login token by logging in on our site, however if you extract this cookie you can use it from another site to login.
+
 ## What's the inspiration behind it?
 
 Maple was inspired by various experiences, such as being on a plane without internet. While I had my music with me, I found local tools like Windows Media Player lacking. This project not only aims to solve that issue but also serves as a learning experience for me.
 
+## Wondering how we use your data?
+
+You can view our privacy policy [here](https://maple.music/privacy)!
+
 ## Credits
 
 ### Lead Developer

README.md

@@ -27,7 +27,7 @@
 		"express": "^4.21.2",
 		"express-rate-limit": "^7.5.0",
 		"express-slow-down": "^3.0.1",
-		"express-validator": "^7.3.1",
+		"express-validator": "^7.2.1",
 		"jsonwebtoken": "^9.0.2",
 		"multer": "^2.0.2",
 		"mysql": "^2.18.1",