From b51287f2ba8596c0594b7f83f9be5ef62116a068 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oleksis=20Fraga=20Men=C3=A9ndez?= Date: Sun, 8 Oct 2023 23:13:42 -0400 Subject: [PATCH 01/10] [membership_map] JSON schema based on Hacktoberfest 2023 Microsoft Office Form Add Faker users.json data Add main script to generate the membership HTML map Resolve #10 --- .pre-commit-config.yaml | 1 + _membership/__main__.py | 114 + _membership/membership_map.html | 124336 +++++++++++++++++++++++++++++ _membership/schema.json | 20 + _membership/users.json | 827 + requirements-dev.txt | 5 + 6 files changed, 125303 insertions(+) create mode 100644 _membership/__main__.py create mode 100644 _membership/membership_map.html create mode 100644 _membership/schema.json create mode 100644 _membership/users.json diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 70a6f43..ffd8eb3 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,6 +8,7 @@ repos: - id: end-of-file-fixer - id: check-yaml - id: check-added-large-files + args: ["--maxkb=7168"] - repo: https://github.com/pre-commit/mirrors-prettier rev: v3.0.3 hooks: diff --git a/_membership/__main__.py b/_membership/__main__.py new file mode 100644 index 0000000..1e0f671 --- /dev/null +++ b/_membership/__main__.py @@ -0,0 +1,114 @@ +# https://en.wikipedia.org/wiki/GeoJSON +# https://realpython.com/python-folium-web-maps-from-data/#create-a-choropleth-map-with-your-data +# https://geopandas.org/en/stable/gallery/polygon_plotting_with_folium.html +import functools +import json +import random +from pathlib import Path + +import faker +import folium +import geopy +import pandas as pd +import requests + +fake = faker.Faker() + +continents = ["Africa", "Asia", "Australia", "Europe", "North America", "South America"] +# Based on Discord members +num_users = 165 +users = [] +users_path = Path(__file__).parent / "users.json" +membership_path = Path(__file__).parent / "membership_map.html" + +print("[Faker] Generating fake users...") + +for _ in range(num_users): + user = {"full_name": fake.name()} + user["discord_username"] = f"{fake.user_name()}#{random.randint(1000, 9999)}" + user["continent_location"] = random.choices( + continents, weights=[0.15, 0.15, 0.3, 0.5, 0.7, 0.25], k=1 + )[0] + users.append(user) + +users_json = json.dumps(users, indent=2) + +with users_path.open("w") as f: + f.write(users_json) + +print("Saved to users.json") + +users_df = pd.read_json(users_path) +geolocator = geopy.Nominatim(user_agent="blackpythondevs.github.io") + + +# @lru_cache decorator with a maxsize of 6 (the number of continents) +@functools.lru_cache(maxsize=6) +def get_continent_coords(continent): + location = geolocator.geocode(continent) + return (location.latitude, location.longitude) + + +print("[geopy] Getting coordinates of continents...") + +users_df["continent_coords"] = users_df["continent_location"].apply( + get_continent_coords +) +# Group the DataFrame by continent location and count the number of users +# Also keep the first value of the continent coordinates for each group +users_by_continent = users_df.groupby("continent_location").agg( + user_count=("full_name", "count"), + continent_coords=("continent_location", lambda x: get_continent_coords(x.iloc[0])), +) + +print("Members per continent:") +print(f"{users_by_continent}\n") + +m = folium.Map(location=[0, 0], zoom_start=2) +# heat_data = [] +geo_data = json.loads( + requests.get( + "https://geojson.xyz/naturalearth-3.3.0/ne_50m_admin_0_countries.geojson" + ).text +) + +for index, row in users_by_continent.iterrows(): + continent = index + user_count = row["user_count"] + coords = row["continent_coords"] + # heat_data.append([coords[0], coords[1], user_count]) + # Marker with the coordinates and a popup text + marker = folium.Marker( + location=coords, + popup=f"{continent}: {user_count} members", + icon=folium.Icon(color="blue"), + ) + marker.add_to(m) + + +# heat_map = plugins.HeatMap( +# heat_data, +# radius=50, +# gradient={0.4: "blue", 0.65: "lime", 1: "red"}, +# min_opacity=0.5, +# ) +# heat_map.add_to(m) + +users_by_continent = users_by_continent.reset_index(names=["continent"]) + +folium.Choropleth( + geo_data=geo_data, + name="choropleth", + data=users_by_continent, + columns=["continent", "user_count"], + key_on="feature.properties.continent", # by name + fill_color="YlOrRd", # ‘YlGn’, ‘YlOrRd’, ‘BuPu’ + fill_opacity=0.7, + line_opacity=0.2, + legend_name="Number of members by continent", +).add_to(m) + +folium.LayerControl().add_to(m) + +m.save(membership_path) +print(f"{membership_path} saved.") diff --git a/_membership/membership_map.html b/_membership/membership_map.html new file mode 100644 index 0000000..ccab92b --- /dev/null +++ b/_membership/membership_map.html @@ -0,0 +1,124336 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + diff --git a/_membership/schema.json b/_membership/schema.json new file mode 100644 index 0000000..f367c44 --- /dev/null +++ b/_membership/schema.json @@ -0,0 +1,20 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "title": "User", + "type": "object", + "properties": { + "full_name": { + "type": "string", + "minLength": 1 + }, + "discord_username": { + "type": "string", + "pattern": "^\\w+#\\d{4}$" + }, + "continent_location": { + "type": "string", + "enum": ["Africa", "Asia", "Australia", "Europe", "North America", "South America"] + } + }, + "required": ["full_name", "discord_username", "continent_location"] +} diff --git a/_membership/users.json b/_membership/users.json new file mode 100644 index 0000000..a38f397 --- /dev/null +++ b/_membership/users.json @@ -0,0 +1,827 @@ +[ + { + "full_name": "Vincent Richardson", + "discord_username": "rosalesvanessa#2884", + "continent_location": "Australia" + }, + { + "full_name": "Christina Ali", + "discord_username": "ashleykelly#9303", + "continent_location": "Australia" + }, + { + "full_name": "Emily Reid", + "discord_username": "friggs#1151", + "continent_location": "Australia" + }, + { + "full_name": "Danielle Rivera", + "discord_username": "campbellchristopher#6317", + "continent_location": "Europe" + }, + { + "full_name": "James Thomas", + "discord_username": "billy29#3480", + "continent_location": "Africa" + }, + { + "full_name": "Margaret Vazquez", + "discord_username": "hmorris#4033", + "continent_location": "Australia" + }, + { + "full_name": "Joseph Carroll", + "discord_username": "rushrachel#6635", + "continent_location": "North America" + }, + { + "full_name": "Rebecca Logan", + "discord_username": "matthew63#6890", + "continent_location": "Europe" + }, + { + "full_name": "Stephanie Mueller", + "discord_username": "nayala#6617", + "continent_location": "North America" + }, + { + "full_name": "Susan Walker", + "discord_username": "sean48#5751", + "continent_location": "South America" + }, + { + "full_name": "Lee Estrada", + "discord_username": "mmoore#4776", + "continent_location": "North America" + }, + { + "full_name": "Sue Moreno", + "discord_username": "cblankenship#8392", + "continent_location": "North America" + }, + { + "full_name": "James Garcia", + "discord_username": "carterjacob#6668", + "continent_location": "North America" + }, + { + "full_name": "Brenda Clark", + "discord_username": "timothyellison#6592", + "continent_location": "North America" + }, + { + "full_name": "Julie Powell", + "discord_username": "bgonzalez#8010", + "continent_location": "Australia" + }, + { + "full_name": "Ryan Thomas", + "discord_username": "smithpaul#6613", + "continent_location": "Europe" + }, + { + "full_name": "Dominique Jacobs", + "discord_username": "wfrancis#1119", + "continent_location": "North America" + }, + { + "full_name": "Barry Pennington", + "discord_username": "katiebaldwin#8713", + "continent_location": "South America" + }, + { + "full_name": "Randy Carter", + "discord_username": "stevenkim#8307", + "continent_location": "North America" + }, + { + "full_name": "Brian Bird", + "discord_username": "joel79#5510", + "continent_location": "Africa" + }, + { + "full_name": "Cindy Hall", + "discord_username": "kwilliams#6435", + "continent_location": "North America" + }, + { + "full_name": "Emily Clark", + "discord_username": "garrettanthony#3518", + "continent_location": "North America" + }, + { + "full_name": "Leslie Kelly", + "discord_username": "lambenjamin#9618", + "continent_location": "Australia" + }, + { + "full_name": "Jaime Hall", + "discord_username": "hwhite#1310", + "continent_location": "North America" + }, + { + "full_name": "Charles Thomas", + "discord_username": "johnsonmaria#4256", + "continent_location": "South America" + }, + { + "full_name": "Alison Ross", + "discord_username": "bcampbell#9511", + "continent_location": "Australia" + }, + { + "full_name": "Jeremy Acosta", + "discord_username": "monica00#3410", + "continent_location": "Africa" + }, + { + "full_name": "Haley Roman", + "discord_username": "patrick40#5051", + "continent_location": "North America" + }, + { + "full_name": "Allison Swanson", + "discord_username": "joel89#2719", + "continent_location": "Europe" + }, + { + "full_name": "Michael Miller", + "discord_username": "sarah56#5854", + "continent_location": "Australia" + }, + { + "full_name": "Oscar Valdez", + "discord_username": "barbara89#2127", + "continent_location": "North America" + }, + { + "full_name": "Patricia Allen", + "discord_username": "wrightteresa#2302", + "continent_location": "North America" + }, + { + "full_name": "Heather Blanchard", + "discord_username": "fhill#9925", + "continent_location": "Europe" + }, + { + "full_name": "Sheila Olsen", + "discord_username": "greenekayla#4848", + "continent_location": "Africa" + }, + { + "full_name": "Caroline Mendoza", + "discord_username": "jbruce#4858", + "continent_location": "Africa" + }, + { + "full_name": "Craig Bird", + "discord_username": "sean92#3572", + "continent_location": "Europe" + }, + { + "full_name": "Ann Williams", + "discord_username": "patriciahudson#4201", + "continent_location": "North America" + }, + { + "full_name": "Sharon Hurst", + "discord_username": "sabrinawu#1429", + "continent_location": "North America" + }, + { + "full_name": "Erin Sutton", + "discord_username": "angelica85#4411", + "continent_location": "North America" + }, + { + "full_name": "Courtney Jimenez", + "discord_username": "lauren92#3633", + "continent_location": "Asia" + }, + { + "full_name": "Erik Johnson", + "discord_username": "bradleydiaz#8751", + "continent_location": "Europe" + }, + { + "full_name": "Margaret Lucas", + "discord_username": "seangarcia#7675", + "continent_location": "North America" + }, + { + "full_name": "Ryan Lee", + "discord_username": "breannadaniels#5783", + "continent_location": "South America" + }, + { + "full_name": "Sarah Ingram", + "discord_username": "royhuff#7507", + "continent_location": "Europe" + }, + { + "full_name": "Amanda Pineda", + "discord_username": "garciasteven#9247", + "continent_location": "North America" + }, + { + "full_name": "Alexander Lopez", + "discord_username": "flynch#9570", + "continent_location": "North America" + }, + { + "full_name": "Mrs. Gina Morris", + "discord_username": "david06#3747", + "continent_location": "Asia" + }, + { + "full_name": "James Anderson", + "discord_username": "johnsonmichael#5640", + "continent_location": "Africa" + }, + { + "full_name": "Ryan Miller", + "discord_username": "josephpena#7417", + "continent_location": "North America" + }, + { + "full_name": "Brenda Martin", + "discord_username": "zking#3724", + "continent_location": "Australia" + }, + { + "full_name": "Jill Collins", + "discord_username": "zphillips#6899", + "continent_location": "North America" + }, + { + "full_name": "Michael Williams", + "discord_username": "michael12#4100", + "continent_location": "Europe" + }, + { + "full_name": "Christy Miller", + "discord_username": "qdavis#2594", + "continent_location": "South America" + }, + { + "full_name": "Joseph Hill", + "discord_username": "laurieallen#5192", + "continent_location": "Asia" + }, + { + "full_name": "Sheena Johnson", + "discord_username": "gonzalezsusan#5120", + "continent_location": "South America" + }, + { + "full_name": "Alison Wu", + "discord_username": "markjohnson#2150", + "continent_location": "North America" + }, + { + "full_name": "Mary Henderson", + "discord_username": "gonzalesleah#3529", + "continent_location": "Europe" + }, + { + "full_name": "Dr. Mario Richards MD", + "discord_username": "david69#6515", + "continent_location": "South America" + }, + { + "full_name": "Ruben Browning", + "discord_username": "michelle34#7557", + "continent_location": "North America" + }, + { + "full_name": "Timothy Costa", + "discord_username": "bobbyclark#4740", + "continent_location": "North America" + }, + { + "full_name": "Gabriel Murphy", + "discord_username": "ryanjessica#3269", + "continent_location": "Europe" + }, + { + "full_name": "Katie Donovan", + "discord_username": "johnbenson#8590", + "continent_location": "Australia" + }, + { + "full_name": "Jasmine Smith", + "discord_username": "qgonzalez#4108", + "continent_location": "Australia" + }, + { + "full_name": "Thomas Williams", + "discord_username": "vhowell#3834", + "continent_location": "Africa" + }, + { + "full_name": "John Sullivan", + "discord_username": "elizabethaguirre#1887", + "continent_location": "South America" + }, + { + "full_name": "Kylie Perez", + "discord_username": "rebecca93#8926", + "continent_location": "Europe" + }, + { + "full_name": "Justin Davenport", + "discord_username": "fernandezderrick#7269", + "continent_location": "Africa" + }, + { + "full_name": "Angela Fletcher", + "discord_username": "daniel45#4421", + "continent_location": "Europe" + }, + { + "full_name": "Mr. Daniel Medina", + "discord_username": "garciarhonda#2228", + "continent_location": "Europe" + }, + { + "full_name": "Christopher Chang", + "discord_username": "tcochran#3599", + "continent_location": "North America" + }, + { + "full_name": "Ricky Lyons", + "discord_username": "jgreen#6165", + "continent_location": "Africa" + }, + { + "full_name": "James Daugherty", + "discord_username": "donna04#5324", + "continent_location": "Australia" + }, + { + "full_name": "Kristen Kennedy", + "discord_username": "hartmatthew#7384", + "continent_location": "North America" + }, + { + "full_name": "Cheryl Flores", + "discord_username": "smithsamantha#7088", + "continent_location": "North America" + }, + { + "full_name": "Jonathan Mcclain", + "discord_username": "deborah83#5933", + "continent_location": "Europe" + }, + { + "full_name": "Angela Holloway", + "discord_username": "jonathanbrown#7726", + "continent_location": "Europe" + }, + { + "full_name": "Kim Hill", + "discord_username": "tgarcia#8669", + "continent_location": "Europe" + }, + { + "full_name": "Barbara Henderson", + "discord_username": "nicholecarter#4418", + "continent_location": "Australia" + }, + { + "full_name": "Daniel Curtis", + "discord_username": "cholmes#4228", + "continent_location": "North America" + }, + { + "full_name": "Brian Crawford", + "discord_username": "jason70#4759", + "continent_location": "Africa" + }, + { + "full_name": "Deborah Peters", + "discord_username": "fisherkyle#6025", + "continent_location": "North America" + }, + { + "full_name": "Timothy Hall", + "discord_username": "natalie28#8616", + "continent_location": "North America" + }, + { + "full_name": "Derrick Francis", + "discord_username": "smithmelissa#2577", + "continent_location": "North America" + }, + { + "full_name": "Gary Bryant", + "discord_username": "anita77#7184", + "continent_location": "North America" + }, + { + "full_name": "Michelle Mccarty", + "discord_username": "riverajasmine#9628", + "continent_location": "North America" + }, + { + "full_name": "Jeffrey Mcmahon", + "discord_username": "hernandezjohn#5778", + "continent_location": "North America" + }, + { + "full_name": "William Cline", + "discord_username": "vwelch#4899", + "continent_location": "North America" + }, + { + "full_name": "Rachel Roberson", + "discord_username": "jacqueline69#9972", + "continent_location": "North America" + }, + { + "full_name": "Lisa Carter", + "discord_username": "kevin17#5557", + "continent_location": "North America" + }, + { + "full_name": "Kristy Perry", + "discord_username": "millerhailey#2050", + "continent_location": "Europe" + }, + { + "full_name": "Victoria Brock", + "discord_username": "shernandez#9981", + "continent_location": "South America" + }, + { + "full_name": "Natasha Thomas", + "discord_username": "xstevens#3915", + "continent_location": "Australia" + }, + { + "full_name": "Kyle Edwards", + "discord_username": "frankjohnson#9943", + "continent_location": "South America" + }, + { + "full_name": "Alexandra King", + "discord_username": "xgarrison#5378", + "continent_location": "North America" + }, + { + "full_name": "Gloria Bishop", + "discord_username": "elizabeth18#1182", + "continent_location": "North America" + }, + { + "full_name": "Kevin Reed", + "discord_username": "blynn#9745", + "continent_location": "South America" + }, + { + "full_name": "Nicholas Castillo", + "discord_username": "chrisbender#8541", + "continent_location": "North America" + }, + { + "full_name": "Cassandra Smith", + "discord_username": "hpineda#2508", + "continent_location": "Australia" + }, + { + "full_name": "Dr. Tanya Holder", + "discord_username": "yglenn#8031", + "continent_location": "Asia" + }, + { + "full_name": "Luis Mills", + "discord_username": "smcdonald#4527", + "continent_location": "Asia" + }, + { + "full_name": "Jeffrey Bauer", + "discord_username": "jessicajohnson#4426", + "continent_location": "Europe" + }, + { + "full_name": "Hannah Robertson", + "discord_username": "gary22#6206", + "continent_location": "Europe" + }, + { + "full_name": "David Arias", + "discord_username": "phillipmontes#1574", + "continent_location": "North America" + }, + { + "full_name": "Justin Hill MD", + "discord_username": "joejohnson#2471", + "continent_location": "Europe" + }, + { + "full_name": "Jesse Johnson", + "discord_username": "matthewdean#1590", + "continent_location": "North America" + }, + { + "full_name": "Lauren Roberson", + "discord_username": "joseph89#3203", + "continent_location": "North America" + }, + { + "full_name": "Lawrence Farley", + "discord_username": "josephhill#5312", + "continent_location": "North America" + }, + { + "full_name": "Sean Cobb", + "discord_username": "kingshane#9410", + "continent_location": "Asia" + }, + { + "full_name": "Isaiah Powers", + "discord_username": "reevessally#2160", + "continent_location": "Africa" + }, + { + "full_name": "Derek Singleton", + "discord_username": "yateslinda#4094", + "continent_location": "Europe" + }, + { + "full_name": "Stephanie Lyons", + "discord_username": "gsmith#3057", + "continent_location": "North America" + }, + { + "full_name": "Mark Diaz", + "discord_username": "lisakim#4917", + "continent_location": "Australia" + }, + { + "full_name": "Sarah Sanchez", + "discord_username": "phillip40#2272", + "continent_location": "North America" + }, + { + "full_name": "Evan Harrison", + "discord_username": "tracy66#9161", + "continent_location": "Europe" + }, + { + "full_name": "Paul Williams", + "discord_username": "slara#8414", + "continent_location": "North America" + }, + { + "full_name": "Anthony Duncan", + "discord_username": "delgadojanet#8197", + "continent_location": "South America" + }, + { + "full_name": "Daniel Beard", + "discord_username": "qho#8529", + "continent_location": "South America" + }, + { + "full_name": "Timothy Allen", + "discord_username": "lamlarry#2710", + "continent_location": "Europe" + }, + { + "full_name": "Dominique Moore", + "discord_username": "mcleanbenjamin#2345", + "continent_location": "Europe" + }, + { + "full_name": "Jennifer Dixon", + "discord_username": "megan78#9939", + "continent_location": "Australia" + }, + { + "full_name": "Christopher Floyd", + "discord_username": "barreraannette#6820", + "continent_location": "Europe" + }, + { + "full_name": "Jerry Arias", + "discord_username": "victoriawashington#4182", + "continent_location": "North America" + }, + { + "full_name": "Kathryn Garcia", + "discord_username": "miranda90#3207", + "continent_location": "South America" + }, + { + "full_name": "Amber Flowers", + "discord_username": "garrettleon#7443", + "continent_location": "Africa" + }, + { + "full_name": "Eric Newman", + "discord_username": "ronnie89#1427", + "continent_location": "South America" + }, + { + "full_name": "Jeremy Elliott", + "discord_username": "guerrarandy#8085", + "continent_location": "Asia" + }, + { + "full_name": "Jason Castro", + "discord_username": "williamsrobert#8602", + "continent_location": "South America" + }, + { + "full_name": "Daniel Walker", + "discord_username": "fwest#5208", + "continent_location": "Africa" + }, + { + "full_name": "Sarah Davis", + "discord_username": "nicole34#7355", + "continent_location": "Africa" + }, + { + "full_name": "Daniel Perez", + "discord_username": "robinsoncarol#5393", + "continent_location": "Australia" + }, + { + "full_name": "Mr. Michael Miller", + "discord_username": "torrescraig#5529", + "continent_location": "Europe" + }, + { + "full_name": "Nicholas Jackson", + "discord_username": "mcfarlandconnie#4227", + "continent_location": "South America" + }, + { + "full_name": "Alexander Villa", + "discord_username": "zgarcia#6853", + "continent_location": "Africa" + }, + { + "full_name": "Angela Evans", + "discord_username": "twilliams#8789", + "continent_location": "Europe" + }, + { + "full_name": "Tammy Chaney", + "discord_username": "jessicacasey#4359", + "continent_location": "Australia" + }, + { + "full_name": "Brittney Acosta", + "discord_username": "wwalker#1790", + "continent_location": "North America" + }, + { + "full_name": "Brian Nelson", + "discord_username": "dickersonnicole#9818", + "continent_location": "Europe" + }, + { + "full_name": "Yvonne Parsons", + "discord_username": "christinafigueroa#5736", + "continent_location": "North America" + }, + { + "full_name": "Pamela Garcia", + "discord_username": "sarahcooper#5445", + "continent_location": "North America" + }, + { + "full_name": "Duane Ramos", + "discord_username": "melissawright#4503", + "continent_location": "Africa" + }, + { + "full_name": "Michael Jones", + "discord_username": "brian24#2667", + "continent_location": "Asia" + }, + { + "full_name": "Jacob Gonzalez", + "discord_username": "austinsean#1647", + "continent_location": "Africa" + }, + { + "full_name": "James Jones", + "discord_username": "lmullins#5887", + "continent_location": "North America" + }, + { + "full_name": "Timothy Maldonado", + "discord_username": "emilyfisher#1097", + "continent_location": "North America" + }, + { + "full_name": "Brenda Rodgers", + "discord_username": "cunninghamdiana#9549", + "continent_location": "South America" + }, + { + "full_name": "Jason Arias", + "discord_username": "tyrone21#3136", + "continent_location": "Europe" + }, + { + "full_name": "Kerri Hodges", + "discord_username": "rachel55#2458", + "continent_location": "Asia" + }, + { + "full_name": "Cindy Dougherty", + "discord_username": "katie41#9951", + "continent_location": "South America" + }, + { + "full_name": "Michael Deleon", + "discord_username": "samantha12#6511", + "continent_location": "Europe" + }, + { + "full_name": "Mark Pierce", + "discord_username": "taylorgregory#2903", + "continent_location": "North America" + }, + { + "full_name": "Jeff Kelly", + "discord_username": "mackwilliam#9808", + "continent_location": "North America" + }, + { + "full_name": "Steven Butler", + "discord_username": "josechurch#4741", + "continent_location": "Europe" + }, + { + "full_name": "Richard Oneill", + "discord_username": "coxnicholas#1319", + "continent_location": "South America" + }, + { + "full_name": "Jeffrey Foley", + "discord_username": "frenchashley#8534", + "continent_location": "South America" + }, + { + "full_name": "Daniel Jackson MD", + "discord_username": "edwardmitchell#9761", + "continent_location": "North America" + }, + { + "full_name": "John Alvarez", + "discord_username": "sotojeffrey#5485", + "continent_location": "North America" + }, + { + "full_name": "Michael Cohen", + "discord_username": "rachel68#1086", + "continent_location": "Europe" + }, + { + "full_name": "Kyle Harrison", + "discord_username": "wmoore#1943", + "continent_location": "Europe" + }, + { + "full_name": "James Hill", + "discord_username": "mistypollard#8854", + "continent_location": "South America" + }, + { + "full_name": "Dawn Duncan", + "discord_username": "crystal08#5859", + "continent_location": "North America" + }, + { + "full_name": "Michael Wright", + "discord_username": "sherimanning#5154", + "continent_location": "North America" + }, + { + "full_name": "Angelica Hays", + "discord_username": "hernandezandrew#7393", + "continent_location": "North America" + }, + { + "full_name": "Christopher Butler", + "discord_username": "brenda66#8078", + "continent_location": "North America" + }, + { + "full_name": "Kelsey Bryant", + "discord_username": "perrydavid#8450", + "continent_location": "North America" + }, + { + "full_name": "Amy Spears", + "discord_username": "clayton13#2079", + "continent_location": "Europe" + } +] diff --git a/requirements-dev.txt b/requirements-dev.txt index f2c92ba..948b37d 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,3 +1,8 @@ black +isort pre-commit pytest-playwright +Faker +folium +geopy +pandas From 145f6d231572cb05679e6eacb13daf342a6193af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oleksis=20Fraga=20Men=C3=A9ndez?= Date: Mon, 9 Oct 2023 13:50:08 -0400 Subject: [PATCH 02/10] [jekyll] Add membership collection --- .prettierignore | 1 + _config.yml | 5 + _membership/__main__.py | 2 +- ...embership_map.html => membership-map.html} | 241 ++--- _membership/users.json | 880 +++++++++--------- 5 files changed, 570 insertions(+), 559 deletions(-) rename _membership/{membership_map.html => membership-map.html} (99%) diff --git a/.prettierignore b/.prettierignore index ae885d3..4cc807f 100644 --- a/.prettierignore +++ b/.prettierignore @@ -3,3 +3,4 @@ assets/js/index.js _layouts/default.html _layouts/index.html _includes/header.html +_membership\membership-map.html diff --git a/_config.yml b/_config.yml index 3e3ca22..f77bd88 100644 --- a/_config.yml +++ b/_config.yml @@ -65,6 +65,8 @@ exclude: - .venv - requirements*.txt - pytest.ini + - _membership/schema.json + - _membership/users.json # timezone: America/Toronto permalink: "/:path/" @@ -73,6 +75,9 @@ collections: articles: output: true permalink: "/:path/" + membership: + output: false + permalink: "/:path/" defaults: # - scope: diff --git a/_membership/__main__.py b/_membership/__main__.py index 1e0f671..3bd38c3 100644 --- a/_membership/__main__.py +++ b/_membership/__main__.py @@ -19,7 +19,7 @@ num_users = 165 users = [] users_path = Path(__file__).parent / "users.json" -membership_path = Path(__file__).parent / "membership_map.html" +membership_path = Path(__file__).parent / "membership-map.html" print("[Faker] Generating fake users...") diff --git a/_membership/membership_map.html b/_membership/membership-map.html similarity index 99% rename from _membership/membership_map.html rename to _membership/membership-map.html index ccab92b..0bc1423 100644 --- a/_membership/membership_map.html +++ b/_membership/membership-map.html @@ -43,7 +43,7 @@ initial-scale=1.0, maximum-scale=1.0, user-scalable=no" /> + + + + + + + + + + + + + + + + + + +
+ + + diff --git a/_membership/schema.json b/_membership/schema.json new file mode 100644 index 0000000..f367c44 --- /dev/null +++ b/_membership/schema.json @@ -0,0 +1,20 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "title": "User", + "type": "object", + "properties": { + "full_name": { + "type": "string", + "minLength": 1 + }, + "discord_username": { + "type": "string", + "pattern": "^\\w+#\\d{4}$" + }, + "continent_location": { + "type": "string", + "enum": ["Africa", "Asia", "Australia", "Europe", "North America", "South America"] + } + }, + "required": ["full_name", "discord_username", "continent_location"] +} diff --git a/_membership/users.json b/_membership/users.json new file mode 100644 index 0000000..a38f397 --- /dev/null +++ b/_membership/users.json @@ -0,0 +1,827 @@ +[ + { + "full_name": "Vincent Richardson", + "discord_username": "rosalesvanessa#2884", + "continent_location": "Australia" + }, + { + "full_name": "Christina Ali", + "discord_username": "ashleykelly#9303", + "continent_location": "Australia" + }, + { + "full_name": "Emily Reid", + "discord_username": "friggs#1151", + "continent_location": "Australia" + }, + { + "full_name": "Danielle Rivera", + "discord_username": "campbellchristopher#6317", + "continent_location": "Europe" + }, + { + "full_name": "James Thomas", + "discord_username": "billy29#3480", + "continent_location": "Africa" + }, + { + "full_name": "Margaret Vazquez", + "discord_username": "hmorris#4033", + "continent_location": "Australia" + }, + { + "full_name": "Joseph Carroll", + "discord_username": "rushrachel#6635", + "continent_location": "North America" + }, + { + "full_name": "Rebecca Logan", + "discord_username": "matthew63#6890", + "continent_location": "Europe" + }, + { + "full_name": "Stephanie Mueller", + "discord_username": "nayala#6617", + "continent_location": "North America" + }, + { + "full_name": "Susan Walker", + "discord_username": "sean48#5751", + "continent_location": "South America" + }, + { + "full_name": "Lee Estrada", + "discord_username": "mmoore#4776", + "continent_location": "North America" + }, + { + "full_name": "Sue Moreno", + "discord_username": "cblankenship#8392", + "continent_location": "North America" + }, + { + "full_name": "James Garcia", + "discord_username": "carterjacob#6668", + "continent_location": "North America" + }, + { + "full_name": "Brenda Clark", + "discord_username": "timothyellison#6592", + "continent_location": "North America" + }, + { + "full_name": "Julie Powell", + "discord_username": "bgonzalez#8010", + "continent_location": "Australia" + }, + { + "full_name": "Ryan Thomas", + "discord_username": "smithpaul#6613", + "continent_location": "Europe" + }, + { + "full_name": "Dominique Jacobs", + "discord_username": "wfrancis#1119", + "continent_location": "North America" + }, + { + "full_name": "Barry Pennington", + "discord_username": "katiebaldwin#8713", + "continent_location": "South America" + }, + { + "full_name": "Randy Carter", + "discord_username": "stevenkim#8307", + "continent_location": "North America" + }, + { + "full_name": "Brian Bird", + "discord_username": "joel79#5510", + "continent_location": "Africa" + }, + { + "full_name": "Cindy Hall", + "discord_username": "kwilliams#6435", + "continent_location": "North America" + }, + { + "full_name": "Emily Clark", + "discord_username": "garrettanthony#3518", + "continent_location": "North America" + }, + { + "full_name": "Leslie Kelly", + "discord_username": "lambenjamin#9618", + "continent_location": "Australia" + }, + { + "full_name": "Jaime Hall", + "discord_username": "hwhite#1310", + "continent_location": "North America" + }, + { + "full_name": "Charles Thomas", + "discord_username": "johnsonmaria#4256", + "continent_location": "South America" + }, + { + "full_name": "Alison Ross", + "discord_username": "bcampbell#9511", + "continent_location": "Australia" + }, + { + "full_name": "Jeremy Acosta", + "discord_username": "monica00#3410", + "continent_location": "Africa" + }, + { + "full_name": "Haley Roman", + "discord_username": "patrick40#5051", + "continent_location": "North America" + }, + { + "full_name": "Allison Swanson", + "discord_username": "joel89#2719", + "continent_location": "Europe" + }, + { + "full_name": "Michael Miller", + "discord_username": "sarah56#5854", + "continent_location": "Australia" + }, + { + "full_name": "Oscar Valdez", + "discord_username": "barbara89#2127", + "continent_location": "North America" + }, + { + "full_name": "Patricia Allen", + "discord_username": "wrightteresa#2302", + "continent_location": "North America" + }, + { + "full_name": "Heather Blanchard", + "discord_username": "fhill#9925", + "continent_location": "Europe" + }, + { + "full_name": "Sheila Olsen", + "discord_username": "greenekayla#4848", + "continent_location": "Africa" + }, + { + "full_name": "Caroline Mendoza", + "discord_username": "jbruce#4858", + "continent_location": "Africa" + }, + { + "full_name": "Craig Bird", + "discord_username": "sean92#3572", + "continent_location": "Europe" + }, + { + "full_name": "Ann Williams", + "discord_username": "patriciahudson#4201", + "continent_location": "North America" + }, + { + "full_name": "Sharon Hurst", + "discord_username": "sabrinawu#1429", + "continent_location": "North America" + }, + { + "full_name": "Erin Sutton", + "discord_username": "angelica85#4411", + "continent_location": "North America" + }, + { + "full_name": "Courtney Jimenez", + "discord_username": "lauren92#3633", + "continent_location": "Asia" + }, + { + "full_name": "Erik Johnson", + "discord_username": "bradleydiaz#8751", + "continent_location": "Europe" + }, + { + "full_name": "Margaret Lucas", + "discord_username": "seangarcia#7675", + "continent_location": "North America" + }, + { + "full_name": "Ryan Lee", + "discord_username": "breannadaniels#5783", + "continent_location": "South America" + }, + { + "full_name": "Sarah Ingram", + "discord_username": "royhuff#7507", + "continent_location": "Europe" + }, + { + "full_name": "Amanda Pineda", + "discord_username": "garciasteven#9247", + "continent_location": "North America" + }, + { + "full_name": "Alexander Lopez", + "discord_username": "flynch#9570", + "continent_location": "North America" + }, + { + "full_name": "Mrs. Gina Morris", + "discord_username": "david06#3747", + "continent_location": "Asia" + }, + { + "full_name": "James Anderson", + "discord_username": "johnsonmichael#5640", + "continent_location": "Africa" + }, + { + "full_name": "Ryan Miller", + "discord_username": "josephpena#7417", + "continent_location": "North America" + }, + { + "full_name": "Brenda Martin", + "discord_username": "zking#3724", + "continent_location": "Australia" + }, + { + "full_name": "Jill Collins", + "discord_username": "zphillips#6899", + "continent_location": "North America" + }, + { + "full_name": "Michael Williams", + "discord_username": "michael12#4100", + "continent_location": "Europe" + }, + { + "full_name": "Christy Miller", + "discord_username": "qdavis#2594", + "continent_location": "South America" + }, + { + "full_name": "Joseph Hill", + "discord_username": "laurieallen#5192", + "continent_location": "Asia" + }, + { + "full_name": "Sheena Johnson", + "discord_username": "gonzalezsusan#5120", + "continent_location": "South America" + }, + { + "full_name": "Alison Wu", + "discord_username": "markjohnson#2150", + "continent_location": "North America" + }, + { + "full_name": "Mary Henderson", + "discord_username": "gonzalesleah#3529", + "continent_location": "Europe" + }, + { + "full_name": "Dr. Mario Richards MD", + "discord_username": "david69#6515", + "continent_location": "South America" + }, + { + "full_name": "Ruben Browning", + "discord_username": "michelle34#7557", + "continent_location": "North America" + }, + { + "full_name": "Timothy Costa", + "discord_username": "bobbyclark#4740", + "continent_location": "North America" + }, + { + "full_name": "Gabriel Murphy", + "discord_username": "ryanjessica#3269", + "continent_location": "Europe" + }, + { + "full_name": "Katie Donovan", + "discord_username": "johnbenson#8590", + "continent_location": "Australia" + }, + { + "full_name": "Jasmine Smith", + "discord_username": "qgonzalez#4108", + "continent_location": "Australia" + }, + { + "full_name": "Thomas Williams", + "discord_username": "vhowell#3834", + "continent_location": "Africa" + }, + { + "full_name": "John Sullivan", + "discord_username": "elizabethaguirre#1887", + "continent_location": "South America" + }, + { + "full_name": "Kylie Perez", + "discord_username": "rebecca93#8926", + "continent_location": "Europe" + }, + { + "full_name": "Justin Davenport", + "discord_username": "fernandezderrick#7269", + "continent_location": "Africa" + }, + { + "full_name": "Angela Fletcher", + "discord_username": "daniel45#4421", + "continent_location": "Europe" + }, + { + "full_name": "Mr. Daniel Medina", + "discord_username": "garciarhonda#2228", + "continent_location": "Europe" + }, + { + "full_name": "Christopher Chang", + "discord_username": "tcochran#3599", + "continent_location": "North America" + }, + { + "full_name": "Ricky Lyons", + "discord_username": "jgreen#6165", + "continent_location": "Africa" + }, + { + "full_name": "James Daugherty", + "discord_username": "donna04#5324", + "continent_location": "Australia" + }, + { + "full_name": "Kristen Kennedy", + "discord_username": "hartmatthew#7384", + "continent_location": "North America" + }, + { + "full_name": "Cheryl Flores", + "discord_username": "smithsamantha#7088", + "continent_location": "North America" + }, + { + "full_name": "Jonathan Mcclain", + "discord_username": "deborah83#5933", + "continent_location": "Europe" + }, + { + "full_name": "Angela Holloway", + "discord_username": "jonathanbrown#7726", + "continent_location": "Europe" + }, + { + "full_name": "Kim Hill", + "discord_username": "tgarcia#8669", + "continent_location": "Europe" + }, + { + "full_name": "Barbara Henderson", + "discord_username": "nicholecarter#4418", + "continent_location": "Australia" + }, + { + "full_name": "Daniel Curtis", + "discord_username": "cholmes#4228", + "continent_location": "North America" + }, + { + "full_name": "Brian Crawford", + "discord_username": "jason70#4759", + "continent_location": "Africa" + }, + { + "full_name": "Deborah Peters", + "discord_username": "fisherkyle#6025", + "continent_location": "North America" + }, + { + "full_name": "Timothy Hall", + "discord_username": "natalie28#8616", + "continent_location": "North America" + }, + { + "full_name": "Derrick Francis", + "discord_username": "smithmelissa#2577", + "continent_location": "North America" + }, + { + "full_name": "Gary Bryant", + "discord_username": "anita77#7184", + "continent_location": "North America" + }, + { + "full_name": "Michelle Mccarty", + "discord_username": "riverajasmine#9628", + "continent_location": "North America" + }, + { + "full_name": "Jeffrey Mcmahon", + "discord_username": "hernandezjohn#5778", + "continent_location": "North America" + }, + { + "full_name": "William Cline", + "discord_username": "vwelch#4899", + "continent_location": "North America" + }, + { + "full_name": "Rachel Roberson", + "discord_username": "jacqueline69#9972", + "continent_location": "North America" + }, + { + "full_name": "Lisa Carter", + "discord_username": "kevin17#5557", + "continent_location": "North America" + }, + { + "full_name": "Kristy Perry", + "discord_username": "millerhailey#2050", + "continent_location": "Europe" + }, + { + "full_name": "Victoria Brock", + "discord_username": "shernandez#9981", + "continent_location": "South America" + }, + { + "full_name": "Natasha Thomas", + "discord_username": "xstevens#3915", + "continent_location": "Australia" + }, + { + "full_name": "Kyle Edwards", + "discord_username": "frankjohnson#9943", + "continent_location": "South America" + }, + { + "full_name": "Alexandra King", + "discord_username": "xgarrison#5378", + "continent_location": "North America" + }, + { + "full_name": "Gloria Bishop", + "discord_username": "elizabeth18#1182", + "continent_location": "North America" + }, + { + "full_name": "Kevin Reed", + "discord_username": "blynn#9745", + "continent_location": "South America" + }, + { + "full_name": "Nicholas Castillo", + "discord_username": "chrisbender#8541", + "continent_location": "North America" + }, + { + "full_name": "Cassandra Smith", + "discord_username": "hpineda#2508", + "continent_location": "Australia" + }, + { + "full_name": "Dr. Tanya Holder", + "discord_username": "yglenn#8031", + "continent_location": "Asia" + }, + { + "full_name": "Luis Mills", + "discord_username": "smcdonald#4527", + "continent_location": "Asia" + }, + { + "full_name": "Jeffrey Bauer", + "discord_username": "jessicajohnson#4426", + "continent_location": "Europe" + }, + { + "full_name": "Hannah Robertson", + "discord_username": "gary22#6206", + "continent_location": "Europe" + }, + { + "full_name": "David Arias", + "discord_username": "phillipmontes#1574", + "continent_location": "North America" + }, + { + "full_name": "Justin Hill MD", + "discord_username": "joejohnson#2471", + "continent_location": "Europe" + }, + { + "full_name": "Jesse Johnson", + "discord_username": "matthewdean#1590", + "continent_location": "North America" + }, + { + "full_name": "Lauren Roberson", + "discord_username": "joseph89#3203", + "continent_location": "North America" + }, + { + "full_name": "Lawrence Farley", + "discord_username": "josephhill#5312", + "continent_location": "North America" + }, + { + "full_name": "Sean Cobb", + "discord_username": "kingshane#9410", + "continent_location": "Asia" + }, + { + "full_name": "Isaiah Powers", + "discord_username": "reevessally#2160", + "continent_location": "Africa" + }, + { + "full_name": "Derek Singleton", + "discord_username": "yateslinda#4094", + "continent_location": "Europe" + }, + { + "full_name": "Stephanie Lyons", + "discord_username": "gsmith#3057", + "continent_location": "North America" + }, + { + "full_name": "Mark Diaz", + "discord_username": "lisakim#4917", + "continent_location": "Australia" + }, + { + "full_name": "Sarah Sanchez", + "discord_username": "phillip40#2272", + "continent_location": "North America" + }, + { + "full_name": "Evan Harrison", + "discord_username": "tracy66#9161", + "continent_location": "Europe" + }, + { + "full_name": "Paul Williams", + "discord_username": "slara#8414", + "continent_location": "North America" + }, + { + "full_name": "Anthony Duncan", + "discord_username": "delgadojanet#8197", + "continent_location": "South America" + }, + { + "full_name": "Daniel Beard", + "discord_username": "qho#8529", + "continent_location": "South America" + }, + { + "full_name": "Timothy Allen", + "discord_username": "lamlarry#2710", + "continent_location": "Europe" + }, + { + "full_name": "Dominique Moore", + "discord_username": "mcleanbenjamin#2345", + "continent_location": "Europe" + }, + { + "full_name": "Jennifer Dixon", + "discord_username": "megan78#9939", + "continent_location": "Australia" + }, + { + "full_name": "Christopher Floyd", + "discord_username": "barreraannette#6820", + "continent_location": "Europe" + }, + { + "full_name": "Jerry Arias", + "discord_username": "victoriawashington#4182", + "continent_location": "North America" + }, + { + "full_name": "Kathryn Garcia", + "discord_username": "miranda90#3207", + "continent_location": "South America" + }, + { + "full_name": "Amber Flowers", + "discord_username": "garrettleon#7443", + "continent_location": "Africa" + }, + { + "full_name": "Eric Newman", + "discord_username": "ronnie89#1427", + "continent_location": "South America" + }, + { + "full_name": "Jeremy Elliott", + "discord_username": "guerrarandy#8085", + "continent_location": "Asia" + }, + { + "full_name": "Jason Castro", + "discord_username": "williamsrobert#8602", + "continent_location": "South America" + }, + { + "full_name": "Daniel Walker", + "discord_username": "fwest#5208", + "continent_location": "Africa" + }, + { + "full_name": "Sarah Davis", + "discord_username": "nicole34#7355", + "continent_location": "Africa" + }, + { + "full_name": "Daniel Perez", + "discord_username": "robinsoncarol#5393", + "continent_location": "Australia" + }, + { + "full_name": "Mr. Michael Miller", + "discord_username": "torrescraig#5529", + "continent_location": "Europe" + }, + { + "full_name": "Nicholas Jackson", + "discord_username": "mcfarlandconnie#4227", + "continent_location": "South America" + }, + { + "full_name": "Alexander Villa", + "discord_username": "zgarcia#6853", + "continent_location": "Africa" + }, + { + "full_name": "Angela Evans", + "discord_username": "twilliams#8789", + "continent_location": "Europe" + }, + { + "full_name": "Tammy Chaney", + "discord_username": "jessicacasey#4359", + "continent_location": "Australia" + }, + { + "full_name": "Brittney Acosta", + "discord_username": "wwalker#1790", + "continent_location": "North America" + }, + { + "full_name": "Brian Nelson", + "discord_username": "dickersonnicole#9818", + "continent_location": "Europe" + }, + { + "full_name": "Yvonne Parsons", + "discord_username": "christinafigueroa#5736", + "continent_location": "North America" + }, + { + "full_name": "Pamela Garcia", + "discord_username": "sarahcooper#5445", + "continent_location": "North America" + }, + { + "full_name": "Duane Ramos", + "discord_username": "melissawright#4503", + "continent_location": "Africa" + }, + { + "full_name": "Michael Jones", + "discord_username": "brian24#2667", + "continent_location": "Asia" + }, + { + "full_name": "Jacob Gonzalez", + "discord_username": "austinsean#1647", + "continent_location": "Africa" + }, + { + "full_name": "James Jones", + "discord_username": "lmullins#5887", + "continent_location": "North America" + }, + { + "full_name": "Timothy Maldonado", + "discord_username": "emilyfisher#1097", + "continent_location": "North America" + }, + { + "full_name": "Brenda Rodgers", + "discord_username": "cunninghamdiana#9549", + "continent_location": "South America" + }, + { + "full_name": "Jason Arias", + "discord_username": "tyrone21#3136", + "continent_location": "Europe" + }, + { + "full_name": "Kerri Hodges", + "discord_username": "rachel55#2458", + "continent_location": "Asia" + }, + { + "full_name": "Cindy Dougherty", + "discord_username": "katie41#9951", + "continent_location": "South America" + }, + { + "full_name": "Michael Deleon", + "discord_username": "samantha12#6511", + "continent_location": "Europe" + }, + { + "full_name": "Mark Pierce", + "discord_username": "taylorgregory#2903", + "continent_location": "North America" + }, + { + "full_name": "Jeff Kelly", + "discord_username": "mackwilliam#9808", + "continent_location": "North America" + }, + { + "full_name": "Steven Butler", + "discord_username": "josechurch#4741", + "continent_location": "Europe" + }, + { + "full_name": "Richard Oneill", + "discord_username": "coxnicholas#1319", + "continent_location": "South America" + }, + { + "full_name": "Jeffrey Foley", + "discord_username": "frenchashley#8534", + "continent_location": "South America" + }, + { + "full_name": "Daniel Jackson MD", + "discord_username": "edwardmitchell#9761", + "continent_location": "North America" + }, + { + "full_name": "John Alvarez", + "discord_username": "sotojeffrey#5485", + "continent_location": "North America" + }, + { + "full_name": "Michael Cohen", + "discord_username": "rachel68#1086", + "continent_location": "Europe" + }, + { + "full_name": "Kyle Harrison", + "discord_username": "wmoore#1943", + "continent_location": "Europe" + }, + { + "full_name": "James Hill", + "discord_username": "mistypollard#8854", + "continent_location": "South America" + }, + { + "full_name": "Dawn Duncan", + "discord_username": "crystal08#5859", + "continent_location": "North America" + }, + { + "full_name": "Michael Wright", + "discord_username": "sherimanning#5154", + "continent_location": "North America" + }, + { + "full_name": "Angelica Hays", + "discord_username": "hernandezandrew#7393", + "continent_location": "North America" + }, + { + "full_name": "Christopher Butler", + "discord_username": "brenda66#8078", + "continent_location": "North America" + }, + { + "full_name": "Kelsey Bryant", + "discord_username": "perrydavid#8450", + "continent_location": "North America" + }, + { + "full_name": "Amy Spears", + "discord_username": "clayton13#2079", + "continent_location": "Europe" + } +] diff --git a/requirements-dev.txt b/requirements-dev.txt index f2c92ba..948b37d 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,3 +1,8 @@ black +isort pre-commit pytest-playwright +Faker +folium +geopy +pandas From 4d531c29eea09bde22713032c8a3ce2df6754bc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oleksis=20Fraga=20Men=C3=A9ndez?= Date: Mon, 9 Oct 2023 13:50:08 -0400 Subject: [PATCH 08/10] [jekyll] Add membership collection --- .prettierignore | 1 + _config.yml | 5 + _membership/__main__.py | 2 +- ...embership_map.html => membership-map.html} | 241 ++--- _membership/users.json | 880 +++++++++--------- 5 files changed, 570 insertions(+), 559 deletions(-) rename _membership/{membership_map.html => membership-map.html} (99%) diff --git a/.prettierignore b/.prettierignore index 59a7242..d362271 100644 --- a/.prettierignore +++ b/.prettierignore @@ -3,6 +3,7 @@ assets/js/index.js _layouts/default.html _layouts/index.html _includes/header.html +_membership/membership-map.html _includes/social.html _includes/social-item.html _includes/svg_symbol.html diff --git a/_config.yml b/_config.yml index 2808864..a9f8e52 100644 --- a/_config.yml +++ b/_config.yml @@ -76,6 +76,8 @@ exclude: - .venv - requirements*.txt - pytest.ini + - _membership/schema.json + - _membership/users.json # timezone: America/Toronto permalink: "/:path/" @@ -84,6 +86,9 @@ collections: articles: output: true permalink: "/:path/" + membership: + output: false + permalink: "/:path/" defaults: # - scope: diff --git a/_membership/__main__.py b/_membership/__main__.py index 1e0f671..3bd38c3 100644 --- a/_membership/__main__.py +++ b/_membership/__main__.py @@ -19,7 +19,7 @@ num_users = 165 users = [] users_path = Path(__file__).parent / "users.json" -membership_path = Path(__file__).parent / "membership_map.html" +membership_path = Path(__file__).parent / "membership-map.html" print("[Faker] Generating fake users...") diff --git a/_membership/membership_map.html b/_membership/membership-map.html similarity index 99% rename from _membership/membership_map.html rename to _membership/membership-map.html index ccab92b..0bc1423 100644 --- a/_membership/membership_map.html +++ b/_membership/membership-map.html @@ -43,7 +43,7 @@ initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />