Merge pull request #169 from ragestudio/dev

Author: srgooglo

comty.js

@@ -1,90 +1,91 @@
 {
-  "name": "@comty/app",
-  "version": "1.44.0@alpha",
-  "license": "ComtyLicense",
-  "main": "electron/main",
-  "type": "module",
-  "author": "RageStudio",
-  "description": "A prototype of a social network.",
-  "scripts": {
-    "dev": "vite",
-    "build": "vite build",
-    "preview": "vite preview",
-    "release": "node ./scripts/release.js",
-    "postinstall": "./scripts/postinstall.sh",
-    "eslint": "eslint"
-  },
-  "dependencies": {
-    "@ant-design/icons": "^5.4.0",
-    "@dnd-kit/core": "^6.0.8",
-    "@dnd-kit/modifiers": "^9.0.0",
-    "@dnd-kit/sortable": "^7.0.2",
-    "@dnd-kit/utilities": "^3.2.2",
-    "@emotion/react": "^11.13.0",
-    "@emotion/styled": "^11.13.0",
-    "@ffmpeg/ffmpeg": "^0.12.10",
-    "@ffmpeg/util": "^0.12.1",
-    "@mui/material": "^5.11.9",
-    "@ragestudio/cordova-nfc": "^1.2.0",
-    "@ragestudio/vessel": "^0.23.1",
-    "@sentry/browser": "^7.64.0",
-    "@tauri-apps/api": "^1.5.4",
-    "@tsmx/human-readable": "^1.0.7",
-    "antd": "^5.20.6",
-    "axios": "^1.7.7",
-    "bear-react-carousel": "^4.0.10-alpha.0",
-    "classnames": "2.3.1",
-    "comty.js": "^0.68.0",
-    "d3": "^7.9.0",
-    "dashjs": "^5.0.3",
-    "dompurify": "^3.0.0",
-    "fast-average-color": "^9.2.0",
-    "fuse.js": "6.5.3",
-    "hls.js": "^1.5.17",
-    "howler": "2.2.3",
-    "i18next": "21.6.6",
-    "js-cookie": "3.0.1",
-    "jsmediatags": "^3.9.7",
-    "lottie-react": "^2.4.0",
-    "luxon": "^3.0.4",
-    "mime": "^3.0.0",
-    "moment": "2.29.4",
-    "motion": "^12.4.2",
-    "music-metadata": "^11.2.1",
-    "plyr": "^3.7.8",
-    "prop-types": "^15.8.1",
-    "qs": "^6.14.0",
-    "react": "18.3.1",
-    "react-beautiful-dnd": "^13.1.1",
-    "react-color": "2.19.3",
-    "react-countup": "^6.4.1",
-    "react-dom": "18.3.1",
-    "react-fast-marquee": "^1.3.5",
-    "react-i18next": "11.15.3",
-    "react-icons": "^5.4.0",
-    "react-lazy-load-image-component": "^1.5.4",
-    "react-markdown": "^8.0.3",
-    "react-modal-image": "^2.6.0",
-    "react-player": "^2.16.0",
-    "react-rnd": "^10.4.14",
-    "react-transition-group": "^4.4.5",
-    "react-useanimations": "^2.10.0",
-    "remark-gfm": "^3.0.1",
-    "rxjs": "^7.5.5",
-    "store": "^2.0.12",
-    "swapy": "^1.0.5",
-    "ua-parser-js": "^1.0.36",
-    "vaul": "^1.1.2",
-    "vite": "^6.2.6"
-  },
-  "devDependencies": {
-    "@eslint/js": "^9.26.0",
-    "@octokit/rest": "^21.1.1",
-    "7zip-min": "1.4.3",
-    "dotenv": "16.0.3",
-    "eslint": "^9.26.0",
-    "eslint-plugin-react": "^7.37.5",
-    "form-data": "^4.0.0",
-    "globals": "^16.1.0"
-  }
+	"name": "@comty/app",
+	"version": "1.44.1@alpha",
+	"license": "ComtyLicense",
+	"main": "electron/main",
+	"type": "module",
+	"author": "RageStudio",
+	"description": "A prototype of a social network.",
+	"scripts": {
+		"dev": "vite",
+		"build": "vite build",
+		"preview": "vite preview",
+		"release": "node ./scripts/release.js",
+		"postinstall": "./scripts/postinstall.sh",
+		"eslint": "eslint"
+	},
+	"dependencies": {
+		"@ant-design/icons": "^5.4.0",
+		"@dnd-kit/core": "^6.0.8",
+		"@dnd-kit/modifiers": "^9.0.0",
+		"@dnd-kit/sortable": "^7.0.2",
+		"@dnd-kit/utilities": "^3.2.2",
+		"@emotion/react": "^11.13.0",
+		"@emotion/styled": "^11.13.0",
+		"@ffmpeg/ffmpeg": "^0.12.10",
+		"@ffmpeg/util": "^0.12.1",
+		"@mui/material": "^5.11.9",
+		"@ragestudio/cordova-nfc": "^1.2.0",
+		"@ragestudio/vessel": "^0.23.1",
+		"@sentry/browser": "^7.64.0",
+		"@tauri-apps/api": "^1.5.4",
+		"@tsmx/human-readable": "^1.0.7",
+		"antd": "^5.20.6",
+		"axios": "^1.7.7",
+		"bear-react-carousel": "^4.0.10-alpha.0",
+		"classnames": "2.3.1",
+		"comty.js": "^0.68.1",
+		"d3": "^7.9.0",
+		"dashjs": "^5.0.3",
+		"dompurify": "^3.0.0",
+		"fast-average-color": "^9.2.0",
+		"fuse.js": "6.5.3",
+		"hls.js": "^1.5.17",
+		"howler": "2.2.3",
+		"i18next": "21.6.6",
+		"js-cookie": "3.0.1",
+		"jsmediatags": "^3.9.7",
+		"lottie-react": "^2.4.0",
+		"luxon": "^3.0.4",
+		"mime": "^3.0.0",
+		"moment": "2.29.4",
+		"motion": "^12.4.2",
+		"music-metadata": "^11.2.1",
+		"plyr": "^3.7.8",
+		"prop-types": "^15.8.1",
+		"qs": "^6.14.0",
+		"react": "18.3.1",
+		"react-beautiful-dnd": "^13.1.1",
+		"react-color": "2.19.3",
+		"react-countup": "^6.4.1",
+		"react-dom": "18.3.1",
+		"react-fast-marquee": "^1.3.5",
+		"react-i18next": "11.15.3",
+		"react-icons": "^5.4.0",
+		"react-lazy-load-image-component": "^1.5.4",
+		"react-markdown": "^8.0.3",
+		"react-modal-image": "^2.6.0",
+		"react-player": "^2.16.0",
+		"react-rnd": "^10.4.14",
+		"react-transition-group": "^4.4.5",
+		"react-turnstile": "^1.1.4",
+		"react-useanimations": "^2.10.0",
+		"remark-gfm": "^3.0.1",
+		"rxjs": "^7.5.5",
+		"store": "^2.0.12",
+		"swapy": "^1.0.5",
+		"ua-parser-js": "^1.0.36",
+		"vaul": "^1.1.2",
+		"vite": "^6.2.6"
+	},
+	"devDependencies": {
+		"@eslint/js": "^9.26.0",
+		"@octokit/rest": "^21.1.1",
+		"7zip-min": "1.4.3",
+		"dotenv": "16.0.3",
+		"eslint": "^9.26.0",
+		"eslint-plugin-react": "^7.37.5",
+		"form-data": "^4.0.0",
+		"globals": "^16.1.0"
+	}
 }

packages/app/package.json

@@ -1,3 +1,11 @@
+&.mobile {
+	.player-seek_bar {
+		.slider-container {
+			height: 10px;
+		}
+	}
+}
+
 .player-seek_bar {
 	z-index: 330;
 

packages/app/src/components/Player/SeekBar/index.less

@@ -40,9 +40,7 @@ export const usePlayerStateContext = (updater) => {
 		app.cores.player.eventBus().on("player.state.update", handleStateChange)
 
 		return () => {
-			app.cores.player
-				.eventBus()
-				.off("player.state.update", handleStateChange)
+			app.cores.player.eventBus().off("player.state.update", handleStateChange)
 		}
 	}, [])
 
@@ -56,9 +54,7 @@ export class WithPlayerContext extends React.Component {
 
 	events = {
 		"player.state.update": async (state) => {
-			if (state !== this.state) {
-				this.setState(state)
-			}
+			this.setState(state)
 		},
 	}
 

packages/app/src/contexts/WithPlayerContext/index.jsx

@@ -23,9 +23,7 @@ export default class Layout extends React.PureComponent {
 			const transitionLayer = document.getElementById("transitionLayer")
 
 			if (!transitionLayer) {
-				console.warn(
-					"transitionLayer not found, no animation will be played",
-				)
+				console.warn("transitionLayer not found, no animation will be played")
 				return false
 			}
 
@@ -42,9 +40,7 @@ export default class Layout extends React.PureComponent {
 			const transitionLayer = document.getElementById("transitionLayer")
 
 			if (!transitionLayer) {
-				console.warn(
-					"transitionLayer not found, no animation will be played",
-				)
+				console.warn("transitionLayer not found, no animation will be played")
 				return false
 			}
 
@@ -114,10 +110,7 @@ export default class Layout extends React.PureComponent {
 			)
 		},
 		toggleMobileStyle: (to) => {
-			return this.layoutInterface.toggleRootContainerClassname(
-				"mobile",
-				to,
-			)
+			return this.layoutInterface.toggleRootContainerClassname("mobile", to)
 		},
 		toggleReducedAnimations: (to) => {
 			return this.layoutInterface.toggleRootContainerClassname(
@@ -150,17 +143,14 @@ export default class Layout extends React.PureComponent {
 			)
 		},
 		toggleRootContainerClassname: (classname, to) => {
-			const root = document.documentElement
+		  const root = document.documentElement
 
 			if (!root) {
 				console.error("root not found")
 				return false
 			}
 
-			to =
-				typeof to === "boolean"
-					? to
-					: !root.classList.contains(classname)
+			to = typeof to === "boolean" ? to : !root.classList.contains(classname)
 
 			if (root.classList.contains(classname) === to) {
 				// ignore
@@ -208,10 +198,9 @@ export default class Layout extends React.PureComponent {
 
 		if (this.state.renderError) {
 			if (this.props.staticRenders?.RenderError) {
-				return React.createElement(
-					this.props.staticRenders?.RenderError,
-					{ error: this.state.renderError },
-				)
+				return React.createElement(this.props.staticRenders?.RenderError, {
+					error: this.state.renderError,
+				})
 			}
 
 			return JSON.stringify(this.state.renderError)

packages/app/src/layout.jsx

@@ -159,7 +159,10 @@ const AccountButton = React.forwardRef((props, ref) => {
 		>
 			<div className="icon">
 				{user ? (
-					<antd.Avatar shape="square" src={app.userData.avatar} />
+					<antd.Avatar
+						shape="square"
+						src={app.userData.avatar}
+					/>
 				) : (
 					createIconRender("FiLogin")
 				)}
@@ -168,6 +171,8 @@ const AccountButton = React.forwardRef((props, ref) => {
 	)
 })
 
+AccountButton.displayName = "AccountButton"
+
 export class BottomBar extends React.Component {
 	static contextType = Context
 
@@ -366,9 +371,7 @@ export class BottomBar extends React.Component {
 		}
 
 		const heightValue = Number(
-			app.cores.style
-				.getDefaultVar("bottom-bar-height")
-				.replace("px", ""),
+			app.cores.style.getDefaultVar("bottom-bar-height").replace("px", ""),
 		)
 
 		return (
@@ -409,10 +412,7 @@ export class BottomBar extends React.Component {
 									<div
 										key="creator"
 										id="creator"
-										className={classnames(
-											"item",
-											"primary",
-										)}
+										className={classnames("item", "primary")}
 										onClick={openCreator}
 									>
 										<div className="icon">
@@ -441,9 +441,7 @@ export class BottomBar extends React.Component {
 											})
 										}}
 									>
-										<div className="icon">
-											{createIconRender("FiHome")}
-										</div>
+										<div className="icon">{createIconRender("FiHome")}</div>
 									</div>
 
 									<div
@@ -452,9 +450,7 @@ export class BottomBar extends React.Component {
 										className="item"
 										onClick={app.controls.openSearcher}
 									>
-										<div className="icon">
-											{createIconRender("FiSearch")}
-										</div>
+										<div className="icon">{createIconRender("FiSearch")}</div>
 									</div>
 
 									<AccountButton ref={this.accountBtnRef} />