Skip to content
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

fix: sponsor and subscribe section width on home page. #480

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
+126 −18
Open

fix: sponsor and subscribe section width on home page. #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4ff3145
Fixed width for sponsor and subscribe section on home page
SahilDahekar Nov 27, 2024
4c2991f
Fixed sponsor render issue on venue pages
SahilDahekar Nov 27, 2024
58b4084
Added cypress test for checking sponsor logos rendering
SahilDahekar Nov 27, 2024
cf4c4fc
Imported hardcode data from city.json
SahilDahekar Nov 27, 2024
1448359
Made changes to if condition in venue.cy.js
SahilDahekar Nov 28, 2024
6ce96d7
Merge branch 'asyncapi:master' into issue_479
SahilDahekar Dec 12, 2024
1135977
Merge branch 'master' into issue_479
AceTheCreator Dec 17, 2024
92de11a
Merge branch 'master' into issue_479
SahilDahekar Dec 17, 2024
caee986
Merge branch 'asyncapi:master' into issue_479
SahilDahekar Dec 23, 2024
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
86 changes: 73 additions & 13 deletions config/city-lists.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,25 @@
"description": "Join us for the AsyncAPI Online Conference Edition as the community unites across the globe to share experiences, collaborate, and foster meaningful connections.",
"img": "/img/testMic.webp",
"address": "AsyncAPI YouTube Channel",
"map": "https://www.youtube.com/playlist?list=PLbi1gRlP7pijItMBmw9SeeyWxuEa3jLR2",
"sponsors": [
"/img/apidays.png"
],
"map": "https://www.youtube.com/live/F9wHxd-v2f0?si=PT8BuAUKNmoLHRiM",
"sponsors": {
"eventSponsors" : [{
"image":"/img/apidays.png",
"websiteUrl":"https://www.apidays.global/"
}],
"financialSponsors" : [
{
"image":"/img/graviteeio.svg" ,
"websiteUrl": "https://www.gravitee.io/",
"className":"w-[250px] h-[50px]"
},
{
"image":"/img/postman.png" ,
"websiteUrl":"https://www.postman.com/",
"className":"w-[240px] h-[70px]"
}
]
},
"ticket": false,
"isFree": true,
"ended": true,
Expand All @@ -27,9 +42,24 @@
"img": "/img/finland.webp",
"address": "Pikku-Finlandia, Helsinki, Karamzininranta 4, 00100 Helsinki, Finland",
"map": "https://maps.app.goo.gl/UpdEp188m5YNEAEo9",
"sponsors": [
"/img/apidays.png"
],
"sponsors": {
"eventSponsors" : [{
"image":"/img/apidays.png",
"websiteUrl":"https://www.apidays.global/"
}],
"financialSponsors" : [
{
"image":"/img/graviteeio.svg" ,
"websiteUrl": "https://www.gravitee.io/",
"className":"w-[250px] h-[50px]"
},
{
"image":"/img/postman.png" ,
"websiteUrl":"https://www.postman.com/",
"className":"w-[240px] h-[70px]"
}
]
},
"ticket": false,
"isFree": false,
"ended": true
Expand All @@ -43,9 +73,24 @@
"img": "/img/london.gif",
"address": "155 Bishopsgate, London EC2M 3YD",
"map": "https://maps.app.goo.gl/b2Vb5H2mM41F9nQA6",
"sponsors": [
"/img/apidays.png"
],
"sponsors": {
"eventSponsors" : [{
"image":"/img/apidays.png",
"websiteUrl":"https://www.apidays.global/"
}],
"financialSponsors" : [
{
"image":"/img/graviteeio.svg" ,
"websiteUrl": "https://www.gravitee.io/",
"className":"w-[250px] h-[50px]"
SahilDahekar marked this conversation as resolved.
Show resolved Hide resolved
},
{
"image":"/img/postman.png" ,
"websiteUrl":"https://www.postman.com/",
"className":"w-[240px] h-[70px]"
}
]
},
"ticket": "https://ticket.apidays.global/event/apidays-london-2024/869eca20-bfb6-4103-b8bb-d0348932e940/",
"isFree": true,
"ended": true,
Expand All @@ -61,9 +106,24 @@
"img": "https://media1.giphy.com/media/v1.Y2lkPTc5MGI3NjExd24yenR4djEyZzRoeDA0ZmEyb3Y1c2F4NWVmbG13NmZwYWNhZzdnNiZlcD12MV9pbnRlcm5hbF9naWZfYnlfaWQmY3Q9Zw/Tuy3QxNZF1cxG/giphy.gif",
"address": "CNIT (Centre des Nouvelles Industries et Technologies), Paris 2 Place de la Défense, 92092 Puteaux",
"map": "https://maps.app.goo.gl/5te8WRM9Rb8B6vNd9",
"sponsors": [
"/img/apidays.png"
],
"sponsors": {
"eventSponsors" : [{
"image":"/img/apidays.png",
"websiteUrl":"https://www.apidays.global/"
}],
"financialSponsors" : [
{
"image":"/img/graviteeio.svg" ,
"websiteUrl": "https://www.gravitee.io/",
"className":"w-[250px] h-[50px]"
},
{
"image":"/img/postman.png" ,
"websiteUrl":"https://www.postman.com/",
"className":"w-[240px] h-[70px]"
}
]
},
"ticket": "https://ticket.apidays.global/event/apidays-paris-2024/f8f61349-4f78-4bba-a162-68d598833116/cart?coupon=ASYNCAPICONF",
"isFree": true,
"cfp": false,
Expand Down
22 changes: 22 additions & 0 deletions cypress/e2e/Landing.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import path from "path";
import cities from "../../config/city-lists.json"

describe("Landing Page Tests", () => {
beforeEach(() => {
cy.visit("/");
Expand Down Expand Up @@ -33,6 +35,26 @@ describe("Landing Page Tests", () => {
cy.getTestData("sponsor-section").should("be.visible");
});

it("Should contain logos in Sponsor component", () => {
const eventSponsors = cities[0].sponsors.eventSponsors;

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hey @SahilDahekar could you input this urls from the json objects, so that we do not have to hard code them.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay

const financialSponsor = cities[0].sponsors.financialSponsors;

eventSponsors.forEach((sponsor) => {
cy.getTestData('sponsor-section')
.find(`img[src="${sponsor.image}"]`)
.should('be.visible');
cy.get(`a[href="${sponsor.websiteUrl}"]`).should('exist');
});

financialSponsor.forEach((sponsor) => {
cy.getTestData('sponsor-section')
.find(`img[src="${sponsor.image}"]`)
.should('be.visible');
cy.get(`a[href="${sponsor.websiteUrl}"]`).should('exist');
});
});

it("Subscribe Button is functional", () => {
cy.getTestData("subscribe-button").invoke("removeAttr", "target").click();

Expand Down
30 changes: 28 additions & 2 deletions cypress/e2e/Venue.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ it("should render guideline for not ended cities and agenda otherwise",()=>{

cy.getTestData(`venue-${city.name}`).then(val=>{

if(!city.ended){
if(Date.now()>Date(city.date) && !city.ended){
cy.getTestData("guideline-com").should("be.visible");
}
else{
Expand All @@ -18,7 +18,33 @@ it("should render guideline for not ended cities and agenda otherwise",()=>{

});

it.only("Form should work",()=>{
it("Should contain logos in Sponsor component", () => {
const eventSponsors = cities[0].sponsors.eventSponsors;

const financialSponsor = cities[0].sponsors.financialSponsors;

cy.wrap(cities).each((city) => {
cy.visit(`http://localhost:3000/venue/${city.name}`);

cy.getTestData("sponsor-section").should("exist");

eventSponsors.forEach((sponsor) => {
cy.getTestData('sponsor-section')
.find(`img[src="${sponsor.image}"]`)
.should('be.visible');
cy.get(`a[href="${sponsor.websiteUrl}"]`).should('exist');
});

financialSponsor.forEach((sponsor) => {
cy.getTestData('sponsor-section')
.find(`img[src="${sponsor.image}"]`)
.should('be.visible');
cy.get(`a[href="${sponsor.websiteUrl}"]`).should('exist');
});
})
});

it("Form should work",()=>{
cy.visit('http://localhost:3000/venue/online/register');

cy.getTestData("cfp-form").should('be.visible');
Expand Down
2 changes: 1 addition & 1 deletion pages/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,13 +185,13 @@ export default function Home() {
</div>
</div>
</div>
</div>
<div id='sponsors' className='mt-20'>
<Sponsors eventSponsors={[{image:'/img/apidays.png',websiteUrl:"https://www.apidays.global/"}]} financialSponsor={[{image:"/img/graviteeio.svg" , websiteUrl: "https://www.gravitee.io/",className:"w-[250px] h-[50px]" } , {image:"/img/postman.png" ,websiteUrl:"https://www.postman.com/",className:"w-[240px] h-[70px]"}]} />
</div>
<div className='mt-5'>
<Subscription/>
</div>
</div>
</div>
);
}
2 changes: 1 addition & 1 deletion pages/venue/[id].js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ function Venue({ city }) {
<div
id='sponsors'
>
<Sponsors imgs={city.sponsors} />
<Sponsors eventSponsors={city.sponsors.eventSponsors} financialSponsor={city.sponsors.financialSponsors} />
</div>
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion pages/venue/online/register/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default function SpeakersForm(){
<Paper />
</div>
<div>
<Sponsors imgs={cfpData.sponsors} />
<Sponsors eventSponsors={[{image:'/img/apidays.png',websiteUrl:"https://www.apidays.global/"}]} financialSponsor={[{image:"/img/graviteeio.svg" , websiteUrl: "https://www.gravitee.io/",className:"w-[250px] h-[50px]" } , {image:"/img/postman.png" ,websiteUrl:"https://www.postman.com/",className:"w-[240px] h-[70px]"}]} />
</div>
</div>)
}
Loading