init

diff --git a/apps/PageHTMLPlugin.pm b/apps/PageHTMLPlugin.pm
index 382827750017437a2c37be8262fb804b73cae080..09c077ef31c18e828be0457c5781fe93b5b9bf3a 100755 (executable)
--- a/apps/PageHTMLPlugin.pm
+++ b/apps/PageHTMLPlugin.pm
@@ -1,7 +1,11 @@
 
 package PageHTMLPlugin;
 use lib::relative '.';
+<<<<<<< HEAD
 use PerlCNFWebServerBase;no warnings qw(experimental::signatures);
+=======
+use PerlCNFWebServerBase;
+>>>>>>> e9c13ae (init)
 
 
     

diff --git a/apps/PageletArticlePlugin.pm b/apps/PageletArticlePlugin.pm
index daa092cdfb9f730ce4e1bb248adfd189c8d300e1..8f5d3e76cdf4530f936cf58abbd16112b321805f 100755 (executable)
--- a/apps/PageletArticlePlugin.pm
+++ b/apps/PageletArticlePlugin.pm
@@ -1,5 +1,9 @@
 package PageletArticlePlugin;
+<<<<<<< HEAD
 use PluginBase;no warnings qw(experimental::signatures);
+=======
+use PluginBase;
+>>>>>>> e9c13ae (init)
 
     sub new { bless {params=>{}}, shift }
 

diff --git a/apps/PerlCNFWebServerBase.pm b/apps/PerlCNFWebServerBase.pm
index 3668edabc7dc6fe6630fb0796b7239b098def214..8cafa7f042d33c27b51844f6c29105805be59f45 100644 (file)
--- a/apps/PerlCNFWebServerBase.pm
+++ b/apps/PerlCNFWebServerBase.pm
@@ -1,7 +1,12 @@
 package PerlCNFWebServerBase;
+<<<<<<< HEAD
 use v5.34;
 use Syntax::Keyword::Try;
 no warnings qw(experimental::signatures);
+=======
+use v5.36; #For younger Perl rebases change only here version, and bellow line 23. And brace for warnings in logs.
+use Syntax::Keyword::Try; no warnings qw(experimental::signatures);
+>>>>>>> e9c13ae (init)
 use feature qw(signatures);
 use Exception::Class ('PageHTMLPluginException');
 use Module::Load;
@@ -21,7 +26,11 @@ package Pagelet {
 
 
 sub import {
+<<<<<<< HEAD
   feature->import(':5.34');
+=======
+  feature->import(':5.36');
+>>>>>>> e9c13ae (init)
   feature->import('signatures');
   warnings->import;
   strict->import;  
@@ -42,4 +51,8 @@ sub import {
 
 
 
+<<<<<<< HEAD
 1;
+=======
+1;
+>>>>>>> e9c13ae (init)

diff --git a/apps/app.cnf b/apps/app.cnf
index ff7a46d57132eeca5a289f5e177d1066137a2c11..1edc134818113dfca514473a63b17b5cfe87d8a7 100644 (file)
--- a/apps/app.cnf
+++ b/apps/app.cnf
@@ -1,5 +1,11 @@
 !CNF3.3
+<<<<<<< HEAD
 <<<CONST DEBUG=1>>>
+=======
+
+<<<CONST DEBUG=1>>>
+<<<INCLUDE  apps/app_defaults.cnf>>>
+>>>>>>> e9c13ae (init)
 <<property <VAR>
     Please <@< meta_1   >@>, this line is a paragraph.
     <@< dynamic_paragraphs >@>
@@ -19,8 +25,24 @@ meta __\
     @@ __\
         header __\
             link __|
+<<<<<<< HEAD
                 rel  = stylesheet
                 href = ../wsrc/app.css
+=======
+                rel  = manifest
+                href = manifest.json
+                __~
+            __/
+            link __|
+                rel  = stylesheet
+                href = ../web_sources/root.css
+                __~
+            __/
+            link __|
+                rel  = stylesheet
+                href = ../web_sources/app.css
+                __~
+>>>>>>> e9c13ae (init)
             __/
         __/
     __/
@@ -127,6 +149,12 @@ If not stays in macro format, like this -> [$$$[ This link doesn't exist ]$$$]
 
 <<GenericInstructionHandler<INSTRUCTOR>PROPERTY>>
 <<ArticleSample_CSS <PROPERTY>
+<<<<<<< HEAD
+=======
+
+
+
+>>>>>>> e9c13ae (init)
 .article{
     display: grid;
     grid-template-columns: .5fr 1fr;
@@ -137,7 +165,11 @@ If not stays in macro format, like this -> [$$$[ This link doesn't exist ]$$$]
 }
 .img{
     display: grid;
+<<<<<<< HEAD
     grid-template-columns: 1fr;    
+=======
+    grid-template-columns: 1fr;
+>>>>>>> e9c13ae (init)
     padding: 5px;
     # border: solid black 1px;
     min-width: min-content;
@@ -162,8 +194,59 @@ If not stays in macro format, like this -> [$$$[ This link doesn't exist ]$$$]
     }
 }
 
+<<<<<<< HEAD
+>>
+
+=======
+@layer base {
+
+        @media (width > 599px) {
+
+                .content>*:nth-child(1) {
+                    flex: 1 2 0;
+                    margin-left: .2rem;
+                }
+
+                .content>*:nth-child(2) {
+                    flex: 0 1 80%;
+                    text-align: justify;
+                    display: inline-block;
+                    overflow: scroll;
+                    border-radius: 10px;
+                }
+
+                .content>*:nth-child(3) {
+                    flex: 1 2 0;
+                    margin-left: .2rem;
+                    display: none;
+                }
+        }
+
+
+
+        @media (width > 1440px) {
+
+                .content>*:nth-child(1) {
+                    flex: 1 2 .1%;
+                    margin-left: .5rem;
+                }
+                .content>*:nth-child(2) {
+                    flex: 0 1 90%;
+                    margin-left: .1rem;
+                }
+                .content>*:nth-child(3) {
+                    flex: 1 2 18%;
+                    margin-left: .5rem;
+                    display: none;
+                }
+        }
+
+    }
+
 >>
 
+
+>>>>>>> e9c13ae (init)
 <<ArticleSample$$ <TREE> __IN_SHORTIFE__   __PRIORITY_2__
 article __\
                 img __\

diff --git a/apps/app.html b/apps/app.html
index 596d1f679c5b4669dd5679a08841b96320fe1c86..af1a7c48aea2658bde1c39918e2227dfe572f449 100644 (file)
--- a/apps/app.html
+++ b/apps/app.html
@@ -4,10 +4,18 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">    
     <meta name="description" content="">
+<<<<<<< HEAD
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <!--<@<  header  >@>-->
 <title><!--<@<  page_title  >@>--></title>
 </head>
+=======
+    <meta name="viewport" content="width=device-width, initial-scale=1">    
+    <!--<@<  header  >@>-->
+    <title><!--<@<  page_title  >@>--></title>
+</head>
+
+>>>>>>> e9c13ae (init)
 <body>
 <!--PerlCNF Template Start-->
 <style><!--<@< css_style   >@>--></style>
@@ -30,4 +38,8 @@
 </div>
 <!--PerlCNF Template End-->
 </body>
+<<<<<<< HEAD
+</html>
+=======
 </html>
+>>>>>>> e9c13ae (init)

diff --git a/apps/app_defaults.cnf b/apps/app_defaults.cnf
new file mode 100644 (file)
index 0000000..578d484
--- /dev/null
+++ b/apps/app_defaults.cnf
@@ -0,0 +1,5 @@
+!CNF3.3
+
+<<<CONST 
+APP_VERSION = 1.0 
+>>>
\ No newline at end of file

diff --git a/apps/main.html b/apps/main.html
new file mode 100644 (file)
index 0000000..2f2a4d8
--- /dev/null
+++ b/apps/main.html
@@ -0,0 +1,138 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="description" content="">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title><!--<@<  page_title  >@>--></title>
+    <link rel="manifest" href="apps/manifest.json" />
+    <link rel="stylesheet" href="../web_sources/root.css" />
+    <link rel="stylesheet" href="../web_sources/app.css" />
+</head>
+
+
+<style>
+
+
+
+.col_section {
+    display: grid;    
+    border: solid salmon 1px;
+    border-radius: 10px;
+    overflow-block: scroll;
+
+    align-content:  start;
+    align-items:  start;
+    justify-items:  start;
+    text-align:  start;
+
+}
+
+.content>*:nth-child(1) {
+    flex: 1 2 10%;
+    margin-left: .5rem;
+}
+
+.content>*:nth-child(2) {
+    flex: 0 1 85%;    
+    text-align: justify;
+    display: inline-block;
+    overflow: scroll;
+    border-radius: 10px;
+}
+
+.content>*:nth-child(3) {
+    flex: 1 2 10%;
+    margin-left: .5rem;
+    /* display: none; */
+}
+
+</style>
+
+<body>
+    <!--PerlCNF Template Start-->
+    <div class="content">
+        <div class="col" role="navigation">
+            <div class="toc"><strong>TOC</strong>&nbsp;&nbsp;
+                <span class="scrolling">
+                    <!--<@< col_left   >@>-->
+                    PerlCNFWebServer
+                </span>
+            </div>
+        </div>
+        <div class="col_main" role="main">
+            <!--<@< col_main   >@>-->
+            <h1>Main</h1>
+            <p>Main paragraph sample text.</p>
+            <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit.
+                Facilis perferendis eius fuga dignissimos tempore repellendus aliquid eligendi iste, esse a quidem cum
+                totam deserunt
+                harum accusantium modi similique officiis? Nemo?</p>
+            <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Accusamus repudiandae, saepe, veritatis eveniet repellat qui ipsa quas possimus iure quae illo! Tenetur libero error dicta non illo, sint porro nihil?</p>
+            <div class="col_section">
+                <h2>Test</h2>
+                <div>
+                    <h3>Lorem I</h3>
+                    <p>Lorem ipsum, dolor sit amet consectetur adipisicing elit. Iure, sint facere officia aliquid iste amet vel
+                        iusto nulla tenetur error porro modi voluptatum reprehenderit! Maiores quidem debitis ex consequuntur
+                        aspernatur?</p>
+                </div>
+
+                <div>
+                    <h3>Lorem II</h3>
+                    <p>Lorem ipsum, dolor sit amet consectetur adipisicing elit. Iure, sint facere officia aliquid iste amet vel
+                        iusto nulla tenetur error porro modi voluptatum reprehenderit! Maiores quidem debitis ex consequuntur
+                        aspernatur?</p>
+
+                    <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Ab similique quisquam distinctio ut nemo
+                        culpa, esse fuga fugit eveniet sint, illum provident consequuntur expedita voluptate veritatis, tenetur quod
+                        delectus error?</p>
+                </div>
+
+                <div>
+                    <h3>Lorem III</h3>
+                    <p>Lorem ipsum, dolor sit amet consectetur adipisicing elit. Iure, sint facere officia aliquid iste amet vel
+                        iusto nulla tenetur error porro modi voluptatum reprehenderit! Maiores quidem debitis ex consequuntur
+                        aspernatur?</p>
+
+                    <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Ab similique quisquam distinctio ut nemo
+                        culpa, esse fuga fugit eveniet sint, illum provident consequuntur expedita voluptate veritatis, tenetur quod
+                        delectus error?</p>
+                        <p>Lorem ipsum, dolor sit amet consectetur adipisicing elit. Fuga maiores eveniet quaerat maxime aspernatur mollitia
+                            modi itaque dolore quis nihil! Hic facilis eum laborum ipsam fugiat reiciendis sunt odio ratione?</p>
+                        <p>Lorem ipsum, dolor sit amet consectetur adipisicing elit. Fuga maiores eveniet quaerat maxime aspernatur mollitia
+                            modi itaque dolore quis nihil! Hic facilis eum laborum ipsam fugiat reiciendis sunt odio ratione?</p>
+                        <p>Lorem ipsum, dolor sit amet consectetur adipisicing elit. Fuga maiores eveniet quaerat maxime aspernatur mollitia
+                            modi itaque dolore quis nihil! Hic facilis eum laborum ipsam fugiat reiciendis sunt odio ratione?</p>
+                        <p>Lorem ipsum, dolor sit amet consectetur adipisicing elit. Fuga maiores eveniet quaerat maxime aspernatur mollitia
+                            modi itaque dolore quis nihil! Hic facilis eum laborum ipsam fugiat reiciendis sunt odio ratione?</p>
+
+                </div>
+            </div>
+
+            <div class="col_section">
+                <h2>Test</h2>
+                <div>
+                    <h3>Lorem II</h3>
+                    <p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Repellat vero accusantium at illo accusamus molestiae
+                        numquam eos optio odio quasi esse placeat eveniet, maxime deleniti vel earum mollitia rem quod?</p>
+                </div>
+            </div>
+                
+
+
+
+        </div>
+        
+        <div class="col" role="contentinfo">
+            <!--<@< col_right   >@>-->
+            <p>Right Column!</p>
+        </div>
+    </div>
+    <!--PerlCNF Template End-->
+  
+</body>
+
+</html>
\ No newline at end of file

diff --git a/apps/manifest.json b/apps/manifest.json
new file mode 100644 (file)
index 0000000..cc9af22
--- /dev/null
+++ b/apps/manifest.json
@@ -0,0 +1,21 @@
+{
+    "short_name": "PerlCNFWEB",
+    "name": "PerlCNFWEBServer App",
+    "icons": [
+      {
+        "src": "images/favicons/PerlCNFEagle_192x192.png",
+        "sizes": "192x192",
+        "type": "image/png"
+      },
+      {
+        "src": "images/favicons/PerlCNFEagle_512x512.png",
+        "sizes": "512x512",
+        "type": "image/png"
+      }
+    ],
+    "start_url": ".",
+    "display": "standalone",
+    "theme_color": "#000000",
+    "background_color": "#ffffff"
+  }
+  
\ No newline at end of file

diff --git a/system b/system
new file mode 120000 (symlink)
index 0000000..5aa7dad
--- /dev/null
+++ b/system
@@ -0,0 +1 @@
+/home/will/dev_new/PerlCNF/system/
\ No newline at end of file

diff --git a/wsrc b/wsrc
new file mode 120000 (symlink)
index 0000000..3f0af37
--- /dev/null
+++ b/wsrc
@@ -0,0 +1 @@
+/home/will/dev_new/LifeLog/htdocs/cgi-bin/wsrc/
\ No newline at end of file