Merge branch 'develop' into main

web-planex · Dec 12, 2022 · e704e99 · e704e99
2 parents b9b7d65 + ffe646e
commit e704e99
Show file tree

Hide file tree

Showing 10 changed files with 1,306 additions and 81 deletions.
diff --git a/package.json b/package.json
@@ -13,6 +13,7 @@
     "deploy": "npm run build && NODE_ENV=production firebase deploy",
     "firestore:copy": "ts-node-script ./scripts/firestore-copy",
     "firestore:init": "ts-node-script ./scripts/firestore-init",
+    "firestore:delete": "npx firebase firestore:delete --recursive --all-collections",
     "fix": "concurrently npm:fix:*",
     "fix:eslint": "eslint . --ext .ts --ext .js --fix",
     "fix:markdownlint": "markdownlint '**/*.md' --fix",

diff --git a/public/data/firestore-data.json b/public/data/firestore-data.json
diff --git a/public/data/job-openings-data.json b/public/data/job-openings-data.json
@@ -448,7 +448,7 @@
       "companyName": "DhiWise Pvt. Ltd.",
       "location": "Surat, India",
       "bio": "DhiWise is a programming platform where developers can convert their designs into developer-friendly code for mobile and web apps. DhiWise automates the application development lifecycle and instantly generates readable, modular and reusable code. At DhiWise, you can fall in love with your work again. A platform built for developers to build apps in a way that uses their engineering muscle rather than forcing the use of crammed information.",
-      "companyLogoUrl": "https://uploads-ssl.webflow.com/618e36726d3c0f19c9284e56/6392ef0773801c4452bd8bde_DhiWise-Logo-150X150.jpg",
+      "companyLogoUrl": "https://uploads-ssl.webflow.com/618e36726d3c0f19c9284e56/6396b5ccaa7b4253b742ee5b_DhiWise-Logo-150X150.jpg",
       "companyWebsite": "https://www.dhiwise.com/",
       "companyCareerPage": "https://dhiwise.freshteam.com/jobs",
       "linkedin": "https://www.linkedin.com/company/dhiwise/",
@@ -710,6 +710,97 @@
     },
     {
       "id": 17,
+      "companyName": "AddWeb Solution Pvt Ltd",
+      "location": "Ahmedabad",
+      "bio": "We know that finding a meaningful and rewarding job can be a long journey. Our goal is to make that process as easy as possible for you and create an enjoyable work environment that you'll look forward to coming to every day. Start your journey with us by browsing available jobs..",
+      "companyLogoUrl": "https://www.addwebsolution.com/themes/custom/addweb/addweb-logo-web.png",
+      "companyWebsite": "https://www.addwebsolution.com/",
+      "companyCareerPage": "https://addwebsolution.zohorecruit.in/jobs/Careers/",
+      "linkedin": "https://in.linkedin.com/company/addwebsolution/",
+      "hiringImageUrl": "https://www.addwebsolution.com/sites/default/files/2022-03/DSC_2251-min.JPG",
+      "openings": [
+        {
+          "title": "Drupal Developers",
+          "count": 3,
+          "experience": "3-10 years"
+        },
+        {
+          "title": "ASP.Net Developers",
+          "count": 1,
+          "experience": "4-8 years"
+        },
+        {
+          "title": "Business Development Executive Manager",
+          "count": 4,
+          "experience": "1 - 8 years"
+        },
+        {
+          "title": "DevOps Engineer",
+          "count": 1,
+          "experience": "3-10 years"
+        }
+      ]
+    },
+    {
+      "id": 18,
+      "companyName": "iView Labs Pvt. Ltd",
+      "location": "Ahmedabad, India",
+      "bio": "iView Labs is a leading cloud-based application development company that provides software solutions to US, Europe, and Australian businesses.",
+      "companyLogoUrl": "https://www.iviewlabs.com/assets/img/iView-Labs-Logo.png",
+      "companyWebsite": "https://www.iviewlabs.com",
+      "companyCareerPage": "https://www.iviewlabs.com/join-us",
+      "linkedin": "https://www.linkedin.com/company/iviewlabs",
+      "hiringImageUrl": "https://tse2.mm.bing.net/th?id=OIP.L2gI9ov2hu2itvAuifSFpQHaHa&pid=Api&P=0",
+      "openings": [
+        {
+          "title": "Shopify Developers",
+          "count": 2,
+          "experience": "3 to 8 Years experience"
+        },
+        {
+          "title": "Flutter Developers",
+          "count": 2,
+          "experience": "3 to 8 Years experience"
+        },
+        {
+          "title": "Python Developer",
+          "count": 2,
+          "experience": "3 to 8 Years experience"
+        },
+        {
+          "title": "React Native Developers",
+          "count": 2,
+          "experience": "3 to 8 Years experience"
+        },
+        {
+          "title": "React JS Developer",
+          "count": 2,
+          "experience": "3 to 8 Years experience"
+        },
+        {
+          "title": "Angular Developer",
+          "count": 2,
+          "experience": "3 to 8 Years experience"
+        },
+        {
+          "title": "Node JS Developer",
+          "count": 2,
+          "experience": "3 to 8 Years experience"
+        },
+        {
+          "title": "Devops Engineer",
+          "count": 2,
+          "experience": "3 to 8 Years experience"
+        },
+        {
+          "title": "Java Developer",
+          "count": 2,
+          "experience": "3 to 8 Years experience"
+        }
+      ]
+    },
+    {
+      "id": 19,
       "companyName": "Yudiz Solutions Ltd.",
       "location": "Ahmedabad, India",
       "bio": "Yudiz Solutions is recognized as an eminent company in the software industry that offers the best in class digital solutions and impressive services that stands out globally.",
@@ -782,4 +873,4 @@
       ]
     }
   ]
-}
+}
diff --git a/public/data/settings.json b/public/data/settings.json
@@ -43,6 +43,11 @@
       "permalink": "/job-openings",
       "label": "Job Opportunities"
     },
+    {
+      "route": "badge",
+      "permalink": "/badge",
+      "label": "Badge"
+    },
     {
       "route": "blog",
       "permalink": "/blog",
@@ -142,6 +147,14 @@
         "color": "#FFF"
       },
       "fontColor": "#424242"
+    },
+    "badge": {
+      "title": "DevFestAhm 2022 Badge",
+      "metaDescription": "GDG Ahmedabad DevFest 2022 Badge Generator",
+      "background": {
+        "color": "#FFF"
+      },
+      "fontColor": "#424242"
     }
   },
   "location": {

diff --git a/public/images/devfestahm22-badge-frame.jpg b/public/images/devfestahm22-badge-frame.jpg
diff --git a/scripts/firestore-init/team.ts b/scripts/firestore-init/team.ts
@@ -15,6 +15,7 @@ export const importTeam = () => {
     if (team) {
       batch.set(firestore.collection('team').doc(teamId), {
         title: team.title,
+        order: team.order,
       });
 
       team.members.forEach((member, id) => {

diff --git a/src/models/team.ts b/src/models/team.ts
@@ -4,6 +4,7 @@ export interface Team {
   id: string;
   title: string;
   members: Member[];
+  order: number;
 }
 
 export type TeamData = Pick<Team, 'title'>;