Merge branch 'master' of github.com:fykosak/webs

fykosak · Nov 18, 2023 · 1ae2a7c · 1ae2a7c
2 parents f08b451 + 6d5dc3e
commit 1ae2a7c
Show file tree

Hide file tree

Showing 12 changed files with 111 additions and 24 deletions.
diff --git a/.github/workflows/php-psr.yml b/.github/workflows/php-psr.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.4' , '8.0' , '8.1']
+        php: [ '8.1' ]
     steps:
       - uses: actions/checkout@v2
         name: Checkout

diff --git a/.github/workflows/php-stan.yml b/.github/workflows/php-stan.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['7.4' , '8.0' , '8.1']
+        php: [ '8.1' ]
     steps:
       - uses: actions/checkout@v2
         name: Checkout

diff --git a/app/Modules/Fof/ArchiveModule/ErasmusPresenter.php b/app/Modules/Fof/ArchiveModule/ErasmusPresenter.php
@@ -8,25 +8,23 @@
 use Nette\Application\BadRequestException;
 use Nette\Http\IResponse;
 
-
 class ErasmusPresenter extends BasePresenter
-{   
-
+{
     /**
      * @throws BadRequestException
      * @throws \Throwable
      */
 
-     public function startup(): void
+    public function startUp(): void
     {
-        parent::startup();
+        parent::startUp();
 
         // Check if it is the correct event year, otherwise throw 404
         if ($this->eventYear !== '2022') {
             throw new BadRequestException('Event not found', IResponse::S404_NOT_FOUND);
         }
     }
-    
+
     protected function createComponentGallery(): ImageGalleryControl
     {
         return new ImageGalleryControl($this->context);

diff --git a/app/Modules/Fof/ArchiveModule/SchedulePresenter.php b/app/Modules/Fof/ArchiveModule/SchedulePresenter.php
@@ -7,26 +7,21 @@
 use Nette\Application\BadRequestException;
 use Nette\Http\IResponse;
 
-
-
-use Fykosak\NetteFKSDBDownloader\ORM\Services\ServiceEventDetail;
-
 class SchedulePresenter extends BasePresenter
-{   
-    
+{
+
     /**
      * @throws BadRequestException
      * @throws \Throwable
      */
 
-     public function startup(): void
+    public function startUp(): void
     {
-        parent::startup();
+        parent::startUp();
 
         // Check if it is the correct event year, otherwise throw 404
         if ($this->eventYear !== '2023') {
             throw new BadRequestException('Event not found', IResponse::S404_NOT_FOUND);
         }
     }
-
 }
diff --git a/app/Modules/Fof/Core/templates/@layout.latte b/app/Modules/Fof/Core/templates/@layout.latte
@@ -100,6 +100,9 @@
                         <a href="https://www.msmt.cz/" style="text-align: center">
                             <img src="{$basePath}/images/logos/msmt_cs.jpg" alt="MŠMT logo" style="max-width: 9rem">
                         </a>
+                        <a href="https://www.fykos.cz/" style="text-align: center">
+                            <img src="{$basePath}/images/logos/fykos_logo.png" alt="logo FYKOSu" style="max-width: 9rem">
+                        </a>
                     </div>
                 </div>
                 {* <div class="category">
@@ -236,8 +239,6 @@
                             {/switch}
                         </ul>
                     </nav>
-                </div>
-                <div class="col-md-3">
                     <nav>
                         <ul>
                             {switch $lang}
@@ -260,6 +261,30 @@
                             {/switch}
                         </ul>
                     </nav>
+
+                </div>
+                <div class="col-md-3">
+                    <nav>
+                        <ul>
+                            {switch $lang}
+                                {case cs}
+                                <li>Zustňme v kontaktu
+                                {default}
+                                <li>Follow us on social media
+                            {/switch}
+                            <ul>
+                                <li>
+                                    <a class="social-sites" href="https://www.facebook.com/FYKOS">
+                                    <i class="fa fa-facebook fa-2x"></i>
+                                    </a>
+                                    <a class="social-sites" href="https://www.instagram.com/fykosak/">
+                                    <i class="fa fa-instagram fa-2x"></i>
+                                    </a>
+                                </li>
+                            </ul>
+                            </li>
+                        </ul>
+                    </nav>
                 </div>
             </div>
         </div>

diff --git a/app/Modules/Fol/Core/styles/titlepage.scss b/app/Modules/Fol/Core/styles/titlepage.scss
@@ -77,6 +77,18 @@
   }
 }
 
+.factorio-box {
+  background-color: #222222;
+  background-image: url("https://cdn.factorio.com/assets/img/artwork/substation.png");
+  background-repeat: no-repeat;
+  background-size: 110%;
+  background-position: center;
+
+  &:hover {
+    background-size: 110%*1.1;
+  }
+}
+
 .mathematica-box {
   background-color: #222222;
   background-image: url("wolfram.png");
@@ -230,4 +242,8 @@
   }
 }
 
+.social-sites{
+  margin-right: 1.5rem
+}
+
 @import "../../DefaultModule/styles/legends";
diff --git a/app/Modules/Fol/Core/templates/@layout.latte b/app/Modules/Fol/Core/templates/@layout.latte
@@ -116,6 +116,9 @@
                         <a href="https://www.msmt.cz/" style="text-align: center">
                             <img src="{$basePath}/images/logos/msmt_cs.jpg" alt="MŠMT logo" style="max-width: 9rem">
                         </a>
+                        <a href="https://www.fykos.cz/" style="text-align: center">
+                            <img src="{$basePath}/images/logos/fykos_logo.png" alt="logo FYKOSu" style="max-width: 9rem">
+                        </a>
                     </div>
                 </div>
                 <div class="category">
@@ -204,6 +207,31 @@
                         </ul>
                     </nav>
                 </div>
+                <div class="col-md-3">
+                    <nav>
+                        <ul>
+                            {switch $lang}
+                                {case cs}
+                                <li>Zustňme v kontaktu
+                                {default}
+                                <li>Follow us on social media
+                            {/switch}
+                            <ul>
+                                <li>
+                                    <a class="social-sites" href="https://www.facebook.com/FYKOS">
+                                    <i class="fa fa-facebook fa-2x"></i>
+                                    </a>
+                                    <a class="social-sites" href="https://www.instagram.com/fykosak/">
+                                    <i class="fa fa-instagram fa-2x"></i>
+                                    </a>
+                                </li>
+                            </ul>
+                            </li>
+                        </ul>
+                    </nav>
+                </div>
+
+
                 {*<div class="col-md-3">
                     <nav>
                         <ul>

diff --git a/app/Modules/Fol/DefaultModule/templates/Default/default.latte b/app/Modules/Fol/DefaultModule/templates/Default/default.latte
@@ -206,9 +206,15 @@
                 {default}We have rewards for the best of you.{/switch}</h1>
             <div class="row prices">
                 <div class="col-md-4">
+                    {switch $lang}{case cs}
                     <div class="price-box propagacni-box small">
-                        {switch $lang}{case cs}FYKOSí lahve,<br/>trička a mikiny{default}Bottles<br/>and towels {/switch}
+                        FYKOSí lahve,<br/>trička a mikiny
                     </div>
+                    {default}
+                    <a class="price-box factorio-box small" href="https://www.factorio.com/">
+                        Factorio license
+                    </a>
+                    {/switch}
 
                     {switch $lang}
                         {case cs}

diff --git a/app/Modules/Fykos/Core/templates/@layout.latte b/app/Modules/Fykos/Core/templates/@layout.latte
@@ -131,6 +131,29 @@
                                 style="max-height: 2rem; margin: 0 1rem 1rem 0" /></a>{/if}
                     </div>
                 </div>
+                <div class="col-md-3">
+                    <nav>
+                        <ul>
+                            {switch $lang}
+                                {case cs}
+                                <li>Zustňme v kontaktu
+                                {default}
+                                <li>Follow us on social media
+                            {/switch}
+                            <ul>
+                                <li>
+                                    <a class="social-sites" href="https://www.facebook.com/FYKOS">
+                                    <i class="fa fa-facebook fa-2x"></i>
+                                    </a>
+                                    <a class="social-sites" href="https://www.instagram.com/fykosak/">
+                                    <i class="fa fa-instagram fa-2x"></i>
+                                    </a>
+                                </li>
+                            </ul>
+                            </li>
+                        </ul>
+                    </nav>
+                </div>
             </div>
         </div>
     </footer>

diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
@@ -54,9 +54,5 @@ public static function boot(string $moduleName): Configurator
 /* @phpstan-ignore-next-line */
 $configurator = Bootstrap::boot(MODULE_NAME);
 $container = $configurator->createContainer();
-
-/* Always acquire locks in the order as below! */
-const LOCK_DB = __DIR__ . '/tmp/database.lock';
-const LOCK_UPLOAD = __DIR__ . '/tmp/upload.lock';
 return $container;
 // phpcs:enable
diff --git a/www/fof/images/logos/fykos_logo.png b/www/fof/images/logos/fykos_logo.png
diff --git a/www/fol/images/logos/fykos_logo.png b/www/fol/images/logos/fykos_logo.png