From 0396845c8d929dd6d2ab269245627d8897432b97 Mon Sep 17 00:00:00 2001 From: Glenn Date: Fri, 13 Sep 2024 09:41:17 -0500 Subject: [PATCH] White Mesa onboarding --- .devcontainer/docker-compose.yml | 10 +- .docker/docker-compose.yml | 2 +- .env.example => .env | 11 +- .gitignore | 5 +- .../seeds/development/seed-campaigns-table.js | 224 +++--------------- src/components/DonateMoney.vue | 2 +- src/components/TakeAction.vue | 7 + src/components/UtahLetterLoad.vue | 179 ++++++++++++++ 8 files changed, 232 insertions(+), 208 deletions(-) rename .env.example => .env (81%) create mode 100644 src/components/UtahLetterLoad.vue diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index c60781886..a04a840f7 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -16,7 +16,7 @@ services: - POSTGRESS_DB=postgres - POSTGRES_USER=postgres - POSTGRES_PASSWORD=postgres - - POSTGRES_PORT=5433 + - POSTGRES_PORT=5432 volumes: - ..:/workspace:cached @@ -39,12 +39,12 @@ services: POSTGRES_DB: postgres POSTGRES_USER: postgres POSTGRES_PASSWORD: postgres - POSTGRES_PORT: 5433 + POSTGRES_PORT: 5432 expose: - - '5433' # Publishes port to other containers but NOT to host machine + - '5432' # Publishes port to other containers but NOT to host machine ports: - - '5433:5433' # Expose PostgreSQL to the host machine on port 5433 - command: '-p 5433' # Run the container's PostgreSQL server on non-standard port 5433 as well + - '5432:5432' # Expose PostgreSQL to the host machine on port 5433 + command: '-p 5432' # Run the container's PostgreSQL server on non-standard port 5433 as well volumes: postgres-data: null diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index ad4679a27..0812ef743 100644 --- a/.docker/docker-compose.yml +++ b/.docker/docker-compose.yml @@ -33,7 +33,7 @@ services: expose: - 5432 ports: - - 5433:5432 + - 5432:5432 networks: - amplify_dev healthcheck: diff --git a/.env.example b/.env similarity index 81% rename from .env.example rename to .env index 957abf18c..e46e8cc5d 100644 --- a/.env.example +++ b/.env @@ -25,9 +25,14 @@ TWILIO_ACCOUNT_SID=your_twilio_account_id # this is user generated TWILIO_AUTH_TOKEN=TWILIO_SECRET_KEY # To run in single-campaign mode, set the following environment vars -VUE_APP_CAMPAIGN_MODE = "single" # or "default" for normal operation -VUE_APP_FEATURED_CAMPAIGN = "6" # campaign's id from Postgres -VUE_APP_LETTER_TEMPLATE = "tmpl_4ffaf2960112b63" # the template associated with the featured campaign +VUE_APP_CAMPAIGN_MODE=single +VUE_APP_FEATURED_CAMPAIGN=1 +VUE_APP_LETTER_TEMPLATE=tmpl_951e09eb07bfd24 + +POSTGRES_USER=postgres +POSTGRES_PASSWORD=postgres +POSTGRES_PORT=5432 +POSTGRES_HOST=amplify_db # Enable $0 transactions (set to 'on' to enable, used in both FE and BE) VUE_APP_EMPTY_TRANSACTIONS= \ No newline at end of file diff --git a/.gitignore b/.gitignore index 1e2586f06..7c97a281e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ package-lock.json # local env files +.env.test .env.local .env.*.local @@ -92,10 +93,6 @@ web_modules/ # Yarn Integrity file .yarn-integrity -# dotenv environment variables file -.env -.env.test - # parcel-bundler cache (https://parceljs.org/) .cache .parcel-cache diff --git a/server/db/seeds/development/seed-campaigns-table.js b/server/db/seeds/development/seed-campaigns-table.js index 37ff29c30..30d59ef09 100644 --- a/server/db/seeds/development/seed-campaigns-table.js +++ b/server/db/seeds/development/seed-campaigns-table.js @@ -7,216 +7,52 @@ module.exports = { await knex('campaigns').insert([ { id: 1, - organization: 'M4BL', - name: 'The Breathe Act', + organization: 'White Mesa Ute Community', + name: 'White Mesa Concerned Community', cause: 'Civic Rights', type: 'Grant', - page_url: 'breatheact.org' - }, - { - id: 2, - organization: 'Sunrise New York', - name: 'Climate and Community Investment Act', - cause: 'Climate Justice', - type: 'Grant', - page_url: 'climatecantwait.org' - }, - { - id: 3, - organization: 'Sunrise New York', - name: 'Energy Efficiency, Equity and Jobs Assembly Bill', - cause: 'Climate Justice', - type: 'Grant', - page_url: 'climatecantwait.org' - }, - { - id: 4, - organization: 'Sunrise New York', - name: 'Proposed Actions on EJ Communities', - cause: 'Climate Justice', - type: 'Grant', - page_url: 'climatecantwait.org' - }, - { - id: 5, - organization: "Sogorea 'Te Land Trust", - name: "Sogorea 'Te Land Trust", - cause: 'Civic Rights', - type: 'Grant', - page_url: 'https://sogoreate-landtrust.org/' - }, - { - id: 6, - organization: 'Tuolumne River Trust', - name: 'Tuolumne River Trust', - cause: 'Civic Rights', - type: 'Grant', - page_url: 'https://www.tuolumne.org/revive-the-tuolumne', - campaign_tagline: 'For a Healthy and Vibrant River', - campaign_text: - '

The Tuolumne River is on the verge of ecological collapse. Historically, the River hosted well over 100,000 salmon, but in 2020 only 1,000 returned to spawn. And it’s not just about fish. Before dams were constructed to divert water to farms and urban areas, salmon transported millions of pounds of nutrients from the ocean to upland habitats, where they fueled the food web and fertilized forests and meadows. Absent those nutrients, the Tuolumne’s salmon-based ecosystem is in a state of crisis.

The main cause of the River’s demise is inadequate instream flows. In an average year, only 21% of the Tuolumne’s unimpaired flow reaches the San Joaquin River. During the recent drought, unimpaired flow averaged just 12% for five straight years. Meanwhile, more than three years’ worth of water remained impounded behind SFPUC dams, and all that water (and much more) had to be “dumped” back into the River two years later to prevent flooding downstream. The Tuolumne experienced one exceptionally good year at the expense of five terrible years.

Revive the Tuolumne aims to reverse this negative trend and restore the River. Our Let it Flow campaign advocates for higher instream flows through federal licensing of dams and by supporting the State Water Board’s update of the Bay Delta Water Quality Control Plan. Our Use It Wisely campaign promotes water conservation and alternative water supplies to reduce reliance on Tuolumne River water so that more can be made available for environmental purposes.

', - supplemental_text: - '

SFPUC water policies create unnecessary water scarcity throughout the Tuolumne watershed and skyrocketing water costs for ratepayers. These water woes are the result of dubious “science” and conservative water storage based on an SFPUC-manufactured drought plan called the Design Drought.

The Design Drought arbitrarily combines two of the worst droughts on record to create a megadrought that might occur once in 25,000 years. The Design Drought has prompted the SFPUC to create an Alternative Water Supply Plan that would double the SFPUC budget (and water rates) to produce expensive water we won’t ever need, while continuing to minimize river flows in the Tuolumne.

Low flows along the Tuolumne River harm the environment: the wild salmon population is on the brink of collapse and the scarcity of this keystone species negatively impacts riparian, delta, bay, and ocean ecosystems as well; frontline communities experience illness from toxic algae blooms and water scarcity; and Indigenous Tribes and commercial fishing communities that rely on healthy fisheries experience the collapse of lifeways and economies.

We encourage you to send a letter to the San Francisco Board of Supervisors, demanding science-backed water policies and a financially viable SFPUC budget.

Let your supervisor know that the citizens call for an independent audit of the SFPUC!

', + page_url: 'https://protectwhitemesa.org/', + campaign_tagline: 'Protecting the Ute Tribal Lands and Peoples from Radioactive Waste', + campaign_text: '

White Mesa Concerned Community is a grassroots group of concerned tribal members of the Ute Mountain Ute Tribe. We work to inform our fellow tribal members and the public about our struggle to protect our community, health, water, air, land, culture, and sacred sites from toxic and radioactive contamination from the uranium mill. We demand that the uranium mill be closed and cleaned up.

Here are some of the species that continue to be impacted by the uranium mining:

Mexican Spotted Owl (Strix occidentalis lucida): This owl is found in forested canyons and riparian zones. The tribe works to protect its habitat by managing forest resources and reducing threats such as wildfires and logging.

Southwestern Willow Flycatcher (Empidonax traillii extimus): Found in riparian areas, this bird\'s protection includes restoring native vegetation, managing water resources, and preventing habitat degradation from livestock grazing and invasive species.

Gunnison Sage-Grouse (Centrocercus minimus): The tribe participates in habitat restoration and conservation efforts for this species, including managing land use and mitigating threats like overgrazing, invasive plants, and human encroachment.

Yellow-Billed Cuckoo (Coccyzus americanus): The tribe works to conserve riparian habitats crucial for this bird by managing water flow and restoring native plant communities that provide nesting and foraging opportunities.

Colorado Pikeminnow (Ptychocheilus lucius): The tribe collaborates with state and federal agencies to protect this endangered fish by managing water quality and flow in river systems, reducing the impact of non-native species, and restoring critical habitat areas.

Bonytail Chub (Gila elegans) and Humpback Chub (Gila cypha): Both fish species benefit from the tribe\'s efforts to maintain clean and healthy river systems, which include monitoring water quality, controlling non-native species, and advocating for water management practices that support native fish populations.

', + supplemental_text: '

The White Mesa Ute Community of the Ute Mountain Ute Tribe is located between Blanding and Bluff in San Juan County in southern Utah. It is near Cedar Mesa, the Bears Ears National Monument, Valley of the Gods, the San Juan River, national parks, and many other beautiful and sacred areas.

White Mesa, however, is adjacent to the Energy Fuels’ uranium mill, the last such facility in the United States, where uranium tailings and other radioactive materials are sent for “processing” and dumping. Not only was the mill built right next to our community, but it was built right on top of hundreds of our culturally significant sites.

', representatives: JSON.stringify([ { - name: 'Connie Chan', - title: 'District 1 Supervisor', - photoUrl: - 'https://sfbos.org/sites/default/files/Connie_Chan_2023.jpg', - address_line1: '1 Dr Carlton B Goodlett Pl', - address_line2: '#244', - address_city: 'San Francisco', - address_state: 'CA', - address_zip: '94102', - address_country: 'US', - email: 'chanstaff@sfgov.org' - }, - { - name: 'Catherine Stefani', - title: 'District 2 Supervisor', - photoUrl: - 'https://sfbos.org/sites/default/files/Supervisor_Stefani_2018.jpg', - address_line1: '1 Dr Carlton B Goodlett Pl', - address_line2: '#244', - address_city: 'San Francisco', - address_state: 'CA', - address_zip: '94102', - address_country: 'US', - email: 'Catherine.Stefani@sfgov.org' - }, - { - name: 'Aaron Peskin', - title: 'District 3 Supervisor', + name: 'Spencer Cox', + title: 'Governor of Utah', photoUrl: - 'https://sfbos.org/sites/default/files/Aaron_Peskin_2023.jpg', - address_line1: '1 Dr Carlton B Goodlett Pl', - address_line2: '#244', - address_city: 'San Francisco', - address_state: 'CA', - address_zip: '94102', - address_country: 'US', - email: 'Aaron.Peskin@sfgov.org' - }, - { - name: 'Joel Engardio', - title: 'District 4 Supervisor', - photoUrl: - 'https://sfbos.org/sites/default/files/Joel_Engardio_2023.jpg', - address_line1: '1 Dr Carlton B Goodlett Pl', - address_line2: '#244', - address_city: 'San Francisco', - address_state: 'CA', - address_zip: '94102', + 'https://www.nga.org/wp-content/uploads/2021/01/Governor_Cox_official_square-scaled.jpg', + address_line1: '350 N STATE ST', + address_line2: 'STE 200', + address_city: 'SALT LAKE CITY', + address_state: 'UT', + address_zip: '84114', address_country: 'US', email: '' }, { - name: 'Dean Preston', - title: 'District 5 Supervisor', + name: 'Phil Lyman', + title: 'State Representative for District 69', photoUrl: - 'https://sfbos.org/sites/default/files/Dean_Preston_2023.jpg', - address_line1: '1 Dr Carlton B Goodlett Pl', - address_line2: '#244', - address_city: 'San Francisco', - address_state: 'CA', - address_zip: '94102', - address_country: 'US', - email: 'prestonstaff@sfgov.org' - }, - { - name: 'Matt Dorsey', - title: 'District 6 Supervisor', - photoUrl: - 'https://sfbos.org/sites/default/files/Dorsey_2022_lg.jpg', - address_line1: '1 Dr Carlton B Goodlett Pl', - address_line2: '#244', - address_city: 'San Francisco', - address_state: 'CA', - address_zip: '94102', - address_country: 'US', - email: 'DorseyStaff@sfgov.org' - }, - { - name: 'Myrna Melgar', - title: 'District 7 Supervisor', - photoUrl: - 'https://sfbos.org/sites/default/files/Myrna_Melgar_2023.jpg', - address_line1: '1 Dr Carlton B Goodlett Pl', - address_line2: '#244', - address_city: 'San Francisco', - address_state: 'CA', - address_zip: '94102', + 'https://le.utah.gov/images/legislator/house/LYMANP.jpg', + address_line1: '333 S MAIN ST', + address_line2: '', + address_city: 'BLANDING', + address_state: 'UT', + address_zip: '84511', address_country: 'US', - email: 'melgarstaff@sfgov.org' - }, - { - name: 'Rafael Mandelman', - title: 'District 8 Supervisor', - photoUrl: - 'https://sfbos.org/sites/default/files/Supervisor_Mandelman_2018.jpg', - address_line1: '1 Dr Carlton B Goodlett Pl', - address_line2: '#244', - address_city: 'San Francisco', - address_state: 'CA', - address_zip: '94102', - address_country: 'US', - email: 'mandelmanstaff@sfgov.org' - }, - { - name: 'Hillary Ronen', - title: 'District 9 Supervisor', - photoUrl: - 'https://sfbos.org/sites/default/files/Supervisor_Ronen_2019.jpg', - address_line1: '1 Dr Carlton B Goodlett Pl', - address_line2: '#244', - address_city: 'San Francisco', - address_state: 'CA', - address_zip: '94102', - address_country: 'US', - email: 'RonenStaff@sfgov.org' - }, - { - name: 'Shamann Walton', - title: 'District 10 Supervisor', - photoUrl: - 'https://sfbos.org/sites/default/files/Shamann_Walton_2023.jpg', - address_line1: '1 Dr Carlton B Goodlett Pl', - address_line2: '#244', - address_city: 'San Francisco', - address_state: 'CA', - address_zip: '94102', - address_country: 'US', - email: 'waltonstaff@sfgov.org' + email: '' }, - { - name: 'Ahsha Safai', - title: 'District 11 Supervisor', - photoUrl: - 'https://sfbos.org/sites/default/files/Ahsha_Safai_2023.jpg', - address_line1: '1 Dr Carlton B Goodlett Pl', - address_line2: '#244', - address_city: 'San Francisco', - address_state: 'CA', - address_zip: '94102', - address_country: 'US', - email: 'Ahsha.Safai@sfgov.org' - } ]), assets: JSON.stringify({ - campaign_logo: - 'https://images.squarespace-cdn.com/content/v1/5eebc0039b04b54b2fb0ce52/1598500758914-E5HAIIGCP0ZXKKMN2FT0/TRT+Logo-13.png?format=500w', - campaign_background: - 'https://images.squarespace-cdn.com/content/v1/5eebc0039b04b54b2fb0ce52/1610135975708-FV42Q30BPWF887M05O51/Poppies-13.jpg?format=1500w', - 'campaign-img-1': - 'https://images.squarespace-cdn.com/content/v1/5eebc0039b04b54b2fb0ce52/1609785926325-63M9MY247ORIL8ON8P5E/tuolumne-camp-960x540.jpg?format=1500w', - 'campaign-img-2': - 'https://images.squarespace-cdn.com/content/v1/5eebc0039b04b54b2fb0ce52/1592586646372-TBY3WC065NJ04KT2B38Z/000091400001.jpg?format=1500w', - 'campaign-img-3': - 'https://images.squarespace-cdn.com/content/v1/5eebc0039b04b54b2fb0ce52/1609781359705-Q5YNFL6DET5ORHW62ZU7/IMG_2249_WEBSITE+copy.jpg?format=1500w' - }) + campaign_logo: 'https://i.imgur.com/Lc9fG1y.png', + campaign_background: 'https://i.imgur.com/WcFdL78.jpeg', + 'campaign-img-1': 'https://i.imgur.com/gpGQxZQ.jpeg', + 'campaign-img-2': 'https://i.imgur.com/5pSUR0q.jpeg', + 'campaign-img-3': 'https://i.imgur.com/0EctJWf.png' + }) }, { - id: 7, + id: 2, organization: 'Save California Salmon', name: 'Save California Salmon', cause: 'Civic Rights', diff --git a/src/components/DonateMoney.vue b/src/components/DonateMoney.vue index ad863226c..71f5dd9b0 100644 --- a/src/components/DonateMoney.vue +++ b/src/components/DonateMoney.vue @@ -80,7 +80,7 @@
- Send email + Send Mail
diff --git a/src/components/TakeAction.vue b/src/components/TakeAction.vue index 2ecfc2bab..3400d6922 100644 --- a/src/components/TakeAction.vue +++ b/src/components/TakeAction.vue @@ -38,6 +38,11 @@ :selected-rep="selectedRep" :letter-body="letterBody" /> + @@ -148,6 +153,7 @@ + +