diff --git a/.gitignore b/.gitignore index e336ab1..2306282 100644 --- a/.gitignore +++ b/.gitignore @@ -37,12 +37,11 @@ yarn-error.log* *.tsbuildinfo next-env.d.ts -# http requests +# HTTP playground *.http -# uploaded images -public/uploads - # vscode .vscode +/cloudinary-images + diff --git a/src/components/Account/UserAvatar.tsx b/src/components/Account/UserAvatar.tsx index 949ed03..385082d 100644 --- a/src/components/Account/UserAvatar.tsx +++ b/src/components/Account/UserAvatar.tsx @@ -2,6 +2,7 @@ import { FC } from 'react'; import Image from 'next/image'; import { z } from 'zod'; import GetUserSchema from '@/services/User/schema/GetUserSchema'; +import { FaUser } from 'react-icons/fa'; interface UserAvatarProps { user: { @@ -13,13 +14,23 @@ interface UserAvatarProps { const UserAvatar: FC = ({ user }) => { const { userAvatar } = user; - return !userAvatar ? null : ( + return !userAvatar ? ( +
+ + + +
+ ) : ( user avatar ); }; diff --git a/src/components/BeerBreweryComments/CommentCardBody.tsx b/src/components/BeerBreweryComments/CommentCardBody.tsx index f4887dc..bb4f643 100644 --- a/src/components/BeerBreweryComments/CommentCardBody.tsx +++ b/src/components/BeerBreweryComments/CommentCardBody.tsx @@ -31,7 +31,7 @@ const CommentCardBody: FC = ({ return (
-
+
diff --git a/src/pages/404.tsx b/src/pages/404.tsx index 6584b01..a83cc5c 100644 --- a/src/pages/404.tsx +++ b/src/pages/404.tsx @@ -1,5 +1,3 @@ -// create a 404 next js page using tailwind - import { NextPage } from 'next'; import Head from 'next/head'; diff --git a/src/pages/account/index.tsx b/src/pages/account/index.tsx index f5394f8..4d9405f 100644 --- a/src/pages/account/index.tsx +++ b/src/pages/account/index.tsx @@ -35,7 +35,7 @@ const AccountPage: NextPage = () => {
-
+
diff --git a/src/pages/breweries/index.tsx b/src/pages/breweries/index.tsx index f9aa78a..967de40 100644 --- a/src/pages/breweries/index.tsx +++ b/src/pages/breweries/index.tsx @@ -8,7 +8,7 @@ import { NextPage } from 'next'; import Head from 'next/head'; import { useContext, MutableRefObject, useRef } from 'react'; import Link from 'next/link'; -import { FaPlus, FaArrowUp } from 'react-icons/fa'; +import { FaPlus, FaArrowUp, FaMap } from 'react-icons/fa'; import { useInView } from 'react-intersection-observer'; import { z } from 'zod'; @@ -51,25 +51,24 @@ const BreweryPage: NextPage = () => {

The Biergarten App

Breweries

-
- +
+ {!!user && ( +
- View map + + + +
+ )} +
+ +
- {!!user && ( -
- - - -
- )}
{!!breweryPosts.length && !isLoading && ( diff --git a/src/pages/breweries/map.tsx b/src/pages/breweries/map.tsx index 8ce572a..61b0c20 100644 --- a/src/pages/breweries/map.tsx +++ b/src/pages/breweries/map.tsx @@ -34,7 +34,7 @@ const BreweryMapPage: NextPage = ({ token }) => { const mapStyles: MapStyles = { light: 'mapbox://styles/mapbox/light-v10', - dark: 'mapbox://styles/mapbox/dark-v11', + dark: 'mapbox://styles/mapbox/dark-v10', }; const pins = useMemo( diff --git a/src/prisma/seed/util/imageUrls.ts b/src/prisma/seed/util/imageUrls.ts index 8029245..2325765 100644 --- a/src/prisma/seed/util/imageUrls.ts +++ b/src/prisma/seed/util/imageUrls.ts @@ -1,9 +1,13 @@ const imageUrls = [ - 'https://res.cloudinary.com/dxie9b7na/image/upload/v1683482214/cld-sample.jpg', - 'https://res.cloudinary.com/dxie9b7na/image/upload/v1683482214/cld-sample-2.jpg', - 'https://res.cloudinary.com/dxie9b7na/image/upload/v1683482214/cld-sample-3.jpg', - 'https://res.cloudinary.com/dxie9b7na/image/upload/v1683482214/cld-sample-4.jpg', - 'https://res.cloudinary.com/dxie9b7na/image/upload/v1683482214/cld-sample-5.jpg', + 'https://res.cloudinary.com/dxie9b7na/image/upload/v1701056802/cloudinary-images/pexels-brett-sayles-1551944_era4te.jpg', + 'https://res.cloudinary.com/dxie9b7na/image/upload/v1701056801/cloudinary-images/pexels-ketut-subiyanto-5055809_fwkfoj.jpg', + 'https://res.cloudinary.com/dxie9b7na/image/upload/v1701056801/cloudinary-images/pexels-cottonbro-studio-5537954_zsxs7n.jpg', + 'https://res.cloudinary.com/dxie9b7na/image/upload/v1701056800/cloudinary-images/pexels-tembela-bohle-1089931_f7jcer.jpg', + 'https://res.cloudinary.com/dxie9b7na/image/upload/v1701056798/cloudinary-images/pexels-tembela-bohle-1089930_yzfjlv.jpg', + 'https://res.cloudinary.com/dxie9b7na/image/upload/v1701056797/cloudinary-images/pexels-cottonbro-studio-5529918_e0jlle.jpg', + 'https://res.cloudinary.com/dxie9b7na/image/upload/v1701056797/cloudinary-images/pexels-casalfilmsestudio-2076748_xymlox.jpg', + 'https://res.cloudinary.com/dxie9b7na/image/upload/v1701056795/cloudinary-images/pexels-elevate-3009770_simouh.jpg', + 'https://res.cloudinary.com/dxie9b7na/image/upload/v1701056793/cloudinary-images/pexels-elevate-1267700_jrno3s.jpg', ] as const; export default imageUrls; diff --git a/tailwind.config.js b/tailwind.config.js index 868e468..a48705e 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -12,12 +12,12 @@ const myThemes = { warning: 'hsl(50, 98%, 50%)', 'primary-content': 'hsl(0, 0%, 98%)', 'error-content': 'hsl(0, 0%, 98%)', - 'base-100': 'hsl(227, 20%, 10%)', - 'base-200': 'hsl(227, 20%, 8%)', - 'base-300': 'hsl(227, 20%, 1%)', + 'base-100': 'hsl(227, 20%, 20%)', + 'base-200': 'hsl(227, 20%, 13%)', + 'base-300': 'hsl(227, 20%, 10%)', }, light: { - primary: 'hsl(180, 15%, 60%)', + primary: 'hsl(180, 15%, 70%)', secondary: 'hsl(21, 54%, 83%)', error: 'hsl(4, 87%, 74%)', accent: 'hsl(93, 27%, 73%)',