Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to hCaptcha #1424

Draft
wants to merge 4 commits into
base: default
Choose a base branch
from
Draft

Switch to hCaptcha #1424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0a41e03
Switch to hCaptcha
goto-bus-stop Apr 10, 2020
d11c4c4
Drop load-script2.
goto-bus-stop Apr 10, 2020
d07aac9
Put hCaptcha test keys in a module.
goto-bus-stop Apr 10, 2020
c74f3cc
Remove obsolete CSS import
goto-bus-stop Apr 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions package-lock.json
View file
Open in desktop

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

9 changes: 2 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"dependencies": {
"@babel/runtime": "^7.9.2",
"@f/cookies-enabled": "^1.1.1",
"@hcaptcha/react-hcaptcha": "^0.1.6",
"@material-ui/core": "^4.9.0",
"@material-ui/icons": "^4.9.0",
"@material-ui/styles": "^4.9.0",
Expand All @@ -38,7 +39,6 @@
"just-map-values": "^1.1.0",
"just-omit": "^1.1.0",
"lie": "^3.3.0",
"load-script2": "^1.0.1",
"lodash": "^4.17.15",
"ms": "^2.1.2",
"nanoraf": "^3.1.0",
Expand Down Expand Up @@ -126,6 +126,7 @@
"gulp-newer": "^1.4.0",
"gulp-sourcemaps": "^2.6.4",
"gulp-yaml": "^2.0.2",
"hcaptcha-test-keys": "^1.0.0",
"html-loader": "^1.0.0",
"html-webpack-plugin": "^4.0.2",
"http-proxy-middleware": "^1.0.0",
Expand All @@ -142,7 +143,6 @@
"postcss-loader": "^3.0.0",
"postcss-preset-env": "^6.7.0",
"postcss-url": "^8.0.0",
"recaptcha-test-keys": "^1.0.0",
"rimraf": "^3.0.0",
"rollup": "^2.0.3",
"rollup-plugin-babel": "^4.3.3",
Expand Down Expand Up @@ -180,10 +180,5 @@
"start": "gulp start",
"prerelease": "npm run clean && npm test && npm run prod",
"postpublish": "cd packages/u-wave-web-middleware && npm publish"
},
"greenkeeper": {
"ignore": [
"load-script2"
]
}
}
2 changes: 1 addition & 1 deletion src/components/Dialogs/LoginDialog/RegisterForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import CircularProgress from '@material-ui/core/CircularProgress';
import EmailIcon from '@material-ui/icons/Email';
import PasswordIcon from '@material-ui/icons/Lock';
import UserIcon from '@material-ui/icons/Person';
import ReCaptcha from '@hcaptcha/react-hcaptcha';
import Form from '../../Form';
import FormGroup from '../../Form/Group';
import TextField from '../../Form/TextField';
import Button from '../../Form/Button';
import ReCaptcha from '../../ReCaptcha';
import SocialLogin from './SocialLogin';
import Separator from './Separator';

Expand Down
41 changes: 0 additions & 41 deletions src/components/ReCaptcha/ReCaptcha.js
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions src/components/ReCaptcha/index.css
View file
Open in desktop

This file was deleted.

59 changes: 0 additions & 59 deletions src/components/ReCaptcha/index.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/components/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
@import "./Overlay/index.css";
@import "./Player/index.css";
@import "./PlaylistManager/index.css";
@import "./ReCaptcha/index.css";
@import "./RoomHistory/index.css";
@import "./SearchBar/index.css";
@import "./ServerList/index.css";
Expand Down
6 changes: 3 additions & 3 deletions tasks/serve.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ const path = require('path');
const log = require('fancy-log');
const chalk = require('chalk');
const emojione = require('u-wave-web-emojione');
const recaptchaTestKeys = require('recaptcha-test-keys');
const express = require('express');
const hcaptchaTestKeys = require('hcaptcha-test-keys');
const { createProxyMiddleware } = require('http-proxy-middleware');
const webpack = require('webpack');
const webpackDevMiddleware = require('webpack-dev-middleware');
Expand Down Expand Up @@ -127,7 +127,7 @@ function serve(done) {
publicPath: '/',
// Point u-wave-web middleware to the virtual webpack filesystem.
fs: dev.fileSystem,
recaptcha: { key: recaptchaTestKeys.sitekey },
recaptcha: { key: hcaptchaTestKeys.sitekey },
});
});

Expand All @@ -149,7 +149,7 @@ function serve(done) {
socketUrl,
emoji: emojione.emoji,
basePath: path.join(__dirname, '../packages/u-wave-web-middleware/public'),
recaptcha: { key: recaptchaTestKeys.sitekey },
recaptcha: { key: hcaptchaTestKeys.sitekey },
});

app.use(webClient);
Expand Down