diff --git a/bower.json b/bower.json index 4797a05d..cfb0c1a9 100644 --- a/bower.json +++ b/bower.json @@ -1,5 +1,5 @@ { - "name": "asp.net", + "name": "grocy", "private": true, "dependencies": { "bootstrap": "^3.3.7", diff --git a/grocy.js b/grocy.js index f43799b1..fd6a1c0e 100644 --- a/grocy.js +++ b/grocy.js @@ -1,4 +1,4 @@ -var Grocy = {}; +var Grocy = { }; $(function() { diff --git a/grocy.phpproj b/grocy.phpproj deleted file mode 100644 index 31d4c13f..00000000 --- a/grocy.phpproj +++ /dev/null @@ -1,87 +0,0 @@ - - - Debug - grocy - edb77631-5196-4860-baeb-bca8900a4b6d - Library - - - {A0786B88-2ADB-4C21-ABE8-AA2D79766269} - grocy - false - PHP - 7.1 - PHPDev - localhost - true - - - true - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Content - README.md - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/grocy.sln b/grocy.sln deleted file mode 100644 index c9b6ea7e..00000000 --- a/grocy.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26403.3 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{A0786B88-2ADB-4C21-ABE8-AA2D79766269}") = "grocy", "grocy.phpproj", "{EDB77631-5196-4860-BAEB-BCA8900A4B6D}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {EDB77631-5196-4860-BAEB-BCA8900A4B6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EDB77631-5196-4860-BAEB-BCA8900A4B6D}.Release|Any CPU.ActiveCfg = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/index.php b/index.php index c389167f..636c7d13 100644 --- a/index.php +++ b/index.php @@ -39,7 +39,7 @@ if (!Grocy::IsDemoInstallation()) $route = $request->getAttribute('route'); $routeName = $route->getName(); - if (!Grocy::IsValidSession($_COOKIE['grocy_session']) && $routeName !== 'login') + if ((!isset($_COOKIE['grocy_session']) || !Grocy::IsValidSession($_COOKIE['grocy_session'])) && $routeName !== 'login') { $response = $response->withRedirect('/login'); } diff --git a/style.css b/style.css index 7f587f4a..3aec2ab4 100644 --- a/style.css +++ b/style.css @@ -1,5 +1,6 @@ body { padding-top: 50px; + font-family: 'Noto Sans', sans-serif; } .navbar-fixed-top { @@ -70,14 +71,25 @@ bottom: 0; width: 100%; color: #b3b3b1; - font-size: 0.85em; + font-size: 11px; text-align: center; + font-family: 'Arial', sans-serif; } .discrete-link { color: inherit; } +a.discrete-link:hover { + color: #5cb85c; + text-decoration: none; +} + +a.discrete-link:focus { + color: #337ab7; + text-decoration: none; +} + .navbar-fixed-top { border-bottom: solid; border-color: #5e5e5e; @@ -87,6 +99,7 @@ font-weight: bold; letter-spacing: -2px; font-size: 2.2em; + font-family: 'Arial', sans-serif; } .table td.fit-content, diff --git a/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-700.eot b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-700.eot new file mode 100644 index 00000000..03bf93fe Binary files /dev/null and b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-700.eot differ diff --git a/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-700.svg b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-700.svg new file mode 100644 index 00000000..925fe474 --- /dev/null +++ b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-700.svg @@ -0,0 +1,336 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-700.ttf b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-700.ttf new file mode 100644 index 00000000..4599e3ca Binary files /dev/null and b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-700.ttf differ diff --git a/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-700.woff b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-700.woff new file mode 100644 index 00000000..f8df5340 Binary files /dev/null and b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-700.woff differ diff --git a/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-700.woff2 b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-700.woff2 new file mode 100644 index 00000000..72744d5c Binary files /dev/null and b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-700.woff2 differ diff --git a/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-700italic.eot b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-700italic.eot new file mode 100644 index 00000000..cb97b2b4 Binary files /dev/null and b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-700italic.eot differ diff --git a/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-700italic.svg b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-700italic.svg new file mode 100644 index 00000000..abdafc0f --- /dev/null +++ b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-700italic.svg @@ -0,0 +1,334 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-700italic.ttf b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-700italic.ttf new file mode 100644 index 00000000..6640dbeb Binary files /dev/null and b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-700italic.ttf differ diff --git a/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-700italic.woff b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-700italic.woff new file mode 100644 index 00000000..248ab38b Binary files /dev/null and b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-700italic.woff differ diff --git a/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-700italic.woff2 b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-700italic.woff2 new file mode 100644 index 00000000..350a869c Binary files /dev/null and b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-700italic.woff2 differ diff --git a/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-italic.eot b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-italic.eot new file mode 100644 index 00000000..a9973499 Binary files /dev/null and b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-italic.eot differ diff --git a/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-italic.svg b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-italic.svg new file mode 100644 index 00000000..dcd8fc89 --- /dev/null +++ b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-italic.svg @@ -0,0 +1,337 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-italic.ttf b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-italic.ttf new file mode 100644 index 00000000..7f75a2d9 Binary files /dev/null and b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-italic.ttf differ diff --git a/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-italic.woff b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-italic.woff new file mode 100644 index 00000000..e54bd83e Binary files /dev/null and b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-italic.woff differ diff --git a/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-italic.woff2 b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-italic.woff2 new file mode 100644 index 00000000..0980986c Binary files /dev/null and b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-italic.woff2 differ diff --git a/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-regular.eot b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-regular.eot new file mode 100644 index 00000000..15fc8bfc Binary files /dev/null and b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-regular.eot differ diff --git a/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-regular.svg b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-regular.svg new file mode 100644 index 00000000..bd2894d6 --- /dev/null +++ b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-regular.svg @@ -0,0 +1,335 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-regular.ttf b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-regular.ttf new file mode 100644 index 00000000..a83bbf9f Binary files /dev/null and b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-regular.ttf differ diff --git a/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-regular.woff b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-regular.woff new file mode 100644 index 00000000..34740552 Binary files /dev/null and b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-regular.woff differ diff --git a/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-regular.woff2 b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-regular.woff2 new file mode 100644 index 00000000..4b3b0663 Binary files /dev/null and b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin-regular.woff2 differ diff --git a/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin.css b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin.css new file mode 100644 index 00000000..f371566f --- /dev/null +++ b/vendor_unmanaged/noto-sans-v6-latin/noto-sans-v6-latin.css @@ -0,0 +1,55 @@ +/* noto-sans-regular - latin */ +@font-face { + font-family: 'Noto Sans'; + font-style: normal; + font-weight: 400; + src: url('noto-sans-v6-latin-regular.eot'); /* IE9 Compat Modes */ + src: local('Noto Sans'), local('NotoSans'), + url('noto-sans-v6-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('noto-sans-v6-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ + url('noto-sans-v6-latin-regular.woff') format('woff'), /* Modern Browsers */ + url('noto-sans-v6-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ + url('noto-sans-v6-latin-regular.svg#NotoSans') format('svg'); /* Legacy iOS */ +} + +/* noto-sans-italic - latin */ +@font-face { + font-family: 'Noto Sans'; + font-style: italic; + font-weight: 400; + src: url('noto-sans-v6-latin-italic.eot'); /* IE9 Compat Modes */ + src: local('Noto Sans Italic'), local('NotoSans-Italic'), + url('noto-sans-v6-latin-italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('noto-sans-v6-latin-italic.woff2') format('woff2'), /* Super Modern Browsers */ + url('noto-sans-v6-latin-italic.woff') format('woff'), /* Modern Browsers */ + url('noto-sans-v6-latin-italic.ttf') format('truetype'), /* Safari, Android, iOS */ + url('noto-sans-v6-latin-italic.svg#NotoSans') format('svg'); /* Legacy iOS */ +} + +/* noto-sans-700 - latin */ +@font-face { + font-family: 'Noto Sans'; + font-style: normal; + font-weight: 700; + src: url('noto-sans-v6-latin-700.eot'); /* IE9 Compat Modes */ + src: local('Noto Sans Bold'), local('NotoSans-Bold'), + url('noto-sans-v6-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('noto-sans-v6-latin-700.woff2') format('woff2'), /* Super Modern Browsers */ + url('noto-sans-v6-latin-700.woff') format('woff'), /* Modern Browsers */ + url('noto-sans-v6-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */ + url('noto-sans-v6-latin-700.svg#NotoSans') format('svg'); /* Legacy iOS */ +} + +/* noto-sans-700italic - latin */ +@font-face { + font-family: 'Noto Sans'; + font-style: italic; + font-weight: 700; + src: url('noto-sans-v6-latin-700italic.eot'); /* IE9 Compat Modes */ + src: local('Noto Sans Bold Italic'), local('NotoSans-BoldItalic'), + url('noto-sans-v6-latin-700italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ + url('noto-sans-v6-latin-700italic.woff2') format('woff2'), /* Super Modern Browsers */ + url('noto-sans-v6-latin-700italic.woff') format('woff'), /* Modern Browsers */ + url('noto-sans-v6-latin-700italic.ttf') format('truetype'), /* Safari, Android, iOS */ + url('noto-sans-v6-latin-700italic.svg#NotoSans') format('svg'); /* Legacy iOS */ +} diff --git a/views/consume.php b/views/consume.php index 29f199a3..0340de35 100644 --- a/views/consume.php +++ b/views/consume.php @@ -38,8 +38,8 @@

Stock quantity unit:

- Stock amount:
- Last purchased:
+ Stock amount:
+ Last purchased:
Last used:

diff --git a/views/habitform.php b/views/habitform.php index 8e7791df..9b90f1f6 100644 --- a/views/habitform.php +++ b/views/habitform.php @@ -12,7 +12,7 @@
- +
@@ -33,7 +33,7 @@
- +
diff --git a/views/habittracking.php b/views/habittracking.php index a9a69c05..3e8a0038 100644 --- a/views/habittracking.php +++ b/views/habittracking.php @@ -36,7 +36,7 @@

Habit overview

- Tracked count:
- Last tracked:
+ Tracked count:
+ Last tracked:

diff --git a/views/inventory.php b/views/inventory.php index 64b0360b..a9e75567 100644 --- a/views/inventory.php +++ b/views/inventory.php @@ -45,8 +45,8 @@

Purchase quantity:

- Stock amount:
- Last purchased:
+ Stock amount:
+ Last purchased:
Last used:

diff --git a/views/layout.php b/views/layout.php index 97066020..b52d728d 100644 --- a/views/layout.php +++ b/views/layout.php @@ -1,27 +1,29 @@ - - - + + + - + + - - + + <?php echo $title; ?> | grocy - - - - - - - - - - + + + + + + + + + + + @@ -153,13 +155,13 @@
grocy is a project by Bernd Bestel -
+
Created with passion since 2017 -
+
Version -
+
Life runs on code -
+
diff --git a/views/locationform.php b/views/locationform.php index a6c43136..96de08cf 100644 --- a/views/locationform.php +++ b/views/locationform.php @@ -12,7 +12,7 @@
- +
diff --git a/views/login.php b/views/login.php index e323543b..acde3e11 100644 --- a/views/login.php +++ b/views/login.php @@ -6,13 +6,13 @@
- +
- +
diff --git a/views/productform.php b/views/productform.php index 0239d10b..a7341f42 100644 --- a/views/productform.php +++ b/views/productform.php @@ -44,7 +44,7 @@
- +
diff --git a/views/purchase.php b/views/purchase.php index 6a30ae29..a088a108 100644 --- a/views/purchase.php +++ b/views/purchase.php @@ -44,8 +44,8 @@

Purchase quantity:

- Stock amount:
- Last purchased:
+ Stock amount:
+ Last purchased:
Last used:

diff --git a/views/quantityunitform.php b/views/quantityunitform.php index c01f623e..52a8dc86 100644 --- a/views/quantityunitform.php +++ b/views/quantityunitform.php @@ -12,7 +12,7 @@
- +
diff --git a/views/shoppinglistform.php b/views/shoppinglistform.php index f67335c3..37de5e67 100644 --- a/views/shoppinglistform.php +++ b/views/shoppinglistform.php @@ -38,8 +38,8 @@

Stock quantity unit:

- Stock amount:
- Last purchased:
+ Stock amount:
+ Last purchased:
Last used: