Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
d488e14
Merge branch 'dev' of https://github.com/bitlogic/bitlogic.io into SB…
julsh21 Mar 10, 2022
54bfacf
navbar home (no dinamica)
benjacanas Mar 11, 2022
6ff13e9
video background rediseño
benjacanas Mar 11, 2022
caae2ce
Merge pull request #88 from bitlogic/SBIT-40
marino-martin Mar 11, 2022
bd02cdb
expanded grid code smell
benjacanas Mar 11, 2022
0da7de2
Merge pull request #89 from bitlogic/SBIT-62/videoBackground
marino-martin Mar 11, 2022
138a055
fix bugs
julsh21 Mar 11, 2022
02ded62
Agregar background y arreglar palabras en una misma linea en hero
drina-bitlogic Mar 11, 2022
17ec36b
Merge branch 'dev' of https://github.com/bitlogic/bitlogic.io into SB…
julsh21 Mar 11, 2022
193b02a
Merge pull request #90 from bitlogic/minore-changes-on-hero
marino-martin Mar 11, 2022
842ebad
Merge branch 'dev' of https://github.com/bitlogic/bitlogic.io into SB…
julsh21 Mar 11, 2022
6bade7e
fix expand grid
julsh21 Mar 11, 2022
e276de1
Merge pull request #91 from bitlogic/SBIT-44
drina-bitlogic Mar 11, 2022
f1987fb
fix banner list
julsh21 Mar 11, 2022
c5a8f6f
Merge pull request #92 from bitlogic/SBIT-44
drina-bitlogic Mar 11, 2022
6711df5
scroll y proporcion arregladas en expand grid
benjacanas Mar 15, 2022
fc49665
Merge pull request #93 from bitlogic/SBIT-63
marino-martin Mar 15, 2022
c0d75bc
Cambiar Link de Ver Más a un button
drina-bitlogic Mar 15, 2022
180cab3
create mobile version of cases section
julsh21 Mar 16, 2022
6e839bb
Merge branch 'dev' of https://github.com/bitlogic/bitlogic.io into SB…
julsh21 Mar 16, 2022
798d41c
Modificar title y lista de palabras en hero
drina-bitlogic Mar 16, 2022
da379d4
Merge branch 'SBIT-44' into SBIT-46
drina-bitlogic Mar 16, 2022
2cd36d4
desktop version of cases cards
julsh21 Mar 17, 2022
65f364e
.
drina-bitlogic Mar 17, 2022
d92882d
Merge branch 'SBIT-44' into SBIT-65
drina-bitlogic Mar 17, 2022
0d91459
Merge branch 'SBIT-44' into SBIT-46
drina-bitlogic Mar 17, 2022
a45a754
Merge branch 'SBIT-44' into SBIT-46, usar primaryBtn
drina-bitlogic Mar 17, 2022
5863d91
Merge branch 'SBIT-46' into SBIT-65
drina-bitlogic Mar 17, 2022
902790f
Agregar estilos de boton primario
drina-bitlogic Mar 17, 2022
bc78eb0
Cambios que solicitaba el sonar
drina-bitlogic Mar 17, 2022
67e248b
Merge pull request #94 from bitlogic/SBIT-46
marino-martin Mar 17, 2022
1eb5394
Modificar colores en pageBlog
drina-bitlogic Mar 18, 2022
b8fe092
cambiar url de image
drina-bitlogic Mar 18, 2022
ce5caf0
Merge pull request #95 from bitlogic/SBIT-46
marino-martin Mar 18, 2022
3b0ee94
Modificar colores en blog page
drina-bitlogic Mar 18, 2022
c4bb53a
Merge pull request #96 from bitlogic/SBIT-65
marino-martin Mar 18, 2022
2736795
cambio de colores svg theme
benjacanas Mar 18, 2022
51361bf
console.log -
benjacanas Mar 18, 2022
f726fd3
useNavbar hook
benjacanas Mar 18, 2022
cf4b3d3
menuLinks eliminado
benjacanas Mar 18, 2022
ddad415
nuevo navbar
benjacanas Mar 18, 2022
e5676aa
null safe
benjacanas Mar 18, 2022
6804c2a
codesmell comentario
benjacanas Mar 18, 2022
bff959e
code smell query
benjacanas Mar 18, 2022
d5a412d
Merge pull request #97 from bitlogic/SBIT-45
marino-martin Mar 18, 2022
aba4fc4
schemas nav
benjacanas Mar 21, 2022
8d88e17
Merge pull request #98 from bitlogic/SBIT-45
marino-martin Mar 21, 2022
ecb959a
modificar tamaño de fuentes en blog page
drina-bitlogic Mar 21, 2022
2b5d2d6
fix merge conflict
drina-bitlogic Mar 21, 2022
f97e85d
fix merge conflict
drina-bitlogic Mar 21, 2022
3b1724d
Merge pull request #99 from bitlogic/SBIT-65
marino-martin Mar 21, 2022
1e1378a
navbar competado
benjacanas Mar 22, 2022
0523588
Merge remote-tracking branch 'origin/dev' into SBIT-45
benjacanas Mar 22, 2022
a085c1a
Merge pull request #100 from bitlogic/SBIT-45
marino-martin Mar 22, 2022
01acf76
esquemas reorganizados y componentes viejos eliminados
benjacanas Mar 22, 2022
e03c6c6
Merge pull request #101 from bitlogic/SBIT-67
marino-martin Mar 22, 2022
b18f771
esquemas reorganizados y componentes viejos eliminados
benjacanas Mar 22, 2022
8ccd087
Merge remote-tracking branch 'origin/dev' into SBIT-67-fix
benjacanas Mar 22, 2022
8ef5e27
Merge pull request #102 from bitlogic/SBIT-67-fix
marino-martin Mar 22, 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
13 changes: 3 additions & 10 deletions gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,24 +37,17 @@ module.exports = {
apiURL: process.env.STRAPI_URL,
queryLimit: 1000,
collectionTypes: [
`banners`,
`services`,
`edTeches`,
`ed-tech-submodules`,
`article`,
`blog-category`,
`landing-page`
`landing-page`,
`case`,
`icon`
],
singleTypes: [
`ed-tech-page`,
`global-seo`,
`services-page`,
`home`,
`blog-page`,
`bitway-page`,
`contact-page`,
`global-config`,
`jobs-page`,
`layout`,
],
},
Expand Down
21 changes: 18 additions & 3 deletions gatsby-node.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,26 @@
const path = require("path")

exports.createSchemaCustomization = ({ actions }) => {
const schema = require("./src/schema/schema")
const blogSchema = require("./src/schema/blogSchema")
const caseSchema = require("./src/schema/caseSchema")
const globalSeoSchema = require("./src/schema/globalSeoSchema")
const homeSchema = require("./src/schema/homeSchema")
const iconSchema = require("./src/schema/iconSchema")
const landingSchema = require("./src/schema/landingSchema")
const layoutSchema = require("./src/schema/layoutSchema")
const generalSchema = require("./src/schema/generalSchema")

const { createTypes } = actions
const typeDefs = schema.value // + luego se concatenan

const typeDefs =
blogSchema.value +
blogSchema.value +
caseSchema.value +
globalSeoSchema.value +
homeSchema.value +
iconSchema.value +
landingSchema.value +
layoutSchema.value +
generalSchema.value
createTypes(typeDefs)
}

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","1279924571","1292738615","1693928026","176670904","1868451474","1921816282","2499611023","2898073905","416013508","770242822","882490824"]}
"staticQueryHashes": ["1128713364","1693928026","176670904","2898073905","3298386516","651390938"]}
8 changes: 2 additions & 6 deletions src/components/BannerList/Banner.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,20 @@
p {
text-align: justify;
margin: 0 !important;
font-size: 16px;
}
img {
width: 48px;
}
}
&__title {
font-size: $second-large;
text-align: center;
font-weight: 700;
text-align: left;
}
}

@media screen and (min-width: $breakpoint-xl) {
.bannerList {
.card_item {
p {
font-size: 20px;
}
img {
width: 70px;
}
Expand Down
57 changes: 28 additions & 29 deletions src/components/BannerList/BannerLis.js
Original file line number Diff line number Diff line change
@@ -1,36 +1,35 @@
import React from 'react';
import './Banner.scss';
import React from "react"
import "./Banner.scss"

export default function BannerLis({ data }) {
const title = data?.title;
const image = data?.Card[0]?.icon?.url;
console.log(data)
console.log(image)

const cards = data?.Card.map((item) => {
return (
<div className="card_item d-flex mb-4">
<div className="card_item col-3 mt-3 mt-xl-1">
<img
class="mx-auto d-block"
src={image}
placeholder="blurred"
/>
</div>
<div className="card_item col-9 ps-2 pe-2">
<p>{item.title}</p>
<p>{item.description}</p>
</div>
</div>
)

})
const title = data?.title
const image = data?.Card[0]?.icon?.url

const cards = data?.Card.map(item => {
return (
<div className="bannerList container-fluid mt-4 d-md-flex flex-row-reverse">
<div className="bannerList__title col-md-4 col-xl-5 align-self-center ps-3 pe-3 mb-4">{title}</div>
<div className="bannerList__cards col-md-8 col-xl-5 ms-xl-4">{cards}</div>
<div className="card_item d-flex mb-4">
<div className="card_item col-3 mt-3 mt-xl-1">
<img class="mx-auto d-block" src={image} placeholder="blurred" />
</div>

<div className="card_item col-9 ps-2 pe-2">
<h4>{item.title}</h4>
<p>{item.description}</p>
</div>
</div>
)
})

return (
<div
className="container my-3 py-3"
id={data.strapi_component + "-" + data.id}
>
<div className="bannerList d-md-flex flex-row-reverse">
<h1 className="bannerList__title col-md-6 col-xl-6 align-self-center ps-4 mb-4">
{title}
</h1>
<div className="bannerList__cards col-md-6 col-xl-6 pe-5">{cards}</div>
</div>
</div>
)
}
87 changes: 0 additions & 87 deletions src/components/BitwayPage/BitwayContainer.js

This file was deleted.

38 changes: 0 additions & 38 deletions src/components/BitwayPage/BitwayContainer.scss

This file was deleted.

72 changes: 0 additions & 72 deletions src/components/BitwayPage/Gallery/Gallery.js

This file was deleted.

Loading