Merge branch 'develop' of https://github.com/getmaxun/maxun into develop
This commit is contained in:
@@ -16,7 +16,7 @@ Maxun lets you train a robot in 2 minutes and scrape the web on auto-pilot. Web
|
||||
|
||||
<p align="center">
|
||||
<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://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>
|
||||
|
||||
@@ -85,6 +85,14 @@ router.post('/login', async (req, res) => {
|
||||
res.cookie('token', token, {
|
||||
httpOnly: true
|
||||
})
|
||||
capture(
|
||||
'maxun-oss-user-login',
|
||||
{
|
||||
email: user.email,
|
||||
userId: user.id,
|
||||
loggedInAt: new Date().toISOString()
|
||||
}
|
||||
)
|
||||
res.json(user)
|
||||
} catch (error: any) {
|
||||
res.status(400).send(`Could not login user - ${error.message}`)
|
||||
|
||||
@@ -66,7 +66,7 @@ export const NavBar: React.FC<NavBarProps> = ({ recordingName, isRecording }) =>
|
||||
<>
|
||||
<IconButton
|
||||
component="a"
|
||||
href="https://discord.gg/NFhWDCdb"
|
||||
href="https://discord.gg/5GbPjBUkws"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
sx={{
|
||||
|
||||
@@ -3,7 +3,7 @@ import Tabs from '@mui/material/Tabs';
|
||||
import Tab from '@mui/material/Tab';
|
||||
import Box from '@mui/material/Box';
|
||||
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";
|
||||
|
||||
interface MainMenuProps {
|
||||
@@ -87,8 +87,8 @@ export const MainMenu = ({ value = 'recordings', handleChangeContent }: MainMenu
|
||||
</Tabs>
|
||||
<hr />
|
||||
<Box sx={{ display: 'flex', flexDirection: 'column', gap: '1rem', textAlign: 'left' }}>
|
||||
<Button href={`${apiUrl}/api-docs/`} target="_blank" rel="noopener noreferrer" sx={buttonStyles} startIcon={<Article />}>
|
||||
API Docs
|
||||
<Button href={`${apiUrl}/api-docs/`} target="_blank" rel="noopener noreferrer" sx={buttonStyles} startIcon={<Code />}>
|
||||
Website To API
|
||||
</Button>
|
||||
<Button href="https://forms.gle/hXjgqDvkEhPcaBW76" target="_blank" rel="noopener noreferrer" sx={buttonStyles} startIcon={<CloudQueue />}>
|
||||
Join Maxun Cloud
|
||||
@@ -103,7 +103,7 @@ const buttonStyles = {
|
||||
justifyContent: 'flex-start',
|
||||
textAlign: 'left',
|
||||
fontSize: 'medium',
|
||||
padding: '6px 16px 6px 22px',
|
||||
padding: '6px 16px 6px 22px',
|
||||
minHeight: '48px',
|
||||
minWidth: '100%',
|
||||
display: 'flex',
|
||||
|
||||
Reference in New Issue
Block a user