vodorod/parcer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/getmaxun/maxun into develop

Browse Source
This commit is contained in:
RohitR311
2024-11-09 11:03:42 +05:30
parent 090dfbbbf0 d225ba8c8f
commit 273219894a
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -16,7 +16,7 @@ Maxun lets you train a robot in 2 minutes and scrape the web on auto-pilot. Web
<p align="center"> <p align="center">
<a href="https://maxun-website.vercel.app/"><b>Website</b></a> | <a href="https://maxun-website.vercel.app/"><b>Website</b></a> |
<a href="https://discord.com/invite/NFhWDCdb"><b>Discord</b></a> | <a href="https://discord.gg/5GbPjBUkws"><b>Discord</b></a> |
<a href="https://x.com/maxun_io"><b>Twitter</b></a> | <a href="https://x.com/maxun_io"><b>Twitter</b></a> |
<a href="https://docs.google.com/forms/d/e/1FAIpQLSdbD2uhqC4sbg4eLZ9qrFbyrfkXZ2XsI6dQ0USRCQNZNn5pzg/viewform"><b>Join Maxun Cloud</b></a> | <a href="https://docs.google.com/forms/d/e/1FAIpQLSdbD2uhqC4sbg4eLZ9qrFbyrfkXZ2XsI6dQ0USRCQNZNn5pzg/viewform"><b>Join Maxun Cloud</b></a> |
<a href="https://www.youtube.com/@MaxunOSS"><b>Watch Tutorials</b></a> <a href="https://www.youtube.com/@MaxunOSS"><b>Watch Tutorials</b></a>

8
server/src/routes/auth.ts
View File

@@ -85,6 +85,14 @@ router.post('/login', async (req, res) => {
res.cookie('token', token, { res.cookie('token', token, {
httpOnly: true httpOnly: true
}) })
capture(
'maxun-oss-user-login',
{
email: user.email,
userId: user.id,
loggedInAt: new Date().toISOString()
}
)
res.json(user) res.json(user)
} catch (error: any) { } catch (error: any) {
res.status(400).send(`Could not login user - ${error.message}`) res.status(400).send(`Could not login user - ${error.message}`)

2
src/components/molecules/NavBar.tsx
View File

@@ -66,7 +66,7 @@ export const NavBar: React.FC<NavBarProps> = ({ recordingName, isRecording }) =>
<> <>
<IconButton <IconButton
component="a" component="a"
href="https://discord.gg/NFhWDCdb" href="https://discord.gg/5GbPjBUkws"
target="_blank" target="_blank"
rel="noopener noreferrer" rel="noopener noreferrer"
sx={{ sx={{

6
src/components/organisms/MainMenu.tsx
View File

@@ -3,7 +3,7 @@ import Tabs from '@mui/material/Tabs';
import Tab from '@mui/material/Tab'; import Tab from '@mui/material/Tab';
import Box from '@mui/material/Box'; import Box from '@mui/material/Box';
import { Paper, Button } from "@mui/material"; import { Paper, Button } from "@mui/material";
import { AutoAwesome, FormatListBulleted, VpnKey, Usb, Article, Link, CloudQueue } from "@mui/icons-material"; import { AutoAwesome, FormatListBulleted, VpnKey, Usb, CloudQueue, Code } from "@mui/icons-material";
import { apiUrl } from "../../apiConfig"; import { apiUrl } from "../../apiConfig";
interface MainMenuProps { interface MainMenuProps {
@@ -87,8 +87,8 @@ export const MainMenu = ({ value = 'recordings', handleChangeContent }: MainMenu
</Tabs> </Tabs>
<hr /> <hr />
<Box sx={{ display: 'flex', flexDirection: 'column', gap: '1rem', textAlign: 'left' }}> <Box sx={{ display: 'flex', flexDirection: 'column', gap: '1rem', textAlign: 'left' }}>
<Button href={`${apiUrl}/api-docs/`} target="_blank" rel="noopener noreferrer" sx={buttonStyles} startIcon={<Article />}> <Button href={`${apiUrl}/api-docs/`} target="_blank" rel="noopener noreferrer" sx={buttonStyles} startIcon={<Code />}>
API Docs Website To API
</Button> </Button>
<Button href="https://forms.gle/hXjgqDvkEhPcaBW76" target="_blank" rel="noopener noreferrer" sx={buttonStyles} startIcon={<CloudQueue />}> <Button href="https://forms.gle/hXjgqDvkEhPcaBW76" target="_blank" rel="noopener noreferrer" sx={buttonStyles} startIcon={<CloudQueue />}>
Join Maxun Cloud Join Maxun Cloud