diff --git a/.bowerrc b/.bowerrc new file mode 100644 index 0000000..7f6b222 --- /dev/null +++ b/.bowerrc @@ -0,0 +1,3 @@ +{ + "directory": "web/components/" +} diff --git a/.gitignore b/.gitignore index 6d98c4e..28eb5fc 100644 --- a/.gitignore +++ b/.gitignore @@ -2,13 +2,12 @@ /.mage/logs/*.log /composer.lock /vendor/ -/propel.yaml +/propel.yml /src/Gist/Model/Base/ /src/Gist/Model/Map/ +/web/components/ /app/propel/ -/node_modules/ /app/config/config.yml /app/config/propel/ /data/ /trans/ -/cache/ diff --git a/.mage/config/environment/.gitignore b/.mage/config/environment/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/.mage/config/environment/prod.yml.dist b/.mage/config/environment/prod.yml.dist new file mode 100644 index 0000000..a5bcb3b --- /dev/null +++ b/.mage/config/environment/prod.yml.dist @@ -0,0 +1,28 @@ +# prod +# Rename this file to "prod.yml" +deployment: + user: gist + from: ./ + to: /var/www/gist/ + excludes: + - "*.svn" + - "*.git" + - "*.swp" + - "app/config/config.yml" + - "app/config/propel/" + - "app/propel/" + - "data/git" + - "deploy" + - "tags" + - "propel.yaml" + - "composer.lock" + - "composer.json" + - "bower.json" + - ".bowerrc" +hosts: + - gist.mycompany.com +tasks: + pre-deploy: + on-deploy: + post-deploy: +verbose_logging: true diff --git a/.mage/config/general.yml b/.mage/config/general.yml new file mode 100644 index 0000000..cff23fa --- /dev/null +++ b/.mage/config/general.yml @@ -0,0 +1,7 @@ +# global settings +name: Gist +email: +notifications: false +logging: true +maxlogs: 30 +ssh_needs_tty: false diff --git a/.mage/logs/.gitignore b/.mage/logs/.gitignore new file mode 100644 index 0000000..c96a04f --- /dev/null +++ b/.mage/logs/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file diff --git a/.mage/tasks/.gitignore b/.mage/tasks/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md deleted file mode 100644 index 8d29688..0000000 --- a/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,26 +0,0 @@ -## Environment - -* GIST version or GIT commit: ... -* PHP Version: ... -* GIT version. ... -* HTTPD (Nginx, Apache2): ... -* DBMS (MySQL, SQLite, PostgreSQL): ... - - -## Description - -... - -### Steps to reproduce - -1. ... -2. ... -3. ... - -#### Observed Results - -... - -#### Expected Results - -... diff --git a/Makefile b/Makefile index 6b5a389..7dd29cc 100644 --- a/Makefile +++ b/Makefile @@ -1,58 +1,53 @@ COMPOSER ?= composer -NPM ?= npm +BOWER ?= bower GIT ?= git MKDIR ?= mkdir PHP ?= php -RM ?= rm -all: update clean-cache +all: update composer: - @echo "Installing PHP dependencies" - @echo "---------------------------" - @echo + @echo "Installing application's dependencies" + @echo "-------------------------------------" + @echo - ${COMPOSER} install + $(COMPOSER) install $(COMPOSER_INSTALL_FLAGS) +bower: + @echo "Installing application's dependencies" + @echo "-------------------------------------" + @echo -npm: - @echo "Installing CSS/JS dependencies" - @echo "------------------------------" - @echo + $(BOWER) install - ${NPM} install - ${NPM} update +optimize: + @echo "Optimizing Composer's autoloader, can take some time" + @echo "----------------------------------------------------" + @echo + + $(COMPOSER) dump-autoload --optimize update: @echo "Updating application's dependencies" @echo "-----------------------------------" - @echo + @echo - ${GIT} pull origin master + $(GIT) pull origin master ${MKDIR} -p data/git - ${MKDIR} -p data/cache - ${COMPOSER} update - ${NPM} install - ${NPM} update - -clean-cache: - @echo "Removing cache" - @echo "--------------" - @echo - - ${RM} -fr cache/* + $(COMPOSER) update + $(BOWER) install run: @echo "Run development server" @echo "----------------------" - @echo + @echo - ${PHP} -S 127.0.0.1:8080 -t web + $(PHP) -S 127.0.0.1:8080 -t web propel: @echo "Propel migration" @echo "----------------" - @echo - + @echo + ./vendor/propel/propel/bin/propel config:convert ./vendor/propel/propel/bin/propel model:build --recursive ./vendor/propel/propel/bin/propel migration:diff --recursive diff --git a/README.md b/README.md index ccbff71..a9e1493 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,418 @@ +Table of Contents +================= + + * [GIST](#gist) + * [Requirements](#requirements) + * [Git](#git) + * [Composer](#composer) + * [Bower](#bower) + * [Installation](#installation) + * [Upgrade](#upgrade) + * [Configuration](#configuration) + * [Makefile](#makefile) + * [API](#api) + * [Console](#console) + * [Deployment](#deployment) + * [Contributors](#contributors) + + GIST ==== GIST is an open-source application to share code. https://www.deblan.io/post/517/gist-est-dans-la-place -**[Read the wiki for more information](https://gitnet.fr/deblan/gist/wiki/_pages).** +![Gist](https://upload.deblan.org/u/2015-11/565b93a5.png "Gist") -### Editor +![Gist](https://upload.deblan.org/u/2016-06/57655dec.png "Gist") -![Gist](https://upload.deblan.org/u/2018-08/5b7ab7a6.png "Gist editor") -### Result +Requirements +------------ -![Gist](https://upload.deblan.org/u/2018-08/5b7ab7d4.png "Gist result") +* PHP >= 5.4 +* GIT +* MySQL, PostgreSQL or SQLite +* Composer (php) +* Bower (node) -### Account +### Git -![Gist](https://upload.deblan.org/u/2018-08/5b7aba2d.png "Gist account") +Git can maybe be downloaded from your system's repositories. -### Embeded Gist + $ git config --global user.email "you@example.com" + $ git config --global user.name "Your Name" -![Gist](https://upload.deblan.org/u/2018-08/5b7ab81c.png "Embeded Gist") +### Composer + +Composer can maybe be downloaded from your system's repositories. +Else, follow the next instructions: + + # With cURL + $ curl -sS https://getcomposer.org/installer | php + + # With Wget + $ wget -O - -q https://getcomposer.org/installer | php + + $ chmod +x composer.phar + + # For a local installation and if the envvar PATH contains "$HOME/bin/" + $ mv composer.phar ~/bin/composer + + # For a global installation + $ sudo mv composer.phar /usr/local/bin/composer + +### Bower + + $ sudo apt-get install npm + $ sudo npm install -g bower + +Installation +------------ + + $ cd /path/to/www/ + $ git clone https://gitnet.fr/deblan/gist + $ cd gist + $ make + $ cp propel-dist.yaml propel.yaml + +Edit `propel.yaml`. **Use spaces instead of tabulations**. + +**MySQL** + + propel: + database: + connections: + default: + adapter: mysql + # http://www.php.net/manual/en/ref.pdo-mysql.connection.php + dsn: "mysql:host=DATABASE_SERVER;dbname=DATABASE_NAME" + user: DATEBASE_USER + password: DATEBASE_PASSWORD + settings: + charset: utf8 + queries: + utf8: "SET NAMES utf8 COLLATE utf8_unicode_ci, COLLATION_CONNECTION = utf8_unicode_ci, COLLATION_DATABASE = utf8_unicode_ci, COLLATION_SERVER = utf8_unicode_ci" + + [...] + +**SQLITE** + + propel: + database: + connections: + default: + adapter: sqlite + # http://www.php.net/manual/en/ref.pdo-sqlite.connection.php + dsn: "sqlite:/PATH/TO/gist.sqlite" + user: ~ + password: ~ + + [...] + +Then `$ make propel`. + +**Versions >= 1.4.4 only**: `$ cp app/config/config.yml.dist app/config/config.yml` + +See the [configuration section](#configuration) for more information about configuration. + +--- + +The web server must have permission to write into `data`. + + $ sudo chown -R www-data:www-data data + +Your webserver must be configured to serve `web/` as document root. If you use nginx, all virtual paths must be rooted with `web/index.php` or `web/app_dev.php` ([documentation](https://www.nginx.com/resources/wiki/start/topics/recipes/symfony/)). If you use apache, you must enable the `rewrite` module and restart: + + $ sudo a2enmod rewrite + $ sudo service apache2 restart + +`app_dev.php` is the development router. Access is granted for an IP range defined in the same file. + +Upgrade +------- + +If your version is less than v1.4.2, run: `test -d app && git add app && git commit -m "Configuration"`. + + $ make update + $ make propel + +If you upgrade to v1.4.1 or more: `app/console migrate:to:v1.4.1`. + +If you upgrade to v1.4.4 or more, the configuration is moved to a `app/config/config.yml`: `$ cp app/config/config.yml.dist app/config/config.yml` and see the [configuration section](#configuration) for more information. + +If you upgrade to v1.7.0 or more, see the [configuration section](#configurationh) for more information about new options. + +Configuration +------------- + +### Version < 1.4.4 + +Edit `app/bootstrap.php.d/70-security.php`. + +* `$app['token']`: the securty token (a strong passphrase). +* `$app['enable_registration']`: defines if the registration is allowed (`true` or `false`) +* `$app['enable_login']`: defines if the login is allowed (`true` or `false`) +* `$app['login_required_to_edit_gist']`: defines if the user must be logged to create or clone a Gist (`true` or `false`) +* `$app['login_required_to_view_gist']`: defines if the user must be logged to view a Gist (`true` or `false`) +* `$app['login_required_to_view_gist']`: defines if the user must be logged to view an embeded Gist (`true` or `false`) + +If you install Gist on your server, you have to modify the `base_uri` of the API. +Edit `app/bootstrap.php.d/60-api.php` and replace `https://gist.deblan.org/`. + +### Version >= 1.4.4 + +Edit `app/config/config.yml`. + +* `security.token`: the securty token (a strong passphrase) +* `security.enable_registration`: defines if the registration is allowed (`true` or `false`) +* `security.enable_login`: defines if the login is allowed (`true` or `false`) +* `security.login_required_to_edit_gist`: defines if the user must be logged to create or clone a Gist (`true` or `false`) +* `security.login_required_to_view_gist`: defines if the user must be logged to view a Gist (`true` or `false`) +* `security.login_required_to_view_gist`: defines if the user must be logged to view an embeded Gist (`true` or `false`) +* `api.base_uri`: The url of your instance. +* `data.path`: the path where the files are saved. +* `git.path`: The path of `git`. +* `theme.name`: the name of the theme (`dark` or `light`) + +### Version >= v1.7.0 + +* `api.enabled`: defines if the API is enabled (`true` or `false`) +* `api.api_key_required`: defines if the API key is required to access the API (`true` or `false`) +* `api.client.api_key`: defines the client API key (`string`) + +Makefile +-------- + +A Makefile is provided to automate some tasks. + +* `make` will install application's dependencies via Composer and Bower, +* `make optimize` will run Composer's autoloader dump script with classmap +* `make update` will update the application +* `make propel` will generate propel's files +* `make run` will run development server on http://127.0.0.1:8080/ + +API +--- + +### Version < v1.7.0 + +#### Create a new gist + +**POST** /{locale}/api/create +Params: + +* `form[title]`: String (required, can be empty) +* `form[type]`: String (required) + Values: html, css, javascript, php, sql, xml, yaml, perl, c, asp, python, bash, actionscript3, text +* `form[content]`: String (required) + +**Responses:** + +* Code `405`: Method Not Allowed +* Code `400`: Bad Request +* Code `200`: A json which contains gist's information. Example: + +```javascript +{ + "url": "https:\/\/gist.deblan.org\/en\/view\/55abcfa7771e0\/f4afbf72967dd95e3461490dcaa310d728d6a97d", + "gist": { + "Id": 66, + "Title": "test prod", + "Cipher": false, + "Type": "javascript", + "File": "55abcfa7771e0", + "CreatedAt": "2015-07-19T16:26:15Z", + "UpdatedAt": "2015-07-19T16:26:15Z" + } +} +``` + +#### Update an existing gist + +**POST** /{locale}/api/update/{id} +Params: + +* `{id}`: Gist Id (required) +* `form[content]`: String (required) + +**Responses:** + +* Code `405`: Method Not Allowed +* Code `400`: Bad Request +* Code `200`: A json which contains gist's information. Example: + +```javascript +{ + "url": "https:\/\/gist.deblan.org\/en\/view\/55abcfa7771e0\/abcgi72967dd95e3461490dcaa310d728d6adef", + "gist": { + "Id": 66, + "Title": "test prod", + "Cipher": false, + "Type": "javascript", + "File": "55abcfa7771e0", + "CreatedAt": "2015-07-19T16:26:15Z", + "UpdatedAt": "2015-07-19T16:30:15Z" + } +} +``` + +### Version >= v1.7.0 + +Invalid response codes: + +* Code `401`: Unauthorized +* Code `403`: API not enabled +* Code `405`: Method Not Allowed +* Code `400`: Bad Request + +#### List gists + +**GET** /{locale}/api/list/{apiToken} + +Response example: + +```javascript +[ + { + "id": 66, + "title": "test prod", + "cipher": false, + "type": "javascript", + "file": "55abcfa7771e0", + "createdAt": "2015-07-19T16:26:15Z", + "updatedAt": "2015-07-19T16:30:15Z" + "url": "https:\/\/gist.deblan.org\/en\/view\/55abcfa7771e0\/abcgi72967dd95e3461490dcaa310d728d6adef", + }, + { + "id": 67, + "title": "test prod 2", + "cipher": false, + "type": "javascript", + "file": "xyzbcfa7771e0", + "createdAt": "2015-08-19T16:26:15Z", + "updatedAt": "2015-08-19T16:30:15Z" + "url": "https:\/\/gist.deblan.org\/en\/view\/5byzbcfa7771e0\/def72967dd95e346koq0dcaa310d728d6artu", + }, + ... +] +``` + +#### Create a new gist + +**POST** /{locale}/api/create/{apiToken} +Params: + +* `form[title]`: String (required, can be empty) +* `form[type]`: String (required) + Values: html, css, javascript, php, sql, xml, yaml, perl, c, asp, python, bash, actionscript3, text +* `form[content]`: String (required) + +Response example: + +```javascript +{ + "url": "https:\/\/gist.deblan.org\/en\/view\/55abcfa7771e0\/f4afbf72967dd95e3461490dcaa310d728d6a97d", + "gist": { + "id": 66, + "title": "test prod", + "cipher": false, + "type": "javascript", + "file": "55abcfa7771e0", + "createdAt": "2015-07-19T16:26:15Z", + "updatedAt": "2015-07-19T16:26:15Z" + } +} +``` + +#### Update an existing gist + +**POST** /{locale}/api/update/{id}/{apiToken} +Params: + +* `{id}`: Gist Id (required) +* `form[content]`: String (required) + +Response example: + +```javascript +{ + "url": "https:\/\/gist.deblan.org\/en\/view\/55abcfa7771e0\/abcgi72967dd95e3461490dcaa310d728d6adef", + "gist": { + "id": 66, + "title": "test prod", + "cipher": false, + "type": "javascript", + "file": "55abcfa7771e0", + "createdAt": "2015-07-19T16:26:15Z", + "updatedAt": "2015-07-19T16:30:15Z" + } +} +``` + +#### Delete an existing gist + +**POST** /{locale}/api/delete/{id}/{apiToken} + +Response code `200`: + +```javascript +{"error":false} +``` + +Response code `400`: + +```javascript +{"message":"Invalid Gist", "error":true} +``` + +Console +------- + +* **Create a gist**: `$ app/console --help create` +* **Update a gist**: `$ app/console --help update` +* **Create user**: `app/console --help user:create` +* **Show stats**: `$ app/console --help stats` + +### Version >= v1.7.0 + +* **List your gists**: `$ app/console --help gists` +* **Delete a gist**: `$ app/console --help delete` + +Deployment +---------- + +Gist uses [Magallanes](http://magephp.com/) to manage deployment. + +**Global installation** + + $ composer global require andres-montanez/magallanes + # if the envvar PATH contains "$HOME/bin/" + $ ln -s ~/.composer/vendor/bin/mage ~/bin/mage + +**Local installation** + + $ composer require andres-montanez/magallanes + +There is an example of the configuration of an environment in `.mage/config/environment/prod.yml.dist`. + + # global installation + $ mage deploy to:prod + + # local installation + $ ./vendor/andres-montanez/magallanes/bin/mage deploy to:prod + +Contributors +------------ + +**Developers** + +* Simon Vieille + +**Translators** + +* Simon Vieille +* Marion Sanchez +* Marjorie Da Silva +* Mélanie Chanat +* Showfom diff --git a/app/bootstrap.php.d/20-twig.php b/app/bootstrap.php.d/20-twig.php index e69e1c6..8da7180 100644 --- a/app/bootstrap.php.d/20-twig.php +++ b/app/bootstrap.php.d/20-twig.php @@ -9,6 +9,6 @@ $app->register(new TwigServiceProvider(), array( $app->extend('twig', function ($twig, $app) { $base = str_replace($app['request']->server->get('SCRIPT_NAME'), '', $app['request']->getBaseUrl()); $twig->addGlobal('web_path', $base.'/'); - + return $twig; }); diff --git a/app/bootstrap.php.d/30-trans.php b/app/bootstrap.php.d/30-trans.php index d65aa5d..9ec8a36 100644 --- a/app/bootstrap.php.d/30-trans.php +++ b/app/bootstrap.php.d/30-trans.php @@ -11,7 +11,7 @@ use Symfony\Component\HttpFoundation\Cookie; $app->register(new TranslationServiceProvider(), array( 'locale' => 'en', 'locale_fallback' => 'en', - 'locales' => array('en', 'fr', 'es', 'de', 'cn', 'pl'), + 'locales' => array('en', 'fr', 'es', 'de', 'cn'), )); $app['translator'] = $app->extend('translator', function ($translator, $app) { diff --git a/app/bootstrap.php.d/80-cache.php b/app/bootstrap.php.d/80-cache.php deleted file mode 100644 index 3a28362..0000000 --- a/app/bootstrap.php.d/80-cache.php +++ /dev/null @@ -1,8 +0,0 @@ -register(new HttpCacheServiceProvider(), array( - 'http_cache.cache_dir' => $app['root_path'].'/cache/', - 'http_cache.esi' => null, -)); diff --git a/app/config/propel.yaml.dist-sqlite b/app/config/propel.yaml.dist-sqlite deleted file mode 100644 index b11f6c7..0000000 --- a/app/config/propel.yaml.dist-sqlite +++ /dev/null @@ -1,31 +0,0 @@ -propel: - database: - connections: - default: - adapter: sqlite - classname: Propel\Runtime\Connection\ConnectionWrapper - dsn: "sqlite:DATABASE_PATH" - user: ~ - password: ~ - settings: - charset: utf8 - queries: - - paths: - projectDir: src/ - schemaDir: src/ - outputDir: src/ - phpDir: src/ - phpConfDir: app/config/propel - sqlDir: app/propel/sql - migrationDir: app/propel/migration - - runtime: - defaultConnection: default - connections: [default] - - generator: - defaultConnection: default - connections: [default] - objectModel: - addClassLevelComment: false diff --git a/app/locales/cn.yml b/app/locales/cn.yml index c2adf88..9af2b92 100644 --- a/app/locales/cn.yml +++ b/app/locales/cn.yml @@ -44,7 +44,7 @@ date: format: 'Y-m-d h:i:s' footer: - text: '

Powered by GIST, it''s open source :) - API

' + text: '

Powered by GIST, it''s open source :) - API

' login: login: @@ -98,7 +98,6 @@ form: php: 'PHP' sql: 'SQL' yaml: 'YAML' - markdown: 'MARKDOWN' perl: 'PERL' c: 'C/C++' asp: 'ASP' diff --git a/app/locales/de.yml b/app/locales/de.yml index 656f71f..28a0314 100644 --- a/app/locales/de.yml +++ b/app/locales/de.yml @@ -44,7 +44,7 @@ date: format: 'Y-m-d h:i:s' footer: - text: '

Powered by GIST, it''s open source :) - API

' + text: '

Powered by GIST, it''s open source :) - API

' login: login: @@ -98,7 +98,6 @@ form: php: 'PHP' sql: 'SQL' yaml: 'YAML' - markdown: 'MARKDOWN' perl: 'PERL' c: 'C/C++' asp: 'ASP' diff --git a/app/locales/en.yml b/app/locales/en.yml index 40e7454..dd99aba 100644 --- a/app/locales/en.yml +++ b/app/locales/en.yml @@ -45,7 +45,7 @@ date: format: 'Y-m-d h:i:s' footer: - text: '

Powered by GIST, it''s open source :) - API

' + text: '

Powered by GIST, it''s open source :) - API

' login: login: @@ -99,7 +99,6 @@ form: php: 'PHP' sql: 'SQL' yaml: 'YAML' - markdown: 'MARKDOWN' perl: 'PERL' c: 'C/C++' asp: 'ASP' diff --git a/app/locales/es.yml b/app/locales/es.yml index 83c0078..679d0f1 100644 --- a/app/locales/es.yml +++ b/app/locales/es.yml @@ -44,7 +44,7 @@ date: format: 'd/m/Y H\hi s\s' footer: - text: '

Impulsado por GIST, es libre :) - API

' + text: '

Impulsado por GIST, es libre :) - API

' login: login: @@ -98,7 +98,6 @@ form: php: 'PHP' sql: 'SQL' yaml: 'YAML' - markdown: 'MARKDOWN' perl: 'PERL' c: 'C/C++' asp: 'ASP' diff --git a/app/locales/fr.yml b/app/locales/fr.yml index 63c79ac..68759cd 100644 --- a/app/locales/fr.yml +++ b/app/locales/fr.yml @@ -44,7 +44,7 @@ date: format: 'd/m/Y H\hi s\s' footer: - text: '

Propulsé par GIST, c''est libre :) - API

' + text: '

Propulsé par GIST, c''est libre :) - API

' login: login: @@ -98,7 +98,6 @@ form: php: 'PHP' sql: 'SQL' yaml: 'YAML' - markdown: 'MARKDOWN' perl: 'PERL' c: 'C/C++' asp: 'ASP' diff --git a/app/locales/pl.yml b/app/locales/pl.yml deleted file mode 100644 index 4eaf452..0000000 --- a/app/locales/pl.yml +++ /dev/null @@ -1,109 +0,0 @@ -app: - title: '#!GIST' - title_prefix: '#!GIST - ' - - menu: - home: - title: 'Home' - about: - title: 'O projekcie' - my: - login: - title: 'Logowanie' - logout: - title: 'Wylogowanie' - register: - title: 'Rejestracja' - my: - title: 'Konta' - -my: - title: 'Moje wklejki' - nothing: 'Nie ma jeszcze nic!' - api: - title: 'API' - warning: 'Trzymaj to w sekrecie!' - form: - generate: 'Wygeneruj nowy' - - -gist: - untitled: 'Bez tytułu' - 404: - title: 'Oops!' - message: 'Wklejka nie została znaleziona...' - action: - view: 'Podgląd' - history: 'Commit(s)' - raw: 'RAW' - download: 'Pobierz' - clone: 'Sklonuj' - embed: 'Embed' - add: 'Nowa' - -date: - format: 'Y-m-d h:i:s' - -footer: - text: '

Napędzane przez GIST, to jest open source :) - API

' - -login: - login: - title: 'Logowanie' - invalid: 'Nie prawidłowy login lub hasło.' - form: - username: - placeholder: 'Login' - password: - placeholder: 'Hasło' - remember_me: - label: 'Pamiętaj' - register: - title: 'Nowe konto' - already_exists: 'Ta nazwa użytkownika jest już zarejestrowana!' - registred: 'Gratulacje, twoje konto zostało utworzone!' - form: - username: - placeholder: 'Login' - current_password: - placeholder: 'Obecne hasło' - password: - placeholder: 'Hasło' - -form: - error: - password: 'Nie prawidłowe hasło.' - not_blank: 'To pole nie powinno być puste!' - title: - placeholder: 'Tytuł' - cipher: - label: 'Szyfrowanie: %value%' - choice: - anyway: 'Tak czy inaczej' - yes: 'Tak' - no: 'Nie' - submit: 'Wyślij' - filter: 'Filtr' - confirm: 'Potwierdzasz?' - success: - password: 'Hasło zostało zaktualizowane.' - gist: 'Wklejka została usunięta.' - type: - label: 'Język: %value%' - choice: - all: 'All' - html: 'HTML' - xml: 'XML' - css: 'CSS' - javascript: 'JAVASCRIPT' - php: 'PHP' - sql: 'SQL' - yaml: 'YAML' - markdown: 'MARKDOWN' - perl: 'PERL' - c: 'C/C++' - asp: 'ASP' - python: 'PYTHON' - bash: 'BASH' - actionscript3: 'ACTION SCRIPT' - text: 'TEXT' diff --git a/bower.json b/bower.json new file mode 100644 index 0000000..464be4d --- /dev/null +++ b/bower.json @@ -0,0 +1,22 @@ +{ + "name": "gist", + "version": "0.0.3", + "authors": [ + "Simon Vieille " + ], + "description": "GIST is an open-source application to share code.", + "main": "web/index.php", + "keywords": [ + "Gist", + "GIT" + ], + "license": "LGPL", + "homepage": "https://gitnet.fr/deblan/gist", + "dependencies": { + "bootstrap": "3.3.4", + "flag-icon-css": "0.7.1", + "iframe-resizer": "2.8.6", + "jsdiff": "~2.2.2", + "Prism": "~1.8.1" + } +} diff --git a/composer.json b/composer.json index 14cd8e1..510fa87 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,4 @@ { - "name": "deblan/gist", - "license": "GPL-3.0-only", - "type": "project", "require": { "silex/silex": "1.3.x-dev", "symfony/yaml": "~2.6", @@ -15,17 +12,6 @@ "guzzlehttp/guzzle": "~6.0", "symfony/security": "^2.7" }, - "scripts": { - "gist-scripts": [ - "Gist\\Composer\\PostInstallHandler::execute" - ], - "post-install-cmd": [ - "@gist-scripts" - ], - "post-update-cmd": [ - "@gist-scripts" - ] - }, "autoload": { "psr-0": { "": "src/" diff --git a/package.json b/package.json deleted file mode 100644 index c637d1f..0000000 --- a/package.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "dependencies": { - "bootstrap": "^3.4.1", - "diff": "^3.5.0", - "flag-icon-css": "^0.8.6", - "iframe-resizer": "^2.8.10", - "jquery": ">=3.4.0" - } -} diff --git a/app/config/propel.yaml.dist-mysql b/propel-dist.yaml similarity index 84% rename from app/config/propel.yaml.dist-mysql rename to propel-dist.yaml index fa13d75..dd6f836 100644 --- a/app/config/propel.yaml.dist-mysql +++ b/propel-dist.yaml @@ -4,9 +4,9 @@ propel: default: adapter: mysql classname: Propel\Runtime\Connection\ConnectionWrapper - dsn: "mysql:host=DATABASE_HOST;dbname=DATABASE_NAME" - user: "DATABASE_USERNAME" - password: "DATABASE_PASSWORD" + dsn: "mysql:host=localhost;dbname=gist" + user: root + password: root settings: charset: utf8 queries: diff --git a/src/Gist/Api/Client.php b/src/Gist/Api/Client.php index ca17817..82ed6cd 100644 --- a/src/Gist/Api/Client.php +++ b/src/Gist/Api/Client.php @@ -88,7 +88,7 @@ class Client extends BaseClient public function update($gist, $content) { $response = $this->post( - str_replace('{gist}', $gist, $this->mergeApiKey(self::UPDATE)), + str_replace('{gist}', $gist, $this->mergeApiKey(self::LIST)), array( 'form_params' => array( 'form' => array( diff --git a/src/Gist/Composer/PostInstallHandler.php b/src/Gist/Composer/PostInstallHandler.php deleted file mode 100644 index 366cc24..0000000 --- a/src/Gist/Composer/PostInstallHandler.php +++ /dev/null @@ -1,211 +0,0 @@ - - */ -class PostInstallHandler -{ - public static function execute(Event $event) - { - $helper = new QuestionHelper(); - $input = new ArgvInput(); - $output = new ConsoleOutput(); - $filesystem = new Filesystem(); - - $output->writeln('+==============================+'); - $output->writeln('| GIST Setup |'); - $output->writeln('+==============================+'); - $output->writeln(''); - $output->writeln('1. Database'); - $output->writeln('==========='); - - $configure = true; - if ($filesystem->exists('propel.yaml')) { - $output->writeln('The configuration file exists.'); - $question = new ConfirmationQuestion('Your current configuration will not be merged. Do you want to override it? [y/N] ', false); - $configure = $helper->ask($input, $output, $question); - } else { - $configure = true; - } - - if ($configure) { - $choices = ['MySQL/MariaDB', 'SQLite', 'other']; - $question = new ChoiceQuestion('Which DBMS? ', $choices, 0); - $dbms = $helper->ask($input, $output, $question); - $substitutions = []; - - if ($dbms === 'MySQL/MariaDB') { - $templateName = 'propel.yaml.dist-mysql'; - - $question = new Question('Host: [127.0.0.1] ', '127.0.0.1'); - $substitutions['DATABASE_HOST'] = $helper->ask($input, $output, $question); - - $question = new Question('Database (it must exists!): [gist] ', 'gist'); - $substitutions['DATABASE_NAME'] = $helper->ask($input, $output, $question); - - $question = new Question('Username: [root] ', 'root'); - $substitutions['DATABASE_USERNAME'] = $helper->ask($input, $output, $question); - - $question = new Question('Password: [] ', ''); - $substitutions['DATABASE_PASSWORD'] = $helper->ask($input, $output, $question); - } elseif ($dbms === 'SQLite') { - $defaultPath = getcwd().'/data/gist.sqlite'; - $question = new Question("Ok! Where do you want me to save datas? [$defaultPath] ", $defaultPath); - $substitutions['DATABASE_PATH'] = $helper->ask($input, $output, $question); - $templateName = 'propel.yaml.dist-sqlite'; - } else { - $output->writeln('See README.md to perform the configuration.'); - - return; - } - - $template = file_get_contents('app/config/'.$templateName); - $content = str_replace( - array_keys($substitutions), - array_values($substitutions), - $template - ); - - $done = file_put_contents('propel.yaml', $content) !== false; - - if ($done) { - $output->writeln('Running migration...'); - - foreach (['config:convert', 'model:build --recursive', 'migration:diff --recursive', 'migration:migrate --recursive'] as $arg) { - $command = self::getPhp(true).' ./vendor/propel/propel/bin/propel '.$arg; - $process = new Process($command); - $process->run(); - - if (!$process->isSuccessful()) { - $output->writeln('An error occured while executing:'); - $output->writeln($command); - $output->writeln('To perform the configuration. See README.md.'); - - return; - } - } - - $output->writeln('Done!'); - } else { - $output->writeln('An error occured. See README.md to perform the configuration.'); - } - } - - $output->writeln(''); - $output->writeln('2. Application'); - $output->writeln('=============='); - - $configure = true; - if ($filesystem->exists('app/config/config.yml')) { - $output->writeln('The configuration file exists.'); - $question = new ConfirmationQuestion('Your current configuration will not be merged. Do you want to override it? [y/N] ', false); - $configure = $helper->ask($input, $output, $question); - } else { - $configure = true; - } - - if ($configure) { - $output->writeln(''); - $output->writeln(' 2.1 Security'); - $output->writeln('-------------'); - - $token = str_shuffle(sha1(microtime().uniqid())); - - $question = new ConfirmationQuestion('Registration enabled: [Y/n] ', true); - $enableRegistration = $helper->ask($input, $output, $question); - - $question = new ConfirmationQuestion('Login enabled: [Y/n] ', true); - $enableLogin = $helper->ask($input, $output, $question); - - $question = new ConfirmationQuestion('Login required to edit a gist: [y/N] ', false); - $loginRequiredToEditGist = $helper->ask($input, $output, $question); - - $question = new ConfirmationQuestion('Login required to view a gist: [y/N] ', false); - $loginRequiredToViewGist = $helper->ask($input, $output, $question); - - $question = new ConfirmationQuestion('Login required to view an embeded gist: [y/N] ', false); - $loginRequiredToViewEmbededGist = $helper->ask($input, $output, $question); - - $output->writeln(''); - $output->writeln(' 2.2 API'); - $output->writeln('--------'); - - $question = new ConfirmationQuestion('API enabled: [Y/n] ', true); - $apiEnabled = $helper->ask($input, $output, $question); - - if ($apiEnabled) { - $question = new ConfirmationQuestion('API key required: [y/N] ', false); - $apikeyRequired = $helper->ask($input, $output, $question); - } else { - $apikeyRequired = false; - } - - $question = new Question('[Client] API base URL: [https://gist.deblan.org/] ', 'https://gist.deblan.org/'); - $apiBaseUrl = $helper->ask($input, $output, $question); - - $question = new Question('[Client] API key: [] ', ''); - $apiClientApiKey = $helper->ask($input, $output, $question); - - $configuration = [ - 'security' => [ - 'token' => $token, - 'enable_registration' => $enableRegistration, - 'enable_login' => $enableLogin, - 'login_required_to_edit_gist' => $loginRequiredToEditGist, - 'login_required_to_view_gist' => $loginRequiredToViewGist, - 'login_required_to_view_embeded_gist' => $loginRequiredToViewEmbededGist, - ], - 'api' => [ - 'enabled' => $apiEnabled, - 'api_key_required' => $apikeyRequired, - 'base_url' => $apiBaseUrl, - 'client' => [ - 'api_key' => $apiClientApiKey, - ], - ], - 'data' => [ - 'path' => 'data/git', - ], - 'git' => [ - 'path' => '/usr/bin/git', - ], - 'theme' => [ - 'name' => 'dark', - ], - ]; - - $content = (new Yaml())->dump($configuration); - - $done = file_put_contents('app/config/config.yml', $content); - } - - $output->writeln(''); - $output->writeln('Configuration finished!'); - } - - protected static function getPhp($includeArgs = true) - { - $phpFinder = new PhpExecutableFinder(); - if (!$phpPath = $phpFinder->find($includeArgs)) { - throw new \RuntimeException('The php executable could not be found, add it to your PATH environment variable and try again'); - } - - return $phpPath; - } -} diff --git a/src/Gist/Controller/ApiController.php b/src/Gist/Controller/ApiController.php index 283a616..89e18e1 100644 --- a/src/Gist/Controller/ApiController.php +++ b/src/Gist/Controller/ApiController.php @@ -158,16 +158,12 @@ class ApiController extends Controller return $this->invalidMethodResponse('POST method is required.'); } - $query = GistQuery::create() - ->filterByCipher(false); - - if (ctype_digit($gist)) { - $query->filterById((int) $gist); - } else { - $query->filterByFile($gist); - } - - $gist = $query->findOne(); + $gist = GistQuery::create() + ->filterByCipher(false) + ->filterById((int) $gist) + ->_or() + ->filterByFile($gist) + ->findOne(); if (!$gist) { return $this->invalidRequestResponse('Invalid Gist'); diff --git a/src/Gist/Controller/Controller.php b/src/Gist/Controller/Controller.php index c13fd38..5e71381 100644 --- a/src/Gist/Controller/Controller.php +++ b/src/Gist/Controller/Controller.php @@ -20,27 +20,6 @@ abstract class Controller */ protected $app; - /** - * @var array - */ - protected $types = [ - 'html', - 'css', - 'javascript', - 'php', - 'sql', - 'xml', - 'yaml', - 'markdown', - 'perl', - 'c', - 'asp', - 'python', - 'bash', - 'actionscript3', - 'text', - ]; - /** * __construct. * @@ -109,7 +88,6 @@ abstract class Controller return array( 'gist' => $gist, 'type' => $gist->getType(), - 'types' => $this->types, 'history' => $history, 'commit' => $commit, 'raw_content' => $content, @@ -158,6 +136,7 @@ abstract class Controller $app = $this->getApp(); if (!empty($request)) { + } $securityContext = $app['security.token_storage']; @@ -201,32 +180,4 @@ abstract class Controller $params ); } - - /** - * Creates a Response. - * - * @param string $template - * @param array $params - * - * @return Response - */ - public function createResponse($template, array $params = null) - { - $body = $this->render($template, $params); - - $response = new Response($body); - - if (empty($params['no_cache'])) { - $ttl = 3600 * 24 * 7; - $etag = sha1($response->getContent()); - - $response->setTtl($ttl); - $response->setClientTtl($ttl); - $response->setExpires(new \DateTime('now +7 days')); - $response->setLastModified(new \DateTime('now')); - $response->setEtag($etag, true); - } - - return $response; - } } diff --git a/src/Gist/Controller/EditController.php b/src/Gist/Controller/EditController.php index bafdf49..1767dce 100644 --- a/src/Gist/Controller/EditController.php +++ b/src/Gist/Controller/EditController.php @@ -9,7 +9,6 @@ use Gist\Model\Gist; use GitWrapper\GitException; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\Form\FormError; -use Symfony\Component\HttpFoundation\Response; /** * Class EditController. @@ -23,7 +22,7 @@ class EditController extends Controller * * @param Request $request * - * @return Response + * @return string */ public function createAction(Request $request) { @@ -55,12 +54,11 @@ class EditController extends Controller } } - return $this->createResponse( + return $this->render( 'Edit/index.html.twig', array( 'gist' => isset($gist) ? $gist : null, 'form' => $form->createView(), - 'no_cache' => true, ) ); } @@ -70,7 +68,7 @@ class EditController extends Controller * * @param Request $request * - * @return Response + * @return string */ public function cloneAction(Request $request, $gist, $commit) { @@ -110,8 +108,7 @@ class EditController extends Controller } $viewOptions['form'] = $form->createView(); - $viewOptions['no_cache'] = true; - return $this->createResponse('Edit/clone.html.twig', $viewOptions); + return $this->render('Edit/clone.html.twig', $viewOptions); } } diff --git a/src/Gist/Controller/LoginController.php b/src/Gist/Controller/LoginController.php index eecff06..f835306 100644 --- a/src/Gist/Controller/LoginController.php +++ b/src/Gist/Controller/LoginController.php @@ -20,7 +20,7 @@ class LoginController extends Controller * * @param Request $request * - * @return Response + * @return string */ public function registerAction(Request $request) { @@ -57,13 +57,12 @@ class LoginController extends Controller } } - return $this->createResponse( + return $this->render( 'Login/register.html.twig', [ 'form' => $form->createView(), 'error' => isset($error) ? $error : '', 'success' => isset($success) ? $success : '', - 'no_cache' => true, ] ); } @@ -73,7 +72,7 @@ class LoginController extends Controller * * @param Request $request * - * @return Response + * @return string */ public function loginAction(Request $request) { @@ -98,12 +97,11 @@ class LoginController extends Controller $error = $app['translator']->trans('login.login.invalid'); } - return $this->createResponse( + return $this->render( 'Login/login.html.twig', [ 'form' => $form->createView(), 'error' => isset($error) ? $error : '', - 'no_cache' => true, ] ); } diff --git a/src/Gist/Controller/MyController.php b/src/Gist/Controller/MyController.php index b3224a5..d59f315 100644 --- a/src/Gist/Controller/MyController.php +++ b/src/Gist/Controller/MyController.php @@ -7,7 +7,6 @@ use Gist\Form\DeleteGistForm; use Gist\Form\FilterGistForm; use Gist\Form\UserPasswordForm; use Symfony\Component\HttpFoundation\RedirectResponse; -use Symfony\Component\HttpFoundation\Response; /** * Class MyController. @@ -22,7 +21,7 @@ class MyController extends Controller * @param Request $request * @param int $page * - * @return Response + * @return string */ public function myAction(Request $request, $page) { @@ -63,7 +62,7 @@ class MyController extends Controller if (empty($apiKey)) { $regenerateApiKey = true; - } + } // FIXME: CSRF issue! elseif ($request->request->get('apiKey') === $apiKey && $request->request->has('generateApiKey')) { $regenerateApiKey = true; @@ -120,7 +119,7 @@ class MyController extends Controller } } - return $this->createResponse( + return $this->render( 'My/my.html.twig', array( 'gists' => $gists, @@ -130,7 +129,6 @@ class MyController extends Controller 'filterForm' => $filterForm->createView(), 'passwordForm' => $passwordForm->createView(), 'deleted' => !empty($deleted), - 'no_cache' => true, ) ); } diff --git a/src/Gist/Controller/ViewController.php b/src/Gist/Controller/ViewController.php index 8ea5002..44aeedc 100644 --- a/src/Gist/Controller/ViewController.php +++ b/src/Gist/Controller/ViewController.php @@ -31,18 +31,7 @@ class ViewController extends Controller $viewOptions = $this->getViewOptions($request, $gist, $commit); if (is_array($viewOptions)) { - if ($request->query->has('type')) { - $type = $request->query->get('type'); - - if (in_array($type, $this->types)) { - $viewOptions['gist']->setType($type); - $viewOptions['type_overrided'] = true; - } - } - - $viewOptions['no_cache'] = true; - - return $this->createResponse('View/view.html.twig', $viewOptions); + return $this->render('View/view.html.twig', $viewOptions); } else { return $this->notFoundResponse(); } @@ -64,16 +53,7 @@ class ViewController extends Controller $viewOptions = $this->getViewOptions($request, $gist, $commit); if (is_array($viewOptions)) { - if ($request->query->has('type')) { - $type = $request->query->get('type'); - - if (in_array($type, $this->types)) { - $viewOptions['gist']->setType($type); - $viewOptions['type_overrided'] = true; - } - } - - return $this->createResponse('View/embed.html.twig', $viewOptions); + return $app['twig']->render('View/embed.html.twig', $viewOptions); } else { return $this->notFoundResponse(); } @@ -86,25 +66,19 @@ class ViewController extends Controller * @param string $gist Gist's ID * @param string $commit The commit * - * @return Response + * @return string|Response */ public function embedJsAction(Request $request, $gist, $commit) { $viewOptions = $this->getViewOptions($request, $gist, $commit); - if ($request->query->has('type')) { - $type = $request->query->get('type'); - - if (in_array($type, $this->types)) { - $viewOptions['gist']->setType($type); - $viewOptions['type_overrided'] = true; - } - } - - $response = $this->createResponse('View/embedJs.html.twig', $viewOptions); - $response->headers->set('Content-Type', 'text/javascript'); - - return $response; + return new Response( + $this->render('View/embedJs.html.twig', $viewOptions), + 200, + array( + 'Content-Type' => 'text/javascript', + ) + ); } /** @@ -114,7 +88,7 @@ class ViewController extends Controller * @param string $gist Gist's ID * @param string $commit The commit * - * @return Response + * @return string|Response */ public function rawAction(Request $request, $gist, $commit) { @@ -140,7 +114,7 @@ class ViewController extends Controller * @param string $gist Gist's ID * @param string $commit The commit * - * @return Response + * @return string|Response */ public function downloadAction(Request $request, $gist, $commit) { @@ -159,8 +133,7 @@ class ViewController extends Controller 'Content-Disposition' => sprintf('filename=%s.%s', $gist->getFile(), $gist->getTypeAsExtension()), 'Content-Length' => mb_strlen($viewOptions['raw_content']), 'Content-Type' => 'application/force-download', - ), - false + ) ); } else { return $this->notFoundResponse($app); @@ -173,7 +146,7 @@ class ViewController extends Controller * @param Request $request * @param string $gist Gist's ID * - * @return Response + * @return string|Response */ public function revisionsAction(Request $request, $gist) { @@ -191,7 +164,7 @@ class ViewController extends Controller return $this->notFoundResponse(); } - return $this->createResponse( + return $this->render( 'View/revisions.html.twig', array( 'gist' => $gist, diff --git a/src/Gist/Form/CreateGistForm.php b/src/Gist/Form/CreateGistForm.php index 3972796..060f444 100644 --- a/src/Gist/Form/CreateGistForm.php +++ b/src/Gist/Form/CreateGistForm.php @@ -97,7 +97,6 @@ class CreateGistForm extends AbstractForm 'sql' => '', 'xml' => '', 'yaml' => '', - 'markdown' => '', 'perl' => '', 'c' => '', 'asp' => '', diff --git a/src/Gist/Model/Gist.php b/src/Gist/Model/Gist.php index 90d8259..54142bc 100644 --- a/src/Gist/Model/Gist.php +++ b/src/Gist/Model/Gist.php @@ -75,7 +75,6 @@ class Gist extends BaseGist 'bash' => 'sh', 'actionscript3' => 'as', 'text' => 'txt', - 'markdown' => 'md', ); return str_replace(array_keys($data), array_values($data), $this->getType()); diff --git a/src/Gist/Resources/public b/src/Gist/Resources/public deleted file mode 120000 index 55a9cd7..0000000 --- a/src/Gist/Resources/public +++ /dev/null @@ -1 +0,0 @@ -../../../web/app/ \ No newline at end of file diff --git a/src/Gist/Resources/views/View/embed.html.twig b/src/Gist/Resources/views/View/embed.html.twig index d1ee417..44ff7df 100644 --- a/src/Gist/Resources/views/View/embed.html.twig +++ b/src/Gist/Resources/views/View/embed.html.twig @@ -3,7 +3,7 @@ {% block css %} {{ parent() }} - + {% if theme_settings.name == 'dark' %} @@ -31,12 +31,6 @@ {% block nav %}{% endblock %} {% block body %} - {% set routeParams = app.request.attributes.get('_route_params') %} - - {% if type_overrided is defined %} - {% set routeParams = routeParams|merge({type: gist.type}) %} - {% endif %} -
- {{ commit|slice(0, 10) }} + {{ commit|slice(0, 10) }} {% if not gist.cipher %} - + {{ 'gist.action.raw'|trans }} - + {{ 'gist.action.download'|trans }} {% endif %} - + {{ 'gist.action.clone'|trans }} @@ -107,7 +101,7 @@
-
{{ raw_content }}
+
{{ raw_content }}
diff --git a/src/Gist/Resources/views/View/embedJs.html.twig b/src/Gist/Resources/views/View/embedJs.html.twig index 8e55f0b..af08fd9 100644 --- a/src/Gist/Resources/views/View/embedJs.html.twig +++ b/src/Gist/Resources/views/View/embedJs.html.twig @@ -1,16 +1,10 @@ -{% set routeParams = app.request.attributes.get('_route_params') %} - -{% if type_overrided is defined %} - {% set routeParams = routeParams|merge({type: gist.type}) %} -{% endif %} - (function() { var iFrameResizeLoaded = function() { var div = document.getElementById('gist-{{ gist.file }}-{{ commit }}'); var iframeId = 'gist-' + (Math.floor(Math.random() * (10000 - 1)) + 1).toString(); var iframe = document.createElement('iframe'); - var url = '{{ app.request.getSchemeAndHttpHost() ~ path('embed', routeParams) }}'; - + var url = '{{ app.request.getSchemeAndHttpHost() ~ path('embed', app.request.attributes.get('_route_params')) }}'; + if (div.getAttribute('data-key')) { url = [url, div.getAttribute('data-key')].join(''); } diff --git a/src/Gist/Resources/views/View/revisions.html.twig b/src/Gist/Resources/views/View/revisions.html.twig index 3b8c2b4..e1d2766 100644 --- a/src/Gist/Resources/views/View/revisions.html.twig +++ b/src/Gist/Resources/views/View/revisions.html.twig @@ -82,7 +82,7 @@ {% if gist.cipher %} - + ' }} +' }}
diff --git a/src/Gist/Resources/views/base.html.twig b/src/Gist/Resources/views/base.html.twig index 6bebf64..aedcedb 100644 --- a/src/Gist/Resources/views/base.html.twig +++ b/src/Gist/Resources/views/base.html.twig @@ -81,7 +81,7 @@ {% block langs %}
"})}}(); +!function(){if(("undefined"==typeof self||self.Prism)&&("undefined"==typeof global||global.Prism)){var e={css:!0,less:!0,sass:[{lang:"sass",inside:"inside",before:"punctuation",root:Prism.languages.sass&&Prism.languages.sass["variable-line"]},{lang:"sass",inside:"inside",root:Prism.languages.sass&&Prism.languages.sass["property-line"]}],scss:!0,stylus:[{lang:"stylus",before:"hexcode",inside:"rest",root:Prism.languages.stylus&&Prism.languages.stylus["property-declaration"].inside},{lang:"stylus",before:"hexcode",inside:"rest",root:Prism.languages.stylus&&Prism.languages.stylus["variable-declaration"].inside}]};Prism.hooks.add("before-highlight",function(r){if(r.language&&e[r.language]&&!e[r.language].initialized){var s=e[r.language];"Array"!==Prism.util.type(s)&&(s=[s]),s.forEach(function(s){var i,a,n,t;s===!0?(i="important",a=r.language,s=r.language):(i=s.before||"important",a=s.inside||s.lang,n=s.root||Prism.languages,t=s.skip,s=r.language),!t&&Prism.languages[s]&&(Prism.languages.insertBefore(a,i,{easing:/\bcubic-bezier\((?:-?\d*\.?\d+,\s*){3}-?\d*\.?\d+\)\B|\b(?:linear|ease(?:-in)?(?:-out)?)(?=\s|[;}]|$)/i},n),r.grammar=Prism.languages[s],e[r.language]={initialized:!0})})}}),Prism.plugins.Previewer&&new Prism.plugins.Previewer("easing",function(e){e={linear:"0,0,1,1",ease:".25,.1,.25,1","ease-in":".42,0,1,1","ease-out":"0,0,.58,1","ease-in-out":".42,0,.58,1"}[e]||e;var r=e.match(/-?\d*\.?\d+/g);if(4===r.length){r=r.map(function(e,r){return 100*(r%2?1-e:e)}),this.querySelector("path").setAttribute("d","M0,100 C"+r[0]+","+r[1]+", "+r[2]+","+r[3]+", 100,0");var s=this.querySelectorAll("line");return s[0].setAttribute("x2",r[0]),s[0].setAttribute("y2",r[1]),s[1].setAttribute("x2",r[2]),s[1].setAttribute("y2",r[3]),!0}return!1},"*",function(){this._elt.innerHTML=''})}}(); +!function(){if(("undefined"==typeof self||self.Prism)&&("undefined"==typeof global||global.Prism)){var s={css:!0,less:!0,markup:{lang:"markup",before:"punctuation",inside:"inside",root:Prism.languages.markup&&Prism.languages.markup.tag.inside["attr-value"]},sass:[{lang:"sass",inside:"inside",root:Prism.languages.sass&&Prism.languages.sass["property-line"]},{lang:"sass",before:"operator",inside:"inside",root:Prism.languages.sass&&Prism.languages.sass["variable-line"]}],scss:!0,stylus:[{lang:"stylus",before:"hexcode",inside:"rest",root:Prism.languages.stylus&&Prism.languages.stylus["property-declaration"].inside},{lang:"stylus",before:"hexcode",inside:"rest",root:Prism.languages.stylus&&Prism.languages.stylus["variable-declaration"].inside}]};Prism.hooks.add("before-highlight",function(e){if(e.language&&s[e.language]&&!s[e.language].initialized){var a=s[e.language];"Array"!==Prism.util.type(a)&&(a=[a]),a.forEach(function(a){var i,r,n,l;a===!0?(i="important",r=e.language,a=e.language):(i=a.before||"important",r=a.inside||a.lang,n=a.root||Prism.languages,l=a.skip,a=e.language),!l&&Prism.languages[a]&&(Prism.languages.insertBefore(r,i,{time:/(?:\b|\B-|(?=\B\.))\d*\.?\d+m?s\b/i},n),e.grammar=Prism.languages[a],s[e.language]={initialized:!0})})}}),Prism.plugins.Previewer&&new Prism.plugins.Previewer("time",function(s){var e=parseFloat(s),a=s.match(/[a-z]+$/i);return e&&a?(a=a[0],this.querySelector("circle").style.animationDuration=2*e+a,!0):!1},"*",function(){this._elt.innerHTML=''})}}(); +!function(){if(("undefined"==typeof self||self.Prism)&&("undefined"==typeof global||global.Prism)){var a={css:!0,less:!0,markup:{lang:"markup",before:"punctuation",inside:"inside",root:Prism.languages.markup&&Prism.languages.markup.tag.inside["attr-value"]},sass:[{lang:"sass",inside:"inside",root:Prism.languages.sass&&Prism.languages.sass["property-line"]},{lang:"sass",before:"operator",inside:"inside",root:Prism.languages.sass&&Prism.languages.sass["variable-line"]}],scss:!0,stylus:[{lang:"stylus",before:"func",inside:"rest",root:Prism.languages.stylus&&Prism.languages.stylus["property-declaration"].inside},{lang:"stylus",before:"func",inside:"rest",root:Prism.languages.stylus&&Prism.languages.stylus["variable-declaration"].inside}]};Prism.hooks.add("before-highlight",function(s){if(s.language&&a[s.language]&&!a[s.language].initialized){var e=a[s.language];"Array"!==Prism.util.type(e)&&(e=[e]),e.forEach(function(e){var i,r,n,g;e===!0?(i="important",r=s.language,e=s.language):(i=e.before||"important",r=e.inside||e.lang,n=e.root||Prism.languages,g=e.skip,e=s.language),!g&&Prism.languages[e]&&(Prism.languages.insertBefore(r,i,{angle:/(?:\b|\B-|(?=\B\.))\d*\.?\d+(?:deg|g?rad|turn)\b/i},n),s.grammar=Prism.languages[e],a[s.language]={initialized:!0})})}}),Prism.plugins.Previewer&&new Prism.plugins.Previewer("angle",function(a){var s,e,i=parseFloat(a),r=a.match(/[a-z]+$/i);if(!i||!r)return!1;switch(r=r[0]){case"deg":s=360;break;case"grad":s=400;break;case"rad":s=2*Math.PI;break;case"turn":s=1}return e=100*i/s,e%=100,this[(0>i?"set":"remove")+"Attribute"]("data-negative",""),this.querySelector("circle").style.strokeDasharray=Math.abs(e)+",500",!0},"*",function(){this._elt.innerHTML=''})}}(); diff --git a/web/components/bootstrap b/web/components/bootstrap deleted file mode 120000 index 379a160..0000000 --- a/web/components/bootstrap +++ /dev/null @@ -1 +0,0 @@ -../../node_modules/bootstrap \ No newline at end of file diff --git a/web/components/diff b/web/components/diff deleted file mode 120000 index 6966ded..0000000 --- a/web/components/diff +++ /dev/null @@ -1 +0,0 @@ -../../node_modules/diff \ No newline at end of file diff --git a/web/components/flag-icon-css b/web/components/flag-icon-css deleted file mode 120000 index 325c10a..0000000 --- a/web/components/flag-icon-css +++ /dev/null @@ -1 +0,0 @@ -../../node_modules/flag-icon-css \ No newline at end of file diff --git a/web/components/iframe-resizer b/web/components/iframe-resizer deleted file mode 120000 index 72ea9a9..0000000 --- a/web/components/iframe-resizer +++ /dev/null @@ -1 +0,0 @@ -../../node_modules/iframe-resizer \ No newline at end of file diff --git a/web/components/jquery b/web/components/jquery deleted file mode 120000 index ee57ada..0000000 --- a/web/components/jquery +++ /dev/null @@ -1 +0,0 @@ -../../node_modules/jquery \ No newline at end of file diff --git a/web/index.php b/web/index.php index d66b7a8..5dd7e92 100644 --- a/web/index.php +++ b/web/index.php @@ -4,4 +4,4 @@ $app = require __DIR__.'/../app/bootstrap.php'; $app['env'] = 'prod'; -$app['http_cache']->run(); +$app->run();