Skip to content

Commit

Permalink
Rebrand project
Browse files Browse the repository at this point in the history
  • Loading branch information
SeinopSys committed Sep 7, 2019
1 parent 4c007ff commit 23ae8ac
Show file tree
Hide file tree
Showing 13 changed files with 35 additions and 32 deletions.
6 changes: 3 additions & 3 deletions .env.example
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions .travis.yml
Expand Up @@ -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:
Expand Down
16 changes: 8 additions & 8 deletions CONTRIBUTING.md
@@ -1,4 +1,4 @@
# Contributing to MLPVC-RR
# Contributing

## Contributions are welcome, but not expected

Expand All @@ -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

Expand Down Expand Up @@ -47,10 +47,10 @@ $ psql
psql (9.6.3)
Type "help" for help.
postgres=# CREATE USER "mlpvc-rr" WITH LOGIN PASSWORD '<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 '<password>';
postgres=# CREATE DATABASE "winterchilla" WITH OWNER "winterchilla";
postgres=# \c "winterchilla"
postgres=# \i /var/www/Winterchilla/setup/create_extensions.pg.sql
postgres=# \q
$ exit
```
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -158,6 +158,6 @@ Host production.vps
Port <port>
User <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
```
6 changes: 5 additions & 1 deletion 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.

> &ldquo;When the sun goes down, it transforms into a giant, monstrous version of itself.&rdquo;<br>*&mdash; [Source](https://mlp.fandom.com/wiki/Creatures#Winterchilla)*
## Attributions

Expand Down
2 changes: 1 addition & 1 deletion app/DeviantArt.php
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion 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');
Expand Down
2 changes: 1 addition & 1 deletion 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';
Expand Down
2 changes: 1 addition & 1 deletion 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';

Expand Down
2 changes: 1 addition & 1 deletion composer.json
@@ -1,5 +1,5 @@
{
"name": "seinopsys/mlpvc-rr",
"name": "mlp-vectorclub/winterchilla",
"type": "project",
"license": "MIT",
"authors": [
Expand Down
2 changes: 1 addition & 1 deletion config/constants.php
Expand Up @@ -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');
Expand Down
13 changes: 8 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions 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",
Expand Down Expand Up @@ -44,9 +43,6 @@
"author": "SeinopSys <seinopsys@gmail.com> (https://github.com/SeinopSys)",
"license": "MIT",
"private": true,
"engines": {
"yarn": "YARN NO LONGER USED - use npm instead."
},
"scripts": {
"build": "gulp default",
"watch": "gulp watch",
Expand Down
2 changes: 1 addition & 1 deletion templates/layout/_footer_git_info.html.twig
Expand Up @@ -2,7 +2,7 @@
<sup style="cursor:help" title="The website has been updated, you should reload to get any new features/fixes">&#x2731;</sup>
{%- endset %}
<span id='git-info'>
Running <strong><a href='{{ constant('GITHUB_URL') }}' title='Visit the GitHub repository'>MLPVC-RR</a>
Running <strong><a href='{{ constant('GITHUB_URL') }}' title='Visit the GitHub repository'>{{ constant('GITHUB_URL') | split('/') | last }}</a>
{%- if commit_id is defined -%}
@<a href='{{ constant('GITHUB_URL') }}/commit/{{ commit_id }}' title='See exactly what was changed and why'>{{ commit_id }}</a>
{%- endif -%}
Expand Down

0 comments on commit 23ae8ac

Please sign in to comment.