Lisa_Stuff/pvtchat
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Voice Channels type and display, updated vulnerable modules, fully re-worked dev docker compose file. Production usage not ready.

Browse Source
This commit is contained in:
root 2025-03-22 13:35:52 +00:00
parent 7276a673cc
commit 24ea281650
7 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
frontend/env/.env.dev vendored
View File

@ -1,10 +1,10 @@
PORT=4200 PORT=3000
REACT_APP_API_URL="http://localhost:3000/v2" REACT_APP_API_URL="https://lisa.root.sx/api/v2"
REACT_APP_CDN_URL="http://localhost:3000/assets" REACT_APP_CDN_URL="https://lisa.root.sx/api/assets"
REACT_APP_WEBSITE_URL="http://localhost:4200" REACT_APP_WEBSITE_URL="https://lisa.root.sx"
REACT_APP_REPO_URL="https://github.com/theadamjr/acrd.app" REACT_APP_REPO_URL="https://github.com/theadamjr/acrd.app"
REACT_APP_VERSION_NAME="Cyan" REACT_APP_VERSION_NAME="PVTChat"
REACT_APP_VERSION_NUMBER="0.6.0-in-development" REACT_APP_VERSION_NUMBER="0.0.1"
REACT_APP_ROOT_API_URL="http://localhost:3000" REACT_APP_ROOT_API_URL="https://lisa.root.sx/api"
REACT_APP_OWNER_USER_ID="450428712295456768" REACT_APP_OWNER_USER_ID="691264629460029440"
REACT_APP_RECAPTCHA_SITE_KEY="6Ldzz2omAAAAAAZ7Ey6ZmDtCS5rMSxVYc3Uf5EpQ" REACT_APP_RECAPTCHA_SITE_KEY="6LfKs_wqAAAAAFj0E4Dk10TeMkBoKJkEMoG6C23G"

18
frontend/env/.env.prod vendored
View File

@ -1,10 +1,10 @@
PORT=4200 PORT=3000
REACT_APP_API_URL="https://api.acrd.app/v2" REACT_APP_API_URL="http://192.168.2.100:3000/v2"
REACT_APP_CDN_URL="https://api.acrd.app/assets" REACT_APP_CDN_URL="http://192.168.2.100:3000/assets"
REACT_APP_WEBSITE_URL="https://acrd.app" REACT_APP_WEBSITE_URL="http://192.168.2.100:3000"
REACT_APP_REPO_URL="https://github.com/theadamjr/acrd.app" REACT_APP_REPO_URL="https://github.com/theadamjr/acrd.app"
REACT_APP_VERSION_NAME="Cyan" REACT_APP_VERSION_NAME="PVTChat"
REACT_APP_VERSION_NUMBER="0.6.0-in-development" REACT_APP_VERSION_NUMBER="0.0.1"
REACT_APP_ROOT_API_URL="https://api.acrd.app" REACT_APP_ROOT_API_URL="http://192.168.2.100:3001"
REACT_APP_OWNER_USER_ID="451453819310678016" REACT_APP_OWNER_USER_ID="450428712295456768"
REACT_APP_RECAPTCHA_SITE_KEY="6Ldzz2omAAAAAAZ7Ey6ZmDtCS5rMSxVYc3Uf5EpQ" REACT_APP_RECAPTCHA_SITE_KEY=""

2
frontend/src/components/modals/create-channel.tsx
View File

@ -16,7 +16,7 @@ const CreateChannel: React.FunctionComponent = () => {
setValue('name', ''); setValue('name', '');
}; };
const types: ChannelTypes.Type[] = ['TEXT']; const types: ChannelTypes.Type[] = ['TEXT','VOICE'];
return ( return (
<Modal typeName={'CreateChannel'} size="sm"> <Modal typeName={'CreateChannel'} size="sm">

2
frontend/src/components/navigation/sidebar/channel-tabs.tsx
View File

@ -18,7 +18,7 @@ const ChannelTabs: React.FunctionComponent = () => {
const dispatch = useDispatch(); const dispatch = useDispatch();
const { activeGuild, activeChannel } = useSelector((s: Store.AppState) => s.ui); const { activeGuild, activeChannel } = useSelector((s: Store.AppState) => s.ui);
const guildChannels = useSelector(getGuildChannels(activeGuild?.id)) const guildChannels = useSelector(getGuildChannels(activeGuild?.id))
.filter(c => c.type !== 'VOICE'); .filter(c => c.type);
const perms = usePerms(); const perms = usePerms();
if (!activeGuild || !perms.can('VIEW_CHANNELS', activeGuild.id)) return null; if (!activeGuild || !perms.can('VIEW_CHANNELS', activeGuild.id)) return null;

2
frontend/src/components/pages/page-wrapper.tsx
View File

@ -24,7 +24,7 @@ const PageWrapper: React.FunctionComponent<PageWrapperProps> = (props) => {
const [hasAnnoyedUser, setHasAnnoyedUser] = useState(false); const [hasAnnoyedUser, setHasAnnoyedUser] = useState(false);
useEffect(() => { useEffect(() => {
document.title = props.pageTitle ?? 'acrd.app'; document.title = props.pageTitle ?? 'PVTChat';
}, []); }, []);
const onClick = () => dropdown && dispatch(ui.toggleDropdown({})); const onClick = () => dropdown && dispatch(ui.toggleDropdown({}));

4
frontend/src/services/ws-service.ts
View File

@ -2,13 +2,13 @@ import '@acrd/types';
import { WS } from '@acrd/types'; import { WS } from '@acrd/types';
import io from 'socket.io-client'; import io from 'socket.io-client';
const ws = (io as any).connect(process.env.REACT_APP_ROOT_API_URL, { const ws = (io as any).connect(process.env.REACT_APP_WEBSITE_URL, {
secure: true, secure: true,
path: `/ws`, path: `/ws`,
transports: ['websocket', 'polling', 'flashsocket'], transports: ['websocket', 'polling', 'flashsocket'],
}); });
ws.io.on('open', () => console.log('Connected to WS Server')); ws.io.on('open', () => console.log(`Connected to WS Server ${process.env.REACT_APP_WEBSITE_URL}/ws`));
export default ws as WSClient; export default ws as WSClient;

1
frontend/types/dotenv.d.ts vendored
View File

@ -11,6 +11,7 @@ declare global {
REACT_APP_ROOT_API_URL: string; REACT_APP_ROOT_API_URL: string;
REACT_APP_OWNER_USER_ID: string; REACT_APP_OWNER_USER_ID: string;
REACT_APP_RECAPTCHA_SITE_KEY: string; REACT_APP_RECAPTCHA_SITE_KEY: string;
REACT_APP_DISABLE_CAPTCHA: string;
} }
} }
} }