Merge branch 'master' into hover-nav-text-bg-color

gaurav-2-0-0-2 · Jan 28, 2025 · 504cd13 · 504cd13
2 parents c5e8fdd + edd0a1f
commit 504cd13
Show file tree

Hide file tree

Showing 9 changed files with 180 additions and 67 deletions.
diff --git a/README.md b/README.md
@@ -9,6 +9,11 @@ First, fork the repository and clone it.
 git clone https://github.com/<username>/conference-website.git
 ```
 
+Change Directory
+```bash
+cd conference-website
+```
+
 Install Dependencies
 ```bash
 npm install

diff --git a/config/city-lists.json b/config/city-lists.json
@@ -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,
@@ -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
@@ -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]" 
+				}, 
+				{
+					"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,
@@ -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,

diff --git a/cypress/e2e/Landing.cy.js b/cypress/e2e/Landing.cy.js
@@ -1,24 +1,27 @@
 import path from "path";
+import cities from "../../config/city-lists.json";
+
 describe("Landing Page Tests", () => {
   beforeEach(() => {
     cy.visit("/");
   });
+
   it("Contains correct heading", () => {
     const Year = new Date().getFullYear();
-    cy.getTestData("landing-heading").contains(`AsyncAPI Conf On Tour ${Year}`);
+    cy.getTestData("landing-heading").contains(new RegExp(`AsyncAPI Conf On Tour (${Year}|${Year-1})`));
   });
 
   it("Should contain About Section", () => {
     cy.getTestData("about-section").should("be.visible");
   });
 
   it("Verify the downloaded file", () => {
+    const Year = new Date().getFullYear();
     cy.getTestData("prospectus-download").should("be.visible");
     cy.getTestData("prospectus-download").click();
 
-    const Year = new Date().getFullYear();
     const downloadsFolder = Cypress.config("downloadsFolder");
-    cy.readFile(path.join(downloadsFolder, `conf ${Year}.pdf`));
+    cy.readFile(path.join(downloadsFolder, `conf ${Year}.pdf`)).should("exist");
   });
 
   it("Should contain Speakers section", () => {
@@ -33,6 +36,25 @@ describe("Landing Page Tests", () => {
     cy.getTestData("sponsor-section").should("be.visible");
   });
 
+  it("Should contain logos in Sponsor component", () => {
+    const eventSponsors = cities[0].sponsors.eventSponsors;
+    const financialSponsors = 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");
+    });
+
+    financialSponsors.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();
 

diff --git a/cypress/e2e/Venue.cy.js b/cypress/e2e/Venue.cy.js
@@ -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{
@@ -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');