Skip to content

Commit

Permalink
merge with default
Browse files Browse the repository at this point in the history
  • Loading branch information
Carles-Piqueras committed Oct 21, 2023
2 parents e408205 + c895495 commit 6b32458
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 9 deletions.
15 changes: 15 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
root = true

[*]
insert_final_newline = true
charset = utf-8
trim_trailing_whitespace = true
end_of_line = lf

[*.{js,ts,tsx,jsx,css,scss,html,json,yml,yaml,md}]
indent_style = space
indent_size = 2

[*.md]
trim_trailing_whitespace = false
max_line_length = off
27 changes: 20 additions & 7 deletions components/blog/blog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { Hero } from './sections/hero';
import Comments from '../comments';

import './blog.scss'; // TODO: This styles will be global even only imported here. We should
import Link from 'next/link';

type Props = {
blogPostItem: BlogPostItem;
Expand All @@ -21,7 +22,6 @@ type Props = {
export function Blog({ blogPostItem, dictionary, lang }: Props) {
const host = `https://gironajs.com`; // TODO: Put host value on environment variables
const getFullHref = (post: BlogPostItem) => `${host}/${post.urlPath}`;

return (
<div>
<Hero {...blogPostItem.data} />
Expand All @@ -34,13 +34,26 @@ export function Blog({ blogPostItem, dictionary, lang }: Props) {
</div>

<hr></hr>
<div className="flex items-center justify-between my-4">
<span>{dictionary.blog.sharePost}</span>
<SocialShareButtons
url={getFullHref(blogPostItem)}
title={blogPostItem.data.title}
/>

<div className="my-4">
<p>
{dictionary.blog.edit_github}
<Link
className="underline underline-offset-4"
href={`https://github.com/gironajs/gironajs.com/tree/main/blog/${lang}/${blogPostItem.id}_${blogPostItem.filePath}`}
>
{dictionary.blog.edit_github_link}
</Link>
</p>
<div className="flex items-center justify-between my-4">
<span>{dictionary.blog.sharePost}</span>
<SocialShareButtons
url={getFullHref(blogPostItem)}
title={blogPostItem.data.title}
/>
</div>
</div>

<Comments lang={lang} />
</div>
</div>
Expand Down
8 changes: 8 additions & 0 deletions config/member.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,14 @@ const members: Member[] = [
company: 'Nexus Geographics',
linkedin: 'carles-piqueras-carreras',
},
{
github: 'biels',
name: 'Biel Simon',
role: 'Senior Javascipt Engineer',
company: 'UserTesting',
twitter: 'biel_simon',
linkedin: 'biel-simon-16554760',
},
];

const membersDictionary: Dictionary<Member> = members.reduce(
Expand Down
4 changes: 3 additions & 1 deletion dictionaries/ca.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@
"sharePost": "T'ha agradat el post? Si us plau, comparteix-lo",
"title": "Blog",
"subtitle_1": "Aquí pots trobar totes les entrades del blog publicades per GironaJS",
"subtitle_2": "Qualsevol contribució és benvinguda, així que si vols escriure una entrada, si us plau, contacta'ns!"
"subtitle_2": "Qualsevol contribució és benvinguda, així que si vols escriure una entrada, si us plau, contacta'ns!",
"edit_github": "Has trobat una errada? ",
"edit_github_link": "Edita-la al Github"
},
"map": {
"title": "GironaJS - Mapa 3D de la ciutat",
Expand Down
4 changes: 3 additions & 1 deletion dictionaries/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@
"sharePost": "Did you like the post? Please share it",
"title": "Blog posts",
"subtitle_1": "Here you can find all the blog posts published by GironaJS",
"subtitle_2": "Any contribution is welcome, so if you want to write a post, please contact us!"
"subtitle_2": "Any contribution is welcome, so if you want to write a post, please contact us!",
"edit_github": "Have you found a mistake? ",
"edit_github_link": "Edit it on Github!"
},
"map": {
"title": "GironaJS - 3D City Map",
Expand Down

0 comments on commit 6b32458

Please sign in to comment.