Skip to content

Commit

Permalink
Landing page & tournament page (#327)
Browse files Browse the repository at this point in the history
* Re add live stream pages

* Update livestream.js

* Remove Live stream pages

Add moment dependency to the client release script from the livestream.js

* Adding COC

This is the changes to Add the code of conduct to the Footer of the website

* Update Paypal Link

Updated how PayPal Link loos in the footer

* Update Footer Layout

- Left Links with no Icons as text
- Move Patreon and PayPal below to  use just the Icon for cleaner look

* Footer Icons

Add Mission Icon line to Links

* Fix Indentation

Fix line 84 indentation of buy button

* Revert indentation changes

* Update indentation

Changed from Col 12 to 6

* Landing Page Addition & Tournament s Page Clean up

- Update Defult.pug with better Logic '===' instead of '=='

- Fix Indentation of Multiplayer section Image & Re-Centre Buy button.

-  Update Tournament.pug with better Logic '===' instead of '=='  & Update Iframe with Pug format rather than HTML format
  • Loading branch information
Rowey committed Jan 27, 2022
1 parent 1150375 commit f98cc0a
Show file tree
Hide file tree
Showing 5 changed files with 80 additions and 24 deletions.
1 change: 1 addition & 0 deletions express.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ function markdown(template) {
app.get('/privacy', markdown("templates/views/privacy.md"));
app.get('/tos', markdown("templates/views/tos.md"));
app.get('/rules', markdown("templates/views/rules.md"));
app.get('/coc', markdown("templates/views/coc.md"));

/// Account routes
// Registration
Expand Down
30 changes: 13 additions & 17 deletions templates/layouts/default.pug
Original file line number Diff line number Diff line change
Expand Up @@ -68,19 +68,19 @@ html(lang='en')
ul.main-navigation
li.mobile-nav-logo-wrapper: a(href="/", class="mobile-nav-logo")
img(src="/images/faf-logo.png")
li(class=(section == 'news' ? 'active' : null)): a(href='/newshub')
li(class=(section === 'news' ? 'active' : null)): a(href='/newshub')
i.fas.fa-rss
span News
li(class=(section == 'competitive' ? 'active' : null)): a(href='/competitive/tournaments')
li(class=(section === 'competitive' ? 'active' : null)): a(href='/competitive/tournaments')
i.fas.fa-trophy
span Competitive
li(class=(section == 'clan' ? 'active' : null)): a(href='/clans')
li(class=(section === 'clan' ? 'active' : null)): a(href='/clans')
i.fas.fa-users
span Clans
li(class=(section == 'contribution' ? 'active' : null)): a(href='/contribution')
li(class=(section === 'contribution' ? 'active' : null)): a(href='/contribution')
i.fas.fa-heart
span Contribute
li(class=(section == "faq" ? 'active' : null)): a(href='https://forum.faforever.com/category/18/frequently-asked-questions')
li(class=(section === "faq" ? 'active' : null)): a(href='https://forum.faforever.com/category/18/frequently-asked-questions')
i.fas.fa-question-circle
span FAQ
li.close-mobile-nav: button.toggle-nav
Expand All @@ -91,7 +91,7 @@ html(lang='en')
a(href='/client' class='nav-download-client')
i.fas.fa-download
span Download
li(class=(section == 'account' ? 'active' : null)).dropdown
li(class=(section === 'account' ? 'active' : null)).dropdown
a.dropdown-toggle.nav-account-dropdown(href='#' data-toggle='dropdown' role='button' title=(username ? 'Welcome ' + username : undefined))
if username
i.fas.fa-user
Expand Down Expand Up @@ -140,23 +140,19 @@ html(lang='en')
.footer-bottom
.footer-links
ul.footer-links
li.footer-support-us-wrapper
form.footer-support-us(action='https://www.patreon.com/faf', method='get', target='_top')
button(type='submit', name='submit')
i.fab.fa-patreon(aria-hidden='true')
span Support us
li.footer-support-us-wrapper
form.footer-support-us(action='https://paypal.me/faforever', method='get', target='_top')
button(type='submit', name='submit')
i.fab.fa-paypal(aria-hidden='true')
span Donate here
li: a(href="https://forum.faforever.com") Forums
li: a(href='/contribution') Contribute
li: a(href='/rules') Rules
li: a(href='/tos') Terms of Service
li: a(href='/privacy') Privacy Statement
li: a(href='/coc') Code of Conduct
.footer-social
ul.footer-social
li
a(href="https://paypal.me/faforever" title="Support Forged Alliance Forever via PayPal" target="_blank")
i.fab.fa-paypal
li
a(href="https://www.patreon.com/faf" title="Support Forged Alliance Forever on Patreon" target="_blank")
i.fab.fa-patreon
li
a(href="https://discord.gg/hgvj6Af" title="Follow Forged Alliance Forever on Discord" target="_blank")
i.fab.fa-discord
Expand Down
59 changes: 59 additions & 0 deletions templates/views/coc.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# FAF Code of Conduct
*Version from 07.07.21*
## Introduction
This code of conduct applies to all spaces managed by the FAForever project, including IRC, Forum, Discord, Zulip, issue trackers, wikis, blogs, Twitter, YouTube, Twitch, and any other communication channel used by our communities.

We expect this code of conduct to be honored by everyone who participates in the FAForever community formally or informally, or claims any affiliation with the Association, in any FAF-related activities and **especially** when representing FAF, in any role.

This code **is not exhaustive or complete**. It serves to distill our common understanding of a collaborative, shared environment and goals. We expect it to be followed in spirit as much as in the letter, so that it can enrich all of us and the technical communities in which we participate.

The Code of Conduct may be supplemented by further rules specifying desired and undesired behaviour in certain areas.

## Specific Guidelines

We strive to:
1. **Be open**. We invite anyone to participate in our community. We preferably use public methods of communication for project-related messages, unless discussing something sensitive. This applies to messages for help or project-related support, too; not only is a public support request much more likely to result in an answer to a question, it also makes sure that any inadvertent mistakes made by people answering will be more easily detected and corrected.
2. **Be empathetic, welcoming, friendly, and patient**. We work together to resolve conflict, assume good intentions, and do our best to act in an empathetic fashion. We may all experience some frustration from time to time, but we do not allow frustration to turn into a personal attack. A community where people feel uncomfortable or threatened is not a productive one. We should be respectful when dealing with other community members as well as with people outside our community.
3. **Be collaborative**. Our work will be used by other people, and in turn we will depend on the work of others. When we make something for the benefit of the project, we are willing to explain to others how it works, so that they can build on the work to make it even better. Any decision we make will affect users and colleagues, and we take those consequences seriously when making decisions.
4. **Be inquisitive**. Nobody knows everything! Asking questions early avoids many problems later, so questions are encouraged, though they may be directed to the appropriate forum. Those who are asked should be responsive and helpful, within the context of our shared goal of improving the FAForever project.
5. **Be careful in the words that we choose**. Whether we are participating as professionals or volunteers, we value professionalism in all interactions, and take responsibility for our own speech. Be kind to others. Do not insult or put down other participants. Harassment and other exclusionary behaviour is not acceptable. This includes, but is not limited to:
- Violent threats or language directed against another person.
- Sexist, racist, or otherwise discriminatory jokes and language.
- Posting sexually explicit or violent material.
- Posting (or threatening to post) other people's personally identifying information ("doxing").
- Sharing private content, such as emails sent privately or non-publicly, or unlogged forums such as IRC channel history.
- Personal insults, especially those using racist or sexist terms.
- Unwelcome sexual attention.
- Excessive or unnecessary profanity.
- Repeated harassment of others. In general, if someone asks you to stop, then stop.
- Advocating for, or encouraging, any of the above behaviour.
6. **Be concise**. Keep in mind that what you write once will be read by hundreds of persons. Writing a short message means people can understand the conversation as efficiently as possible. Short messages should always strive to be empathetic, welcoming, friendly and patient. When a long explanation is necessary, consider adding a summary.
Try to bring new ideas to a conversation so that each message adds something unique to the thread, keeping in mind that the rest of the thread still contains the other messages with arguments that have already been made.
Try to stay on topic, especially in discussions that are already fairly large.
7. **Step down considerately**. Members of every project come and go. When somebody leaves or disengages from the project they should tell people they are leaving and take the proper steps to ensure that others can pick up where they left off. In doing so, they should remain respectful of those who continue to participate in the project and should not misrepresent the project's goals or achievements. Likewise, community members should respect any individual's choice to leave the project.

## Diversity Statement

FAForever welcomes and encourages participation by everyone. We are committed to being a community that everyone feels good about joining. Although we may not be able to satisfy everyone, we will always work to treat everyone well.

No matter how you identify yourself or how others perceive you: we welcome you. Though no list can hope to be comprehensive, we explicitly honour diversity in: age, culture, ethnicity, genotype, gender identity or expression, language, national origin, neurotype, phenotype, political beliefs, profession, race, religion, sexual orientation, socioeconomic status, subculture and technical ability.

Though we welcome people fluent in all languages, all official FAForever communication is conducted in English. Translations may be provided, but in case of contradictory wording, the English version takes precedence.

Standards for behaviour in the FAForever community are detailed in the Code of Conduct above. We expect participants in our community to meet these standards in all their interactions and to help others to do so as well.

## Reporting Guidelines

While this code of conduct should be adhered to by community members, we recognize that sometimes people may have a bad day, or be unaware of some of the guidelines in this code of conduct. If you believe someone is violating this code of conduct, you may reply to them and point out this code of conduct. Such messages may be in public or in private, whatever is most appropriate. Assume good faith; it is more likely that participants are unaware of their bad behaviour than that they intentionally try to degrade the quality of the discussion. Should there be difficulties in dealing with the situation, you may report your compliance issues in confidence to either:
- The moderation team members indicated in our communication mediums
- The president of the FAForever association: Sheeo (admin at faforever dot org)
- Any other board member of the association as listed in our association forum.

If the violation is in documentation or code, for example inappropriate pronoun usage or word choice within official documentation, we ask that people report these privately to the project maintainers or to the DevOps Team Lead (Brutus5000, brutus5000 at faforever dot com).
Endnotes

This Code defines **empathy** as "a vicarious participation in the emotions, ideas, or opinions of others; the ability to imagine oneself in the condition or predicament of another." **Empathetic** is the adjectival form of empathy.

This statement was shamelessly copied and modified from the Apache Software Foundation Code Of Conduct and it’s honoured predecessors.


4 changes: 2 additions & 2 deletions templates/views/index.pug
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ block content
.col-md-4: .text-right
h3 Multiplayer
p Host and join team games with up to 16 players simultaneously or measure your skill against others in one versus one combat against players from all over the world.
.col-md-4
.col-md-4
img(src="/images/multiplayer.png" class="img-responsive")
.row
.col-md-2
Expand Down Expand Up @@ -81,7 +81,7 @@ block content
.row.text-center.buy-now
hr
h3 To play Forged Alliance Forever, you must first install Supreme Commander: Forged Alliance. You can purchase it for less than 10€, below:
.col-md-12
.col-md-12.text-center
a(href="https://store.steampowered.com/app/9420" class="btn btn-default btn-lg btn-outro btn-danger") Buy from Steam


Expand Down
10 changes: 5 additions & 5 deletions templates/views/tournaments.pug
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ block cContent
h3 Error: No response from Challonge
else

if data.runningTournaments.length == 0
if data.runningTournaments.length === 0
else
each tournament, i in data.runningTournaments
h1.text-center= tournament.name
br
<iframe class="tournament-live" src="https://challonge.com/#{tournament.url}/module?theme=3899" width="100%" height="900" frameborder="0" scrolling="auto" allowtransparency="true"></iframe>
iframe.tournament-live(src='https://challonge.com/#{tournament.url}/module?theme=3899' width='100%' height='900' frameborder='0' scrolling='auto' allowtransparency='true')
button(data-toggle="collapse" data-target="##{tournament.url}") Description
if tournament.description == ""
if tournament.description === ""
div(id="#{tournament.url}" class="collapse") Tournament has no description
else
div(id="#{tournament.url}" class="collapse") !{tournament.description}
Expand All @@ -27,7 +27,7 @@ block cContent
h3 Error: No response from Challonge
else

if data.upcomingTournaments.length == 0 && data.runningTournaments.length == 0
if data.upcomingTournaments.length === 0 && data.runningTournaments.length === 0
p.text-center No upcoming tournaments have been registered
else
table.table.table-striped.table-hover
Expand All @@ -46,5 +46,5 @@ block cContent
each tournament, i in data.upcomingTournaments
tr
td= tournament.name
td= (tournament.start_at == 'Thu, 01 Jan 1970 00:00:00 UTC' ? 'Undetermined' : tournament.start_at)
td= (tournament.start_at === 'Thu, 01 Jan 1970 00:00:00 UTC' ? 'Undetermined' : tournament.start_at)
td: a(href=tournament.full_challonge_url target="_blank")= tournament.full_challonge_url

0 comments on commit f98cc0a

Please sign in to comment.