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.

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

Добавить страницу логина #427

Open
wants to merge 62 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
3714962
add humorist stat and tests
smthingwicked May 11, 2021
cbf8768
fix functions name and regex, add new tests
smthingwicked May 17, 2021
c7172ee
fix "messageForReplay" to "messageForReply"
smthingwicked May 19, 2021
b503d93
Merge branch 'qelphybox:master' into master
smthingwicked May 19, 2021
8013a9f
add get('/api/stupid_achievments')
smthingwicked May 19, 2021
0223a46
Merge branch 'qelphybox:master' into master
smthingwicked May 25, 2021
dacf048
add tests for 'api/stupid_achievments'
smthingwicked May 27, 2021
5774f34
fix tests for '/api/stupid_achievments'
smthingwicked May 29, 2021
c1e66ad
Merge branch 'master' into iss178
smthingwicked May 29, 2021
312a391
Merge branch 'master' into iss178
qelphybox May 29, 2021
3234b86
Merge branch 'qelphybox:master' into master
smthingwicked Jul 13, 2021
ee793a1
Update checks.yml (#357)
qelphybox May 30, 2021
12dfd0c
Bump jest from 26.6.3 to 27.0.3 (#356)
dependabot[bot] May 30, 2021
bc5ba34
Bump mongodb from 3.6.8 to 3.6.9 (#352)
dependabot[bot] May 30, 2021
f3e8cd1
Bump eslint-plugin-import from 2.23.3 to 2.23.4 (#358)
dependabot[bot] May 31, 2021
d349325
Bump @babel/preset-env from 7.14.2 to 7.14.4 (#360)
dependabot[bot] May 31, 2021
4c1a461
Bump sass-loader from 11.1.1 to 12.0.0 (#361)
dependabot[bot] Jun 2, 2021
5379a5b
Bump eslint-plugin-react from 7.23.2 to 7.24.0 (#359)
dependabot[bot] Jun 2, 2021
282948f
Bump jest from 27.0.3 to 27.0.4 (#362)
dependabot[bot] Jun 4, 2021
621d814
Bump eslint from 7.27.0 to 7.28.0 (#363)
dependabot[bot] Jun 7, 2021
8c3fd4c
Bump webpack-cli from 4.7.0 to 4.7.2 (#364)
dependabot[bot] Jun 8, 2021
b1932a1
Bump glob-parent from 5.1.1 to 5.1.2 (#365)
dependabot[bot] Jun 8, 2021
7bfada0
Bump @babel/preset-env from 7.14.4 to 7.14.5 (#366)
dependabot[bot] Jun 10, 2021
9bcc070
Bump @babel/core from 7.14.3 to 7.14.5 (#368)
dependabot[bot] Jun 10, 2021
face952
Bump @babel/preset-react from 7.13.13 to 7.14.5 (#367)
dependabot[bot] Jun 10, 2021
a2636e9
Bump sass-loader from 12.0.0 to 12.1.0 (#369)
dependabot[bot] Jun 11, 2021
f5a4823
Bump @babel/core from 7.14.5 to 7.14.6 (#370)
dependabot[bot] Jun 15, 2021
e365089
Bump webpack from 5.38.1 to 5.39.0 (#371)
dependabot[bot] Jun 15, 2021
ff55fa9
Bump webpack from 5.39.0 to 5.39.1 (#372)
dependabot[bot] Jun 18, 2021
655f82e
Bump eslint from 7.28.0 to 7.29.0 (#373)
dependabot[bot] Jun 21, 2021
2465fe0
Bump @babel/preset-env from 7.14.5 to 7.14.7 (#374)
dependabot[bot] Jun 22, 2021
f1431f3
Bump webpack from 5.39.1 to 5.40.0 (#375)
dependabot[bot] Jun 22, 2021
bd4b7ae
Bump html-webpack-plugin from 5.3.1 to 5.3.2 (#376)
dependabot[bot] Jun 23, 2021
571520b
Bump jest from 27.0.4 to 27.0.5 (#377)
dependabot[bot] Jun 23, 2021
7e3cdfe
Bump node-sass from 6.0.0 to 6.0.1 (#378)
dependabot[bot] Jun 25, 2021
7d2758b
Bump style-loader from 2.0.0 to 3.0.0 (#379)
dependabot[bot] Jun 25, 2021
3e95683
Bump mini-css-extract-plugin from 1.6.0 to 1.6.1 (#380)
dependabot[bot] Jun 28, 2021
5b6af7a
Bump webpack from 5.40.0 to 5.41.0 (#381)
dependabot[bot] Jun 29, 2021
c5badd5
Bump jest from 27.0.5 to 27.0.6 (#382)
dependabot[bot] Jun 29, 2021
6eacb29
Bump mini-css-extract-plugin from 1.6.1 to 1.6.2 (#383)
dependabot[bot] Jun 29, 2021
6af36f3
Bump webpack from 5.41.0 to 5.41.1 (#384)
dependabot[bot] Jun 30, 2021
2192652
Bump mini-css-extract-plugin from 1.6.2 to 2.0.0 (#385)
dependabot[bot] Jul 1, 2021
e7f753a
Bump webpack from 5.41.1 to 5.42.0 (#386)
dependabot[bot] Jul 5, 2021
6388470
Bump debug from 4.3.1 to 4.3.2 (#387)
dependabot[bot] Jul 5, 2021
07cc0aa
Bump mini-css-extract-plugin from 2.0.0 to 2.1.0 (#390)
dependabot[bot] Jul 6, 2021
19c5e2d
Bump eslint from 7.29.0 to 7.30.0 (#388)
dependabot[bot] Jul 6, 2021
e5b7325
Bump webpack from 5.42.0 to 5.43.0 (#391)
dependabot[bot] Jul 7, 2021
0e0e151
Bump mongodb from 3.6.9 to 3.6.10 (#392)
dependabot[bot] Jul 7, 2021
95935d2
Bump webpack from 5.43.0 to 5.44.0 (#393)
dependabot[bot] Jul 9, 2021
e65d675
Bump style-loader from 3.0.0 to 3.1.0 (#394)
dependabot[bot] Jul 13, 2021
a17c7bc
add validate in app.get('/api/stupid_achievments')
smthingwicked Jul 6, 2021
d9fabe9
fix test for get(stupid_achievments)
smthingwicked Jul 13, 2021
b873acd
fix test for get(stupid_achievments)
smthingwicked Aug 8, 2021
da8e81d
Merge branch 'qelphybox:master' into master
smthingwicked Aug 8, 2021
2cee191
Merge branch 'master' into iss178
smthingwicked Aug 8, 2021
4d3c72d
Merge branch 'master' into iss178
qelphybox Aug 9, 2021
75737fa
fix tests names for get(stupid_achievments)
smthingwicked Aug 9, 2021
7aaa643
Update .github/workflows/checks.yml
qelphybox Aug 10, 2021
e60e8f5
Merge branch 'qelphybox:master' into iss178
smthingwicked Aug 16, 2021
77f8a98
try to add tg widget
smthingwicked Aug 17, 2021
43cd715
add tg widget
smthingwicked Aug 30, 2021
d2d5258
Revert "add tg widget"
smthingwicked Sep 15, 2021
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
118 changes: 111 additions & 7 deletions package-lock.json

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

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
"proschet": "^1.0.1",
"react": "^17.0.2",
"react-bulma-components": "^3.4.0",
"react-dom": "^17.0.2"
"react-dom": "^17.0.2",
"react-router-dom": "^5.2.0"
},
"devDependencies": {
"@babel/core": "^7.15.0",
Expand Down
5 changes: 4 additions & 1 deletion src/client/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import Content from 'react-bulma-components/lib/components/content';
import Hero from 'react-bulma-components/lib/components/hero';
import Heading from 'react-bulma-components/src/components/heading';
import Columns from 'react-bulma-components/src/components/columns';
// import { BrowserRouter, Route } from 'react-router-dom';
import WelcomeImage from './welcome.svg';

function App() {
Expand All @@ -20,6 +21,7 @@ function App() {
<div>
<Heading size={1} renderAs="p" className="has-text-centered-mobile is-size-2-mobile">HakeShonassyBot</Heading>
<Heading subtitle renderAs="p" className="has-text-centered-mobile is-size-5-mobile">Телеграм бот раздающий глупые ачивки участникам чата</Heading>
<script async src="https://telegram.org/js/telegram-widget.js?14" data-telegram-login="HakeShonassyBot" data-size="large" data-auth-url="https://github.com/qelphybox/hakeshonassybot/issues/180"></script>
Copy link
Owner

@qelphybox qelphybox Aug 19, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Старт хороший, ты разместил скрипт где надо :)

Тебе надо настроить бота сначала, чтобы виджет для него работал. Внимательно, от первого и до последнего слова прочитай док по виджету. Там есть 2 раздела Setting up a bot и Linking your domain to the bot. Возьми своего тестового бота и настрой его как просят в доке и сделай виджет для него. Тебе еще нужен будет домен без него работать не будет.

Туториал тебе снял: https://www.loom.com/share/96b96e5d2d7f45f7817f537918d158dc

</div>
</Columns.Column>
<Columns.Column>
Expand All @@ -33,7 +35,8 @@ function App() {
<Container>
<Content style={{ textAlign: 'center' }}>
<p>
<strong>HakeShonassyBot</strong> Исходный код лицензирован <a href="http://opensource.org/licenses/mit-license.php">MIT</a>.
<strong>HakeShonassyBot</strong> Исходный код лицензирован <a href="http://opensource.org/licenses/mit-license.php">MIT</a>
<a href="https://github.com/qelphybox/hakeshonassybot"> Github</a>
</p>
</Content>
</Container>
Expand Down