Merge branch 'main' into 90-add-linting-action

.github/workflows/build.yml

@@ -24,12 +24,12 @@ jobs:
         run: npm ci
       - run: npm run fetchEvents
       - run: npm run build
-      - name: Commit events-data.js
+      - name: Commit events-data.ts
         run: |
           git status
           git config --global user.name 'Newwwie Bot'
           git config --global user.email '[email protected]'
-          git add src/js/events/events-data.js
+          git add src/js/events/events-data.ts
           git add dist
           git commit -m "Get latest set of Meetup events"
           git push

.prettierignore

@@ -1,2 +1,3 @@
-src/js/events/events-data.js
-src/js/communities/communities-data.js
+src/js/events/events-data.ts
+src/js/communities/community-data.ts
+dist/

CONTRIBUTING.md

@@ -1,8 +1,8 @@
-<img 
+<img
   align="right"
   width="1600px"
   alt="Newwwie Logo"
-  src="newwwie-logo.svg?sanitize=true" 
+  src="newwwie-logo.svg?sanitize=true"
 />
 
 # Contributing to Newwwie Website
@@ -161,9 +161,9 @@ We are still working on having hack days where we can meetup in person and hack
 
 Pulls from the Meetup API based on a list of approved Meetup Group IDs.
 
-[`fetch-events/meetups.js`](fetch-events/meetups.js)
+[`fetch-events/meetups.json`](fetch-events/meetups.json)
 
-You can [edit it directly on the Github Website](https://github.com/newwwie/newwwie.com/edit/main/fetch-events/meetups.js)
+You can [edit it directly on the Github Website](https://github.com/newwwie/newwwie.com/edit/main/fetch-events/meetups.json)
 
 ## Communities page
 
@@ -173,9 +173,9 @@ https://newwwie.com/#community
 
 If you would like to get added, the content is in:
 
-[`src/js/communities/community-data.js`](src/js/communities/community-data.js)
+[`src/js/communities/community-data.ts`](src/js/communities/community-data.ts)
 
-You can [edit it directly on the Github Website](https://github.com/newwwie/newwwie.com/edit/main/src/js/communities/community-data.js)
+You can [edit it directly on the Github Website](https://github.com/newwwie/newwwie.com/edit/main/src/js/communities/community-data.ts)
 
 Here is an example of a high quality entry:
 

README.md

@@ -1,8 +1,8 @@
-<img 
+<img
   align="right"
   width="1600px"
   alt="Newwwie Logo"
-  src="newwwie-logo.svg?sanitize=true" 
+  src="newwwie-logo.svg?sanitize=true"
 />
 
 # newwwie.com
@@ -20,6 +20,16 @@ npm install
 npm run dev
 ```
 
+### Typescript
+
+This repository uses typescript for source files. Currently some typescript errors remain, though at some point (after existing issues in [#119](https://github.com/newwwie/newwwie.com/issues/119) are resolved) webpack will be configured to not build in the presence of typescript errors.
+
+```sh
+npm run typecheck -- --watch
+```
+
+## Contributing
+
 For more information please see our [Contributing Guide](CONTRIBUTING.md)
 
 This includes adding meetup groups and community listings.

fetch-events/event-data-template.njk

@@ -0,0 +1,5 @@
+{#- Template format for the generated event file  -#}
+// Auto Generated on {{ generationTime }}
+import { type EventItem } from "./types";
+
+export const events: readonly EventItem[] = {{ sortedEvents | dump(2) | safe }};

fetch-events/fetch-events.ts

@@ -0,0 +1,62 @@
+import _ from "lodash";
+import axios from "axios";
+import dayjs from "dayjs";
+import path from "path";
+import { readFileSync, writeFileSync } from "fs";
+import { renderString } from "nunjucks";
+
+import { EventItem } from "../src/js/events/types";
+import { GroupEdge, GroupResponse, MEETUP_GQL_QUERY } from "./types";
+import { Meetups } from "./meetups.json";
+
+const MEETUP_GQL_URL = "https://www.meetup.com/gql";
+const END_DATE_RANGE = dayjs().add(3, "month").toISOString(); // Retrieve up to three months from the current date
+const EVENT_OUTPUT_FILE = path.join(__dirname, "../src/js/events/events-data.ts");
+const EVENT_TEMPLATE_FILE = path.join(__dirname, "./event-data-template.njk");
+
+const buildGraphQLQuery = (groupName: string) => ({
+  query: MEETUP_GQL_QUERY,
+  variables: {
+    groupName,
+    endDateRange: END_DATE_RANGE,
+  },
+});
+
+const getGroupEvents = async (groupName: string): Promise<EventItem[]> => {
+  console.log(`Fetching events for "${groupName}"`);
+  const query = buildGraphQLQuery(groupName);
+  const events = (await axios.post(MEETUP_GQL_URL, JSON.stringify(query))).data as GroupResponse;
+
+  // Transform the response
+  const { unifiedEvents, ...group } = events.data.groupByUrlname || {};
+
+  console.log(`Finished fetching events for "${groupName}"`);
+  return (
+    unifiedEvents?.edges?.map((edge: GroupEdge) => ({
+      event: edge.node,
+      group,
+    })) || []
+  );
+};
+
+(async () => {
+  try {
+    console.log("Fetching events");
+    const events = await Promise.all(Meetups.map((eventName: string) => getGroupEvents(eventName)));
+
+    const sortedEvents = _.sortBy(events.flat(), (event: EventItem) => event.event.dateTime);
+
+    console.log("Rendering the events file");
+    const template = readFileSync(EVENT_TEMPLATE_FILE, "utf-8");
+    const rendered = renderString(template, {
+      generationTime: dayjs().toISOString(),
+      sortedEvents,
+    });
+
+    writeFileSync(EVENT_OUTPUT_FILE, rendered);
+
+    console.log("Fetch events complete");
+  } catch (err) {
+    console.error(`Error fetching events: ${err}`);
+  }
+})();