Skip to content

Added changes from aug 11 discussion #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gavindizon wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added changes from aug 11 discussion #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffd02a3
Added changes from the discussion last Aug 13
gavindizon Aug 15, 2021
8aeccd5
Fixed slug on recap-manila
gavindizon Aug 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25,979 changes: 25,965 additions & 14 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"bootstrap-utilities": "^4.1.3",
"classnames": "^2.2.6",
"dangerously-set-html-content": "^1.0.8",
"dateformat": "^4.5.1",
"gatsby": "^2.26.1",
"gatsby-image": "^2.5.0",
"gatsby-plugin-image": "^1.8.0",
Expand All @@ -37,7 +38,8 @@
"react-helmet": "^6.1.0",
"react-lazy-load-image-component": "^1.5.1",
"react-responsive": "^8.1.1",
"reactstrap": "^8.7.1"
"reactstrap": "^8.7.1",
"reading-time": "^1.4.0"
},
"devDependencies": {
"prettier": "2.1.2"
Expand Down
59 changes: 32 additions & 27 deletions src/assets/sass/post.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,66 +2,71 @@
text-align: center;
}

.blog-flex-container{
.blog-flex-container {
display: flex;

}
.author{
&-card{
.author {
&-card {
width: 210px;
height: 100px;

.override-button-12{
.MuiButton-label{
font-size: .75rem !important;
.override-button-12 {
.MuiButton-label {
font-size: 0.75rem !important;
}
}

}

&-info{
display:flex;
&-info {
display: flex;
align-items: center;
}

&-avatar{
&-avatar {
width: 64px;
height: 64px;
margin-right: .8rem;
margin-right: 0.8rem;
border-radius: 100%;
background-color: #c4c4c4;
}

&-names{
h5{
&-names {
h5 {
font-size: 1rem;
}
p{
p {
line-height: 1.2rem;
font-size: 0.8rem;
}
}
&-membership{
p{
&-membership {
p {
font-size: 1rem;
}
}
}

.blog-post{
p{
color: rgba($color: #000000, $alpha: .6);
.blog-post {
p {
color: rgba($color: #000000, $alpha: 0.6);
}
&-content{
blockquote{
&-content {
blockquote {
max-width: unset !important;
margin: 2.0rem 0rem;
margin: 2rem 0rem;
padding: 1rem;
}
p {
margin: 1rem 0;
}
h2 {
margin-top: 4rem;
margin-bottom: 1rem;
}
img{
img {
max-width: 80% !important;
display: block !important;
margin: 2.0rem auto !important;

margin: 2rem auto !important;
}
}
}
}
83 changes: 40 additions & 43 deletions src/components/BlogItem/BlogItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,53 +2,50 @@ import React from "react";
import { Box } from "@material-ui/core";
import { Link } from "gatsby";
import { Button } from "../Components";
import dateFormat from "dateformat";
import { NavigateNextRounded } from "@material-ui/icons";

const BlogItem = ({ blog }) => {
const { date, slug, cover, title } = blog.node.frontmatter;
const description = blog.node.html.replace(/(<([^>]+)>)/gi, "");
return (
<Link to="/">
<Box p={1} borderRadius={8} className="blog_item">
<Box
component="div"
display="block"
height={200}
borderRadius={4}
className="bg-light"
overflow="hidden"
mb={2}
>
<img src={cover} className="featured_image" alt={title} />
</Box>
<Box p={1}>
<h3 className="margin-bottom-8 font-size-18 line-height-24 blog_title">
{title}
</h3>
<p className="text-gray margin-bottom-16 blog_description font-size-14 line-height-24 two-liner">
{description}
</p>
<Box component="div" className="blog_author" mb={4}>
<img
src="https://miro.medium.com/max/700/0*B_owcQpugXNQbbVu"
alt="Pauline Baterna"
className="profile_photo"
/>
<Box component="div">
<h4 className="text-primary font-size-14 font-weight-normal">
Pauline Baterna
</h4>
<small className="text-gray">{date}</small>
const { date, slug, cover, title } = blog.node.frontmatter;
const description = blog.node.html.replace(/(<([^>]+)>)/gi, "");
return (
<Link to={slug}>
<Box p={1} borderRadius={8} className="blog_item">
<Box
component="div"
display="block"
height={200}
borderRadius={4}
className="bg-light"
overflow="hidden"
mb={2}
>
<img src={cover} className="featured_image" alt={title} />
</Box>
<Box p={1}>
<h3 className="margin-bottom-8 font-size-18 line-height-24 blog_title">{title}</h3>
<p className="text-gray margin-bottom-16 blog_description font-size-14 line-height-24 two-liner">
{description}
</p>
<Box component="div" className="blog_author" mb={4}>
<img
src="https://miro.medium.com/max/700/0*B_owcQpugXNQbbVu"
alt="Pauline Baterna"
className="profile_photo"
/>
<Box component="div">
<h4 className="text-primary font-size-14 font-weight-normal">Pauline Baterna</h4>
<small className="text-gray">{dateFormat(date, "mmm d, yyyy")}</small>
</Box>
</Box>
<Button variant="link" href={slug} className="blog_cta">
<span className="text-uppercase">Read more</span>
<NavigateNextRounded />
</Button>
</Box>
</Box>
</Box>
<Button variant="link" href={slug} className="blog_cta">
<span className="text-uppercase">Read more</span>
<NavigateNextRounded />
</Button>
</Box>
</Box>
</Link>
);
</Link>
);
};

export default BlogItem;
99 changes: 42 additions & 57 deletions src/components/EventItem/EventItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,67 +2,52 @@ import React from "react";
import { Box } from "@material-ui/core";
import { Button } from "../Components";
import { Link } from "gatsby";
import {
NavigateNextRounded,
PinDropRounded,
EventRounded,
} from "@material-ui/icons";
import dateFormat from "dateformat";
import { NavigateNextRounded, PinDropRounded, EventRounded } from "@material-ui/icons";

const EventItem = ({ event }) => {
const { title, time, date, venue, cover } = event.node.frontmatter;
const { title, time, date, venue, cover, slug } = event.node.frontmatter;

return (
<Link to="/">
<Box p={1} borderRadius={8} className="event_item">
<Box
component="div"
display="block"
height={200}
borderRadius={4}
className="bg-light"
overflow="hidden"
mb={2}
>
<img src={cover} className="featured_image" alt={title} />
</Box>
<Box p={1}>
<h3 className="margin-bottom-8 font-size-18 line-height-24 event_title">
{title}
</h3>
<Box component="div" mb={4} className="event_details">
<Box
component="p"
display="flex"
alignItems="center"
className="text-gray"
>
<EventRounded className="mr-2" />
<Box component="span">
<span className="font-size-14">
{date} ({time})
</span>
</Box>
return (
<Link to={slug}>
<Box p={1} borderRadius={8} className="event_item">
<Box
component="div"
display="block"
height={200}
borderRadius={4}
className="bg-light"
overflow="hidden"
mb={2}
>
<img src={cover} className="featured_image" alt={title} />
</Box>
<Box p={1}>
<h3 className="margin-bottom-8 font-size-18 line-height-24 event_title">{title}</h3>
<Box component="div" mb={4} className="event_details">
<Box component="p" display="flex" alignItems="center" className="text-gray">
<EventRounded className="mr-2" />
<Box component="span">
<span className="font-size-14">
{dateFormat(date, "mmm dd, yyyy")} ({time})
</span>
</Box>
</Box>
<Box component="p" display="flex" alignItems="center" className="text-gray">
<PinDropRounded className="mr-2" />
<Box component="span">
<span className="font-size-14">{venue}</span>
</Box>
</Box>
</Box>
<Button variant="link" href={slug}>
<span className="text-uppercase">Event recap</span>
<NavigateNextRounded />
</Button>
</Box>
</Box>
<Box
component="p"
display="flex"
alignItems="center"
className="text-gray"
>
<PinDropRounded className="mr-2" />
<Box component="span">
<span className="font-size-14">{venue}</span>
</Box>
</Box>
</Box>
<Button variant="link" href={null}>
<span className="text-uppercase">Event recap</span>
<NavigateNextRounded />
</Button>
</Box>
</Box>
</Link>
);
</Link>
);
};

export default EventItem;
Loading