Merge branch 'main' into main

fix for PR
Donation dependent style
2024-04-03 16:32:03 -07:00 · 2024-04-03 16:27:46 -07:00 · 2024-04-03 15:30:32 +02:00 · 2024-04-03 15:25:51 +02:00 · 2024-04-03 15:25:02 +02:00 · 2024-04-03 15:09:03 +02:00
8 changed files with 435 additions and 194 deletions
--- a/.env.example
+++ b/.env.example
@ -17,7 +17,7 @@ APP_DESCRIPTION="Integrate Steam Widgets of your game/app into your website"
 APP_KEYWORDS="steam, widgets, steam widgets, steam game widget, steam app widget, steam server widget, steam player widget"
 APP_DEBUG=true
 APP_BASEDIR=""
-APP_SESSION=true
+APP_TIMEZONE=null
 APP_LINK_GITHUB="https://github.com/danielbrendel"
 APP_LINK_STEAM="https://store.steampowered.com/developer/danielbrendel/"
 APP_REPOSITORY="danielbrendel/steamwidgets-web"
@ -31,9 +31,15 @@ APP_EXAMPLE_WORKSHOP=""
 APP_EXAMPLE_GROUP=""
 APP_FOOTER_NOTICE="${APP_NAME} is not affiliated with Valve or Steam"
 APP_STATSPASSWORD="test"
+APP_ENABLEDONATION=true

 STEAM_API_KEY=""

+# Session
+SESSION_ENABLE=true
+SESSION_DURATION=0
+SESSION_NAME=null
+
 # Redis settings
 REDIS_HOST=localhost
 REDIS_PORT=6379
@ -49,6 +55,7 @@ DB_PASSWORD=""
 DB_PORT=3306
 DB_DATABASE=asatru
 DB_DRIVER=mysql
+DB_CHARSET="utf8"

 # SMTP settings
 SMTP_FROMNAME="Test"
@ -57,4 +64,7 @@ SMTP_HOST=""
 SMTP_PORT=587
 SMTP_USERNAME=""
 SMTP_PASSWORD=""
-SMTP_ENCRYPTION=tls
+SMTP_ENCRYPTION=tls
+
+# Logging
+LOG_ENABLE=true
--- a/app/resources/sass/app.scss
+++ b/app/resources/sass/app.scss
@ -279,6 +279,11 @@ tbody strong {
    text-decoration: underline;
 }

+.sponsoring {
+    position: relative;
+    margin-top: 35px;
+}
+
 .stats-input {
    padding: 8px;
    color: rgb(50, 50, 50);
@ -450,6 +455,14 @@ tbody strong {
    padding-top: 45px;
 }

+.background-get-started {
+    background-color: rgb(35, 55, 79);
+    @media screen and (min-width: 768px) {
+        border-radius: 10px;
+    }
+    margin-bottom: 30px;
+}
+
 .button-get-started {
    margin-top: 50px;
    margin-bottom: 50px;
--- a/app/views/error/exception_debug.php
+++ b/app/views/error/exception_debug.php
@ -2,6 +2,7 @@
 <html>
    <head>
        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">

        <title>Asatru PHP - Exception</title>

@ -25,6 +26,12 @@
 				height: 100%;
 			}

+            @media screen and (max-width: 1087px) {
+                .ex_image {
+                    display: none;
+                }
+            }
+
            .ex_box {
                position: absolute;
 				display: inline-block;
@ -32,6 +39,12 @@
 				height: 100%;
 				overflow-y: auto;
            }
+
+            @media screen and (max-width: 1087px) {
+                .ex_box {
+                    width: 100%;
+                }
+            }
 			
 			.ex_header_num {
                position: relative;
@ -76,24 +89,25 @@
 				position: relative;
 				margin-left: 10px;
                margin-right: 10px;
-				margin-top: 20px;
-				padding-top: 10px;
-				padding-bottom: 10px;
-				padding-left: 50px;
-				padding-right: 50px;
-				width: 51px;
-				border: 1px solid rgb(51, 63, 104);
-				border-radius: 5px;
-				background-color: rgb(45, 95, 245);
+				margin-top: 30px;
 			}
 			
 			.ex_refresh a {
+                width: 51px;
+                padding-top: 10px;
+				padding-bottom: 10px;
+				padding-left: 50px;
+				padding-right: 50px;
 				color: rgb(235, 235, 235);
+                background-color: rgb(45, 95, 245);
+                border: 1px solid rgb(51, 63, 104);
+				border-radius: 5px;
 				text-decoration: none;
 			}
 			
 			.ex_refresh a:hover {
 				color: rgb(255, 255, 255);
+                background-color: rgb(67, 111, 245);
 				text-decoration: none;
 			}

@ -167,8 +181,8 @@
                    
                    <?php foreach ($stacktrace as $item) { ?>
                        <div class="ex_trace_content_col_<?= (($tableswitch) ? '1' : '2') ?>">
-                            #<?= $stackcounter ?> <?= ((isset($item['file'])) ? $item['file'] : 'internal function') ?><?= (isset($item['line']) ? '(' . $item['line'] . ')' : '') ?>: <?= $item['function'] ?>
-                            <?php if (count($item['args']) > 0) { ?>
+                            #<?= $stackcounter ?> <?= ((isset($item['file'])) ? $item['file'] : 'internal function') ?><?= (isset($item['line']) ? '(' . $item['line'] . ')' : '') ?>: <?= isset($item['class']) ? $item['class'] . '::' : '' ?><?= $item['function'] ?>
+                            <?php if ((isset($item['args'])) && (count($item['args']) > 0)) { ?>
                                (
                                <?php $argcnt = 0; ?>
                                <?php foreach ($item['args'] as $key => $arg) { ?>
--- a/app/views/error/exception_prod.php
+++ b/app/views/error/exception_prod.php
@ -2,6 +2,7 @@
 <html>
    <head>
        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">

        <title>Asatru PHP - Error 500</title>

--- a/app/views/index.php
+++ b/app/views/index.php
@ -140,10 +140,28 @@ let widget = new SteamApp('#app-widget', {
 </div>
@endif

-<div><hr/></div>
+@if (!env('APP_ENABLEDONATION'))
+	<div><hr/></div>
+@endif

-<div class="content-section is-centered">
+<div class="content-section is-centered {{ (env('APP_ENABLEDONATION')) ? 'background-get-started' : '' }}">
 	<div class="is-sidepadding button-get-started fade fade-out">
 		<a href="{{ url('/documentation') }}">Get Started!</a>
 	</div>
-</div>
+</div>
+
+@if (env('APP_ENABLEDONATION'))
+	<div class="content-section is-centered">
+		<div class="is-sidepadding fade fade-out">
+			<h3>Your support is greatly appreciated</h3>
+
+			<p>
+				Your support helps to continue working on the project and providing the required infrastructure.
+			</p>
+
+			<p class="sponsoring">
+				<a href='https://ko-fi.com/C0C7V2ESD' target='_blank'><img height='36' style='border:0px;height:36px;' src='https://storage.ko-fi.com/cdn/kofi2.png?v=3' border='0' alt='Buy Me a Coffee at ko-fi.com' /></a>
+			</p>
+		</div>
+	</div>
+@endif
--- a/composer.lock
+++ b/composer.lock
--- a/doc/documentation.pdf
+++ b/doc/documentation.pdf
--- a/public/js/app.js
+++ b/public/js/app.js
Author	SHA1	Message	Date
Sophia Atkinson	28900e2788	Merge branch 'main' into main	2024-04-03 16:32:03 -07:00
Sophia Atkinson	ae7a4f2a36	fix for PR	2024-04-03 16:27:46 -07:00
Daniel Brendel	8c184046b4	Donation dependent style	2024-04-03 15:30:32 +02:00
Daniel Brendel	3ce1b5c1c0	Add to env	2024-04-03 15:25:51 +02:00
Daniel Brendel	a7c3a4cd0f	Resolves #22	2024-04-03 15:25:02 +02:00
Daniel Brendel	7bd96a7c4d	Resolves #21	2024-04-03 15:09:03 +02:00
Daniel Brendel	0cd71b7ee1	#21 Upgrade env	2024-04-03 15:05:02 +02:00
Daniel Brendel	6c3f82b2ab	Resolves #9	2024-04-03 15:02:05 +02:00
Daniel Brendel	cb5fc6c826	Resolves #23	2024-04-03 14:35:50 +02:00
Daniel Brendel	d85bb1073b	Resolves #10	2024-04-03 10:52:02 +02:00
Daniel Brendel	07d4ad4425	#19 Table border color	2024-04-03 02:25:41 +02:00
Daniel Brendel	3b2f71ae26	#19 hr color	2024-04-03 02:22:50 +02:00
Daniel Brendel	329e430cc1	#10 Upgrade package-lock.json version	2024-04-03 02:20:30 +02:00
Daniel Brendel	f9e2639be7	#14 Order	2024-04-03 02:12:50 +02:00
Daniel Brendel	56eec4c113	#14 Check before rendering	2024-04-03 02:12:03 +02:00
Daniel Brendel	bcc773aa67	#14 Proper wording	2024-04-03 02:09:03 +02:00
Daniel Brendel	af851fab96	Same here	2024-04-03 02:05:05 +02:00
Daniel Brendel	00cc24e0a6	Year	2024-04-03 02:04:50 +02:00
Daniel Brendel	f178a68304	Resolves #17	2024-04-03 02:04:25 +02:00
Daniel Brendel	d8c6d7adab	Add comment	2024-04-03 02:03:14 +02:00
Daniel Brendel	2716862285	Resolves #18	2024-04-03 02:02:50 +02:00