From 04f29a7f9ec8e0f7a4b626a1c218358d9d9b6db3 Mon Sep 17 00:00:00 2001
From: "Benjamin.sitbon" <benjamin.sitbon@etu.hesge.ch>
Date: Sun, 18 Apr 2021 18:50:33 +0200
Subject: [PATCH] modifications sur le chargement de la page
---
frontend/button.css | 113 +++++++++++++++++++
frontend/img/eevee.svg | 217 -------------------------------------
frontend/img/pikachu.svg | 101 -----------------
frontend/img/pikachu2.svg | 164 ----------------------------
frontend/img/pokeball.png | Bin 7014 -> 0 bytes
frontend/img/pokeball.svg | 63 ++++-------
frontend/img/pokeball2.svg | 1 -
frontend/img/ronflex.svg | 147 -------------------------
frontend/img/sac.svg | 101 +++++++++--------
frontend/js/index.js | 44 ++++----
frontend/js/product.js | 66 ++++++++---
frontend/menu.css | 13 ++-
frontend/select.css | 163 +++++++---------------------
frontend/select.html | 3 +-
frontend/shop.html | 12 +-
frontend/style.css | 11 +-
16 files changed, 319 insertions(+), 900 deletions(-)
delete mode 100644 frontend/img/eevee.svg
delete mode 100644 frontend/img/pikachu.svg
delete mode 100644 frontend/img/pikachu2.svg
delete mode 100644 frontend/img/pokeball.png
delete mode 100644 frontend/img/pokeball2.svg
delete mode 100644 frontend/img/ronflex.svg
diff --git a/frontend/button.css b/frontend/button.css
index c673e6f..b10e00e 100644
--- a/frontend/button.css
+++ b/frontend/button.css
@@ -93,4 +93,117 @@
@-webkit-keyframes buttonx-out {
from {transform: skew(-42deg) translate(0, 0);}
to {transform: skew(-42deg) translate(300px, -0px);}
+ }
+
+
+ .btn-5 {
+
+ font-weight: 500;
+ cursor: pointer;
+ transition: all 0.3s ease;
+ display: inline-block;
+ box-shadow:inset 2px 2px 10px 0px rgba(255,255,255,.5), 2px 2px 10px 0px rgba(0,0,0,.1), 2px 2px 10px 0px rgba(0,0,0,.1);
+ outline: none;
+ width: 100px;
+ height: 4vh;
+ width: 30%;
+ padding: 0;
+ border: none;
+ border-radius: 20px 20px;
+ background: linear-gradient(0deg, rgba(255,27,0,1) 0%, rgba(251,75,2,1) 100%);
+ color: white;
+ font-size: 1.5vh;
+
+ }
+ .btn-5:hover {
+ box-shadow:inset 2px 2px 2px 0px rgba(255,255,255,.5), 7px 7px 20px 0px rgba(0,0,0,.1), 4px 4px 5px 0px rgba(0,0,0,.1) !important;
+ color: #f0094a !important;
+ background: whitesmoke !important;
+ box-shadow:none;
+ }
+
+
+
+ .btn-5:before,
+ .btn-5:after{
+ content:'';
+ position:absolute;
+ top:0;
+ right:0;
+ height:2px;
+ width:0;
+ background: rgba(255,27,0,1);
+ box-shadow:
+ -1px -1px 5px 0px #fff,
+ 7px 7px 20px 0px #0003,
+ 4px 4px 5px 0px #0002;
+ transition:400ms ease all;
+ }
+ .btn-5:after{
+ right:inherit;
+ top:inherit;
+ left:0;
+ bottom:0;
+ }
+ .btn-5:hover:before,
+ .btn-5:hover:after{
+ width:100%;
+ transition:800ms ease all;
+ }
+
+
+
+ .btn-2 {
+ font-weight: 500;
+ cursor: pointer;
+ transition: all 0.3s ease;
+ display: inline-block;
+ box-shadow:inset 2px 2px 10px 0px rgba(255,255,255,.5), 2px 2px 10px 0px rgba(0,0,0,.1), 2px 2px 10px 0px rgba(0,0,0,.1);
+
+ outline: none;
+ width: 100px;
+ height: 4vh;
+ width: 30%;
+ padding: 0;
+ border: none;
+ border-radius: 20px 20px;
+ background: linear-gradient(0deg,whitesmoke 0%, whitesmoke 100%);
+ color: rgba(255,27,0,1);
+ font-size: 1.5vh;
+
+ }
+ .btn-2:hover {
+ box-shadow:inset 2px 2px 2px 0px rgba(255,255,255,.5), 7px 7px 20px 0px rgba(0,0,0,.1), 4px 4px 5px 0px rgba(0,0,0,.1) !important;
+ color: whitesmoke !important;
+ background:rgba(255,27,0,1) !important;
+ box-shadow:none;
+ }
+
+
+
+ .btn-2:before,
+ .btn-2:after{
+ content:'';
+ position:absolute;
+ top:0;
+ right:0;
+ height:2px;
+ width:0;
+ background: black;
+ box-shadow:
+ -1px -1px 5px 0px #fff,
+ 7px 7px 20px 0px #0003,
+ 4px 4px 5px 0px #0002;
+ transition:400ms ease all;
+ }
+ .btn-2:after{
+ right:inherit;
+ top:inherit;
+ left:0;
+ bottom:0;
+ }
+ .btn-2:hover:before,
+ .btn-2:hover:after{
+ width:100%;
+ transition:800ms ease all;
}
\ No newline at end of file
diff --git a/frontend/img/eevee.svg b/frontend/img/eevee.svg
deleted file mode 100644
index dfe7e63..0000000
--- a/frontend/img/eevee.svg
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="0 0 127.6 127.6" style="enable-background:new 0 0 127.6 127.6;" xml:space="preserve">
-<g>
- <g>
- <path style="fill:#FFECD2;" d="M115.06,91.168c0,16.236-22.949,34.932-51.26,34.932s-51.26-18.695-51.26-34.932
- c0-16.238,22.949-29.402,51.26-29.402S115.06,74.93,115.06,91.168z"/>
- </g>
- <g>
- <path style="fill:#EFC99A;" d="M115.06,91.168c0,16.236-22.949,29.266-51.26,29.266s-51.26-13.029-51.26-29.266
- c0-16.238,22.949-29.402,51.26-29.402S115.06,74.93,115.06,91.168z"/>
- </g>
- <g>
- <path style="fill:#33363A;" d="M63.8,127.6c-29.713,0-52.76-19.584-52.76-36.432c0-17.04,23.668-30.902,52.76-30.902
- s52.76,13.862,52.76,30.902C116.56,108.016,93.513,127.6,63.8,127.6z M63.8,63.266c-27.438,0-49.76,12.517-49.76,27.902
- c0,15.143,22.196,33.432,49.76,33.432s49.76-18.289,49.76-33.432C113.56,75.782,91.237,63.266,63.8,63.266z"/>
- </g>
- <g>
- <g>
- <path style="fill:#E5B076;" d="M113.009,79.612c0,20.676-22.031,37.441-49.209,37.441s-49.209-16.766-49.209-37.441
- c0-20.68,22.031-45.459,49.209-45.459S113.009,58.932,113.009,79.612z"/>
- </g>
- <g>
- <path style="fill:#D3964C;" d="M113.009,79.612c0,20.676-22.031,37.441-49.209,37.441s-49.209-16.766-49.209-37.441
- c0-20.68,22.031-34.928,49.209-34.928S113.009,58.932,113.009,79.612z"/>
- </g>
- <g>
- <path style="fill:#E5B076;" d="M74.278,83.569c0,1.393-4.691,1.643-10.478,1.643c-5.787,0-10.479-0.25-10.479-1.643
- c0-1.395,4.691-5.037,10.479-5.037C69.587,78.531,74.278,82.174,74.278,83.569z"/>
- </g>
- <g>
- <path style="fill:#C4833D;" d="M113.009,79.612c0,20.676-22.031,37.441-49.209,37.441s-49.209-16.766-49.209-37.441
- c0-20.682,6.262,18.34,49.209,18.34S113.009,58.93,113.009,79.612z"/>
- </g>
- <g>
- <path style="fill:#33363A;" d="M63.8,118.553c-27.961,0-50.709-17.469-50.709-38.941c0-21.27,22.619-46.959,50.709-46.959
- s50.709,25.689,50.709,46.959C114.509,101.084,91.761,118.553,63.8,118.553z M63.8,35.653c-26.428,0-47.709,24.048-47.709,43.959
- c0,19.818,21.402,35.941,47.709,35.941s47.709-16.123,47.709-35.941C111.509,59.7,90.228,35.653,63.8,35.653z"/>
- </g>
- </g>
- <g>
- <g>
- <g>
- <g>
- <g>
- <g>
- <path style="fill:#D3964C;" d="M21.11,34.031c-0.124,12.322,4.217,22.303,11.009,27.771
- c6.933-8.355,11.495-20.207,11.619-32.531C43.863,16.948,39.522,6.967,32.729,1.5C25.798,9.854,21.235,21.707,21.11,34.031z"
- />
- </g>
- <g>
- <path style="fill:#C4833D;" d="M32.729,1.5C25.798,9.854,21.235,21.707,21.11,34.031
- c-0.124,12.322,4.217,22.303,11.009,27.771L32.729,1.5z"/>
- </g>
- <g>
- <path style="fill:#33363A;" d="M26.4,56.705c-0.503,0-0.995-0.254-1.278-0.714c-3.69-6-5.596-13.599-5.511-21.976
- c0.123-12.257,4.484-24.458,11.964-33.474c0.521-0.631,1.454-0.725,2.095-0.211c7.479,6.019,11.695,16.572,11.569,28.956
- c-0.075,7.313-1.688,14.76-4.665,21.537c-0.333,0.757-1.219,1.104-1.977,0.77c-0.758-0.333-1.103-1.218-0.77-1.977
- c2.815-6.409,4.341-13.45,4.411-20.361c0.109-10.797-3.267-20.025-9.311-25.604c-6.463,8.362-10.206,19.348-10.317,30.395
- c-0.079,7.811,1.672,14.855,5.065,20.373c0.435,0.706,0.214,1.63-0.491,2.063C26.94,56.634,26.668,56.705,26.4,56.705z"/>
- </g>
- </g>
- </g>
- </g>
- <g>
- <g>
- <g>
- <g>
- <path style="fill:#66310E;" d="M26.919,40.11c-0.059,5.826,1.994,10.541,5.204,13.127c3.276-3.949,5.433-9.551,5.491-15.375
- c0.06-5.826-1.992-10.543-5.203-13.127C29.135,28.684,26.978,34.285,26.919,40.11z"/>
- </g>
- <g>
- <path style="fill:#89410B;" d="M32.411,24.735c-3.276,3.949-5.434,9.551-5.492,15.375
- c-0.059,5.826,1.994,10.541,5.204,13.127L32.411,24.735z"/>
- </g>
- <g>
- <path style="fill:#33363A;" d="M32.122,54.737c-0.33,0-0.663-0.108-0.94-0.332c-3.724-3-5.824-8.216-5.763-14.31l0,0
- c0.061-5.971,2.188-11.919,5.838-16.318c0.521-0.631,1.455-0.726,2.095-0.211c3.725,2.998,5.825,8.214,5.763,14.312
- c-0.061,5.971-2.188,11.919-5.837,16.317C32.982,54.552,32.554,54.737,32.122,54.737z M26.919,40.11l1.5,0.015
- c-0.045,4.413,1.253,8.354,3.524,10.88c2.618-3.716,4.123-8.423,4.171-13.157c0.045-4.416-1.252-8.356-3.523-10.88
- c-2.619,3.716-4.124,8.424-4.172,13.157L26.919,40.11z"/>
- </g>
- </g>
- </g>
- </g>
- </g>
- <g>
- <g>
- <g>
- <g>
- <g>
- <path style="fill:#D3964C;" d="M106.489,34.031c0.124,12.322-4.217,22.303-11.009,27.771
- c-6.933-8.355-11.495-20.207-11.619-32.531C83.736,16.948,88.078,6.967,94.871,1.5
- C101.802,9.854,106.365,21.707,106.489,34.031z"/>
- </g>
- <g>
- <path style="fill:#C4833D;" d="M94.871,1.5c6.931,8.353,11.494,20.207,11.618,32.531
- c0.124,12.322-4.217,22.303-11.009,27.771L94.871,1.5z"/>
- </g>
- <g>
- <path style="fill:#33363A;" d="M101.2,56.705c-0.269,0-0.54-0.071-0.785-0.223c-0.705-0.434-0.926-1.357-0.491-2.063
- c3.394-5.518,5.145-12.563,5.065-20.372c-0.111-11.048-3.854-22.033-10.317-30.396c-6.044,5.579-9.42,14.808-9.311,25.604
- c0.07,6.911,1.596,13.952,4.411,20.361c0.333,0.759-0.012,1.644-0.77,1.977c-0.758,0.336-1.644-0.012-1.977-0.77
- c-2.978-6.777-4.59-14.225-4.665-21.537C82.235,16.904,86.452,6.35,93.931,0.331c0.641-0.514,1.572-0.42,2.095,0.211
- c7.479,9.016,11.841,21.217,11.964,33.475c0.085,8.376-1.82,15.975-5.511,21.975C102.195,56.451,101.703,56.705,101.2,56.705
- z"/>
- </g>
- </g>
- </g>
- </g>
- <g>
- <g>
- <g>
- <g>
- <path style="fill:#66310E;" d="M100.681,40.11c0.059,5.826-1.994,10.541-5.204,13.127c-3.276-3.949-5.433-9.551-5.491-15.375
- c-0.06-5.826,1.992-10.543,5.203-13.127C98.465,28.684,100.622,34.285,100.681,40.11z"/>
- </g>
- <g>
- <path style="fill:#89410B;" d="M95.189,24.735c3.276,3.949,5.434,9.551,5.492,15.375c0.059,5.826-1.994,10.541-5.204,13.127
- L95.189,24.735z"/>
- </g>
- <g>
- <path style="fill:#33363A;" d="M95.478,54.737c-0.432,0-0.859-0.185-1.155-0.542c-3.649-4.398-5.776-10.347-5.837-16.318
- c-0.063-6.097,2.038-11.313,5.763-14.311c0.64-0.515,1.572-0.42,2.095,0.211c3.65,4.399,5.777,10.348,5.838,16.318l0,0
- c0.062,6.094-2.039,11.31-5.763,14.31C96.141,54.628,95.808,54.737,95.478,54.737z M95.009,26.967
- c-2.271,2.523-3.568,6.464-3.523,10.879c0.048,4.735,1.553,9.442,4.171,13.158c2.271-2.525,3.569-6.467,3.524-10.88
- C99.133,35.391,97.628,30.683,95.009,26.967z"/>
- </g>
- </g>
- </g>
- </g>
- </g>
- </g>
- <path style="fill:#33363A;" d="M73.437,94.565c-0.828,0-1.5,0.672-1.5,1.5c0,1.428-1.162,2.59-2.59,2.59H67.89
- c-1.428,0-2.59-1.162-2.59-2.59V94.61c0-0.073-0.011-0.143-0.021-0.213l3.111-1.557c0.622-0.312,0.949-1.01,0.789-1.687
- s-0.765-1.155-1.46-1.155h-7.837c-0.695,0-1.3,0.479-1.46,1.155s0.167,1.375,0.789,1.687l3.11,1.557
- c-0.01,0.07-0.021,0.14-0.021,0.213v1.455c0,1.428-1.162,2.59-2.59,2.59h-1.457c-1.428,0-2.59-1.162-2.59-2.59
- c0-0.828-0.672-1.5-1.5-1.5s-1.5,0.672-1.5,1.5c0,3.082,2.508,5.59,5.59,5.59h1.457c1.615,0,3.068-0.693,4.09-1.792
- c1.021,1.099,2.475,1.792,4.09,1.792h1.457c3.082,0,5.59-2.508,5.59-5.59C74.937,95.237,74.265,94.565,73.437,94.565z"/>
- <g>
- <path style="fill:#89410B;" d="M47.638,84.428c0,4.449-3.605,8.051-8.053,8.051c-4.445,0-8.051-3.602-8.051-8.051
- c0-4.447,3.605-8.051,8.051-8.051C44.032,76.377,47.638,79.981,47.638,84.428z"/>
- </g>
- <g>
- <circle style="fill:#FFFFFF;" cx="35.582" cy="81.811" r="3.28"/>
- </g>
- <path style="fill:#33363A;" d="M39.585,74.877c-3.243,0-6.11,1.628-7.837,4.107c-0.106,0.143-0.198,0.294-0.288,0.448
- c-0.898,1.456-1.426,3.163-1.426,4.996c0,5.267,4.284,9.551,9.551,9.551c5.268,0,9.553-4.284,9.553-9.551
- S44.853,74.877,39.585,74.877z M39.585,90.979c-2.721,0-5.058-1.668-6.046-4.034c0.68-0.018,1.509-0.201,2.437-0.393
- c0.357-0.03,0.701-0.097,1.032-0.202c0.809-0.144,1.675-0.258,2.577-0.258c2.413,0,4.572,0.813,6.048,0.853
- C44.644,89.311,42.307,90.979,39.585,90.979z"/>
- <circle style="fill:#FFFFFF;" cx="35.581" cy="81.812" r="1.78"/>
- <g>
- <path style="fill:#89410B;" d="M96.066,84.428c0,4.449-3.605,8.051-8.051,8.051c-4.447,0-8.053-3.602-8.053-8.051
- c0-4.447,3.605-8.051,8.053-8.051C92.46,76.377,96.066,79.981,96.066,84.428z"/>
- </g>
- <g>
- <circle style="fill:#FFFFFF;" cx="84.01" cy="81.811" r="3.28"/>
- </g>
- <path style="fill:#33363A;" d="M88.015,74.877c-3.242,0-6.108,1.626-7.835,4.102c-0.108,0.146-0.202,0.299-0.294,0.457
- c-0.897,1.455-1.424,3.161-1.424,4.992c0,5.267,4.285,9.551,9.553,9.551c5.267,0,9.551-4.284,9.551-9.551
- S93.281,74.877,88.015,74.877z M88.015,90.979c-2.721,0-5.059-1.668-6.048-4.034c0.689-0.018,1.526-0.2,2.47-0.396
- c0.335-0.03,0.657-0.093,0.968-0.189c0.82-0.148,1.695-0.268,2.61-0.268c2.412,0,4.571,0.813,6.046,0.853
- C93.073,89.311,90.735,90.979,88.015,90.979z"/>
- <circle style="fill:#FFFFFF;" cx="84.009" cy="81.812" r="1.78"/>
- <g>
- <g>
- <polygon style="fill:#E5B076;" points="84.327,44.19 77.62,29.262 71.208,32.145 63.8,24.735 56.391,32.145 49.98,29.262
- 43.273,44.19 58.197,50.897 58.53,50.155 63.8,55.424 69.069,50.156 69.402,50.897 "/>
- </g>
- <g>
- <polygon style="fill:#D3964C;" points="71.208,44.645 63.8,37.237 56.391,44.645 49.98,41.764 47.946,46.289 58.197,50.897
- 58.53,50.155 63.8,55.424 69.069,50.156 69.402,50.897 79.653,46.289 77.62,41.764 "/>
- </g>
- <g>
- <path style="fill:#33363A;" d="M84.328,45.69c-0.572,0-1.119-0.329-1.369-0.885l-6.092-13.56l-5.044,2.268
- c-0.567,0.256-1.235,0.132-1.676-0.308l-6.348-6.35l-6.349,6.35c-0.441,0.439-1.109,0.563-1.676,0.308l-5.043-2.268l-6.092,13.56
- c-0.34,0.755-1.226,1.095-1.983,0.753c-0.755-0.34-1.093-1.228-0.753-1.983l6.707-14.928c0.163-0.362,0.464-0.646,0.836-0.787
- c0.37-0.143,0.783-0.13,1.147,0.034l5.467,2.458l6.678-6.678c0.281-0.281,0.663-0.439,1.061-0.439l0,0
- c0.397,0,0.779,0.158,1.061,0.439l6.677,6.678l5.468-2.458c0.362-0.164,0.775-0.177,1.147-0.034
- c0.372,0.142,0.673,0.425,0.836,0.787l6.707,14.928c0.34,0.756,0.002,1.644-0.753,1.983C84.742,45.648,84.533,45.69,84.328,45.69
- z"/>
- </g>
- </g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
diff --git a/frontend/img/pikachu.svg b/frontend/img/pikachu.svg
deleted file mode 100644
index 94e0667..0000000
--- a/frontend/img/pikachu.svg
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<path style="fill:#303C42;" d="M448,266.667c0-24.962-9.085-54.28-17.755-76.638C487.435,175.296,512,74.178,512,32
- c0-5.896-4.771-10.667-10.667-10.667c-60.137,0-141.182,39.081-157.033,81.564C321.71,94.258,290.186,85.333,256,85.333
- s-65.71,8.924-88.301,17.564c-15.85-42.483-96.896-81.564-157.033-81.564C4.771,21.333,0,26.104,0,32
- c0,42.178,24.565,143.296,81.755,158.029C73.085,212.387,64,241.704,64,266.667c0,18.719-3.833,25.417-8.708,33.896
- C49.375,310.885,42.667,322.604,42.667,352c0,56.677,75.979,138.667,213.333,138.667S469.333,408.677,469.333,352
- c0-29.396-6.708-41.115-12.625-51.438C451.833,292.083,448,285.385,448,266.667z"/>
-<path style="fill:#FFEE58;" d="M400.438,150.521c5.25-2.667,11.688-0.656,14.375,4.583c0.382,0.741,3.228,6.339,7.064,14.882
- c10.01-1.695,18.934-7.691,26.839-16.277c-1.47-22.102-14.262-71.655-28.268-90.72c-29.005,13.956-51.608,32.642-56.635,48.164
- c8.816,4.134,14.23,7.237,14.918,7.639c5.083,2.979,6.771,9.5,3.813,14.583c-2.958,5.083-9.479,6.833-14.583,3.833
- c-0.521-0.302-53.083-30.542-111.958-30.542c-59.083,0-111.417,30.229-111.938,30.542c-1.708,0.99-3.563,1.458-5.396,1.458
- c-3.646,0-7.229-1.885-9.208-5.281c-2.979-5.083-1.271-11.615,3.813-14.594c0.688-0.402,6.102-3.505,14.918-7.639
- c-5.027-15.522-27.63-34.208-56.635-48.164c-14.428,19.639-27.146,70.22-27.911,91.115c7.818,8.374,16.622,14.214,26.482,15.883
- c3.836-8.543,6.682-14.141,7.064-14.882c2.708-5.24,9.146-7.271,14.375-4.583c5.229,2.698,7.292,9.135,4.583,14.365
- c-0.313,0.604-30.813,60.271-30.813,101.781c0,24.396-6.125,35.073-11.521,44.5c-2.939,5.132-5.757,10.185-7.62,18.133
- C74.767,323.478,84.99,320,96,320c29.417,0,53.333,23.927,53.333,53.333c0,24.596-16.822,45.154-39.51,51.288
- c32.003,24.927,80.672,44.712,146.177,44.712s114.174-19.785,146.177-44.712c-22.689-6.134-39.51-26.691-39.51-51.288
- C362.667,343.927,386.583,320,416,320c11.01,0,21.233,3.477,29.807,9.299c-1.863-7.947-4.681-13.001-7.62-18.133
- c-5.396-9.427-11.521-20.104-11.521-44.5c0-41.594-30.5-101.177-30.813-101.771C393.146,159.656,395.208,153.219,400.438,150.521z"
- />
-<circle style="fill:#303C42;" cx="160" cy="266.667" r="32"/>
-<circle style="fill:#FFFFFF;" cx="170.667" cy="256" r="10.667"/>
-<circle style="fill:#303C42;" cx="352" cy="266.667" r="32"/>
-<circle style="fill:#FFFFFF;" cx="343.04" cy="256" r="10.667"/>
-<path style="fill:#303C42;" d="M311.229,335.25c-0.792,1.125-6.125,4.552-16.313,5.719c-9.917,1.135-23.563-0.25-31.833-7.604
- c-2.017-1.798-4.543-2.697-7.069-2.701c2.724-0.003,5.448-1.043,7.527-3.122l10.667-10.667c3.042-3.052,3.958-7.635,2.313-11.625
- c-1.646-3.99-5.542-6.583-9.854-6.583h-21.333c-4.313,0-8.208,2.594-9.854,6.583c-1.646,3.99-0.729,8.573,2.313,11.625
- l10.667,10.667c2.079,2.079,4.803,3.12,7.527,3.122c-2.526,0.004-5.052,0.902-7.069,2.701c-8.271,7.375-21.938,8.75-31.833,7.604
- c-10.188-1.167-15.521-4.594-16.313-5.719c-3.375-4.833-10.021-6.042-14.854-2.677c-4.833,3.354-6.042,10-2.688,14.844
- c7.201,10.372,22.612,13.548,29.927,14.518c-0.18,15.685,0.837,39.401,14.74,53.628c7.208,7.365,16.667,11.104,28.104,11.104
- c10.438,0,19.646-3.969,26.646-11.479c13.478-14.495,15.954-39.034,16.195-53.253c7.311-0.97,22.728-4.145,29.93-14.518
- c3.333-4.833,2.125-11.417-2.688-14.781C321.313,329.302,314.625,330.448,311.229,335.25z"/>
-<path style="fill:#E53935;" d="M243.167,400.656c-8.165-8.355-8.806-26.975-8.671-38.947c7.906-1.21,15.297-3.587,21.504-7.251
- c6.172,3.648,13.642,5.669,21.491,6.887c-0.254,12.069-2.375,30.595-10.47,39.311C260.333,407.792,248.75,406.417,243.167,400.656z"
- />
-<path style="opacity:0.1;enable-background:new ;" d="M256,373.292c5.655,3.342,12.457,5.217,19.585,6.462
- c1.201-6.461,1.794-13.068,1.906-18.409c-7.849-1.217-15.319-3.238-21.491-6.887c-6.207,3.664-13.598,6.042-21.504,7.251
- c-0.061,5.371,0.142,12.076,1.003,18.595C243.013,379.051,250.066,376.794,256,373.292z"/>
-<path style="fill:#E53935;" d="M424.092,403.928C401.934,410.135,384,393.582,384,373.333c0-17.646,14.354-32,32-32
- c14.169,0,26.181,9.363,30.264,22.797C443.253,376.47,435.865,390.328,424.092,403.928z"/>
-<path style="opacity:0.2;fill:#FFFFFF;enable-background:new ;" d="M389.777,380.345c0-17.646,14.354-32,32-32
- c8.145,0,15.353,3.336,20.975,8.517c-5.607-9.337-15.374-15.529-26.753-15.529c-17.646,0-32,14.354-32,32
- c0,9.639,4.15,18.353,10.799,24.26C391.698,392.561,389.777,386.691,389.777,380.345z"/>
-<path style="fill:#E53935;" d="M87.901,403.921c-11.768-13.598-19.154-27.453-22.165-39.79
- c4.083-13.435,16.095-22.797,30.264-22.797c17.646,0,32,14.354,32,32C128,393.605,109.909,410.086,87.901,403.921z"/>
-<path style="opacity:0.2;fill:#FFFFFF;enable-background:new ;" d="M97.777,351.111c14.059,0,25.895,9.172,30.18,21.801
- c-0.232-17.447-14.456-31.578-31.957-31.578c-14.169,0-26.181,9.362-30.264,22.797c0.638,2.613,1.578,5.324,2.608,8.056
- C72.931,359.75,84.268,351.111,97.777,351.111z"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-36.5446" y1="631.7689" x2="-29.6035" y2="624.8278" gradientTransform="matrix(21.3333 0 0 -21.3333 996.3334 13791.667)">
- <stop offset="0" style="stop-color:#000000;stop-opacity:0.1"/>
- <stop offset="1" style="stop-color:#000000;stop-opacity:0"/>
-</linearGradient>
-<path style="fill:url(#SVGID_1_);" d="M183.229,347.417l30.587,30.587c-0.492-5.75-0.715-11.309-0.66-16.069
- C205.841,360.965,190.43,357.789,183.229,347.417z M362.667,373.333c0-1.215,0.277-2.353,0.358-3.547l-33.961-33.961h-0.007
- c2.134,3.482,2.182,8.012-0.286,11.591c-7.202,10.374-22.618,13.548-29.93,14.518c-0.241,14.219-2.717,38.758-16.195,53.253
- c-7,7.51-16.208,11.479-26.646,11.479c-11.438,0-20.896-3.74-28.104-11.104l52.77,52.77c53.184-4.259,93.669-22.025,121.512-43.711
- C379.488,418.487,362.667,397.93,362.667,373.333z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="-47.8644" y1="642.6061" x2="-23.703" y2="631.3364" gradientTransform="matrix(21.3333 0 0 -21.3333 996.3334 13791.667)">
- <stop offset="0" style="stop-color:#FFFFFF;stop-opacity:0.2"/>
- <stop offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
-</linearGradient>
-<path style="fill:url(#SVGID_2_);" d="M448,266.667c0-24.962-9.085-54.28-17.755-76.638C487.435,175.296,512,74.178,512,32
- c0-5.896-4.771-10.667-10.667-10.667c-60.137,0-141.182,39.081-157.033,81.564C321.71,94.258,290.186,85.333,256,85.333
- s-65.71,8.924-88.301,17.564c-15.85-42.483-96.896-81.564-157.033-81.564C4.771,21.333,0,26.104,0,32
- c0,42.178,24.565,143.296,81.755,158.029C73.085,212.387,64,241.704,64,266.667c0,18.719-3.833,25.417-8.708,33.896
- C49.375,310.885,42.667,322.604,42.667,352c0,56.677,75.979,138.667,213.333,138.667S469.333,408.677,469.333,352
- c0-29.396-6.708-41.115-12.625-51.438C451.833,292.083,448,285.385,448,266.667z"/>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
diff --git a/frontend/img/pikachu2.svg b/frontend/img/pikachu2.svg
deleted file mode 100644
index eb2ffae..0000000
--- a/frontend/img/pikachu2.svg
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="0 0 127.782 127.782" style="enable-background:new 0 0 127.782 127.782;" xml:space="preserve">
-<g>
- <g>
- <g>
- <polygon style="fill:#FFD400;" points="90.685,5.927 64.69,5.927 50.365,31.066 62.005,31.066 46.735,62.091 86.864,26.183
- 73.827,26.183 "/>
- </g>
- <g>
- <polygon style="fill:#FFB000;" points="59.724,14.642 50.365,31.066 62.005,31.066 46.735,62.091 77.124,34.898 66.995,34.898
- 74.247,26.183 73.827,26.183 83.431,14.642 "/>
- </g>
- <g>
- <path style="fill:#33363A;" d="M46.734,63.591c-0.318,0-0.638-0.101-0.906-0.305c-0.572-0.435-0.757-1.213-0.439-1.857
- l14.206-28.863h-9.229c-0.534,0-1.028-0.284-1.297-0.746s-0.271-1.032-0.007-1.496L63.386,5.185
- c0.268-0.469,0.765-0.758,1.304-0.758h25.995c0.582,0,1.111,0.337,1.358,0.863c0.247,0.527,0.167,1.149-0.205,1.597
- L77.027,24.683h9.837c0.622,0,1.18,0.384,1.401,0.965s0.063,1.238-0.401,1.653l-40.13,35.908
- C47.451,63.463,47.093,63.591,46.734,63.591z M52.946,29.566h9.059c0.519,0,1,0.268,1.273,0.707
- c0.273,0.44,0.301,0.99,0.072,1.455L51.492,55.821l31.446-28.138h-9.111c-0.582,0-1.111-0.337-1.358-0.863
- c-0.247-0.527-0.167-1.149,0.205-1.597L87.484,7.427H65.562L52.946,29.566z"/>
- </g>
- </g>
- <g>
- <g>
- <path style="fill:#FFF800;" d="M113.1,84.413c0,20.676-22.032,37.441-49.209,37.441c-27.178,0-49.209-16.766-49.209-37.441
- c0-20.68,22.031-45.459,49.209-45.459C91.068,38.954,113.1,63.734,113.1,84.413z"/>
- </g>
- <g>
- <path style="fill:#FFD400;" d="M113.1,84.413c0,20.676-22.032,37.441-49.209,37.441c-27.178,0-49.209-16.766-49.209-37.441
- c0-20.68,22.031-34.928,49.209-34.928C91.068,49.486,113.1,63.734,113.1,84.413z"/>
- </g>
- <g>
- <path style="fill:#FFF800;" d="M74.37,74.615c0,1.393-4.691,1.643-10.479,1.643s-10.479-0.25-10.479-1.643
- c0-1.395,4.691-5.037,10.479-5.037S74.37,73.22,74.37,74.615z"/>
- </g>
- <g>
- <path style="fill:#FFB000;" d="M113.1,84.413c0,20.676-22.032,37.441-49.209,37.441c-27.178,0-49.209-16.766-49.209-37.441
- c0-20.682,6.261,18.34,49.209,18.34S113.1,63.732,113.1,84.413z"/>
- </g>
- <g>
- <path style="fill:#33363A;" d="M63.891,123.355c-27.961,0-50.709-17.469-50.709-38.941c0-21.27,22.619-46.959,50.709-46.959
- S114.6,63.144,114.6,84.413C114.6,105.886,91.852,123.355,63.891,123.355z M63.891,40.454c-26.428,0-47.709,24.048-47.709,43.959
- c0,19.818,21.402,35.941,47.709,35.941S111.6,104.232,111.6,84.413C111.6,64.502,90.318,40.454,63.891,40.454z"/>
- </g>
- </g>
- <g>
- <g>
- <g>
- <g>
- <path style="fill:#FFD400;" d="M9.197,47.273c6.385,10.541,15.331,16.738,23.985,17.811
- c1.492-10.754-0.872-23.232-7.258-33.773C19.539,20.767,10.593,14.57,1.94,13.501C0.447,24.251,2.812,36.732,9.197,47.273z"/>
- </g>
- <g>
- <path style="fill:#FFB000;" d="M1.94,13.501c-1.492,10.75,0.872,23.23,7.258,33.771c6.385,10.541,15.331,16.738,23.985,17.811
- L1.94,13.501z"/>
- </g>
- <path style="fill:#33363A;" d="M34.587,51.296c-1.041-7.334-3.593-14.514-7.379-20.764c-6.417-10.594-15.56-17.344-25.085-18.52
- c-0.816-0.101-1.557,0.47-1.669,1.282c-1.611,11.602,1.108,24.27,7.46,34.755c4.339,7.166,9.961,12.622,16.259,15.778
- c0.216,0.108,0.444,0.159,0.671,0.159c0.55,0,1.079-0.303,1.342-0.828c0.371-0.74,0.072-1.642-0.669-2.013
- c-5.791-2.903-10.99-7.969-15.036-14.651c-1.861-3.071-3.385-6.34-4.567-9.713c6.1-1,13.157,2.117,12.314-12.987
- c2.338,2.362,4.503,5.137,6.414,8.292c3.579,5.906,5.99,12.694,6.975,19.631c0.117,0.82,0.879,1.385,1.696,1.274
- C34.133,52.876,34.703,52.117,34.587,51.296z"/>
- </g>
- </g>
- <g>
- <g>
- <g>
- <path style="fill:#FFD400;" d="M118.584,47.273c-6.385,10.541-15.331,16.738-23.985,17.811
- c-1.492-10.754,0.871-23.232,7.258-33.773c6.386-10.543,15.332-16.74,23.986-17.808
- C127.334,24.251,124.971,36.732,118.584,47.273z"/>
- </g>
- <g>
- <path style="fill:#FFB000;" d="M125.843,13.501c1.491,10.75-0.872,23.23-7.259,33.771
- c-6.385,10.541-15.331,16.738-23.985,17.811L125.843,13.501z"/>
- </g>
- <path style="fill:#33363A;" d="M127.328,13.295c-0.112-0.813-0.857-1.382-1.669-1.282c-9.525,1.176-18.669,7.926-25.086,18.52
- c-3.787,6.253-6.339,13.434-7.378,20.764c-0.116,0.82,0.454,1.58,1.274,1.696c0.832,0.114,1.58-0.455,1.696-1.274
- c0.982-6.934,3.395-13.722,6.974-19.631c1.911-3.155,4.076-5.93,6.414-8.292c-0.844,15.104,6.214,11.987,12.315,12.987
- c-1.182,3.373-2.706,6.642-4.567,9.713c-4.048,6.684-9.247,11.75-15.036,14.651c-0.741,0.371-1.04,1.272-0.669,2.013
- c0.263,0.525,0.792,0.828,1.342,0.828c0.226,0,0.455-0.051,0.671-0.159c6.296-3.155,11.918-8.611,16.259-15.778
- C126.219,37.567,128.939,24.899,127.328,13.295z"/>
- </g>
- </g>
- </g>
- <g>
- <g>
- <circle style="fill:#FF1A1A;" cx="32.889" cy="87.775" r="7.013"/>
- </g>
- <g>
- <path style="fill:#D61D1D;" d="M39.902,87.775c0,3.871-3.14,7.012-7.013,7.012c-3.874,0-7.014-3.141-7.014-7.012"/>
- </g>
- <g>
- <circle style="fill:#FF1A1A;" cx="94.892" cy="87.775" r="7.014"/>
- </g>
- <g>
- <path style="fill:#D61D1D;" d="M101.905,87.775c0,3.871-3.141,7.012-7.014,7.012c-3.873,0-7.014-3.141-7.014-7.012"/>
- </g>
- </g>
- <path style="fill:#33363A;" d="M73.528,80.281c-0.828,0-1.5,0.672-1.5,1.5c0,1.427-1.162,2.588-2.591,2.588h-1.456
- c-1.428,0-2.59-1.161-2.59-2.588v-1.455c0-0.073-0.011-0.143-0.021-0.213l3.11-1.556c0.622-0.312,0.949-1.01,0.789-1.687
- s-0.765-1.155-1.46-1.155h-7.837c-0.695,0-1.3,0.479-1.46,1.155s0.167,1.375,0.789,1.687l3.109,1.556
- c-0.01,0.07-0.021,0.14-0.021,0.213v1.455c0,1.427-1.161,2.588-2.589,2.588h-1.457c-1.429,0-2.591-1.161-2.591-2.588
- c0-0.828-0.672-1.5-1.5-1.5s-1.5,0.672-1.5,1.5c0,3.081,2.508,5.588,5.591,5.588h1.457c1.616,0,3.069-0.693,4.09-1.792
- c1.021,1.099,2.475,1.792,4.091,1.792h1.456c3.083,0,5.591-2.507,5.591-5.588C75.028,80.953,74.357,80.281,73.528,80.281z"/>
- <g>
- <path style="fill:#6D5C4D;" d="M47.729,70.144c0,4.449-3.605,8.051-8.053,8.051c-4.446,0-8.051-3.602-8.051-8.051
- c0-4.447,3.604-8.053,8.051-8.053C44.123,62.091,47.729,65.697,47.729,70.144z"/>
- </g>
- <g>
- <circle style="fill:#FFFFFF;" cx="35.672" cy="67.527" r="3.281"/>
- </g>
- <path style="fill:#33363A;" d="M39.676,60.591c-3.245,0-6.113,1.63-7.84,4.111c-0.105,0.143-0.197,0.293-0.286,0.447
- c-0.897,1.455-1.425,3.163-1.425,4.995c0,5.267,4.284,9.551,9.551,9.551c5.268,0,9.553-4.284,9.553-9.551
- C49.229,64.876,44.943,60.591,39.676,60.591z M39.676,76.695c-2.721,0-5.058-1.668-6.047-4.035c0.681-0.018,1.511-0.202,2.44-0.394
- c0.356-0.03,0.699-0.097,1.029-0.201c0.809-0.145,1.675-0.259,2.577-0.259c2.413,0,4.573,0.814,6.049,0.854
- C44.736,75.027,42.398,76.695,39.676,76.695z"/>
- <circle style="fill:#FFFFFF;" cx="35.672" cy="67.527" r="1.779"/>
- <g>
- <path style="fill:#6D5C4D;" d="M96.155,70.144c0,4.449-3.604,8.051-8.051,8.051c-4.447,0-8.052-3.602-8.052-8.051
- c0-4.447,3.604-8.053,8.052-8.053C92.551,62.091,96.155,65.697,96.155,70.144z"/>
- </g>
- <g>
- <circle style="fill:#FFFFFF;" cx="84.1" cy="67.527" r="3.28"/>
- </g>
- <path style="fill:#33363A;" d="M88.105,60.591c-3.243,0-6.11,1.629-7.837,4.108c-0.107,0.145-0.201,0.298-0.292,0.455
- c-0.896,1.454-1.423,3.16-1.423,4.99c0,5.267,4.285,9.551,9.552,9.551s9.551-4.284,9.551-9.551
- C97.655,64.876,93.371,60.591,88.105,60.591z M88.105,76.695c-2.721,0-5.059-1.668-6.048-4.035
- c0.689-0.019,1.527-0.201,2.471-0.397c0.335-0.03,0.658-0.093,0.97-0.189c0.819-0.148,1.693-0.268,2.607-0.268
- c2.413,0,4.571,0.814,6.047,0.854C93.163,75.027,90.826,76.695,88.105,76.695z"/>
- <circle style="fill:#FFFFFF;" cx="84.101" cy="67.527" r="1.779"/>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
diff --git a/frontend/img/pokeball.png b/frontend/img/pokeball.png
deleted file mode 100644
index 8b15cbb102e756607572aec81debb064fb7b21a3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 7014
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
diff --git a/frontend/img/pokeball.svg b/frontend/img/pokeball.svg
index 90173ac..fcd2923 100644
--- a/frontend/img/pokeball.svg
+++ b/frontend/img/pokeball.svg
@@ -1,48 +1,25 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="0 0 511.99 511.99" style="enable-background:new 0 0 511.99 511.99;" xml:space="preserve">
-<polygon style="fill:#ED5564;" points="493.991,200.996 478.991,149.497 437.991,89.998 384.493,45.999 319.493,19.999
- 263.995,13.499 198.996,21.499 128.997,48.999 78.498,87.498 40.499,135.497 18.999,200.496 18.999,236.995 58.498,240.495
- 168.996,255.995 187.996,210.996 234.995,184.996 262.495,184.996 287.995,188.996 320.993,210.996 347.993,252.495
- 496.491,235.995 "/>
-<polygon style="fill:#F5F7FA;" points="340.993,288.495 335.993,293.494 319.493,326.993 288.995,346.993 260.245,349.493
- 235.995,344.993 220.495,339.993 199.996,326.993 187.496,311.994 174.496,288.495 150.497,283.995 75.498,276.495 18.999,271.995
- 14.999,284.995 40.499,374.493 107.997,451.991 219.495,497.991 304.994,500.491 367.993,478.491 432.991,427.491 482.491,353.493
- 505.49,266.667 "/>
-<path style="fill:#434A54;" d="M505.49,238.495l-35.999,3l-123.998,18l-8-8l-7.5-17.5l-13.499-26.5l-37.499-19h-23l-43.101,8.719
- l-23.398,20.781l-14.5,38h-41.5l-118.497-12l2,22.672l23,4.828l97.92,11.25l34.554,5.375l11.523,27.374l25.5,22.999l23,9.484h45.125
- c0,0,29.374-17.984,31.718-19.484c2.328-1.5,31.655-39.998,31.655-39.998l12.5-6.5l130.998-15.328l23.498-7.672L505.49,238.495z"/>
-<path style="fill:#F5F7FA;" d="M296.869,266.557c0,21.844-17.718,39.562-39.562,39.562c-21.851,0-39.562-17.718-39.562-39.562
- s17.711-39.562,39.562-39.562C279.151,226.995,296.869,244.714,296.869,266.557z"/>
-<path d="M491.866,156.341c-12.891-30.468-31.344-57.843-54.844-81.358c-23.515-23.515-50.904-41.953-81.373-54.858
- C324.087,6.781,290.557,0,255.995,0c-34.554,0-68.085,6.781-99.646,20.125C125.865,33.03,98.482,51.468,74.983,74.983
- c-23.507,23.515-41.968,50.89-54.858,81.358C6.773,187.918,0,221.433,0,255.995s6.773,68.092,20.125,99.654
- c12.89,30.484,31.351,57.858,54.858,81.373c23.5,23.5,50.882,41.953,81.366,54.844c31.562,13.358,65.092,20.124,99.646,20.124
- c34.562,0,68.092-6.766,99.654-20.124c30.469-12.891,57.858-31.344,81.373-54.844c23.5-23.515,41.953-50.889,54.844-81.373
- c13.343-31.562,20.124-65.092,20.124-99.654C511.99,221.433,505.209,187.918,491.866,156.341z M490.647,255.995
- c0,0.656,0,1.297-0.016,1.938c-10.406,1.984-30.203,5.438-57.672,8.859c-20.765,2.594-48.326,5.453-81.279,7.531
- c0.219-2.516,0.312-5.078,0.312-7.656c0-0.984-0.016-1.953-0.047-2.938c68.202-4.234,116.576-11.984,138.545-16.047
- C490.585,250.448,490.647,253.214,490.647,255.995z M90.06,90.06c44.328-44.311,103.256-68.717,165.935-68.717
- c62.686,0,121.607,24.406,165.935,68.717c37.233,37.25,60.405,84.795,66.874,136.216c-10.812,2.031-29.906,5.281-55.844,8.516
- c-21.343,2.672-49.873,5.609-84.061,7.703c-10.734-41.28-48.312-71.827-92.904-71.827c-44.585,0-82.17,30.546-92.913,71.827
- c-34.179-2.094-62.709-5.031-84.045-7.703c-8.906-1.109-16.992-2.219-24.227-3.281c5.367-44.859,25.437-86.374,57.882-118.826
- c38.274-38.265,89.171-59.343,143.303-59.343l0,0c2.727,0,5.461-1.046,7.539-3.125c4.172-4.172,4.172-10.922,0-15.094
- c-2.078-2.078-4.812-3.125-7.539-3.125l0,0l0,0l0,0c-59.835,0-116.084,23.312-158.388,65.608
- C61.936,133.277,39.795,178.87,33.725,228.15c-4.094-0.688-7.617-1.328-10.531-1.875C29.647,174.856,52.827,127.31,90.06,90.06z
- M330.649,266.667c0,41.171-33.483,74.67-74.654,74.67s-74.663-33.499-74.663-74.67s33.491-74.671,74.663-74.671
- C297.166,191.996,330.649,225.495,330.649,266.667z M21.335,255.995c0-2.781,0.062-5.547,0.156-8.312
- c21.968,4.062,70.35,11.812,138.552,16.047c-0.031,0.984-0.047,1.953-0.047,2.938c0,2.578,0.102,5.141,0.305,7.656
- c-32.944-2.078-60.506-4.938-81.264-7.531c-27.484-3.422-47.273-6.875-57.679-8.859C21.351,257.292,21.335,256.651,21.335,255.995z
- M421.93,421.93c-44.328,44.327-103.249,68.733-165.935,68.733c-62.679,0-121.607-24.406-165.935-68.733
- c-38.64-38.64-62.14-88.405-67.53-142.06c22.937,4.219,72.53,12.03,142.06,16.124c12.422,38.64,48.702,66.671,91.405,66.671
- c42.702,0,78.982-28.031,91.404-66.671c45.594-2.688,82.623-6.968,109.186-10.78c-6.188,43.029-25.984,82.779-57.28,114.091
- c-38.28,38.28-89.186,59.358-143.31,59.358l0,0c-2.727,0-5.461,1.047-7.539,3.125c-4.172,4.172-4.172,10.922,0,15.078
- c2.078,2.094,4.812,3.125,7.539,3.125c59.843,0,116.092-23.297,158.388-65.593c36.171-36.187,58.437-82.53,64.14-132.606
- c4.141-0.703,7.781-1.328,10.938-1.922C484.069,333.524,460.569,383.29,421.93,421.93z"/>
-<path d="M255.995,213.339c-29.406,0-53.335,23.922-53.335,53.328c0,29.405,23.929,53.326,53.335,53.326s53.343-23.921,53.343-53.326
- C309.338,237.261,285.401,213.339,255.995,213.339z M255.995,298.666c-17.648,0-32-14.358-32-31.999s14.351-32,32-32
- c17.641,0,32,14.359,32,32S273.636,298.666,255.995,298.666z"/>
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ viewBox="0 0 176.02 176.02" style="enable-background:new 0 0 176.02 176.02;" xml:space="preserve">
+<g>
+ <g>
+ <path d="M88.01,0.001C39.481,0.001,0,39.48,0,88.011c0,0.707,0.011,1.426,0.031,2.14v0.002v0.006v0.015v0.007
+ c0.557,23.047,9.953,44.624,26.458,60.763c16.539,16.17,38.387,25.076,61.522,25.076c22.012,0,43.079-8.168,59.323-23.001
+ c16.133-14.731,26.172-34.771,28.268-56.428l0.002-0.007V96.58c0.098-1.021,0.416-5.531,0.417-8.57
+ C176.02,39.482,136.54,0.001,88.01,0.001z M88.01,168.242c-42.343,0-77.755-33.747-80.106-75.736
+ c7.766-3.374,16.22-5.148,24.605-5.148c6.028,0,12.005,0.89,17.806,2.649c1.041,19.889,17.551,35.749,37.695,35.749
+ c9.98,0,19.39-3.857,26.496-10.862c6.321-6.229,10.18-14.315,11.058-23.044c2.944-0.432,8.976-0.65,9.03-0.654
+ c0.902-0.037,1.816-0.057,2.717-0.057c14.98,0,25.732,5.191,30.233,7.48C162.312,138.508,128.602,168.242,88.01,168.242z
+ M58.071,86.748C58.735,70.806,71.907,58.04,88.008,58.04c16.527,0,29.971,13.445,29.971,29.969c0,0.071-0.005,0.142-0.007,0.213
+ l-0.006,0.214c-0.002,0.106,0,0.209,0.004,0.313c-0.392,16.143-13.775,29.232-29.959,29.232c-16.526,0-29.971-13.445-29.971-29.97
+ c0-0.338,0.015-0.672,0.025-1.007l0.007-0.213C58.072,86.791,58.071,86.762,58.071,86.748z M168.237,88.733
+ c-0.007,0.407-0.02,0.938-0.039,1.549c-6.001-2.809-16.718-6.917-30.888-6.917c-0.979,0-8.84,0.261-11.768,0.642
+ c-2.008-18.938-18.072-33.741-37.533-33.741c-18.781,0-34.397,13.789-37.268,31.774c-5.957-1.631-12.069-2.456-18.231-2.456
+ c-8.353,0-16.762,1.563-24.64,4.55C9.9,41.686,45.068,7.777,88.01,7.777c44.241,0,80.234,35.992,80.234,80.234
+ C168.244,88.251,168.239,88.489,168.237,88.733z"/>
+ </g>
+</g>
<g>
</g>
<g>
diff --git a/frontend/img/pokeball2.svg b/frontend/img/pokeball2.svg
deleted file mode 100644
index 460714f..0000000
--- a/frontend/img/pokeball2.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'><svg enable-background="new 0 0 100 100" height="100px" id="Layer_1" version="1.1" viewBox="0 0 100 100" width="100px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g><path d="M50,5C30.67,5,15,20.67,15,40c0,0.289,0.015,0.574,0.022,0.861c0.392-1.575,13.013-2.496,27.438-2.739 c0.841-3.386,3.893-5.899,7.54-5.899c3.643,0,6.692,2.508,7.537,5.889c14.427,0.224,27.05,1.133,27.441,2.748 C84.985,40.573,85,40.288,85,40C85,20.67,69.33,5,50,5z M60.158,34.269c-2.025-3.603-5.864-5.935-10.158-5.935 c-4.301,0-8.144,2.338-10.167,5.949c-10.051,0.217-16.479,0.657-20.627,1.266C21.372,20.494,34.356,8.889,50,8.889 c15.633,0,28.61,11.59,30.789,26.629C76.639,34.908,70.205,34.473,60.158,34.269z"/><path d="M50,47.778c-3.603,0-6.625-2.453-7.509-5.778c-13.41,0.208-25.268,1.006-27.205,2.414 c0.888,7.057,3.88,13.456,8.323,18.557c5.327,6.116,10.594,12.285,15.66,18.618L50,95l10.729-13.411 c5.072-6.34,10.348-12.511,15.677-18.637c4.433-5.096,7.418-11.485,8.307-18.53c-1.94-1.377-13.797-2.187-27.206-2.412 C56.619,45.33,53.599,47.778,50,47.778z M60.028,45.949c10.777,0.243,17.05,0.796,20.23,1.274 C76.975,61.052,64.508,71.111,50,71.111c-14.517,0-26.989-10.072-30.264-23.912c3.166-0.48,9.435-1.033,20.227-1.263 c2.06,3.482,5.845,5.731,10.037,5.731C54.184,51.667,57.966,49.423,60.028,45.949z"/></g></svg>
\ No newline at end of file
diff --git a/frontend/img/ronflex.svg b/frontend/img/ronflex.svg
deleted file mode 100644
index e3b2f4f..0000000
--- a/frontend/img/ronflex.svg
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="0 0 127.543 127.543" style="enable-background:new 0 0 127.543 127.543;" xml:space="preserve">
-<g>
- <g>
- <g>
- <g>
- <path style="fill:#0D5C9E;" d="M11.573,15.268c-7.047,9.68-8.523,22.881-2.655,34.246c5.867,11.371,17.481,17.81,29.458,17.678
- c7.047-9.684,8.522-22.881,2.654-34.25C35.162,21.574,23.551,15.133,11.573,15.268z"/>
- </g>
- <g>
- <path style="fill:#009BE8;" d="M38.376,67.191c7.047-9.684,8.522-22.881,2.654-34.25c-5.868-11.367-17.479-17.809-29.457-17.674
- "/>
- </g>
- <g>
- <path style="fill:#33363A;" d="M38.001,68.693c-12.888,0-24.517-7.058-30.416-18.492c-5.963-11.549-4.9-25.273,2.775-35.816
- c0.279-0.383,0.722-0.611,1.196-0.617c0.132-0.001,0.266-0.002,0.397-0.002c12.883,0,24.508,7.056,30.41,18.487
- c5.962,11.551,4.899,25.276-2.774,35.821c-0.279,0.383-0.722,0.612-1.196,0.617C38.262,68.692,38.131,68.693,38.001,68.693z
- M12.348,16.768c-6.604,9.534-7.421,21.747-2.097,32.058c5.32,10.312,15.751,16.721,27.351,16.866
- c6.602-9.536,7.418-21.75,2.096-32.062C34.375,23.319,23.944,16.911,12.348,16.768z"/>
- </g>
- </g>
- <g>
- <g>
- <path style="fill:#0D5C9E;" d="M115.97,15.268c7.047,9.68,8.523,22.881,2.655,34.246c-5.867,11.371-17.48,17.81-29.458,17.678
- c-7.047-9.684-8.522-22.881-2.654-34.25C92.381,21.574,103.992,15.133,115.97,15.268z"/>
- </g>
- <g>
- <path style="fill:#009BE8;" d="M89.167,67.191c-7.047-9.684-8.522-22.881-2.654-34.25c5.868-11.367,17.479-17.809,29.457-17.674
- "/>
- </g>
- <g>
- <path style="fill:#33363A;" d="M89.542,68.693c-0.131,0-0.26-0.001-0.392-0.002c-0.474-0.005-0.917-0.234-1.196-0.617
- c-7.673-10.545-8.736-24.271-2.774-35.82c5.901-11.432,17.528-18.488,30.41-18.488c0.132,0,0.264,0.001,0.397,0.002
- c0.474,0.006,0.917,0.234,1.196,0.617c7.675,10.543,8.739,24.268,2.775,35.817C114.059,61.635,102.429,68.693,89.542,68.693z
- M115.195,16.768c-11.597,0.143-22.027,6.551-27.35,16.862s-4.506,22.525,2.096,32.062c11.6-0.145,22.03-6.555,27.351-16.865
- C122.616,38.515,121.799,26.302,115.195,16.768z"/>
- </g>
- </g>
- </g>
- <g>
- <g>
- <g>
- <g>
- <g>
- <g>
- <path style="fill:#009BE8;" d="M126.043,68.844c0,26.166-27.88,47.381-62.271,47.381S1.5,95.01,1.5,68.844
- c0-26.168,27.88-57.525,62.271-57.525S126.043,42.676,126.043,68.844z"/>
- </g>
- <g>
- <path style="fill:#0D5C9E;" d="M126.043,68.844c0,26.166-27.88,47.381-62.271,47.381S1.5,95.01,1.5,68.844
- c0-26.168,27.88-44.199,62.271-44.199S126.043,42.676,126.043,68.844z"/>
- </g>
- <g>
- <path style="fill:#063B66;" d="M126.043,68.844c0,26.166-27.88,47.381-62.271,47.381S1.5,95.01,1.5,68.844
- c0-26.17,7.923,23.209,62.271,23.209S126.043,42.674,126.043,68.844z"/>
- </g>
- <g>
- <path style="fill:#F4D7B8;" d="M81.88,38.541L63.771,56.65L45.663,38.541c-22.968,3.551-39.547,14.4-39.547,33.814
- c0,24.227,25.812,43.869,57.655,43.869s57.655-19.643,57.655-43.869C121.427,52.943,104.848,42.092,81.88,38.541z"/>
- </g>
- <g>
- <path style="fill:#FCE6C8;" d="M104.186,45.525c-6.225-3.365-13.828-5.674-22.307-6.984L63.771,56.65L45.663,38.541
- c-8.479,1.311-16.082,3.619-22.307,6.984c10.404,7.783,24.669,12.592,40.415,12.592
- C79.517,58.117,93.782,53.309,104.186,45.525z"/>
- </g>
- <g>
- <path style="fill:#EAC79D;" d="M121.427,72.355c0-2.656-0.321-5.148-0.916-7.488c-7.173,8.18-23.018,27.186-56.739,27.186
- S14.205,73.047,7.032,64.867c-0.596,2.34-0.916,4.832-0.916,7.488c0,23.469,24.225,42.637,54.687,43.811
- c0.984,0.035,1.973,0.059,2.968,0.059c0.995,0,1.983-0.023,2.968-0.059C97.202,114.992,121.427,95.824,121.427,72.355z"/>
- </g>
- <g>
- <path style="fill:#33363A;" d="M63.771,117.725c-32.618,0-59.155-20.353-59.155-45.369c0-18.692,14.496-31.228,40.818-35.297
- c0.473-0.07,0.952,0.084,1.29,0.422l17.048,17.049L80.819,37.48c0.337-0.339,0.819-0.496,1.29-0.422
- c26.322,4.069,40.818,16.604,40.818,35.297C122.927,97.372,96.39,117.725,63.771,117.725z M45.143,40.143
- C30.776,42.484,7.616,49.77,7.616,72.355c0,23.362,25.191,42.369,56.155,42.369s56.155-19.007,56.155-42.369
- c0-22.586-23.16-29.871-37.527-32.213L64.832,57.711c-0.563,0.563-1.559,0.563-2.121,0L45.143,40.143z"/>
- </g>
- <g>
- <path style="fill:#33363A;" d="M63.771,117.725C28.608,117.725,0,95.797,0,68.844C0,42.108,28.446,9.818,63.771,9.818
- s63.771,32.29,63.771,59.025C127.543,95.797,98.935,117.725,63.771,117.725z M63.771,12.818C30.108,12.818,3,43.468,3,68.844
- c0,25.299,27.262,45.881,60.771,45.881s60.771-20.582,60.771-45.881C124.543,43.468,97.435,12.818,63.771,12.818z"/>
- </g>
- </g>
- </g>
- </g>
- </g>
- <g>
- <path style="fill:#FCE6C8;" d="M76.187,82.021c0,2.613-5.559,1.146-12.416,1.146s-12.416,1.467-12.416-1.146
- s5.559-4.734,12.416-4.734S76.187,79.408,76.187,82.021z"/>
- </g>
- </g>
- <g>
- <g>
- <g>
- <path style="fill:#33363A;" d="M53.608,73.309c-0.616,0-1.194-0.383-1.413-0.996c-1.032-2.896-3.071-4.771-6.059-5.57
- c-2.781-0.745-6.21-0.476-9.658,0.755c-0.783,0.278-1.639-0.129-1.917-0.909c-0.279-0.78,0.128-1.638,0.908-1.917
- c4.016-1.433,8.079-1.728,11.442-0.827c3.942,1.055,6.746,3.635,8.11,7.461c0.278,0.78-0.129,1.639-0.91,1.917
- C53.945,73.281,53.775,73.309,53.608,73.309z"/>
- </g>
- <g>
- <path style="fill:#33363A;" d="M73.934,73.309c-0.167,0-0.337-0.027-0.504-0.087c-0.78-0.278-1.187-1.137-0.909-1.917
- c1.364-3.826,4.169-6.406,8.111-7.461c3.362-0.9,7.426-0.605,11.442,0.827c0.78,0.279,1.187,1.137,0.908,1.917
- c-0.278,0.781-1.135,1.188-1.917,0.909c-3.448-1.231-6.878-1.501-9.658-0.755c-2.989,0.8-5.028,2.674-6.06,5.57
- C75.127,72.926,74.55,73.309,73.934,73.309z"/>
- </g>
- </g>
- <path style="fill:#33363A;" d="M84.627,81.144c-0.124-0.06-0.254-0.109-0.397-0.134l-3.514-0.602
- c-0.391-0.07-0.795,0.023-1.12,0.254s-0.545,0.58-0.612,0.973l-0.581,3.406c-3.229,0.945-8.142,1.754-14.633,1.754
- s-11.404-0.81-14.633-1.754l-0.581-3.406c-0.067-0.393-0.287-0.742-0.612-0.973s-0.73-0.323-1.12-0.254l-3.514,0.602
- c-0.143,0.024-0.273,0.074-0.397,0.134c-0.721,0.109-1.276,0.726-1.276,1.477c0,4.929,11.473,7.174,22.132,7.174
- s22.132-2.245,22.132-7.174C85.903,81.87,85.349,81.253,84.627,81.144z M45.881,83.784c-0.083-0.046-0.144-0.089-0.22-0.133
- l0.191-0.033L45.881,83.784z M81.69,83.618l0.191,0.033c-0.075,0.045-0.136,0.088-0.22,0.133L81.69,83.618z"/>
- </g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
diff --git a/frontend/img/sac.svg b/frontend/img/sac.svg
index 92cc27b..59c247d 100644
--- a/frontend/img/sac.svg
+++ b/frontend/img/sac.svg
@@ -1,85 +1,82 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="0 0 126.935 126.935" style="enable-background:new 0 0 126.935 126.935;" xml:space="preserve">
+ viewBox="0 0 125.687 125.687" style="enable-background:new 0 0 125.687 125.687;" xml:space="preserve">
<g>
<g>
- <path style="fill:#FF1A1A;" d="M21.528,104.172c0,4.52-3.662,8.181-8.182,8.181l0,0c-4.519,0-8.182-3.661-8.182-8.181V80.436
- c0-4.52,3.662-8.183,8.182-8.183l0,0c4.519,0,8.182,3.663,8.182,8.183V104.172z"/>
+ <polygon style="fill:#C12727;" points="117.975,94.518 7.712,94.518 20.31,6.981 105.377,6.981 "/>
</g>
<g>
- <path style="fill:#FF7676;" d="M13.346,72.254c-4.519,0-8.182,3.663-8.182,8.183v1.61c0,4.519,3.662,8.181,8.182,8.181
- s8.182-3.662,8.182-8.181v-1.61C21.528,75.917,17.866,72.254,13.346,72.254z"/>
+ <polygon style="fill:#FF1A1A;" points="20.31,6.981 19.149,15.054 106.538,15.054 105.377,6.981 "/>
</g>
<g>
- <path style="fill:#33363A;" d="M13.346,113.853c-5.339,0-9.682-4.343-9.682-9.681V80.437c0-5.339,4.343-9.683,9.682-9.683
- s9.682,4.344,9.682,9.683v23.735C23.028,109.51,18.685,113.853,13.346,113.853z M13.346,73.754c-3.685,0-6.682,2.998-6.682,6.683
- v23.735c0,3.684,2.997,6.681,6.682,6.681s6.682-2.997,6.682-6.681V80.437C20.028,76.752,17.031,73.754,13.346,73.754z"/>
+ <polygon style="fill:#FF1A1A;" points="20.31,42.784 9.702,94.518 115.984,94.518 105.377,42.784 "/>
</g>
<g>
- <path style="fill:#FF1A1A;" d="M121.77,104.172c0,4.52-3.662,8.181-8.183,8.181l0,0c-4.519,0-8.181-3.661-8.181-8.181V80.436
- c0-4.52,3.662-8.183,8.181-8.183l0,0c4.521,0,8.183,3.663,8.183,8.183V104.172z"/>
+ <path style="fill:#33363A;" d="M117.975,96.018H7.712c-0.436,0-0.849-0.189-1.134-0.518c-0.285-0.329-0.413-0.766-0.351-1.196
+ L18.826,6.767c0.105-0.738,0.738-1.286,1.484-1.286h85.066c0.746,0,1.379,0.548,1.484,1.286l12.599,87.537
+ c0.063,0.431-0.065,0.867-0.351,1.196C118.824,95.829,118.411,96.018,117.975,96.018z M9.443,93.018h106.801L104.077,8.481H21.61
+ L9.443,93.018z"/>
</g>
<g>
- <path style="fill:#FF7676;" d="M113.587,72.254c-4.519,0-8.181,3.663-8.181,8.183v1.61c0,4.519,3.662,8.181,8.181,8.181
- c4.521,0,8.183-3.662,8.183-8.181v-1.61C121.77,75.917,118.108,72.254,113.587,72.254z"/>
+ <polygon style="fill:#F95D5D;" points="124.187,118.706 1.5,118.706 15.517,21.304 110.17,21.304 "/>
</g>
<g>
- <path style="fill:#33363A;" d="M113.587,113.853c-5.338,0-9.681-4.343-9.681-9.681V80.437c0-5.339,4.343-9.683,9.681-9.683
- c5.339,0,9.683,4.344,9.683,9.683v23.735C123.27,109.51,118.926,113.853,113.587,113.853z M113.587,73.754
- c-3.684,0-6.681,2.998-6.681,6.683v23.735c0,3.684,2.997,6.681,6.681,6.681c3.685,0,6.683-2.997,6.683-6.681V80.437
- C120.27,76.752,117.272,73.754,113.587,73.754z"/>
+ <polygon style="fill:#FF1A1A;" points="15.517,61.142 3.714,118.706 121.974,118.706 110.17,61.142 "/>
</g>
<g>
- <path style="fill:#8DE4FF;" d="M66.922,11.39H60.01c-24.771,0-44.926,20.156-44.926,44.928v51.838
- c0,9.543,7.734,17.279,17.279,17.279h62.205c9.545,0,17.281-7.736,17.281-17.279V56.317C111.85,31.546,91.695,11.39,66.922,11.39z
- "/>
+ <circle style="fill:#FFFFFF;" cx="42.846" cy="37.455" r="5.585"/>
</g>
<g>
- <path style="fill:#00AAFF;" d="M66.922,23.593H60.01c-24.771,0-44.926,20.156-44.926,44.928v39.635
- c0,9.543,7.734,17.279,17.279,17.279h62.205c9.545,0,17.281-7.736,17.281-17.279V68.52C111.85,43.749,91.695,23.593,66.922,23.593
- z"/>
+ <circle style="fill:#FFFFFF;" cx="82.842" cy="37.455" r="5.585"/>
</g>
+ <path style="fill:#33363A;" d="M89.928,37.455c0-3.907-3.179-7.086-7.086-7.086c-3.906,0-7.085,3.179-7.085,7.086
+ c0,2.945,1.806,5.474,4.368,6.543c-2.651,6.975-9.386,11.955-17.281,11.955s-14.63-4.98-17.281-11.955
+ c2.562-1.069,4.368-3.598,4.368-6.543c0-3.907-3.179-7.086-7.085-7.086s-7.085,3.179-7.085,7.086c0,3.813,3.029,6.924,6.805,7.073
+ c2.934,8.385,10.904,14.425,20.278,14.425s17.344-6.04,20.278-14.425C86.899,44.379,89.928,41.268,89.928,37.455z M38.761,37.455
+ c0-2.253,1.832-4.086,4.085-4.086s4.085,1.833,4.085,4.086c0,1.58-0.91,2.938-2.225,3.618c-0.233-1.171-0.36-2.379-0.36-3.618
+ c0-0.829-0.672-1.5-1.5-1.5s-1.5,0.671-1.5,1.5c0,1.336,0.139,2.639,0.374,3.909C40.017,40.871,38.761,39.315,38.761,37.455z
+ M83.968,41.364c0.234-1.27,0.374-2.573,0.374-3.909c0-0.829-0.672-1.5-1.5-1.5s-1.5,0.671-1.5,1.5c0,1.238-0.127,2.447-0.36,3.618
+ c-1.314-0.68-2.225-2.038-2.225-3.618c0-2.253,1.832-4.086,4.085-4.086s4.086,1.833,4.086,4.086
+ C86.928,39.315,85.671,40.871,83.968,41.364z"/>
<g>
- <path style="fill:#FF1A1A;" d="M95.631,96.541c0,8.091-6.559,14.652-14.65,14.652H45.954c-8.09,0-14.65-6.562-14.65-14.652V85.552
- c0-8.09,6.561-14.648,14.65-14.648h35.027c8.092,0,14.65,6.559,14.65,14.648V96.541z"/>
+ <circle style="fill:#FF7676;" cx="62.844" cy="91.723" r="25.185"/>
</g>
<g>
- <path style="fill:#FF7676;" d="M45.954,70.903c-5.369,0-10.051,2.896-12.603,7.205c2.552,4.31,7.233,7.209,12.603,7.209h35.027
- c5.369,0,10.051-2.899,12.601-7.209c-2.551-4.309-7.232-7.205-12.601-7.205H45.954z"/>
+ <path style="fill:#F95D5D;" d="M88.029,91.723c0,10.654-11.275,19.293-25.186,19.293c-13.909,0-25.185-8.639-25.185-19.293
+ c0-10.652,11.276-19.289,25.185-19.289C76.754,72.433,88.029,81.07,88.029,91.723z"/>
</g>
<g>
- <path style="fill:#33363A;" d="M95.571,58.81c-0.828,0-1.5-0.671-1.5-1.5c0-15.61-12.7-28.31-28.312-28.31h-4.585
- c-15.61,0-28.311,12.7-28.311,28.31c0,0.829-0.672,1.5-1.5,1.5s-1.5-0.671-1.5-1.5C29.864,40.045,43.91,26,61.174,26h4.585
- c17.266,0,31.312,14.045,31.312,31.31C97.071,58.138,96.399,58.81,95.571,58.81z"/>
+ <path style="fill:#FFFFFF;" d="M37.658,91.723c0,13.91,11.276,25.187,25.185,25.187c13.91,0,25.186-11.277,25.186-25.187H37.658z"
+ />
</g>
<g>
- <path style="fill:#33363A;" d="M95.85,68.479c-1.287,0-2.334-1.048-2.334-2.336v-2.633c0-1.287,1.047-2.334,2.334-2.334
- s2.334,1.047,2.334,2.334v2.633C98.184,67.432,97.137,68.479,95.85,68.479z"/>
+ <path style="fill:#D8E5EA;" d="M62.844,111.016c13.91,0,25.186-8.639,25.186-19.293H37.658
+ C37.658,102.377,48.934,111.016,62.844,111.016z"/>
</g>
- <path style="fill:#33363A;" d="M78.495,11.35C76.623,4.808,70.602,0,63.467,0C56.333,0,50.311,4.807,48.44,11.35
- C28.42,16.504,13.584,34.71,13.584,56.317v51.838c0,10.355,8.425,18.779,18.779,18.779h62.205c10.356,0,18.781-8.424,18.781-18.779
- V56.317C113.35,34.711,98.515,16.505,78.495,11.35z M63.467,3c5.185,0,9.647,3.141,11.594,7.619
- c-2.645-0.47-5.361-0.729-8.139-0.729H60.01c-2.777,0-5.493,0.259-8.137,0.729C53.821,6.141,58.282,3,63.467,3z M110.35,108.155
- c0,8.701-7.079,15.779-15.781,15.779H32.364c-8.701,0-15.779-7.079-15.779-15.779V56.317c0-19.735,13.236-36.426,31.294-41.69
- c-0.022,0.337-0.051,0.672-0.051,1.015c0,0.829,0.672,1.5,1.5,1.5s1.5-0.671,1.5-1.5c0-0.612,0.059-1.21,0.143-1.799
- c2.918-0.62,5.941-0.953,9.041-0.953h6.912c3.101,0,6.124,0.333,9.042,0.954c0.084,0.589,0.143,1.186,0.143,1.798
- c0,0.829,0.672,1.5,1.5,1.5s1.5-0.671,1.5-1.5c0-0.342-0.03-0.677-0.051-1.014c18.057,5.265,31.294,21.955,31.294,41.69V108.155z"
- />
<g>
- <path style="fill:#33363A;" d="M80.981,69.403H45.954c-8.905,0-16.15,7.244-16.15,16.148v10.989
- c0,8.906,7.245,16.152,16.15,16.152h35.027c8.905,0,16.15-7.246,16.15-16.152V85.552C97.131,76.647,89.886,69.403,80.981,69.403z
- M80.981,109.693H45.954c-4.805,0-9.004-2.599-11.299-6.457h1.98c0.828,0,1.5-0.671,1.5-1.5s-0.672-1.5-1.5-1.5h-3.294
- c-0.344-1.174-0.538-2.412-0.538-3.695V85.552c0-7.25,5.899-13.148,13.15-13.148h35.027c7.251,0,13.15,5.898,13.15,13.148v10.989
- c0,1.284-0.193,2.522-0.538,3.695h-3.294c-0.828,0-1.5,0.671-1.5,1.5s0.672,1.5,1.5,1.5h1.98
- C89.985,107.095,85.786,109.693,80.981,109.693z"/>
- <path style="fill:#33363A;" d="M51.967,100.236h-7.666c-0.828,0-1.5,0.671-1.5,1.5s0.672,1.5,1.5,1.5h7.666
- c0.828,0,1.5-0.671,1.5-1.5S52.795,100.236,51.967,100.236z"/>
- <path style="fill:#33363A;" d="M67.3,100.236h-7.666c-0.828,0-1.5,0.671-1.5,1.5s0.672,1.5,1.5,1.5H67.3
- c0.828,0,1.5-0.671,1.5-1.5S68.128,100.236,67.3,100.236z"/>
- <path style="fill:#33363A;" d="M82.632,100.236h-7.666c-0.828,0-1.5,0.671-1.5,1.5s0.672,1.5,1.5,1.5h7.666
- c0.828,0,1.5-0.671,1.5-1.5S83.46,100.236,82.632,100.236z"/>
+ <path style="fill:#A7BBC1;" d="M68.731,88.719c3.253,3.256,3.253,8.525,0,11.777c-3.252,3.254-8.523,3.254-11.776,0
+ c-3.252-3.252-3.252-8.521,0-11.777C60.208,85.469,65.479,85.469,68.731,88.719z"/>
</g>
+ <g>
+ <circle style="fill:#FFFFFF;" cx="62.843" cy="91.777" r="8.328"/>
+ </g>
+ <g>
+ <path style="fill:#D8E5EA;" d="M56.955,97.666c-3.252-3.252-3.252-8.525,0-11.777c3.253-3.253,8.524-3.253,11.776,0"/>
+ </g>
+ <path style="fill:#33363A;" d="M125.672,118.492L111.654,21.09c-0.105-0.738-0.738-1.286-1.484-1.286H15.517
+ c-0.746,0-1.379,0.548-1.484,1.286L0.016,118.492c-0.063,0.431,0.065,0.867,0.351,1.196c0.285,0.329,0.698,0.518,1.134,0.518
+ h122.688c0.436,0,0.849-0.189,1.134-0.518C125.606,119.359,125.734,118.923,125.672,118.492z M72.538,90.223
+ c-0.322-2.034-1.262-3.911-2.746-5.395c-1.856-1.856-4.324-2.878-6.948-2.878c-2.625,0-5.093,1.022-6.949,2.879
+ c-1.52,1.52-2.427,3.419-2.741,5.395H39.211c0.777-12.363,11.077-22.186,23.633-22.186S85.7,77.859,86.477,90.223H72.538z
+ M61.344,90.223h-5.139c0.279-1.2,0.878-2.34,1.811-3.273c0.928-0.928,2.078-1.55,3.328-1.829V90.223z M61.344,93.225v5.203
+ c-1.22-0.273-2.38-0.876-3.328-1.822c-0.961-0.961-1.57-2.141-1.837-3.381H61.344z M64.344,93.225h5.17
+ c-0.273,1.271-0.901,2.44-1.843,3.38c-0.947,0.947-2.107,1.55-3.327,1.823V93.225z M64.344,90.223V85.12
+ c1.25,0.279,2.399,0.901,3.327,1.829c0,0,0,0,0,0c0.915,0.914,1.531,2.044,1.816,3.273H64.344z M53.138,93.223
+ c0.298,2.015,1.209,3.957,2.757,5.504c1.916,1.915,4.433,2.872,6.949,2.872s5.032-0.958,6.948-2.872
+ c1.51-1.511,2.458-3.429,2.762-5.504h13.923C85.7,105.587,75.4,115.41,62.844,115.41s-22.856-9.823-23.633-22.188H53.138z
+ M70.777,117.206c10.853-3.386,18.752-13.53,18.752-25.483c0-14.714-11.971-26.686-26.686-26.686S36.158,77.008,36.158,91.723
+ c0,11.954,7.899,22.097,18.752,25.483H3.231l13.586-94.402h92.053l13.586,94.402H70.777z"/>
</g>
<g>
</g>
diff --git a/frontend/js/index.js b/frontend/js/index.js
index d599169..e88692b 100644
--- a/frontend/js/index.js
+++ b/frontend/js/index.js
@@ -1,11 +1,4 @@
-
-
-
-
-
- let val = 0;
-
function Pokemons(){
return fetch("https://pokeapi.co/api/v2/pokemon/?limit=900")
@@ -73,7 +66,7 @@
- for(let i = init+1; i<init+number; i++){
+ for(let i = init; i<init+number; i++){
var tab = document.getElementsByClassName("tab");
@@ -83,7 +76,7 @@
var img = document.createElement("img");
img.id = "pokemon" + i;
img.className = "canvas";
- img.src = "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/" + i + ".png";
+ img.src = "https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/" + (i+1) + ".png";
@@ -102,7 +95,7 @@
let type = document.getElementById(i).parentNode.children[1].children;
- let data = [name,type[0].src,type[1].src,"https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/" + i + ".png"]
+ let data = [name,type[0].src,type[1].src,"https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/" + (i+1) + ".png"]
console.log(data);
@@ -191,26 +184,35 @@
}
-
+ function sleep(milliseconds) {
+ const date = Date.now();
+ let currentDate = null;
+ do {
+ currentDate = Date.now();
+ } while (currentDate - date < milliseconds);
+ }
pokedex(0,20);
+
+
function scrollEffect(){
+
+
let main = document.getElementsByTagName("main")[0].scrollTop;
- for(let i = 1; i<48; i++){
+ for(let i = 1; i<45; i++){
+
- if(main > i*50 && main < i*100 && val<i*50){
- if(i==47){
- val = i*50;
- pokedex(i*19,5);
- }
- else{
- val = i*50;
- pokedex(i*19,20);
- }
+
+
+ if(i==44){
+ pokedex(i*20,18);
+ }
+ else{
+ pokedex(i*20,20);
}
}
}
diff --git a/frontend/js/product.js b/frontend/js/product.js
index 495af4e..d9051f2 100644
--- a/frontend/js/product.js
+++ b/frontend/js/product.js
@@ -1,4 +1,5 @@
-
+ let talentnb = 0;
+
function typeBox(src1,src2){
var typeBox = document.createElement("div");
@@ -134,31 +135,68 @@
function getTalent(talent,pokemon){
- let title = document.createElement("p");
- title.style.paddingLeft = "2%";
+ let title = document.createElement("div");
title.className = "infos";
+
+ let leftArrow = document.createElement("i");
+ leftArrow.className = "arrow left";
+
+ let rightArrow = document.createElement("i");
+ rightArrow.className = "arrow right";
+
+ let name = document.createElement("p");
+
+
let text = document.createElement("p");
text.className = "text";
pokemon.then(data =>{
if(data.abilities.length > 1){
- for(let i = 0; i < data.abilities.length; i++){
- title.innerHTML = data.abilities[i].ability.name;
+
+
+ leftArrow.onclick = function() {
+ if(talentnb > 0){
+ talentnb -= 1;
+ name.innerHTML = data.abilities[talentnb].ability.name;
- get(data.abilities[i].ability.url).then(ability => {
- text.innerHTML = ability.effect_entries[1].effect;
- });
+ get(data.abilities[talentnb].ability.url).then(ability => {
+ text.innerHTML = ability.effect_entries[1].effect;
+ });
+
+ title.appendChild(name);
+ title.appendChild(leftArrow);
+ title.appendChild(rightArrow);
+ }
+ }
+
+ rightArrow.onclick = function() {
+ if(talentnb < data.abilities.length-1){
+ talentnb += 1;
+ name.innerHTML = data.abilities[talentnb].ability.name;
+
+ get(data.abilities[talentnb].ability.url).then(ability => {
+ text.innerHTML = ability.effect_entries[1].effect;
+ });
+ }
+
+ title.appendChild(name);
+ title.appendChild(leftArrow);
+ title.appendChild(rightArrow);
}
}
- else{
- title.innerHTML = data.abilities[0].ability.name;
+
+ name.innerHTML = data.abilities[0].ability.name;
+
+ get(data.abilities[0].ability.url).then(ability => {
+ text.innerHTML = ability.effect_entries[1].effect;
+ });
+
+ title.appendChild(name);
+ title.appendChild(leftArrow);
+ title.appendChild(rightArrow);
- get(data.abilities[0].ability.url).then(ability => {
- text.innerHTML = ability.effect_entries[1].effect;
- });
- }
});
talent.appendChild(title);
diff --git a/frontend/menu.css b/frontend/menu.css
index bd34cd7..7029fd0 100644
--- a/frontend/menu.css
+++ b/frontend/menu.css
@@ -83,7 +83,7 @@ nav {
#logo{
- height: 10vh;
+ height: 7.5vh;
position: relative;
top: 50%;
left: 10%;
@@ -104,7 +104,7 @@ nav {
#sac {
width: 100%;
- height: 10vh;
+ height: 7.5vh;
position: relative;
left:80%;
top: 50%;
@@ -113,11 +113,12 @@ nav {
}
-#sac::after {
+#sac::before {
- content: "-";
- font-size: medium;
- background-image: url(img/pokeball.svg);
+
+ background-color: white;
border-radius: 10px 10px;
+ font-size: large;
+
}
\ No newline at end of file
diff --git a/frontend/select.css b/frontend/select.css
index 8bed0ea..5abbad5 100644
--- a/frontend/select.css
+++ b/frontend/select.css
@@ -18,11 +18,13 @@ main {
flex-direction: column;
width: 25vw;
height: 30vw;
- background-color: rgb(255, 255, 255);
- border: gray 2px groove;
-
+ border-radius: 20px 20px;
+
+ box-shadow:inset 2px 2px 10px 0px rgba(255,255,255,.5), 2px 2px 10px 0px rgba(0,0,0,.1), 2px 2px 10px 0px rgba(0,0,0,.1);
margin-left: 2.5vw;
margin-right: 2.5vw;
+ margin-top: 2.5vh;
+
}
@@ -32,16 +34,12 @@ main {
transform: translateX(-50%);
width: 25vh;
height: 25vh;
-
+
overflow-y: hidden;
}
.gif > img{
-
-
-
- background-color: white;
width: 100%;
height: 100%;
@@ -107,30 +105,32 @@ button {
margin-right: 2.5vw;
padding-bottom: 3vh;
padding-top: 2.5vh;
+
}
.container2 {
display: flex;
flex-direction: column;
- width: 70%;
+ width: 80%;
+ padding: 2vh 2vh 2vh 2vh;
+
}
.description {
font-size: 2vh;
-
height: 70%;
- border: solid 2px rgba(150, 150, 150, 1);
- background-color: rgba(240, 240, 240, 0.5);
+ box-shadow:inset 2px 2px 10px 0px rgba(255,255,255,.5), 2px 2px 10px 0px rgba(0,0,0,.1), 2px 2px 10px 0px rgba(0,0,0,.1);
+ border-radius: 20px 20px;
}
.talent {
height: 30%;
margin-top: 1vh;
- border: solid 2px rgba(150, 150, 150, 1);
- background-color: rgba(240, 240, 240, 0.5);
+ box-shadow:inset 2px 2px 10px 0px rgba(255,255,255,.5), 2px 2px 10px 0px rgba(0,0,0,.1), 2px 2px 10px 0px rgba(0,0,0,.1);
+ border-radius: 20px 20px;
}
@@ -161,10 +161,10 @@ button {
margin-right: 1%;
width: 35%;
height: 30vw;
- border-radius: 0 20px 20px 20px;
+ border-radius: 20px 20px 20px 20px;
background-color: white;
- box-shadow:inset 2px 2px 2px 0px rgba(255,255,255,.5), 7px 7px 20px 0px rgba(0,0,0,.1), 4px 4px 5px 0px rgba(0,0,0,.1);
-
+ box-shadow:inset 2px 2px 10px 0px rgba(255,255,255,.5), 2px 2px 10px 0px rgba(0,0,0,.1), 2px 2px 10px 0px rgba(0,0,0,.1);
+ margin-left: 2.5vw;
}
.abilities::-webkit-scrollbar {
@@ -235,8 +235,10 @@ button {
border-bottom: 2px rgb(177, 177, 177) solid;
margin-top: 1%;
padding-bottom: 1%;
+ padding-left: 3%;
font-size: 2vh;
-
+
+
}
@@ -244,120 +246,33 @@ button {
.infos > p {
margin-left: 4%;
+ width: 80%;
}
-
-
-
-
-.btn-5 {
-
- font-weight: 500;
- cursor: pointer;
- transition: all 0.3s ease;
-
+.arrow {
+ border: solid black;
+ border-width: 0 2px 2px 0;
display: inline-block;
- box-shadow:inset 2px 2px 2px 0px rgba(255,255,255,.5), 7px 7px 20px 0px rgba(0,0,0,.1), 4px 4px 5px 0px rgba(0,0,0,.1);
- outline: none;
- width: 100px;
- height: 4vh;
- width: 30%;
- padding: 0;
- border: none;
-
- background: linear-gradient(0deg, rgba(255,27,0,1) 0%, rgba(251,75,2,1) 100%);
- color: white;
- font-size: 1.5vh;
-
- }
- .btn-5:hover {
- color: #f0094a !important;
- background: whitesmoke !important;
- box-shadow:none;
- }
-
-
-
- .btn-5:before,
- .btn-5:after{
- content:'';
- position:absolute;
- top:0;
- right:0;
- height:2px;
- width:0;
- background: rgba(255,27,0,1);
- box-shadow:
- -1px -1px 5px 0px #fff,
- 7px 7px 20px 0px #0003,
- 4px 4px 5px 0px #0002;
- transition:400ms ease all;
- }
- .btn-5:after{
- right:inherit;
- top:inherit;
- left:0;
- bottom:0;
- }
- .btn-5:hover:before,
- .btn-5:hover:after{
- width:100%;
- transition:800ms ease all;
- }
-
-
-
- .btn-2 {
- font-weight: 500;
+ width: 5px;
+ height: 5px;
cursor: pointer;
- transition: all 0.3s ease;
- display: inline-block;
- box-shadow:inset 2px 2px 2px 0px rgba(255,255,255,.5), 7px 7px 20px 0px rgba(0,0,0,.1), 4px 4px 5px 0px rgba(0,0,0,.1);
- outline: none;
- width: 100px;
- height: 4vh;
- width: 30%;
- padding: 0;
- border: none;
-
- background: linear-gradient(0deg,whitesmoke 0%, whitesmoke 100%);
- color: rgba(255,27,0,1);
- font-size: 1.5vh;
-
- }
- .btn-2:hover {
- color: whitesmoke !important;
- background:rgba(255,27,0,1) !important;
- box-shadow:none;
+ margin-left: 0.25vw;
+ margin-right: 0.25vw;
}
-
-
- .btn-2:before,
- .btn-2:after{
- content:'';
- position:absolute;
- top:0;
- right:0;
- height:2px;
- width:0;
- background: black;
- box-shadow:
- -1px -1px 5px 0px #fff,
- 7px 7px 20px 0px #0003,
- 4px 4px 5px 0px #0002;
- transition:400ms ease all;
+ .arrow:hover {
+ background-color: rgba(128, 128, 128, 0.5);
+ border-radius: 100%;
}
- .btn-2:after{
- right:inherit;
- top:inherit;
- left:0;
- bottom:0;
+
+ .right {
+ transform: rotate(-45deg) ;
+ -webkit-transform: rotate(-45deg) translateY(100%);
}
- .btn-2:hover:before,
- .btn-2:hover:after{
- width:100%;
- transition:800ms ease all;
+
+ .left {
+ transform: rotate(135deg);
+ -webkit-transform: rotate(135deg) translateY(-100%);
}
\ No newline at end of file
diff --git a/frontend/select.html b/frontend/select.html
index 3b7573f..3175a04 100644
--- a/frontend/select.html
+++ b/frontend/select.html
@@ -10,6 +10,7 @@
<link rel="stylesheet" href="menu.css">
<link rel="stylesheet" href="select.css">
+ <link rel="stylesheet" href="button.css">
</head>
<body>
@@ -24,7 +25,7 @@
<div id="sac">
- <img src="img/pokeball.png" id="logo">
+ <img src="img/sac.svg" id="logo">
</div>
</div>
diff --git a/frontend/shop.html b/frontend/shop.html
index 10abb61..69bdbff 100644
--- a/frontend/shop.html
+++ b/frontend/shop.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html lang="en">
+<html lang="en" >
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -10,7 +10,7 @@
<link rel="stylesheet" href="button.css">
<title>Pokeshop</title>
</head>
-<body>
+<body onload="scrollEffect()" >
<nav>
<div class="shop">
@@ -21,17 +21,15 @@
<div class="shop">
<div id="sac">
- <img src="img/pokeball.png" id="logo">
+ <img src="img/sac.svg" id="logo">
</div>
</div>
</nav>
- <main onscroll="scrollEffect()">
-
-
-
+
+ <main>
<div class="search">
<input type="text" name="pokemon" id="poke" onkeyup="search()" placeholder="Search a Pokemon..">
diff --git a/frontend/style.css b/frontend/style.css
index f7c45db..2ac1d63 100644
--- a/frontend/style.css
+++ b/frontend/style.css
@@ -30,11 +30,16 @@ input {
font-size: large;
padding-left: 2vh;
outline: none;
+ transition: 0.5s ease;
+ box-shadow:inset 2px 2px 10px 0px rgba(255,255,255,.5), 2px 2px 10px 0px rgba(0,0,0,.1), 2px 2px 10px 0px rgba(0,0,0,.1);
+}
+
+input:hover{
box-shadow:inset 7px 7px 20px 0px rgba(255,255,255,.5), 7px 7px 20px 0px rgba(0,0,0,.1), 7px 7px 20px 0px rgba(0,0,0,.1);
-
}
input:focus {
+
outline: none;
color: rgba(255,27,0,1);
}
@@ -46,6 +51,8 @@ input:focus {
gap:40px;
justify-content: center;
width: 100vw;
+ padding-top: 5vh;
+ padding-bottom: 5vh;
}
@@ -58,7 +65,7 @@ input:focus {
height: 15vw;
background-color: rgb(255, 255, 255);
border-radius: 10px 10px;
- box-shadow:inset 2px 2px 2px 0px rgba(255,255,255,.5), 7px 7px 20px 0px rgba(0,0,0,.1), 4px 4px 5px 0px rgba(0,0,0,.1);
+ box-shadow:inset 2px 2px 10px 0px rgba(255,255,255,.5), 2px 2px 10px 0px rgba(0,0,0,.1), 2px 2px 10px 0px rgba(0,0,0,.1);
}
--
GitLab