Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
47161d0
theme black hardcode
benjacanas Jan 11, 2022
4e84d05
Merge remote-tracking branch 'origin/dev' into CUN-1182
benjacanas Jan 11, 2022
8eb1388
theme implementation
benjacanas Jan 12, 2022
16fde50
Merge branch 'dev' of https://github.com/bitlogic/bitlogic.io into CU…
yolit-bitlogic Jan 12, 2022
0a65a6e
Merge
yolit-bitlogic Jan 12, 2022
8271bf6
Merge branch 'dev' of https://github.com/bitlogic/bitlogic.io into CU…
yolit-bitlogic Jan 12, 2022
32fbf6a
Actualización de squemas
yolit-bitlogic Jan 12, 2022
8fadb3c
Creacion de la pagina jobs
drina-bitlogic Jan 12, 2022
4f602dd
Merge branch 'dev' of https://github.com/bitlogic/bitlogic.io into CU…
drina-bitlogic Jan 12, 2022
3a7137e
checkbox added
benjacanas Jan 13, 2022
f56a593
partners container fix
benjacanas Jan 13, 2022
9115100
bannercolor fix color
benjacanas Jan 13, 2022
7fe3b92
blog detail fix color
benjacanas Jan 13, 2022
df527ce
Agregar jobs page
drina-bitlogic Jan 13, 2022
0e11e64
Agregar Seo a Jobs Page
drina-bitlogic Jan 14, 2022
8be844d
add sitemap plugin
julsh21 Jan 14, 2022
a756bd3
modificar useJobsPage para el seo
drina-bitlogic Jan 14, 2022
148dada
Merge pull request #30 from bitlogic/CUN-900
julsh21 Jan 14, 2022
a258e33
Merge branch 'dev' of https://github.com/bitlogic/bitlogic.io into CU…
julsh21 Jan 14, 2022
2ffeee9
correct bugs
julsh21 Jan 14, 2022
c27fb74
Merge pull request #31 from bitlogic/CUN-1016
drina-bitlogic Jan 14, 2022
b145c45
Merge branch 'dev' of https://github.com/bitlogic/bitlogic.io into CU…
yolit-bitlogic Jan 14, 2022
7c7e604
Merge branch 'CUN-1182' of https://github.com/bitlogic/bitlogic.io in…
yolit-bitlogic Jan 14, 2022
204689d
Se agrega modo dark en páginas y cards
yolit-bitlogic Jan 14, 2022
70bb285
useHOme fix icon
benjacanas Jan 14, 2022
ba1739f
hover jobs
benjacanas Jan 17, 2022
cf5e536
Merge pull request #32 from bitlogic/CUN-1177-2
yolit-bitlogic Jan 17, 2022
2bb0eb6
ServiceCards
yolit-bitlogic Jan 17, 2022
ad414bc
Merge pull request #33 from bitlogic/CUN-1177
marino-martin Jan 17, 2022
f6cc7f5
comment sitemap plugin
julsh21 Jan 17, 2022
5b6a727
remove comment from package.json
julsh21 Jan 17, 2022
215d351
add yarn lock
julsh21 Jan 17, 2022
90bc075
Merge pull request #34 from bitlogic/CUN-1016
marino-martin Jan 17, 2022
d6e6d24
fix bugs
julsh21 Jan 17, 2022
f406358
add sitemap plugin
julsh21 Jan 17, 2022
e2037c8
Merge pull request #35 from bitlogic/CUN-1016
marino-martin Jan 17, 2022
1c4255d
fix font-size in jobs page
julsh21 Jan 17, 2022
7b11423
Merge pull request #36 from bitlogic/CUN-1016
yolit-bitlogic Jan 17, 2022
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: 3 additions & 0 deletions gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ module.exports = {
title: `Bitlogic`,
description: `Bitlogic Web es una empresa dedicada al diseño, ingeniería y desarrollo ágil de productos de software, especializada en la transformación digital de instituciones educativas .`,
author: `Bitlogic.io`,
siteUrl: `https://www.bitlogic.io`,
},
plugins: [
`gatsby-plugin-sitemap`,
{
resolve: `gatsby-plugin-google-gtag`,
options: {
Expand Down Expand Up @@ -52,6 +54,7 @@ module.exports = {
`bitway-page`,
`contact-page`,
`global-config`,
`jobs-page`,
],
},
},
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"gatsby-plugin-react-helmet": "^4.12.0",
"gatsby-plugin-sass": "^4.12.0",
"gatsby-plugin-sharp": "^3.12.0",
"gatsby-plugin-sitemap": "^3.0.0",
"gatsby-remark-external-links": "^0.0.4",
"gatsby-source-filesystem": "^3.12.0",
"gatsby-source-strapi": "^1.0.2",
Expand Down
2 changes: 1 addition & 1 deletion public/page-data/index/page-data.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"componentChunkName": "component---src-pages-index-js",
"path": "/",
"result": {"pageContext":{}},
"staticQueryHashes": ["1128713364","1687125271","176670904","2432702713","3498872882","3858639830","4109181808","854109855","882490824"]}
"staticQueryHashes": ["1128713364","1292738615","176670904","1868451474","2432702713","2499611023","3422151259","67086494","770810350","882490824"]}
1 change: 0 additions & 1 deletion public/render-page.js.map

This file was deleted.

4 changes: 2 additions & 2 deletions src/components/Banners/BannerActionCall.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import "../../styles/global.scss";

.bannerActCall {
background: linear-gradient(180deg, $white 20%, $blue 0);
background: linear-gradient(180deg, $primary-container 20%, $secondary-container 0);
padding: 30px 25px;
max-height: 235px;
display: flex;
Expand Down Expand Up @@ -49,7 +49,7 @@
.bannerActCall {
padding: 45px 65px;
max-height: 600px;
background: linear-gradient(180deg, $white 35%, $blue 0);
background: linear-gradient(180deg, $primary-container 35%, $secondary-container 0);
&__title {
color: $white;
font-size: $second-large;
Expand Down
13 changes: 11 additions & 2 deletions src/components/Banners/BannerBgImage.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,16 @@ import { useBanner } from "../../hooks/index"
import showdown from "showdown"
import "./BannerBgImage.scss"

import { useTheme } from "../../context/themeContext"

const BannerBgImage = ({ banner }) => {
const dataBanner = useBanner()
const { theme } = useTheme()

const bannerSelected = dataBanner?.allStrapiBanners?.nodes.find(
ban => ban.strapiId === banner.id
)
const { image, link, summary } = bannerSelected
const { image, imageDarkMode, link, summary } = bannerSelected

const titles = summary
let converter = new showdown.Converter()
Expand All @@ -23,10 +26,16 @@ const BannerBgImage = ({ banner }) => {
return { __html: html }
}

const imagen = getImage(image?.localFile)
const imagenDM = getImage(imageDarkMode?.localFile)

return (
<div className="bannerBgImage">
{bannerSelected.type === "bgImage" ? (
<BgImage image={getImage(image.localFile)} className="bannerBgImage__bgImage">
<BgImage
image={theme === "dark" && imagenDM ? imagenDM : imagen}
className="bannerBgImage__bgImage"
>
<div className="bannerBgImage__titleContainer">
<div
dangerouslySetInnerHTML={ReplaceHtml()}
Expand Down
9 changes: 5 additions & 4 deletions src/components/Banners/BannerBgImage.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
display: flex;
align-items: center;
justify-content: center;
background-color: $primary-container;
}
&__titleContainer {
display: flex;
Expand Down Expand Up @@ -48,7 +49,7 @@
h5 span p,
h6 span p,
p span p {
color: $white;
color: $primary-container;
padding: 5px 20px;
display: inline-block;
transform: skew(15deg);
Expand All @@ -72,7 +73,7 @@
display: flex;
align-items: center;
justify-content: center;
background-color: $blue;
background-color: $secondary-container
}
&__titleContainer {
display: flex;
Expand All @@ -91,7 +92,7 @@
span,
p {
font-size: $large;
color: $white;
color: white;
font-weight: $max-bold;
margin-bottom: 10px;
text-align: center;
Expand All @@ -116,7 +117,7 @@
h5 span p,
h6 span p,
p span p {
color: $blue;
color: $secondary-container;
padding: 0 15px;
display: inline-block;
transform: skew(25deg);
Expand Down
2 changes: 1 addition & 1 deletion src/components/Banners/BannerISO.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const BannerISO = ({ banner, title }) => {
></div>
</div>
<div className="bannerISO__image ">
<GatsbyImage image={getImage(logo.localFile)} alt={`img-${title}`} />
<GatsbyImage image={getImage(logo?.localFile)} alt={`img-${title}`} />
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Banners/BannerISO.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import "../../styles/global.scss";

.bannerISO {
background-color: $blue;
background-color: $secondary-container;
width: 100%;
min-height: 300px;
padding: 50px;
Expand Down
35 changes: 25 additions & 10 deletions src/components/Banners/BannerLogo.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,44 @@ import { getImage, GatsbyImage } from "gatsby-plugin-image"
import { BgImage } from "gbimage-bridge"

import { useBanner } from "../../hooks/index"
import { useTheme } from "../../context/themeContext"

import "./BannerLogo.scss"

const BannerLogo = ({ banner, title }) => {
const { theme } = useTheme()

const dataBanner = useBanner()

const bannerSelected = dataBanner?.allStrapiBanners?.nodes.find(
ban => ban.strapiId === banner.id
)
const { image, logo, summary } = bannerSelected
const { image, imageDarkMode, logo, logoDarkMode, summary } = bannerSelected

const imagen = getImage(image.localFile)
const logoImage = getImage(logo.localFile)
const imagen = getImage(image?.localFile)
const logoImage = getImage(logo?.localFile)
// Version Dark Mode
const imagenDM = getImage(imageDarkMode?.localFile)
const logoDM = getImage(logoDarkMode?.localFile)

return (
<>
<BgImage image={imagen} className="BannerLogo__BgImage">
<div className="BannerLogo__Logo__Container">
<GatsbyImage image={logoImage} alt={`img-${title}`}></GatsbyImage>
</div>
<h1 className="BannerLogo__Title">{title}</h1>
</BgImage>

{theme === "dark" && imagenDM && logoDM ? (
<BgImage image={imagenDM} className="BannerLogo__BgImage">
<div className="BannerLogo__Logo__Container">
<GatsbyImage image={logoDM} alt={`img-${title}`}></GatsbyImage>
</div>
<h1 className="BannerLogo__Title">{title}</h1>
</BgImage>
) : (
<BgImage image={imagen} className="BannerLogo__BgImage">
<div className="BannerLogo__Logo__Container">
<GatsbyImage image={logoImage} alt={`img-${title}`}></GatsbyImage>
</div>
<h1 className="BannerLogo__Title">{title}</h1>
</BgImage>
)}

{summary ? (
<div className="BannerLogo__summary">
<div className="container ">
Expand Down
2 changes: 2 additions & 0 deletions src/components/Banners/BannerLogo.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
}
}
.BannerLogo__BgImage {
background-color: $primary-container;
width: 100%;
min-height: 600px;
display: flex;
Expand All @@ -48,6 +49,7 @@
font-size: 1.2rem;
line-height: 16px;
padding: 1.8rem 0 0.5rem;
color: $primary;
}
.BannerLogo__Title::after {
position: absolute;
Expand Down
27 changes: 20 additions & 7 deletions src/components/Banners/BannerTop.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,30 @@ import { getImage } from "gatsby-plugin-image"
import { BgImage } from "gbimage-bridge"
import "./BannerTop.scss"

import { useTheme } from "../../context/themeContext"

const BannerTop = ({ banner }) => {
const { image, title, summary } = banner
const imageBanner = getImage(image.localFile)
const { image, imageDarkMode, title, summary } = banner
const { theme } = useTheme()

const imageBanner = getImage(image?.localFile)
const imageDM = getImage(imageDarkMode?.localFile)

return (
<div className="banner">
<BgImage image={imageBanner} className="banner__bgImage">
<div className="banner__titleContainer">
<h1 className="banner__title">{title}</h1>
</div>
</BgImage>
{theme === "dark" && imageDM ? (
<BgImage image={imageDM} className="banner__bgImage">
<div className="banner__titleContainer">
<h1 className="banner__title">{title}</h1>
</div>
</BgImage>
) : (
<BgImage image={imageBanner} className="banner__bgImage">
<div className="banner__titleContainer">
<h1 className="banner__title">{title}</h1>
</div>
</BgImage>
)}
{summary ? (
<div className="banner__summary">
<div className="container ">
Expand Down
2 changes: 1 addition & 1 deletion src/components/Banners/BannerTop.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
margin: 0;
}
&__summary {
background-color: $blue;
background-color: $secondary-container;
display: flex;
justify-content: center;
align-items: center;
Expand Down
2 changes: 1 addition & 1 deletion src/components/BitwayPage/Gallery/Gallery.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const Gallery = ({ content, ...extra }) => {
>
{fillGrid(elem.galleryImage, photos[elem.type]).map(
(image, index) => {
const prosImage = getImage(image.image.localFile)
const prosImage = getImage(image?.image?.localFile)
return (
<BgImage
className={"bitway-gallery-" + index + " bitway-gallery-item"}
Expand Down
3 changes: 2 additions & 1 deletion src/components/BitwayPage/Paragraph/Paragraph.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@import "../../../styles/global.scss";
.bitway-paragraph {
color: $primary;
margin-bottom: 20px;
& p {
font-family: $primary-font;
Expand Down Expand Up @@ -54,7 +55,7 @@
font-weight: $bold;
margin: 0;
display: inline-block;
color: white;
color: $primary-container;
transform: skew(15deg);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/BlogPage/BlogArticle/BlogArticle.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const BlogArticle = ({ title, summary, image, slug, text }) => {
return (
<div className="article__container">
<GatsbyImage
image={getImage(image.localFile)}
image={getImage(image?.localFile)}
alt={title}
className="article__image"
/>
Expand Down
8 changes: 6 additions & 2 deletions src/components/Cards/Cards.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@ import { getImage, GatsbyImage } from "gatsby-plugin-image"
import Markdown from "react-markdown"
import { SubModulesEdTech } from "../index"
import "./Cards.scss"
import { useTheme } from "../../context/themeContext"

const Cards = ({ tech }) => {
const { theme } = useTheme()

const subModules = tech?.edTechSubmodules?.ed_tech_submodules.map(submod => (
<p
key={submod.id}
Expand All @@ -27,13 +30,14 @@ const Cards = ({ tech }) => {
)
)

const icon = getImage(tech?.icon.localFile)
const icon = getImage(tech?.icon?.localFile)
const iconDark = getImage(tech?.iconDarkMode?.localFile)

return (
<>
<div className=" Cards container-fluid ">
<div className="Cards__icon ">
<GatsbyImage image={icon} alt={tech.title} />
<GatsbyImage image={theme === "dark" && iconDark ? iconDark : icon} alt={tech.title} />
</div>
<div className="Cards__body col-12">
<div className="Cards__title col-lg-8">{tech.title}</div>
Expand Down
9 changes: 8 additions & 1 deletion src/components/Cards/Cards.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
transform: translateY(60%);
}
&__title {
color: $primary;
font-weight: $max-bold;
font-size: $medium;
line-height: $large;
Expand All @@ -28,6 +29,8 @@
}
}
&__description {
background-color: rgba(255, 255, 255, 0.089);
color: $primary;
padding: 20px 25px;
margin-bottom: 0;
p {
Expand All @@ -37,11 +40,13 @@
}
}
&__submodules {
background-color: none;
color: $primary;
position: relative;
padding: 0 45px;

&__title {
margin: 0 0 30px 0;
margin: 2em 0 30px 0;
font-size: $medium;
line-height: 18px;
text-align: center;
Expand Down Expand Up @@ -105,9 +110,11 @@
&__submodules {
box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
border-radius: 18px;
background-color: rgba(255, 255, 255, 0.089);

&--items {
box-shadow: none;
background-color: unset;
}
&__title {
margin: 0 0 5px 0;
Expand Down
6 changes: 3 additions & 3 deletions src/components/ContactPage/Contact.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
transform: skew(-15deg);
height: 40px;
p {
color: $white;
color: $primary-container;
text-transform: uppercase;
padding: 5px 15px;
display: inline-block;
Expand All @@ -46,8 +46,8 @@
.contact {
max-width: 1400px;
margin: 0 auto;
margin-bottom: 50px;
margin-top: 20px;
padding-bottom: 50px;
padding-top: 20px;
flex-direction: row-reverse;
justify-content: space-around;
&__group {
Expand Down
Loading