Skip to content

Commit

Permalink
[WIP] Update frontend for Pre-LAN 2022 (#703)
Browse files Browse the repository at this point in the history
* Update the links in the banner

- Added Instagram
- Color inversion now happens when hovering over it.

* Add information Pre-LAN

* Remove the "What do you get?" for now

* Add Pre-LAN Tournaments

* Remove organizing own tournament, move q and a for prelan

* Update Pre-LAN faq

* Remove sponsors, but keeping them in html as example

* Remove Pickup radius

Remove Pickup radius as we do not have pickup any more

* Add link to discord after getting a ticket

* Update lancie-order-check.html

Change order confirmation Pre-LAN to note the necessity of joining Discord

* Update Dockerfile to upgrade Node version

* Updating spell check

* Update spell check faq

* Update official tournaments Pre-LAN text

Fix spelling and grammar errors amongst others

* Update LANcie home page

* Reformatting commission page and order check

Co-authored-by: Simcha Vos <[email protected]>
  • Loading branch information
ArdyZ and simchavos authored Jan 24, 2022
1 parent e03bd68 commit 9f9ca9e
Show file tree
Hide file tree
Showing 11 changed files with 134 additions and 23 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:12 AS builder
FROM node:17 AS builder

WORKDIR /app
COPY package.json ./
Expand Down
23 changes: 23 additions & 0 deletions data/faq_prelan.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
### When will the Pre-LAN take place?

The event will take place Friday the 25th of February. Further details will be made available later.

### What does the Pre-LAN look like this year?

Just like last year the Pre-LAN will be held online. So, everyone can participate from the comfort of their own home.

### Is there a minimum age to participate?

No, there is not. If you are younger than 18, you should be able to present any form of authorisation by caretakers/parents upon entry to the event.

### I don't have any friends who want to participate, will it still be fun?

Yes! There will be plenty of opportunities to socialise with other participants and we will try to create groups of single players.

### Are there still prizes this year?

Yes, of course. We will have comparable prizes available as last year. More details will follow later.

### I still have questions, where can I ask them?

You can send any questions either in the [Discord](https://discord.gg/WGrks2A8As) server or through the [contact](/contact) form.
62 changes: 62 additions & 0 deletions data/official-tournaments-pre_lan.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
[
{
"title": "CS:GO",
"subtitle": "2 v 2",
"headerTitle": "Counter Strike: Global Offensive",
"description": "Counter-Strike: Global Offensive is a tactical first-person shooter developed by Valve Corporation and Hidden Path Entertainment. It is the fourth game in the main Counter-Strike franchise. Like the previous games in the series, Global Offensive is an objective-based multiplayer first-person shooter. Each player joins either the Terrorist or Counter-Terrorist team and attempts to complete objectives or eliminate the enemy team. The game operates in short rounds that end when all players on one side are dead or a teams objective is completed.\r\n\r\n# Rules #\r\n\r\n## 1. Format: ##\r\n1. Single elimination in a 2v2 wingman. Depending on the amount of contestants, the group stage matches will be a best of 1 or a best of 3. All other matches will be a best of 3.\r\n\r\n### 1.1 Draw ###\r\n1. A draw (15-15) is allowed for group stage matches. In case there is a draw (15-15) in an elimination match, there will be a mr3 on that map to decide who will win that round. The first team that reaches 4 points will win the round. If it ends in a 3-3 this will be done again until there is a winner. \r\n\r\n## 2. Maps ##\r\n - de_train\r\n - de_inferno\r\n - de_nuke\r\n - de_mirage\r\n - de_vertigo\r\n - de_overpass\r\n - de_dust2\r\n\r\n### 2.1 Map pick ###\r\n\r\n#### 2.1.1 Best of 1 ####\r\n1. The HOME team will remove 1 map from the map pool. \r\n2. The AWAY team will remove 2 maps from the remaining 6 maps in the pool.\r\n3. The HOME team will remove 2 maps from the remaining 4 maps in the pool.\r\n4. The Away team will select the map to be played from the remaining 2 maps in the pool.\r\n\r\n#### 2.1.2 Best of 3 ####\r\n1. The AWAY team will remove 2 maps from the map pool. After this, the HOME team will choose one of the remaining 5 maps as the first map in the series.\r\n2. The HOME team will remove 2 maps from the remaining 4 maps in the pool. Next, the AWAY team will choose one of 2 maps remaining in the pool as the second map in the series.\r\n3. The remaining map in the pool will serve as the tiebreaker map (if necessary).\r\n4. The maps will be played in order\r\n\r\n## 3. Game and Server settings ##\r\n - MR15\r\n\r\nThis means that you&#39;ll play 15 rounds on each side. The team that reaches 16 first wins the match.\r\n\r\n### 3.1 Server\/client settings ###\r\nWe&#39;re using the ESL server config:\r\nTwo flashes and a maximum of two other grenades are allowed.\r\nForbidden:\r\nweapon_recoil_model 0\r\nmat_hdr_level 0\/1\/2\r\nAlways use:\r\nweapon_debug_spread_show 0\r\n\r\n### 3.2 Bugs and forbidden actions ###\r\n1. Using bugs isn&#39;t allowed. \r\nBoosting through walls, ceiling and ground, skywalking, map swimming, floating and sharking are all forbidden.\r\n2. Scripts are not allowed, except buy scripts.",
"backgroundImagePath": "images-optimized/activities/csgo.jpg",
"sponsor": {
"name": "TBD",
"imagePath": "images-optimized/invader.png",
"website": "https://areafiftylan.nl"
},
"prizes": [
"TBD"
]
},
{
"title": "RL",
"subtitle": "2 v 2",
"headerTitle": "Rocket League",
"description": "Soccer meets driving once again in the long-awaited, physics-based multiplayer-focused sequel to Supersonic Acrobatic Rocket-Powered Battle-Cars! Choose a variety of high-flying vehicles equipped with huge rocket boosters to score amazing aerial goals and pull-off incredible game-changing saves! \n[~ steampowered.com](http://store.steampowered.com/app/252950/Rocket_League/)\n\nRules #\n\n## 1. Tournament Format ##\n\n1. The tournament is a single elimination. Cross platform play is allowed. \n\n## 2. Match Format ##\n\n1. All matches must be played on the DFL Stadium map.\n2. All matches must be played in the designated tournament area using a laptop/device that can use wired internet.\n3. All matches are played best of 5, except for the finals, they are best of 7.\n4. All matches at AreaFiftyLAN are played on European servers.\n\n## 3. Technical Issues ##\n\n1. If either player disconnects from the game due to technical reasons and the game is heavily favoured towards the other party, an administrator may rule the game in favour of said player, provided a screenshot of the game prior or just at the moment of the disconnect. Should the game be too close to call, it will be replayed.\n2. If a player uses an alternative connection than ethernet they do so at their own risk and can’t be guaranteed the same stability as other players.\n\n## 4. Behavior and Conduct ##\n\n1. If a participant commits - or threatens to commit - violent acts against any other player in the Tournament, any admin, or any spectators of the Tournament, he or she may be disqualified from the Tournament.\n2. If a participant behaves in any unsportsmanlike way it is possible that he or she receives a penalty, to the sole discretion of the administrators.\n3. It is a players responsibility to be on time for their matches, if they are late they will suffer a penalty. This can be either losing a game after 20 minutes, or the entire match after 30 minutes as to not delay the entire tournament. A player is required to inform the tournament staff if they are late for a match, including a valid reason. If not they will be dropped from the tournament.\n4. One 5 minute break is allowed during a match.\n5. Coaching is not allowed during a match.\n\n## 5. Tournament Eligibility ##\n\n1. Participants which have a conflict of interest may be excluded from tournaments.\n2. The current organising committee (LANcie) have the final say in tournament eligibility\n\n## 6. Penalties ##\n\nDepending on the situation a player could be penalised in any of the following ways:\n\n1. Score penalisation (eg. starting their next match 0-1 instead of 0-0)\n2. Penalised for one match (eg. forfeiting a match)\n3. Disqualification from the tournament entirely\n\n## 7. Drop out ##\n\nIf a player decides to drop out of the tournament they are required to contact the administrators and sign a drop out sheet for confirmation. Once a player has dropped out of the tournament they will not be able to rejoin.",
"backgroundImagePath": "images-optimized/activities/rl.jpg",
"sponsor": {
"name": "TBD",
"imagePath": "images-optimized/invader.png",
"website": "https://areafiftylan.nl"
},
"prizes": [
"TBD"
]
},
{
"title": "MC",
"subtitle": "TEAM UHC",
"headerTitle": "Minecraft: Ultra Hardcore",
"description": "UHC (Ultra Hardcore) is a Minecraft PvP minigame where the goal is to be the last player/team standing. Fight in a lobby against other teams after creating your own tools and armour. In this gamemode normal Minecraft health regeneration is disabled. \n\nFor those interested, we are using the UHCCore plugin and these are the config settings we will be playing on during the event: https://pastebin.com/xHui0pKb \n\n# Rules #\n## 1. Format ##\nYou will be working in a team of 3 players, fighting against all the other teams in a Free For All format. There will be a total of 3 rounds played. The 3 teams that won each round will have to face off against each other one more time in order to become the Minecraft UHC Champion. \n## 2. Behavior and Conduct ##\n\n1. If a participant commits - or threatens to commit - violent acts against any other player in the Tournament, any admin, or any spectators of the Tournament, he or she may be disqualified from the Tournament.\n2. If a participant behaves in any unsportsmanlike way it is possible that he or she receives a penalty, to the sole discretion of the administrators.\n3. If a participant finishes his run, he or she must give the next player in line the possibility to set a score.\n\n## 3. Tournament Eligibility ##\n\n1. Participants which have a conflict of interest may be excluded from tournaments.\n2. The current organising committee (LANcie) have the final say in tournament eligibility",
"backgroundImagePath":"images-optimized/activities/minecraft.jpg",
"sponsor": {
"name": "TBD",
"imagePath": "images-optimized/invader.png",
"website": "https://areafiftylan.nl"
},
"prizes": [
"TBD"
]
},
{
"title": "MC",
"subtitle": "Building Competition",
"headerTitle": "Minecraft: Building competition",
"description": "The Minecraft building competition will be a weeklong event leading up to the preLAN. Here you can work in creative-mode, solo or with friends, to create the most magnificent buildings mankind has ever seen.\n\nFormat:\nFrom the start of the competition, on Monday the 21st of February, until the start of the preLAN, on Friday at 19:00, you will be able to work on your building project. You have complete creative freedom, on the condition that it is not insulting to anyone in any way. During the preLAN event the moderators will rate all the buildings and at the end the winner(s) will be announced.",
"backgroundImagePath":"images-optimized/activities/minecraft_building.jpg",
"sponsor": {
"name": "TBD",
"imagePath": "images-optimized/invader.png",
"website": "https://areafiftylan.nl"
},
"prizes": [
"TBD"
]
}
]
Binary file added images/activities/minecraft_building.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/lancie-commission/lancie-commission.html
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@

<div class="layout horizontal wrap">
<div class$="{{_computeSmall('textual', small)}}">
<p>The LANcie is the committee that organizes Area FiftyLAN each
<p>The LANcie is the committee that organises AreaFiftyLAN each
year. It's our job to make sure everything goes to plan and that
all potential problems are taken care of. We don't bite, so don't hesitate
to contact us with a good story, some questions or just a casual
Expand Down
4 changes: 2 additions & 2 deletions src/lancie-faq/lancie-faq.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
display: block;
}

marked-element a {
/* marked-element a {
color: var(--secondary-color);
}
} */
</style>

<iron-ajax
Expand Down
5 changes: 3 additions & 2 deletions src/lancie-home-page/lancie-banner.html
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
text-decoration: underline;
}

.links > *:last-child {
.links > *:hover {
background-color: var(--secondary-color);
color: var(--primary-color);
}
Expand Down Expand Up @@ -131,8 +131,9 @@
</div>

<div class="links">
<a href="https://ch.tudelft.nl/media/photos/?type_0=gallery&album_gallery_id_0=34" target="_self" rel="noopener noreferrer"><div>Check AreaFiftyLAN 2020 photos</div></a>
<a href="https://www.facebook.com/areafiftylan" target="_blank" rel="noopener noreferrer"><div>Stay up to date via Facebook</div></a>
<a href="https://ch.tudelft.nl/media/photos/?type_0=gallery&album_gallery_id_0=34" target="_self" rel="noopener noreferrer"><div>Check AreaFiftyLAN 2020 photos</div></a>
<a href="https://instagram.com/areafiftylan?utm_medium=copy_link" target="_blank" rel="noopener noreferrer"><div>Stay up to date via Instagram</div></a>
</div>

</template>
Expand Down
51 changes: 38 additions & 13 deletions src/lancie-home-page/lancie-home-page.html
Original file line number Diff line number Diff line change
Expand Up @@ -84,27 +84,34 @@
<lancie-timeline></lancie-timeline>
</lancie-section> -->

<lancie-section type="primary" header="Area FiftyLAN">
<lancie-section type="primary" header="AreaFiftyLAN">
<div class="intro-container">
<div class="intro-text">
<p>
Area FiftyLAN is the annual gaming event held at the TU Delft.
AreaFiftyLAN is the annual gaming event held at the TU Delft.
In May, more than 200 gamers will spend the weekend having a blast playing games
together. It is organized by the study association of Applied
together. It is organised by the study association of Applied
Mathematics and Computer Science &amp; Engineering, W.I.S.V. ‘Christiaan Huygens',
in cooperation with X (former Unit Sports &amp; Culture, TU Delft). All students are
welcome to bring their PCs to play their favourite games with their friends.
welcome to bring their computers to play their favourite games with their friends.
There will be official tournaments where you can win amazing prizes. Besides the
official tournaments, you can team up and have fun with more casual games as well
or organize your own tournament.

or organise your own tournament.
</p>
<p>
This year for the second time there will be a Pre-LAN again.
The Pre-LAN is an online gaming event.
It will be held on Friday 25 February 2022.
It will have gaming, chilling and tournaments.
The tickets for the Pre-LAN are free and available now!
<br /><sub>* A Discord account is required to participate</sub>
</p>
<lancie-activities json="data/activity.json"></lancie-activities>
</div>
</div>
</lancie-section>

<lancie-section type="primary" header="What do you get?">
<!-- <lancie-section type="primary" header="What do you get?">
<div>
<p>Buying a ticket will get you the following perks:</p>
<ul>
Expand Down Expand Up @@ -134,9 +141,9 @@
<br /><sub>* CH members/alumni will get a small discount</sub>
</p>
</div>
</lancie-section>
</lancie-section> -->

<lancie-section type="secondary" header="Official Tournaments">
<!-- <lancie-section type="secondary" header="Official Tournaments">
<div>
<p>
There are multiple official tournaments that will be organized by the
Expand All @@ -149,9 +156,22 @@
json="data/official-tournaments.json?ver=1.2"
></lancie-activities>
</div>
</lancie-section> -->

<lancie-section type="secondary" header="Official Pre-LAN Tournaments">
<div>
<p>
There are multiple official tournaments that will be organised by the
committee. These tournaments feature the most populair tournaments of
the last AreaFiftyLAN, so expect the competition to be fierce.
</p>
<lancie-activities
json="data/official-tournaments-pre_lan.json?ver=1.2"
></lancie-activities>
</div>
</lancie-section>

<lancie-section type="primary" header="Organize your own tournament!">
<!-- <lancie-section type="primary" header="Organize your own tournament!">
<div>
<p>
Is your favorite game not listed as an official tournament? We offer
Expand Down Expand Up @@ -204,11 +224,11 @@
json="data/unofficial-tournaments.json?ver=1.3"
></lancie-activities>
</div>
</lancie-section>
</lancie-section> -->

<lancie-section type="secondary" header="Frequently Asked Questions">
<!-- <lancie-section type="secondary" header="Frequently Asked Questions">
<lancie-faq markdown="data/faq.md?ver=1.0"></lancie-faq>
</lancie-section>
</lancie-section> -->

<lancie-section type="primary" header="Partners &amp; Sponsors">
<lancie-sponsors></lancie-sponsors>
Expand Down Expand Up @@ -249,6 +269,11 @@
<lancie-subscribe-mail-form></lancie-subscribe-mail-form>
</div>
</lancie-section>

<lancie-section type="primary" header="Frequently Asked Pre-LAN Questions">
<lancie-faq markdown="data/faq_prelan.md?ver=1.0"></lancie-faq>
</lancie-section>

</template>
</dom-module>
<script>
Expand Down
2 changes: 1 addition & 1 deletion src/lancie-order-check.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<a href="/">Head back to the homepage</a>
</div>
<div class="card-content" hidden$="[[!success]]">
<p>Thank you for your purchase! We are looking forward to meeting you at Area FiftyLAN.</p>
<p>Thank you for your purchase! We are looking forward to meeting you at the Pre-LAN. In order to join the Pre-LAN, you should join the Discord server <a href="https://discord.gg/WGrks2A8As" target="_blank" rel="noopener noreferrer">here</a>.</p>
<paper-button raised on-tap="openMyArea">my area</paper-button>
</div>
<div class="card-content" hidden$="[[!cancelled]]">
Expand Down
4 changes: 2 additions & 2 deletions src/lancie-sponsors/lancie-sponsors.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ <h3>Presented by</h3>
/></a>
</div>
</div>
<div class="vertical-flex">
<!-- <div class="vertical-flex">
<h3>Premium sponsors</h3>
<div>
<a
Expand Down Expand Up @@ -111,7 +111,7 @@ <h3>Supporting partners</h3>
><img src="images-optimized/logos/bit.jpg"
/></a>
</div>
</div>
</div> -->
</div>
</template>
<script>
Expand Down
2 changes: 1 addition & 1 deletion src/lancie-ticket-page/lancie-ticket-basket.html
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ <h2>Order</h2>
<span class="price">&euro; [[_formatPrice(basket.amount)]]</span>
</div>
<ul>
<li>Pickup radius is 7,5 km from the event site</li>
<!-- <li>Pickup radius is 7,5 km from the event site</li> -->
<li>Under 18 years, you must be able to provide parental approval</li>
</ul>
<small hidden$="[[!_userAssigned(basket)]]">Note: Every ticket added to this order will be reserved and you will have 15 minutes to pay. Tickets will be released after this period if not paid.</small>
Expand Down

0 comments on commit 9f9ca9e

Please sign in to comment.