diff --git a/.gitmodules b/.gitmodules index 4ad3741..9dbf9fe 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "app/web/Resources"] path = app/web/Resources url = https://github.com/Karaka-Management/Resources.git +[submodule "app/web/cssOMS"] + path = app/web/cssOMS + url = https://github.com/Karaka-Management/cssOMS.git diff --git a/app/server/CMakeLists.txt b/app/server/CMakeLists.txt index f150823..bcdb62e 100644 --- a/app/server/CMakeLists.txt +++ b/app/server/CMakeLists.txt @@ -7,5 +7,8 @@ include_directories( /usr/include ) link_directories( /usr/lib ) target_link_libraries( OnlineResourceWatcherServerApp sqlite3 ) +# Libcurl +target_link_libraries( OnlineResourceWatcherServerApp libcurl ) + # cmake -DCMAKE_BUILD_TYPE=Debug -DOMS_DEBUG=true # cmake -DCMAKE_BUILD_TYPE=Release -DOMS_DEMO=true \ No newline at end of file diff --git a/app/server/cOMS b/app/server/cOMS index 24cf23f..9c0859d 160000 --- a/app/server/cOMS +++ b/app/server/cOMS @@ -1 +1 @@ -Subproject commit 24cf23f026e675c2a087d081d496794d42653466 +Subproject commit 9c0859daffb80abc7bc62c28697c47d22b5ba5ed diff --git a/app/web/.htaccess b/app/web/.htaccess new file mode 100644 index 0000000..447213c --- /dev/null +++ b/app/web/.htaccess @@ -0,0 +1,107 @@ +# BEGIN Gzip Compression + + AddEncoding gzip .gz + + AddType "text/javascript" .gz + + + AddType "text/css" .gz + + + +AddType font/ttf .ttf +AddType font/otf .otf +AddType application/font-woff .woff +AddType application/vnd.ms-fontobject .eot + + + AddOutputFilterByType DEFLATE text/text text/html text/plain text/xml text/css application/x-javascript application/javascript text/javascript + +# END Gzip Compression + +# Force mime for javascript files + + ForceType text/javascript + + +# BEGIN Caching + + ExpiresActive On + ExpiresDefault A300 + + ExpiresByType image/x-icon A2592000 + + + ExpiresDefault A0 + Header set Cache-Control "no-store, no-cache, must-revalidate, max-age=0" + Header set Pragma "no-cache" + + +# END Caching + +# BEGIN Spelling + + CheckSpelling On + CheckCaseOnly On + +# END Spelling + +# BEGIN URL rewrite + + RewriteEngine On + RewriteBase / + RewriteCond %{HTTP:Accept-encoding} gzip + RewriteCond %{REQUEST_FILENAME} \.(js|css)$ + RewriteCond %{REQUEST_FILENAME}.gz -f + RewriteRule ^(.*)$ $1.gz [QSA,L] + RewriteCond %{REQUEST_FILENAME} !-d + RewriteCond %{REQUEST_FILENAME} !-f + RewriteRule ^(.*)$ /?{QUERY_STRING} [QSA] + RewriteCond %{HTTPS} !on + RewriteCond %{HTTP_HOST} !^(127\.0\.0)|(192\.)|(172\.) + RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} + +# END URL rewrite + +# BEGIN Access control + + Order Deny,Allow + Deny from all + Allow from 127.0.0.1 + + + Allow from all + +# END Access control + +# Disable directory view +Options All -Indexes + +# Disable unsupported scripts +Options -ExecCGI +AddHandler cgi-script .pl .py .jsp .asp .shtml .sh .cgi + +# +# # XSS protection +# header always set x-xss-protection "1; mode=block" +# +# # Nosnif +# header always set x-content-type-options "nosniff" +# +# # Iframes only from self +# header always set x-frame-options "SAMEORIGIN" +# + + + + Header set Service-Worker-Allowed "/" + + + +# Php config +# This should be removed from here and adjusted in the php.ini file +php_value upload_max_filesize 40M +php_value post_max_size 40M +php_value memory_limit 128M +php_value max_input_time 30 +php_value max_execution_time 30 \ No newline at end of file diff --git a/app/web/Install/self/index.tpl.php b/app/web/Install/self/index.tpl.php new file mode 100644 index 0000000..e69de29 diff --git a/app/web/cssOMS b/app/web/cssOMS new file mode 160000 index 0000000..a4c1e7e --- /dev/null +++ b/app/web/cssOMS @@ -0,0 +1 @@ +Subproject commit a4c1e7e8b2def04fb761027de2d8473cbe38850b diff --git a/app/web/tpl/landing/footer.tpl.php b/app/web/tpl/landing/footer.tpl.php new file mode 100644 index 0000000..4776699 --- /dev/null +++ b/app/web/tpl/landing/footer.tpl.php @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/app/web/tpl/landing/header.tpl.php b/app/web/tpl/landing/header.tpl.php new file mode 100644 index 0000000..2c5dc01 --- /dev/null +++ b/app/web/tpl/landing/header.tpl.php @@ -0,0 +1,15 @@ + \ No newline at end of file