Skip to content

Commit

Permalink
change version
Browse files Browse the repository at this point in the history
  • Loading branch information
@djyde
djyde committed Jul 12, 2023
1 parent 3ab689c commit d717211
Show file tree
Hide file tree
Showing 10 changed files with 422 additions and 426 deletions.
107 changes: 44 additions & 63 deletions components/Footer.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,73 +1,54 @@
import { Box, Container, HStack, Image, Link, LinkBox, LinkOverlay, List, ListItem, Text, VStack } from '@chakra-ui/react'
import { Anchor, Box, Group, List, Stack, Text, Image, Center } from '@mantine/core'
import * as React from 'react'
import { VERSION } from '../utils.client'

export function Footer(props: {
maxWidth?: string
}) {
return (
<>
<Box borderTopWidth={1} borderTopColor="gray.100" py={12} mt={24}>
<Container maxWidth={props.maxWidth || '6xl'}>
<HStack alignItems="stretch" spacing={24}>
<Box fontSize="sm">
<List color="gray.500" spacing={2}>
<ListItem>
<Text color="gray.900" fontWeight="medium">Contact</Text>
</ListItem>
<ListItem>
<Link isExternal href="https://twitter.com/cusdis_hq">Twitter</Link>
</ListItem>
<ListItem>
<Link isExternal href="https://blog.cusdis.com">Blog</Link>
</ListItem>
<ListItem>
<Link isExternal href="https://github.com/djyde/cusdis">GitHub</Link>
</ListItem>
<ListItem>
<Text>[email protected]</Text>
</ListItem>
<Box p={48}>
<Center>
<Group spacing={120} align="start">
<List listStyleType={'none'} color="gray.500" spacing={2}>
<List.Item mb={8}>
<Text color="gray.900" weight={500}>Contact</Text>
</List.Item>
<List.Item>
<Anchor target={'_blank'} href="https://twitter.com/cusdis_hq">Twitter</Anchor>
</List.Item>
<List.Item>
<Anchor target="_blank" href="https://blog.cusdis.com">Blog</Anchor>
</List.Item>
<List.Item>
<Anchor target="_blank" href="https://github.com/djyde/cusdis">GitHub</Anchor>
</List.Item>
<List.Item>
<Text>[email protected]</Text>
</List.Item>
</List>
<List listStyleType={'none'} color="gray.500" spacing={2}>
<List.Item mb={8}>
<Text weight={500} color="gray">Resources</Text>
</List.Item>
<List.Item>
<Anchor target="_blank" href="https://cusdis.com/doc">Documentation</Anchor>
</List.Item>
<List.Item>
<Anchor target="_blank" href="https://opencollective.com/cusdis">Sponsor</Anchor>
</List.Item>
<List.Item>
<Anchor target="_blank" href="/privacy-policy">Privacy Policy</Anchor>
</List.Item>
</List>

</List>
{/* <Text>Made with ❤️ by <Link href="https://twitter.com/randyloop">Randy</Link></Text> */}
</Box>

<Box fontSize="sm">
<List color="gray.500" spacing={2}>
<ListItem>
<Text fontWeight="medium" color="gray.900" >Resources</Text>
</ListItem>
<ListItem>
<Link isExternal href="https://cusdis.com/doc">Documentation</Link>
</ListItem>
<ListItem>
<Link isExternal href="https://opencollective.com/cusdis">Sponsor</Link>
</ListItem>
<ListItem>
<Link isExternal href="/privacy-policy">Privacy Policy</Link>
</ListItem>
<ListItem>
<Box>
<a href="https://vercel.com?utm_source=randysoft&utm_campaign=oss">
<img width={128} src="https://images.ctfassets.net/e5382hct74si/78Olo8EZRdUlcDUFQvnzG7/fa4cdb6dc04c40fceac194134788a0e2/1618983297-powered-by-vercel.svg" />
</a>
</Box>
</ListItem>
</List>
</Box>

</HStack>

<VStack spacing={2} mt={12} alignItems="center">
<Image w={8} src="/images/artworks/logo-gray-256.png" />
<Text fontSize="sm" textAlign="right" color="gray.500">
v{VERSION}
</Text>
</VStack>

</Container>
</Box>

</>
</Group>
</Center>
<Stack spacing={2} mt={12} align="center">
<Image width={8} src="/images/artworks/logo-gray-256.png" />
<Text size="sm" align="right" color="gray.500">
v{VERSION}
</Text>
</Stack>
</Box>
)
}
24 changes: 8 additions & 16 deletions components/Layout.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,14 @@
import React, { useCallback, useState } from "react"
import { useMutation, useQuery } from "react-query"
import { getAllProjects } from "../pages/dashboard"
import { UserSession } from "../service"
import NextLink from 'next/link'
import { useRouter } from "next/router"
import { SettingsIcon } from '@chakra-ui/icons'
import { AiOutlineLogout, AiOutlineSetting, AiOutlineFileText, AiOutlineAlert, AiOutlinePlus, AiOutlineComment, AiOutlineCode, AiOutlineRight, AiOutlineDown, AiOutlineFile } from 'react-icons/ai'
import { signout, signOut } from "next-auth/client"
import { Footer } from "./Footer"
import { createProject } from "../pages/getting-start"
import { Anchor, AppShell, Avatar, Badge, Box, Button, Code, Group, Header, Menu, Modal, Navbar, NavLink, ScrollArea, Select, Space, Stack, Switch, Text, TextInput, Title } from "@mantine/core"
import Link from "next/link"
import type { ProjectServerSideProps } from "../pages/dashboard/project/[projectId]/settings"
import { modals } from "@mantine/modals"
import { useClipboard } from '@mantine/hooks';
import { useClipboard, useDisclosure } from '@mantine/hooks';
import { notifications } from "@mantine/notifications"
import { Project } from "@prisma/client"
import { ProjectService } from "../service/project.service"
import type { resolvedConfig } from "../utils.server"
import { useDisclosure } from '@mantine/hooks';
import { apiClient } from "../utils.client"
import { useForm } from "react-hook-form"
import { MainLayoutData } from "../service/viewData.service"
Expand Down Expand Up @@ -99,7 +89,7 @@ export function MainLayout(props: {
})

const onClickSaveUserSettings = async () => {
const data = userSettingsForm.getValues()
const data = userSettingsForm.getValues()
if (!validateEmail(data.notificationEmail)) {
notifications.show({
title: 'Invalid email',
Expand Down Expand Up @@ -227,7 +217,9 @@ export function MainLayout(props: {
<Group>
<Group>
<Title order={3} style={{ fontWeight: 'bold' }}>
Cusdis
<Anchor href="/">
Cusdis
</Anchor>
</Title>
<ProjectMenu />
</Group>
Expand All @@ -242,7 +234,7 @@ export function MainLayout(props: {
<Group spacing={4}>
<Button onClick={_ => {
openUserModal()
}} size="xs" rightIcon={<AiOutlineRight />} variant='subtle'>{props.session.user.name} {badge}</Button>
}} size="xs" rightIcon={<AiOutlineRight />} variant='subtle'>{props.session.user.name}</Button>
</Group>
</Group>
)
Expand Down Expand Up @@ -298,11 +290,11 @@ export function MainLayout(props: {
<Text weight={500} size="sm">Display name</Text>
<TextInput placeholder={props.userInfo.name} {...userSettingsForm.register("displayName")} size="sm" />
</Stack>
<Stack spacing={8}>
{/* <Stack spacing={8}>
<Text weight={500} size="sm">Subscription </Text>
<Text size="sm">Current plan: {badge}</Text>
<Anchor size="sm">Manage subscription</Anchor>
</Stack>
</Stack> */}
<Button loading={updateUserSettingsMutation.isLoading} onClick={onClickSaveUserSettings}>Save</Button>
<Button onClick={_ => signOut()} variant={'outline'} color='red'>
Logout
Expand Down
40 changes: 0 additions & 40 deletions components/Navbar.tsx
View file

This file was deleted.

5 changes: 2 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,14 @@
},
"prettier": "@egoist/prettier-config",
"dependencies": {
"@chakra-ui/icons": "^1.0.10",
"@chakra-ui/react": "^1.1.4",
"@emotion/react": "^11.10.4",
"@emotion/styled": "^11.0.0",
"@emotion/server": "^11.11.0",
"@hapi/boom": "^9.1.2",
"@mantine/core": "^6.0.16",
"@mantine/form": "^6.0.16",
"@mantine/hooks": "^6.0.16",
"@mantine/modals": "^6.0.16",
"@mantine/next": "^6.0.16",
"@mantine/notifications": "^6.0.16",
"@prisma/client": "^4.16.2",
"@sendgrid/mail": "^7.4.2",
Expand Down
1 change: 0 additions & 1 deletion pages/_app.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Provider } from 'next-auth/client'
import { ChakraProvider } from "@chakra-ui/react"
import { QueryClient, QueryClientProvider } from 'react-query'
import { MantineProvider } from '@mantine/core'
import { Notifications } from '@mantine/notifications';
Expand Down
2 changes: 1 addition & 1 deletion pages/error.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Text } from "@chakra-ui/layout"
import { Text } from '@mantine/core'

export enum ErrorCode {
INVALID_TOKEN = 'INVALID_TOKEN'
Expand Down
Loading

0 comments on commit d717211

Please sign in to comment.