franzz/spot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert changes on MainAppPage: splitting getParams

Browse Source
This commit is contained in:
Franzz
2023-11-19 18:10:00 +01:00
parent f5d193e42b
commit 828d32b0ef
3 changed files with 29 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build/webpack.common.js
View File

@@ -86,6 +86,9 @@ module.exports = {
}, { }, {
from: path.resolve(LIB, 'index.php'), from: path.resolve(LIB, 'index.php'),
to: 'index.php' to: 'index.php'
}, {
from: path.resolve(SRC, 'images/icons'),
to: 'images/icons'
}] }]
}), }),
new SymlinkWebpackPlugin({ origin: '../files/', symlink: 'files' }), new SymlinkWebpackPlugin({ origin: '../files/', symlink: 'files' }),
@@ -96,8 +99,6 @@ module.exports = {
alias: { alias: {
"@scripts": path.resolve(SRC, "scripts"), "@scripts": path.resolve(SRC, "scripts"),
'load-image': 'blueimp-load-image/js/load-image.js', 'load-image': 'blueimp-load-image/js/load-image.js',
//'load-image-orientation': 'blueimp-load-image/js/load-image-orientation.js',
//'load-image-scale': 'blueimp-load-image/js/load-image-scale.js',
'load-image-meta': 'blueimp-load-image/js/load-image-meta.js', 'load-image-meta': 'blueimp-load-image/js/load-image-meta.js',
'load-image-exif': 'blueimp-load-image/js/load-image-exif.js', 'load-image-exif': 'blueimp-load-image/js/load-image-exif.js',
'canvas-to-blob': 'blueimp-canvas-to-blob/js/canvas-to-blob.js', 'canvas-to-blob': 'blueimp-canvas-to-blob/js/canvas-to-blob.js',

20
lib/Spot.php
View File

@@ -162,7 +162,7 @@ class Spot extends Main
); );
} }
public function getAppParams($bInternal=false) { public function getAppMainPage() {
//Cache Page List //Cache Page List
$asPages = array_diff($this->asMasks, array('email_update', 'email_conf')); $asPages = array_diff($this->asMasks, array('email_update', 'email_conf'));
@@ -170,7 +170,8 @@ class Spot extends Main
$asPages = array_diff($asPages, array('admin', 'upload')); $asPages = array_diff($asPages, array('admin', 'upload'));
} }
$asGlobalVars = array( return parent::getMainPage(
array(
'vars' => array( 'vars' => array(
'chunk_size' => self::FEED_CHUNK_SIZE, 'chunk_size' => self::FEED_CHUNK_SIZE,
'default_project_codename' => $this->oProject->getProjectCodeName(), 'default_project_codename' => $this->oProject->getProjectCodeName(),
@@ -182,23 +183,14 @@ class Spot extends Main
'clearances' => User::CLEARANCES, 'clearances' => User::CLEARANCES,
'default_timezone' => Settings::TIMEZONE 'default_timezone' => Settings::TIMEZONE
) )
); ),
$asParams = parent::getParams($asGlobalVars, self::MAIN_PAGE, $asPages);
return $bInternal?$asParams:self::getJsonResult(true, '', $asParams);
}
public function getAppMainPage()
{
return parent::getMainPage(
self::MAIN_PAGE, self::MAIN_PAGE,
array( array(
'language' => $this->oLang->getLanguage(), 'language' => $this->oLang->getLanguage(),
'host_url' => $this->asContext['serv_name'],
'filepath_css' => self::addTimestampToFilePath('spot.css'), 'filepath_css' => self::addTimestampToFilePath('spot.css'),
'filepath_js' => self::addTimestampToFilePath('../dist/app.js'), 'filepath_js' => self::addTimestampToFilePath('../dist/app.js'),
'params' => json_encode($this->getAppParams(true)) ),
) $asPages
); );
} }

20
src/masks/index.html
View File

@@ -7,19 +7,19 @@
<meta property="og:title" content="Spotty" /> <meta property="og:title" content="Spotty" />
<meta property="og:description" content="[#]lang:page_og_desc[#]" /> <meta property="og:description" content="[#]lang:page_og_desc[#]" />
<meta property="og:type" content="website" /> <meta property="og:type" content="website" />
<meta property="og:url" content="[#]host_url[#]" /> <meta property="og:url" content="[#]server[#]" />
<meta property="og:image" content="../src/images/ogp.png" /> <meta property="og:image" content="images/ogp.png" />
<meta property="og:locale" content="[#]lang:locale[#]" /> <meta property="og:locale" content="[#]lang:locale[#]" />
<link rel="apple-touch-icon" sizes="180x180" href="../src/images/icons/apple-touch-icon.png?v=GvmqYyKwbb"> <link rel="apple-touch-icon" sizes="180x180" href="images/icons/apple-touch-icon.png?v=GvmqYyKwbb">
<link rel="icon" type="image/png" sizes="32x32" href="../src/images/icons/favicon-32x32.png?v=GvmqYyKwbb"> <link rel="icon" type="image/png" sizes="32x32" href="images/icons/favicon-32x32.png?v=GvmqYyKwbb">
<link rel="icon" type="image/png" sizes="16x16" href="../src/images/icons/favicon-16x16.png?v=GvmqYyKwbb"> <link rel="icon" type="image/png" sizes="16x16" href="images/icons/favicon-16x16.png?v=GvmqYyKwbb">
<link rel="manifest" href="../src/images/icons/site.webmanifest?v=GvmqYyKwbb"> <link rel="manifest" href="images/icons/site.webmanifest?v=GvmqYyKwbb">
<link rel="mask-icon" href="../src/images/icons/safari-pinned-tab.svg?v=GvmqYyKwbb" color="#44d15a"> <link rel="mask-icon" href="images/icons/safari-pinned-tab.svg?v=GvmqYyKwbb" color="#44d15a">
<link rel="shortcut icon" href="../src/images/icons/favicon.ico?v=GvmqYyKwbb"> <link rel="shortcut icon" href="images/icons/favicon.ico?v=GvmqYyKwbb">
<meta name="msapplication-TileColor" content="#00a300"> <meta name="msapplication-TileColor" content="#00a300">
<meta name="msapplication-config" content="../src/images/icons/browserconfig.xml?v=GvmqYyKwbb"> <meta name="msapplication-config" content="images/icons/browserconfig.xml?v=GvmqYyKwbb">
<meta name="theme-color" content="#ffffff"> <meta name="theme-color" content="#ffffff">
<script type="text/javascript">window.params = [#]params[#];</script> <script type="text/javascript">window.params = [#]GLOBAL_VARS[#];</script>
<script type="text/javascript" src="[#]filepath_js[#]"></script> <script type="text/javascript" src="[#]filepath_js[#]"></script>
<title>Spotty</title> <title>Spotty</title>
</head> </head>