Skip to content

Commit bd637a0

Browse files
ShweitShweit
authored
Some final quick Fixes (#100)
* Some quick Fixes * Updated info text for canna consultant * Added link to logo * Added z-index 9999 to modal * Updated Meta Tags for better view when sharing * added meta Tags for better view when sharing link
1 parent 684d93b commit bd637a0

13 files changed

Lines changed: 111 additions & 50 deletions

File tree

‎assets/styles/app.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,10 @@ $navbar-dark-color: #DFDFDF;
226226
transition: none !important;
227227
}
228228

229+
.modal {
230+
z-index: 9999;
231+
}
232+
229233
/* Extra small devices (phones, 600px and down) */
230234
@media only screen and (max-width: 600px) {
231235

‎src/DataFixtures/PlantFixtures.php‎

Lines changed: 34 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,30 +35,41 @@ public function load(ObjectManager $manager)
3535
// Create plants
3636
$plant1 = new Plant();
3737
$plant1->setName('Plant 1');
38-
$plant1->setDate(new \DateTime('2024-06-27'));
38+
$plant1->setDate(new \DateTime('now - 7 days'));
3939
$plant1->setState('Vegetativ');
4040
$plant1->setPlaceOfCultivation('Innen');
4141
$plant1->setLighting('LED');
4242
$plant1->setUser($user1);
4343
$plant1->setStrain($strain1);
4444
$plant1->setBreeder($breeder1);
4545
$plant1->setGrowth(1);
46+
47+
// Get a random date between now and 7 days ago
48+
$watering = new \DateTime('now - ' . random_int(0, 7) . ' days');
49+
$wateringDateString = $watering->format('Y-m-d H:i:s');
50+
51+
$fertilize = new \DateTime('now - ' . random_int(0, 3) . ' days');
52+
$fertilizeDateString = $fertilize->format('Y-m-d H:i:s');
53+
54+
$temperature = new \DateTime('now - ' . random_int(0, 5) . ' days');
55+
$temperatureDateString = $temperature->format('Y-m-d H:i:s');
56+
4657
$plant1->setWeeklyTasks([
4758
'water' => [
4859
[
49-
'date' => '2024-07-17 18:48:09',
60+
'date' => $wateringDateString,
5061
'task' => 'water',
5162
],
5263
],
5364
'fertilize' => [
5465
[
55-
'date' => '2024-07-17 18:48:10',
66+
'date' => $fertilizeDateString,
5667
'task' => 'fertilize',
5768
],
5869
],
5970
'temperature' => [
6071
[
61-
'date' => '2024-07-17 18:48:10',
72+
'date' => $temperatureDateString,
6273
'task' => 'temperature',
6374
],
6475
],
@@ -70,36 +81,50 @@ public function load(ObjectManager $manager)
7081

7182
$plant2 = new Plant();
7283
$plant2->setName('BOB');
73-
$plant2->setDate(new \DateTime('2024-07-10'));
84+
$plant2->setDate(new \DateTime('now - 10 days'));
7485
$plant2->setState('Blüte');
7586
$plant2->setPlaceOfCultivation('Außen');
7687
$plant2->setLighting('Natural');
7788
$plant2->setUser($user1);
7889
$plant2->setStrain($strain2);
7990
$plant2->setBreeder($breeder2);
8091
$plant2->setGrowth(1);
92+
93+
$watering = new \DateTime('now - ' . random_int(0, 7) . ' days');
94+
$wateringDateString = $watering->format('Y-m-d H:i:s');
95+
96+
$fertilize = new \DateTime('now - ' . random_int(0, 3) . ' days');
97+
$fertilizeDateString = $fertilize->format('Y-m-d H:i:s');
98+
99+
$temperature = new \DateTime('now - ' . random_int(0, 5) . ' days');
100+
$temperatureDateString = $temperature->format('Y-m-d H:i:s');
101+
102+
$pesticide = new \DateTime('now - ' . random_int(0, 5) . ' days');
103+
$pesticideDateString = $pesticide->format('Y-m-d H:i:s');
104+
81105
$plant2->setWeeklyTasks([
82106
'water' => [
83107
[
84-
'date' => '2024-07-15 18:48:09',
108+
'date' => $wateringDateString,
85109
'task' => 'water',
86110
],
87111
],
88112
'fertilize' => [
89113
[
90-
'date' => '2024-07-17 18:48:10',
114+
'date' => $fertilizeDateString,
91115
'task' => 'fertilize',
92116
],
93117
],
94118
'temperature' => [
95119
[
96-
'date' => '2024-07-12 18:48:10',
120+
'date' => $temperatureDateString,
97121
'task' => 'temperature',
98122
],
99123
],
124+
100125
'pesticide' => [
101126
[
102-
'date' => '2024-07-15 18:48:10',
127+
'date' => $pesticideDateString,
103128
'task' => 'pesticide',
104129
],
105130
],

‎templates/base.html.twig‎

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,34 +33,43 @@
3333
<link rel="icon" type="image/png" sizes="96x96" href="{{ asset('build/images/favicon/favicon-96x96.png') }}">
3434
<link rel="icon" type="image/png" sizes="16x16" href="{{ asset('build/images/favicon/favicon-16x16.png') }}">
3535
<link rel="manifest" href="{{ asset('build/images/favicon/manifest.json') }}">
36+
<link rel='canonical' href='https://weedwizard.de'>
3637

38+
<meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'>
3739
<meta name="msapplication-TileColor" content="#ffffff">
3840
<meta name="msapplication-TileImage" content="{{ asset('build/images/favicon/ms-icon-144x144.png') }}">
3941
<meta name="theme-color" content="#ffffff">
40-
42+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
43+
<meta name="revisit-after" content="2 days" />
4144
<meta http-equiv="content-Type" content="text/html; utf-8" />
42-
<meta name="robots" content="INDEX,FOLLOW" />
4345
<meta http-equiv="content-Language" content="de" />
44-
<meta name="description" content="Dein Begleiter für sorgenfreien Cannabiskonsum" />
45-
<meta name="keywords" content="cannabis, konsum, drogen, grass, Cannabis Deutschland, bubatzkarte, cannabis map, konsum map" />
46-
<meta name="author" content="WeedWizard" />
47-
<meta name="publisher" content="WeedWizard" />
48-
<meta name="copyright" content="WeedWizard" />
49-
<meta name="audience" content="Alle" />
50-
<meta name="page-topic" content="Cannabis" />
51-
<meta name="revisit-after" content="2 days" />
5246

53-
<meta property="og:title" content="WeedWizard">
54-
<meta property="og:description" content="Dein Begleiter für sorgenfreien Cannabiskonsum">
55-
<meta property="og:image" content="https://www.weedwizard.de/build/images/favicon/android-icon-192x192.png">
56-
<meta property="og:url" content="https://www.weedwizard.de">
57-
<meta property="og:type" content="website">
47+
{% block meta %}
48+
<meta name="title" content="WeedWizard">
49+
<meta name="description" content="Dein Begleiter für sorgenfreien Cannabiskonsum" />
50+
<meta name="keywords" content="cannabis, konsum, drogen, grass, Cannabis Deutschland, bubatzkarte, cannabis map, konsum map" />
51+
<meta name="author" content="WeedWizard" />
52+
<meta name="publisher" content="WeedWizard" />
53+
<meta name="copyright" content="WeedWizard" />
54+
<meta name="audience" content="Alle" />
55+
<meta name="page-topic" content="Cannabis" />
5856

59-
<meta name="twitter:card" content="summary_large_image">
60-
<meta name="twitter:title" content="WeedWizard">
61-
<meta name="twitter:description" content="Dein Begleiter für sorgenfreien Cannabiskonsum">
62-
<meta name="twitter:image" content="https://www.weedwizard.de/build/images/favicon/android-icon-192x192.png">
63-
<meta name="viewport" content="width=device-width, initial-scale=1.0">
57+
<meta property='og:site_name' content='WeedWizard'>
58+
<meta property='og:type' content='website'>
59+
<meta property="og:title" content="WeedWizard">
60+
<meta property="og:description" content="Dein Begleiter für sorgenfreien Cannabiskonsum">
61+
<meta property="og:image" content="{{ asset('build/images/favicon/android-icon-144x144.png') }}">
62+
<meta property="og:url" content="https://www.weedwizard.de">
63+
<meta property="og:type" content="website">
64+
65+
<meta name="twitter:card" content="{{ asset('build/images/favicon/android-icon-144x144.png') }}">
66+
<meta name="twitter:title" content="WeedWizard">
67+
<meta name="twitter:description" content="Dein Begleiter für sorgenfreien Cannabiskonsum">
68+
<meta name="twitter:image" content="{{ asset('build/images/favicon/android-icon-144x144.png') }}">
69+
{% endblock %}
70+
71+
<meta name='mobile-web-app-capable' content='yes'>
72+
<meta name='apple-mobile-web-app-capable' content='yes'>
6473
</head>
6574

6675
{% include 'templates/_site_loader.hmtl.twig' %}

‎templates/budBash_locator/index.html.twig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,20 +82,20 @@
8282
<div class="col-md-12">
8383
<input type="text" class="form-control mb-3" id="searchBudBash" placeholder="Suche nach Name...">
8484
<div class="row mb-4">
85-
<div class="col-4">
85+
<div class="col-12 col-sm-4">
8686
<div class="input-group mb-3">
8787
<input type="number" id="entfernung" class="form-control" placeholder="Maximale Entfernung" aria-label="Maximale Entfernung" aria-describedby="Maximale Entfernung" value="{{ app.request.get('distance') }}">
8888
<span class="input-group-text" id="entfernung_label">km</span>
8989
</div>
9090
</div>
9191

92-
<div class="col-5">
92+
<div class="col-12 col-sm-5">
9393
<div class="input-group mb-3">
9494
<div class="w-100" id="priceSlider" data-min="{{ lowestEntranceFee }}" data-max="{{ highestEntranceFee }}"></div>
9595
</div>
9696
</div>
9797

98-
<div class="col-3">
98+
<div class="col-12 col-sm-3">
9999
<select class="form-select" id="sortBy">
100100
<option value="id_ASC">Neuste</option>
101101
<option value="id_DESC">Älteste</option>

‎templates/canna_consultant/index.html.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<div class="chat-container overflow-y-auto overflow-x-hidden mb-3" id="chat" data-userPhotoPath="{{ userProfilePicture }}" data-username="{{ app.user.username }}">
2323
{% if app.environment == 'dev' %}
2424
<div class="alert alert-warning position-fixed mt-3 d-none d-sm-block" style="z-index: 90; left: 50%; transform: translate(-50%, 0);" role="alert">
25-
Bitte denkt dran, dass wir jede Anfrage an den Canna-Consultant bezahlen müssen. Bitte nicht so viele Anfragen stellen, bin leider (noch) kein Millionär. Ihr könnt <a href="https://openai.com/api/pricing/" target="_blank">hier</a> nachlesen wie teuer die Anfragen an OpenAI sind. Wir benutzen gerade das Model GPT-3.5 Turbo.
25+
Bitte denkt dran, dass wir jede Anfrage an den Canna-Consultant bezahlen müssen. Bitte nicht so viele Anfragen stellen, bin leider (noch) kein Millionär. Ihr könnt <a href="https://openai.com/api/pricing/" target="_blank">hier</a> nachlesen wie teuer die Anfragen an OpenAI sind. Wir benutzen gerade das Model GPT-4o mini.
2626
</div>
2727
{% endif %}
2828

‎templates/cannastrain_library/partials/_breeder_card.html.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="breeder-logo rounded-top-3">
55
<a href="{{ path('weedwizard_cannastrain-library_breeder-view', {breeder_id: seedfinder_id }) }}">
66
<img src="https://de.seedfinder.eu/pics/00breeder/{{ image }}" class="breeder-logo-img"
7-
alt="Logo of the breeder shown below">
7+
alt="Logo of the breeder shown below" loading="lazy">
88
</a>
99
</div>
1010

‎templates/cannastrain_library/partials/_header.html.twig‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎templates/cannastrain_library/partials/_strain_card.html.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="card rounded-3 mb-4" style="width: auto;">
33
<div class="cropped-img rounded-top-3 position-relative">
44
<a href="{{ btnLink }}">
5-
<img src="{{ image }}" class="card-img-top" alt="{{ name }}">
5+
<img src="{{ image }}" class="card-img-top" alt="{{ name }}" loading="lazy">
66
</a>
77
<div class="type-overlay bg-secondary">{{ type }}</div>
88
</div>

‎templates/cannastrain_library/strain/showStrain.html.twig‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@
7474
<div class="cropped-img user-img-container rounded-3">
7575
<img src="{{ strainInfo.pic }}"
7676
class="card-img-top user-img"
77-
alt="User img for selected strain from SeedFinder">
77+
alt="User img for selected strain from SeedFinder"
78+
loading="lazy">
7879
</div>
7980

8081
{# Forward / backward btn #}

‎templates/grow_mate/index.html.twig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
</td>
8484
{% endif %}
8585
{% if plant.strain.pics %}
86-
<td rowspan="2"><img src="{{ plant.strain.breederInfo['pic'] }}" class="card-img-top" alt="Bild der Pflanze" style="height:12rem; width: 9rem; float: right"></td>
86+
<td rowspan="2"><img src="{{ plant.strain.breederInfo['pic'] }}" class="card-img-top" alt="Bild der Pflanze" style="height:12rem; width: 9rem; float: right" loading="lazy"></td>
8787
{% endif %}
8888
</tr>
8989
</table>
@@ -111,7 +111,7 @@
111111
<h4 class="offcanvas-title" id="offcanvasLabel-{{ plant.id }}" style="color: white">Pflanzendetails</h4>
112112
<button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="Close"></button>
113113
</div>
114-
<div class="offcanvas-body" style="overflow: hidden">
114+
<div class="offcanvas-body">
115115
<div class="container-fluid">
116116
<div class="row">
117117
<!-- Oben links: Name, erstellt vor, Entwicklungsphase -->

0 commit comments

Comments
 (0)