Skip to content
Permalink
Browse files

rework boostrap + bootstrap migration, reworked front end, added visi…

…ts, added stats, removed useles sections
  • Loading branch information...
guigur committed Oct 9, 2018
1 parent 9073871 commit 25734cba80e64005bb7ece7096948ec03ffee2f2
Showing with 2,536 additions and 9,708 deletions.
  1. +483 −168 guigur.com/.idea/workspace.xml
  2. +10 −0 guigur.com/app/Resources/TwigBundle/views/Exception/error404.html.twig
  3. +12 −0 guigur.com/app/Resources/views/Article_min_display.html.twig
  4. +4 −0 guigur.com/app/Resources/views/Page_header_display.html.twig
  5. +1 −2 guigur.com/app/Resources/views/Projects_display.html.twig
  6. +99 −76 guigur.com/app/Resources/views/base.html.twig
  7. +14 −1 guigur.com/src/GuigurAdminBundle/Controller/DefaultController.php
  8. +5 −1 guigur.com/src/GuigurAdminBundle/Resources/config/routing.yml
  9. +4 −3 guigur.com/src/GuigurAdminBundle/Resources/config/services.yml
  10. +72 −0 guigur.com/src/GuigurAdminBundle/Resources/views/Default/index.html.twig
  11. +40 −0 guigur.com/src/GuigurAdminBundle/Resources/views/Default/visits.html.twig
  12. +116 −0 guigur.com/src/GuigurAdminBundle/Service/VisitsService.php
  13. +2 −2 guigur.com/src/GuigurFrontBundle/Controller/ArchivesController.php
  14. +2 −1 guigur.com/src/GuigurFrontBundle/Controller/BlogController.php
  15. +0 −15 guigur.com/src/GuigurFrontBundle/Controller/CatchPhraseController.php
  16. +3 −1 guigur.com/src/GuigurFrontBundle/Controller/ChangelogController.php
  17. +2 −1 guigur.com/src/GuigurFrontBundle/Controller/ContactController.php
  18. +27 −1 guigur.com/src/GuigurFrontBundle/Controller/DefaultController.php
  19. +14 −0 guigur.com/src/GuigurFrontBundle/Controller/PortfolioController.php
  20. +2 −1 guigur.com/src/GuigurFrontBundle/Controller/ProjectController.php
  21. +0 −13 guigur.com/src/GuigurFrontBundle/Controller/RandomController.php
  22. +2 −1 guigur.com/src/GuigurFrontBundle/Controller/ShopController.php
  23. +0 −13 guigur.com/src/GuigurFrontBundle/Controller/TrollController.php
  24. +159 −0 guigur.com/src/GuigurFrontBundle/Entity/Visits.php
  25. +13 −0 guigur.com/src/GuigurFrontBundle/Repository/VisitsRepository.php
  26. +3 −0 guigur.com/src/GuigurFrontBundle/Resources/config/routing.yml
  27. +1 −10 guigur.com/src/GuigurFrontBundle/Resources/views/Default/CV.html.twig
  28. +42 −40 guigur.com/src/GuigurFrontBundle/Resources/views/Default/about.html.twig
  29. +1 −4 guigur.com/src/GuigurFrontBundle/Resources/views/Default/archives.html.twig
  30. +20 −44 guigur.com/src/GuigurFrontBundle/Resources/views/Default/blog.html.twig
  31. +4 −4 guigur.com/src/GuigurFrontBundle/Resources/views/Default/changelog.html.twig
  32. +2 −2 guigur.com/src/GuigurFrontBundle/Resources/views/Default/contact.html.twig
  33. +54 −15 guigur.com/src/GuigurFrontBundle/Resources/views/Default/index.html.twig
  34. +7 −7 guigur.com/src/GuigurFrontBundle/Resources/views/Default/projects.html.twig
  35. +0 −74 guigur.com/src/GuigurFrontBundle/Resources/views/Default/random.html.twig
  36. +139 −15 guigur.com/src/GuigurFrontBundle/Resources/views/Default/shop.html.twig
  37. +0 −8 guigur.com/src/GuigurFrontBundle/Resources/views/Default/siteEnConstruction.html.twig
  38. +0 −17 guigur.com/src/GuigurFrontBundle/Resources/views/Default/troll.html.twig
  39. +0 −13 guigur.com/web/css/blog-home.css
  40. +7 −0 guigur.com/web/css/bootstrap-grid.min.css
  41. +8 −0 guigur.com/web/css/bootstrap-reboot.min.css
  42. +0 −6,757 guigur.com/web/css/bootstrap.css
  43. +4 −3 guigur.com/web/css/bootstrap.min.css
  44. +75 −12 guigur.com/web/css/custom.css
  45. +19 −0 guigur.com/web/css/exceptions.css
  46. BIN guigur.com/web/img/avatar/guigur_avatar_2018.png
  47. +10 −0 guigur.com/web/js/Chart.min.js
  48. +0 −2,377 guigur.com/web/js/bootstrap.js
  49. +6 −6 guigur.com/web/js/bootstrap.min.js
  50. +1 −0 guigur.com/web/js/tinymce/jquery.tinymce.min.js
  51. +3 −0 guigur.com/web/js/tinymce/langs/readme.md
  52. +504 −0 guigur.com/web/js/tinymce/license.txt
  53. +1 −0 guigur.com/web/js/tinymce/plugins/advlist/plugin.min.js
  54. +1 −0 guigur.com/web/js/tinymce/plugins/anchor/plugin.min.js
  55. +1 −0 guigur.com/web/js/tinymce/plugins/autolink/plugin.min.js
  56. +1 −0 guigur.com/web/js/tinymce/plugins/autoresize/plugin.min.js
  57. +1 −0 guigur.com/web/js/tinymce/plugins/autosave/plugin.min.js
  58. +1 −0 guigur.com/web/js/tinymce/plugins/bbcode/plugin.min.js
  59. +1 −0 guigur.com/web/js/tinymce/plugins/charmap/plugin.min.js
  60. +1 −0 guigur.com/web/js/tinymce/plugins/code/plugin.min.js
  61. +138 −0 guigur.com/web/js/tinymce/plugins/codesample/css/prism.css
  62. +1 −0 guigur.com/web/js/tinymce/plugins/codesample/plugin.min.js
  63. +1 −0 guigur.com/web/js/tinymce/plugins/colorpicker/plugin.min.js
  64. +1 −0 guigur.com/web/js/tinymce/plugins/contextmenu/plugin.min.js
  65. +1 −0 guigur.com/web/js/tinymce/plugins/directionality/plugin.min.js
  66. BIN guigur.com/web/js/tinymce/plugins/emoticons/img/smiley-cool.gif
  67. BIN guigur.com/web/js/tinymce/plugins/emoticons/img/smiley-cry.gif
  68. BIN guigur.com/web/js/tinymce/plugins/emoticons/img/smiley-embarassed.gif
  69. BIN guigur.com/web/js/tinymce/plugins/emoticons/img/smiley-foot-in-mouth.gif
  70. BIN guigur.com/web/js/tinymce/plugins/emoticons/img/smiley-frown.gif
  71. BIN guigur.com/web/js/tinymce/plugins/emoticons/img/smiley-innocent.gif
  72. BIN guigur.com/web/js/tinymce/plugins/emoticons/img/smiley-kiss.gif
  73. BIN guigur.com/web/js/tinymce/plugins/emoticons/img/smiley-laughing.gif
  74. BIN guigur.com/web/js/tinymce/plugins/emoticons/img/smiley-money-mouth.gif
  75. BIN guigur.com/web/js/tinymce/plugins/emoticons/img/smiley-sealed.gif
  76. BIN guigur.com/web/js/tinymce/plugins/emoticons/img/smiley-smile.gif
  77. BIN guigur.com/web/js/tinymce/plugins/emoticons/img/smiley-surprised.gif
  78. BIN guigur.com/web/js/tinymce/plugins/emoticons/img/smiley-tongue-out.gif
  79. BIN guigur.com/web/js/tinymce/plugins/emoticons/img/smiley-undecided.gif
  80. BIN guigur.com/web/js/tinymce/plugins/emoticons/img/smiley-wink.gif
  81. BIN guigur.com/web/js/tinymce/plugins/emoticons/img/smiley-yell.gif
  82. +1 −0 guigur.com/web/js/tinymce/plugins/emoticons/plugin.min.js
  83. +1 −0 guigur.com/web/js/tinymce/plugins/fullpage/plugin.min.js
  84. +1 −0 guigur.com/web/js/tinymce/plugins/fullscreen/plugin.min.js
  85. BIN guigur.com/web/js/tinymce/plugins/help/img/logo.png
  86. +1 −0 guigur.com/web/js/tinymce/plugins/help/plugin.min.js
  87. +1 −0 guigur.com/web/js/tinymce/plugins/hr/plugin.min.js
  88. +1 −0 guigur.com/web/js/tinymce/plugins/image/plugin.min.js
  89. +1 −0 guigur.com/web/js/tinymce/plugins/imagetools/plugin.min.js
  90. +1 −0 guigur.com/web/js/tinymce/plugins/importcss/plugin.min.js
  91. +1 −0 guigur.com/web/js/tinymce/plugins/insertdatetime/plugin.min.js
  92. +1 −0 guigur.com/web/js/tinymce/plugins/legacyoutput/plugin.min.js
  93. +1 −0 guigur.com/web/js/tinymce/plugins/link/plugin.min.js
  94. +1 −0 guigur.com/web/js/tinymce/plugins/lists/plugin.min.js
  95. +1 −0 guigur.com/web/js/tinymce/plugins/media/plugin.min.js
  96. +1 −0 guigur.com/web/js/tinymce/plugins/nonbreaking/plugin.min.js
  97. +1 −0 guigur.com/web/js/tinymce/plugins/noneditable/plugin.min.js
  98. +1 −0 guigur.com/web/js/tinymce/plugins/pagebreak/plugin.min.js
  99. +1 −0 guigur.com/web/js/tinymce/plugins/paste/plugin.min.js
  100. +1 −0 guigur.com/web/js/tinymce/plugins/preview/plugin.min.js
  101. +1 −0 guigur.com/web/js/tinymce/plugins/print/plugin.min.js
  102. +1 −0 guigur.com/web/js/tinymce/plugins/save/plugin.min.js
  103. +1 −0 guigur.com/web/js/tinymce/plugins/searchreplace/plugin.min.js
  104. +1 −0 guigur.com/web/js/tinymce/plugins/spellchecker/plugin.min.js
  105. +1 −0 guigur.com/web/js/tinymce/plugins/tabfocus/plugin.min.js
  106. +1 −0 guigur.com/web/js/tinymce/plugins/table/plugin.min.js
  107. +1 −0 guigur.com/web/js/tinymce/plugins/template/plugin.min.js
  108. +1 −0 guigur.com/web/js/tinymce/plugins/textcolor/plugin.min.js
  109. +1 −0 guigur.com/web/js/tinymce/plugins/textpattern/plugin.min.js
  110. +1 −0 guigur.com/web/js/tinymce/plugins/toc/plugin.min.js
  111. +154 −0 guigur.com/web/js/tinymce/plugins/visualblocks/css/visualblocks.css
  112. +1 −0 guigur.com/web/js/tinymce/plugins/visualblocks/plugin.min.js
  113. +1 −0 guigur.com/web/js/tinymce/plugins/visualchars/plugin.min.js
  114. +1 −0 guigur.com/web/js/tinymce/plugins/wordcount/plugin.min.js
  115. +1 −0 guigur.com/web/js/tinymce/skins/lightgray/content.inline.min.css
  116. +1 −0 guigur.com/web/js/tinymce/skins/lightgray/content.min.css
  117. +1 −0 guigur.com/web/js/tinymce/skins/lightgray/content.mobile.min.css
  118. BIN guigur.com/web/js/tinymce/skins/lightgray/fonts/tinymce-mobile.woff
  119. BIN guigur.com/web/js/tinymce/skins/lightgray/fonts/tinymce-small.eot
  120. +63 −0 guigur.com/web/js/tinymce/skins/lightgray/fonts/tinymce-small.svg
  121. BIN guigur.com/web/js/tinymce/skins/lightgray/fonts/tinymce-small.ttf
  122. BIN guigur.com/web/js/tinymce/skins/lightgray/fonts/tinymce-small.woff
  123. BIN guigur.com/web/js/tinymce/skins/lightgray/fonts/tinymce.eot
  124. +131 −0 guigur.com/web/js/tinymce/skins/lightgray/fonts/tinymce.svg
  125. BIN guigur.com/web/js/tinymce/skins/lightgray/fonts/tinymce.ttf
  126. BIN guigur.com/web/js/tinymce/skins/lightgray/fonts/tinymce.woff
  127. BIN guigur.com/web/js/tinymce/skins/lightgray/img/anchor.gif
  128. BIN guigur.com/web/js/tinymce/skins/lightgray/img/loader.gif
  129. BIN guigur.com/web/js/tinymce/skins/lightgray/img/object.gif
  130. BIN guigur.com/web/js/tinymce/skins/lightgray/img/trans.gif
  131. +1 −0 guigur.com/web/js/tinymce/skins/lightgray/skin.min.css
  132. +2 −0 guigur.com/web/js/tinymce/skins/lightgray/skin.mobile.min.css
  133. +1 −0 guigur.com/web/js/tinymce/themes/inlite/theme.min.js
  134. +1 −0 guigur.com/web/js/tinymce/themes/mobile/theme.min.js
  135. +1 −0 guigur.com/web/js/tinymce/themes/modern/theme.min.js
  136. +2 −0 guigur.com/web/js/tinymce/tinymce.min.js

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -0,0 +1,10 @@
{% extends "base.html.twig" %}
{% block css%}
<link href="{{ asset('css/exceptions.css') }}" rel="stylesheet">
{% endblock %}
{% block body %}
<div class="not_found_game_div">
<div class="not_found_game_food">?</div>
</div>

{% endblock %}
@@ -0,0 +1,12 @@
<div class="card mb-4">
<img class="card-img-top" src="http://placehold.it/750x300" alt="Card image cap">
<div class="card-body">
<h3 class="card-title">Post Title&nbsp;<span class="badge badge-warning">Work in Progress</span></h3>
<p class="card-text">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Reiciendis aliquid atque, nulla? Quos cum ex quis soluta, a laboriosam. Dicta expedita corporis animi vero voluptate voluptatibus possimus, veniam magni quis!</p>
<a href="#" class="btn btn-primary">Read More &rarr;</a>
</div>
<div class="card-footer text-muted">
Posted on January 1, 2017 by
<a href="#">Start Bootstrap</a>
</div>
</div>
@@ -0,0 +1,4 @@
<h3 class="page-header">
{{ Page.header }} <br />
<small class="text-secondary">{{ Catchphrase.phrase }}</small>
</h3>
@@ -1,7 +1,6 @@

<a href="{% if Project.directLink != '' %}{{ Project.directLink }}{% else %}{{ path('Project', {'nameOfProject': Project.name}) }}{% endif %}">
<div class="project">
<div class="card effect__hover">
<div class="project-card effect__hover">
<div class="card__front" style="background:{% if Project.imgMiniature == '' %}#{% if Project.color is defined and Project.color != '' %}{{ Project.color }}{% else %}535353{% endif %};{% else %} url({{ asset(Project.imgMiniature) }});{% endif %}">
<div class="card__front_icons">
{% for ProjectCategories in ProjectsCategories if ProjectCategories.project.id == Project.id %}
@@ -2,27 +2,23 @@
<html lang="fr">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="">
<meta name="description" content="guigur's website">
<meta name="author" content="guigur">

<title>Blog Home - Start Bootstrap Template</title>
<title>Guigur.com</title>

<link rel="icon" type="image/png" href="{{ asset('img/favicons/guigur_32.png') }}" sizes="32x32">
<link rel="icon" type="image/png" href="{{ asset('img/favicons/guigur_48.png') }}" sizes="48x48">
<link rel="icon" type="image/png" href="{{ asset('img/favicons/guigur_64.png') }}" sizes="64x64">
<link rel="icon" type="image/png" href="{{ asset('img/favicons/guigur_96.png') }}" sizes="96x96">

<!-- Bootstrap Core CSS -->
<link href="{{ asset('css/bootstrap.css') }}" rel="stylesheet">
<link href="{{ asset('css/bootstrap.min.css') }}" rel="stylesheet">
<link href="{{ asset('css/foundation-icons.css') }}" rel="stylesheet">

<!-- Custom CSS -->
<link href="{{ asset('css/custom.css') }}" rel="stylesheet">
<link href="{{ asset('css/blog-home.css') }}" rel="stylesheet">

<script defer src="https://use.fontawesome.com/releases/v5.2.0/js/all.js"></script>
{% block css %}{% endblock %}
<script defer src="https://use.fontawesome.com/releases/v5.3.1/js/all.js"></script>

<!-- analytics -->
<script>
@@ -37,82 +33,109 @@

<!-- reCAPTCHA -->
<script src='https://www.google.com/recaptcha/api.js'></script>


<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
<![endif]-->
</head>

<body>
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<a class="navbar-brand" href="{{ path('Homepage') }}"><img height="100%" src="{{ asset('img/guigur_.com_green_small.png') }}"></a>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav mr-auto">
<li class="nav-item {% if app.request.get('_route') == 'Homepage' %}active{% endif %}">
<a href="{{ path('Homepage') }}"><span class="fa fa-home" aria-hidden="true"></span> Accueil</a>
</li>
<li class="nav-item {% if (app.request.get('_route') == 'Projects') or (app.request.get('_route') == 'Project') %}active{% endif %}">
<a href="{{ path('Projects') }}"><span class="fa fa-microchip" aria-hidden="true"></span> Projets</a>
</li>
<li class="nav-item {% if app.request.get('_route') == 'Archives' %}active{% endif %}">
<a href="{{ path('Archives') }}"><span class="fa fa-archive" aria-hidden="true"></span> Archives</a>
</li>
<li class="nav-item {% if app.request.get('_route') == 'Blog' %}active{% endif %}">
<a href="{{ path('Blog') }}"><span class="fa fa-rss" aria-hidden="true"></span> Blog</a>
</li>
<li class="nav-item {% if app.request.get('_route') == 'Random' %}active{% endif %}">
<a href="{{ path('Random') }}"><span class="fa fa-dice" aria-hidden="true"></span> Random</a>
</li>
<li class="nav-item {% if app.request.get('_route') == 'About' %}active{% endif %}">
<a href="{{ path('About') }}"><span class="fa fa-address-card" aria-hidden="true"></span> A propos</a>
</li>
<li class="nav-item {% if app.request.get('_route') == 'Shop' %}active{% endif %}">
<a href="{{ path('Shop') }}"><span class="fa fa-shopping-cart" aria-hidden="true"></span> Magasin</a>
</li>
<li class="nav-item {% if app.request.get('_route') == 'Contact' %}active{% endif %}">
<a href="{{ path('Contact') }}"><span class="fa fa-envelope" aria-hidden="true"></span> Contact</a>
</li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-user"></i> <span class="caret "></span></a>
<ul class="dropdown-menu">
<li><a href="#">Se connecter</a></li>
<li><a href="#">S'inscrire</a></li>
</ul>
</li>
</ul>
<nav class="navbar navbar navbar-expand-md sticky-top navbar-dark bg-darker">
<div class="container">
<a class="navbar-brand" href="{{ path('Homepage') }}">
<img src="{{ asset('img/guigur_.com_green_small.png') }}" height="50em" alt="">
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNavDropdown">
<ul class="navbar-nav">
<li class="nav-item {% if app.request.get('_route') == 'Homepage' %}active{% endif %}">
<a class="nav-link" href="{{ path('Homepage') }}"><span class="fa fa-home" aria-hidden="true"></span> Accueil</a>
</li>
<li class="nav-item {% if (app.request.get('_route') == 'Projects') or (app.request.get('_route') == 'Project') %}active{% endif %}">
<a class="nav-link" href="{{ path('Projects') }}"><span class="fa fa-microchip" aria-hidden="true"></span> Projets</a>
</li>
<li class="nav-item {% if app.request.get('_route') == 'Portfolio' %}active{% endif %}">
<a class="nav-link" href="{{ path('Portfolio') }}"><span class="fa fa-images" aria-hidden="true"></span> Portfolio</a>
</li>
<li class="nav-item {% if app.request.get('_route') == 'Blog' %}active{% endif %}">
<a class="nav-link" href="{{ path('Blog') }}"><span class="fa fa-rss" aria-hidden="true"></span> Blog</a>
</li>
<li class="nav-item {% if app.request.get('_route') == 'Archives' %}active{% endif %}">
<a class="nav-link" href="{{ path('Archives') }}"><span class="fa fa-archive" aria-hidden="true"></span> Archives</a>
</li>
<li class="nav-item {% if app.request.get('_route') == 'About' %}active{% endif %}">
<a class="nav-link" href="{{ path('About') }}"><span class="fa fa-address-card" aria-hidden="true"></span> A propos</a>
</li>
<li class="nav-item {% if app.request.get('_route') == 'Shop' %}active{% endif %}">
<a class="nav-link" href="{{ path('Shop') }}"><span class="fa fa-shopping-cart" aria-hidden="true"></span> Magasin</a>
</li>
<li class="nav-item {% if app.request.get('_route') == 'Contact' %}active{% endif %}">
<a class="nav-link" href="{{ path('Contact') }}"><span class="fa fa-envelope" aria-hidden="true"></span> Contact</a>
</li>
</ul>
</div>
<div class="collapse navbar-collapse justify-content-end" id="nav-content">
<ul class="navbar-nav">
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-user"></i>
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
<a class="dropdown-item" href="#">S'inscrire</a>
<a class="dropdown-item" href="#">Se connecter</a>
</div>
</li>

<!-- /.navbar-collapse -->
</ul>
</div>
<!-- /.container -->
</nav>
<div class="container">
</div>
</nav>
<div class="container" style="margin-top:2em;">
<div class="modal fade" id="guigurModal" tabindex="-1" role="dialog" aria-labelledby="guigurModalLabel">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="guigurModalLabel">Modal title</h4>
</div>
<div class="modal-body"></div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary">Save changes</button>
</div>
</div>
</div>
</div>

{% block body %}
{% endblock body %}
</div>

<footer class="footer">
<div class="container">
<div class="col-lg-12">
<p><a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-sa/4.0/80x15.png" /></a> guigur.com 2012-2018</p>
<footer class="footer bg-darker">
<div class="container">
<div class="row" >
<div class="col-md-4 text-center footer-blocks">
<a class="footer-link" rel="license" href="http://creativecommons.org/licenses/by-nc/4.0/">
<span class="footer-icons-cc-wrapper" >
<span class="footer-icons-cc fab fa-creative-commons" aria-hidden="true"></span>
<span class="footer-icons-cc fab fa-creative-commons-by" aria-hidden="true"></span>
<span class="footer-icons-cc fab fa-creative-commons-nc" aria-hidden="true"></span>
</span>
</a>
</div>
<div class="col-md-4 text-center">
guigur.com 2012-2018
</div>
<div class="col-md-4 text-center">
<a class="footer-link" href="{{ path('Changelog') }}" ><span class="fa fa-pen" aria-hidden="true"></span> Changelog</a>
</div>
</div>
</footer>
</div>
</footer>



<script src="{{ asset('js/jquery.js') }}"></script>
<script src="{{ asset('js/bootstrap.js') }}"></script>
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
<script src="{{ asset('js/bootstrap.min.js') }}"></script>
{% block js %}{% endblock %}
</body>
</html>
@@ -8,6 +8,19 @@ class DefaultController extends Controller
{
public function indexAction()
{
return $this->render('GuigurAdminBundle:Default:index.html.twig');
$pastVisit = $this->getDoctrine()
->getRepository('GuigurFrontBundle:Visits')
->findAll();
$countVisitsDays = $this->get('guigur.admin.visits')->VisitsDays();
$visitsStats = $this->get('guigur.admin.visits')->VisitsStats();
return $this->render('GuigurAdminBundle:Default:index.html.twig', array("visitsDays" => $countVisitsDays, "visitsStats" => $visitsStats));
}
public function visitsAction()
{
$countVisitsDays = $this->get('guigur.admin.visits')->VisitsDays(360);
return $this->render('GuigurAdminBundle:Default:visits.html.twig', array("visitsDays" => $countVisitsDays));
}
}
@@ -1,3 +1,7 @@
guigur_admin_homepage:
admin_homepage:
path: /
defaults: { _controller: GuigurAdminBundle:Default:index }

admin_visits:
path: /Visits
defaults: { _controller: GuigurAdminBundle:Default:visits }
@@ -1,4 +1,5 @@
services:
# guigur_admin.example:
# class: GuigurAdminBundle\Example
# arguments: ["@service_id", "plain_value", %parameter%]
guigur.admin.visits:
class: GuigurAdminBundle\Service\VisitsService
arguments: ["@doctrine"]

@@ -0,0 +1,72 @@
{% extends "base.html.twig" %}
{% block body %}
<script src="{{ asset('js/Chart.min.js') }}"></script>
<div class="row">
</div>
<div class="row">
<div class="col-lg-3">
<div class="card" >
<canvas height="200" id="register_chart_7"></canvas>

<div class="card-body">
<h5 class="card-title">Incriptions les 7 derniers jours</h5>
<p class="card-text">Some quick example text to build on the card title and make up the bulk of the card's content.</p>
<a href="#" class="btn btn-primary">Voir plus</a>
</div>
</div>
</div>
<div class="col-lg-3">
<div class="card">
<div class="admin_card_container">
<canvas height="200" id="connection_chart_7"></canvas>
</div>

<div class="card-body">
<h5 class="card-title">Connexions les 7 derniers jours</h5>
<p class="card-text">Some quick example text to build on the card title and make up the bulk of the card's content.</p>
<a href="#" class="btn btn-primary">Voir plus</a>
</div>
</div>
</div>
<div class="col-lg-3">

<div class="card">
<div class="admin_card_container">
<canvas height="220" id="visit_chart_7"></canvas>
</div>
<div class="card-body">
<h5 class="card-title">Visites les 7 derniers jours</h5>
<p class="card-text">Visites Totales: <br /><strong>{{ visitsStats.visitsTotal }} </strong></p>
<p class="card-text">Visites les dernières 24h: <br /><strong>{{ visitsStats.visits24h }}&nbsp;</strong><span title="{{ visitsStats.visits24hPast }}" class="{{ visitsStats.visits24hIcon }}"></span></p>
<p class="card-text">Visites les 7 dernièrs jours: <br /><strong>{{ visitsStats.visits7days }}&nbsp;</strong><span title="{{ visitsStats.visits7daysPast }}" class="{{ visitsStats.visits7daysIcon }}"></span></p>
<p class="card-text">Moyenne des visites les 7 dernièrs jours: <br /><strong>{{ visitsStats.visitsMoy7days }}&nbsp;</strong><span title="{{ visitsStats.visitsMoy7daysPast }}" class="{{ visitsStats.visitsMoy7daysIcon }}"></span></p>
<a href="{{ path('admin_visits') }}" class="btn btn-primary">Voir tout</a>
</div>
</div>
</div>
</div>
{% endblock %}
{% block js %}
<script>tinymce.init({ selector:'.tinymce' });</script>
<script src="{{ asset('js/tinymce/tinymce.min.js') }}"></script>
<script>
new Chart($("#visit_chart_7"), {
type: 'line',
data: {
labels: [{% for visitsDay in visitsDays %}"{{ visitsDay.date }}",{% endfor %}],
datasets: [{
label: false,
data: [{% for visitsDay in visitsDays %}"{{ visitsDay.visits }}",{% endfor %}],
backgroundColor: ['rgba(54, 162, 235, 0.2)'],
borderColor: ['rgba(54, 162, 235, 1)'],
borderWidth: 1
}]
},
options: {
legend: {
display: false
}
}
});
</script>
{% endblock %}
Oops, something went wrong.

0 comments on commit 25734cb

Please sign in to comment.
You can’t perform that action at this time.