Skip to content

Commit

Permalink
Merge pull request #94 from matt598/setup-linter
Browse files Browse the repository at this point in the history 
Setup linter
  • Loading branch information
@Nolram12345
Nolram12345 authored Apr 8, 2024
2 parents d2355d3 + 2ab88f7 commit 552b013
Show file tree
Hide file tree
Showing 22 changed files with 1,829 additions and 602 deletions.
13 changes: 13 additions & 0 deletions .github/workflows/lint-prs.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# This workflow will do a clean installation of node dependencies, then run our linter to show linting errors
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs

name: Lint Files
"on": push
jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- run: |
npm ci
npm run lint
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
1 change: 1 addition & 0 deletions .nvmrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lts/*
7 changes: 7 additions & 0 deletions .vscode/settings.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"eslint.enable": true,
"eslint.validate": [
"javascript", // ...
"html" // Add "html" to enable linting `.html` files.
]
}
6 changes: 6 additions & 0 deletions CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,9 @@ To update the footers, change the [./update-action/footer.html](./update-action/
### Metadata

To update common metadata, change the [./update-action/metadata.html](./update-action/metadata.html) file and push to a branch. A github action will run and update the headers across all files.

### Linting
Step 1: Setup [NVM](https://github.com/nvm-sh/nvm?tab=readme-ov-file#install--update-script)
Step 2: Run `nvm use` (if you don't have the latest version, it will prompt you to run `nvm install`)
Step 3: Run `npm i`
Step 4: Run `npm lint`
62 changes: 31 additions & 31 deletions about.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
href="https://fonts.googleapis.com/css2?family=Atkinson+Hyperlegible:ital,wght@0,400;0,700;1,400;1,700&display=swap"
rel="stylesheet"
href="https://fonts.googleapis.com/css2?family=Atkinson+Hyperlegible:ital,wght@0,400;0,700;1,400;1,700&display=swap"
rel="stylesheet"
/>
<link rel="stylesheet" href="style.css" />
<link rel="icon" type="image/x-icon" href="img/favicon.ico">
<link rel="icon" type="image/x-icon" href="img/favicon.ico" />
<script src="jquery-3.7.1.min.js"></script>
<script src="menu.js"></script>
<!-- Variable Tags -->
Expand All @@ -30,35 +30,35 @@
</head>
<body class="about">
<!--BELOW THIS GETS COPIED TO ALL PAGES WHEN MENU CHANGES (CHANGE BODY CLASS TO PAGE NAME)-->
<header id="site-head"><a href="#main" class="skip">Skip to main content</a>
<div class="wrapper-head">
<h1 class="page-title">
<a href="index.html"><span class="black-highlight">TB</span>FIGHTERS</a>
</h1>
<a class="toggle-button" href="#" title="menu"></a>
<nav class="site-menu">
<ul class="active">
<li><a href="about.html">About Us</a></li>
<li><a href="timeline.html">News &amp; Timeline</a></li>
<li><a href="resources.html">Resources</a></li>
<li><a href="action.html">Take Action</a></li>
</ul>
</nav>
</div>
</header>
<!--ABOVE THIS GETS COPIED TO ALL PAGES MENU CHANGES-->
<header id="site-head"><a href="#main" class="skip">Skip to main content</a>
<div class="wrapper-head">
<p class="page-title">
<a href="index.html"><span class="black-highlight">TB</span>FIGHTERS</a>
</p>
<a class="toggle-button" href="#" title="menu"></a>
<nav class="site-menu">
<ul class="active">
<li><a href="about.html">About Us</a></li>
<li><a href="timeline.html">News &amp; Timeline</a></li>
<li><a href="resources.html">Resources</a></li>
<li><a href="action.html">Take Action</a></li>
</ul>
</nav>
</div>
</header>
<!--ABOVE THIS GETS COPIED TO ALL PAGES MENU CHANGES-->
<main id="main">
<section class="container container-compact title">
<div class="wrapper-full">
<h1 class="break-anywhere">About TBFighters</h1>
<p>
<img src="img/hourglass.png" class="image-right about-hourglass" style="max-width:150px;">TBFighters is a collective of <a href="resources.html#glossary">Nerdfighters</a> and global health activists committed to fighting the structural causes of <a href="resources.html">tuberculosis (TB)</a>. TB has been curable for decades. It continues to kill 1.3 million people a year because of human choices. The TBFighters group and this website were originally created to support the <a href="https://msfaccess.org/time-for-5" target="_blank">Time for $5 campaign</a> for lower tuberculosis test prices, after <a href="https://www.youtube.com/watch?v=tSC06P9A5W4">John Green introduced Nerdfighteria to the campaign</a> in September 2023.
<img src="img/hourglass.png" alt="Hourglass icon, time for 5" class="image-right about-hourglass" style="max-width:150px;" />TBFighters is a collective of <a href="resources.html#glossary">Nerdfighters</a> and global health activists committed to fighting the structural causes of <a href="resources.html">tuberculosis (TB)</a>. TB has been curable for decades. It continues to kill 1.3 million people a year because of human choices. The TBFighters group and this website were originally created to support the <a href="https://msfaccess.org/time-for-5" target="_blank">Time for $5 campaign</a> for lower tuberculosis test prices, after <a href="https://www.youtube.com/watch?v=tSC06P9A5W4">John Green introduced Nerdfighteria to the campaign</a> in September 2023.
</p>
<p>
We lead by following and we act with compassion. That means we follow the guidance of public health experts, including <a href="https://www.pih.org/" target="_blank">Partners in Health</a> and <a href="https://www.msfaccess.org/" target="_blank">Médecins Sans Frontières (Doctors Without Borders)</a>, and the TB-affected communities who have needlessly suffered from this curable disease.
</p>
<div id="video" class="join-left">
<iframe class="video-embed" id="video" style="display:block;" src="https://www.youtube.com/embed/uizFXzSTeVs?si=CrgRLdXVf5PgzMj8" title="I Own Danaher" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>
<iframe class="video-embed" style="display:block;" src="https://www.youtube.com/embed/uizFXzSTeVs?si=CrgRLdXVf5PgzMj8" title="I Own Danaher" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>
</div>
<p>
<a href="https://www.youtube.com/playlist?list=PLHaAg4A3ezRPslu3SYmwnmfq2DLcpDbXa" target="_blank">More vlogbrothers TB videos</a>
Expand All @@ -78,13 +78,13 @@ <h2 id="getinvolved">Get Involved</h2>
</section>
</main>
<footer class="site-foot">
<p>
&copy; The TBFighters Project | <a href="privacy.html" class="footer-link">Privacy Policy</a>
</p>
<p class="too-small">
<p>
&copy; The TBFighters Project | <a href="privacy.html" class="footer-link">Privacy Policy</a>
</p>
<p class="too-small">

We lead by following and we act with compassion. Get in touch: contact at tbfighters dot org
</p>
</footer>
</body>
</html>
We lead by following and we act with compassion. Get in touch: contact at tbfighters dot org
</p>
</footer>
</body>
</html>
90 changes: 45 additions & 45 deletions action.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
href="https://fonts.googleapis.com/css2?family=Atkinson+Hyperlegible:ital,wght@0,400;0,700;1,400;1,700&display=swap"
rel="stylesheet"
href="https://fonts.googleapis.com/css2?family=Atkinson+Hyperlegible:ital,wght@0,400;0,700;1,400;1,700&display=swap"
rel="stylesheet"
/>
<link rel="stylesheet" href="style.css" />
<link rel="icon" type="image/x-icon" href="img/favicon.ico">
<link rel="icon" type="image/x-icon" href="img/favicon.ico" />
<script src="jquery-3.7.1.min.js"></script>
<script src="menu.js"></script>
<!-- Variable Tags -->
Expand All @@ -34,23 +34,23 @@

<body class="action">
<!--BELOW THIS GETS COPIED TO ALL PAGES WHEN MENU CHANGES (CHANGE BODY CLASS TO PAGE NAME)-->
<header id="site-head"><a href="#main" class="skip">Skip to main content</a>
<div class="wrapper-head">
<h1 class="page-title">
<a href="index.html"><span class="black-highlight">TB</span>FIGHTERS</a>
</h1>
<a class="toggle-button" href="#" title="menu"></a>
<nav class="site-menu">
<ul class="active">
<li><a href="about.html">About Us</a></li>
<li><a href="timeline.html">News &amp; Timeline</a></li>
<li><a href="resources.html">Resources</a></li>
<li><a href="action.html">Take Action</a></li>
</ul>
</nav>
</div>
</header>
<!--ABOVE THIS GETS COPIED TO ALL PAGES MENU CHANGES-->
<header id="site-head"><a href="#main" class="skip">Skip to main content</a>
<div class="wrapper-head">
<p class="page-title">
<a href="index.html"><span class="black-highlight">TB</span>FIGHTERS</a>
</p>
<a class="toggle-button" href="#" title="menu"></a>
<nav class="site-menu">
<ul class="active">
<li><a href="about.html">About Us</a></li>
<li><a href="timeline.html">News &amp; Timeline</a></li>
<li><a href="resources.html">Resources</a></li>
<li><a href="action.html">Take Action</a></li>
</ul>
</nav>
</div>
</header>
<!--ABOVE THIS GETS COPIED TO ALL PAGES MENU CHANGES-->
<main id="main">
<section class="container container-compact title">
<div class="wrapper-full">
Expand Down Expand Up @@ -79,7 +79,7 @@ <h2 id="contact">Contact <span class="red">Danaher and Cepheid</span></h2>
<img src="img/hashtag.svg" alt="hashtag icon" class="action-icon" /><strong><span class="red">Post</span></strong> on Social Media
</p>
<p class="smaller">
Use our hashtags, <em>#People<wbr>OverProfits</em> and <em>#TimeFor5</em>.
Use our hashtags, <em>#People<wbr />OverProfits</em> and <em>#TimeFor5</em>.
</p>
<p class="smaller">
Tag <em><a href="https://twitter.com/DanaherCorp" target="_blank">@DanaherCorp</a></em> and <em><a href="https://twitter.com/CepheidNews" target="_blank">@CepheidNews</a></em> on Twitter, <em>@DanaherCorporation</em> on <a href="https://www.instagram.com/DanaherCorporation" target="_blank">Instagram</a> and <a href="https://www.threads.net/@danahercorporation" target="_blank">Threads</a>, and comment on their <a href="https://www.facebook.com/danahercorporation/" target="_blank">Facebook</a> and <a href="https://www.linkedin.com/company/danaher/posts/?feedView=all" target="_blank">LinkedIn</a> posts.
Expand All @@ -93,7 +93,7 @@ <h2 id="contact">Contact <span class="red">Danaher and Cepheid</span></h2>
<img src="img/envelope.svg" alt="email icon" class="action-icon" /><strong><span class="red">Email</span></strong> Danaher's Leadership
</p>
<p class="smaller">
<a href="mailto:investor.relations@danaher.com">investor.<wbr>relations<wbr>@danaher.com</a>
<a href="mailto:investor.relations@danaher.com">investor.<wbr />relations<wbr />@danaher.com</a>
</p>
<p class="smaller">
<a class="button" href="https://docs.google.com/document/d/e/2PACX-1vTh05tEoyCsh8oEWScWM9n41B1pcUeVNGFcUDqdlcILHvVUB2_LsK4voMTdKPdEQwmjMHRBaoalG259/pub#h.bz7dg2lhjj6o" target="_blank">Email templates</a>
Expand All @@ -117,9 +117,9 @@ <h2 id="contact">Contact <span class="red">Danaher and Cepheid</span></h2>
</p>
<div style="background: #DDDDDD; padding: 10px 15px; margin-bottom: 0.4em; box-shadow: var(--aside-shadow);">
<p class="smaller">
c/o Corporate Secretary<br>
Danaher Corporation<br>
2200 Pennsylvania Avenue, N.W., Suite 800W<br>
c/o Corporate Secretary<br />
Danaher Corporation<br />
2200 Pennsylvania Avenue, N.W., Suite 800W<br />
Washington, D.C. 20037-1701
</p>
</div>
Expand All @@ -138,24 +138,24 @@ <h2 id="contact">Contact <span class="red">Danaher and Cepheid</span></h2>
Educate and inform others on the worldwide impact of tuberculosis - the world's deadliest infectious disease, but one many people assume is a thing of the past. Learn more on our resource page below.
</p>
<p class="smaller">
<a href="resources.html" class="button" target="_blank">Resource page</a>
<a href="resources.html" class="button" target="_blank">Resource page</a>
</p>
</div>
<div class="action">
<p class="larger">
<img src="img/gavel.svg" alt="gavel icon" class="action-icon" /><strong><span class="red">Support</span></strong> Legislative and Government Action
</p>
<p class="smaller">
<strong><span class="red">U.S. residents</span></strong>: <a href="https://act.pih.org/end-tb-now-act-2023" target="_blank">Ask your representative to support The End Tuberculosis Now Act 2023</a>.
<br>
<br>
<strong><span class="red">U.K. residents</span></strong>: Send a letter to your MP to ask they ensure the UK-India Free Trade Agreement still allows for the manufacture of generic drugs in India, including TB drugs. <a href="https://msfaccess.org/civil-society-calls-uk-prime-minister-ensure-uk-india-free-trade-agreement-does-not-threaten-access" target="_blank">Learn more</a> about the FTA and <a href="https://docs.google.com/document/d/18U7N7z0VJqifN_5_KkE3DtA45a9nEIK9FhlgWAafILQ/edit" target="_blank">view a letter template</a>
<strong><span class="red">U.S. residents</span></strong>: <a href="https://act.pih.org/end-tb-now-act-2023" target="_blank">Ask your representative to support The End Tuberculosis Now Act 2023</a>.
<br />
<br />
<strong><span class="red">U.K. residents</span></strong>: Send a letter to your MP to ask they ensure the UK-India Free Trade Agreement still allows for the manufacture of generic drugs in India, including TB drugs. <a href="https://msfaccess.org/civil-society-calls-uk-prime-minister-ensure-uk-india-free-trade-agreement-does-not-threaten-access" target="_blank">Learn more</a> about the FTA and <a href="https://docs.google.com/document/d/18U7N7z0VJqifN_5_KkE3DtA45a9nEIK9FhlgWAafILQ/edit" target="_blank">view a letter template</a>
</p>

</div>
</div>
<div class="wrapper wrap-centered" style="display: none;" id="expand-button-container">
<button class="button button-subtle" onclick="toggleExpand()"><img src="img/chevron.svg" class="expand-actions-arrow" alt="expand-arrow"> <span id="expand-button-txt">More actions</span></button>
<button class="button button-subtle" onclick="toggleExpand()"><img src="img/chevron.svg" class="expand-actions-arrow" alt="expand-arrow" /> <span id="expand-button-txt">More actions</span></button>
</div>
<div class="wrapper-full" style="transition: ease 0.5s all;">
<h2 id="posts">Graphics and Templates</h2>
Expand Down Expand Up @@ -200,7 +200,7 @@ <h4>Some ready-made posts:</h4>
</div>

</div>
<br>
<br />
<div class="wrapper-full">
<h4 id="graphics">And some of our most popular <a href="https://tbfighters.notion.site/7fb225aa690e4c5b8384c085ada11960?v=203b5b2bbe6f4ba9a9fc3385a6944f9e&pvs=4" target="_blank">social media graphics</a>:</h4>

Expand All @@ -218,7 +218,7 @@ <h4 id="graphics">And some of our most popular <a href="https://tbfighters.notio
<img class="slideshow-img" src="img/actions-graphics/Sign_Petition_Urgent_Megaphone.png" alt="A red megaphone and a piece of paper. Text: Urgent. Sign the petition to help lower prices." />
<img class="slideshow-img" src="img/actions-graphics/Square_Site5Action_1.png" alt="Take Action: Sign the petition at tbfighter.link/petition to tell Danaher that medical tests shouldn’t be a luxury. Visit tbfighters.org to learn how you can fight against health injustice." />
<noscript>
<br>
<br />
</noscript>
</div>
<div style="margin: auto auto; margin-top: 0.4em; gap: 0.2em; display: none;" id="slideshow-buttons">
Expand All @@ -228,23 +228,23 @@ <h4 id="graphics">And some of our most popular <a href="https://tbfighters.notio
<button class="button" onclick="download()" style="float:right">Download</button>
</div>
<noscript>
<br>
<br />
<p style="font-style: italic;">Please enable javascript to use the slideshow and download buttons.</p>
</noscript>
</div>
</div>
<div class="wrapper-full">
<h2 id="list">Join Our <span class="red">Mailing List</span></h2>
<p>
Be informed of new calls to action, campaign press releases, and other TBFighters campaign updates. Emails may be authored by TBFighters, John Green, and partner organizations, such as MSF Access and PIH.
Be informed of new calls to action, campaign press releases, and other TBFighters campaign updates. Emails may be authored by TBFighters, John Green, and partner organizations, such as MSF Access and PIH.
</p>
<form method="post" action="https://gaggle.email/join/tbfighters@gaggle.email">
<div class="list-form wrapper-columns">
<div>
<label for="name"><span>Name: </span><input name="name" type="text" placeholder="Dave Green"></label>
<label for="name"><span>Name: </span><input name="name" type="text" placeholder="Dave Green" /></label>
</div>
<div>
<label for="email"><span>Email Address: </span><input name="email" type="email" placeholder="dave@tbfighters.org"></label>
<label for="email"><span>Email Address: </span><input name="email" type="email" placeholder="dave@tbfighters.org" /></label>
</div>
<div>
<button class="button">Sign up</button>
Expand All @@ -255,13 +255,13 @@ <h2 id="list">Join Our <span class="red">Mailing List</span></h2>
</section>
</main>
<footer class="site-foot">
<p>
&copy; The TBFighters Project | <a href="privacy.html" class="footer-link">Privacy Policy</a>
</p>
<p class="too-small">
Icons by fontawesome.<br>
We lead by following and we act with compassion. Get in touch: contact at tbfighters dot org
</p>
</footer>
<p>
&copy; The TBFighters Project | <a href="privacy.html" class="footer-link">Privacy Policy</a>
</p>
<p class="too-small">
Icons by fontawesome.<br />
We lead by following and we act with compassion. Get in touch: contact at tbfighters dot org
</p>
</footer>
</body>
</html>
Loading

0 comments on commit 552b013

Please sign in to comment.