move resources around

src/engine/lang/Strings.php

@@ -42,7 +42,7 @@ class Strings extends StringsBase
      * @return array<string,string|string[]>|StringsPack 
      */
     public static function getStringsPack(string $name, bool $raw = false): array|StringsPack {
-        $file = APP_ROOT.'/src/strings/'.$name.'.yaml';
+        $file = APP_ROOT.'/resources/strings/'.$name.'.yaml';
         $data = yaml_parse_file($file);
         if ($data === false)
             logError(__METHOD__.': yaml_parse_file failed on file '.$file);

src/engine/skin/ErrorSkin.php

@@ -8,7 +8,7 @@ use Twig\Loader\LoaderInterface;
 class ErrorSkin
     extends BaseSkin
 {
-    const string TEMPLATES_ROOT = APP_ROOT.'/src/skins/error';
+    const string TEMPLATES_ROOT = APP_ROOT.'/resources/skins/error';
 
     protected function getTwigLoader(): LoaderInterface {
         return new FilesystemLoader(self::TEMPLATES_ROOT, APP_ROOT);

src/engine/skin/FeaturedSkin.php

@@ -73,7 +73,7 @@ abstract class FeaturedSkin
         $h = $this->svgDefs[$name]['height'];
         if ($in_place) {
             $svg = '<svg id="svgicon_'.$name.'" width="'.$w.'" height="'.$h.'" fill="currentColor" viewBox="0 0 '.$w.' '.$h.'">';
-            $svg .= file_get_contents(APP_ROOT.'/src/skins/svg/'.$name.'.svg');
+            $svg .= file_get_contents(APP_ROOT.'/resources/skins/svg/'.$name.'.svg');
             $svg .= '</svg>';
             return $svg;
         } else {
@@ -179,7 +179,7 @@ HTML;
     protected function getSVGTags(): string {
         $buf = '<svg style="display: none">';
         foreach ($this->svgDefs as $name => $icon) {
-            $content = file_get_contents(APP_ROOT.'/src/skins/svg/'.$name.'.svg');
+            $content = file_get_contents(APP_ROOT.'/resources/skins/svg/'.$name.'.svg');
             $buf .= "<symbol id=\"svgicon_{$name}\" viewBox=\"0 0 {$icon['width']} {$icon['height']}\" fill=\"currentColor\">$content</symbol>";
         }
         $buf .= '</svg>';

src/handlers/ic/MainHandler.php

@@ -24,7 +24,7 @@ class MainHandler
     }
 
     public function GET_books() {
-        $html = MarkupUtil::markdownToHtml(file_get_contents(APP_ROOT.'/data/ic_books.md'));
+        $html = MarkupUtil::markdownToHtml(file_get_contents(APP_ROOT.'/resources/data/ic_books.md'));
         $this->skin->title = lang('books');
         $this->skin->options->headSection = 'books';
         $this->skin->set(['html' => $html]);;

src/lib/foreignone/ForeignOneSkin.php

@@ -32,7 +32,7 @@ class ForeignOneSkin
     }
 
     protected function getTwigLoader(): LoaderInterface {
-        $twig_loader = new FilesystemLoader(APP_ROOT.'/src/skins/foreignone', APP_ROOT);
+        $twig_loader = new FilesystemLoader(APP_ROOT.'/resources/skins/foreignone', APP_ROOT);
         // $twig_loader->addPath(APP_ROOT.'/htdocs/svg', 'svg');
         return $twig_loader;
     }

src/lib/ic/InvisibleCollegeSkin.php

@@ -31,8 +31,8 @@ class InvisibleCollegeSkin
     }
 
     protected function getTwigLoader(): LoaderInterface {
-        $twig_loader = new FilesystemLoader(APP_ROOT.'/src/skins/ic', APP_ROOT);
+        $twig_loader = new FilesystemLoader(APP_ROOT.'/resources/skins/ic', APP_ROOT);
-        $twig_loader->addPath(APP_ROOT.'/src/skins/foreignone', 'foreignone');
+        $twig_loader->addPath(APP_ROOT.'/resources/skins/foreignone', 'foreignone');
         return $twig_loader;
     }
 

src/lib/ic/TZO.php

@@ -9,7 +9,7 @@ class TZO
     public static function getStrings(): array {
         static $strings;
         if ($strings === null)
-            $strings = yaml_parse_file(APP_ROOT.'/data/tzo/info.yaml');
+            $strings = yaml_parse_file(APP_ROOT.'/resources/data/tzo/info.yaml');
         return $strings;
     }
 

src/lib/ic/TZOPart.php

@@ -63,7 +63,7 @@ class TZOPart
         if ($this->html !== null)
             return $this->html;
 
-        $markdown_file = APP_ROOT.'/data/tzo/'.($this->appendix ? 'appendix' : $this->part).'.md';
+        $markdown_file = APP_ROOT.'/resources/data/tzo/'.($this->appendix ? 'appendix' : $this->part).'.md';
         $md = file_get_contents($markdown_file);
 
         // images

src/lib/omnia/OmniaSkin.php

@@ -30,7 +30,7 @@ class OmniaSkin
     }
 
     protected function getTwigLoader(): LoaderInterface {
-        $twig_loader = new FilesystemLoader(APP_ROOT.'/src/skins/omnia', APP_ROOT);
+        $twig_loader = new FilesystemLoader(APP_ROOT.'/resources/skins/omnia', APP_ROOT);
         return $twig_loader;
     }