Skip to content

Commit

Permalink
Change icon, improve Slack integration (#409)
Browse files Browse the repository at this point in the history
  • Loading branch information
antoinejaussoin authored May 15, 2022
1 parent d79047c commit 5456607
Show file tree
Hide file tree
Showing 93 changed files with 194 additions and 84 deletions.
2 changes: 1 addition & 1 deletion backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"passport-local": "1.0.0",
"passport-microsoft": "1.0.0",
"passport-okta-oauth20": "1.1.0",
"passport-slack": "0.0.7",
"passport-slack-oauth2": "^1.1.1",
"passport-twitter": "1.0.4",
"pg": "8.7.3",
"prettier": "2.6.2",
Expand Down
4 changes: 4 additions & 0 deletions backend/src/admin/router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ router.get('/self-hosting', async (_, res) => {
selfHosted: config.SELF_HOSTED,
licenced: !!licence,
emailAvailable: canSendEmails(),
slackClientId:
config.SLACK_BOT_ENABLE && config.SLACK_KEY
? config.SLACK_KEY
: undefined,
disableAnonymous: config.DISABLE_ANONYMOUS_LOGIN,
disablePasswords: config.DISABLE_PASSWORD_LOGIN,
disablePasswordRegistration: config.DISABLE_PASSWORD_REGISTRATION,
Expand Down
8 changes: 7 additions & 1 deletion backend/src/auth/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,16 @@ export const GITHUB_CONFIG: GitHubStrategy | null =
export const SLACK_CONFIG =
config.SLACK_KEY && config.SLACK_SECRET
? {
skipUserProfile: false, // default
scope: [
'identity.basic',
'identity.email',
'identity.avatar',
'identity.team',
], // default
clientID: config.SLACK_KEY || '',
clientSecret: config.SLACK_SECRET || '',
callbackURL: slackURL,
scope: ['identity.email', 'identity.avatar', 'identity.basic'],
}
: null;

Expand Down
2 changes: 1 addition & 1 deletion backend/src/auth/passport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Strategy as LocalStrategy, IVerifyOptions } from 'passport-local';
import { Strategy as TwitterStrategy } from 'passport-twitter';
import { Strategy as GoogleStrategy } from 'passport-google-oauth20';
import { Strategy as GithubStrategy } from 'passport-github2';
import { Strategy as SlackStrategy } from 'passport-slack';
import { Strategy as SlackStrategy } from 'passport-slack-oauth2';
import { Strategy as MicrosoftStrategy } from 'passport-microsoft';
import { Strategy as OktaStrategy } from 'passport-okta-oauth20';

Expand Down
2 changes: 1 addition & 1 deletion backend/src/auth/router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const googleAuth = passport.authenticate('google', {
});
const facebookAuth = passport.authenticate('facebook');
const githubAuth = passport.authenticate('github', { scope: ['user:email'] });
const slackAuth = passport.authenticate('slack');
const slackAuth = passport.authenticate('Slack');
const microsoftAuth = passport.authenticate('microsoft');
const oktaAuth = passport.authenticate('okta');

Expand Down
1 change: 1 addition & 0 deletions backend/src/common/payloads.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ export interface BackendCapabilities {
adminEmail: string;
licenced: boolean;
oAuth: OAuthAvailabilities;
slackClientId?: string;
disableAnonymous: boolean;
disablePasswords: boolean;
disablePasswordRegistration: boolean;
Expand Down
1 change: 1 addition & 0 deletions backend/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ const config: BackendConfig = {
GITHUB_SECRET: defaults('GITHUB_SECRET', ''),
SLACK_KEY: defaults('SLACK_KEY', ''),
SLACK_SECRET: defaults('SLACK_SECRET', ''),
SLACK_BOT_ENABLE: defaultsBool('SLACK_BOT_ENABLE', false),
MICROSOFT_KEY: defaults('MICROSOFT_KEY', ''),
MICROSOFT_SECRET: defaults('MICROSOFT_SECRET', ''),
OKTA_AUDIENCE: defaults('OKTA_AUDIENCE', ''),
Expand Down
2 changes: 1 addition & 1 deletion backend/src/slack/router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default function slackRouter(): Router {
if (session) {
await sendToSlack(
msg.response_url,
`Well done! You can start retrospecting here: ${config.BASE_URL}/game/${session.id}`
`All done! You can start retrospecting here: ${config.BASE_URL}/game/${session.id}`
);
} else {
await sendToSlack(
Expand Down
1 change: 1 addition & 0 deletions backend/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export interface BackendConfig {
GITHUB_SECRET: string;
SLACK_KEY: string;
SLACK_SECRET: string;
SLACK_BOT_ENABLE: boolean;
MICROSOFT_KEY: string;
MICROSOFT_SECRET: string;
OKTA_AUDIENCE: string;
Expand Down
2 changes: 0 additions & 2 deletions backend/src/typings.d.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import { UserIds } from './utils';

declare module 'passport-okta-oauth';

declare module 'express-serve-static-core' {
interface Request {
user?: UserIds | undefined;
Expand Down
2 changes: 1 addition & 1 deletion backend/src/typings/typings.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ declare namespace Express {
}
}

declare module 'passport-slack';
declare module 'freemail';
declare module 'passport-slack-oauth2';
38 changes: 8 additions & 30 deletions backend/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3853,7 +3853,7 @@ [email protected]:
passport-strategy "1.x.x"
utils-merge "1.x.x"

[email protected], [email protected], passport-oauth2@^1.6.1:
[email protected], [email protected], passport-oauth2@^1.5.0, passport-oauth2@^1.6.1:
version "1.6.1"
resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.6.1.tgz#c5aee8f849ce8bd436c7f81d904a3cd1666f181b"
integrity sha512-ZbV43Hq9d/SBSYQ22GOiglFsjsD1YY/qdiptA+8ej+9C1dL1TVB+mBE5kDH/D4AJo50+2i8f4bx0vg4/yDDZCQ==
Expand All @@ -3864,15 +3864,6 @@ [email protected], [email protected], passport-oauth2@^1.6.1:
uid2 "0.0.x"
utils-merge "1.x.x"

passport-oauth@~0.1.1:
version "0.1.15"
resolved "https://registry.yarnpkg.com/passport-oauth/-/passport-oauth-0.1.15.tgz#fb74e0afe84614bfa256c5fc716cc56bbfc8cec0"
integrity sha1-+3Tgr+hGFL+iVsX8cWzFa7/IzsA=
dependencies:
oauth "0.9.x"
passport "~0.1.1"
pkginfo "0.2.x"

[email protected]:
version "1.1.0"
resolved "https://registry.yarnpkg.com/passport-okta-oauth20/-/passport-okta-oauth20-1.1.0.tgz#c017edca4a1a782b457492187d3b73d96efc9e56"
Expand All @@ -3881,13 +3872,13 @@ [email protected]:
node-fetch "^2.6.1"
passport-oauth2 "^1.6.1"

passport-slack@0.0.7:
version "0.0.7"
resolved "https://registry.yarnpkg.com/passport-slack/-/passport-slack-0.0.7.tgz#167eb80f0ab622d2156e7cae7055e16d0b1890d0"
integrity sha1-Fn64Dwq2ItIVbnyucFXhbQsYkNA=
passport-slack-oauth2@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/passport-slack-oauth2/-/passport-slack-oauth2-1.1.1.tgz#d831ffc3f1e968fcc3622e6ecf41643c8d8f9cbc"
integrity sha512-xC+yMKFXximP5TzSNt4lr9TP78MMos5B+acC7bJNCxBAVNyL9e02AEpVpVtyMIqHv4nNZnv1vyoOb50J8VCcZQ==
dependencies:
passport-oauth "~0.1.1"
pkginfo "0.2.x"
passport-oauth2 "^1.5.0"
pkginfo "^0.4.1"

[email protected]:
version "1.0.0"
Expand All @@ -3910,14 +3901,6 @@ [email protected]:
passport-strategy "1.x.x"
pause "0.0.1"

passport@~0.1.1:
version "0.1.18"
resolved "https://registry.yarnpkg.com/passport/-/passport-0.1.18.tgz#c8264479dcb6414cadbb66752d12b37e0b6525a1"
integrity sha1-yCZEedy2QUytu2Z1LRKzfgtlJaE=
dependencies:
pause "0.0.1"
pkginfo "0.2.x"

path-exists@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
Expand Down Expand Up @@ -4026,12 +4009,7 @@ pkg-dir@^4.2.0:
dependencies:
find-up "^4.0.0"

[email protected]:
version "0.2.3"
resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.2.3.tgz#7239c42a5ef6c30b8f328439d9b9ff71042490f8"
integrity sha1-cjnEKl72wwuPMoQ52bn/cQQkkPg=

[email protected]:
[email protected], pkginfo@^0.4.1:
version "0.4.1"
resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.4.1.tgz#b5418ef0439de5425fc4995042dced14fb2a84ff"
integrity sha1-tUGO8EOd5UJfxJlQQtztFPsqhP8=
Expand Down
Binary file added content/new_logo/Logo Retrospected.logoist
Binary file not shown.
Binary file added content/new_logo/fav/android-chrome-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added content/new_logo/fav/android-chrome-512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added content/new_logo/fav/apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added content/new_logo/fav/favicon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added content/new_logo/fav/favicon-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added content/new_logo/fav/favicon.ico
Binary file not shown.
1 change: 1 addition & 0 deletions content/new_logo/fav/site.webmanifest
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}
Binary file added content/new_logo/favicon_io-3.zip
Binary file not shown.
Binary file added content/new_logo/screenshot-v1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions content/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Convert PNG to icons

https://en.rakko.tools/tools/69/
Binary file removed frontend/public/android-chrome-144x144.png
Binary file not shown.
Binary file modified frontend/public/android-chrome-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed frontend/public/android-chrome-36x36.png
Binary file not shown.
Binary file removed frontend/public/android-chrome-48x48.png
Binary file not shown.
Binary file added frontend/public/android-chrome-512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed frontend/public/android-chrome-72x72.png
Binary file not shown.
Binary file removed frontend/public/android-chrome-96x96.png
Binary file not shown.
Binary file added frontend/public/android-icon-144x144.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/android-icon-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/android-icon-36x36.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/android-icon-48x48.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/android-icon-72x72.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/android-icon-96x96.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/apple-icon-114x114.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/apple-icon-120x120.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/apple-icon-144x144.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/apple-icon-152x152.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/apple-icon-180x180.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/apple-icon-57x57.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/public/apple-icon-60x60.png
Binary file added frontend/public/apple-icon-72x72.png
Binary file added frontend/public/apple-icon-76x76.png
Binary file added frontend/public/apple-icon-precomposed.png
Binary file added frontend/public/apple-icon.png
Binary file removed frontend/public/apple-touch-icon-114x114.png
Diff not rendered.
Binary file removed frontend/public/apple-touch-icon-120x120.png
Diff not rendered.
Binary file removed frontend/public/apple-touch-icon-144x144.png
Diff not rendered.
Binary file removed frontend/public/apple-touch-icon-152x152.png
Diff not rendered.
Binary file removed frontend/public/apple-touch-icon-180x180.png
Diff not rendered.
Binary file removed frontend/public/apple-touch-icon-57x57.png
Diff not rendered.
Binary file removed frontend/public/apple-touch-icon-60x60.png
Diff not rendered.
Binary file removed frontend/public/apple-touch-icon-72x72.png
Diff not rendered.
Binary file removed frontend/public/apple-touch-icon-76x76.png
Diff not rendered.
Binary file removed frontend/public/apple-touch-icon-precomposed.png
Diff not rendered.
Binary file modified frontend/public/apple-touch-icon.png
10 changes: 5 additions & 5 deletions frontend/public/browserconfig.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<browserconfig>
<msapplication>
<tile>
<square70x70logo src="/mstile-70x70.png"/>
<square150x150logo src="/mstile-150x150.png"/>
<square310x310logo src="/mstile-310x310.png"/>
<wide310x150logo src="/mstile-310x150.png"/>
<TileColor>#da532c</TileColor>
<square70x70logo src="/ms-icon-70x70.png"/>
<square144x144logo src="/ms-icon-144*144.png"/>
<square150x150logo src="/ms-icon-150x150.png"/>
<square310x310logo src="/ms-icon-310x310.png"/>
<TileColor>#5842DE</TileColor>
</tile>
</msapplication>
</browserconfig>
Binary file modified frontend/public/favicon-16x16.png
Binary file modified frontend/public/favicon-32x32.png
Binary file modified frontend/public/favicon-96x96.png
Binary file modified frontend/public/favicon.ico
Binary file not shown.
35 changes: 18 additions & 17 deletions frontend/public/index.empty.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,24 @@
<script src="https://polyfill.io/v3/polyfill.min.js?features=Map%2CSet%2CWeakMap%2CObject.setPrototypeOf"></script>
<% } %>

<link rel="apple-touch-icon" sizes="57x57" href="%PUBLIC_URL%/apple-touch-icon-57x57.png" />
<link rel="apple-touch-icon" sizes="60x60" href="%PUBLIC_URL%/apple-touch-icon-60x60.png" />
<link rel="apple-touch-icon" sizes="72x72" href="%PUBLIC_URL%/apple-touch-icon-72x72.png" />
<link rel="apple-touch-icon" sizes="76x76" href="%PUBLIC_URL%/apple-touch-icon-76x76.png" />
<link rel="apple-touch-icon" sizes="114x114" href="%PUBLIC_URL%/apple-touch-icon-114x114.png" />
<link rel="apple-touch-icon" sizes="120x120" href="%PUBLIC_URL%/apple-touch-icon-120x120.png" />
<link rel="apple-touch-icon" sizes="144x144" href="%PUBLIC_URL%/apple-touch-icon-144x144.png" />
<link rel="apple-touch-icon" sizes="152x152" href="%PUBLIC_URL%/apple-touch-icon-152x152.png" />
<link rel="apple-touch-icon" sizes="180x180" href="%PUBLIC_URL%/apple-touch-icon-180x180.png" />
<link rel="icon" type="image/png" href="%PUBLIC_URL%/favicon-32x32.png" sizes="32x32" />
<link rel="icon" type="image/png" href="%PUBLIC_URL%/android-chrome-192x192.png" sizes="192x192" />
<link rel="icon" type="image/png" href="%PUBLIC_URL%/favicon-96x96.png" sizes="96x96" />
<link rel="icon" type="image/png" href="%PUBLIC_URL%/favicon-16x16.png" sizes="16x16" />
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<link rel="mask-icon" href="%PUBLIC_URL%/safari-pinned-tab.svg" color="#5bbad5" />
<meta name="msapplication-TileColor" content="#da532c" />
<meta name="msapplication-TileImage" content="%PUBLIC_URL%/mstile-144x144.png" />

<link rel="apple-touch-icon" sizes="57x57" href="%PUBLIC_URL%/apple-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="%PUBLIC_URL%/apple-icon-60x60.png">
<link rel="apple-touch-icon" sizes="72x72" href="%PUBLIC_URL%/apple-icon-72x72.png">
<link rel="apple-touch-icon" sizes="76x76" href="%PUBLIC_URL%/apple-icon-76x76.png">
<link rel="apple-touch-icon" sizes="114x114" href="%PUBLIC_URL%/apple-icon-114x114.png">
<link rel="apple-touch-icon" sizes="120x120" href="%PUBLIC_URL%/apple-icon-120x120.png">
<link rel="apple-touch-icon" sizes="144x144" href="%PUBLIC_URL%/apple-icon-144x144.png">
<link rel="apple-touch-icon" sizes="152x152" href="%PUBLIC_URL%/apple-icon-152x152.png">
<link rel="apple-touch-icon" sizes="180x180" href="%PUBLIC_URL%/apple-icon-180x180.png">
<link rel="icon" type="image/png" sizes="192x192" href="%PUBLIC_URL%/android-icon-192x192.png">
<link rel="icon" type="image/png" sizes="32x32" href="%PUBLIC_URL%/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="96x96" href="%PUBLIC_URL%/favicon-96x96.png">
<link rel="icon" type="image/png" sizes="16x16" href="%PUBLIC_URL%/favicon-16x16.png">
<link rel="manifest" href="%PUBLIC_URL%/manifest.json">
<meta name="msapplication-TileColor" content="#5842DE">
<meta name="msapplication-TileImage" content="%PUBLIC_URL%/ms-icon-144x144.png">

<meta name="theme-color" content="#ffffff" />
<meta name="version" content="%REACT_APP_VERSION%" />
<meta name="env" content="%NODE_ENV%" />
Expand Down
36 changes: 18 additions & 18 deletions frontend/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,24 +37,24 @@
<script src="https://polyfill.io/v3/polyfill.min.js?features=Map%2CSet%2CWeakMap%2CObject.setPrototypeOf"></script>
<% } %>

<link rel="apple-touch-icon" sizes="57x57" href="%PUBLIC_URL%/apple-touch-icon-57x57.png" />
<link rel="apple-touch-icon" sizes="60x60" href="%PUBLIC_URL%/apple-touch-icon-60x60.png" />
<link rel="apple-touch-icon" sizes="72x72" href="%PUBLIC_URL%/apple-touch-icon-72x72.png" />
<link rel="apple-touch-icon" sizes="76x76" href="%PUBLIC_URL%/apple-touch-icon-76x76.png" />
<link rel="apple-touch-icon" sizes="114x114" href="%PUBLIC_URL%/apple-touch-icon-114x114.png" />
<link rel="apple-touch-icon" sizes="120x120" href="%PUBLIC_URL%/apple-touch-icon-120x120.png" />
<link rel="apple-touch-icon" sizes="144x144" href="%PUBLIC_URL%/apple-touch-icon-144x144.png" />
<link rel="apple-touch-icon" sizes="152x152" href="%PUBLIC_URL%/apple-touch-icon-152x152.png" />
<link rel="apple-touch-icon" sizes="180x180" href="%PUBLIC_URL%/apple-touch-icon-180x180.png" />
<link rel="icon" type="image/png" href="%PUBLIC_URL%/favicon-32x32.png" sizes="32x32" />
<link rel="icon" type="image/png" href="%PUBLIC_URL%/android-chrome-192x192.png" sizes="192x192" />
<link rel="icon" type="image/png" href="%PUBLIC_URL%/favicon-96x96.png" sizes="96x96" />
<link rel="icon" type="image/png" href="%PUBLIC_URL%/favicon-16x16.png" sizes="16x16" />
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<link rel="mask-icon" href="%PUBLIC_URL%/safari-pinned-tab.svg" color="#5bbad5" />
<meta name="msapplication-TileColor" content="#da532c" />
<meta name="msapplication-TileImage" content="%PUBLIC_URL%/mstile-144x144.png" />
<meta name="theme-color" content="#ffffff" />
<link rel="apple-touch-icon" sizes="57x57" href="%PUBLIC_URL%/apple-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="%PUBLIC_URL%/apple-icon-60x60.png">
<link rel="apple-touch-icon" sizes="72x72" href="%PUBLIC_URL%/apple-icon-72x72.png">
<link rel="apple-touch-icon" sizes="76x76" href="%PUBLIC_URL%/apple-icon-76x76.png">
<link rel="apple-touch-icon" sizes="114x114" href="%PUBLIC_URL%/apple-icon-114x114.png">
<link rel="apple-touch-icon" sizes="120x120" href="%PUBLIC_URL%/apple-icon-120x120.png">
<link rel="apple-touch-icon" sizes="144x144" href="%PUBLIC_URL%/apple-icon-144x144.png">
<link rel="apple-touch-icon" sizes="152x152" href="%PUBLIC_URL%/apple-icon-152x152.png">
<link rel="apple-touch-icon" sizes="180x180" href="%PUBLIC_URL%/apple-icon-180x180.png">
<link rel="icon" type="image/png" sizes="192x192" href="%PUBLIC_URL%/android-icon-192x192.png">
<link rel="icon" type="image/png" sizes="32x32" href="%PUBLIC_URL%/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="96x96" href="%PUBLIC_URL%/favicon-96x96.png">
<link rel="icon" type="image/png" sizes="16x16" href="%PUBLIC_URL%/favicon-16x16.png">
<link rel="manifest" href="%PUBLIC_URL%/manifest.json">
<meta name="msapplication-TileColor" content="#5842DE">
<meta name="msapplication-TileImage" content="%PUBLIC_URL%/ms-icon-144x144.png">

<meta name="theme-color" content="#ffffff">
<meta name="version" content="%REACT_APP_VERSION%" />
<meta name="env" content="%NODE_ENV%" />

Expand Down
12 changes: 6 additions & 6 deletions frontend/public/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,37 @@
"display": "standalone",
"start_url": "/",
"icons": [{
"src": "\/android-chrome-36x36.png",
"src": "\/android-icon-36x36.png",
"sizes": "36x36",
"type": "image\/png",
"density": 0.75
},
{
"src": "\/android-chrome-48x48.png",
"src": "\/android-icon-48x48.png",
"sizes": "48x48",
"type": "image\/png",
"density": 1
},
{
"src": "\/android-chrome-72x72.png",
"src": "\/android-icon-72x72.png",
"sizes": "72x72",
"type": "image\/png",
"density": 1.5
},
{
"src": "\/android-chrome-96x96.png",
"src": "\/android-icon-96x96.png",
"sizes": "96x96",
"type": "image\/png",
"density": 2
},
{
"src": "\/android-chrome-144x144.png",
"src": "\/android-icon-144x144.png",
"sizes": "144x144",
"type": "image\/png",
"density": 3
},
{
"src": "\/android-chrome-192x192.png",
"src": "\/android-icon-192x192.png",
"sizes": "192x192",
"type": "image\/png",
"density": 4
Expand Down
Binary file added frontend/public/ms-icon-144x144.png
Binary file added frontend/public/ms-icon-150x150.png
Binary file added frontend/public/ms-icon-310x310.png
Binary file added frontend/public/ms-icon-70x70.png
Binary file removed frontend/public/mstile-144x144.png
Diff not rendered.
Binary file removed frontend/public/mstile-150x150.png
Diff not rendered.
Binary file removed frontend/public/mstile-310x150.png
Diff not rendered.
Binary file removed frontend/public/mstile-310x310.png
Diff not rendered.
Binary file removed frontend/public/mstile-70x70.png
Diff not rendered.
19 changes: 19 additions & 0 deletions frontend/public/site.webmanifest
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"name": "Retrospected",
"short_name": "Retrospected",
"icons": [
{
"src": "/android-chrome-192x192.png",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "/android-chrome-512x512.png",
"sizes": "512x512",
"type": "image/png"
}
],
"theme_color": "#5842DE",
"background_color": "#ffffff",
"display": "standalone"
}
1 change: 1 addition & 0 deletions frontend/src/common/payloads.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ export interface BackendCapabilities {
adminEmail: string;
licenced: boolean;
oAuth: OAuthAvailabilities;
slackClientId?: string;
disableAnonymous: boolean;
disablePasswords: boolean;
disablePasswordRegistration: boolean;
Expand Down
5 changes: 5 additions & 0 deletions frontend/src/translations/locales/ar-SA.json
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,11 @@
"accountType": "نوع الحساب",
"language": "اللغة"
},
"slack": {
"header": "تكامل السدود",
"help": "أضف الروبوت الذي تم التنقيب عنه إلى مساحة العمل الرخيصة الخاصة بك، واحصل على القدرة على بدء ريترو مع أمر بسيط: '/retro My Retro'.",
"addToSlack": "إضافة إلى Slack"
},
"plan": {
"header": "خطتك",
"plan": "خطة",
Expand Down
5 changes: 5 additions & 0 deletions frontend/src/translations/locales/de-DE.json
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,11 @@
"accountType": "Kontotyp",
"language": "Sprache"
},
"slack": {
"header": "Slack Integration",
"help": "Fügen Sie den Retrospected Bot Ihrem Arbeitsbereich hinzu und erhalten Sie die Möglichkeit, ein Retro mit einem einfachen Befehl zu starten: '/retro My Retro'.",
"addToSlack": "Zu Slack hinzufügen"
},
"plan": {
"header": "Ihr Plan",
"plan": "Plan",
Expand Down
5 changes: 5 additions & 0 deletions frontend/src/translations/locales/en-GB.json
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,11 @@
"accountType": "Account Type",
"language": "Language"
},
"slack": {
"header": "Slack Integration",
"help": "Add the Retrospected Bot to your slack workspace, and get the ability to start a retro with a simple command: '/retro My Retro'.",
"addToSlack": "Add to Slack"
},
"plan": {
"header": "Your Plan",
"plan": "Plan",
Expand Down
Loading

0 comments on commit 5456607

Please sign in to comment.