Skip to content

Commit

Permalink
Merge pull request #47 from gugcz/main
Browse files Browse the repository at this point in the history
Release fixes
  • Loading branch information
Przecza authored Jun 12, 2023
2 parents 488e0df + f9d1180 commit 51ed0f1
Show file tree
Hide file tree
Showing 5 changed files with 4,400 additions and 4,381 deletions.
22 changes: 19 additions & 3 deletions components/PartnersSection/PartnersSection.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ const useStyles = makeStyles(({ spacing, breakpoints }) => ({
},
[breakpoints.down('sm')]: {
flexDirection: 'column',
maxWidth: '80vw',
maxHeight: 'initial',
margin: spacing(4, 0),
'&>*': {
objectFit: 'contain',
height: 80,
maxWidth: '100%',
},
},
},
Expand All @@ -44,6 +44,11 @@ const useStyles = makeStyles(({ spacing, breakpoints }) => ({
margin: 0,
},
},
image: {
[breakpoints.down('sm')]: {
width: '100%',
},
},
}));

export const PartnersSection = () => {
Expand All @@ -54,10 +59,21 @@ export const PartnersSection = () => {
<InfoText icon={<PartnersIcon size={80} />} title="Partneři" />
<Box className={classes.gold}>
<a href="https://grow.google/intl/cz/">
<img src={'/images/partners/Google_logo_Horizontal_Grey_RGB.png'} alt="Grow with google" />
<img
src={'/images/partners/Google_logo_Horizontal_Grey_RGB.png'}
alt="Grow with google"
className={classes.image}
/>
</a>
<a href="https://www.smartemailing.cz/">
<img
src={'/images/partners/SmartEmailing_logo_RGB_SmartEmailing_Color.png'}
alt="Partneři Gugu"
className={classes.image}
/>
</a>
<a href="https://www.smartemailing.cz/">
<img src={'/images/partners/SmartEmailing_logo_RGB_SmartEmailing_Color.png'} alt="Partneři Gugu" />
<img src={'/images/partners/dotekomanie.png'} alt="Partneři Gugu" className={classes.image} />
</a>
</Box>
<Button variant={'contained'} color={'primary'} className={classes.action} href="mailto:[email protected]">
Expand Down
50 changes: 26 additions & 24 deletions firebase.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
{
"hosting": [{
"public": "out",
"target": "staging",
"ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
"rewrites": [
{
"source": "/about",
"destination": "/about.html"
},
{
"source": "/events",
"destination": "/events.html"
},
{
"source": "/event/**",
"destination": "/event/[event].html"
},
{
"source": "**",
"destination": "/index.html"
}
]
},
"hosting": [
{
"public": "out",
"target": "staging",
"ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
"rewrites": [
{
"source": "/about",
"destination": "/about.html"
},
{
"source": "/events",
"destination": "/events.html"
},
{
"source": "/event/**",
"destination": "/event/[event].html"
},
{
"source": "**",
"destination": "/index.html"
}
]
},
{
"public": "out",
"target": "production",
Expand All @@ -44,5 +45,6 @@
"destination": "/index.html"
}
]
}]
}
]
}
5 changes: 3 additions & 2 deletions pages/events.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useEffect, useState } from 'react';
import Box from '@material-ui/core/Box';
import { makeStyles } from '@material-ui/core';
import { Button, makeStyles } from '@material-ui/core';
import { isEmpty } from 'ramda';
import EventsHeadline from '../components/events/EventsHeadline/EventsHeadline';
import EventsListBox from '../components/events/EventsListBox/EventsListBox';
Expand Down Expand Up @@ -30,6 +30,7 @@ const Events = () => {
<EventsListBox events={events.upcomingEvents} />
<h1>Proběhlé události</h1>
<EventsListBox events={events.pastEvents} past />
<Button href={'https://talkbase.io/company/gugcz/events'}>Zobrazit všechny události</Button>
</Box>
);
};
Expand All @@ -39,7 +40,7 @@ Events.propTypes = {
upcomingEvents: EventsPropTypes,
};
const fetchEvents = async () => {
const talkBaseUrl = 'https://public.talkbase.io/api/workspace/gugcz/event?limit=3&offset=0&state=';
const talkBaseUrl = 'https://api.talkbase.io/api/workspace-public/gugcz/event?limit=6&offset=0&state=';
const pastEvents = await (await fetch(`${talkBaseUrl}PAST`)).json();
const upcomingEvents = await (await fetch(`${talkBaseUrl}UPCOMING`)).json();
return { pastEvents, upcomingEvents };
Expand Down
Binary file added public/images/partners/dotekomanie.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 51ed0f1

Please sign in to comment.