Basic initial webpack configuration for Modular js code #14464

Piyush3079 · 2018-07-06T18:50:51Z

This pr contains the basic webpack configuration for modular js code with some basic changes in Header and Script class and the javascript AJAX handler for handling the new js code files.

Before submitting pull request, please check that every commit:

Has proper Signed-Off-By
Has commit message which describes it
Is needed on it's own, if you have just minor fixes to previous commits, you can squash them
Any new functionality is covered by tests

devenbansod

A few comments/suggestions/requests for change.

devenbansod · 2018-07-08T05:09:32Z

.scrutinizer.yml

@@ -24,4 +25,4 @@ build:
                        command: './vendor/bin/phpcs  --standard=PMAStandard ./ --report=checkstyle --report-file=cs-data --ignore=*/vendor/*,*/build/*'
                        analysis:
                            file: 'cs-data'                 # The reporter filename
-                            format: 'php-cs-checkstyle'     # The supported format by Scrutinizer
+                            format: 'php-cs-checkstyle'     # The supported format by Scrutinizer


/minor unneeded change

devenbansod · 2018-07-08T05:19:07Z

.scrutinizer.yml

@@ -12,6 +12,7 @@ build:
        test:
            environment:
                php: 7.1
+                node: '8.11.3'


Is the exact number required? I'd prefer to specify the latest in 8.x.x if it can automatically pick it up.

I am not sure whether it will work or not as I have gone through the documentation and they have specified the exact version in examples.
https://scrutinizer-ci.com/docs/configuration/build#node
Also on nodejs.org this version is given stable

devenbansod · 2018-07-08T05:20:41Z

config.sample.inc.php

+ * for making production build $cfg['environment'] = 'production'
+ *
+ */
+$cfg['environment'] = 'production';


I think these should go to libraries/config.default.php instead

They have already been added in next pr.
I will add that webpack_host directive here which needs to be used in development only.

Let's add them in this PR instead and remove it from the next PRs. We'll move to getting the next ones reviewed only when this one is ready and merged.

I have added them.

These settings only matter to developers, I think they should not be in this file, not even commented.

config.sample.inc.php is intended to overwrite the default configurations in config.default.php. So if developer wants to make change in webpack port and webpack host then he has to make change in config.default.php. Is it the change required?
Also we need to make these directives available in webpack.config.babel.js as there also, we need to specify some sort of configuration for port and output path on the basis of environment.
Creating a .env file can solve webpack.config.babel.js directive issue.

Please remove it from the config.sample.inc.php. It's meant for the users (not developers) who want minimum overhead of setting phpmyadmin up.

Ok I am removing it.
And adding a comment in config.default $cfg['CSPAllow'] directive that it has to set to some value like http://localhost:3307 ws://localhost:3307 for webpack host to be localhost and webpack port to be 3307 so that it can allow loading of js files from cross-origin

devenbansod · 2018-07-08T05:23:12Z

js/ajax.js

+            if (check[check.length - 1] === 'new.js') {
+                var script_src = '';
+                if (PMA_commonParams.get('environment') === 'development') {
+                    script_src += 'http://localhost:' + PMA_commonParams.get('webpack_port') + '/js/dist/';


I think we should allow for specifying the webpack_host too. I've personally seen and used hosts like localhost.xyz.com while developing locally. Hardcoding anyway does not make sense, though the default value can be localhost.

I think then there will not be the need of specifying the webpack port number as webpack_host will take care of that too.
So I will remove webpack_port and add webpack_host.

Hostname would just be example.com (and would not have port). We'd still require the webpack_port too.

So it should be like hostname:port.
Ok I am updating it.

devenbansod · 2018-07-08T05:24:42Z

js/ajax.js

+                if (PMA_commonParams.get('environment') === 'development') {
+                    script_src += 'http://localhost:' + PMA_commonParams.get('webpack_port') + '/js/dist/';
+                } else if (PMA_commonParams.get('environment') === 'production') {
+                    script_src = 'js/dist/';


Which one is better?
I see you have used += on L651, but use = here. Is the initialization of script_src to '' really required?

devenbansod · 2018-07-08T05:26:29Z

js/src/db_search.js

@@ -0,0 +1,251 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */


If this PR only focusses on Basic initial webpack configuration for Modular js code, I wonder if this change (js/src/db_search.js) should go in here.

Yeah this files is not required in this pr but as this pr is made from gsoc branch, the commits or later branch will require this files so I thought of not removing this files as doing this will cause conflicts in later prs.
Also one of the purpose fulfilled by this files is testing of webpack configuration.

We can always rebase other PRs once this is merged. With regards to the testing, I believe we could do more exhaustive testing in the next PR too.
Add this here might make it trickier to come back to this PR later and wonder why was it needed. But I'm open to keep it.

I am not sure about this file. If it create some problem then I think I should remove it otherwise I just added it here to check if webpack is building the files correctly and the urls are working proporly.
What do you think?

It's not a huge problem. But for any (potential) contributor, the PR looks cleaner w/o it. You can decide to remove it or keep it based on your judgement.

I guess you could remove it out, add it in a later PR

Yeah I am removing this file from this pr

devenbansod · 2018-07-08T05:28:37Z

libraries/classes/Header.php

+        // Here would not be a good place to add CodeMirror because
+        // the user preferences have not been merged at this point
+
+        $this->_scripts->addFile('messages.php', array('l' => $GLOBALS['lang']));


Any specific reason for moving this code for addition of messages.php to $this->_scripts above?

This files contains the message strings for js code so it should be loaded before any other other js files so that all the strings were available for any file being loaded.

devenbansod · 2018-07-08T05:29:04Z

libraries/classes/Scripts.php

+                 * It checks whether the file contains new in its name or not
+                 */
+                if ($GLOBALS['cfg']['environment'] === 'development') {
+                    $src = "http://localhost:" . $GLOBALS['cfg']['webpack_port'] . "/";


See above comment regarding webpack_host

devenbansod · 2018-07-08T05:30:49Z

libraries/classes/Scripts.php

+                 */
+                if ($GLOBALS['cfg']['environment'] === 'development') {
+                    $src = "http://localhost:" . $GLOBALS['cfg']['webpack_port'] . "/";
+                } else if ($GLOBALS['cfg']['environment'] === 'production'){


I think instead of else if, we should initialize $src = "" and have only if ($GLOBALS['cfg']['environment'] === 'development') check

Piyush3079

I have made required changes with some comments regarding some of the requested changes.

Piyush3079 · 2018-07-08T06:33:34Z

.scrutinizer.yml

@@ -12,6 +12,7 @@ build:
        test:
            environment:
                php: 7.1
+                node: '8.11.3'


I am not sure whether it will work or not as I have gone through the documentation and they have specified the exact version in examples.
https://scrutinizer-ci.com/docs/configuration/build#node
Also on nodejs.org this version is given stable

Piyush3079 · 2018-07-08T06:52:50Z

config.sample.inc.php

+ * for making production build $cfg['environment'] = 'production'
+ *
+ */
+$cfg['environment'] = 'production';


They have already been added in next pr.
I will add that webpack_host directive here which needs to be used in development only.

Piyush3079 · 2018-07-08T06:55:06Z

js/ajax.js

+            if (check[check.length - 1] === 'new.js') {
+                var script_src = '';
+                if (PMA_commonParams.get('environment') === 'development') {
+                    script_src += 'http://localhost:' + PMA_commonParams.get('webpack_port') + '/js/dist/';


I think then there will not be the need of specifying the webpack port number as webpack_host will take care of that too.
So I will remove webpack_port and add webpack_host.

Piyush3079 · 2018-07-08T07:39:05Z

js/src/db_search.js

@@ -0,0 +1,251 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */


Yeah this files is not required in this pr but as this pr is made from gsoc branch, the commits or later branch will require this files so I thought of not removing this files as doing this will cause conflicts in later prs.
Also one of the purpose fulfilled by this files is testing of webpack configuration.

Piyush3079 · 2018-07-08T07:42:45Z

libraries/classes/Header.php

+        // Here would not be a good place to add CodeMirror because
+        // the user preferences have not been merged at this point
+
+        $this->_scripts->addFile('messages.php', array('l' => $GLOBALS['lang']));


This files contains the message strings for js code so it should be loaded before any other other js files so that all the strings were available for any file being loaded.

devenbansod · 2018-07-09T03:26:50Z

@Piyush3079 please look at the failures in Travis job at: https://travis-ci.org/phpmyadmin/phpmyadmin/jobs/401385243 and try to fix them.

codecov · 2018-07-09T14:24:41Z

Codecov Report

Merging #14464 into gsoc-js-refactoring will increase coverage by <.01%.
The diff coverage is 66.66%.

@@                    Coverage Diff                    @@
##             gsoc-js-refactoring   #14464      +/-   ##
=========================================================
+ Coverage                  50.43%   50.43%   +<.01%     
- Complexity                 14428    14430       +2     
=========================================================
  Files                        500      500              
  Lines                      67846    67858      +12     
=========================================================
+ Hits                       34220    34227       +7     
- Misses                     33626    33631       +5

Piyush3079 · 2018-07-09T14:36:32Z

The failures were due to these tests stub the Header class and whenever these tests instantiate the class, they will call class method defined in constructor _addDefaultScripts and in this method, the value of environment in $params was undefined during the tests. But now I have added all the webpack and environment directives in config.default.php so tests will not fail now.

devenbansod · 2018-07-09T15:03:23Z

You might want to delay enforcing the strict eslint standards, till we clean up the JS codebase. The
Lint Job seems to error right now: https://travis-ci.org/phpmyadmin/phpmyadmin/jobs/401785317

Piyush3079 · 2018-07-09T15:24:46Z

I am working on this only. The "extends": "eslint:recommended", part needs to be commented.

MauricioFauth · 2018-07-11T04:48:07Z

.eslintrc.json

+    },
+    // This comment to be removed only when working on local
+    // It should not go on the PMA repo uncommented untill all the code gets cleaned.
+    // "extends": "eslint:recommended",


The original configuration is almost an extension of https://github.com/airbnb/javascript.

And if I remember correctly, JSON files doesn't allow comments.

"extends": "eslint:recommended", this helps in enabling eslint in files strictly. If it is removed travis will not show any failure in tests for undefined functions and variables in files.
Although it is not needed now but we need to add this in future to make sure that there should not be any undefined variables as complete code is going to run in strict mode.

We can remove it for now, and add it later then?

Yeah that won't be problem I guess.

MauricioFauth · 2018-07-11T04:51:47Z

config.sample.inc.php

+ * for making production build $cfg['environment'] = 'production'
+ *
+ */
+$cfg['environment'] = 'production';


These settings only matter to developers, I think they should not be in this file, not even commented.

MauricioFauth · 2018-07-11T05:00:10Z

libraries/config.default.php

+/**
+ * Webppack port number for running development server of webpack
+ */
+$cfg['webpack_port'] = 3307;


I'm still not sure if these are the most appropriate default values. $cfg['webpack_host'] and $cfg['webpack_port'] values are only interesting to developers, right?

Yeah these configurations only need to be setup for developers. Normal users don't need these configurations.

MauricioFauth · 2018-07-11T05:01:37Z

package.json

@@ -20,6 +24,14 @@
    "zxcvbn": "4.4.2"
  },
  "devDependencies": {
-    "eslint": "^4.9.0"
+    "babel-core": "^6.26.3",


I think you should replace babel-core by babel-cli here.

Yeah I have done this in next pr but I will add in this pr also and remove from next one.
Also I am making change in production build script as it is creating some random directory like es6. So please review this change also and suggest required changes.

MauricioFauth · 2018-07-11T05:10:17Z

.babelrc

@@ -0,0 +1,3 @@
+{
+    "presets": ["env"]
+}


If you want, you can use the EditorConfig plugin to help with style issues like this and like most of the style issues pointed to by @phpmyadmin-bot.

Yeah I think this will be helpful. Thanks

devenbansod · 2018-07-14T02:50:45Z

package.json

@@ -5,6 +5,12 @@
  "repository": "https://github.com/phpmyadmin/phpmyadmin.git",
  "author": "The phpMyAdmin Team <developers@phpmyadmin.net> (https://www.phpmyadmin.net/team/)",
  "license": "GPL-2.0",
+  "scripts": {
+    "dev:wds": "webpack-dev-server --progress",
+    "prod:build": "rimraf js/lib js/dist && babel js/src/ -d js/lib --ignore .test.js && cross-env NODE_ENV=production webpack -p --progress",


@Piyush3079 Can we not use rm -rf? (Is it required for Windows compatibility?)

It seems to have ISC license, which might require a review before adding it to our package.json (given that phpMyAdmin is GPL-v2 licensed).
cc: @ibennetch @nijel

Yeah, rm -rf will give error to Windows users. That's why I have used this package to have cross-platform compatibility for creating build.

devenbansod · 2018-07-14T02:52:00Z

Looks good to me, except the few final comments.

ibennetch · 2018-07-15T08:43:26Z

libraries/config.default.php

+/**
+ * Working environment configuration
+ * for development mode $cfg['environment'] = 'development',
+ * for making production build $cfg['environment'] = 'production'


I suggest adding a line here mentioning the need to also change CSPAllow, something like "You will probably also have to modify the $cfg['CSPAllow'] directive in order to use the webpack development server."

I have done that.

ibennetch · 2018-07-15T08:43:48Z

libraries/config.default.php

@@ -3014,8 +3031,12 @@

 /**
 * Additional string to allow in CSP headers.
+ *
+ * For working envionment to be development, this has to be changed to allow
+ * cross-origin loading of js files for specified webpack host and webpack port.


I'd spell out JavaScript instead of "js" here

ibennetch · 2018-07-15T08:44:06Z

libraries/config.default.php

+ *
+ * For working envionment to be development, this has to be changed to allow
+ * cross-origin loading of js files for specified webpack host and webpack port.
+ * Eg. 'http://localhost:3307 ws://localhost:3307' for locahost and 3307 webpack pot


"port" rather than "pot" :)

ibennetch · 2018-07-15T08:45:00Z

webpack.config.babel.js

+];
+
+export default [{
+    // envionment either development or production


typo: "environment"

ibennetch · 2018-07-15T08:46:00Z

webpack.config.babel.js

+    output: {
+        filename: 'db_search_new.js',
+        path: path.resolve(__dirname, 'dist'),
+        publicPath: 'http://localhost:3307/js/dist'


Will this work properly if the developer sets a different value for $cfg['webpack_host'] or cfg['webpack_port']?

ibennetch · 2018-07-15T08:48:38Z

libraries/config.default.php

@@ -3014,8 +3031,12 @@

 /**
 * Additional string to allow in CSP headers.
+ *
+ * For working envionment to be development, this has to be changed to allow


Typo: "environment"

ibennetch · 2018-07-15T08:54:21Z

doc/config.rst

+    :type: string
+    :default: `'production'`
+
+    Enable you to set the working environment for loading js files


Can I suggest instead writing this?

Sets the working environment for loading JavaScript files for webpack development

Possible values are 'production' or 'development'

ibennetch · 2018-07-15T08:55:42Z

doc/config.rst

@@ -3402,6 +3402,29 @@ Developer

    These settings might have huge effect on performance or security.

+.. config:option:: $cfg['environment']


Would $cfg['webpack_environment'] be more appropriate?

Making it webpack_environment would restrict this directive to webpack only rather than making it for the complete application. With environmet only we can use this directive for other things also like adding debugging in development environment.

Personally, I think any other debugging functionality should have its own configuration directive (so developers can focus on debugging a specific module or functionality), but you have a valid point as well. It's not that important to change and besides, if a problem comes up later we can deal with it at that time.

If @MauricioFauth and @devenbansod are okay with this directive then it's fine for me as well.

ibennetch · 2018-07-15T08:56:20Z

doc/config.rst

+    :default: `'http://localhost'`
+
+    Enable you to start webpack development server on specified host for serving js files
+    when working in the development environment


I'd just say:

Webpack development server hostname for serving JavaScript files. Requires $cfg['environment'] to be development.

ibennetch · 2018-07-15T08:56:47Z

doc/config.rst

+    :default: 3307
+
+    Enable you to start webpack development server on specified port for serving js files
+    when working in the development environment


Similarly,

Webpack development server port for serving JavaScript files. Requires $cfg['environment'] to be development.

ibennetch · 2018-07-15T09:03:33Z

According to https://www.gnu.org/licenses/license-list.en.html#ISC, the ISC license is compatible with the GPL, so rifraf should be okay according to GNU.

…tive modules in package manager. Add script in package.json for building js files using webpack. Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

…rectory, environment variable introduced Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

and adding comments for some code handleing new js files. Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

…es in default.config. Introduce webpack_host and webpack_port directive and updating package.json build scripts. Signed-Off-By: Piyush Vijay <piyushvijay.1997@gmail.com>

devenbansod · 2018-07-16T03:11:52Z

Hi @ibennetch @MauricioFauth, @Piyush3079 has done some of the suggested changes, rebased the PR and squashed the commits. How does the PR look to you?
Could you please approve the changes if you are fine with them?

MauricioFauth · 2018-07-16T14:09:36Z

js/ajax.js

+                if (PMA_commonParams.get('environment') === 'development') {
+                    script_src = PMA_commonParams.get('webpack_host') + ':'
+                    + PMA_commonParams.get('webpack_port') + '/js/dist/';
+                } else if (PMA_commonParams.get('environment') === 'production') {


I think any value other than development must be considered as production.

…irectives are added in webpack.config Signed-Off-By: Piyush Vijay <piyushvijay.1997@gmail.com>

ibennetch · 2018-07-17T13:25:24Z

This all looks great to me, thanks.

devenbansod · 2018-07-18T11:42:06Z

Thanks everyone for the reviews.

@Piyush3079 Great work on this! Thanks for your contribution.

Piyush3079 force-pushed the Mod_Js_Config branch from 32db0dc to d84ac42 Compare July 6, 2018 19:24

devenbansod requested changes Jul 8, 2018

View reviewed changes

devenbansod requested a review from MauricioFauth July 8, 2018 05:31

devenbansod assigned MauricioFauth and devenbansod Jul 8, 2018

Piyush3079 force-pushed the Mod_Js_Config branch from c67a3ff to 4fb1887 Compare July 8, 2018 07:32

Piyush3079 commented Jul 8, 2018

View reviewed changes

Piyush3079 force-pushed the Mod_Js_Config branch from 4fb1887 to 1bf67fa Compare July 8, 2018 07:55

MauricioFauth changed the base branch from master to gsoc-js-refactoring July 11, 2018 04:29

MauricioFauth reviewed Jul 11, 2018

View reviewed changes

devenbansod reviewed Jul 14, 2018

View reviewed changes

devenbansod approved these changes Jul 14, 2018

View reviewed changes

Piyush3079 force-pushed the Mod_Js_Config branch 6 times, most recently from 8032054 to de8919a Compare July 14, 2018 18:42

ibennetch requested changes Jul 15, 2018

View reviewed changes

Piyush3079 force-pushed the Mod_Js_Config branch 4 times, most recently from c7eece4 to ec4c356 Compare July 15, 2018 13:28

Piyush3079 force-pushed the Mod_Js_Config branch 2 times, most recently from 3008809 to 33002a3 Compare July 15, 2018 16:01

Piyush3079 added 5 commits July 15, 2018 21:58

Files for babel, eslint and webpack base configuration and add respec…

d80a8ba

…tive modules in package manager. Add script in package.json for building js files using webpack. Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

Module for importing variable defined in messages.php.

10d545c

Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

Some changes in the configuration to revamp file by file not whole di…

59ef2b9

…rectory, environment variable introduced Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

Update documentation for the new configuration variables introduced

3e56b17

and adding comments for some code handleing new js files. Signed-off-by: Piyush Vijay <piyushvijay.1997@gmail.com>

Update node version for scrutinizer. Add webpack environment directiv…

3d9e656

…es in default.config. Introduce webpack_host and webpack_port directive and updating package.json build scripts. Signed-Off-By: Piyush Vijay <piyushvijay.1997@gmail.com>

Piyush3079 force-pushed the Mod_Js_Config branch from 33002a3 to a6ec954 Compare July 15, 2018 16:31

MauricioFauth requested changes Jul 16, 2018

View reviewed changes

Typo fixes for documentation and comments and webpack configuration d…

4d3a8c9

…irectives are added in webpack.config Signed-Off-By: Piyush Vijay <piyushvijay.1997@gmail.com>

Piyush3079 force-pushed the Mod_Js_Config branch from a6ec954 to 4d3a8c9 Compare July 16, 2018 15:35

ibennetch approved these changes Jul 17, 2018

View reviewed changes

williamdes approved these changes Jul 17, 2018

View reviewed changes

MauricioFauth approved these changes Jul 17, 2018

View reviewed changes

devenbansod merged commit 224ae6d into phpmyadmin:gsoc-js-refactoring Jul 18, 2018

Piyush3079 deleted the Mod_Js_Config branch July 23, 2018 06:27

MauricioFauth mentioned this pull request Jun 14, 2019

Add working environment configuration directive #15331

Merged

		@@ -3402,6 +3402,29 @@ Developer

		These settings might have huge effect on performance or security.

		.. config:option:: $cfg['environment']

Basic initial webpack configuration for Modular js code #14464

Basic initial webpack configuration for Modular js code #14464

Conversation

Piyush3079 commented Jul 6, 2018 • edited Loading

devenbansod left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Piyush3079 Jul 14, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Piyush3079 left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

devenbansod commented Jul 9, 2018

codecov bot commented Jul 9, 2018 • edited Loading

Codecov Report

Piyush3079 commented Jul 9, 2018

devenbansod commented Jul 9, 2018

Piyush3079 commented Jul 9, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Piyush3079 Jul 11, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

devenbansod commented Jul 14, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ibennetch commented Jul 15, 2018

devenbansod commented Jul 16, 2018

Choose a reason for hiding this comment

ibennetch commented Jul 17, 2018

devenbansod commented Jul 18, 2018

Piyush3079 commented Jul 6, 2018 •

edited

Loading

Piyush3079 Jul 14, 2018 •

edited

Loading

Piyush3079 left a comment •

edited

Loading

codecov bot commented Jul 9, 2018 •

edited

Loading

Piyush3079 Jul 11, 2018 •

edited

Loading