Skip to content

Commit

Permalink
Merge pull request #25 from ifheroes/development
Browse files Browse the repository at this point in the history
WIP: Development
  • Loading branch information
chrischivlog authored Dec 31, 2023
2 parents 53d6ac7 + 2deb587 commit 24d39ac
Show file tree
Hide file tree
Showing 27 changed files with 318 additions and 4,676 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
/content/sec/api-key.json
/content/news/*
!/content/news/.gitkeep
/.DS_Store/
4,441 changes: 0 additions & 4,441 deletions assets/all.js

This file was deleted.

1 change: 0 additions & 1 deletion assets/clipboard.min.js

This file was deleted.

14 changes: 14 additions & 0 deletions assets/copy.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
function copyToClipboardDomain() {
var textToCopy = "play.ifheroes.de:25565"; /// Domain

var tempInput = document.createElement("input"); /// erstelle variable mit wert
tempInput.value = textToCopy; /// in ablage speichern
document.body.appendChild(tempInput);

tempInput.select(); //// markieren des textes in der shadow box
document.execCommand("copy");

document.body.removeChild(tempInput); /// entfernen des temp textfelds

alert("Adresse erfolgreich kopiert!"); /// benachrichtigung
}
1 change: 1 addition & 0 deletions assets/icons/external-link-thin.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions assets/icons/link-thin.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions assets/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -800,8 +800,8 @@

.badge {
color: rgb(247, 247, 247);
background-color: rgb(10 8 10);
border: 6px solid rgb(10 8 10);
background-color: #38598b;
border: 6px solid #38598b;
border-radius: 5px;
display: inline-block;
font-size: small;
Expand Down Expand Up @@ -831,8 +831,8 @@

.badge {
color: rgba(10, 8, 10, 0.849);
background-color: #e9ecef;
border: 6px solid #e9ecef;
background-color: #38598b;
border: 6px solid #38598b;
border-radius: 5px;
display: inline-block;
font-size: small;
Expand Down
3 changes: 3 additions & 0 deletions content/.htaccess
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
order deny,allow
deny from all
allow from 127.0.0.1
4 changes: 1 addition & 3 deletions index.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@

<script src="<?php echo $website_url; ?>assets/jquery-3.4.1.slim.min.js"></script>
<script src="<?php echo $website_url; ?>assets/bootstrap.min.js"></script>
<script src="<?php echo $website_url; ?>assets/all.js"></script>
<script src="<?php echo $website_url; ?>assets/jquery.min.js"></script>
<script src="<?php echo $website_url; ?>assets/clipboard.min.js"></script>
<script src="<?php echo $website_url; ?>assets/copy.js"></script>

<link rel="apple-touch-icon" href="assets/img/apple-touch-icon.png" />
<link rel="shortcut icon" type="image/png" href="assets/img/server-icon.png" sizes="96x96">
Expand Down
49 changes: 5 additions & 44 deletions pages/footer.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,9 @@
<br>
<b><?php echo $data_lang->footer[0]->quicklinks?></b>
<br>
<b><a class="link-footer" href="?page=jobs"><?php echo $data_lang->navbar[0]->jobs;?></a></b>
<br>
<b><a class="link-footer" target="_blank" href="https://status.ifheroes.de"><?php echo $data_lang->navbar[0]->status?></a></b>
<br>
<b><a class="link-footer" href="?page=about"><?php echo $data_lang->navbar[0]->about?></a></b>
<br>
<b><a class="link-footer" href="https://github.com/ifheroes" target="_blank" ><?php echo $data_lang->navbar[0]->github?></a></b>
<br>
<b><a class="link-footer" href="https://github.com/ifheroes/website"><?php echo $data_lang->footer[0]->contents?></a></b>
<b><a class="link-footer" target="_blank" href="https://open.spotify.com/playlist/1tZH97oP2eWhMtIpbejEnv?si=9c220372192f4a5f">Spotify</a></b>
</div>
<div class="col-sm">
<br>
Expand All @@ -61,13 +55,7 @@
</a>
</center>
</div>
<!-- <div class="col-sm">
<center>
<a class="link-footer" href="?page=legal&terms">
<?php echo $data_lang->footer[0]->terms;?>
</a>
</center>
</div> -->

<div class="col-sm">
<center>
<a class="link-footer" href="?page=legal&privacy">
Expand All @@ -81,33 +69,6 @@
<br>
</footer>

<link rel="stylesheet" type="text/css" href="https://cdn.wpcc.io/lib/1.0.2/cookieconsent.min.css" />
<script src="https://cdn.wpcc.io/lib/1.0.2/cookieconsent.min.js"></script>
<script>
window.addEventListener("load", function() {
window.wpcc.init({
"colors": {
"popup": {
"background": "#f6f6f6",
"text": "#000000",
"border": "#555555"
},
"button": {
"background": "#1E90FF",
"text": "#f6f6f6"
}
},
"position": "bottom",
"corners": "large",
"padding": "large",
"margin": "large",
"fontsize": "large",
"content": {
"href": "?page=legal&amp;privacy",
"message": "Diese Webseite benutzt Cookies um Nutzern das bestmögliche erlebnis zu bieten.",
"link": "Datenschutz",
"button": "Ich stimme zu!"
}
})
});
</script>

<!--cookie bot-->
<script id="Cookiebot" src="https://consent.cookiebot.com/uc.js" data-cbid="10ec7fa6-f873-4fae-a8f5-7076f0efece4" data-blockingmode="auto" type="text/javascript"></script>
29 changes: 0 additions & 29 deletions pages/games/games-class.php
Original file line number Diff line number Diff line change
@@ -1,32 +1,3 @@
<!--Gamemodes section /// Survival-->
<div class="container">
<div class="row">
<div class="col-sm">
<h4><?php echo $data_lang->games[0]->survival_title; ?></h4>
<br>
<?php echo $data_lang->games[0]->survival_text; ?>
<br><br>
<p>
<button class="games_button" onClick="window.location.href='https://map.ifheroes.de';">Dynmap</button>
<button class="games_button" onClick="window.location.href='#Survival';">FAQ</button>
<button class="games_button" onClick="window.location.href='?page=rules&game=<?php echo $data_lang->games[0]->survival_title; ?>';" id="<?php echo $data_lang->games[0]->survival_title; ?>-rules">Regeln</button>
</p>
</div>
<div class="hide-mobile">
<div class="col-sm">
<img src="<?php echo $data_lang->games[0]->survival_image; ?>">
</div>
</div>
</div>
</div>

<br>
<br>
<br>
<br>
<br>
<br>

<!--Gamemodes section /// SGduels-->
<div class="container">
<div class="row">
Expand Down
38 changes: 0 additions & 38 deletions pages/games/games-faq-class.php
Original file line number Diff line number Diff line change
@@ -1,42 +1,4 @@
<br>
<br>

<!-- SURVIVAL AREA-->
<center>
<h4 id="<?php echo $data_lang->games[0]->survival_title; ?>"><?php echo $data_lang->games[0]->survival_title; ?></h4>
</center>
<?php

//// COUNT FOR SURVIVAL FAQ

// get content form json file content/job_info.json via system/json_files.php
$data = file_get_contents($json['games_faq'], true);
// JSON decode
$obj = json_decode($data);

$count_survival = count($obj->survival);

$n = 0;

while ($n < $count_survival) {

$number = $n++;
?>
<p>
<details>
<summary>
<b><?php echo $obj->survival[$number]->title; ?></b>
</summary>
<div class="sum-word-breakUI">
<p>
<?php echo "<br>" . $obj->survival[$number]->text; ?>
</p>
</div>
</details>
</p>
<?php
}
?>

<!-- SGDUELS AREA-->

Expand Down
78 changes: 75 additions & 3 deletions pages/home.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
<br>
<br>
<a href="#start" class="link-no-deco">
<h6><?php echo $data_lang->home[0]->Arrow_animation; ///get data from lang.json in index
?></h6>
<br> <br>
<h6><?php echo $data_lang->home[0]->Arrow_animation; ///get data from lang.json in index
?></h6>
<br> <br>



Expand Down Expand Up @@ -54,6 +54,39 @@
<?php include $page['news']; ?>





<!--Gamemodes section /// Survival-->

<center>
<br>
<h3 id="survivalMode"><?php echo $data_lang->games[0]->survival_title; ?></h3>
</center>
<div class="container">
<div class="row">
<div class="col-sm">
<br>
<?php echo $data_lang->games[0]->survival_text; ?>
<br><br>
<p>
<button class="games_button" onClick="window.location.href='https://map.ifheroes.de';">Dynmap</button>
<button class="games_button" onClick="window.location.href='#Survival';">FAQ</button>
<button class="games_button" onClick="window.location.href='?page=rules&game=<?php echo $data_lang->games[0]->survival_title; ?>';" id="<?php echo $data_lang->games[0]->survival_title; ?>-rules">Tutorial</button>
</p>
</div>
<div class="hide-mobile">
<div class="col-sm">
<img src="<?php echo $data_lang->games[0]->survival_image; ?>">
</div>
</div>
</div>
</div>


<br>
<br>

<!-- FAQ Übersicht allgemein -->
<?php

Expand Down Expand Up @@ -97,6 +130,45 @@
?>
</div>
</div>
<br>
<br>

<!-- SURVIVAL AREA-->
<center>
<h3 id="<?php echo $data_lang->games[0]->survival_title; ?>"><?php echo $data_lang->games[0]->survival_title; ?></h3>
</center>
<?php

//// COUNT FOR SURVIVAL FAQ

// get content form json file content/job_info.json via system/json_files.php
$data = file_get_contents($json['games_faq'], true);
// JSON decode
$obj = json_decode($data);

$count_survival = count($obj->survival);

$n = 0;

while ($n < $count_survival) {

$number = $n++;
?>
<p>
<details>
<summary>
<b><?php echo $obj->survival[$number]->title; ?></b>
</summary>
<div class="sum-word-breakUI">
<p>
<?php echo "<br>" . $obj->survival[$number]->text; ?>
</p>
</div>
</details>
</p>
<?php
}
?>
</div>


Expand Down
3 changes: 3 additions & 0 deletions pages/home/.htaccess
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
order deny,allow
deny from all
allow from 127.0.0.1
2 changes: 1 addition & 1 deletion pages/home/online_players.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<!-- Zeigt Spieler auf MC -->
<div class="col-sm">
<div class="shadow-box">
<div class="shadow-box" onclick="copyToClipboardDomain()">
<div class="col-sm">
<text class="font-color">
<h3><img src="<?php echo $website_url; ?>/assets/icons/minecraft_icon_138374.svg" class="minecraft-icon-1" class="discord-icon-1" width="30px"> <?php echo $data_lang->home[0]->show_mc_title; ?></h3>
Expand Down
Loading

0 comments on commit 24d39ac

Please sign in to comment.