tested

Author: nirajprakash

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "editor.fontSize": 11
+}

es_data_provider/.env

@@ -1,4 +1,4 @@
 CA_64_KEY='LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURwekNDQW8rZ0F3SUJBZ0lVVVhZdVU5VDVuWlpaU2tRamVNN1htUk9kSnpRd0RRWUpLb1pJaHZjTkFRRUwKQlFBd1l6RUxNQWtHQTFVRUJoTUNTVTR4RXpBUkJnTlZCQWdNQ2xOdmJXVXRVM1JoZEdVeEZqQVVCZ05WQkFvTQpEV3AxYm10cFpXeGhZbk11YVc0eEp6QWxCZ2txaGtpRzl3MEJDUUVXR0dwMWJtdHBaV3hoWW5NdVpHVjJRR2R0CllXbHNMbU52YlRBZUZ3MHlOREF5TVRBeE5UTXlNVE5hRncweU5EQXpNVEV4TlRNeU1UTmFNR014Q3pBSkJnTlYKQkFZVEFrbE9NUk13RVFZRFZRUUlEQXBUYjIxbExWTjBZWFJsTVJZd0ZBWURWUVFLREExcWRXNXJhV1ZzWVdKegpMbWx1TVNjd0pRWUpLb1pJaHZjTkFRa0JGaGhxZFc1cmFXVnNZV0p6TG1SbGRrQm5iV0ZwYkM1amIyMHdnZ0VpCk1BMEdDU3FHU0liM0RRRUJBUVVBQTRJQkR3QXdnZ0VLQW9JQkFRQ0xmaWtVNDVNQmd6UzZSQzNaNk1tbGpjNGwKMS93OFdsa0c0eVVVSGJvMXJJV1NnZGJzTkJ5ZTR6Z0Q4bSs3eXJSQjBhSmtXMm0rS3FoQ09lSGZLekVSVFFHUQp1Qkd1U2ZiajI1bmU5b2JQRFhRWTNwM3pHR2JXakE2cTdwWkpNSlJzZVFrR1JkaXp6U0NxUVlPcnRDSGRVc0JtCkN6TVcyRmoxWUp6eHl3Mko4SUhXUjZYcnUrWjFpWE45bDlNZVZJWTdwNktOUzhQcTBQZ2NaUjkrbzJnZWZuOTEKak13dml2cHlIcEtGV1BrSFdLTXIzMGNiMmFWVm9iQ2NEZm5nOE1acTNhbVRaZTRNbEEwOWNGOWZvZ3A0dHAzSwo3dzE1T2NNTTJ0MkpkclQ4MWtlSjEwS0pyYTB4SWwxcmNnbkNTMTlzc2xzQjB6cWZ5SGJWTWgrN1ROVnpBZ01CCkFBR2pVekJSTUIwR0ExVWREZ1FXQkJSQlhXTTdOYjB1cGJMc0ZtcitDNW5ZelV1dmhqQWZCZ05WSFNNRUdEQVcKZ0JSQlhXTTdOYjB1cGJMc0ZtcitDNW5ZelV1dmhqQVBCZ05WSFJNQkFmOEVCVEFEQVFIL01BMEdDU3FHU0liMwpEUUVCQ3dVQUE0SUJBUUJKb2NZeXc3WHNDNHJpRklGM0JDeDBHNGlHVVh4dVRhY2w1TWRCVkhmZDFRMFBCR0oxCitDWDV1UVBRblE0b0t1Ulg3bzd0N3JYL2tyZThqRGRKa0V5d3BMV1ZPV0N0Y0RLVWdwV1YwSzUydjFOQlZTNjkKcjdMb25WdkdoWEJ0SWR2RDBTNlY1cmlQMlNBYmJ0OGI0K2JOTE8yeXdEdDlLemNKb1h4VGVmaDVLRFZrZVlSOQpzZU5FUXliTVNKRGIwaVhKV3FCM21YYjhJMFdsQmFmS3lLWEZVejNOSnc2U0NWMkNib2NVL1Y2NzJISTJ0K3g0CjlEK1J0a1YraVozUTZhTFBhay9vK2RCNnpBdGVGcnRrN0pidlhTcVp6TFgzbG5kS1RiMXVmclpEWDZKTlhjb1kKTE9JVzF6RUt1LzdhWjMxSHphWnYyYnkrYVg4VHlFcVlQR2RxCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0='
-ELASTIC_URL='https://localhost:9202'
+ELASTIC_URL='https://192.168.0.103:9202'
 ELASTIC_USERNAME='elastic'
 ELASTIC_PASSWORD='password'

es_data_provider/dist/city_list.js

@@ -49,7 +49,10 @@ const upload = async (bulk) => {
         client = new elasticsearch_1.Client({
             node: process.env.ELASTIC_URL,
             tls: {
-                ca: Buffer.from(process.env.CA_64_KEY, 'base64').toString('utf8')
+                ca: Buffer.from(process.env.CA_64_KEY, 'base64').toString('utf8'),
+                checkServerIdentity: (host, cert) => {
+                    return undefined;
+                }
             },
             auth: {
                 username: process.env.ELASTIC_USERNAME ?? "",

es_data_provider/dist/event_generator.js

@@ -30,7 +30,7 @@ const boquetNames = Array.from({ length: 20 }, (_, i) => `Boquet ${i + 1}`);
 const deviceToCity = {};
 const deviceToPincode = {};
 // Define base timestamp
-const baseTimestamp = luxon_1.DateTime.fromISO("2023-10-22T13:01:55.000");
+const baseTimestamp = luxon_1.DateTime.fromISO("2024-03-02T00:00:55.000");
 const assign = async () => {
     // const random  = await import("random");
     deviceIds.forEach(deviceId => {
@@ -89,7 +89,10 @@ const upload = async (bulk) => {
         client = new elasticsearch_1.Client({
             node: process.env.ELASTIC_URL,
             tls: {
-                ca: Buffer.from(process.env.CA_64_KEY, 'base64').toString('utf8')
+                ca: Buffer.from(process.env.CA_64_KEY, 'base64').toString('utf8'),
+                checkServerIdentity: (host, cert) => {
+                    return undefined;
+                }
             },
             auth: {
                 username: process.env.ELASTIC_USERNAME ?? "",

es_data_provider/scripts/city_list.ts

@@ -75,7 +75,11 @@ const upload = async (bulk: any[]) => {
         client = new Client({
             node: process.env.ELASTIC_URL,
             tls: {
-                ca: Buffer.from(process.env.CA_64_KEY, 'base64').toString('utf8')
+                ca: Buffer.from(process.env.CA_64_KEY, 'base64').toString('utf8'),
+                checkServerIdentity : (host, cert) => {
+                    return undefined
+
+                }
 
             },
             auth: {

es_data_provider/scripts/event_generator.ts

@@ -39,7 +39,7 @@ const deviceToPincode: { [key: string]: string } = {};
 
 
 // Define base timestamp
-const baseTimestamp: DateTime = DateTime.fromISO("2023-10-22T13:01:55.000");
+const baseTimestamp: DateTime = DateTime.fromISO("2024-03-02T00:00:55.000");
 
 const assign = async () => {
     // const random  = await import("random");
@@ -122,8 +122,11 @@ const upload = async (bulk: any[]) => {
         client = new Client({
             node: process.env.ELASTIC_URL,
             tls: {
-                ca: Buffer.from(process.env.CA_64_KEY, 'base64').toString('utf8')
+                ca: Buffer.from(process.env.CA_64_KEY, 'base64').toString('utf8'),
+                checkServerIdentity : (host, cert) => {
+                    return undefined
 
+                }
             },
             auth: {
                 username: process.env.ELASTIC_USERNAME ?? "",

src/data/elastic/elastic.ts

@@ -28,9 +28,36 @@ export const getElasticClient = async () => {
 
 function getElasticOptions(): ClientOptions {
     // this branch is for dev
-    return {
-        node: DEFAULTS.node,
-    };
+
+    if (process.env.NEXT_ELASTIC_CA_64_KEY) {
+
+        console.log("getElasticOptions elastic : ", )
+        return {
+            node: process.env.NEXT_ELASTIC_URL,
+            tls: {
+                ca: Buffer.from(process.env.NEXT_ELASTIC_CA_64_KEY, 'base64').toString('utf8'),
+                checkServerIdentity : (host, cert) => {
+                    return undefined
+
+                }
+
+            },
+            
+            auth: {
+                username: process.env.NEXT_ELASTIC_USERNAME ?? "",
+                password: process.env.NEXT_ELASTIC_PASSWORD ?? ""
+            }
+
+        };
+    } else {
+       return {
+            node: process.env.NEXT_ELASTIC_URL,
+
+        };
+    }
+    // return {
+    //     node: DEFAULTS.node,
+    // };
 }
 
 // process.env.NEXT_PUBLIC_RECAPTCHA_CLIENT

src/ui/common/side-nav/side-nav.tsx

@@ -115,7 +115,7 @@ const SideNav: FC<SideNavProps> = (props) => {
       />
       <Box sx={{ display: 'flex', gap: 2, minHeight: "4rem", alignItems: 'center', justifyContent: 'center' }}>
         <ElectricBoltRounded />
-        <Typography fontWeight="xl">SmarDtv</Typography>
+        <Typography fontWeight="xl">SwampedDtv</Typography>
         {/* <ColorSchemeToggle sx={{ ml: 'auto' }} /> */}
       </Box>
       <Box