Skip to content

Commit

Permalink
Initial UI Rework
Browse files Browse the repository at this point in the history
  • Loading branch information
bbdoc committed Apr 21, 2021
1 parent 74d8e0e commit 01dbf88
Show file tree
Hide file tree
Showing 15 changed files with 510 additions and 18 deletions.
47 changes: 35 additions & 12 deletions actions/channel_sync.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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 = ?
");
Expand All @@ -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 = ?
");
Expand All @@ -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 = ?
");
Expand Down
3 changes: 2 additions & 1 deletion css/custom-bootstrap.css
Original file line number Diff line number Diff line change
Expand Up @@ -6805,7 +6805,7 @@ button.bg-light:focus {
}

.bg-dark {
background-color: #5a5c69 !important;
background-color: #000000 !important;
}

a.bg-dark:hover,
Expand Down Expand Up @@ -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;
Expand Down
134 changes: 134 additions & 0 deletions css/nav.css
Original file line number Diff line number Diff line change
@@ -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;
}
10 changes: 10 additions & 0 deletions examples/config_example.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file added img/nav/invasion.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/nav/lure.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/nav/mons.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/nav/nest.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/nav/quest.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
35 changes: 35 additions & 0 deletions img/nav/raid.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 01dbf88

Please sign in to comment.