Skip to content

Dev #17

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

Merged
merged 3 commits into from
Sep 1, 2021
Merged

Dev #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5475f98
add seo to homepage
julsh21 Sep 1, 2021
3119ff7
Merge branch 'dev' of https://github.com/bitlogic/bitlogic.io into yu…
julsh21 Sep 1, 2021
4072d4f
Merge pull request #16 from bitlogic/yuli-fix-bugs
yolit-bitlogic Sep 1, 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
3 changes: 0 additions & 3 deletions src/components/BitwayPage/BitwayContainer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
grid-area: bitway-even;
}

.bitway-desktop {
display: grid;
}
.bitway-mobile {
display: none;
}
Expand Down
14 changes: 8 additions & 6 deletions src/components/BitwayPage/Paragraph/Paragraph.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
@import "../../../styles/global.scss";
.bitway-paragraph {
margin-bottom: 20px;
& p {
font-family: $primary-font;
font-size: 25px;
font-size: 20px;
font-style: normal;
font-weight: 400;
line-height: 36px;
line-height: 30px;
letter-spacing: 0em;
text-align: left;
}
& > div > p {
font-family: $primary-font;
font-size: 25px;
font-size: 20px;
font-style: normal;
font-weight: 400;
line-height: 36px;
line-height: 30px;
letter-spacing: 0em;
text-align: left;
padding: 0 80px 20px;
& * {
font-size: 25px;
font-size: 20px;
}
& a {
color: $blue;
Expand Down Expand Up @@ -70,6 +71,7 @@
line-height: 26px;
letter-spacing: 0em;
text-align: left;

}
& > div > p {
font-family: $primary-font;
Expand All @@ -79,7 +81,7 @@
line-height: 26px;
letter-spacing: 0em;
text-align: left;
padding: 0 20px 0px;
padding: 0 20px 0px 0px;
& * {
font-size: 15px;
}
Expand Down
10 changes: 9 additions & 1 deletion src/components/HomePage/HomeContainer/HomeContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,20 @@ import { Seo, CustomSection } from "../../index"
import "./HomeContainer.scss"

const Home = () => {

const data = useHomePage()

const homeSections = data?.allStrapiHome?.nodes[0]?.sections
const { pageTitle, pageDescription, pageKeywords } = data?.allStrapiHome?.nodes[0].pageMetadata


return (
<Layout>
<Seo title="Home" />
<Seo
title={pageTitle}
description={pageDescription}
keywords={pageKeywords}
/>
<CustomSection sections={homeSections} />
</Layout>
)
Expand Down
5 changes: 5 additions & 0 deletions src/hooks/useHomePage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ const useHomePage = () => {
{
allStrapiHome {
nodes {
pageMetadata {
pageDescription
pageKeywords
pageTitle
}
sections {
title
type
Expand Down
72 changes: 21 additions & 51 deletions src/schema/schema.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,17 @@ type StrapiHome implements Node {
locale: String
): Date
sections: [StrapiHomeSections]
pageMetadata: StrapiHomePageMetadata
strapiId: Int
}

type StrapiHomePageMetadata {
id: Int
pageTitle: String
pageDescription: String
pageKeywords: String
}

type StrapiHomeSections {
id: Int
banner: StrapiHomeSectionsBanner
Expand Down Expand Up @@ -419,33 +427,21 @@ type StrapiBanners implements Node {
type: String
summary: String
published_at(
# Format the date using Moment.js' date tokens, e.g. . See https://momentjs.com/docs/#/displaying/format/ for documentation for different tokens.
formatString: String
# Returns a string generated with Moment.js' function
fromNow: Boolean
# Returns the difference between this date and the current time. Defaults to "milliseconds" but you can also pass in as the measurement "years", "months", "weeks", "days", "hours", "minutes", and "seconds".
formatString: String
fromNow: Boolean
difference: String
# Configures the locale Moment.js will use to format the date.
locale: String
): Date
created_at(
# Format the date using Moment.js' date tokens, e.g. . See https://momentjs.com/docs/#/displaying/format/ for documentation for different tokens.
formatString: String
# Returns a string generated with Moment.js' function
fromNow: Boolean
# Returns the difference between this date and the current time. Defaults to "milliseconds" but you can also pass in as the measurement "years", "months", "weeks", "days", "hours", "minutes", and "seconds".
formatString: String
fromNow: Boolean
difference: String
# Configures the locale Moment.js will use to format the date.
locale: String
): Date
updated_at(
# Format the date using Moment.js' date tokens, e.g. . See https://momentjs.com/docs/#/displaying/format/ for documentation for different tokens.
formatString: String
# Returns a string generated with Moment.js' function
fromNow: Boolean
# Returns the difference between this date and the current time. Defaults to "milliseconds" but you can also pass in as the measurement "years", "months", "weeks", "days", "hours", "minutes", and "seconds".
formatString: String
fromNow: Boolean
difference: String
# Configures the locale Moment.js will use to format the date.
locale: String
): Date
link: StrapiBannersLink
Expand Down Expand Up @@ -668,33 +664,21 @@ type StrapiBlogPage implements Node {
formatString: String

fromNow: Boolean

# Returns the difference between this date and the current time. Defaults to "milliseconds" but you can also pass in as the measurement "years", "months", "weeks", "days", "hours", "minutes", and "seconds".
difference: String

# Configures the locale Moment.js will use to format the date.
locale: String
): Date
created_at(
formatString: String

fromNow: Boolean

# Returns the difference between this date and the current time. Defaults to "milliseconds" but you can also pass in as the measurement "years", "months", "weeks", "days", "hours", "minutes", and "seconds".
difference: String

# Configures the locale Moment.js will use to format the date.
locale: String
): Date
updated_at(
formatString: String

fromNow: Boolean

# Returns the difference between this date and the current time. Defaults to "milliseconds" but you can also pass in as the measurement "years", "months", "weeks", "days", "hours", "minutes", and "seconds".
difference: String

# Configures the locale Moment.js will use to format the date.
locale: String
): Date
pageMetadata: StrapiBlogPagePageMetadata
Expand All @@ -716,49 +700,35 @@ type StrapiContactPage implements Node {
title: String
imageName: String
published_at(
# Format the date using Moment.js' date tokens, e.g. See https://momentjs.com/docs/#/displaying/format/ for documentation for different tokens.
formatString: String

# Returns a string generated with Moment.js' function
fromNow: Boolean

# Returns the difference between this date and the current time. Defaults to "milliseconds" but you can also pass in as the measurement "years", "months", "weeks", "days", "hours", "minutes", and "seconds".
difference: String

# Configures the locale Moment.js will use to format the date.
locale: String
): Date
created_at(
# Format the date using Moment.js' date tokens, e.g. See https://momentjs.com/docs/#/displaying/format/ for documentation for different tokens.
formatString: String

# Returns a string generated with Moment.js' function
fromNow: Boolean

# Returns the difference between this date and the current time. Defaults to "milliseconds" but you can also pass in as the measurement "years", "months", "weeks", "days", "hours", "minutes", and "seconds".
difference: String

# Configures the locale Moment.js will use to format the date.
locale: String
): Date
updated_at(
# Format the date using Moment.js' date tokens, e.g. See https://momentjs.com/docs/#/displaying/format/ for documentation for different tokens.
formatString: String

# Returns a string generated with Moment.js' function
fromNow: Boolean

# Returns the difference between this date and the current time. Defaults to "milliseconds" but you can also pass in as the measurement "years", "months", "weeks", "days", "hours", "minutes", and "seconds".
difference: String

# Configures the locale Moment.js will use to format the date.
locale: String
): Date
pageMetadata: StrapiContactPagePageMetadata
contactForm: StrapiContactPageContactForm
image: LocalFile
strapiId: Int
}

type StrapiContactPageContactForm {
id: Int
portalId: String
formId: String
}

type StrapiContactPagePageMetadata {
id: Int
pageTitle: String
Expand Down