Skip to content

Commit

Permalink
[#325]: Blog footer (#368)
Browse files Browse the repository at this point in the history
  • Loading branch information
Themezv authored Jun 28, 2023
1 parent 6fb2c69 commit 5221c8e
Show file tree
Hide file tree
Showing 13 changed files with 159 additions and 9 deletions.
10 changes: 6 additions & 4 deletions apps/blog/content/posts/what-is-memebattle.ru.mdx

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion apps/blog/src/app/[locale]/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { languages } from '../../i18n/i18n.settings'
import { useTranslation } from '../../i18n'
import { LanguageSwitcher } from '../../components/LanguageSwitcher'
import { generateFullUrl } from '../../utils/generateFullUrl'
import { Footer } from '../../components/Footer'

type RootLayoutParams = { locale: Language }

Expand Down Expand Up @@ -118,12 +119,14 @@ const archerusFeralFont = localFont({
export default function RootLayout({ children, params: { locale } }: { children: React.ReactNode; params: RootLayoutParams }) {
return (
<html lang={locale} dir={dir(locale)} className={`${gravityFont.variable} ${archerusFeralFont.variable}`}>
<body className="flex flex-col items-center">
<body className="flex flex-col items-center min-h-screen">
<header className="h-18 w-full bg-gray-600 flex items-center">
{/* @ts-expect-error React Server components */}
<LanguageSwitcher locale={locale} />
</header>
{children}
{/** @ts-expect-error React Server components */}
<Footer locale={locale} />
</body>
</html>
)
Expand Down
3 changes: 2 additions & 1 deletion apps/blog/src/app/[locale]/posts/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { Breadcrumbs } from '../../../components/Breadcrumbs'
import type { Language } from '../../../i18n/i18n.settings'
import { useTranslation } from '../../../i18n'
import { generateFullUrl } from '../../../utils/generateFullUrl'
import memebattleLogo from '../../../assets/memebattle-logo.svg'

export async function generateMetadata({ params }: { params: { locale: Language } }): Promise<Metadata> {
// useTranslation on server isn't react hook
Expand All @@ -17,7 +18,7 @@ export async function generateMetadata({ params }: { params: { locale: Language
url: generateFullUrl(`/${params.locale}/posts`),
description: t('description'),
title: t('title'),
images: [generateFullUrl('/memebattle-logo.svg')],
images: [generateFullUrl(memebattleLogo)],
},
}
}
Expand Down
File renamed without changes
36 changes: 36 additions & 0 deletions apps/blog/src/components/Footer/Footer.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import Image from 'next/image'

import gitHubLogo from './GitHub_Logo_White.png'
import type { Language } from '../../i18n/i18n.settings'
import { useTranslation } from '../../i18n'
import memebattleLogo from '../../assets/memebattle-logo.svg'

export async function Footer({ locale }: { locale: Language }) {
const { t } = await useTranslation(locale)

return (
<footer className="sm:h-32 mt-auto w-full pt-5">
<div className="bg-gray-600 grid grid-cols-1 grid-rows-3 sm:grid-cols-3 sm:grid-rows-1 h-full">
<div className="text-gray-200 p-5 text-center sm:text-left">
<span className="font-light text-xs">{t('footer.projects.title')}</span>
<ul className="text-sm font-bold list-disc list-inside">
<li>
<a href="https://mems.fun">{t('footer.projects.gameHub')}</a>
</li>
<li>
<a href="https://ligretto.app">{t('footer.projects.ligretto')}</a>
</li>
</ul>
</div>
<div className="flex flex-1 justify-center items-center h-full">
<a className="max-h-fit" href="https://github.com/MemeBattle/monorepo">
<Image width="150" alt="GitHub" src={gitHubLogo} />
</a>
</div>
<div className="flex sm:mr-5 flex-1 items-center h-full justify-self-center sm:justify-self-end justify-end">
<Image width="70" alt="MemeBattle logo" src={memebattleLogo} />
</div>
</div>
</footer>
)
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions apps/blog/src/components/Footer/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { Footer } from './Footer'
91 changes: 91 additions & 0 deletions apps/blog/src/components/InstagramPost/InstagramPost.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
import Script from 'next/script'

export function InstagramPost({ publicationId, description }: { publicationId: string; description: string }) {
return (
<>
<div
className="flex justify-center"
dangerouslySetInnerHTML={{
__html: `
<blockquote
class="instagram-media"
data-instgrm-captioned
data-instgrm-permalink="https://www.instagram.com/p/${publicationId}/?utm_source=ig_embed&amp;utm_campaign=loading"
data-instgrm-version="14"
style=" background:#FFF; border:0; border-radius:3px; box-shadow:0 0 1px 0 rgba(0,0,0,0.5),0 1px 10px 0 rgba(0,0,0,0.15); margin: 1px; max-width:540px; min-width:326px; padding:0; width:99.375%; width:-webkit-calc(100% - 2px); width:calc(100% - 2px);">
<div style="padding:16px;">
<a href="https://www.instagram.com/p/${publicationId}/?utm_source=ig_embed&amp;utm_campaign=loading"
style=" background:#FFFFFF; line-height:0; padding:0 0; text-align:center; text-decoration:none; width:100%;"
target="_blank">
<div style=" display: flex; flex-direction: row; align-items: center;">
<div
style="background-color: #F4F4F4; border-radius: 50%; flex-grow: 0; height: 40px; margin-right: 14px; width: 40px;"></div>
<div style="display: flex; flex-direction: column; flex-grow: 1; justify-content: center;">
<div
style=" background-color: #F4F4F4; border-radius: 4px; flex-grow: 0; height: 14px; margin-bottom: 6px; width: 100px;"></div>
<div style=" background-color: #F4F4F4; border-radius: 4px; flex-grow: 0; height: 14px; width: 60px;"></div>
</div>
</div>
<div style="padding: 19% 0;"></div>
<div style="display:block; height:50px; margin:0 auto 12px; width:50px;">
<svg width="50px" height="50px" viewBox="0 0 60 60" version="1.1" xmlns="https://www.w3.org/2000/svg"
xmlns:xlink="https://www.w3.org/1999/xlink">
<g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g transform="translate(-511.000000, -20.000000)" fill="#000000">
<g>
<path
d="M556.869,30.41 C554.814,30.41 553.148,32.076 553.148,34.131 C553.148,36.186 554.814,37.852 556.869,37.852 C558.924,37.852 560.59,36.186 560.59,34.131 C560.59,32.076 558.924,30.41 556.869,30.41 M541,60.657 C535.114,60.657 530.342,55.887 530.342,50 C530.342,44.114 535.114,39.342 541,39.342 C546.887,39.342 551.658,44.114 551.658,50 C551.658,55.887 546.887,60.657 541,60.657 M541,33.886 C532.1,33.886 524.886,41.1 524.886,50 C524.886,58.899 532.1,66.113 541,66.113 C549.9,66.113 557.115,58.899 557.115,50 C557.115,41.1 549.9,33.886 541,33.886 M565.378,62.101 C565.244,65.022 564.756,66.606 564.346,67.663 C563.803,69.06 563.154,70.057 562.106,71.106 C561.058,72.155 560.06,72.803 558.662,73.347 C557.607,73.757 556.021,74.244 553.102,74.378 C549.944,74.521 548.997,74.552 541,74.552 C533.003,74.552 532.056,74.521 528.898,74.378 C525.979,74.244 524.393,73.757 523.338,73.347 C521.94,72.803 520.942,72.155 519.894,71.106 C518.846,70.057 518.197,69.06 517.654,67.663 C517.244,66.606 516.755,65.022 516.623,62.101 C516.479,58.943 516.448,57.996 516.448,50 C516.448,42.003 516.479,41.056 516.623,37.899 C516.755,34.978 517.244,33.391 517.654,32.338 C518.197,30.938 518.846,29.942 519.894,28.894 C520.942,27.846 521.94,27.196 523.338,26.654 C524.393,26.244 525.979,25.756 528.898,25.623 C532.057,25.479 533.004,25.448 541,25.448 C548.997,25.448 549.943,25.479 553.102,25.623 C556.021,25.756 557.607,26.244 558.662,26.654 C560.06,27.196 561.058,27.846 562.106,28.894 C563.154,29.942 563.803,30.938 564.346,32.338 C564.756,33.391 565.244,34.978 565.378,37.899 C565.522,41.056 565.552,42.003 565.552,50 C565.552,57.996 565.522,58.943 565.378,62.101 M570.82,37.631 C570.674,34.438 570.167,32.258 569.425,30.349 C568.659,28.377 567.633,26.702 565.965,25.035 C564.297,23.368 562.623,22.342 560.652,21.575 C558.743,20.834 556.562,20.326 553.369,20.18 C550.169,20.033 549.148,20 541,20 C532.853,20 531.831,20.033 528.631,20.18 C525.438,20.326 523.257,20.834 521.349,21.575 C519.376,22.342 517.703,23.368 516.035,25.035 C514.368,26.702 513.342,28.377 512.574,30.349 C511.834,32.258 511.326,34.438 511.181,37.631 C511.035,40.831 511,41.851 511,50 C511,58.147 511.035,59.17 511.181,62.369 C511.326,65.562 511.834,67.743 512.574,69.651 C513.342,71.625 514.368,73.296 516.035,74.965 C517.703,76.634 519.376,77.658 521.349,78.425 C523.257,79.167 525.438,79.673 528.631,79.82 C531.831,79.965 532.853,80.001 541,80.001 C549.148,80.001 550.169,79.965 553.369,79.82 C556.562,79.673 558.743,79.167 560.652,78.425 C562.623,77.658 564.297,76.634 565.965,74.965 C567.633,73.296 568.659,71.625 569.425,69.651 C570.167,67.743 570.674,65.562 570.82,62.369 C570.966,59.17 571,58.147 571,50 C571,41.851 570.966,40.831 570.82,37.631"></path>
</g>
</g>
</g>
</svg>
</div>
<div style="padding-top: 8px;">
<div
style=" color:#3897f0; font-family:Arial,sans-serif; font-size:14px; font-style:normal; font-weight:550; line-height:18px;">
View this post on Instagram
</div>
</div>
<div style="padding: 12.5% 0;"></div>
<div style="display: flex; flex-direction: row; margin-bottom: 14px; align-items: center;">
<div>
<div
style="background-color: #F4F4F4; border-radius: 50%; height: 12.5px; width: 12.5px; transform: translateX(0px) translateY(7px);"></div>
<div
style="background-color: #F4F4F4; height: 12.5px; transform: rotate(-45deg) translateX(3px) translateY(1px); width: 12.5px; flex-grow: 0; margin-right: 14px; margin-left: 2px;"></div>
<div
style="background-color: #F4F4F4; border-radius: 50%; height: 12.5px; width: 12.5px; transform: translateX(9px) translateY(-18px);"></div>
</div>
<div style="margin-left: 8px;">
<div style=" background-color: #F4F4F4; border-radius: 50%; flex-grow: 0; height: 20px; width: 20px;"></div>
<div
style=" width: 0; height: 0; border-top: 2px solid transparent; border-left: 6px solid #f4f4f4; border-bottom: 2px solid transparent; transform: translateX(16px) translateY(-4px) rotate(30deg)"></div>
</div>
<div style="margin-left: auto;">
<div
style=" width: 0px; border-top: 8px solid #F4F4F4; border-right: 8px solid transparent; transform: translateY(16px);"></div>
<div
style=" background-color: #F4F4F4; flex-grow: 0; height: 12px; width: 16px; transform: translateY(-4px);"></div>
<div
style=" width: 0; height: 0; border-top: 8px solid #F4F4F4; border-left: 8px solid transparent; transform: translateY(-4px) translateX(8px);"></div>
</div>
</div>
<div style="display: flex; flex-direction: column; flex-grow: 1; justify-content: center; margin-bottom: 24px;">
<div
style=" background-color: #F4F4F4; border-radius: 4px; flex-grow: 0; height: 14px; margin-bottom: 6px; width: 224px;"></div>
<div style=" background-color: #F4F4F4; border-radius: 4px; flex-grow: 0; height: 14px; width: 144px;"></div>
</div>
</a>
<p
style=" color:#c9c8cd; font-family:Arial,sans-serif; font-size:14px; line-height:17px; margin-bottom:0; margin-top:8px; overflow:hidden; padding:8px 0 7px; text-align:center; text-overflow:ellipsis; white-space:nowrap;">
<a href="https://www.instagram.com/p/${publicationId}/?utm_source=ig_embed&amp;utm_campaign=loading"
style=" color:#c9c8cd; font-family:Arial,sans-serif; font-size:14px; font-style:normal; font-weight:normal; line-height:17px; text-decoration:none;"
target="_blank">${description}</a></p></div>
</blockquote>
`,
}}
/>
<Script src="//www.instagram.com/embed.js" />
</>
)
}
1 change: 1 addition & 0 deletions apps/blog/src/components/InstagramPost/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export { InstagramPost, InstagramPost as default } from './InstagramPost'
3 changes: 2 additions & 1 deletion apps/blog/src/components/Mdx/Mdx.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import Image from 'next/image'
import { useMDXComponent } from 'next-contentlayer/hooks'
import InstagramPost from '../InstagramPost'

interface MdxProps {
code: string
Expand All @@ -10,7 +11,7 @@ export function Mdx({ code }: MdxProps) {

return (
<article className="prose lg:prose-xl">
<Component components={{ Image }} />
<Component components={{ Image, InstagramPost }} />
</article>
)
}
4 changes: 2 additions & 2 deletions apps/blog/src/components/SearchInput/SearchInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ export function SearchInput({ placeholder }: SearchInputProps) {
onChange={handleSearchChange}
type="text"
name="search"
className="block w-full rounded-lg border-0 py-5 pl-6 pr-10 text-gray-900 ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6"
className="block w-full rounded-lg border-0 py-5 pl-3 pr-10 text-gray-900 ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6 sm:pl-6 sm:pr-12"
placeholder={placeholder}
defaultValue={searchParams.get('search') || undefined}
/>
<div className="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-3">
<div className="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-3 sm:pr-6">
<span className="text-gray-500 sm:text-sm">
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="none">
<path stroke="currentColor" d="M14.443 14.444 19 19M16.75 8.875a7.875 7.875 0 1 1-15.75 0 7.875 7.875 0 0 1 15.75 0Z" />
Expand Down
7 changes: 7 additions & 0 deletions apps/blog/src/i18n/locales/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,12 @@
"header": {
"ru": "Русский",
"en": "English"
},
"footer": {
"projects": {
"title": "Our projects:",
"gameHub": "GameHub",
"ligretto": "Ligretto"
}
}
}
7 changes: 7 additions & 0 deletions apps/blog/src/i18n/locales/ru/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,12 @@
"header": {
"ru": "Русский",
"en": "English"
},
"footer": {
"projects": {
"title": "Наши проекты:",
"gameHub": "GameHub",
"ligretto": "Ligretto"
}
}
}

1 comment on commit 5221c8e

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coverage report for apps/ligretto-gameplay-backend

St.
Category Percentage Covered / Total
🔴 Statements 48.63% 373/767
🔴 Branches 24.53% 26/106
🔴 Functions 26.07% 55/211
🔴 Lines 46.27% 310/670

Test suite run success

12 tests passing in 1 suite.

Report generated by 🧪jest coverage report action from 5221c8e

Please sign in to comment.