diff --git a/.env.example b/.env.example index ab41ae569..e2234aaba 100644 --- a/.env.example +++ b/.env.example @@ -2,11 +2,11 @@ PRODUCTION=false # Database Access Info DB_HOST=localhost -DB_USER=mlpvc-rr +DB_USER=winterchilla DB_PASS=example-password -DB_NAME=mlpvc-rr +DB_NAME=winterchilla -# Log path - relative to the "logs" directory, e.g. "error.log" == "/var/www/MLPVC-RR/logs/error.log" +# Log path - relative to the "logs" directory, e.g. "error.log" == "/var/www/Winterchilla/logs/error.log" LOG_PATH=error.log DISABLE_MONOLOG=true diff --git a/.travis.yml b/.travis.yml index c9ecdef97..d5191c26e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,9 +9,9 @@ install: services: - postgresql before_script: - - psql -c 'CREATE DATABASE "mlpvc-rr";' -U postgres - - psql -c "CREATE USER \"mlpvc-rr\" WITH LOGIN PASSWORD 'example-password'" -U postgres - - psql "mlpvc-rr" < ./setup/create_extensions.pg.sql + - psql -c 'CREATE DATABASE "winterchilla";' -U postgres + - psql -c "CREATE USER \"winterchilla\" WITH LOGIN PASSWORD 'example-password'" -U postgres + - psql "winterchilla" < ./setup/create_extensions.pg.sql - vendor/bin/phinx migrate dist: xenial addons: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 65da47bca..f0545100a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,4 @@ -# Contributing to MLPVC-RR +# Contributing ## Contributions are welcome, but not expected @@ -10,7 +10,7 @@ I wanted to be as transparent as I could be to signify that I'm not doing this i The lack of this explanation along with my immaturity has caused some confusion during the time I got my first set of contributions, which made me outright "ban" them to the best of my ability. However, as the years passed I've gradually become more familiar with what "open source" truly means, and I realized that being so conservative might not be the best path going forward. -In addition to the reasons above, due to the fact that setting the development environment up is quite a lengthy process I wouldn't expect anyone to go through all the trouble just to be able to help out, so that's why I would rather encourage you to [submit an issue](https://github.com/ponydevs/MLPVC-RR/issues/new) instead if you have any feature ideas or bug reports, and I'll see what I can do. If you do take your time to write up something useful, be it an issue or a PR, and your suggestions/changes makes it into the project, I'll be sure include your name in a dedicated section at the end of [README.md](README.md#thanks-to) as a way to thank you for your work (unless you explicitly ask me not to). +In addition to the reasons above, due to the fact that setting the development environment up is quite a lengthy process I wouldn't expect anyone to go through all the trouble just to be able to help out, so that's why I would rather encourage you to [submit an issue](https://github.com/MLP-VectorClub/Winterchilla/issues/new) instead if you have any feature ideas or bug reports, and I'll see what I can do. If you do take your time to write up something useful, be it an issue or a PR, and your suggestions/changes makes it into the project, I'll be sure include your name in a dedicated section at the end of [README.md](README.md#thanks-to) as a way to thank you for your work (unless you explicitly ask me not to). ## What you'll need @@ -47,10 +47,10 @@ $ psql psql (9.6.3) Type "help" for help. -postgres=# CREATE USER "mlpvc-rr" WITH LOGIN PASSWORD ''; -postgres=# CREATE DATABASE "mlpvc-rr" WITH OWNER "mlpvc-rr"; -postgres=# \c "mlpvc-rr" -postgres=# \i /var/www/MLPVC-RR/setup/create_extensions.pg.sql +postgres=# CREATE USER "winterchilla" WITH LOGIN PASSWORD ''; +postgres=# CREATE DATABASE "winterchilla" WITH OWNER "winterchilla"; +postgres=# \c "winterchilla" +postgres=# \i /var/www/Winterchilla/setup/create_extensions.pg.sql postgres=# \q $ exit ``` @@ -97,7 +97,7 @@ The `php7.3-fpm` package is used used by the provided `setup/nginx.conf` configu Replace `domain.tld` with the domain of your choice, and change `/path/to/*` placeholders appropriately. `/path/to/www` is the `www` directory of this repository, and `/path/to/error.log` should point to a file in the `logs` directory. The site assumes that this isn't the only site running on your machine, so you'll have to add your domain to your `/etc/hosts` file (`C:\Windows\System32\drivers\etc\hosts` on Windows) on all machines where you want to reach the server from. ``` -$ cd /var/www/MLPVC-RR +$ cd /var/www/Winterchilla $ dir composer.json fs LICENSE package-lock.json setup composer.lock graphics logs phinx.php tests @@ -158,6 +158,6 @@ Host production.vps Port User IdentityFile ~/.ssh/id_rsa -$ git remote add production production.vps:/var/www/MLPVC-RR/ +$ git remote add production production.vps:/var/www/Winterchilla/ $ git push production ``` diff --git a/README.md b/README.md index 73f1572ba..40a8d0984 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,8 @@ -# MLPVC-RR [![Build Status](https://travis-ci.org/SeinopSys/MLPVC-RR.svg?branch=master)](https://travis-ci.org/SeinopSys/MLPVC-RR) +# Winterchilla [![Build Status](https://travis-ci.org/MLP-VectorClub/Winterchilla.svg?branch=master)](https://travis-ci.org/MLP-VectorClub/Winterchilla) + +PHP-rendered classic web app powering the MLP Vector Club's website since 2015. + +> “When the sun goes down, it transforms into a giant, monstrous version of itself.”
*— [Source](https://mlp.fandom.com/wiki/Creatures#Winterchilla)* ## Attributions diff --git a/app/DeviantArt.php b/app/DeviantArt.php index cac2c3e45..9f7c290f4 100644 --- a/app/DeviantArt.php +++ b/app/DeviantArt.php @@ -51,7 +51,7 @@ public static function OAuthProviderInstance() { public static function request($endpoint, $token = null, $postdata = null) { global $http_response_header; - $requestHeaders = ['Accept-Encoding: gzip', 'User-Agent: MLPVC-RR @ '.GITHUB_URL]; + $requestHeaders = ['Accept-Encoding: gzip', 'User-Agent: Winterchilla @ '.GITHUB_URL]; if ($token === null && Auth::$signed_in) $token = Auth::$session->access; if (!empty($token)) diff --git a/assets/js/jquery.ctxmenu.js b/assets/js/jquery.ctxmenu.js index cd3a700dd..f4c44aa83 100644 --- a/assets/js/jquery.ctxmenu.js +++ b/assets/js/jquery.ctxmenu.js @@ -1,4 +1,4 @@ -/* Context menu plugin | by @SeinopSys | for gh:ponydevs/MLPVC-RR | utilizes: http://stackoverflow.com/a/30255040/1344955 */ +/* Context menu plugin | by @SeinopSys | for gh:MLP-VectorClub/Winterchilla | utilizes: http://stackoverflow.com/a/30255040/1344955 */ (function($) { 'use strict'; let $ctxmenu = $.mk('div').attr('id', 'ctxmenu'); diff --git a/assets/js/jquery.uploadzone.js b/assets/js/jquery.uploadzone.js index 4138e94c5..b1b670bc8 100644 --- a/assets/js/jquery.uploadzone.js +++ b/assets/js/jquery.uploadzone.js @@ -1,4 +1,4 @@ -/* Image upload plugin w/ drag'n'drop support | by @SeinopSys | for gh:ponydevs/MLPVC-RR */ +/* Image upload plugin w/ drag'n'drop support | by @SeinopSys | for gh:MLP-VectorClub/Winterchilla */ /* global File */ (function() { 'use strict'; diff --git a/assets/js/pages/colorguide/picker-frame.js b/assets/js/pages/colorguide/picker-frame.js index f6ad66675..beecc2c25 100644 --- a/assets/js/pages/colorguide/picker-frame.js +++ b/assets/js/pages/colorguide/picker-frame.js @@ -1,4 +1,4 @@ -/* Color Picker | by @SeinopSys + Trildar & Masem | for gh:ponydevs/MLPVC-RR */ +/* Color Picker | by @SeinopSys + Trildar & Masem | for gh:MLP-VectorClub/Winterchilla */ (function($, undefined) { 'use strict'; diff --git a/composer.json b/composer.json index 89c413829..5ea624837 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "seinopsys/mlpvc-rr", + "name": "mlp-vectorclub/winterchilla", "type": "project", "license": "MIT", "authors": [ diff --git a/config/constants.php b/config/constants.php index 0756340ca..491b27af6 100644 --- a/config/constants.php +++ b/config/constants.php @@ -11,7 +11,7 @@ define('ABSPATH', ORIGIN.'/'); require __DIR__.'/init/path-constants.php'; define('POST_REQUEST', ($_SERVER['REQUEST_METHOD'] ?? 'GET') === 'POST'); -define('GITHUB_PROJECT_NAME', 'ponydevs/MLPVC-RR'); +define('GITHUB_PROJECT_NAME', 'MLP-VectorClub/Winterchilla'); define('GITHUB_URL', 'https://github.com/'.GITHUB_PROJECT_NAME); define('SITE_TITLE', 'MLP Vector Club'); define('SVGO_BINARY', PROJPATH.'node_modules/svgo/bin/svgo'); diff --git a/package-lock.json b/package-lock.json index 03b760f89..0150a5b3c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "mlpvc-rr", + "name": "winterchilla", "version": "1.0.0", "lockfileVersion": 1, "requires": true, @@ -2448,10 +2448,13 @@ } }, "eslint-utils": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz", - "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==", - "dev": true + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.2.tgz", + "integrity": "sha512-eAZS2sEUMlIeCjBeubdj45dmBHQwPHWyBcT1VSYB7o9x9WRRqKxyUoiXlRjyAwzN7YEzHJlYg0NmzDRWx6GP4Q==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^1.0.0" + } }, "eslint-visitor-keys": { "version": "1.0.0", diff --git a/package.json b/package.json index b4c5aa0de..b97f2e124 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,6 @@ { - "name": "mlpvc-rr", + "name": "winterchilla", "version": "1.0.0", - "description": "An automated system for handling requests & reservations, made for MLP-VectorClub", "homepage": "https://mlpvector.club", "dependencies": { "@babel/core": "^7.4.3", @@ -44,9 +43,6 @@ "author": "SeinopSys (https://github.com/SeinopSys)", "license": "MIT", "private": true, - "engines": { - "yarn": "YARN NO LONGER USED - use npm instead." - }, "scripts": { "build": "gulp default", "watch": "gulp watch", diff --git a/templates/layout/_footer_git_info.html.twig b/templates/layout/_footer_git_info.html.twig index 177eec455..4ba92eb50 100644 --- a/templates/layout/_footer_git_info.html.twig +++ b/templates/layout/_footer_git_info.html.twig @@ -2,7 +2,7 @@ ✱ {%- endset %} -Running MLPVC-RR +Running {{ constant('GITHUB_URL') | split('/') | last }} {%- if commit_id is defined -%} @{{ commit_id }} {%- endif -%}