"+e+"
",className:"marker-cluster"+i,iconSize:new L.Point(40,40)})},_bindEvents:function(){var t=this._map,e=this.options.spiderfyOnMaxZoom,i=this.options.showCoverageOnHover,n=this.options.zoomToBoundsOnClick;(e||n)&&this.on("clusterclick",this._zoomOrSpiderfy,this),i&&(this.on("clustermouseover",this._showCoverage,this),this.on("clustermouseout",this._hideCoverage,this),t.on("zoomend",this._hideCoverage,this))},_zoomOrSpiderfy:function(t){var e=this._map;e.getMaxZoom()===e.getZoom()?this.options.spiderfyOnMaxZoom&&t.layer.spiderfy():this.options.zoomToBoundsOnClick&&t.layer.zoomToBounds(),t.originalEvent&&13===t.originalEvent.keyCode&&e._container.focus()},_showCoverage:function(t){var e=this._map;this._inZoomAnimation||(this._shownPolygon&&e.removeLayer(this._shownPolygon),t.layer.getChildCount()>2&&t.layer!==this._spiderfied&&(this._shownPolygon=new L.Polygon(t.layer.getConvexHull(),this.options.polygonOptions),e.addLayer(this._shownPolygon)))},_hideCoverage:function(){this._shownPolygon&&(this._map.removeLayer(this._shownPolygon),this._shownPolygon=null)},_unbindEvents:function(){var t=this.options.spiderfyOnMaxZoom,e=this.options.showCoverageOnHover,i=this.options.zoomToBoundsOnClick,n=this._map;(t||i)&&this.off("clusterclick",this._zoomOrSpiderfy,this),e&&(this.off("clustermouseover",this._showCoverage,this),this.off("clustermouseout",this._hideCoverage,this),n.off("zoomend",this._hideCoverage,this))},_zoomEnd:function(){this._map&&(this._mergeSplitClusters(),this._zoom=this._map._zoom,this._currentShownBounds=this._getExpandedVisibleBounds())},_moveEnd:function(){if(!this._inZoomAnimation){var t=this._getExpandedVisibleBounds();this._topClusterLevel._recursivelyRemoveChildrenFromMap(this._currentShownBounds,this._zoom,t),this._topClusterLevel._recursivelyAddChildrenToMap(null,this._map._zoom,t),this._currentShownBounds=t}},_generateInitialClusters:function(){var t=this._map.getMaxZoom(),e=this.options.maxClusterRadius,i=e;"function"!=typeof e&&(i=function(){return e}),this.options.disableClusteringAtZoom&&(t=this.options.disableClusteringAtZoom-1),this._maxZoom=t,this._gridClusters={},this._gridUnclustered={};for(var n=t;n>=0;n--)this._gridClusters[n]=new L.DistanceGrid(i(n)),this._gridUnclustered[n]=new L.DistanceGrid(i(n));this._topClusterLevel=new L.MarkerCluster(this,-1)},_addLayer:function(t,e){var i,n,s=this._gridClusters,r=this._gridUnclustered;for(this.options.singleMarkerMode&&(t.options.icon=this.options.iconCreateFunction({getChildCount:function(){return 1},getAllChildMarkers:function(){return[t]}}));e>=0;e--){i=this._map.project(t.getLatLng(),e);var o=s[e].getNearObject(i);if(o)return o._addChild(t),t.__parent=o,void 0;if(o=r[e].getNearObject(i)){var a=o.__parent;a&&this._removeLayer(o,!1);var h=new L.MarkerCluster(this,e,o,t);s[e].addObject(h,this._map.project(h._cLatLng,e)),o.__parent=h,t.__parent=h;var _=h;for(n=e-1;n>a._zoom;n--)_=new L.MarkerCluster(this,n,_),s[n].addObject(_,this._map.project(o.getLatLng(),n));for(a._addChild(_),n=e;n>=0&&r[n].removeObject(o,this._map.project(o.getLatLng(),n));n--);return}r[e].addObject(t,i)}this._topClusterLevel._addChild(t),t.__parent=this._topClusterLevel},_enqueue:function(t){this._queue.push(t),this._queueTimeout||(this._queueTimeout=setTimeout(L.bind(this._processQueue,this),300))},_processQueue:function(){for(var t=0;t{itemsList}
);
69 | }
70 |
71 | renderFolderItem (folderId, item) {
72 | return(- {listItems}
" + t('photomap', 'You have not added photos yet?') + "
" + 137 | ""+ t('photomap', 'Add photos to the cloud. Photos containing data about the geographical location will be automatically pinned to the map.') + "
" + 138 | ""+ t('photomap', 'If photos already are in cloud, You can pin them to the map using command {command}', {"command" : "occ photoMap:rescanPhotos"}, undefined, {escape: false}) + "
"; 139 | this.showPopup(latlng, message); 140 | } 141 | 142 | showPopup(latlng, message) { 143 | L.popup() 144 | .setLatLng(latlng) 145 | .setContent(message) 146 | .openOn(this.map); 147 | } 148 | 149 | getZoomLevel() { 150 | return this.map.getZoom(); 151 | } 152 | 153 | getBounds() { 154 | var bounds = this.map.getBounds(); 155 | return [[bounds.getSouth(), bounds.getWest()],[bounds.getNorth(), bounds.getEast()]]; 156 | } 157 | 158 | } -------------------------------------------------------------------------------- /js_src/index.js: -------------------------------------------------------------------------------- 1 | 'use strict'; 2 | 3 | /** 4 | * PhotoMap 5 | * 6 | * This file is licensed under the Affero General Public License version 3 or 7 | * later. See the COPYING file. 8 | * 9 | * @author Piotr Bator
18 |
22 |
23 |
27 |
--------------------------------------------------------------------------------
/templates/navigation/index.php:
--------------------------------------------------------------------------------
1 |
24 |
25 |
26 |
2 |
3 |
4 |
5 |
6 |
--------------------------------------------------------------------------------
/templates/settings/index.php:
--------------------------------------------------------------------------------
1 |
2 |
13 |
--------------------------------------------------------------------------------
/tests/Integration/AppTest.php:
--------------------------------------------------------------------------------
1 | container = $app->getContainer();
22 | }
23 |
24 | public function testAppInstalled() {
25 | $appManager = $this->container->query('OCP\App\IAppManager');
26 | $this->assertTrue($appManager->isInstalled('photomap'));
27 | }
28 |
29 | }
30 |
--------------------------------------------------------------------------------
/tests/Unit/Controller/PageControllerTest.php:
--------------------------------------------------------------------------------
1 | getMockBuilder('OCP\IRequest')->getMock();
16 |
17 | $this->controller = new PageController(
18 | 'photomap', $request, $this->userId
19 | );
20 | }
21 |
22 | public function testIndex() {
23 | $result = $this->controller->index();
24 |
25 | $this->assertEquals('index', $result->getTemplateName());
26 | $this->assertTrue($result instanceof TemplateResponse);
27 | }
28 |
29 | }
30 |
--------------------------------------------------------------------------------
/tests/bootstrap.php:
--------------------------------------------------------------------------------
1 | addValidRoot(OC::$SERVERROOT . '/tests');
11 |
12 | // Fix for "Autoload path not allowed: .../photomap/tests/testcase.php"
13 | \OC_App::loadApp('photomap');
14 |
15 | if(!class_exists('PHPUnit_Framework_TestCase')) {
16 | require_once('PHPUnit/Autoload.php');
17 | }
18 |
19 | OC_Hook::clear();
20 |
--------------------------------------------------------------------------------
/webpack/dev-proxy.js:
--------------------------------------------------------------------------------
1 | var httpProxy = require('http-proxy');
2 | var config = require('./dev.config');
3 | var host = 'localhost';
4 | var port = parseInt(process.env.PORT) || 3000;
5 | var url = require('url');
6 |
7 | var app = require('express')();
8 |
9 |
10 | var ocRoot = url.parse(config.ocRoot);
11 | var proxyRoot = ocRoot;
12 | proxyRoot.path = '';
13 |
14 | var proxy = httpProxy.createProxyServer({
15 | target: proxyRoot
16 | });
17 |
18 | var webPackProxy = httpProxy.createProxyServer({
19 | target: 'http://localhost:' + config.webPackPort
20 | });
21 |
22 | proxy.on('proxyRes', function (proxyRes, req, res, options) {
23 | if (proxyRes.headers['content-security-policy']) {
24 | // allow the webpack sockets and javascript
25 | var post = 'localhost:' + config.webPackPort + ' ';
26 | proxyRes.headers['content-security-policy'] = proxyRes.headers['content-security-policy']
27 | .replace('connect-src ', 'connect-src * ')
28 | .replace('style-src ', 'style-src * blob: ')
29 | .replace('script-src ', 'script-src ' + post);
30 | }
31 | });
32 |
33 | var pathTest = new RegExp(config.appId + '(/js/main.js)');
34 |
35 | app.use('/', function (req, res) {
36 | var path = req.path.substr(ocRoot.pathname.length);
37 | var matches = path.match(pathTest);
38 | if (matches) {
39 | req.url = matches[1];
40 | webPackProxy.web(req, res);
41 | } else {
42 | proxy.web(req, res);
43 | }
44 | });
45 |
46 | app.listen(port, function () {
47 | console.info('==> 🚧 Webpack proxy server listening on %s:%s', host, port);
48 | // print this last
49 | setTimeout(function () {
50 | console.info('----------\n==> 💻 Open http://localhost:%s%s in a browser.', port, ocRoot.pathname);
51 | }, 500);
52 | });
53 |
--------------------------------------------------------------------------------
/webpack/dev.config.js:
--------------------------------------------------------------------------------
1 | var path = require('path');
2 | var webpack = require('webpack');
3 | var assetsPath = path.resolve(__dirname, '../js');
4 | var host = 'localhost';
5 | var port = parseInt(process.env.PORT) + 1 || 3001;
6 | var appId = 'photomap'
7 |
8 | module.exports = {
9 | ocRoot: 'http://localhost/',
10 | appId: 'photomap',
11 |
12 | webPackPort: port,
13 | devtool: 'inline-source-map',
14 | context: path.resolve(__dirname, '..'),
15 | entry: {
16 | 'main': [
17 | 'webpack-dev-server/client?http://' + host + ':' + port,
18 | 'webpack/hot/only-dev-server',
19 | './js_src/index.js'
20 | ]
21 | },
22 | output: {
23 | path: assetsPath,
24 | filename: '[name].js',
25 | chunkFilename: '[name]-[chunkhash].js',
26 | publicPath: '/js/'
27 | },
28 | module: {
29 | loaders: [
30 | {
31 | test: /\.(jpe?g|png|gif|svg)$/,
32 | loader: 'url',
33 | query: {limit: 10240}
34 | },
35 | {
36 | test: /\.js$/,
37 | exclude: /node_modules/,
38 | loaders: ['react-hot', 'babel-loader']
39 | },
40 | {test: /\.json$/, loader: 'json-loader'},
41 | {
42 | test: /\.css$/,
43 | loader: 'style!css?modules&importLoaders=2&sourceMap&localIdentName=[local]___[hash:base64:5]!autoprefixer?browsers=last 2 version!'
44 | },
45 | {
46 | test: /\.less$/,
47 | loader: 'style!css?modules&importLoaders=2&sourceMap&localIdentName=[local]___[hash:base64:5]!autoprefixer?browsers=last 2 version!less'
48 | }
49 | ]
50 | },
51 | progress: true,
52 | resolve: {
53 | modulesDirectories: [
54 | 'src',
55 | 'node_modules'
56 | ],
57 | extensions: ['', '.json', '.js']
58 | },
59 | plugins: [
60 | // hot reload
61 | new webpack.HotModuleReplacementPlugin(),
62 | new webpack.IgnorePlugin(/\.json$/),
63 | new webpack.NoErrorsPlugin(),
64 | new webpack.DefinePlugin({
65 | __CLIENT__: true,
66 | __SERVER__: false,
67 | __DEVELOPMENT__: true,
68 | __DEVTOOLS__: false // <-------- DISABLE redux-devtools HERE
69 | })
70 | ]
71 | };
72 |
--------------------------------------------------------------------------------
/webpack/prod.config.js:
--------------------------------------------------------------------------------
1 | // Webpack config for creating the production bundle.
2 |
3 | var path = require('path');
4 | var webpack = require('webpack');
5 | var CleanPlugin = require('clean-webpack-plugin');
6 | var ExtractTextPlugin = require('extract-text-webpack-plugin');
7 | var strip = require('strip-loader');
8 |
9 | var relativeAssetsPath = '../js';
10 | var assetsPath = path.join(__dirname, relativeAssetsPath);
11 |
12 | module.exports = {
13 | devtool: 'source-map',
14 | context: path.resolve(__dirname, '..'),
15 | entry: {
16 | 'main': './js_src/index.js'
17 | },
18 | output: {
19 | path: assetsPath,
20 | filename: '[name].js',
21 | chunkFilename: '[name]-[chunkhash].js',
22 | publicPath: '/js/'
23 | },
24 | module: {
25 | loaders: [
26 | {
27 | test: /\.(jpe?g|png|gif|svg)$/,
28 | loader: 'url',
29 | query: {limit: 10240}
30 | },
31 | {
32 | test: /\.js$/,
33 | exclude: /node_modules/,
34 | loaders: [strip.loader('debug'), 'babel-loader']
35 | },
36 | {test: /\.json$/, loader: 'json-loader'},
37 | {
38 | test: /\.css$/,
39 | loader: ExtractTextPlugin.extract('style', 'css?modules&importLoaders=2&sourceMap!autoprefixer?browsers=last 2 version')
40 | },
41 | {
42 | test: /\.less$/,
43 | loader: ExtractTextPlugin.extract('style', 'css?modules&importLoaders=2&sourceMap!autoprefixer?browsers=last 2 version!less')
44 | }
45 | ]
46 | },
47 | progress: true,
48 | resolve: {
49 | modulesDirectories: [
50 | 'src',
51 | 'node_modules'
52 | ],
53 | extensions: ['', '.json', '.js']
54 | },
55 | plugins: [
56 | new CleanPlugin([relativeAssetsPath]),
57 | new ExtractTextPlugin("[name].css"),
58 | new webpack.DefinePlugin({
59 | __CLIENT__: true,
60 | __SERVER__: false,
61 | __DEVELOPMENT__: false,
62 | __DEVTOOLS__: false
63 | }),
64 |
65 | // ignore dev config
66 | new webpack.IgnorePlugin(/\.\/dev/, /\/config$/),
67 |
68 | // set global vars
69 | new webpack.DefinePlugin({
70 | 'process.env': {
71 | // Useful to reduce the size of client-side libraries, e.g. react
72 | NODE_ENV: JSON.stringify('production')
73 | }
74 | }),
75 |
76 | // optimizations
77 | new webpack.optimize.DedupePlugin(),
78 | new webpack.optimize.OccurenceOrderPlugin(),
79 | new webpack.optimize.UglifyJsPlugin({
80 | compress: {
81 | warnings: false
82 | }
83 | })
84 | ]
85 | };
86 |
--------------------------------------------------------------------------------
/webpack/utils/notifyStats.js:
--------------------------------------------------------------------------------
1 | function notifyError(error) {
2 | // BELLs when something goes wrong!
3 | console.log("\x07" + error);
4 | }
5 |
6 | function notifyWarning(warning) {
7 | console.log(warning);
8 | }
9 |
10 | module.exports = function notifyStats(stats) {
11 | var json = stats.toJson();
12 | if (json.errors.length > 0) {
13 | json.errors.forEach(notifyError);
14 | } else if (json.warnings.length > 0) {
15 | json.warnings.forEach(notifyWarning);
16 | } else {
17 | console.log(stats.toString({
18 | chunks: false,
19 | colors: true
20 | }));
21 | }
22 | };
23 |
--------------------------------------------------------------------------------
/webpack/utils/writeStats.js:
--------------------------------------------------------------------------------
1 | var fs = require('fs'),
2 | path = require('path'),
3 | filepath = path.resolve(__dirname, '../../webpack-stats.json');
4 |
5 | module.exports = function writeStats(stats, env) {
6 |
7 | var publicPath = this.options.output.publicPath;
8 |
9 | var json = stats.toJson();
10 |
11 | // get chunks by name and extensions
12 | function getChunks(name, ext) {
13 | ext = ext || 'js';
14 | var chunk = json.assetsByChunkName[name];
15 |
16 | // a chunk could be a string or an array, so make sure it is an array
17 | if (!(Array.isArray(chunk))) {
18 | chunk = [chunk];
19 | }
20 |
21 | return chunk
22 | // filter by extension
23 | .filter(function(chunkName) {
24 | return path.extname(chunkName) === '.' + ext;
25 | })
26 | .map(function(chunkName) {
27 | return publicPath + chunkName;
28 | });
29 | }
30 |
31 | var script = getChunks('main', 'js');
32 | var cssFiles = getChunks('main', 'css');
33 |
34 | var cssModules = {};
35 |
36 | json.modules.filter(function(m) {
37 | if (env === 'prod') {
38 | return /\.scss$/.test(m.name);
39 | }
40 | //filter by modules with '.scss' inside name string, that also have name and moduleName that end with 'ss'(allows for css, less, sass, and scss extensions)
41 | //this ensures that the proper scss module is returned, so that namePrefix variable is no longer needed
42 | return (/\.scss$/.test(m.name) && m.name.slice(-2) === 'ss' && m.reasons[0].moduleName.slice(-2) === 'ss');
43 | }).forEach(function(m) {
44 | //find index of '/src' inside the module name, slice it and resolve path
45 | var srcIndex = m.name.indexOf('/src');
46 | var name = path.resolve(__dirname, '../../', m.name.slice(srcIndex + '/src'.length));
47 | if (name) {
48 | // Resolve the e.g.: "C:\" issue on windows
49 | const i = name.indexOf(':');
50 | if (i >= 0) {
51 | name = name.slice(i + 1);
52 | }
53 | }
54 | //end
55 | if (m.source) {
56 | var regex = env === 'prod' ? /module\.exports = ((.|\n)+);/ : /exports\.locals = ((.|\n)+);/;
57 | var match = m.source.match(regex);
58 | cssModules[name] = match ? JSON.parse(match[1]) : {};
59 | }
60 | });
61 |
62 | // Find compiled images in modules
63 | // it will be used to map original filename to the compiled one
64 | // for server side rendering
65 | const imagesRegex = /\.(jpe?g|png|gif|svg)$/;
66 | const images = json.modules
67 | .filter(function(module) {
68 | return imagesRegex.test(module.name);
69 | })
70 | .map(function(image) {
71 | var i = image.source.indexOf('"');
72 | var imageSource = image.source.slice(i + 1, -1);
73 | imageSource = imageSource.lastIndexOf('data:image', 0) === 0 ? imageSource : publicPath + imageSource;
74 | return {
75 | original: image.name,
76 | compiled: imageSource
77 | };
78 | });
79 |
80 | var content = {
81 | script: script,
82 | css: {
83 | files: cssFiles,
84 | modules: cssModules
85 | },
86 | images: images
87 | };
88 |
89 | fs.writeFileSync(filepath, JSON.stringify(content));
90 |
91 | };
92 |
--------------------------------------------------------------------------------
/webpack/webpack-dev-server.js:
--------------------------------------------------------------------------------
1 | var WebpackDevServer = require('webpack-dev-server'),
2 | webpack = require('webpack'),
3 | config = require('./dev.config'),
4 | host = process.env.HOST || 'localhost',
5 | port = parseInt(process.env.PORT) + 1 || 3001,
6 | serverOptions = {
7 | contentBase: config.ocRoot + '/' + config.appId + '/',
8 | quiet: true,
9 | noInfo: true,
10 | hot: true,
11 | inline: true,
12 | lazy: false,
13 | publicPath: config.output.publicPath,
14 | headers: {"Access-Control-Allow-Origin": "*"},
15 | stats: {colors: true}
16 | },
17 | compiler = webpack(config, function (err, stats) {
18 | var json = stats.toJson();
19 | if (json.errors.length)
20 | console.error(json.errors[0])
21 | }),
22 | webpackDevServer = new WebpackDevServer(compiler, serverOptions);
23 |
24 | webpackDevServer.listen(port, host, function () {
25 | console.info('==> 🚧 Webpack development server listening on %s:%s', host, port);
26 | });
27 |
--------------------------------------------------------------------------------
3 |
6 |
7 |
8 |
9 |
12 | 10 | 11 |