{/*
diff --git a/packages/app/src/layouts/components/toolsBar/index.less b/packages/app/src/layouts/components/toolsBar/index.less
index a34b8e07..e94a0f1d 100755
--- a/packages/app/src/layouts/components/toolsBar/index.less
+++ b/packages/app/src/layouts/components/toolsBar/index.less
@@ -6,15 +6,22 @@
top: 0;
right: 0;
- max-width: 420px;
- min-width: 320px;
-
height: 100vh;
height: 100dvh;
-
- padding: 10px;
+ max-width: 420px;
z-index: 150;
+ padding: 10px;
+
+ .visible {
+ min-width: 320px;
+ }
+
+ &:not(.visible) {
+ min-width: 0;
+ padding: 0;
+
+ }
}
.tools-bar {
@@ -29,13 +36,13 @@
border-radius: @sidebar_borderRadius;
box-shadow: @card-shadow;
+ padding: 10px;
+
background-color: var(--background-color-accent);
gap: 20px;
- &.visible {
- padding: 10px;
- }
+ flex: 0;
.card {
display: flex;
diff --git a/packages/app/src/layouts/components/topBar/index.jsx b/packages/app/src/layouts/components/topBar/index.jsx
index 3bacac30..0700e132 100755
--- a/packages/app/src/layouts/components/topBar/index.jsx
+++ b/packages/app/src/layouts/components/topBar/index.jsx
@@ -85,7 +85,7 @@ export default (props) => {
}
}, [render])
- const heightValue = visible ? Number(app.cores.style.defaultVar("top-bar-height").replace("px", "")) : 0
+ const heightValue = visible ? Number(app.cores.style.getDefaultVar("top-bar-height").replace("px", "")) : 0
return {
- return
-
+ return
+
+
}
-const ExtensionsBrowser = () => {
- return
{props.title}
@@ -26,16 +26,16 @@ const FieldItem = (props) => {
-
+const AddonsBrowser = () => {
+ return
+
-
+
{
}
-const Marketplace = () => {
- return
-
-
+const addons = () => {
+ return
diff --git a/packages/app/src/pages/lyrics/components/text/index.jsx b/packages/app/src/pages/lyrics/components/text/index.jsx
index f4b0485e..e6b2f089 100644
--- a/packages/app/src/pages/lyrics/components/text/index.jsx
+++ b/packages/app/src/pages/lyrics/components/text/index.jsx
@@ -54,6 +54,8 @@ const LyricsText = React.forwardRef((props, textRef) => {
if (currentLineIndex === 0) {
setVisible(false)
} else {
+ setVisible(true)
+ console.log(`Scrolling to line ${currentLineIndex}`)
// find line element by id
const lineElement = textRef.current.querySelector(`#lyrics-line-${currentLineIndex}`)
@@ -63,24 +65,26 @@ const LyricsText = React.forwardRef((props, textRef) => {
behavior: "smooth",
block: "center",
})
+ } else {
+ // scroll to top
+ textRef.current.scrollTop = 0
}
}
}, [currentLineIndex])
//* Handle when playback status change
React.useEffect(() => {
- if (lyrics) {
- if (typeof lyrics?.lrc !== "undefined") {
- if (context.playback_status === "playing") {
- startSyncInterval()
- } else {
- if (syncInterval) {
- clearInterval(syncInterval)
- }
- } startSyncInterval()
+ if (typeof lyrics?.lrc !== "undefined") {
+ if (context.playback_status === "playing") {
+ startSyncInterval()
+ } else {
+ if (syncInterval) {
+ clearInterval(syncInterval)
+ }
}
+ } else {
+ clearInterval(syncInterval)
}
-
}, [context.playback_status])
//* Handle when lyrics object change
@@ -96,6 +100,12 @@ const LyricsText = React.forwardRef((props, textRef) => {
}
}, [lyrics])
+ React.useEffect(() => {
+ setVisible(false)
+ clearInterval(syncInterval)
+ setCurrentLineIndex(0)
+ }, [context.track_manifest])
+
React.useEffect(() => {
return () => {
clearInterval(syncInterval)
diff --git a/packages/app/src/pages/lyrics/components/video/index.jsx b/packages/app/src/pages/lyrics/components/video/index.jsx
index d8df998f..ab985f81 100644
--- a/packages/app/src/pages/lyrics/components/video/index.jsx
+++ b/packages/app/src/pages/lyrics/components/video/index.jsx
@@ -1,5 +1,7 @@
import React from "react"
+import classnames from "classnames"
+import useHideOnMouseStop from "@hooks/useHideOnMouseStop"
import { Context } from "@contexts/WithPlayerContext"
const maxLatencyInMs = 55
@@ -32,6 +34,13 @@ const LyricsVideo = React.forwardRef((props, videoRef) => {
// if `sync_audio_at_ms` is present, it means the video must be synced with audio
if (lyrics.video_source && typeof lyrics.sync_audio_at_ms !== "undefined") {
+ if (!videoRef.current) {
+ clearInterval(syncInterval)
+ setSyncInterval(null)
+ setCurrentVideoLatency(0)
+ return false
+ }
+
const currentTrackTime = app.cores.player.seek()
const currentVideoTime = videoRef.current.currentTime - (lyrics.sync_audio_at_ms / 1000)
@@ -55,7 +64,7 @@ const LyricsVideo = React.forwardRef((props, videoRef) => {
}
function startSyncInterval() {
- setSyncInterval(setInterval(syncPlayback, 100))
+ setSyncInterval(setInterval(syncPlayback, 300))
}
React.useEffect(() => {
@@ -97,6 +106,17 @@ const LyricsVideo = React.forwardRef((props, videoRef) => {
}
}, [context.playback_status])
+ React.useEffect(() => {
+ if (context.loading === true && context.playback_status === "playing") {
+ videoRef.current.pause()
+ }
+
+ if (context.loading === false && context.playback_status === "playing") {
+ videoRef.current.play()
+ }
+
+ }, [context.loading])
+
//* Handle when lyrics object change
React.useEffect(() => {
if (lyrics) {
@@ -141,17 +161,24 @@ const LyricsVideo = React.forwardRef((props, videoRef) => {
}, [])
return <>
-
{
+ const [navigatorRef, navigatorProps] = useClickNavById(SelectorPaths, ".studio-page-selectors-item")
+
+ return
+
}
-export default Marketplace
\ No newline at end of file
+export default addons
\ No newline at end of file
diff --git a/packages/app/src/pages/marketplace/index.less b/packages/app/src/pages/addons/index.less
similarity index 86%
rename from packages/app/src/pages/marketplace/index.less
rename to packages/app/src/pages/addons/index.less
index c9da0256..5dfb8ab1 100644
--- a/packages/app/src/pages/marketplace/index.less
+++ b/packages/app/src/pages/addons/index.less
@@ -1,4 +1,4 @@
-.marketplace {
+.addons-page {
display: flex;
flex-direction: column;
@@ -6,7 +6,7 @@
width: 100%;
- .marketplace-header {
+ .addons-header {
display: flex;
flex-direction: row;
@@ -16,7 +16,7 @@
width: 100%;
- .marketplace-header-card {
+ .addons-header-card {
display: flex;
flex-direction: row;
@@ -37,20 +37,20 @@
}
}
- .marketplace-field {
+ .addons-field {
display: flex;
flex-direction: column;
- .marketplace-field-header {}
+ .addons-field-header {}
- .marketplace-field-slider {
+ .addons-field-slider {
display: flex;
flex-direction: row;
gap: 20px;
}
- .marketplace-field-item {
+ .addons-field-item {
position: relative;
display: flex;
@@ -67,7 +67,7 @@
padding: 10px;
- .marketplace-field-item-image {
+ .addons-field-item-image {
width: 100%;
height: 60%;
@@ -90,7 +90,7 @@
}
}
- .marketplace-field-item-info {
+ .addons-field-item-info {
display: flex;
flex-direction: column;
diff --git a/packages/app/src/pages/music/creator/components/BasicInformation/index.jsx b/packages/app/src/pages/creator/music/components/BasicInformation/index.jsx
similarity index 100%
rename from packages/app/src/pages/music/creator/components/BasicInformation/index.jsx
rename to packages/app/src/pages/creator/music/components/BasicInformation/index.jsx
diff --git a/packages/app/src/pages/music/creator/components/TracksUploads/index.jsx b/packages/app/src/pages/creator/music/components/TracksUploads/index.jsx
similarity index 99%
rename from packages/app/src/pages/music/creator/components/TracksUploads/index.jsx
rename to packages/app/src/pages/creator/music/components/TracksUploads/index.jsx
index 514ef390..13e28ed9 100755
--- a/packages/app/src/pages/music/creator/components/TracksUploads/index.jsx
+++ b/packages/app/src/pages/creator/music/components/TracksUploads/index.jsx
@@ -332,7 +332,7 @@ const FileListItem = (props) => {
export default (props) => {
const onClickEditTrack = (track) => {
- app.DrawerController.open("track_editor", FileItemEditor, {
+ app.layout.drawer.open("track_editor", FileItemEditor, {
type: "drawer",
props: {
width: "30vw",
diff --git a/packages/app/src/pages/music/creator/components/TracksUploads/index.less b/packages/app/src/pages/creator/music/components/TracksUploads/index.less
similarity index 100%
rename from packages/app/src/pages/music/creator/components/TracksUploads/index.less
rename to packages/app/src/pages/creator/music/components/TracksUploads/index.less
diff --git a/packages/app/src/pages/music/creator/index.jsx b/packages/app/src/pages/creator/music/index.jsx
similarity index 100%
rename from packages/app/src/pages/music/creator/index.jsx
rename to packages/app/src/pages/creator/music/index.jsx
diff --git a/packages/app/src/pages/music/creator/index.less b/packages/app/src/pages/creator/music/index.less
similarity index 100%
rename from packages/app/src/pages/music/creator/index.less
rename to packages/app/src/pages/creator/music/index.less
diff --git a/packages/app/src/pages/lyrics/components/controller/index.jsx b/packages/app/src/pages/lyrics/components/controller/index.jsx
index 564cf8fe..85e21477 100644
--- a/packages/app/src/pages/lyrics/components/controller/index.jsx
+++ b/packages/app/src/pages/lyrics/components/controller/index.jsx
@@ -1,8 +1,10 @@
import React from "react"
-import { Tag } from "antd"
+import { Tag, Button } from "antd"
import classnames from "classnames"
import Marquee from "react-fast-marquee"
+import useHideOnMouseStop from "@hooks/useHideOnMouseStop"
+
import { Icons } from "@components/Icons"
import Controls from "@components/Player/Controls"
@@ -49,6 +51,7 @@ const PlayerController = React.forwardRef((props, ref) => {
const titleRef = React.useRef()
+ const [hide, onMouseEnter, onMouseLeave] = useHideOnMouseStop({ delay: 3000, hideCursor: true })
const [titleIsOverflown, setTitleIsOverflown] = React.useState(false)
const [currentTime, setCurrentTime] = React.useState(0)
@@ -61,6 +64,7 @@ const PlayerController = React.forwardRef((props, ref) => {
setDraggingTime(false)
app.cores.player.seek(seekTime)
+ syncPlayback()
}
async function syncPlayback() {
@@ -87,12 +91,24 @@ const PlayerController = React.forwardRef((props, ref) => {
React.useEffect(() => {
setTitleIsOverflown(isOverflown(titleRef.current))
setTrackDuration(app.cores.player.duration())
+ console.log(context.track_manifest)
}, [context.track_manifest])
+ React.useEffect(() => {
+ syncPlayback()
+ }, [])
+
const isStopped = context.playback_status === "stopped"
return
+
- - Marketplace + Addons
@@ -174,7 +190,6 @@ const PlayerController = React.forwardRef((props, ref) => {
{
context.track_manifest?.metadata.lossless &&
-
}
-const ReleasesList = (props) => {
- const hopNumber = props.hopsPerPage ?? 6
-
- const [offset, setOffset] = React.useState(0)
- const [ended, setEnded] = React.useState(false)
-
- const [loading, result, error, makeRequest] = app.cores.api.useRequest(props.fetchMethod, {
- limit: hopNumber,
- trim: offset
- })
-
- const onClickPrev = () => {
- if (offset === 0) {
- return
- }
-
- setOffset((value) => {
- const newOffset = value - hopNumber
-
- // check if newOffset is NaN
- if (newOffset !== newOffset) {
- return false
- }
-
- if (typeof makeRequest === "function") {
- makeRequest({
- trim: newOffset,
- limit: hopNumber,
- })
- }
-
- return newOffset
- })
- }
-
- const onClickNext = () => {
- if (ended) {
- return
- }
-
- setOffset((value) => {
- const newOffset = value + hopNumber
-
- // check if newOffset is NaN
- if (newOffset !== newOffset) {
- return false
- }
-
- if (typeof makeRequest === "function") {
- makeRequest({
- trim: newOffset,
- limit: hopNumber,
- })
- }
-
- return newOffset
- })
- }
-
- React.useEffect(() => {
- if (result) {
- setEnded(result.length < hopNumber)
- }
- }, [result])
-
- if (error) {
- console.error(error)
-
- return
-
+ }
Maximun latency
-{maxLatencyInMs}ms
+ { + props.lyrics?.sync_audio_at &&
+
-
+
+ Maximun latency
+{maxLatencyInMs}ms
+
+
+ {syncingVideo ? Video Latency
+{(currentVideoLatency * 1000).toFixed(2)}ms
+Syncing video...
: null}
-
- {syncingVideo ? Video Latency
-{(currentVideoLatency * 1000).toFixed(2)}ms
-Syncing video...
: null} -
-
- }
-
- return
-
-}
-
const ResultGroupsDecorators = {
"playlists": {
icon: "MdPlaylistPlay",
diff --git a/packages/app/src/pages/music/components/explore/index.less b/packages/app/src/pages/music/tabs/explore/index.less
similarity index 83%
rename from packages/app/src/pages/music/components/explore/index.less
rename to packages/app/src/pages/music/tabs/explore/index.less
index 086cb8d0..ba35a49c 100755
--- a/packages/app/src/pages/music/components/explore/index.less
+++ b/packages/app/src/pages/music/tabs/explore/index.less
@@ -150,59 +150,6 @@ html {
overflow-x: visible;
}
-
- .playlistExplorer_section {
- display: flex;
- flex-direction: column;
-
- overflow-x: visible;
-
- .playlistExplorer_section_header {
- display: flex;
- flex-direction: row;
-
- align-items: center;
-
- margin-bottom: 20px;
-
- h1 {
- font-size: 1.5rem;
- margin: 0;
- }
-
- .playlistExplorer_section_header_actions {
- display: flex;
- flex-direction: row;
-
- gap: 10px;
-
- align-self: center;
-
- margin-left: auto;
- }
- }
-
- .playlistExplorer_section_list {
- display: grid;
-
- grid-gap: 20px;
- grid-template-columns: repeat(3, minmax(0, 1fr));
-
- min-width: 372px !important;
-
- @media (min-width: 2000px) {
- grid-template-columns: repeat(4, 1fr);
- }
-
- @media (min-width: 2300px) {
- grid-template-columns: repeat(5, 1fr);
- }
-
- .playlistItem {
- justify-self: center;
- }
- }
- }
}
.music-explorer_search_results {
diff --git a/packages/app/src/pages/music/components/favorites/index.jsx b/packages/app/src/pages/music/tabs/favorites/index.jsx
similarity index 100%
rename from packages/app/src/pages/music/components/favorites/index.jsx
rename to packages/app/src/pages/music/tabs/favorites/index.jsx
diff --git a/packages/app/src/pages/music/tabs.jsx b/packages/app/src/pages/music/tabs/index.jsx
similarity index 77%
rename from packages/app/src/pages/music/tabs.jsx
rename to packages/app/src/pages/music/tabs/index.jsx
index fc1d3e38..6611ecc2 100755
--- a/packages/app/src/pages/music/tabs.jsx
+++ b/packages/app/src/pages/music/tabs/index.jsx
@@ -1,6 +1,6 @@
-import LibraryTab from "./components/library"
-import FavoritesTab from "./components/favorites"
-import ExploreTab from "./components/explore"
+import LibraryTab from "./library"
+import FavoritesTab from "./favorites"
+import ExploreTab from "./explore"
export default [
{
diff --git a/packages/app/src/pages/music/components/library/index.jsx b/packages/app/src/pages/music/tabs/library/index.jsx
similarity index 100%
rename from packages/app/src/pages/music/components/library/index.jsx
rename to packages/app/src/pages/music/tabs/library/index.jsx
diff --git a/packages/app/src/pages/music/components/library/index.less b/packages/app/src/pages/music/tabs/library/index.less
similarity index 100%
rename from packages/app/src/pages/music/components/library/index.less
rename to packages/app/src/pages/music/tabs/library/index.less
diff --git a/packages/app/src/pages/music/components/spaces/index.jsx b/packages/app/src/pages/music/tabs/spaces/index.jsx
similarity index 100%
rename from packages/app/src/pages/music/components/spaces/index.jsx
rename to packages/app/src/pages/music/tabs/spaces/index.jsx
diff --git a/packages/app/src/pages/music/components/spaces/index.less b/packages/app/src/pages/music/tabs/spaces/index.less
similarity index 100%
rename from packages/app/src/pages/music/components/spaces/index.less
rename to packages/app/src/pages/music/tabs/spaces/index.less
diff --git a/packages/app/src/pages/settings/components/SettingItemComponent/index.jsx b/packages/app/src/pages/settings/components/SettingItemComponent/index.jsx
index 41f755b9..ab2c3e05 100755
--- a/packages/app/src/pages/settings/components/SettingItemComponent/index.jsx
+++ b/packages/app/src/pages/settings/components/SettingItemComponent/index.jsx
@@ -1,7 +1,6 @@
import React from "react"
import * as antd from "antd"
import classnames from "classnames"
-
import { Translation } from "react-i18next"
import { SliderPicker } from "react-color"
@@ -9,6 +8,19 @@ import { Icons, createIconRender } from "@components/Icons"
import PerformanceLog from "@classes/PerformanceLog"
+import "./index.less"
+
+function shouldUseHorizontalLayout(type) {
+ switch (type) {
+ case "switch":
+ return true
+ case "button":
+ return true
+ default:
+ return false
+ }
+}
+
export const SettingsComponents = {
button: {
component: antd.Button,
@@ -400,8 +412,10 @@ export default class SettingItemComponent extends React.PureComponent {
className={classnames(
"setting_item",
{
- ["usePadding"]: this.props.setting.usePadding ?? true
- })}
+ ["usePadding"]: this.props.setting.usePadding ?? true,
+ ["useHorizontal"]: this.props.setting.layout ?? shouldUseHorizontalLayout(String(this.props.setting.component).toLowerCase())
+ })
+ }
>
-
- {
- props.headerIcon
- }
-
-
-
-
- {
- props.headerIcon
- }
-
- {(t) => t(props.headerTitle)}
-
-
-
-
-
-
- {
- loading &&
-
@@ -414,7 +428,9 @@ export default class SettingItemComponent extends React.PureComponent {
{(t) => t(this.props.setting.title ?? this.props.setting.id)}
- {this.props.setting.experimental && Experimental }
+ {
+ this.props.setting.experimental && Experimental
+ }
diff --git a/packages/app/src/pages/settings/components/SettingItemComponent/index.less b/packages/app/src/pages/settings/components/SettingItemComponent/index.less new file mode 100644 index 00000000..198ba880 --- /dev/null +++ b/packages/app/src/pages/settings/components/SettingItemComponent/index.less @@ -0,0 +1,121 @@ +.setting_item { + display: flex; + flex-direction: column; + + width: 100%; + + padding: 0 15px; + + &.useHorizontal { + flex-direction: row; + + justify-content: space-between; + + gap: 50px; + + .setting_item_content { + width: fit-content; + } + } + + .uploadButton { + background-color: var(--background-color-primary); + border: 1px solid var(--border-color); + } + + .setting_item_header { + display: inline-flex; + flex-direction: row; + + align-items: center; + justify-content: space-between; + + width: 100%; + + .setting_item_info { + display: flex; + flex-direction: column; + + gap: 7px; + + width: 100%; + + .setting_item_header_title { + display: flex; + flex-direction: row; + + align-items: center; + justify-content: space-between; + + width: 100%; + + color: var(--background-color-contrast); + + h1 { + font-size: 1rem; + margin: 0; + color: var(--background-color-contrast); + } + } + + .setting_item_header_description { + p { + color: var(--background-color-contrast); + font-size: 0.7rem; + margin: 0; + } + } + + } + + .setting_item_header_actions { + display: inline-flex; + align-items: center; + + gap: 10px; + + .ant-btn { + background-color: var(--background-color-primary-2); + } + + .ant-btn:not([disabled]) { + &:hover { + color: var(--colorPrimary); + border: 1px solid var(--colorPrimary); + } + } + } + } + + .setting_item_content { + display: flex; + flex-direction: column; + + --ignore-dragger: true; + padding: 6px 20px; + + width: 100%; + + h1, + h2, + h3, + h4, + h5, + h6, + h3, + p, + span { + color: var(--background-color-contrast); + } + + button { + width: min-content; + } + + .ant-btn.ant-btn-icon-only { + width: 32px; + } + + .ant-select {} + } +} \ No newline at end of file diff --git a/packages/app/src/pages/settings/index.jsx b/packages/app/src/pages/settings/index.jsx index 9c833a94..69be9cff 100755 --- a/packages/app/src/pages/settings/index.jsx +++ b/packages/app/src/pages/settings/index.jsx @@ -122,6 +122,14 @@ export default () => { }) } + React.useEffect(() => { + app.layout.tools_bar.toggleVisibility(false) + + return () => { + app.layout.tools_bar.toggleVisibility(true) + } + }, []) + return
+
+}
+
+export default StudioPage
\ No newline at end of file
diff --git a/packages/app/src/pages/studio/index.less b/packages/app/src/pages/studio/index.less
new file mode 100644
index 00000000..70ca6eb5
--- /dev/null
+++ b/packages/app/src/pages/studio/index.less
@@ -0,0 +1,78 @@
+@studio-page-selectors-item-size: 100px;
+
+.studio-page {
+ display: flex;
+ flex-direction: column;
+
+ gap: 20px;
+
+ .studio-page-header {
+ display: flex;
+ flex-direction: row;
+
+ align-items: center;
+ justify-content: center;
+
+ padding: 10px 20px;
+ gap: 10px;
+
+ background-color: var(--background-color-accent);
+ border-radius: 12px;
+
+ font-family: "Space Grotesk", sans-serif;
+ font-size: 1.5rem;
+ margin: 0;
+
+ h1 {
+ margin: 0;
+ }
+ }
+
+ .studio-page-selectors {
+ display: flex;
+ flex-direction: row;
+
+ gap: 10px;
+
+ width: 100px;
+ height: 100px;
+
+ .studio-page-selectors-item {
+ display: flex;
+ flex-direction: column;
+
+ align-items: center;
+ justify-content: center;
+
+ width: 100%;
+ height: 100%;
+ max-width: @studio-page-selectors-item-size;
+ max-height: @studio-page-selectors-item-size;
+ min-height: @studio-page-selectors-item-size;
+ min-width: @studio-page-selectors-item-size;
+
+ padding: 20px;
+ gap: 10px;
+
+ border: 2px var(--border-color) solid;
+ border-radius: 12px;
+
+ cursor: pointer;
+
+ transition: all 150ms ease-in-out;
+
+ &:hover {
+ background-color: var(--background-color-accent);
+ }
+
+ svg,
+ span {
+ margin: 0;
+ }
+
+ svg {
+ font-size: 1.3rem;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/packages/app/src/pages/studio/music/[release_id]/index.jsx b/packages/app/src/pages/studio/music/[release_id]/index.jsx
new file mode 100644
index 00000000..d51afc29
--- /dev/null
+++ b/packages/app/src/pages/studio/music/[release_id]/index.jsx
@@ -0,0 +1,13 @@
+import React from "react"
+
+import ReleaseEditor from "@components/MusicStudio/ReleaseEditor"
+
+const ReleaseEditorPage = (props) => {
+ const { release_id } = props.params
+
+ return
+
+
+ Studio
+
+
+
+
+
+
+
+
+
+
+
+
+}
+
+export default MusicStudioPage
\ No newline at end of file
diff --git a/packages/app/src/pages/studio/music/index.less b/packages/app/src/pages/studio/music/index.less
new file mode 100644
index 00000000..06f6489e
--- /dev/null
+++ b/packages/app/src/pages/studio/music/index.less
@@ -0,0 +1,25 @@
+.music-studio-page {
+ display: flex;
+ flex-direction: column;
+
+ width: 100%;
+
+ gap: 20px;
+
+ .music-studio-page-header {
+ display: flex;
+ flex-direction: row;
+
+ align-items: center;
+ justify-content: space-between;
+
+ width: 100%;
+ }
+
+ .music-studio-page-content {
+ display: flex;
+ flex-direction: column;
+
+ width: 100%;
+ }
+}
\ No newline at end of file
diff --git a/packages/app/src/pages/tv/live/[id].jsx b/packages/app/src/pages/tv/live/[id].jsx
index fcacdb7a..257951ef 100755
--- a/packages/app/src/pages/tv/live/[id].jsx
+++ b/packages/app/src/pages/tv/live/[id].jsx
@@ -256,15 +256,16 @@ export default class StreamViewer extends React.Component {
}
enterPlayerAnimation = () => {
- app.cores.style.applyVariant("dark")
- app.cores.style.compactMode(true)
+ app.cores.style.applyTemporalVariant("dark")
+ app.cores.style.toggleCompactMode(true)
app.layout.toggleCenteredContent(false)
app.controls.toggleUIVisibility(false)
}
exitPlayerAnimation = () => {
- app.cores.style.applyInitialVariant()
- app.cores.style.compactMode(false)
+ app.cores.style.applyVariant(app.cores.style.currentVariantKey)
+ app.cores.style.toggleCompactMode(false)
+ app.layout.toggleCenteredContent(true)
app.controls.toggleUIVisibility(true)
}
diff --git a/packages/app/src/settings/accessibility/index.jsx b/packages/app/src/settings/accessibility/index.jsx
new file mode 100644
index 00000000..83f17be6
--- /dev/null
+++ b/packages/app/src/settings/accessibility/index.jsx
@@ -0,0 +1,40 @@
+export default {
+ id: "accessibility",
+ icon: "MdAccessibilityNew",
+ label: "Accessibility",
+ group: "app",
+ order: 4,
+ settings: [
+ {
+ id: "haptics:enabled",
+ storaged: true,
+ group: "Accessibility",
+ component: "Switch",
+ icon: "MdVibration",
+ title: "Haptic Feedback",
+ description: "Enable haptic feedback on touch events.",
+ desktop: false
+ },
+ {
+ id: "longPressDelay",
+ storaged: true,
+ group: "Accessibility",
+ component: "Slider",
+ icon: "MdTimer",
+ title: "Long press delay",
+ description: "Set the delay before long press trigger is activated.",
+ props: {
+ min: 300,
+ max: 2000,
+ step: 100,
+ marks: {
+ 300: "0.3s",
+ 600: "0.6s",
+ 1000: "1s",
+ 1500: "1.5s",
+ 2000: "2s",
+ }
+ }
+ },
+ ]
+}
\ No newline at end of file
diff --git a/packages/app/src/settings/apparence/index.jsx b/packages/app/src/settings/apparence/index.jsx
index ae09a5ed..8dfdb5f9 100755
--- a/packages/app/src/settings/apparence/index.jsx
+++ b/packages/app/src/settings/apparence/index.jsx
@@ -12,76 +12,14 @@ export default {
order: 1,
settings: [
{
- id: "style.reduceAnimations",
- group: "animations",
- component: "Switch",
- icon: "MdOutlineSlowMotionVideo",
- title: "Reduce animations",
- experimental: true,
- disabled: true,
- storaged: true,
- },
- {
- id: "style.pageTransitionDuration",
- group: "animations",
- component: "Slider",
- icon: "MdOutlineSpeed",
- title: "Page transition duration",
- description: "Change the duration of the page transition animation.",
- props: {
- min: 0,
- max: 1000,
- step: 50,
- marks: {
- [app.cores.style.defaultVar("page-transition-duration").replace("ms", "")]: " ",
- },
- tooltip: {
- formatter: (value) => `${value / 1000}s`
- }
- },
- defaultValue: () => {
- const value = app.cores.style.getValue("page-transition-duration")
-
- return value ? Number(value.replace("ms", "")) : 250
- },
- onUpdate: (value) => {
- app.cores.style.modify({
- "page-transition-duration": `${value}ms`
- })
- },
- storaged: true,
- },
- {
- id: "style:auto_darkmode",
+ id: "style:variant_mode",
group: "aspect",
component: "Switch",
icon: "Moon",
- title: "Sync with system",
- description: "Automatically switch to dark mode based on your system preference.",
- emitEvent: "style:auto_darkmode",
- storaged: true,
- },
- {
- id: "style:darkmode",
- group: "aspect",
- component: "Switch",
- icon: "Moon",
- title: "Dark mode",
- description: "Change the theme variant of the application to dark.",
- dependsOn: {
- "style:auto_darkmode": false
- },
- defaultValue: () => {
- return app.cores.style.currentVariant === "dark"
- },
- onUpdate: (value) => {
- app.cores.style.modify({
- themeVariant: value ? "dark" : "light"
- })
-
- return value
- },
- storaged: true
+ title: "Theme",
+ description: "Change the theme of the application.",
+ component: loadable(() => import("../components/themeVariantSelector")),
+ layout: "horizontal",
},
{
id: "style.compactMode",
@@ -91,10 +29,10 @@ export default {
title: "Compact mode",
description: "Reduce the size of the application elements.",
defaultValue: () => {
- return app.cores.style.getValue("compact-mode")
+ return app.cores.style.getVar("compact-mode")
},
onUpdate: (value) => {
- app.cores.style.modify({
+ app.cores.style.mutateTheme({
"compact-mode": value
})
@@ -118,10 +56,10 @@ export default {
}
},
defaultValue: () => {
- return app.cores.style.getValue("fontScale")
+ return app.cores.style.getVar("fontScale")
},
onUpdate: (value) => {
- app.cores.style.modify({
+ app.cores.style.mutateTheme({
"fontScale": value
})
@@ -152,10 +90,10 @@ export default {
]
},
defaultValue: () => {
- return app.cores.style.getValue("fontFamily")
+ return app.cores.style.getVar("fontFamily")
},
onUpdate: (value) => {
- app.cores.style.modify({
+ app.cores.style.mutateTheme({
"fontFamily": value
})
@@ -169,11 +107,12 @@ export default {
component: "SliderColorPicker",
title: "Primary color",
description: "Change primary color of the application.",
+ icon: "IoMdColorFill",
defaultValue: () => {
- return app.cores.style.getValue("colorPrimary")
+ return app.cores.style.getVar("colorPrimary")
},
onUpdate: (value) => {
- app.cores.style.modify({
+ app.cores.style.mutateTheme({
"colorPrimary": value
})
},
@@ -202,261 +141,42 @@ export default {
UploadButton
],
defaultValue: () => {
- const value = app.cores.style.getValue("backgroundImage")
+ const value = app.cores.style.getVar("backgroundImage")
console.log(value)
return value ? value.replace(/url\(|\)/g, "") : ""
},
onUpdate: (value) => {
- app.cores.style.modify({
+ app.cores.style.mutateTheme({
backgroundImage: `url(${value})`
})
},
storaged: false,
},
{
- id: "style.backgroundBlur",
+ id: "style.backgroundTweaker",
group: "aspect",
- component: "Slider",
- icon: "MdBlurOn",
- title: "Background blur",
- description: "Create a blur effect on the background.",
- props: {
- min: 0,
- max: 50,
- step: 1
- },
- defaultValue: () => {
- const value = app.cores.style.getValue("backgroundBlur")
-
- return value ? parseInt(value.replace("px", "")) : 0
- },
- onUpdate: (value) => {
- app.cores.style.modify({
- backgroundBlur: `${value}px`
- })
- },
- storaged: false,
- },
- {
- id: "style.backgroundColorTransparency",
- group: "aspect",
- component: "Slider",
- icon: "Eye",
- title: "Background color transparency",
- description: "Adjust the transparency of the background color.",
- props: {
- min: 0,
- max: 1,
- step: 0.1
- },
- defaultValue: () => {
- const value = app.cores.style.getValue("backgroundColorTransparency")
-
- return value ? parseFloat(value) : 1
- },
- onUpdate: (value) => {
- app.cores.style.modify({
- backgroundColorTransparency: value
- })
- },
- storaged: false
- },
- {
- id: "style.backgroundSize",
- group: "aspect",
- component: "Select",
- icon: "MdOutlineImageAspectRatio",
- title: "Background size",
- description: "Adjust the size of the background image.",
- props: {
- style: {
- width: "100%"
- },
- options: [
- {
- label: "Cover",
- value: "cover"
- },
- {
- label: "Contain",
- value: "contain"
- },
- {
- label: "Auto",
- value: "auto"
- },
- {
- label: "50%",
- value: "50%"
- },
- {
- label: "100%",
- value: "100%"
- },
- {
- label: "150%",
- value: "150%"
- },
- ]
- },
- defaultValue: () => {
- return app.cores.style.getValue("backgroundSize")
- },
- onUpdate: (value) => {
- app.cores.style.modify({
- backgroundSize: value
- })
-
- return value
- },
- storaged: false
- },
- {
- id: "style.backgroundPosition",
- group: "aspect",
- component: "Select",
- icon: "MdOutlineImageAspectRatio",
- title: "Background position",
- description: "Adjust the position of the background image.",
- props: {
- style: {
- width: "100%"
- },
- options: [
- {
- label: "Left",
- value: "left"
- },
- {
- label: "Center",
- value: "center"
- },
- {
- label: "Right",
- value: "right"
- },
- {
- label: "Top",
- value: "top"
- },
- ]
- },
- defaultValue: () => {
- return app.cores.style.getValue("backgroundPosition")
- },
- onUpdate: (value) => {
- app.cores.style.modify({
- backgroundPosition: value
- })
-
- return value
- },
- storaged: false
- },
- {
- id: "style.backgroundRepeat",
- group: "aspect",
- component: "Select",
- icon: "MdOutlineImageAspectRatio",
- title: "Background repeat",
- description: "Adjust the repeat of the background image.",
- props: {
- style: {
- width: "100%"
- },
- options: [
- {
- label: "Repeat",
- value: "repeat"
- },
- {
- label: "No repeat",
- value: "no-repeat"
- },
- {
- label: "Repeat X",
- value: "repeat-x"
- },
- {
- label: "Repeat Y",
- value: "repeat-y"
- },
- ]
- },
- defaultValue: () => {
- return app.cores.style.getValue("backgroundRepeat")
- },
- onUpdate: (value) => {
- app.cores.style.modify({
- backgroundRepeat: value
- })
-
- return value
- },
- storaged: false
- },
- {
- id: "style.backgroundAttachment",
- group: "aspect",
- component: "Select",
- icon: "MdOutlineImageAspectRatio",
- title: "Background attachment",
- description: "Adjust the attachment of the background image.",
- props: {
- style: {
- width: "100%"
- },
- options: [
- {
- label: "Scroll",
- value: "scroll"
- },
- {
- label: "Fixed",
- value: "fixed"
- },
- {
- label: "Local",
- value: "local"
- },
- {
- label: "Initial",
- value: "initial"
- },
- {
- label: "Inherit",
- value: "inherit"
- },
- ]
- },
- defaultValue: () => {
- return app.cores.style.getValue("backgroundAttachment")
- },
- onUpdate: (value) => {
- app.cores.style.modify({
- backgroundAttachment: value
- })
-
- return value
- },
+ title: "Background tweaker",
+ description: "Tweak the custom background",
+ component: loadable(() => import("../components/backgroundTweaker")),
storaged: false
},
{
id: "resetTheme",
group: "aspect",
component: "Button",
- title: "Reset theme",
+ icon: "IoMdRefresh",
+ title: "Reset to default theme",
props: {
- children: "Default Theme"
+ children: "Reset"
},
onUpdate: (value) => {
Modal.confirm({
title: "Are you sure you want to reset the theme to the default theme ?",
description: "This action will reset the theme to the default theme. All your modifications will be lost.",
onOk: () => {
- app.cores.style.setDefault()
+ app.cores.style.resetToDefault()
}
})
},
diff --git a/packages/app/src/settings/components/backgroundSelector/index.jsx b/packages/app/src/settings/components/backgroundSelector/index.jsx
index 3519f3f8..111936e7 100755
--- a/packages/app/src/settings/components/backgroundSelector/index.jsx
+++ b/packages/app/src/settings/components/backgroundSelector/index.jsx
@@ -38,7 +38,7 @@ export default (props) => {
+
+
+ Music Studio
+ + {
- app.cores.style.modify({
+ app.cores.style.mutateTheme({
backgroundSVG: `url("${background.src}")`
})
}}
diff --git a/packages/app/src/settings/components/backgroundTweaker/index.jsx b/packages/app/src/settings/components/backgroundTweaker/index.jsx
new file mode 100644
index 00000000..6df90362
--- /dev/null
+++ b/packages/app/src/settings/components/backgroundTweaker/index.jsx
@@ -0,0 +1,313 @@
+import React from "react"
+import * as antd from "antd"
+import classnames from "classnames"
+
+import { Icons } from "@components/Icons"
+
+import "./index.less"
+
+const Tweaks = {
+ blur: {
+ id: "style.backgroundBlur",
+ fetchValue: () => {
+ const value = app.cores.style.getVar("backgroundBlur")
+
+ if (typeof value !== "string") {
+ return 0
+ }
+
+ return value ? parseInt(value.replace("px", "")) : 0
+ },
+ updateValue: (value) => {
+ app.cores.style.mutateTheme({
+ backgroundBlur: `${value}px`
+ })
+ },
+ },
+ opacity: {
+ id: "style.backgroundColorTransparency",
+ fetchValue: () => {
+ const value = app.cores.style.getVar("backgroundColorTransparency")
+
+ return value ? parseFloat(value) : 1
+ },
+ updateValue: (value) => {
+ app.cores.style.mutateTheme({
+ backgroundColorTransparency: value
+ })
+ },
+ },
+ size: {
+ id: "style.backgroundSize",
+ fetchValue: () => {
+ return app.cores.style.getVar("backgroundSize")
+ },
+ updateValue: (value) => {
+ app.cores.style.mutateTheme({
+ backgroundSize: value
+ })
+ },
+ options: [
+ {
+ label: "Cover",
+ value: "cover"
+ },
+ {
+ label: "Contain",
+ value: "contain"
+ },
+ {
+ label: "Auto",
+ value: "auto"
+ },
+ {
+ label: "50%",
+ value: "50%"
+ },
+ {
+ label: "100%",
+ value: "100%"
+ },
+ {
+ label: "150%",
+ value: "150%"
+ },
+ ],
+ },
+ position: {
+ id: "style.backgroundPosition",
+ fetchValue: () => {
+ return app.cores.style.getVar("backgroundPosition")
+ },
+ updateValue: (value) => {
+ app.cores.style.mutateTheme({
+ backgroundPosition: value
+ })
+ },
+ options: [
+ {
+ label: "Left",
+ value: "left"
+ },
+ {
+ label: "Center",
+ value: "center"
+ },
+ {
+ label: "Right",
+ value: "right"
+ },
+ {
+ label: "Top",
+ value: "top"
+ },
+ ],
+ },
+ repeat: {
+ id: "style.backgroundRepeat",
+ fetchValue: () => {
+ return app.cores.style.getVar("backgroundRepeat")
+ },
+ updateValue: (value) => {
+ app.cores.style.mutateTheme({
+ backgroundRepeat: value
+ })
+ },
+ options: [
+ {
+ label: "Repeat",
+ value: "repeat"
+ },
+ {
+ label: "No repeat",
+ value: "no-repeat"
+ },
+ {
+ label: "Repeat X",
+ value: "repeat-x"
+ },
+ {
+ label: "Repeat Y",
+ value: "repeat-y"
+ },
+ ],
+ }
+}
+
+function useBackgroundTweakerValues() {
+ const [values, setValues] = React.useState({
+ blur: Tweaks.blur.fetchValue(),
+ opacity: Tweaks.opacity.fetchValue(),
+ size: Tweaks.size.fetchValue(),
+ position: Tweaks.position.fetchValue(),
+ repeat: Tweaks.repeat.fetchValue(),
+ })
+
+ function changeOption(key, value) {
+ if (!Tweaks[key]) {
+ console.error(`Tweaker ${key} not found`)
+ return false
+ }
+
+ Tweaks[key].updateValue(value)
+
+ setValues((prev) => {
+ return {
+ ...prev,
+ [key]: value
+ }
+ })
+ }
+
+ return [values, changeOption]
+}
+
+const BackgroundTweaker = (props) => {
+ const [values, updateOption] = useBackgroundTweakerValues()
+
+ return , reboot, exit`)
-
- await internal_proxy.listen(9000, "0.0.0.0")
-
- await attachAllInstancesStd()
-}
-
-// SERVICE WATCHER FUNCTIONS
-async function handleNewServiceStarting(id) {
- if (serviceRegistry[id].ready === false) {
- spinnies.add(id, {
- text: `📦 [${id}] Loading service...`,
- spinner: DefaultSpinner
- })
- }
-}
-
-async function handleServiceStarted(id) {
- serviceRegistry[id].initialized = true
-
- if (serviceRegistry[id].ready === false) {
- if (spinnies.pick(id)) {
- spinnies.succeed(id, { text: `[${id}][${serviceRegistry[id].index}] Ready` })
- }
- }
-
- serviceRegistry[id].ready = true
-}
-
-async function handleServiceExit(id, code, err) {
- serviceRegistry[id].initialized = true
-
- if (serviceRegistry[id].ready === false) {
- if (spinnies.pick(id)) {
- spinnies.fail(id, { text: `[${id}][${serviceRegistry[id].index}] Failed with code ${code}` })
- }
- }
-
- console.log(`[${id}] Exit with code ${code}`)
-
- // try to unregister from proxy
- internal_proxy.unregisterAllFromService(id)
-
- serviceRegistry[id].ready = false
-}
-
-
-async function handleIPCData(service_id, msg) {
- if (msg.type === "log") {
- console.log(`[${service_id}] ${msg.message}`)
- }
-
- if (msg.status === "ready") {
- await handleServiceStarted(service_id)
- }
-
- if (msg.type === "router:register") {
- if (msg.data.path_overrides) {
- for await (let pathOverride of msg.data.path_overrides) {
- await internal_proxy.register({
- serviceId: service_id,
- path: `/${pathOverride}`,
- target: `http://${internalIp}:${msg.data.listen.port}/${pathOverride}`,
- pathRewrite: {
- [`^/${pathOverride}`]: "",
- },
- })
- }
- } else {
- await internal_proxy.register({
- serviceId: service_id,
- path: `/${service_id}`,
- target: `http://${msg.data.listen.ip}:${msg.data.listen.port}`,
- })
- }
- }
-
- if (msg.type === "router:ws:register") {
- await internal_proxy.register({
- serviceId: service_id,
- path: `/${msg.data.namespace}`,
- target: `http://${internalIp}:${msg.data.listen.port}/${msg.data.namespace}`,
- pathRewrite: {
- [`^/${msg.data.namespace}`]: "",
- },
- ws: true,
- })
- }
-}
-
-function spawnService({ id, service, cwd }) {
- handleNewServiceStarting(id)
-
- const instanceEnv = {
- ...process.env,
- lb_service: {
- id: service.id,
- index: service.index,
- },
- }
-
- let instance = ChildProcess.fork(bootloaderBin, [service], {
- detached: false,
- silent: true,
- cwd: cwd,
- env: instanceEnv,
- killSignal: "SIGKILL",
- })
-
- instance.reload = () => {
- ipcRouter.unregister({ id, instance })
-
- // try to unregister from proxy
- internal_proxy.unregisterAllFromService(id)
-
- instance.kill()
-
- instance = spawnService({ id, service, cwd })
-
- const instanceIndex = instancePool.findIndex((_instance) => _instance.id === id)
-
- if (instanceIndex !== -1) {
- instancePool[instanceIndex].instance = instance
- }
-
- // check if selectedProcessInstance
- if (selectedProcessInstance) {
- if (selectedProcessInstance === "all") {
- attachInstanceStd(instance, {
- afterMsg: "Reloading service...",
- })
- } else {
- detachInstanceStd(selectedProcessInstance.instance)
-
- //if the selected process is this service, reattach std
- if (selectedProcessInstance.id === id) {
- attachInstanceStd(instance, {
- afterMsg: "Reloading service...",
- })
- }
- }
- }
- }
-
- instance.logs = {
- stdout: createServiceLogTransformer({ id }),
- stderr: createServiceLogTransformer({ id, color: "bgRed" }),
- }
-
- instance.logs.stdout.history = []
- instance.logs.stderr.history = []
-
- // push to buffer history
- instance.stdout.pipe(instance.logs.stdout)
- instance.stderr.pipe(instance.logs.stderr)
-
- instance.on("message", (data) => {
- return handleIPCData(id, data)
- })
-
- instance.on("close", (code, err) => {
- return handleServiceExit(id, code, err)
- })
-
- ipcRouter.register({ id, instance })
-
- return instance
-}
-
-function createServiceLogTransformer({ id, color = "bgCyan" }) {
- return new Transform({
- transform(data, encoding, callback) {
- callback(null, `${chalk[color](`[${id}]`)} > ${data.toString()}`)
- }
- })
-}
-
-async function main() {
- internalIp = await getInternalIp()
-
- console.clear()
- console.log(comtyAscii)
- console.log(`\nRunning ${chalk.bgBlue(`${pkg.name}`)} | ${chalk.bgMagenta(`[v${pkg.version}]`)} | ${internalIp} \n\n\n`)
-
- services = await scanServices()
-
- if (services.length === 0) {
- console.error("❌ No service found")
- return process.exit(1)
- }
-
- console.log(`📦 Found ${services.length} service(s)`)
-
- // create watchers
- for await (let service of services) {
- const instanceFile = path.basename(service)
- const instanceBasePath = path.dirname(service)
-
- const { name: id, version } = require(path.resolve(instanceBasePath, "package.json"))
-
- serviceFileReference[instanceFile] = id
-
- serviceRegistry[id] = {
- index: services.indexOf(service),
- id: id,
- version: version,
- file: instanceFile,
- cwd: instanceBasePath,
- buffer: [],
- ready: false,
- }
- }
-
- // create a new process of node for each service
- for await (let service of services) {
- const { id, version, cwd } = serviceRegistry[serviceFileReference[path.basename(service)]]
-
- const instance = spawnService({ id, service, cwd })
-
- const serviceInstance = {
- id,
- version,
- instance
- }
-
- // push to pool
- instancePool.push(serviceInstance)
-
- // if is NODE_ENV to development, start a file watcher for hot-reload
- if (process.env.NODE_ENV === "development") {
- const ignored = [
- ...await getIgnoredFiles(cwd),
- "**/.cache/**",
- "**/node_modules/**",
- "**/dist/**",
- "**/build/**",
- ]
-
- chokidar.watch(cwd, {
- ignored: ignored,
- persistent: true,
- ignoreInitial: true,
- }).on("all", (event, path) => {
- // find instance from pool
- const instanceIndex = instancePool.findIndex((instance) => instance.id === id)
-
- console.log(event, path, instanceIndex)
-
- // reload
- instancePool[instanceIndex].instance.reload()
- })
- }
- }
-
- repl.start({
- prompt: "> ",
- useGlobal: true,
- eval: (input, context, filename, callback) => {
- let inputs = input.split(" ")
-
- // remove last \n from input
- inputs[inputs.length - 1] = inputs[inputs.length - 1].replace(/\n/g, "")
-
- // find relp command
- const command = inputs[0]
- const args = inputs.slice(1)
-
- const command_fn = relp_commands.find((relp_command) => {
- let exising = false
-
- if (Array.isArray(relp_command.aliases)) {
- exising = relp_command.aliases.includes(command)
- }
-
- if (relp_command.cmd === command) {
- exising = true
- }
-
- return exising
- })
-
- if (!command_fn) {
- return callback(`Command not found: ${command}`)
- }
-
- return command_fn.fn(callback, ...args)
- }
- })
-
- onExit((code, signal) => {
- console.clear()
- console.log(`\n🛑 Preparing to exit...`)
-
- console.log(`Stoping proxy...`)
-
- internal_proxy.close()
-
- console.log(`Kill all ${instancePool.length} instances...`)
-
- for (let instance of instancePool) {
- console.log(`Killing ${instance.id} [${instance.instance.pid}]`)
-
- instance.instance.kill()
-
- treeKill(instance.instance.pid)
- }
-
- treeKill(process.pid)
- })
-}
-
-main()
\ No newline at end of file
diff --git a/packages/server/services/chats/routes/chats/my/get.js b/packages/server/services/chats/routes/chats/my/get.js
new file mode 100644
index 00000000..e82f7c79
--- /dev/null
+++ b/packages/server/services/chats/routes/chats/my/get.js
@@ -0,0 +1,77 @@
+import { User, ChatMessage } from "@db_models"
+
+export default {
+ middlewares: ["withAuthentication"],
+ fn: async (req) => {
+ // get recent messages
+ // query messages sended to current user or from current user
+ // must pick one message by user_id
+
+ const current_user_id = req.auth.session.user_id
+
+ let history = await ChatMessage.aggregate([
+ {
+ $match: {
+ $or: [
+ { from_user_id: current_user_id },
+ { to_user_id: current_user_id }
+ ]
+ }
+ },
+ {
+ $sort: { created_at: -1 }
+ },
+ {
+ $group: {
+ _id: {
+ $cond: [
+ { $eq: ["$from_user_id", current_user_id] },
+ "$to_user_id",
+ "$from_user_id"
+ ]
+ },
+ latestMessage: { $first: "$$ROOT" }
+ }
+ },
+ {
+ $replaceRoot: { newRoot: "$latestMessage" }
+ }
+ ])
+
+ if (history.length === 0) {
+ return history
+ }
+
+ history = history.map((message) => {
+
+ // chose an user_id that is not the `current_user_id`
+ message.chat_user_id = message.from_user_id === current_user_id ? message.to_user_id : message.from_user_id
+
+ return message
+ })
+
+ // order by created_at
+ history = history.sort((a, b) => {
+ return new Date(b.created_at) - new Date(a.created_at)
+ })
+
+ const userData = await User.find({
+ _id: {
+ $in: history.map((message) => {
+ return message.chat_user_id
+ })
+ }
+ })
+
+
+ history = history.map((message) => {
+ message.user = userData.find((user) => {
+ return user._id.toString() === message.chat_user_id
+ })
+
+ return message
+ })
+
+ return history
+ },
+}
\ No newline at end of file
diff --git a/packages/server/services/chats/routes_ws/chat/send/message.js b/packages/server/services/chats/routes_ws/chat/send/message.js
index 45f31767..d7394dab 100644
--- a/packages/server/services/chats/routes_ws/chat/send/message.js
+++ b/packages/server/services/chats/routes_ws/chat/send/message.js
@@ -1,12 +1,14 @@
import { ChatMessage } from "@db_models"
export default async (socket, payload, engine) => {
+ if (!socket.userData) {
+ throw new OperationError(401, "Unauthorized")
+ }
+
const created_at = new Date().getTime()
const [from_user_id, to_user_id] = [socket.userData._id, payload.to_user_id]
- const targetSocket = await engine.find.socketByUserId(payload.to_user_id)
-
const wsMessageObj = {
...payload,
created_at: created_at,
@@ -24,7 +26,11 @@ export default async (socket, payload, engine) => {
socket.emit("chat:receive:message", wsMessageObj)
- if (targetSocket.emit) {
+ const targetSocket = await engine.find.socketByUserId(payload.to_user_id)
+
+ console.log(targetSocket)
+
+ if (targetSocket) {
await targetSocket.emit("chat:receive:message", wsMessageObj)
}
diff --git a/packages/server/services/chats/routes_ws/chat/state/typing.js b/packages/server/services/chats/routes_ws/chat/state/typing.js
index e8c12da7..9b12da3e 100644
--- a/packages/server/services/chats/routes_ws/chat/state/typing.js
+++ b/packages/server/services/chats/routes_ws/chat/state/typing.js
@@ -1,20 +1,17 @@
export default async (socket, payload, engine) => {
+ if (!socket.userData) {
+ throw new OperationError(401, "Unauthorized")
+ }
+
const from_user_id = socket.userData._id
const { to_user_id, is_typing } = payload
const targetSocket = await engine.find.socketByUserId(to_user_id)
- if (targetSocket) {
+ if (targetSocket && targetSocket.emit) {
await targetSocket.emit("chat:state:typing", {
+ from_user_id: from_user_id,
is_typing: is_typing
})
-
- // socket.pendingFunctions.push("chats:state:typing")
-
- // setTimeout(() => {
- // socket.emit("chats:state:typing", {
- // is_typing: false,
- // })
- // }, 5000)
}
}
\ No newline at end of file
diff --git a/packages/server/services/ems/routes/dispatch/post.js b/packages/server/services/ems/routes/dispatch/post.js
index c5f01470..dc4e7f8e 100644
--- a/packages/server/services/ems/routes/dispatch/post.js
+++ b/packages/server/services/ems/routes/dispatch/post.js
@@ -1,16 +1,28 @@
+import templates from "../../templates"
+
export default {
useContext: ["mailTransporter"],
middlewares: ["withAuthentication"],
fn: async (req, res) => {
req.body = await req.urlencoded()
- const { to, subject, body } = req.body
+ let { to, subject, body, template } = req.body
+
+ if (template) {
+ if (!templates[template]) {
+ throw new OperationError(404, "Template not found")
+ }
+
+ body = templates[template]({
+ ...req.body
+ })
+ }
const mailOptions = {
- from: "comty_no_reply@ragestudio.net",
+ from: process.env.SMTP_USERNAME,
to: to,
subject: subject,
- text: body
+ html: body
}
console.log(mailOptions)
diff --git a/packages/server/services/ems/templates/account_disabled/index.handlebars b/packages/server/services/ems/templates/account_disabled/index.handlebars
new file mode 100644
index 00000000..2768e503
--- /dev/null
+++ b/packages/server/services/ems/templates/account_disabled/index.handlebars
@@ -0,0 +1,290 @@
+
+
+
+
+ Comty
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/packages/server/services/ems/templates/index.js b/packages/server/services/ems/templates/index.js
index 5d5404ec..a6f86801 100644
--- a/packages/server/services/ems/templates/index.js
+++ b/packages/server/services/ems/templates/index.js
@@ -4,6 +4,7 @@ import path from "node:path"
import Handlebars from "handlebars"
export default {
+ account_disabled: Handlebars.compile(fs.readFileSync(path.resolve(__dirname, "account_disabled/index.handlebars"), "utf-8")),
new_login: Handlebars.compile(fs.readFileSync(path.resolve(__dirname, "new_login/index.handlebars"), "utf-8")),
mfa_code: Handlebars.compile(fs.readFileSync(path.resolve(__dirname, "mfa_code/index.handlebars"), "utf-8")),
password_recovery: Handlebars.compile(fs.readFileSync(path.resolve(__dirname, "password_recovery/index.handlebars"), "utf-8")),
diff --git a/packages/server/services/music/package.json b/packages/server/services/music/package.json
index 1334afe7..ca9a3a24 100755
--- a/packages/server/services/music/package.json
+++ b/packages/server/services/music/package.json
@@ -26,6 +26,7 @@
"morgan": "^1.10.0",
"ms": "^2.1.3",
"music-metadata": "^7.14.0",
+ "openai": "^4.47.2",
"redis": "^4.6.6",
"socket.io": "^4.5.4"
}
diff --git a/packages/server/services/music/routes/music/feed/get.js b/packages/server/services/music/routes/music/feed/get.js
index a2aed60b..4957499a 100644
--- a/packages/server/services/music/routes/music/feed/get.js
+++ b/packages/server/services/music/routes/music/feed/get.js
@@ -1,13 +1,20 @@
import { MusicRelease, Track } from "@db_models"
export default async (req) => {
- const { limit = 10, trim = 0 } = req.query
+ const { limit = 10, trim = 0, order = "desc" } = req.query
- let result = await MusicRelease.find({})
+ const searchQuery = {}
+
+ const total_length = await MusicRelease.count(searchQuery)
+
+ let result = await MusicRelease.find(searchQuery)
.limit(limit)
.skip(trim)
+ .sort({ created_at: order === "desc" ? -1 : 1 })
return {
+ total_length: total_length,
+ has_more: total_length > trim + result.length,
items: result,
}
}
\ No newline at end of file
diff --git a/packages/server/services/music/routes/music/lyrics/[track_id]/get.js b/packages/server/services/music/routes/music/lyrics/[track_id]/get.js
index 89b14284..cdf9b040 100644
--- a/packages/server/services/music/routes/music/lyrics/[track_id]/get.js
+++ b/packages/server/services/music/routes/music/lyrics/[track_id]/get.js
@@ -1,4 +1,5 @@
import { TrackLyric } from "@db_models"
+import axios from "axios"
function parseTimeToMs(timeStr) {
const [minutes, seconds, milliseconds] = timeStr.split(":")
@@ -8,6 +9,7 @@ function parseTimeToMs(timeStr) {
export default async (req) => {
const { track_id } = req.params
+ let { translate_lang = "original" } = req.query
let trackLyric = await TrackLyric.findOne({
track_id
@@ -19,12 +21,43 @@ export default async (req) => {
trackLyric = trackLyric.toObject()
+ if (typeof trackLyric.lrc === "object") {
+ trackLyric.available_langs = Object.entries(trackLyric.lrc).map(([key, value]) => {
+ return {
+ id: key,
+ name: key,
+ value: value
+ }
+ })
+
+ if (typeof trackLyric.lrc[translate_lang] === "undefined") {
+ translate_lang = "original"
+ }
+
+ trackLyric.lang = translate_lang
+
+ trackLyric.lrc = trackLyric.lrc[translate_lang]
+
+ const { data } = await axios.get(trackLyric.lrc).catch((err) => {
+ return false
+ })
+
+ trackLyric.lrc = data
+ }else {
+ trackLyric.available_langs = [{
+ id: "original",
+ name: "Original",
+ value: null
+ }]
+ }
+
if (trackLyric.lrc) {
trackLyric.lrc = trackLyric.lrc.split("\n")
trackLyric.lrc = trackLyric.lrc.map((line) => {
const syncedLine = {}
- syncedLine.time = line.match(/\[.*\]/)[0]
+ //syncedLine.time = line.match(/\[.*\]/)[0]
+ syncedLine.time = line.split(" ")[0]
syncedLine.text = line.replace(syncedLine.time, "").trim()
if (syncedLine.text === "") {
diff --git a/packages/server/services/music/routes/music/releases/self/get.js b/packages/server/services/music/routes/music/releases/self/get.js
index 186545f9..b838b553 100644
--- a/packages/server/services/music/routes/music/releases/self/get.js
+++ b/packages/server/services/music/routes/music/releases/self/get.js
@@ -1,4 +1,4 @@
-import { Playlist, Release, Track } from "@db_models"
+import { MusicRelease, Track } from "@db_models"
export default {
middlewares: ["withAuthentication"],
@@ -21,33 +21,13 @@ export default {
}
}
- const playlistsCount = await Playlist.count(searchQuery)
- const releasesCount = await Release.count(searchQuery)
-
- let total_length = playlistsCount + releasesCount
-
- let playlists = await Playlist.find(searchQuery)
+ let releases = await MusicRelease.find(searchQuery)
.sort({ created_at: -1 })
.limit(limit)
.skip(offset)
- playlists = playlists.map((playlist) => {
- playlist = playlist.toObject()
-
- playlist.type = "playlist"
-
- return playlist
- })
-
- let releases = await Release.find(searchQuery)
- .sort({ created_at: -1 })
- .limit(limit)
- .skip(offset)
-
- let result = [...playlists, ...releases]
-
if (req.query.resolveItemsData === "true") {
- result = await Promise.all(
+ releases = await Promise.all(
playlists.map(async playlist => {
playlist.list = await Track.find({
_id: [...playlist.list],
@@ -59,8 +39,8 @@ export default {
}
return {
- total_length: total_length,
- items: result,
+ total_length: await MusicRelease.count(searchQuery),
+ items: releases,
}
}
}
\ No newline at end of file
diff --git a/packages/server/services/users/routes/users/[user_id]/roles/get.js b/packages/server/services/users/routes/users/[user_id]/roles/get.js
new file mode 100644
index 00000000..908d7de2
--- /dev/null
+++ b/packages/server/services/users/routes/users/[user_id]/roles/get.js
@@ -0,0 +1,12 @@
+import Users from "@classes/users"
+
+export default {
+ middlewares: ["withOptionalAuthentication"],
+ fn: async (req) => {
+ const data = await Users.data({
+ user_id: req.auth.session.user_id,
+ })
+
+ return data.roles
+ }
+}
\ No newline at end of file
diff --git a/packages/server/services/users/routes/users/self/roles/get.js b/packages/server/services/users/routes/users/self/roles/get.js
new file mode 100644
index 00000000..68dab220
--- /dev/null
+++ b/packages/server/services/users/routes/users/self/roles/get.js
@@ -0,0 +1,16 @@
+import Users from "@classes/users"
+
+export default {
+ middlewares: ["withAuthentication"],
+ fn: async (req) => {
+ const data = await Users.data({
+ user_id: user_id,
+ })
+
+ if (!data) {
+ throw new OperationError(404, "User not found")
+ }
+
+ return data.roles
+ }
+}
\ No newline at end of file
diff --git a/packages/server/ssl/cert.pem b/packages/server/ssl/cert.pem
new file mode 100644
index 00000000..2cf79ddd
--- /dev/null
+++ b/packages/server/ssl/cert.pem
@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIEPzCCAyegAwIBAgISBCm/J1yKDXCE/xdDr6sqPM+iMA0GCSqGSIb3DQEBCwUA
+MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
+EwJSMzAeFw0yNDA0MDUxMTEyMTJaFw0yNDA3MDQxMTEyMTFaMBsxGTAXBgNVBAMM
+ECoucmFnZXN0dWRpby5uZXQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARZElFg25Qr
+1cfjFWI0vKzEDmMB81zOSHVm1AwwVxQyT/87XSaUHoLkzh48+ooWw6t95LqcPmSW
+lGFdhgvGRRvdOsSN1HvosD2lBCB774PcssyqK7KXIZuTa1I/7nIso+6jggISMIIC
+DjAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFFnUMpE9b+gZNNrt1DlYd3HxgsaIMB8G
+A1UdIwQYMBaAFBQusxe3WFbLrlAJQOYfr52LFMLGMFUGCCsGAQUFBwEBBEkwRzAh
+BggrBgEFBQcwAYYVaHR0cDovL3IzLm8ubGVuY3Iub3JnMCIGCCsGAQUFBzAChhZo
+dHRwOi8vcjMuaS5sZW5jci5vcmcvMBsGA1UdEQQUMBKCECoucmFnZXN0dWRpby5u
+ZXQwEwYDVR0gBAwwCjAIBgZngQwBAgEwggEEBgorBgEEAdZ5AgQCBIH1BIHyAPAA
+dgB2/4g/Crb7lVHCYcz1h7o0tKTNuyncaEIKn+ZnTFo6dAAAAY6uLHZmAAAEAwBH
+MEUCIAN0x8P1LfVpqQfqfrV0Xh2DFtgIDdHLp9eN9P82/4PAAiEAx5X0ATzVjO1L
+3jkKYyzN2gGHcsqKXB9PFVWxsO6qJv0AdgAZmBBxCfDWUi4wgNKeP2S7g24ozPkP
+Uo7u385KPxa0ygAAAY6uLHZGAAAEAwBHMEUCIHqQzpaQFH4c4RLCEbtf8esSUE8o
++4VgFZQ9mWB5PcU9AiEAjHibXgQ1zlVK5G8kgygJZgPptV8rJvjIZ8IfgZDxqucw
+DQYJKoZIhvcNAQELBQADggEBAHvERBxB+2izDfHh8PaZwM+wvmqZ18+9kNzdc/ri
++I53zpra6PELo8VjlVV5R8C/B4q5CJQf/AyElQdAwzME+6F1j0JhVktkaRqgoHwD
+Qi/BQkJlAVbVdhHctpi7ukDhzVEPzqZ3VJDaVEnAA6HhVctec44W/4JgALone10D
+xr3T8IA77hsZK+bW+2IXoSUdjY++2muGz8xH5jGEALtSat6iidaJCdDCogEvUiGa
+nek8LqGm0b5a7tsubK7qbJwxDsBixGm01tCIMa/7Px+gNrry2APg9VPCOrTVBmAH
+8TRonOKw4IzKbCRVpfXlGMvL+Ezi7vrHYO1lMRbceVBPspc=
+-----END CERTIFICATE-----
diff --git a/packages/server/ssl/chain.pem b/packages/server/ssl/chain.pem
new file mode 100644
index 00000000..43b222a6
--- /dev/null
+++ b/packages/server/ssl/chain.pem
@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
+TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
+cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjAwOTA0MDAwMDAw
+WhcNMjUwOTE1MTYwMDAwWjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
+RW5jcnlwdDELMAkGA1UEAxMCUjMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQC7AhUozPaglNMPEuyNVZLD+ILxmaZ6QoinXSaqtSu5xUyxr45r+XXIo9cP
+R5QUVTVXjJ6oojkZ9YI8QqlObvU7wy7bjcCwXPNZOOftz2nwWgsbvsCUJCWH+jdx
+sxPnHKzhm+/b5DtFUkWWqcFTzjTIUu61ru2P3mBw4qVUq7ZtDpelQDRrK9O8Zutm
+NHz6a4uPVymZ+DAXXbpyb/uBxa3Shlg9F8fnCbvxK/eG3MHacV3URuPMrSXBiLxg
+Z3Vms/EY96Jc5lP/Ooi2R6X/ExjqmAl3P51T+c8B5fWmcBcUr2Ok/5mzk53cU6cG
+/kiFHaFpriV1uxPMUgP17VGhi9sVAgMBAAGjggEIMIIBBDAOBgNVHQ8BAf8EBAMC
+AYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMBIGA1UdEwEB/wQIMAYB
+Af8CAQAwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYfr52LFMLGMB8GA1UdIwQYMBaA
+FHm0WeZ7tuXkAXOACIjIGlj26ZtuMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcw
+AoYWaHR0cDovL3gxLmkubGVuY3Iub3JnLzAnBgNVHR8EIDAeMBygGqAYhhZodHRw
+Oi8veDEuYy5sZW5jci5vcmcvMCIGA1UdIAQbMBkwCAYGZ4EMAQIBMA0GCysGAQQB
+gt8TAQEBMA0GCSqGSIb3DQEBCwUAA4ICAQCFyk5HPqP3hUSFvNVneLKYY611TR6W
+PTNlclQtgaDqw+34IL9fzLdwALduO/ZelN7kIJ+m74uyA+eitRY8kc607TkC53wl
+ikfmZW4/RvTZ8M6UK+5UzhK8jCdLuMGYL6KvzXGRSgi3yLgjewQtCPkIVz6D2QQz
+CkcheAmCJ8MqyJu5zlzyZMjAvnnAT45tRAxekrsu94sQ4egdRCnbWSDtY7kh+BIm
+lJNXoB1lBMEKIq4QDUOXoRgffuDghje1WrG9ML+Hbisq/yFOGwXD9RiX8F6sw6W4
+avAuvDszue5L3sz85K+EC4Y/wFVDNvZo4TYXao6Z0f+lQKc0t8DQYzk1OXVu8rp2
+yJMC6alLbBfODALZvYH7n7do1AZls4I9d1P4jnkDrQoxB3UqQ9hVl3LEKQ73xF1O
+yK5GhDDX8oVfGKF5u+decIsH4YaTw7mP3GFxJSqv3+0lUFJoi5Lc5da149p90Ids
+hCExroL1+7mryIkXPeFM5TgO9r0rvZaBFOvV2z0gp35Z0+L4WPlbuEjN/lxPFin+
+HlUjr8gRsI3qfJOQFy/9rKIJR0Y/8Omwt/8oTWgy1mdeHmmjk7j1nYsvC9JSQ6Zv
+MldlTTKB3zhThV1+XWYp6rjd5JW1zbVWEkLNxE7GJThEUG3szgBVGP7pSWTUTsqX
+nLRbwHOoq7hHwg==
+-----END CERTIFICATE-----
diff --git a/packages/server/ssl/fullchain.pem b/packages/server/ssl/fullchain.pem
new file mode 100644
index 00000000..6c609bed
--- /dev/null
+++ b/packages/server/ssl/fullchain.pem
@@ -0,0 +1,55 @@
+-----BEGIN CERTIFICATE-----
+MIIEPzCCAyegAwIBAgISBCm/J1yKDXCE/xdDr6sqPM+iMA0GCSqGSIb3DQEBCwUA
+MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
+EwJSMzAeFw0yNDA0MDUxMTEyMTJaFw0yNDA3MDQxMTEyMTFaMBsxGTAXBgNVBAMM
+ECoucmFnZXN0dWRpby5uZXQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARZElFg25Qr
+1cfjFWI0vKzEDmMB81zOSHVm1AwwVxQyT/87XSaUHoLkzh48+ooWw6t95LqcPmSW
+lGFdhgvGRRvdOsSN1HvosD2lBCB774PcssyqK7KXIZuTa1I/7nIso+6jggISMIIC
+DjAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFFnUMpE9b+gZNNrt1DlYd3HxgsaIMB8G
+A1UdIwQYMBaAFBQusxe3WFbLrlAJQOYfr52LFMLGMFUGCCsGAQUFBwEBBEkwRzAh
+BggrBgEFBQcwAYYVaHR0cDovL3IzLm8ubGVuY3Iub3JnMCIGCCsGAQUFBzAChhZo
+dHRwOi8vcjMuaS5sZW5jci5vcmcvMBsGA1UdEQQUMBKCECoucmFnZXN0dWRpby5u
+ZXQwEwYDVR0gBAwwCjAIBgZngQwBAgEwggEEBgorBgEEAdZ5AgQCBIH1BIHyAPAA
+dgB2/4g/Crb7lVHCYcz1h7o0tKTNuyncaEIKn+ZnTFo6dAAAAY6uLHZmAAAEAwBH
+MEUCIAN0x8P1LfVpqQfqfrV0Xh2DFtgIDdHLp9eN9P82/4PAAiEAx5X0ATzVjO1L
+3jkKYyzN2gGHcsqKXB9PFVWxsO6qJv0AdgAZmBBxCfDWUi4wgNKeP2S7g24ozPkP
+Uo7u385KPxa0ygAAAY6uLHZGAAAEAwBHMEUCIHqQzpaQFH4c4RLCEbtf8esSUE8o
++4VgFZQ9mWB5PcU9AiEAjHibXgQ1zlVK5G8kgygJZgPptV8rJvjIZ8IfgZDxqucw
+DQYJKoZIhvcNAQELBQADggEBAHvERBxB+2izDfHh8PaZwM+wvmqZ18+9kNzdc/ri
++I53zpra6PELo8VjlVV5R8C/B4q5CJQf/AyElQdAwzME+6F1j0JhVktkaRqgoHwD
+Qi/BQkJlAVbVdhHctpi7ukDhzVEPzqZ3VJDaVEnAA6HhVctec44W/4JgALone10D
+xr3T8IA77hsZK+bW+2IXoSUdjY++2muGz8xH5jGEALtSat6iidaJCdDCogEvUiGa
+nek8LqGm0b5a7tsubK7qbJwxDsBixGm01tCIMa/7Px+gNrry2APg9VPCOrTVBmAH
+8TRonOKw4IzKbCRVpfXlGMvL+Ezi7vrHYO1lMRbceVBPspc=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
+TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
+cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjAwOTA0MDAwMDAw
+WhcNMjUwOTE1MTYwMDAwWjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
+RW5jcnlwdDELMAkGA1UEAxMCUjMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQC7AhUozPaglNMPEuyNVZLD+ILxmaZ6QoinXSaqtSu5xUyxr45r+XXIo9cP
+R5QUVTVXjJ6oojkZ9YI8QqlObvU7wy7bjcCwXPNZOOftz2nwWgsbvsCUJCWH+jdx
+sxPnHKzhm+/b5DtFUkWWqcFTzjTIUu61ru2P3mBw4qVUq7ZtDpelQDRrK9O8Zutm
+NHz6a4uPVymZ+DAXXbpyb/uBxa3Shlg9F8fnCbvxK/eG3MHacV3URuPMrSXBiLxg
+Z3Vms/EY96Jc5lP/Ooi2R6X/ExjqmAl3P51T+c8B5fWmcBcUr2Ok/5mzk53cU6cG
+/kiFHaFpriV1uxPMUgP17VGhi9sVAgMBAAGjggEIMIIBBDAOBgNVHQ8BAf8EBAMC
+AYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMBIGA1UdEwEB/wQIMAYB
+Af8CAQAwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYfr52LFMLGMB8GA1UdIwQYMBaA
+FHm0WeZ7tuXkAXOACIjIGlj26ZtuMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcw
+AoYWaHR0cDovL3gxLmkubGVuY3Iub3JnLzAnBgNVHR8EIDAeMBygGqAYhhZodHRw
+Oi8veDEuYy5sZW5jci5vcmcvMCIGA1UdIAQbMBkwCAYGZ4EMAQIBMA0GCysGAQQB
+gt8TAQEBMA0GCSqGSIb3DQEBCwUAA4ICAQCFyk5HPqP3hUSFvNVneLKYY611TR6W
+PTNlclQtgaDqw+34IL9fzLdwALduO/ZelN7kIJ+m74uyA+eitRY8kc607TkC53wl
+ikfmZW4/RvTZ8M6UK+5UzhK8jCdLuMGYL6KvzXGRSgi3yLgjewQtCPkIVz6D2QQz
+CkcheAmCJ8MqyJu5zlzyZMjAvnnAT45tRAxekrsu94sQ4egdRCnbWSDtY7kh+BIm
+lJNXoB1lBMEKIq4QDUOXoRgffuDghje1WrG9ML+Hbisq/yFOGwXD9RiX8F6sw6W4
+avAuvDszue5L3sz85K+EC4Y/wFVDNvZo4TYXao6Z0f+lQKc0t8DQYzk1OXVu8rp2
+yJMC6alLbBfODALZvYH7n7do1AZls4I9d1P4jnkDrQoxB3UqQ9hVl3LEKQ73xF1O
+yK5GhDDX8oVfGKF5u+decIsH4YaTw7mP3GFxJSqv3+0lUFJoi5Lc5da149p90Ids
+hCExroL1+7mryIkXPeFM5TgO9r0rvZaBFOvV2z0gp35Z0+L4WPlbuEjN/lxPFin+
+HlUjr8gRsI3qfJOQFy/9rKIJR0Y/8Omwt/8oTWgy1mdeHmmjk7j1nYsvC9JSQ6Zv
+MldlTTKB3zhThV1+XWYp6rjd5JW1zbVWEkLNxE7GJThEUG3szgBVGP7pSWTUTsqX
+nLRbwHOoq7hHwg==
+-----END CERTIFICATE-----
diff --git a/packages/server/ssl/privkey.pem b/packages/server/ssl/privkey.pem
new file mode 100644
index 00000000..d4644cdc
--- /dev/null
+++ b/packages/server/ssl/privkey.pem
@@ -0,0 +1,6 @@
+-----BEGIN PRIVATE KEY-----
+MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDBKp+X11fOIu7rBPTij
+4vj4a9M+pjkVA4/gzeDTEKmASArNd+6sdbRtBa4vdirWyU+hZANiAARZElFg25Qr
+1cfjFWI0vKzEDmMB81zOSHVm1AwwVxQyT/87XSaUHoLkzh48+ooWw6t95LqcPmSW
+lGFdhgvGRRvdOsSN1HvosD2lBCB774PcssyqK7KXIZuTa1I/7nIso+4=
+-----END PRIVATE KEY-----
diff --git a/testExtensions/tidal/package.json b/testExtensions/tidal/package.json
new file mode 100644
index 00000000..954c8c60
--- /dev/null
+++ b/testExtensions/tidal/package.json
@@ -0,0 +1,7 @@
+{
+ "name": "Tidal API",
+ "description": "Tidal playback from Comty",
+ "license": "MIT",
+ "version": "0.1.0",
+ "main": "./src/index.js"
+}
\ No newline at end of file
diff --git a/testExtensions/tidal/src/tidal.extension.js b/testExtensions/tidal/src/tidal.extension.js
new file mode 100644
index 00000000..42d08bab
--- /dev/null
+++ b/testExtensions/tidal/src/tidal.extension.js
@@ -0,0 +1,9 @@
+import Extension from "evite/src/extension"
+
+export default class Tidal extends Extension {
+ static dependencies = ["player"]
+
+ async onInitialize() {
+
+ }
+}
\ No newline at end of file
+
+}
+
+export default BackgroundTweaker
\ No newline at end of file
diff --git a/packages/app/src/settings/components/backgroundTweaker/index.less b/packages/app/src/settings/components/backgroundTweaker/index.less
new file mode 100644
index 00000000..a9f55329
--- /dev/null
+++ b/packages/app/src/settings/components/backgroundTweaker/index.less
@@ -0,0 +1,111 @@
+@anchors-selector-size: 120px;
+
+.background-tweaker {
+ display: flex;
+ flex-direction: row;
+
+ align-items: center;
+
+ padding: 10px;
+ gap: 30px;
+
+ .background-tweaker-anchors {
+ display: flex;
+ flex-direction: column;
+
+ align-items: center;
+ justify-content: space-between;
+
+ padding: 10px;
+
+ width: @anchors-selector-size;
+ height: @anchors-selector-size;
+ min-width: @anchors-selector-size;
+ min-height: @anchors-selector-size;
+
+ border: 1px var(--border-color) solid;
+ border-radius: 12px;
+
+ .background-tweaker-anchors-row {
+ display: flex;
+ flex-direction: row;
+
+ align-items: center;
+ justify-content: space-between;
+
+ width: 100%;
+
+ .background-tweaker-anchor {
+ display: flex;
+ flex-direction: row;
+
+ justify-content: center;
+ align-items: center;
+
+ width: fit-content;
+
+ font-size: 1.2rem;
+
+ padding: 5px;
+
+ border-radius: 12px;
+
+ transition: all 150ms ease-in-out;
+
+ &.selected {
+ background-color: var(--background-color-primary);
+ }
+
+ &:only-child {
+ width: 100%;
+ }
+
+ p,
+ svg {
+ margin: 0;
+ }
+ }
+ }
+ }
+
+ .background-tweaker-sliders {
+ display: flex;
+ flex-direction: column;
+
+ width: 100%;
+
+ gap: 8px;
+
+ .background-tweaker-sliders-option {
+ display: flex;
+ flex-direction: column;
+
+ gap: 5px;
+
+ width: 100%;
+
+ p {
+ margin: 0;
+ }
+
+ .ant-slider {
+ margin: 0;
+ padding: 3px;
+ }
+
+ p {
+ display: flex;
+ flex-direction: row;
+
+ align-items: center;
+
+ gap: 5px;
+
+ svg {
+ margin: 0;
+ font-size: 1.2rem;
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/packages/app/src/settings/components/changePassword/index.jsx b/packages/app/src/settings/components/changePassword/index.jsx
index 68279871..8ffa03c2 100755
--- a/packages/app/src/settings/components/changePassword/index.jsx
+++ b/packages/app/src/settings/components/changePassword/index.jsx
@@ -126,7 +126,7 @@ const ChangePasswordComponent = (props) => {
export default (props) => {
const onClick = () => {
if (app.isMobile) {
- return app.DrawerController.open("passwordChange", ChangePasswordComponent)
+ return app.layout.drawer.open("passwordChange", ChangePasswordComponent)
}
return app.layout.sidedrawer.open("passwordChange", ChangePasswordComponent)
diff --git a/packages/app/src/settings/components/themeVariantSelector/index.jsx b/packages/app/src/settings/components/themeVariantSelector/index.jsx
new file mode 100644
index 00000000..f908f2ce
--- /dev/null
+++ b/packages/app/src/settings/components/themeVariantSelector/index.jsx
@@ -0,0 +1,49 @@
+import React from "react"
+import classnames from "classnames"
+import { createIconRender } from "@components/Icons"
+
+import "./index.less"
+
+const variants = [
+ {
+ id: "light",
+ icon: "MdLightMode",
+ },
+ {
+ id: "dark",
+ icon: "MdDarkMode",
+ },
+ {
+ id: "auto",
+ icon: "MdAutoFixHigh",
+ },
+]
+
+const ThemeVariantSelector = (props) => {
+ const [selected, setSelected] = React.useState(app.cores.style.currentVariantKey)
+
+ React.useEffect(() => {
+ app.cores.style.applyVariant(selected)
+ }, [selected])
+
+ return
+
+
+
+
+
+ {
+ updateOption("position", "top")
+ }}
+ >
+
+
+
+
+ {
+ updateOption("position", "left")
+ }}
+ >
+
+ {
+ updateOption("position", "center")
+ }}
+ >
+
+ {
+ updateOption("position", "right")
+ }}
+ >
+
+
+
+ {
+ updateOption("position", "bottom")
+ }}
+ >
+
+
+
+
+ `${value}px`
+ }}
+ defaultValue={values.blur}
+ onChangeComplete={(values) => {
+ updateOption("blur", values)
+ }}
+ />
+
+
+
+ `${value * 100}%`
+ }}
+ defaultValue={values.opacity}
+ onChangeComplete={(value) => {
+ updateOption("opacity", value)
+ }}
+ />
+
+
+
+ {
+ updateOption("repeat", value)
+ }}
+ options={Tweaks.repeat.options}
+ />
+
+
+
+ {
+ updateOption("size", value)
+ }}
+ options={Tweaks.size.options}
+ />
+
+
+
+ {
+ variants.map((variant) => {
+ return
+}
+
+export default ThemeVariantSelector
\ No newline at end of file
diff --git a/packages/app/src/settings/components/themeVariantSelector/index.less b/packages/app/src/settings/components/themeVariantSelector/index.less
new file mode 100644
index 00000000..8f8cc413
--- /dev/null
+++ b/packages/app/src/settings/components/themeVariantSelector/index.less
@@ -0,0 +1,45 @@
+.__setting_theme_variant_selector {
+ display: flex;
+ flex-direction: row;
+
+ align-items: center;
+
+ border: 1px var(--border-color) solid;
+ border-radius: 12px;
+
+ overflow: hidden;
+
+ .__setting_theme_variant_selector-variant {
+ display: flex;
+ flex-direction: column;
+
+ align-items: center;
+ justify-content: center;
+
+ padding: 10px 20px;
+
+ border-right: 1px var(--border-color) solid;
+
+ transition: all 150ms ease-in-out;
+
+ cursor: pointer;
+
+ &.selected {
+ background-color: var(--background-color-primary);
+ }
+
+ // if is the last child, remove border
+ &:last-child {
+ border-right: 0;
+ }
+
+ &:hover {
+ background-color: var(--background-color-primary-2);
+ }
+
+ svg {
+ font-size: 1.3rem;
+ margin: 0;
+ }
+ }
+}
\ No newline at end of file
diff --git a/packages/app/src/settings/general/index.jsx b/packages/app/src/settings/general/index.jsx
index 1f87b705..a1922d80 100755
--- a/packages/app/src/settings/general/index.jsx
+++ b/packages/app/src/settings/general/index.jsx
@@ -26,35 +26,19 @@ export default {
emitEvent: "app:language_changes",
},
{
- id: "haptics:enabled",
- storaged: true,
+ id: "app:lpm",
group: "general",
component: "Switch",
- icon: "MdVibration",
- title: "Haptic Feedback",
- description: "Enable haptic feedback on touch events.",
- desktop: false
- },
- {
- id: "longPressDelay",
- storaged: true,
- group: "general",
- component: "Slider",
- icon: "MdTimer",
- title: "Long press delay",
- description: "Set the delay before long press trigger is activated.",
+ icon: "MdSlowMotionVideo",
+ title: "Low performance mode",
+ description: "Enable low performance mode disabling all the animations and secondary features, boosting the app performance.",
+ emitEvent: "app:lpm_changed",
props: {
- min: 300,
- max: 2000,
- step: 100,
- marks: {
- 300: "0.3s",
- 600: "0.6s",
- 1000: "1s",
- 1500: "1.5s",
- 2000: "2s",
- }
- }
+ disabled: true
+ },
+ storaged: true,
+ experimental: true,
+ disabled: true,
},
{
id: "clear_internal_storage",
@@ -70,21 +54,6 @@ export default {
},
noUpdate: true,
},
- {
- id: "app:lpm",
- group: "general",
- component: "Switch",
- icon: "MdSlowMotionVideo",
- title: "Low performance mode",
- description: "Enable low performance mode disabling all the animations and secondary features, boosting the app performance.",
- emitEvent: "app:lpm_changed",
- props: {
- disabled: true
- },
- storaged: true,
- experimental: true,
- disabled: true,
- },
{
id: "ui.effects",
storaged: true,
diff --git a/packages/app/src/settings/tap_share/index.jsx b/packages/app/src/settings/tap_share/index.jsx
index 9c6b2a5a..7f1a2c60 100755
--- a/packages/app/src/settings/tap_share/index.jsx
+++ b/packages/app/src/settings/tap_share/index.jsx
@@ -202,7 +202,7 @@ class OwnTags extends React.Component {
return ownedTag.serial === tag.serialNumber
})
- if (!ownedTag && app.DrawerController.drawersLength() === 0) {
+ if (!ownedTag && app.layout.drawer.drawersLength() === 0) {
app.message.error("This tag is not registered or you don't have permission to edit it.")
return false
}
@@ -260,7 +260,7 @@ class OwnTags extends React.Component {
}
const OpenTagEditor = ({ tag, onFinish = () => app.navigation.softReload() } = {}) => {
- app.DrawerController.open("tag_register", RegisterNewTag, {
+ app.layout.drawer.open("tag_register", RegisterNewTag, {
componentProps: {
tagData: tag,
onFinish: onFinish,
diff --git a/packages/app/src/utils/checkUserIdIsSelf/index.js b/packages/app/src/utils/checkUserIdIsSelf/index.js
new file mode 100644
index 00000000..db6a7292
--- /dev/null
+++ b/packages/app/src/utils/checkUserIdIsSelf/index.js
@@ -0,0 +1,3 @@
+export default (user_id) => {
+ return user_id === app.userData._id
+}
\ No newline at end of file
diff --git a/packages/app/ssl/cert.pem b/packages/app/ssl/cert.pem
new file mode 100644
index 00000000..2cf79ddd
--- /dev/null
+++ b/packages/app/ssl/cert.pem
@@ -0,0 +1,25 @@
+-----BEGIN CERTIFICATE-----
+MIIEPzCCAyegAwIBAgISBCm/J1yKDXCE/xdDr6sqPM+iMA0GCSqGSIb3DQEBCwUA
+MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
+EwJSMzAeFw0yNDA0MDUxMTEyMTJaFw0yNDA3MDQxMTEyMTFaMBsxGTAXBgNVBAMM
+ECoucmFnZXN0dWRpby5uZXQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARZElFg25Qr
+1cfjFWI0vKzEDmMB81zOSHVm1AwwVxQyT/87XSaUHoLkzh48+ooWw6t95LqcPmSW
+lGFdhgvGRRvdOsSN1HvosD2lBCB774PcssyqK7KXIZuTa1I/7nIso+6jggISMIIC
+DjAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFFnUMpE9b+gZNNrt1DlYd3HxgsaIMB8G
+A1UdIwQYMBaAFBQusxe3WFbLrlAJQOYfr52LFMLGMFUGCCsGAQUFBwEBBEkwRzAh
+BggrBgEFBQcwAYYVaHR0cDovL3IzLm8ubGVuY3Iub3JnMCIGCCsGAQUFBzAChhZo
+dHRwOi8vcjMuaS5sZW5jci5vcmcvMBsGA1UdEQQUMBKCECoucmFnZXN0dWRpby5u
+ZXQwEwYDVR0gBAwwCjAIBgZngQwBAgEwggEEBgorBgEEAdZ5AgQCBIH1BIHyAPAA
+dgB2/4g/Crb7lVHCYcz1h7o0tKTNuyncaEIKn+ZnTFo6dAAAAY6uLHZmAAAEAwBH
+MEUCIAN0x8P1LfVpqQfqfrV0Xh2DFtgIDdHLp9eN9P82/4PAAiEAx5X0ATzVjO1L
+3jkKYyzN2gGHcsqKXB9PFVWxsO6qJv0AdgAZmBBxCfDWUi4wgNKeP2S7g24ozPkP
+Uo7u385KPxa0ygAAAY6uLHZGAAAEAwBHMEUCIHqQzpaQFH4c4RLCEbtf8esSUE8o
++4VgFZQ9mWB5PcU9AiEAjHibXgQ1zlVK5G8kgygJZgPptV8rJvjIZ8IfgZDxqucw
+DQYJKoZIhvcNAQELBQADggEBAHvERBxB+2izDfHh8PaZwM+wvmqZ18+9kNzdc/ri
++I53zpra6PELo8VjlVV5R8C/B4q5CJQf/AyElQdAwzME+6F1j0JhVktkaRqgoHwD
+Qi/BQkJlAVbVdhHctpi7ukDhzVEPzqZ3VJDaVEnAA6HhVctec44W/4JgALone10D
+xr3T8IA77hsZK+bW+2IXoSUdjY++2muGz8xH5jGEALtSat6iidaJCdDCogEvUiGa
+nek8LqGm0b5a7tsubK7qbJwxDsBixGm01tCIMa/7Px+gNrry2APg9VPCOrTVBmAH
+8TRonOKw4IzKbCRVpfXlGMvL+Ezi7vrHYO1lMRbceVBPspc=
+-----END CERTIFICATE-----
diff --git a/packages/app/ssl/chain.pem b/packages/app/ssl/chain.pem
new file mode 100644
index 00000000..43b222a6
--- /dev/null
+++ b/packages/app/ssl/chain.pem
@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
+TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
+cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjAwOTA0MDAwMDAw
+WhcNMjUwOTE1MTYwMDAwWjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
+RW5jcnlwdDELMAkGA1UEAxMCUjMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQC7AhUozPaglNMPEuyNVZLD+ILxmaZ6QoinXSaqtSu5xUyxr45r+XXIo9cP
+R5QUVTVXjJ6oojkZ9YI8QqlObvU7wy7bjcCwXPNZOOftz2nwWgsbvsCUJCWH+jdx
+sxPnHKzhm+/b5DtFUkWWqcFTzjTIUu61ru2P3mBw4qVUq7ZtDpelQDRrK9O8Zutm
+NHz6a4uPVymZ+DAXXbpyb/uBxa3Shlg9F8fnCbvxK/eG3MHacV3URuPMrSXBiLxg
+Z3Vms/EY96Jc5lP/Ooi2R6X/ExjqmAl3P51T+c8B5fWmcBcUr2Ok/5mzk53cU6cG
+/kiFHaFpriV1uxPMUgP17VGhi9sVAgMBAAGjggEIMIIBBDAOBgNVHQ8BAf8EBAMC
+AYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMBIGA1UdEwEB/wQIMAYB
+Af8CAQAwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYfr52LFMLGMB8GA1UdIwQYMBaA
+FHm0WeZ7tuXkAXOACIjIGlj26ZtuMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcw
+AoYWaHR0cDovL3gxLmkubGVuY3Iub3JnLzAnBgNVHR8EIDAeMBygGqAYhhZodHRw
+Oi8veDEuYy5sZW5jci5vcmcvMCIGA1UdIAQbMBkwCAYGZ4EMAQIBMA0GCysGAQQB
+gt8TAQEBMA0GCSqGSIb3DQEBCwUAA4ICAQCFyk5HPqP3hUSFvNVneLKYY611TR6W
+PTNlclQtgaDqw+34IL9fzLdwALduO/ZelN7kIJ+m74uyA+eitRY8kc607TkC53wl
+ikfmZW4/RvTZ8M6UK+5UzhK8jCdLuMGYL6KvzXGRSgi3yLgjewQtCPkIVz6D2QQz
+CkcheAmCJ8MqyJu5zlzyZMjAvnnAT45tRAxekrsu94sQ4egdRCnbWSDtY7kh+BIm
+lJNXoB1lBMEKIq4QDUOXoRgffuDghje1WrG9ML+Hbisq/yFOGwXD9RiX8F6sw6W4
+avAuvDszue5L3sz85K+EC4Y/wFVDNvZo4TYXao6Z0f+lQKc0t8DQYzk1OXVu8rp2
+yJMC6alLbBfODALZvYH7n7do1AZls4I9d1P4jnkDrQoxB3UqQ9hVl3LEKQ73xF1O
+yK5GhDDX8oVfGKF5u+decIsH4YaTw7mP3GFxJSqv3+0lUFJoi5Lc5da149p90Ids
+hCExroL1+7mryIkXPeFM5TgO9r0rvZaBFOvV2z0gp35Z0+L4WPlbuEjN/lxPFin+
+HlUjr8gRsI3qfJOQFy/9rKIJR0Y/8Omwt/8oTWgy1mdeHmmjk7j1nYsvC9JSQ6Zv
+MldlTTKB3zhThV1+XWYp6rjd5JW1zbVWEkLNxE7GJThEUG3szgBVGP7pSWTUTsqX
+nLRbwHOoq7hHwg==
+-----END CERTIFICATE-----
diff --git a/packages/app/ssl/fullchain.pem b/packages/app/ssl/fullchain.pem
new file mode 100644
index 00000000..6c609bed
--- /dev/null
+++ b/packages/app/ssl/fullchain.pem
@@ -0,0 +1,55 @@
+-----BEGIN CERTIFICATE-----
+MIIEPzCCAyegAwIBAgISBCm/J1yKDXCE/xdDr6sqPM+iMA0GCSqGSIb3DQEBCwUA
+MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
+EwJSMzAeFw0yNDA0MDUxMTEyMTJaFw0yNDA3MDQxMTEyMTFaMBsxGTAXBgNVBAMM
+ECoucmFnZXN0dWRpby5uZXQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARZElFg25Qr
+1cfjFWI0vKzEDmMB81zOSHVm1AwwVxQyT/87XSaUHoLkzh48+ooWw6t95LqcPmSW
+lGFdhgvGRRvdOsSN1HvosD2lBCB774PcssyqK7KXIZuTa1I/7nIso+6jggISMIIC
+DjAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFFnUMpE9b+gZNNrt1DlYd3HxgsaIMB8G
+A1UdIwQYMBaAFBQusxe3WFbLrlAJQOYfr52LFMLGMFUGCCsGAQUFBwEBBEkwRzAh
+BggrBgEFBQcwAYYVaHR0cDovL3IzLm8ubGVuY3Iub3JnMCIGCCsGAQUFBzAChhZo
+dHRwOi8vcjMuaS5sZW5jci5vcmcvMBsGA1UdEQQUMBKCECoucmFnZXN0dWRpby5u
+ZXQwEwYDVR0gBAwwCjAIBgZngQwBAgEwggEEBgorBgEEAdZ5AgQCBIH1BIHyAPAA
+dgB2/4g/Crb7lVHCYcz1h7o0tKTNuyncaEIKn+ZnTFo6dAAAAY6uLHZmAAAEAwBH
+MEUCIAN0x8P1LfVpqQfqfrV0Xh2DFtgIDdHLp9eN9P82/4PAAiEAx5X0ATzVjO1L
+3jkKYyzN2gGHcsqKXB9PFVWxsO6qJv0AdgAZmBBxCfDWUi4wgNKeP2S7g24ozPkP
+Uo7u385KPxa0ygAAAY6uLHZGAAAEAwBHMEUCIHqQzpaQFH4c4RLCEbtf8esSUE8o
++4VgFZQ9mWB5PcU9AiEAjHibXgQ1zlVK5G8kgygJZgPptV8rJvjIZ8IfgZDxqucw
+DQYJKoZIhvcNAQELBQADggEBAHvERBxB+2izDfHh8PaZwM+wvmqZ18+9kNzdc/ri
++I53zpra6PELo8VjlVV5R8C/B4q5CJQf/AyElQdAwzME+6F1j0JhVktkaRqgoHwD
+Qi/BQkJlAVbVdhHctpi7ukDhzVEPzqZ3VJDaVEnAA6HhVctec44W/4JgALone10D
+xr3T8IA77hsZK+bW+2IXoSUdjY++2muGz8xH5jGEALtSat6iidaJCdDCogEvUiGa
+nek8LqGm0b5a7tsubK7qbJwxDsBixGm01tCIMa/7Px+gNrry2APg9VPCOrTVBmAH
+8TRonOKw4IzKbCRVpfXlGMvL+Ezi7vrHYO1lMRbceVBPspc=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
+TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
+cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjAwOTA0MDAwMDAw
+WhcNMjUwOTE1MTYwMDAwWjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
+RW5jcnlwdDELMAkGA1UEAxMCUjMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQC7AhUozPaglNMPEuyNVZLD+ILxmaZ6QoinXSaqtSu5xUyxr45r+XXIo9cP
+R5QUVTVXjJ6oojkZ9YI8QqlObvU7wy7bjcCwXPNZOOftz2nwWgsbvsCUJCWH+jdx
+sxPnHKzhm+/b5DtFUkWWqcFTzjTIUu61ru2P3mBw4qVUq7ZtDpelQDRrK9O8Zutm
+NHz6a4uPVymZ+DAXXbpyb/uBxa3Shlg9F8fnCbvxK/eG3MHacV3URuPMrSXBiLxg
+Z3Vms/EY96Jc5lP/Ooi2R6X/ExjqmAl3P51T+c8B5fWmcBcUr2Ok/5mzk53cU6cG
+/kiFHaFpriV1uxPMUgP17VGhi9sVAgMBAAGjggEIMIIBBDAOBgNVHQ8BAf8EBAMC
+AYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMBIGA1UdEwEB/wQIMAYB
+Af8CAQAwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYfr52LFMLGMB8GA1UdIwQYMBaA
+FHm0WeZ7tuXkAXOACIjIGlj26ZtuMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcw
+AoYWaHR0cDovL3gxLmkubGVuY3Iub3JnLzAnBgNVHR8EIDAeMBygGqAYhhZodHRw
+Oi8veDEuYy5sZW5jci5vcmcvMCIGA1UdIAQbMBkwCAYGZ4EMAQIBMA0GCysGAQQB
+gt8TAQEBMA0GCSqGSIb3DQEBCwUAA4ICAQCFyk5HPqP3hUSFvNVneLKYY611TR6W
+PTNlclQtgaDqw+34IL9fzLdwALduO/ZelN7kIJ+m74uyA+eitRY8kc607TkC53wl
+ikfmZW4/RvTZ8M6UK+5UzhK8jCdLuMGYL6KvzXGRSgi3yLgjewQtCPkIVz6D2QQz
+CkcheAmCJ8MqyJu5zlzyZMjAvnnAT45tRAxekrsu94sQ4egdRCnbWSDtY7kh+BIm
+lJNXoB1lBMEKIq4QDUOXoRgffuDghje1WrG9ML+Hbisq/yFOGwXD9RiX8F6sw6W4
+avAuvDszue5L3sz85K+EC4Y/wFVDNvZo4TYXao6Z0f+lQKc0t8DQYzk1OXVu8rp2
+yJMC6alLbBfODALZvYH7n7do1AZls4I9d1P4jnkDrQoxB3UqQ9hVl3LEKQ73xF1O
+yK5GhDDX8oVfGKF5u+decIsH4YaTw7mP3GFxJSqv3+0lUFJoi5Lc5da149p90Ids
+hCExroL1+7mryIkXPeFM5TgO9r0rvZaBFOvV2z0gp35Z0+L4WPlbuEjN/lxPFin+
+HlUjr8gRsI3qfJOQFy/9rKIJR0Y/8Omwt/8oTWgy1mdeHmmjk7j1nYsvC9JSQ6Zv
+MldlTTKB3zhThV1+XWYp6rjd5JW1zbVWEkLNxE7GJThEUG3szgBVGP7pSWTUTsqX
+nLRbwHOoq7hHwg==
+-----END CERTIFICATE-----
diff --git a/packages/app/ssl/privkey.pem b/packages/app/ssl/privkey.pem
new file mode 100644
index 00000000..d4644cdc
--- /dev/null
+++ b/packages/app/ssl/privkey.pem
@@ -0,0 +1,6 @@
+-----BEGIN PRIVATE KEY-----
+MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDBKp+X11fOIu7rBPTij
+4vj4a9M+pjkVA4/gzeDTEKmASArNd+6sdbRtBa4vdirWyU+hZANiAARZElFg25Qr
+1cfjFWI0vKzEDmMB81zOSHVm1AwwVxQyT/87XSaUHoLkzh48+ooWw6t95LqcPmSW
+lGFdhgvGRRvdOsSN1HvosD2lBCB774PcssyqK7KXIZuTa1I/7nIso+4=
+-----END PRIVATE KEY-----
diff --git a/packages/app/vite.config.js b/packages/app/vite.config.js
index 88312070..050a4670 100755
--- a/packages/app/vite.config.js
+++ b/packages/app/vite.config.js
@@ -32,6 +32,10 @@ export default defineConfig({
fs: {
allow: ["..", "../../"],
},
+ https: {
+ key: path.join(__dirname, "ssl", "privkey.pem"),
+ cert: path.join(__dirname, "ssl", "cert.pem"),
+ }
},
css: {
preprocessorOptions: {
diff --git a/packages/server/classes/Languages/data.json b/packages/server/classes/Languages/data.json
new file mode 100644
index 00000000..97ec78b2
--- /dev/null
+++ b/packages/server/classes/Languages/data.json
@@ -0,0 +1,611 @@
+{
+ "ab": "Abkhazian",
+ "ace": "Achinese",
+ "ach": "Acoli",
+ "ada": "Adangme",
+ "ady": "Adyghe",
+ "aa": "Afar",
+ "afh": "Afrihili",
+ "af": "Afrikaans",
+ "agq": "Aghem",
+ "ain": "Ainu",
+ "ak": "Akan",
+ "akk": "Akkadian",
+ "bss": "Akoose",
+ "akz": "Alabama",
+ "sq": "Albanian",
+ "ale": "Aleut",
+ "arq": "Algerian Arabic",
+ "am": "Amarik",
+ "en_US": "American English",
+ "ase": "American Sign Language",
+ "egy": "Ancient Egyptian",
+ "grc": "Ancient Greek",
+ "anp": "Angika",
+ "njo": "Ao Naga",
+ "ar": "Arabik",
+ "an": "Aragonese",
+ "arc": "Aramaic",
+ "aro": "Araona",
+ "arp": "Arapaho",
+ "arw": "Arawak",
+ "hy": "Armenian",
+ "rup": "Aromanian",
+ "frp": "Arpitan",
+ "as": "Assamese",
+ "ast": "Asturian",
+ "asa": "Asu",
+ "cch": "Atsam",
+ "en_AU": "Australian English",
+ "de_AT": "Austrian German",
+ "av": "Avaric",
+ "ae": "Avestan",
+ "awa": "Awadhi",
+ "ay": "Aymara",
+ "az": "Azerbaijani",
+ "bfq": "Badaga",
+ "ksf": "Bafia",
+ "bfd": "Bafut",
+ "bqi": "Bakhtiari",
+ "ban": "Balinese",
+ "bal": "Baluchi",
+ "bm": "Bambara",
+ "bax": "Bamun",
+ "bjn": "Banjar",
+ "bas": "Basaa",
+ "ba": "Bashkir",
+ "eu": "Basque",
+ "bbc": "Batak Toba",
+ "bar": "Bavarian",
+ "bej": "Beja",
+ "be": "Belarus kasa",
+ "bem": "Bemba",
+ "bez": "Bena",
+ "bn": "Bengali kasa",
+ "bew": "Betawi",
+ "my": "B\u025b\u025bmis kasa",
+ "bho": "Bhojpuri",
+ "bik": "Bikol",
+ "bin": "Bini",
+ "bpy": "Bishnupriya",
+ "bi": "Bislama",
+ "byn": "Blin",
+ "zbl": "Blissymbols",
+ "brx": "Bodo",
+ "en": "Bor\u0254fo",
+ "bs": "Bosnian",
+ "bg": "B\u0254lgeria kasa",
+ "brh": "Brahui",
+ "bra": "Braj",
+ "pt_BR": "Brazilian Portuguese",
+ "br": "Breton",
+ "en_GB": "British English",
+ "bug": "Buginese",
+ "bum": "Bulu",
+ "bua": "Buriat",
+ "cad": "Caddo",
+ "frc": "Cajun French",
+ "en_CA": "Canadian English",
+ "fr_CA": "Canadian French",
+ "yue": "Cantonese",
+ "cps": "Capiznon",
+ "car": "Carib",
+ "ca": "Catalan",
+ "cay": "Cayuga",
+ "ceb": "Cebuano",
+ "tzm": "Central Atlas Tamazight",
+ "dtp": "Central Dusun",
+ "ckb": "Central Kurdish",
+ "esu": "Central Yupik",
+ "shu": "Chadian Arabic",
+ "chg": "Chagatai",
+ "ch": "Chamorro",
+ "ce": "Chechen",
+ "chr": "Cherokee",
+ "chy": "Cheyenne",
+ "chb": "Chibcha",
+ "cgg": "Chiga",
+ "qug": "Chimborazo Highland Quichua",
+ "chn": "Chinook Jargon",
+ "chp": "Chipewyan",
+ "cho": "Choctaw",
+ "cu": "Church Slavic",
+ "chk": "Chuukese",
+ "cv": "Chuvash",
+ "nwc": "Classical Newari",
+ "syc": "Classical Syriac",
+ "ksh": "Colognian",
+ "swb": "Comorian",
+ "swc": "Congo Swahili",
+ "cop": "Coptic",
+ "kw": "Cornish",
+ "co": "Corsican",
+ "cr": "Cree",
+ "mus": "Creek",
+ "crh": "Crimean Turkish",
+ "hr": "Croatian",
+ "dak": "Dakota",
+ "da": "Danish",
+ "dar": "Dargwa",
+ "dzg": "Dazaga",
+ "del": "Delaware",
+ "nl": "D\u025b\u025bkye",
+ "din": "Dinka",
+ "dv": "Divehi",
+ "doi": "Dogri",
+ "dgr": "Dogrib",
+ "dua": "Duala",
+ "dyu": "Dyula",
+ "dz": "Dzongkha",
+ "frs": "Eastern Frisian",
+ "efi": "Efik",
+ "arz": "Egyptian Arabic",
+ "eka": "Ekajuk",
+ "elx": "Elamite",
+ "ebu": "Embu",
+ "egl": "Emilian",
+ "myv": "Erzya",
+ "eo": "Esperanto",
+ "et": "Estonian",
+ "pt_PT": "European Portuguese",
+ "es_ES": "European Spanish",
+ "ee": "Ewe",
+ "ewo": "Ewondo",
+ "ext": "Extremaduran",
+ "fan": "Fang",
+ "fat": "Fanti",
+ "fo": "Faroese",
+ "hif": "Fiji Hindi",
+ "fj": "Fijian",
+ "fil": "Filipino",
+ "fi": "Finnish",
+ "nl_BE": "Flemish",
+ "fon": "Fon",
+ "gur": "Frafra",
+ "fr": "Fr\u025bnkye",
+ "fur": "Friulian",
+ "ff": "Fulah",
+ "gaa": "Ga",
+ "gag": "Gagauz",
+ "gl": "Galician",
+ "gan": "Gan Chinese",
+ "lg": "Ganda",
+ "gay": "Gayo",
+ "gba": "Gbaya",
+ "gez": "Geez",
+ "ka": "Georgian",
+ "aln": "Gheg Albanian",
+ "bbj": "Ghomala",
+ "glk": "Gilaki",
+ "gil": "Gilbertese",
+ "gom": "Goan Konkani",
+ "gon": "Gondi",
+ "gor": "Gorontalo",
+ "got": "Gothic",
+ "grb": "Grebo",
+ "el": "Greek kasa",
+ "gn": "Guarani",
+ "gu": "Gujarati",
+ "guz": "Gusii",
+ "gwi": "Gwich\u02bcin",
+ "de": "Gyaaman",
+ "jv": "Gyabanis kasa",
+ "ja": "Gyapan kasa",
+ "hai": "Haida",
+ "ht": "Haitian",
+ "hak": "Hakka Chinese",
+ "hu": "Hangri kasa",
+ "ha": "Hausa",
+ "haw": "Hawaiian",
+ "he": "Hebrew",
+ "hz": "Herero",
+ "hil": "Hiligaynon",
+ "hi": "Hindi",
+ "ho": "Hiri Motu",
+ "hit": "Hittite",
+ "hmn": "Hmong",
+ "hup": "Hupa",
+ "iba": "Iban",
+ "ibb": "Ibibio",
+ "is": "Icelandic",
+ "io": "Ido",
+ "ig": "Igbo",
+ "ilo": "Iloko",
+ "smn": "Inari Sami",
+ "id": "Indonihyia kasa",
+ "izh": "Ingrian",
+ "inh": "Ingush",
+ "ia": "Interlingua",
+ "ie": "Interlingue",
+ "iu": "Inuktitut",
+ "ik": "Inupiaq",
+ "ga": "Irish",
+ "it": "Italy kasa",
+ "jam": "Jamaican Creole English",
+ "kaj": "Jju",
+ "dyo": "Jola-Fonyi",
+ "jrb": "Judeo-Arabic",
+ "jpr": "Judeo-Persian",
+ "jut": "Jutish",
+ "kbd": "Kabardian",
+ "kea": "Kabuverdianu",
+ "kab": "Kabyle",
+ "kac": "Kachin",
+ "kgp": "Kaingang",
+ "kkj": "Kako",
+ "kl": "Kalaallisut",
+ "kln": "Kalenjin",
+ "xal": "Kalmyk",
+ "kam": "Kamba",
+ "km": "Kambodia kasa",
+ "kbl": "Kanembu",
+ "kn": "Kannada",
+ "kr": "Kanuri",
+ "kaa": "Kara-Kalpak",
+ "krc": "Karachay-Balkar",
+ "krl": "Karelian",
+ "ks": "Kashmiri",
+ "csb": "Kashubian",
+ "kaw": "Kawi",
+ "kk": "Kazakh",
+ "ken": "Kenyang",
+ "kha": "Khasi",
+ "kho": "Khotanese",
+ "khw": "Khowar",
+ "ki": "Kikuyu",
+ "kmb": "Kimbundu",
+ "krj": "Kinaray-a",
+ "kiu": "Kirmanjki",
+ "tlh": "Klingon",
+ "bkm": "Kom",
+ "kv": "Komi",
+ "koi": "Komi-Permyak",
+ "kg": "Kongo",
+ "kok": "Konkani",
+ "ko": "Korea kasa",
+ "kfo": "Koro",
+ "kos": "Kosraean",
+ "avk": "Kotava",
+ "khq": "Koyra Chiini",
+ "ses": "Koyraboro Senni",
+ "kpe": "Kpelle",
+ "kri": "Krio",
+ "kj": "Kuanyama",
+ "kum": "Kumyk",
+ "ku": "Kurdish",
+ "kru": "Kurukh",
+ "kut": "Kutenai",
+ "nmg": "Kwasio",
+ "zh": "Kyaena kasa",
+ "cs": "Ky\u025bk kasa",
+ "ky": "Kyrgyz",
+ "quc": "K\u02bciche\u02bc",
+ "lad": "Ladino",
+ "lah": "Lahnda",
+ "lkt": "Lakota",
+ "lam": "Lamba",
+ "lag": "Langi",
+ "lo": "Lao",
+ "ltg": "Latgalian",
+ "la": "Latin",
+ "es_419": "Latin American Spanish",
+ "lv": "Latvian",
+ "lzz": "Laz",
+ "lez": "Lezghian",
+ "lij": "Ligurian",
+ "li": "Limburgish",
+ "ln": "Lingala",
+ "lfn": "Lingua Franca Nova",
+ "lzh": "Literary Chinese",
+ "lt": "Lithuanian",
+ "liv": "Livonian",
+ "jbo": "Lojban",
+ "lmo": "Lombard",
+ "nds": "Low German",
+ "sli": "Lower Silesian",
+ "dsb": "Lower Sorbian",
+ "loz": "Lozi",
+ "lu": "Luba-Katanga",
+ "lua": "Luba-Lulua",
+ "lui": "Luiseno",
+ "smj": "Lule Sami",
+ "lun": "Lunda",
+ "luo": "Luo",
+ "lb": "Luxembourgish",
+ "luy": "Luyia",
+ "mde": "Maba",
+ "mk": "Macedonian",
+ "jmc": "Machame",
+ "mad": "Madurese",
+ "maf": "Mafa",
+ "mag": "Magahi",
+ "vmf": "Main-Franconian",
+ "mai": "Maithili",
+ "mak": "Makasar",
+ "mgh": "Makhuwa-Meetto",
+ "kde": "Makonde",
+ "mg": "Malagasy",
+ "ms": "Malay kasa",
+ "ml": "Malayalam",
+ "mt": "Maltese",
+ "mnc": "Manchu",
+ "mdr": "Mandar",
+ "man": "Mandingo",
+ "mni": "Manipuri",
+ "gv": "Manx",
+ "mi": "Maori",
+ "arn": "Mapuche",
+ "mr": "Marathi",
+ "chm": "Mari",
+ "mh": "Marshallese",
+ "mwr": "Marwari",
+ "mas": "Masai",
+ "mzn": "Mazanderani",
+ "byv": "Medumba",
+ "men": "Mende",
+ "mwv": "Mentawai",
+ "mer": "Meru",
+ "mgo": "Meta\u02bc",
+ "es_MX": "Mexican Spanish",
+ "mic": "Micmac",
+ "dum": "Middle Dutch",
+ "enm": "Middle English",
+ "frm": "Middle French",
+ "gmh": "Middle High German",
+ "mga": "Middle Irish",
+ "nan": "Min Nan Chinese",
+ "min": "Minangkabau",
+ "xmf": "Mingrelian",
+ "mwl": "Mirandese",
+ "lus": "Mizo",
+ "ar_001": "Modern Standard Arabic",
+ "moh": "Mohawk",
+ "mdf": "Moksha",
+ "ro_MD": "Moldavian",
+ "lol": "Mongo",
+ "mn": "Mongolian",
+ "mfe": "Morisyen",
+ "ary": "Moroccan Arabic",
+ "mos": "Mossi",
+ "mul": "Multiple Languages",
+ "mua": "Mundang",
+ "ttt": "Muslim Tat",
+ "mye": "Myene",
+ "naq": "Nama",
+ "na": "Nauru",
+ "nv": "Navajo",
+ "ng": "Ndonga",
+ "nap": "Neapolitan",
+ "new": "Newari",
+ "ne": "N\u025bpal kasa",
+ "sba": "Ngambay",
+ "nnh": "Ngiemboon",
+ "jgo": "Ngomba",
+ "yrl": "Nheengatu",
+ "nia": "Nias",
+ "niu": "Niuean",
+ "zxx": "No linguistic content",
+ "nog": "Nogai",
+ "nd": "North Ndebele",
+ "frr": "Northern Frisian",
+ "se": "Northern Sami",
+ "nso": "Northern Sotho",
+ "no": "Norwegian",
+ "nb": "Norwegian Bokm\u00e5l",
+ "nn": "Norwegian Nynorsk",
+ "nov": "Novial",
+ "nus": "Nuer",
+ "nym": "Nyamwezi",
+ "ny": "Nyanja",
+ "nyn": "Nyankole",
+ "tog": "Nyasa Tonga",
+ "nyo": "Nyoro",
+ "nzi": "Nzima",
+ "nqo": "N\u02bcKo",
+ "oc": "Occitan",
+ "oj": "Ojibwa",
+ "ang": "Old English",
+ "fro": "Old French",
+ "goh": "Old High German",
+ "sga": "Old Irish",
+ "non": "Old Norse",
+ "peo": "Old Persian",
+ "pro": "Old Proven\u00e7al",
+ "or": "Oriya",
+ "om": "Oromo",
+ "osa": "Osage",
+ "os": "Ossetic",
+ "ota": "Ottoman Turkish",
+ "pal": "Pahlavi",
+ "pfl": "Palatine German",
+ "pau": "Palauan",
+ "pi": "Pali",
+ "pam": "Pampanga",
+ "pag": "Pangasinan",
+ "pap": "Papiamento",
+ "ps": "Pashto",
+ "pdc": "Pennsylvania German",
+ "fa": "P\u025b\u025bhyia kasa",
+ "phn": "Phoenician",
+ "pcd": "Picard",
+ "pms": "Piedmontese",
+ "pdt": "Plautdietsch",
+ "pon": "Pohnpeian",
+ "pnt": "Pontic",
+ "pl": "P\u0254land kasa",
+ "pt": "P\u0254\u0254tugal kasa",
+ "prg": "Prussian",
+ "pa": "Pungyabi kasa",
+ "qu": "Quechua",
+ "ru": "Rahyia kasa",
+ "raj": "Rajasthani",
+ "rap": "Rapanui",
+ "rar": "Rarotongan",
+ "rw": "Rewanda kasa",
+ "rif": "Riffian",
+ "rgn": "Romagnol",
+ "rm": "Romansh",
+ "rom": "Romany",
+ "rof": "Rombo",
+ "ro": "Romenia kasa",
+ "root": "Root",
+ "rtm": "Rotuman",
+ "rug": "Roviana",
+ "rn": "Rundi",
+ "rue": "Rusyn",
+ "rwk": "Rwa",
+ "ssy": "Saho",
+ "sah": "Sakha",
+ "sam": "Samaritan Aramaic",
+ "saq": "Samburu",
+ "sm": "Samoan",
+ "sgs": "Samogitian",
+ "sad": "Sandawe",
+ "sg": "Sango",
+ "sbp": "Sangu",
+ "sa": "Sanskrit",
+ "sat": "Santali",
+ "sc": "Sardinian",
+ "sas": "Sasak",
+ "sdc": "Sassarese Sardinian",
+ "stq": "Saterland Frisian",
+ "saz": "Saurashtra",
+ "sco": "Scots",
+ "gd": "Scottish Gaelic",
+ "sly": "Selayar",
+ "sel": "Selkup",
+ "seh": "Sena",
+ "see": "Seneca",
+ "sr": "Serbian",
+ "sh": "Serbo-Croatian",
+ "srr": "Serer",
+ "sei": "Seri",
+ "ksb": "Shambala",
+ "shn": "Shan",
+ "sn": "Shona",
+ "ii": "Sichuan Yi",
+ "scn": "Sicilian",
+ "sid": "Sidamo",
+ "bla": "Siksika",
+ "szl": "Silesian",
+ "zh_Hans": "Simplified Chinese",
+ "sd": "Sindhi",
+ "si": "Sinhala",
+ "sms": "Skolt Sami",
+ "den": "Slave",
+ "sk": "Slovak",
+ "sl": "Slovenian",
+ "xog": "Soga",
+ "sog": "Sogdien",
+ "so": "Somalia kasa",
+ "snk": "Soninke",
+ "azb": "South Azerbaijani",
+ "nr": "South Ndebele",
+ "alt": "Southern Altai",
+ "sma": "Southern Sami",
+ "st": "Southern Sotho",
+ "es": "Spain kasa",
+ "srn": "Sranan Tongo",
+ "zgh": "Standard Moroccan Tamazight",
+ "suk": "Sukuma",
+ "sux": "Sumerian",
+ "su": "Sundanese",
+ "sus": "Susu",
+ "sw": "Swahili",
+ "ss": "Swati",
+ "sv": "Sweden kasa",
+ "fr_CH": "Swiss French",
+ "gsw": "Swiss German",
+ "de_CH": "Swiss High German",
+ "syr": "Syriac",
+ "shi": "Tachelhit",
+ "th": "Taeland kasa",
+ "tl": "Tagalog",
+ "ty": "Tahitian",
+ "dav": "Taita",
+ "tg": "Tajik",
+ "tly": "Talysh",
+ "tmh": "Tamashek",
+ "ta": "Tamil kasa",
+ "trv": "Taroko",
+ "twq": "Tasawaq",
+ "tt": "Tatar",
+ "te": "Telugu",
+ "ter": "Tereno",
+ "teo": "Teso",
+ "tet": "Tetum",
+ "tr": "T\u025b\u025bki kasa",
+ "bo": "Tibetan",
+ "tig": "Tigre",
+ "ti": "Tigrinya",
+ "tem": "Timne",
+ "tiv": "Tiv",
+ "tli": "Tlingit",
+ "tpi": "Tok Pisin",
+ "tkl": "Tokelau",
+ "to": "Tongan",
+ "fit": "Tornedalen Finnish",
+ "zh_Hant": "Traditional Chinese",
+ "tkr": "Tsakhur",
+ "tsd": "Tsakonian",
+ "tsi": "Tsimshian",
+ "ts": "Tsonga",
+ "tn": "Tswana",
+ "tcy": "Tulu",
+ "tum": "Tumbuka",
+ "aeb": "Tunisian Arabic",
+ "tk": "Turkmen",
+ "tru": "Turoyo",
+ "tvl": "Tuvalu",
+ "tyv": "Tuvinian",
+ "tw": "Twi",
+ "kcg": "Tyap",
+ "udm": "Udmurt",
+ "uga": "Ugaritic",
+ "uk": "Ukren kasa",
+ "umb": "Umbundu",
+ "und": "Unknown Language",
+ "hsb": "Upper Sorbian",
+ "ur": "Urdu kasa",
+ "ug": "Uyghur",
+ "uz": "Uzbek",
+ "vai": "Vai",
+ "ve": "Venda",
+ "vec": "Venetian",
+ "vep": "Veps",
+ "vi": "Vi\u025btnam kasa",
+ "vo": "Volap\u00fck",
+ "vro": "V\u00f5ro",
+ "vot": "Votic",
+ "vun": "Vunjo",
+ "wa": "Walloon",
+ "wae": "Walser",
+ "war": "Waray",
+ "wbp": "Warlpiri",
+ "was": "Washo",
+ "guc": "Wayuu",
+ "cy": "Welsh",
+ "vls": "West Flemish",
+ "fy": "Western Frisian",
+ "mrj": "Western Mari",
+ "wal": "Wolaytta",
+ "wo": "Wolof",
+ "wuu": "Wu Chinese",
+ "xh": "Xhosa",
+ "hsn": "Xiang Chinese",
+ "yav": "Yangben",
+ "yao": "Yao",
+ "yap": "Yapese",
+ "ybb": "Yemba",
+ "yi": "Yiddish",
+ "yo": "Yoruba",
+ "zap": "Zapotec",
+ "dje": "Zarma",
+ "zza": "Zaza",
+ "zea": "Zeelandic",
+ "zen": "Zenaga",
+ "za": "Zhuang",
+ "gbz": "Zoroastrian Dari",
+ "zu": "Zulu",
+ "zun": "Zuni"
+}
\ No newline at end of file
diff --git a/packages/server/classes/Languages/index.js b/packages/server/classes/Languages/index.js
new file mode 100644
index 00000000..fe05f9e1
--- /dev/null
+++ b/packages/server/classes/Languages/index.js
@@ -0,0 +1,11 @@
+import Data from "./data.json"
+
+export default class Languages {
+ get() {
+ return Data
+ }
+
+ resolveName(code) {
+ return Data[code]
+ }
+}
\ No newline at end of file
diff --git a/packages/server/db_models/musicLyrics/index.js b/packages/server/db_models/musicLyrics/index.js
index 249d5804..577e4771 100644
--- a/packages/server/db_models/musicLyrics/index.js
+++ b/packages/server/db_models/musicLyrics/index.js
@@ -7,7 +7,7 @@ export default {
required: true
},
lrc: {
- type: String,
+ type: Object,
}
}
}
\ No newline at end of file
diff --git a/packages/server/db_models/track/index.js b/packages/server/db_models/track/index.js
index 74c08bd3..744ba32f 100755
--- a/packages/server/db_models/track/index.js
+++ b/packages/server/db_models/track/index.js
@@ -2,6 +2,10 @@ export default {
name: "Track",
collection: "tracks",
schema: {
+ source: {
+ type: String,
+ required: true,
+ },
title: {
type: String,
required: true,
@@ -12,10 +16,6 @@ export default {
artists: {
type: Array,
},
- source: {
- type: String,
- required: true,
- },
metadata: {
type: Object,
},
@@ -27,20 +27,13 @@ export default {
type: Boolean,
default: true,
},
+ publish_date: {
+ type: Date,
+ },
cover: {
type: String,
default: "https://storage.ragestudio.net/comty-static-assets/default_song.png"
},
- videoCanvas: {
- type: String,
- },
- spotifyId: {
- type: String,
- },
- lyricsEnabled: {
- type: Boolean,
- default: true,
- },
publisher: {
type: Object,
required: true,
diff --git a/packages/server/gateway/proxy.js b/packages/server/gateway/proxy.js
index 4c9749f2..7dcaf4ab 100644
--- a/packages/server/gateway/proxy.js
+++ b/packages/server/gateway/proxy.js
@@ -1,15 +1,38 @@
-import http from "node:http"
import httpProxy from "http-proxy"
import defaults from "linebridge/src/server/defaults"
import pkg from "../package.json"
+import http from "node:http"
+import https from "node:https"
+
+import fs from "node:fs"
+import path from "node:path"
+
+function getHttpServerEngine(extraOptions = {}, handler = () => { }) {
+ const sslKey = path.resolve(process.cwd(), "ssl", "privkey.pem")
+ const sslCert = path.resolve(process.cwd(), "ssl", "cert.pem")
+
+ if (fs.existsSync(sslKey) && fs.existsSync(sslCert)) {
+ return https.createServer(
+ {
+ key: fs.readFileSync(sslKey),
+ cert: fs.readFileSync(sslCert),
+ ...extraOptions
+ },
+ handler
+ )
+ } else {
+ return http.createServer(extraOptions, handler)
+ }
+}
+
export default class Proxy {
constructor() {
this.proxys = new Map()
this.wsProxys = new Map()
- this.http = http.createServer(this.handleHttpRequest)
+ this.http = getHttpServerEngine({}, this.handleHttpRequest)
this.http.on("upgrade", this.handleHttpUpgrade)
}
diff --git a/packages/server/old_g.js b/packages/server/old_g.js
deleted file mode 100755
index dc6e41e4..00000000
--- a/packages/server/old_g.js
+++ /dev/null
@@ -1,467 +0,0 @@
-require("dotenv").config()
-
-import fs from "node:fs"
-import path from "node:path"
-import repl from "node:repl"
-import { Transform } from "node:stream"
-import ChildProcess from "node:child_process"
-import { Observable } from "@gullerya/object-observer"
-import chalk from "chalk"
-import Spinnies from "spinnies"
-import chokidar from "chokidar"
-import IPCRouter from "linebridge/src/server/classes/IPCRouter"
-import treeKill from "tree-kill"
-
-import { dots as DefaultSpinner } from "spinnies/spinners.json"
-import getInternalIp from "./lib/getInternalIp"
-import comtyAscii from "./gateway/ascii"
-import pkg from "./package.json"
-
-import { onExit } from "signal-exit"
-
-import Proxy from "./gateway/proxy"
-
-const bootloaderBin = path.resolve(__dirname, "boot")
-const servicesPath = path.resolve(__dirname, "services")
-
-async function scanServices() {
- const finalServices = []
-
- let services = fs.readdirSync(servicesPath)
-
- for await (let _path of services) {
- _path = path.resolve(servicesPath, _path)
-
- if (fs.lstatSync(_path).isDirectory()) {
- // search main file "*.service.*" (using regex) on the root of the service path
- const mainFile = fs.readdirSync(_path).find((filename) => {
- const regex = new RegExp(`^.*\.service\..*$`)
-
- return regex.test(filename)
- })
-
- if (mainFile) {
- finalServices.push(path.resolve(_path, mainFile))
- }
- }
- }
-
- return finalServices
-}
-
-let internal_proxy = new Proxy()
-let allReady = false
-let selectedProcessInstance = null
-let internalIp = null
-let services = null
-
-const spinnies = new Spinnies()
-
-const ipcRouter = global.ipcRouter = new IPCRouter()
-const instancePool = global.instancePool = []
-const serviceFileReference = {}
-const serviceRegistry = global.serviceRegistry = Observable.from({})
-
-Observable.observe(serviceRegistry, (changes) => {
- const { type, path, value } = changes[0]
-
- switch (type) {
- case "update": {
- //console.log(`Updated service | ${path} > ${value}`)
-
- //check if all services all ready
- if (Object.values(serviceRegistry).every((service) => service.initialized)) {
- handleAllReady()
- }
-
- break
- }
- }
-})
-
-function detachInstanceStd(instance) {
- if (instance.logs) {
- instance.logs.stdout.unpipe(process.stdout)
- instance.logs.stderr.unpipe(process.stderr)
- }
-}
-
-function attachInstanceStd(instance, { afterMsg } = {}) {
- if (instance.logs) {
- console.clear()
-
- if (afterMsg) {
- console.log(afterMsg)
- }
-
- instance.logs.stdout.pipe(process.stdout)
- instance.logs.stderr.pipe(process.stderr)
- }
-}
-
-function attachAllInstancesStd() {
- for (let instance of instancePool) {
- attachInstanceStd(instance.instance)
- }
-
- selectedProcessInstance = "all"
-}
-
-function detachAllInstancesStd() {
- for (let instance of instancePool) {
- detachInstanceStd(instance.instance)
- }
-
- selectedProcessInstance = null
-}
-
-const relp_commands =
-
-async function getIgnoredFiles(cwd) {
- // git check-ignore -- *
- let output = await new Promise((resolve, reject) => {
- ChildProcess.exec("git check-ignore -- *", {
- cwd: cwd
- }, (err, stdout) => {
- if (err) {
- resolve(``)
- }
-
- resolve(stdout)
- })
- })
-
- output = output.split("\n").map((file) => {
- return `**/${file.trim()}`
- })
-
- output = output.filter((file) => {
- return file
- })
-
- return output
-}
-
-async function handleAllReady() {
- if (allReady) {
- return false
- }
-
- console.clear()
-
- allReady = true
-
- console.log(comtyAscii)
- console.log(`🎉 All services[${services.length}] ready!\n`)
- console.log(`USE: select {
+ setSelected(variant.id)
+ }}
+ >
+ {
+ createIconRender(variant.icon)
+ }
+
+ })
+ }
+ 
+