From 0b0cb04c1f1411a043e9248abe85929f1defdffb Mon Sep 17 00:00:00 2001 From: jomefavourite Date: Sun, 30 Jul 2023 23:30:54 +0100 Subject: [PATCH 1/2] fix featured blog mobile --- src/components/BlogCard.tsx | 17 ++++++++++++----- src/components/ReadLikely.tsx | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/components/BlogCard.tsx b/src/components/BlogCard.tsx index c72b324..1d6decf 100644 --- a/src/components/BlogCard.tsx +++ b/src/components/BlogCard.tsx @@ -33,11 +33,18 @@ function BlogCard({ featured }: { featured?: boolean }) { )} -

- Starting out building a platform with little to no experience is a - daunting task that not everyone has the courage to do...Starting out - building a platform with little to no experience -

+ {featured ? ( +

+ Starting out building a platform with little to no experience is a + daunting task that not everyone has the courage to do...Starting + out building a platform with little to no experience +

+ ) : ( +

+ Starting out building a platform with little to no experience is a + daunting task that not everyone has the courage to do... +

+ )}

Devgenix

diff --git a/src/components/ReadLikely.tsx b/src/components/ReadLikely.tsx index 44fb687..e97d1b0 100644 --- a/src/components/ReadLikely.tsx +++ b/src/components/ReadLikely.tsx @@ -11,7 +11,7 @@ function ReadLikely() { -
+
From e247a54353e3942566fbb12db64edd50484b852d Mon Sep 17 00:00:00 2001 From: jomefavourite Date: Sat, 5 Aug 2023 19:32:06 +0100 Subject: [PATCH 2/2] blog layout --- package-lock.json | 9 ++++++ package.json | 1 + src/app/blog/[slug]/page.tsx | 8 +---- src/app/blog/page.tsx | 4 --- src/app/blog/tags/page.tsx | 56 +++++++++++++++++++++++++++++++++++ src/app/layout.tsx | 4 +++ src/components/Footer.tsx | 15 ++++++---- src/components/Navigation.tsx | 7 +++-- src/components/ReadMore.tsx | 18 ++++++++--- src/components/Tags.tsx | 42 ++++++++++++++++++++------ src/images/search-icon.svg | 6 ++++ src/images/tab-icon.svg | 6 ++++ tailwind.config.js | 2 +- 13 files changed, 144 insertions(+), 34 deletions(-) create mode 100644 src/app/blog/tags/page.tsx create mode 100644 src/images/search-icon.svg create mode 100644 src/images/tab-icon.svg diff --git a/package-lock.json b/package-lock.json index 548753d..a6f6448 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,7 @@ "name": "my-app", "version": "0.1.0", "dependencies": { + "@tailwindcss/container-queries": "^0.1.1", "@types/node": "20.4.4", "@types/react": "18.2.16", "@types/react-dom": "18.2.7", @@ -2646,6 +2647,14 @@ "tslib": "^2.4.0" } }, + "node_modules/@tailwindcss/container-queries": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@tailwindcss/container-queries/-/container-queries-0.1.1.tgz", + "integrity": "sha512-p18dswChx6WnTSaJCSGx6lTmrGzNNvm2FtXmiO6AuA1V4U5REyoqwmT6kgAsIMdjo07QdAfYXHJ4hnMtfHzWgA==", + "peerDependencies": { + "tailwindcss": ">=3.2.0" + } + }, "node_modules/@trysound/sax": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz", diff --git a/package.json b/package.json index 01e190e..fc6e842 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "lint": "next lint" }, "dependencies": { + "@tailwindcss/container-queries": "^0.1.1", "@types/node": "20.4.4", "@types/react": "18.2.16", "@types/react-dom": "18.2.7", diff --git a/src/app/blog/[slug]/page.tsx b/src/app/blog/[slug]/page.tsx index 96a5119..ae3d103 100644 --- a/src/app/blog/[slug]/page.tsx +++ b/src/app/blog/[slug]/page.tsx @@ -1,6 +1,4 @@ import CommentComp from '@/components/CommentComp'; -import Footer from '@/components/Footer'; -import Navigation from '@/components/Navigation'; import ReadLikely from '@/components/ReadLikely'; import ShareLink from '@/components/ShareLink'; import { TypographyH1, TypographyH2 } from '@/components/Typography'; @@ -9,8 +7,6 @@ import Image from 'next/image'; export default function BlogDetails({ params }: { params: { slug: string } }) { return ( <> - -
@@ -94,10 +90,8 @@ export default function BlogDetails({ params }: { params: { slug: string } }) { - + {/* */}
- -
); } diff --git a/src/app/blog/page.tsx b/src/app/blog/page.tsx index cc3314c..0ceabc9 100644 --- a/src/app/blog/page.tsx +++ b/src/app/blog/page.tsx @@ -1,5 +1,3 @@ -import Footer from '@/components/Footer'; -import Navigation from '@/components/Navigation'; import ReadLikely from '@/components/ReadLikely'; import ReadMore from '@/components/ReadMore'; import { TypographyH1 } from '@/components/Typography'; @@ -13,7 +11,6 @@ export const metadata: Metadata = { function BlogPage() { return ( <> -
The Faraday Blog @@ -23,7 +20,6 @@ function BlogPage() {
-
); } diff --git a/src/app/blog/tags/page.tsx b/src/app/blog/tags/page.tsx new file mode 100644 index 0000000..6217303 --- /dev/null +++ b/src/app/blog/tags/page.tsx @@ -0,0 +1,56 @@ +import React from 'react'; +import { TypographyH1, TypographyH3 } from '@/components/Typography'; +import BlogCard from '@/components/BlogCard'; +import Tags from '@/components/Tags'; +import SearchIcon from '@/images/search-icon.svg'; +import { Metadata } from 'next'; + +export const metadata: Metadata = { + title: 'Faraday - Tags', +}; + +function TagPage() { + return ( + <> +
+ + The Faraday Blog + + +
+
+ Tech + +
+ + + + + + +
+
+ +
+
+ + +
+ + +
+
+
+ + ); +} + +export default TagPage; diff --git a/src/app/layout.tsx b/src/app/layout.tsx index c7ac080..c8a2168 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -1,6 +1,8 @@ import React from 'react'; import '@/styles/globals.css'; import { Roboto } from 'next/font/google'; +import Navigation from '@/components/Navigation'; +import Footer from '@/components/Footer'; const roboto = Roboto({ subsets: ['latin'], @@ -14,7 +16,9 @@ const RootLayout = ({ children }: React.PropsWithChildren) => { + {children} +
); diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx index cd64656..7f79855 100644 --- a/src/components/Footer.tsx +++ b/src/components/Footer.tsx @@ -24,18 +24,18 @@ function Footer() {
  • Sign up
    • - {/*
  • - Download app -
    • */} +
  • + Download app +
    • Company
    @@ -56,6 +56,9 @@ function Footer() {
  • Gallery
    • +
  • + Social impact +
    • {/*
  • Social impact
    • */} diff --git a/src/components/Navigation.tsx b/src/components/Navigation.tsx index 10aac4b..2d4d5ba 100644 --- a/src/components/Navigation.tsx +++ b/src/components/Navigation.tsx @@ -26,7 +26,7 @@ const links = [ export default function Navigation() { const [hamClicked, setHamClicked] = useState(false); return ( -