diff --git a/README.md b/README.md index 67961ac..e630ea1 100644 --- a/README.md +++ b/README.md @@ -148,6 +148,7 @@ Add `config.json` file in root directory with following content. You can use `co { "title": "Pony Town", "discordLink": "https://discordapp.com/invite/", // optional + "contactDiscord": "your_contact_discord#0000", // optional "twitterLink": "https://twitter.com/", // optional "contactEmail": "", "port": 8090, diff --git a/assets/images/avatars.jpg b/assets/images/avatars.jpg index 9f979bf..1ce199a 100644 --- a/assets/images/avatars.jpg +++ b/assets/images/avatars.jpg @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d6b853fcb46500cf02ba0b4910efa390b7ce2b57171aa7fa3fa0beac510c0084 -size 106880 +oid sha256:96c814f0c2708221753ce037d48814bb2ec40c272ae30fa334716f6cef426c7f +size 114645 diff --git a/config-template.json b/config-template.json index 33aeb87..f34d150 100644 --- a/config-template.json +++ b/config-template.json @@ -3,6 +3,7 @@ "discordLink": "", "twitterLink": "", "contactEmail": "your_contact_email@example.com", + "contactDiscord": "your_contact_discord#0000", "port": 8090, "adminPort": 8091, "host": "http://localhost:8090/", diff --git a/src/ts/client/credits.ts b/src/ts/client/credits.ts index 15ce0ed..c25af08 100644 --- a/src/ts/client/credits.ts +++ b/src/ts/client/credits.ts @@ -30,12 +30,6 @@ export const CREDITS: Credit[] = [ avatarIndex: 0, links: ['https://twitter.com/BytewaveMLP', 'https://github.com/BytewaveMLP'] }, - { - name: 'Cloud Hop', - title: 'Programmer', - avatarIndex: 1, - links: ['https://twitter.com/blackhole0173', 'https://github.com/blackhole12'] - }, { name: 'CyberPon3', title: 'Programmer / Moderator', @@ -48,24 +42,36 @@ export const CREDITS: Credit[] = [ avatarIndex: 3, links: ['https://github.com/Keupoz'] }, - { - name: 'NotMyWing', - title: 'Programmer / Moderator', - avatarIndex: 4, - links: ['https://twitter.com/NotMyWing', 'https://github.com/Neeve01'] - }, { name: 'Luney', title: 'Programmer', avatarIndex: 5, links: ['https://twitter.com/luneythesnep', 'https://github.com/LunarMist'] }, + { + name: 'MysticBlare', + title: 'Artist', + avatarIndex: 1, + links: ['https://twitter.com/MysticBlare'] + }, + { + name: 'NotMyWing', + title: 'Programmer / Moderator', + avatarIndex: 4, + links: ['https://twitter.com/NotMyWing', 'https://github.com/Neeve01'] + }, { name: 'Stubenhocker', title: 'Programmer', avatarIndex: 6, links: ['https://github.com/Stubenhocker1399', 'https://twitter.com/Stubenhocker13'] }, + { + name: 'Sunberry', + title: 'Moderator', + avatarIndex: 9, + links: ['https://twitter.com/Sunberreiy'] + }, { name: 'Terncode', title: 'Programmer', @@ -118,7 +124,6 @@ export const CONTRIBUTORS: Contributors[] = [ { name: 'Wellfugzee' }, { name: 'ScribblesHeart', links: ['https://www.deviantart.com/scribblesdesu'] }, { name: 'dsp2003', links: ['https://dsp2003.tumblr.com/', 'http://www.deviantart.com/dsp2003'] }, - { name: 'MysticBlare', links: ['https://twitter.com/MysticBlare'] }, { name: 'Towmacow Waffles', links: ['https://www.deviantart.com/towmacowwaffles'] }, { name: 'OrchidPony', links: ['https://www.deviantart.com/orchidpony'] }, { name: 'Cherry Cerise', links: ['https://www.deviantart.com/cherryceriseart'] }, diff --git a/src/ts/client/data.ts b/src/ts/client/data.ts index ee8bc71..36b8e0c 100644 --- a/src/ts/client/data.ts +++ b/src/ts/client/data.ts @@ -28,6 +28,7 @@ export const discordLink = attr('data-discord-link'); export const twitterLink = attr('data-twitter-link'); export const contactEmail = attr('data-email'); export const copyrightName = attr('data-copyright'); +export const contactDiscord = attr('data-contact-discord'); /* istanbul ignore next */ export const oauthProviders = json('oauth-providers', '[]') diff --git a/src/ts/components/app/about/about.pug b/src/ts/components/app/about/about.pug index 5a05edc..4497326 100644 --- a/src/ts/components/app/about/about.pug +++ b/src/ts/components/app/about/about.pug @@ -8,6 +8,9 @@ h1(focusTitle) About h2 Contact p For all inquiries please send an email to #[b {{contactEmail}}] + span(*ngIf="contactDiscord") + | or message #[b {{contactDiscord}}] on Discord + | . h2 Technology diff --git a/src/ts/components/app/about/about.ts b/src/ts/components/app/about/about.ts index a923583..039a931 100644 --- a/src/ts/components/app/about/about.ts +++ b/src/ts/components/app/about/about.ts @@ -4,7 +4,7 @@ import { getUrl } from '../../../client/rev'; import { CREDITS, CONTRIBUTORS, Credit } from '../../../client/credits'; import { CHANGELOG } from '../../../generated/changelog'; import { SUPPORTER_REWARDS_LIST } from '../../../common/constants'; -import { discordLink, contactEmail } from '../../../client/data'; +import { discordLink, contactEmail, contactDiscord } from '../../../client/data'; function toCredit(credit: Credit) { return { @@ -28,4 +28,5 @@ export class About { readonly rewards = SUPPORTER_REWARDS_LIST; readonly discordLink = discordLink; readonly contactEmail = contactEmail; + readonly contactDiscord = contactDiscord; } diff --git a/src/ts/components/app/app.ts b/src/ts/components/app/app.ts index 3b1d949..5346583 100644 --- a/src/ts/components/app/app.ts +++ b/src/ts/components/app/app.ts @@ -6,7 +6,7 @@ import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal'; import { Subscription } from 'rxjs'; import { GameService } from '../services/gameService'; import { Model, Friend } from '../services/model'; -import { version, host, contactEmail, twitterLink, discordLink, copyrightName } from '../../client/data'; +import { version, host, contactEmail, twitterLink, discordLink, copyrightName, contactDiscord } from '../../client/data'; import { PonyTownGame } from '../../client/game'; import { faTwitter, faPatreon, faDiscord, faEnvelope, faCog, faHome, faInfoCircle, faHorseHead, faQuestionCircle } from '../../client/icons'; import { OAuthProvider, Entity, FakeEntity, Pony } from '../../common/interfaces'; @@ -53,6 +53,7 @@ export class App implements OnInit, OnDestroy { readonly aboutIcon = faInfoCircle; readonly charactersIcon = faHorseHead; readonly contactEmail = contactEmail; + readonly contactDiscord = contactDiscord; readonly discordLink = discordLink; readonly twitterLink = twitterLink; readonly copyright = copyrightName; diff --git a/src/ts/components/app/help/help.pug b/src/ts/components/app/help/help.pug index 5b62969..5f089e1 100644 --- a/src/ts/components/app/help/help.pug +++ b/src/ts/components/app/help/help.pug @@ -5,9 +5,12 @@ h1(focusTitle) Help section h2 Contact - p. - For technical issues, see the #[a(routerLink="/help" fragment="issues") Common Issues] section. If it doesn't solve your problem, - send an email to #[b {{contactEmail}}]. + p + | For technical issues, see the #[a(routerLink="/help" fragment="issues") Common Issues] section. If it doesn't solve your problem, + | send an email to #[b {{contactEmail}}] + span(*ngIf="contactDiscord") + | or message #[b {{contactDiscord}}] on Discord + | . section h2 Controls diff --git a/src/ts/components/app/help/help.ts b/src/ts/components/app/help/help.ts index 36666be..7d14a79 100644 --- a/src/ts/components/app/help/help.ts +++ b/src/ts/components/app/help/help.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; import { emojis } from '../../../client/emoji'; import { faArrowLeft, faArrowRight, faArrowUp, faArrowDown } from '../../../client/icons'; -import { contactEmail } from '../../../client/data'; +import { contactEmail, contactDiscord } from '../../../client/data'; import { ActivatedRoute } from '@angular/router'; @Component({ @@ -17,6 +17,7 @@ export class Help { readonly emotes = emojis.map(e => e.names[0]); readonly mac = /Macintosh/.test(navigator.userAgent); readonly contactEmail = contactEmail; + readonly contactDiscord = contactDiscord; // allow scrolling to #issues and #rules fragments diff --git a/src/ts/server/config.ts b/src/ts/server/config.ts index 8c1f494..09e1dfb 100644 --- a/src/ts/server/config.ts +++ b/src/ts/server/config.ts @@ -7,6 +7,7 @@ export interface AppConfig { supporterLink?: string; discordLink?: string; contactEmail?: string; + contactDiscord?: string; port: number; adminPort?: number; host: string; diff --git a/src/ts/server/routes/index.ts b/src/ts/server/routes/index.ts index 9ab5744..2ed47e1 100644 --- a/src/ts/server/routes/index.ts +++ b/src/ts/server/routes/index.ts @@ -101,6 +101,7 @@ export function createIndex(assetsPath: string, adminAssetsPath: string) { twitterLink: config.twitterLink, discordLink: config.discordLink, email: config.contactEmail, + contactDiscord: config.contactDiscord, logo: `${config.host}${getRevImageURL('logo-120.png')}`, loadingImage: `data:image/png;base64,${loadingImage.toString('base64')}`, version, diff --git a/views/index.pug b/views/index.pug index b80f893..d94efaa 100644 --- a/views/index.pug +++ b/views/index.pug @@ -52,6 +52,7 @@ html(lang="en") data-discord-link=discordLink data-twitter-link=twitterLink data-email=email + data-contact-discord=contactDiscord data-copyright=title data-host=host data-local=local