diff --git a/actions/channel_sync.php b/actions/channel_sync.php index c840ecb4..b102a7cf 100644 --- a/actions/channel_sync.php +++ b/actions/channel_sync.php @@ -35,8 +35,19 @@ // Insert New Monsters Tracking - $stmt = $conn->prepare("INSERT INTO ".$target_db.".monsters SELECT - REPLACE(id, ?, ? ), + $stmt = $conn->prepare("INSERT INTO ".$target_db.".monsters + (id, ping, clean, pokemon_id, distance, + min_iv, max_iv, + min_cp, max_cp, + min_level, max_level, + atk, def, sta, + template, min_weight, max_weight, form, max_atk, + max_def, max_sta, gender, + great_league_ranking, great_league_ranking_min_cp, + ultra_league_ranking, ultra_league_ranking_min_cp, + profile_no, min_time, rarity, max_rarity + ) + SELECT REPLACE(id, ?, ? ), ping, clean, pokemon_id, distance, min_iv, max_iv, min_cp, max_cp, @@ -45,7 +56,8 @@ template, min_weight, max_weight, form, max_atk, max_def, max_sta, gender, great_league_ranking, great_league_ranking_min_cp, - ultra_league_ranking, ultra_league_ranking_min_cp + ultra_league_ranking, ultra_league_ranking_min_cp, + profile_no, min_time, rarity, max_rarity FROM monsters WHERE id = ? "); @@ -56,9 +68,10 @@ // Insert New Eggs Tracking - $stmt = $conn->prepare("INSERT INTO ".$target_db.".egg SELECT - REPLACE(id, ?, ? ), - ping, clean, exclusive, template, distance, team, level + $stmt = $conn->prepare("INSERT INTO ".$target_db.".egg + (id,ping, clean, exclusive, template, distance, team, level, profile_no) + SELECT REPLACE(id, ?, ? ), + ping, clean, exclusive, template, distance, team, level, profile_no FROM egg WHERE id = ? "); @@ -69,22 +82,32 @@ // Insert New Raids Tracking - $stmt = $conn->prepare("INSERT INTO ".$target_db.".raid SELECT - REPLACE(id, ?, ? ), - ping, clean, pokemon_id, exclusive, template, distance, team, level, form + $stmt = $conn->prepare("INSERT INTO ".$target_db.".raid + (id, ping, clean, pokemon_id, exclusive, template, distance, team, level, form, profile_no) + SELECT REPLACE(id, ?, ? ), + ping, clean, pokemon_id, exclusive, template, distance, team, level, form, profile_no FROM raid WHERE id = ? "); + + echo "INSERT INTO ".$target_db.".raid + (id, ping, clean, pokemon_id, exclusive, template, distance, team, level, form, profile_no) + SELECT REPLACE(id, ".$_SESSION['id'].", ".$target_id." ), + ping, clean, pokemon_id, exclusive, template, distance, team, level, form, profile_no + FROM raid + WHERE id = ".$_SESSION['id']; + $rs = $stmt->bind_param("sss", $_SESSION['id'], $target_id, $_SESSION['id']); $rs = $stmt->execute(); $stmt->close(); // Insert New Quests Tracking - $stmt = $conn->prepare("INSERT INTO ".$target_db.".quest SELECT - REPLACE(id, ?, ? ), - ping, clean, reward, template, shiny, reward_type, distance + $stmt = $conn->prepare("INSERT INTO ".$target_db.".quest + (id, ping, clean, reward, template, shiny, reward_type, distance, profile_no) + SELECT REPLACE(id, ?, ? ), + ping, clean, reward, template, shiny, reward_type, distance, profile_no FROM quest WHERE id = ? "); diff --git a/css/custom-bootstrap.css b/css/custom-bootstrap.css index dcabc46d..126b70dd 100644 --- a/css/custom-bootstrap.css +++ b/css/custom-bootstrap.css @@ -6805,7 +6805,7 @@ button.bg-light:focus { } .bg-dark { - background-color: #5a5c69 !important; + background-color: #000000 !important; } a.bg-dark:hover, @@ -10529,6 +10529,7 @@ a:focus { } .sidebar .nav-item .nav-link .img-profile, +.img-profile, .topbar .nav-item .nav-link .img-profile { height: 2rem; width: 2rem; diff --git a/css/nav.css b/css/nav.css new file mode 100644 index 00000000..e94461a4 --- /dev/null +++ b/css/nav.css @@ -0,0 +1,134 @@ +.nav-icon { + color:#999c9f; + cursor: pointer; +} +.nav-icon:hover { + color: white !important; +} + +a.dropdown-item:hover { + background-color: #dadada78; + background-image: none; +} + +.dropdown-menu.navbar-dropdown.scrollable-menu.show { + max-height: 80vh; + overflow-x: hidden; +} + +.language-dropdown { + top: 47px; + left: -115px; +} + +a.navbar-brand { + left: 70px; + position: absolute; +} + +.navbar { + margin-bottom: 20px; + height: 60px; + padding: .5rem 1rem; +} + +.offcanvas-header { + display: block; +} + +.screen-overlay { + height: 100%; + z-index: 30; + position: absolute; + top: 0; + left: 0; + opacity: 0; + visibility: hidden; + background-color: rgba(0,0,0, 0.9); + transition: opacity .2s linear, visibility .1s, width 1s ease-in; +} +.screen-overlay.show { + transition: opacity .5s ease, width 0s; + opacity: 0.4; + width: 100%; + top:60px; + visibility: visible; +} + +.offcanvas { + visibility: hidden; + transform: translateX(-100%); + border-radius: 5px; + display: block; + position: absolute; + top: 60px; + left: 0; + height: 100%; + z-index: 1200; + width: 18em; + overflow-y: scroll; + overflow-x: hidden; + transition: visibility .2s ease-in-out, transform .2s ease-in-out; +} + +.offcanvas.show { + visibility: visible; + transform: translateX(0); +} + +.heading-title { + top: 6px; + position: relative; +} + +.card-header-navbar[aria-expanded="false"]:after { + content: "\f067"; /* fa-plus */ + font-family: 'Font Awesome\ 5 Free'; + font-weight: 900; + position: absolute; + right: 30px; + top: 21px; + font-size: 10px; +} +.card-header-navbar[aria-expanded="true"]:after { + content: "\f068"; /* fa-minus */ + font-family: 'Font Awesome\ 5 Free'; + font-weight: 900; + position: absolute; + right: 30px; + top: 21px; + font-size: 10px; +} + +.btn:focus { + box-shadow: none; +} +.dropdown-item:active { + background-color: #fff; +} + +.border { + border: 1px solid #dfdfdf; +} + +.card.z-depth-0.bordered { + width: 114%; + margin-left: -18px; +} + +.color-button { + height: 21px; + width: 21px; + margin-right: 5px; + border: 1px solid #ced4da; + border-radius: 10px; + position: relative; + top: 2px; + -webkit-tap-highlight-color: rgba(255, 255, 255, 0) !important; + -webkit-focus-ring-color: rgba(255, 255, 255, 0) !important; + outline: none !important; +} + +.form-control { + margin-bottom: 15px; +} diff --git a/examples/config_example.php b/examples/config_example.php index 27138ccb..83bb9d0f 100644 --- a/examples/config_example.php +++ b/examples/config_example.php @@ -45,6 +45,16 @@ $api_address="http://127.0.0.1:4201"; $api_secret="MySecret"; +// Donation Pages + +#$paypalUrl = "https://paypal.me/StephaneHanrez"; + +// Custom Page + +$custom_page_name = ""; +$custom_page_url = ""; +$custom_page_icon = "fas fa-globe-europe"; # Any Free Icon from https://fontawesome.com/icons (Use Full Class) +$custom_profile_msg = "" // Admin User diff --git a/img/nav/invasion.png b/img/nav/invasion.png new file mode 100644 index 00000000..23f9b16e Binary files /dev/null and b/img/nav/invasion.png differ diff --git a/img/nav/lure.png b/img/nav/lure.png new file mode 100644 index 00000000..cce2ddaa Binary files /dev/null and b/img/nav/lure.png differ diff --git a/img/nav/mons.png b/img/nav/mons.png new file mode 100644 index 00000000..cfaa9930 Binary files /dev/null and b/img/nav/mons.png differ diff --git a/img/nav/nest.png b/img/nav/nest.png new file mode 100644 index 00000000..b6298d49 Binary files /dev/null and b/img/nav/nest.png differ diff --git a/img/nav/quest.png b/img/nav/quest.png new file mode 100644 index 00000000..dba5ac23 Binary files /dev/null and b/img/nav/quest.png differ diff --git a/img/nav/raid.svg b/img/nav/raid.svg new file mode 100644 index 00000000..1c4cfe51 --- /dev/null +++ b/img/nav/raid.svg @@ -0,0 +1,35 @@ + + + + + + diff --git a/include/nav.php b/include/nav.php new file mode 100644 index 00000000..214f03be --- /dev/null +++ b/include/nav.php @@ -0,0 +1,236 @@ + + + + + +
diff --git a/index.php b/index.php index 2b6238a5..3f1a6399 100644 --- a/index.php +++ b/index.php @@ -38,6 +38,7 @@ + @@ -73,7 +74,7 @@ function areas(type) {
- +
@@ -2267,7 +2268,8 @@ class="badge badge-primary badge-pill"> - + + diff --git a/js/nav.js b/js/nav.js new file mode 100644 index 00000000..bc686dc5 --- /dev/null +++ b/js/nav.js @@ -0,0 +1,44 @@ + +// SideNav +$('[data-trigger]').on('click', function () { + var offcanvasId = $(this).attr('data-trigger') + $(offcanvasId).toggleClass('show') + $('.screen-overlay').toggleClass('show') +}) + +$('.screen-overlay').click(function () { + $('.offcanvas').removeClass('show') + $('.screen-overlay').removeClass('show') +}) + +$(window).on('scroll', function () { + if (!$('#header').visible()) { + $('.offcanvas').removeClass('show') + $('.screen-overlay').removeClass('show') + } +}) + +// Nav Styling +$('#color-button-dark').on('click', function () { + darkMode() + Store.set('navColor', 'dark') +}) + +$('#color-button-light').on('click', function () { + lightMode() + Store.set('navColor', 'light') +}) + +$('#color-button-secondary').on('click', function () { + greyMode() + Store.set('navColor', 'grey') +}) + +// Close on Menu Item Click + +document.getElementById("logout").addEventListener("click", function(event) { + $('.offcanvas').removeClass('show') + $('.screen-overlay').removeClass('show') +}); + + diff --git a/locales/fr.json b/locales/fr.json index c07ea449..34d50f4e 100644 --- a/locales/fr.json +++ b/locales/fr.json @@ -94,12 +94,13 @@ "Close":"Fermer", "Other":"Autres", "Buy or Renew a Subscription": "Acheter ou renouveler un abonnement", + "Subscription":"Abonnement", "It looks like you do not have a valid subscription to this tool yet":"Il semble que vous n'avez pas encore d'abonnement pour cet outil", "It looks like your subscription has expired on":"Votre souscription a expiré le", "Your subscription is still valid until":"Votre abonnement est valide jusqu'au", "Back to":"Retour à", "Renew":"Renouveler", - "Subscription valid until":"Abonnement Valide jusqu'au", + "Valid until":"Valide jusqu'au", "Alerts":"Alarmes", "ALL Monsters Cleaning":"Nettoyer TOUS les Pokémon", "ALL Raid/Egg Cleaning":"Nettoyer TOUS les Raids/Oeufs", @@ -292,5 +293,11 @@ "AND ALL ASSOCIATED TRACKINGS":"ET TOUS LES SUIVIS ASSOCIES", "Duplicate - This Alarm already exist":"Doublon - Cette Alarme existe déjà", "Your account has been disabled on":"Votre compte a été désactivé le", - "Please contact an admin!":"Veuillez contacter un administrateur!" + "Your account has been disabled by an admin":"Votre compte a été désactivé par l'administrateur", + "Please contact an admin!":"Veuillez contacter un administrateur!", + "Admin Tools":"Outils Administrateur", + "Cleaning":"Nettoyage", + "Trackings":"Suivis", + "Profiles":"Profils", + "Areas & Location":"Zones et Localisation" } diff --git a/return_messages.php b/return_messages.php index d244e465..238100e2 100644 --- a/return_messages.php +++ b/return_messages.php @@ -379,7 +379,7 @@ +