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

Вечный code-review #34

Open
wants to merge 325 commits into
base: code-review-1
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
325 commits
Select commit Hold shift + click to select a range
3435973
Merge pull request #31 from Student-Labs-2023/BugFix-B3-1
WhiteHodok Jul 21, 2023
a07db2c
BugFix-A3
WhiteHodok Jul 21, 2023
0ed0f3b
Merge pull request #32 from Student-Labs-2023/BugFix-A3-1
WhiteHodok Jul 21, 2023
2e22319
BugFix
Qubicool Jul 21, 2023
137cd4d
Features-B3-AdminCancelButtonWithoutNStates
WhiteHodok Jul 21, 2023
fea23f2
Merge pull request #33 from Student-Labs-2023/Features-B3-AdminCancel…
WhiteHodok Jul 21, 2023
5715f7b
Update main.py
WhiteHodok Jul 21, 2023
6510119
CancelButton
Qubicool Jul 22, 2023
f86cb1a
Cancel button in admin menu
Qubicool Jul 22, 2023
110b0bf
Features-A4-PromoGenerator
WhiteHodok Jul 23, 2023
d3c64a0
Merge pull request #35 from Student-Labs-2023/Features-A4-PromoGenerator
WhiteHodok Jul 23, 2023
cb66464
Features-B4-MakeRepoPatternInMain
Qubicool Jul 23, 2023
f5f7a7a
Merge pull request #36 from Student-Labs-2023/Features-B4-MakeRepoPat…
Qubicool Jul 23, 2023
6795260
Features-A4-GoogleSheetOpti
Goldenbarnowl Jul 23, 2023
995be45
Merge pull request #37 from Student-Labs-2023/Features-A4-GoogleSheet…
Goldenbarnowl Jul 23, 2023
c966dd8
Features-A4-AddBalanceForUser
WhiteHodok Jul 23, 2023
532442d
Merge pull request #39 from Student-Labs-2023/Features-A4-AddBalanceF…
WhiteHodok Jul 23, 2023
5fc65b9
Features-B4-AdminPromoPreviewLast
WhiteHodok Jul 23, 2023
e5920d1
Merge pull request #40 from Student-Labs-2023/Features-B4-AdminPromoP…
WhiteHodok Jul 23, 2023
1698759
Features-A4-AddPromoForAdmin
WhiteHodok Jul 23, 2023
c32ccd3
Merge pull request #41 from Student-Labs-2023/Features-A4-AddPromoFor…
WhiteHodok Jul 23, 2023
7f28a22
Features-B4-DelPromo
WhiteHodok Jul 23, 2023
ca1d478
Merge pull request #42 from Student-Labs-2023/Features-B4-DelPromo
WhiteHodok Jul 23, 2023
62bbffc
Update main.py
WhiteHodok Jul 24, 2023
334640b
Features-A4-StateForPromoUpdate
WhiteHodok Jul 24, 2023
008393b
Merge pull request #43 from Student-Labs-2023/Features-A4-StateForPro…
WhiteHodok Jul 24, 2023
0243bff
Features-A4-EditProfile
Qubicool Jul 24, 2023
b876e9f
Merge pull request #44 from Student-Labs-2023/Features-A4-EditProfile
Qubicool Jul 24, 2023
cabf2ae
Features-C3-ButtonEmoji
Goldenbarnowl Jul 24, 2023
cfe7c09
Merge pull request #45 from Student-Labs-2023/Features-C3-ButtonEmoji
WhiteHodok Jul 24, 2023
48c2d7a
Merge pull request #46 from Student-Labs-2023/Features-A4-EditProfile
WhiteHodok Jul 24, 2023
264030c
Bugfix with command /start
Qubicool Jul 24, 2023
bb7eedf
Features-A4-BugFixWithSupabaseIdUsedPromocode
WhiteHodok Jul 24, 2023
69cd8cd
Merge pull request #47 from Student-Labs-2023/Features-A4-BugFixWithS…
WhiteHodok Jul 24, 2023
4f29197
Features-A4-BugFixWithGenCode
WhiteHodok Jul 24, 2023
56c5e6d
Merge pull request #48 from Student-Labs-2023/Features-A4-BugFixWithG…
WhiteHodok Jul 24, 2023
4cf1566
Features-B4-CancelUserEditMenu
WhiteHodok Jul 24, 2023
26b4318
Merge pull request #49 from Student-Labs-2023/Features-B4-CancelUserE…
WhiteHodok Jul 24, 2023
924bf08
BugFix-A4-ClearChatAfterReg
WhiteHodok Jul 24, 2023
11fac94
Merge pull request #50 from Student-Labs-2023/BugFix-A4-ClearChatAfte…
WhiteHodok Jul 24, 2023
382728d
Features-B4-FixStates
Qubicool Jul 24, 2023
5bab47d
Merge pull request #52 from Student-Labs-2023/Features-B4-FixStates
Qubicool Jul 24, 2023
77dbb7f
Features-A4-AddQRgenerator
WhiteHodok Jul 24, 2023
dd0e8ae
Merge pull request #53 from Student-Labs-2023/Features-A4-AddQRgenerator
WhiteHodok Jul 24, 2023
7d7cebc
Update requirements.txt
WhiteHodok Jul 24, 2023
b3bd484
BugFix-C4-CancelButtonForUser
WhiteHodok Jul 24, 2023
a7d54e4
Merge pull request #54 from Student-Labs-2023/BugFix-C4-CancelButtonF…
WhiteHodok Jul 24, 2023
d3868ab
BugFix-C4-FixCancelStateAdmin
WhiteHodok Jul 24, 2023
8670307
Merge pull request #55 from Student-Labs-2023/BugFix-C4-FixCancelStat…
WhiteHodok Jul 24, 2023
43bf2af
Features-B4-UserTickerReport
WhiteHodok Jul 25, 2023
f6e8ae5
Merge pull request #56 from Student-Labs-2023/Features-B4-UserTickerR…
WhiteHodok Jul 25, 2023
18a57e1
Features-B4-AdminTicketButtonBackAndCheck
WhiteHodok Jul 25, 2023
a02fd4c
Merge pull request #57 from Student-Labs-2023/Features-B4-AdminTicket…
WhiteHodok Jul 25, 2023
4c879f0
Features-B4-AddDelTicketForAdmin
WhiteHodok Jul 25, 2023
0fe6810
Merge pull request #58 from Student-Labs-2023/Features-B4-AddDelTicke…
WhiteHodok Jul 25, 2023
d02c865
fixed states
Qubicool Jul 25, 2023
f03e0df
Documentation-A4
WhiteHodok Jul 25, 2023
6866676
Merge pull request #59 from Student-Labs-2023/Documentation-A4
WhiteHodok Jul 25, 2023
d65a931
Update README.md
WhiteHodok Jul 25, 2023
f7a2e88
Update README.md
WhiteHodok Jul 25, 2023
99a269c
Update README.md
WhiteHodok Jul 25, 2023
e0435df
Update README.md
WhiteHodok Jul 25, 2023
86ccdb9
Update README.md
WhiteHodok Jul 25, 2023
cec3bb2
Update README.md
WhiteHodok Jul 25, 2023
4d8efbb
Update README.md
WhiteHodok Jul 25, 2023
1802aa8
Update README.md
WhiteHodok Jul 25, 2023
b269163
Update README.md
WhiteHodok Jul 25, 2023
cebc2df
Update README.md
WhiteHodok Jul 25, 2023
01cf84c
Update README.md
WhiteHodok Jul 25, 2023
c716abe
Features-A4-UserDataDelAll
WhiteHodok Jul 26, 2023
d418df7
Merge pull request #60 from Student-Labs-2023/Features-A4-UserDataDelAll
WhiteHodok Jul 26, 2023
6e88a09
Features-B4-GetInfoAboutUserInAdmin
Qubicool Jul 26, 2023
19cf334
Merge pull request #61 from Student-Labs-2023/Features-B4-GetInfoAbou…
Qubicool Jul 26, 2023
ef22867
Features-A4-TaskUpdate
Goldenbarnowl Jul 26, 2023
b7e9a9a
Merge pull request #62 from Student-Labs-2023/Features-A4-TaskUpdate
Goldenbarnowl Jul 26, 2023
2416abe
Scheme for DataBase
WhiteHodok Jul 26, 2023
7d50eaa
Update README.md
WhiteHodok Jul 26, 2023
4255ffe
Update README.md
WhiteHodok Jul 26, 2023
774546c
Update README.md
WhiteHodok Jul 26, 2023
7998c7f
Features-A4-BugFix
WhiteHodok Jul 26, 2023
1ed20ae
Merge pull request #63 from Student-Labs-2023/Features-A4-BugFix
WhiteHodok Jul 26, 2023
2a80831
Update main.py
Qubicool Jul 26, 2023
3060357
BugFix-A4-StateNotFoundPromoinAdmin
WhiteHodok Jul 27, 2023
f96bdca
Merge pull request #64 from Student-Labs-2023/BugFix-A4-StateNotFound…
WhiteHodok Jul 27, 2023
1a9e62c
Features-A5-EventScriptLeaderId
Qubicool Jul 28, 2023
b4f73d5
Merge pull request #66 from Student-Labs-2023/Features-A5-EventScript…
Qubicool Jul 28, 2023
81b4f64
Features-A5-ModularSystemForFunc
WhiteHodok Jul 29, 2023
3a4ca6a
Merge pull request #67 from Student-Labs-2023/Features-A5-ModularSyst…
WhiteHodok Jul 29, 2023
a4951b3
Features-B5-AddNamingPromo
WhiteHodok Jul 29, 2023
e4a39b3
Merge pull request #68 from Student-Labs-2023/Features-B5-AddNamingPromo
WhiteHodok Jul 29, 2023
f880d05
Update README.md
WhiteHodok Jul 29, 2023
360be74
Update README.md
WhiteHodok Jul 29, 2023
31f7bb0
Features-C5-DelZeroLastPromo
WhiteHodok Jul 30, 2023
1f7f71d
Merge pull request #69 from Student-Labs-2023/Features-C5-DelZeroLast…
WhiteHodok Jul 30, 2023
898dcc8
Features-C5-ZeroGoogleSheet
Goldenbarnowl Jul 30, 2023
c8d0fbd
Merge pull request #71 from Student-Labs-2023/Features-C5-ZeroGoogleS…
WhiteHodok Jul 30, 2023
e8e25af
Features-A5-AddEventMakerPanel
WhiteHodok Jul 30, 2023
894f647
Merge pull request #72 from Student-Labs-2023/Features-A5-AddEventMak…
WhiteHodok Jul 30, 2023
6d61efa
Features-C5-AddRolesJSON
WhiteHodok Jul 30, 2023
f134200
Merge pull request #73 from Student-Labs-2023/Features-C5-AddRolesJSON
WhiteHodok Jul 30, 2023
c3b780c
Features-B5-RuleskbmForAdmin
WhiteHodok Jul 30, 2023
1053142
Merge pull request #74 from Student-Labs-2023/Features-B5-RuleskbmFor…
WhiteHodok Jul 30, 2023
075c3c8
Features-B5-GivingEventMakerRoleFromAdmin
WhiteHodok Jul 30, 2023
a89b887
Merge pull request #75 from Student-Labs-2023/Features-B5-GivingEvent…
WhiteHodok Jul 30, 2023
c3a6ca7
Features-B5-DelRulesFromUser
WhiteHodok Jul 30, 2023
2f709dc
Merge pull request #76 from Student-Labs-2023/Features-B5-DelRulesFro…
WhiteHodok Jul 30, 2023
5b7566d
Features-B5-ChekUserRules
WhiteHodok Jul 30, 2023
ed2e61c
Merge pull request #77 from Student-Labs-2023/Features-B5-ChekUserRules
WhiteHodok Jul 30, 2023
ea39c7a
Features-B5-RatingPosition
Goldenbarnowl Jul 31, 2023
fef756c
Merge pull request #78 from Student-Labs-2023/Features-B5-RatingPosit…
WhiteHodok Jul 31, 2023
a196968
Features-B5-CalendarButton
Qubicool Jul 31, 2023
2484935
Merge pull request #79 from Student-Labs-2023/Features-B5-CalendarButton
Qubicool Jul 31, 2023
55b9ecc
BugFix-A5-ValidationUsersDataChange
WhiteHodok Jul 31, 2023
e730aaf
Merge pull request #80 from Student-Labs-2023/BugFix-A5-ValidationUse…
WhiteHodok Jul 31, 2023
2434931
Features-A5-EditAminPanel
Qubicool Jul 31, 2023
cfcfd81
Merge pull request #81 from Student-Labs-2023/Features-A5-EditAminPanel
Qubicool Jul 31, 2023
0839c43
Update README.md
WhiteHodok Jul 31, 2023
5506b66
Update README.md
WhiteHodok Jul 31, 2023
7c34472
Update README.md
WhiteHodok Jul 31, 2023
5ca818f
BugFix-A5-FixStatesHelpMenu
WhiteHodok Jul 31, 2023
8cdaa7f
Merge pull request #82 from Student-Labs-2023/BugFix-A5-FixStatesHelp…
WhiteHodok Jul 31, 2023
f29ecf9
Features-A5-TaskUpdateV2
Goldenbarnowl Aug 1, 2023
068bcff
Merge pull request #83 from Student-Labs-2023/Features-A5-TaskUpdateV2
Goldenbarnowl Aug 1, 2023
5ba5b72
Features-B5-PatchNoteStateForTasks
WhiteHodok Aug 1, 2023
afcd6c8
Merge pull request #84 from Student-Labs-2023/Features-B5-PatchNoteSt…
WhiteHodok Aug 1, 2023
29678b4
Features-C5-MarkdownV2Promos
WhiteHodok Aug 1, 2023
427e332
Merge pull request #85 from Student-Labs-2023/Features-C5-MarkdownV2P…
WhiteHodok Aug 1, 2023
0ae3368
Features-C5-MarkdownEditor
WhiteHodok Aug 1, 2023
f7ab73a
Merge pull request #86 from Student-Labs-2023/Features-C5-MarkdownEditor
WhiteHodok Aug 1, 2023
db7b8ff
Update README.md
WhiteHodok Aug 1, 2023
b5aad85
Update README.md
WhiteHodok Aug 1, 2023
bbf7357
Features-C5-CancelButtonForPromo
WhiteHodok Aug 2, 2023
f49dd7f
Merge pull request #87 from Student-Labs-2023/Features-C5-CancelButto…
WhiteHodok Aug 2, 2023
c01757a
Features-C5-EventMessage
Qubicool Aug 2, 2023
f650b68
Merge pull request #88 from Student-Labs-2023/Features-C5-EventMessage-1
Qubicool Aug 2, 2023
329096c
Features-B6-IntgrateBoardWitTGWebApp
WhiteHodok Aug 5, 2023
4d0e364
Merge pull request #89 from Student-Labs-2023/Features-B6-IntgrateBoa…
WhiteHodok Aug 5, 2023
d54a061
Features-A6-WebAppQrScanner
WhiteHodok Aug 6, 2023
dafaf19
Merge pull request #90 from Student-Labs-2023/Features-A6-WebAppQrSca…
WhiteHodok Aug 6, 2023
455e1ae
Features-B6-AddPromocodeMenuInMain
WhiteHodok Aug 7, 2023
053f872
Merge pull request #91 from Student-Labs-2023/Features-B6-AddPromocod…
WhiteHodok Aug 7, 2023
f9b406c
Features-C6-RewriteText
WhiteHodok Aug 7, 2023
fbcc786
Merge pull request #92 from Student-Labs-2023/Features-C6-RewriteText
WhiteHodok Aug 7, 2023
c459388
Features-B6-EditEventMessage
Qubicool Aug 7, 2023
90832dd
Merge pull request #93 from Student-Labs-2023/Features-B6-EditEventMe…
Qubicool Aug 7, 2023
be73a49
Features-B6-AddScanFromUserImage
WhiteHodok Aug 8, 2023
4a9e2e5
Merge pull request #95 from Student-Labs-2023/Features-B6-AddScanFrom…
WhiteHodok Aug 9, 2023
0bf8eaa
Update requirements.txt
WhiteHodok Aug 9, 2023
ac69b80
Update requirements.txt
WhiteHodok Aug 9, 2023
fcc9052
HotFix-C6-FixAvatarTable
WhiteHodok Aug 9, 2023
8467721
Merge pull request #97 from Student-Labs-2023/HotFix-C6-FixAvatarTable-1
WhiteHodok Aug 9, 2023
293ecae
Update-A6-Requirements
WhiteHodok Aug 9, 2023
8add9d6
Merge pull request #98 from Student-Labs-2023/Update-A6-Requirements
WhiteHodok Aug 9, 2023
a1a4a2b
Features-A6-QRWebApp
Goldenbarnowl Aug 9, 2023
48631d6
Merge pull request #99 from Student-Labs-2023/Features-A6-QRWebApp
Goldenbarnowl Aug 9, 2023
56102e6
Features-6B-AvatarGoogleSheet
Goldenbarnowl Aug 9, 2023
cea64a5
Merge pull request #100 from Student-Labs-2023/Features-6B-AvatarGoog…
Goldenbarnowl Aug 9, 2023
f9d3453
Features-B6-WithButtonStates
Qubicool Aug 9, 2023
f609fe9
Merge pull request #101 from Student-Labs-2023/Features-B6-WithButton…
Qubicool Aug 9, 2023
fc45122
Update README.md
WhiteHodok Aug 10, 2023
1a179fc
Update README.md
WhiteHodok Aug 10, 2023
ee6f917
Update README.md
WhiteHodok Aug 10, 2023
551d467
Update README.md
WhiteHodok Aug 10, 2023
901fa54
Update README.md
WhiteHodok Aug 10, 2023
f96808f
Features-A6-RegistrationFix
Qubicool Aug 10, 2023
18cca88
Merge pull request #102 from Student-Labs-2023/Features-A6-Registrati…
Qubicool Aug 10, 2023
11c4046
Features-A7-HelpForUserInline
WhiteHodok Aug 13, 2023
095c5c2
Update README.md
WhiteHodok Aug 13, 2023
f90b33c
Update README.md
WhiteHodok Aug 13, 2023
df5f190
Features-B7-ValidationBadWordsInName
Qubicool Aug 13, 2023
3e2e7da
Merge pull request #103 from Student-Labs-2023/Features-B7-Validation…
Qubicool Aug 13, 2023
711e20e
Валидация ФИО
Qubicool Aug 13, 2023
af38546
Update README.md
WhiteHodok Aug 13, 2023
ac302ff
Features-A7-AddUserInlineGuide
WhiteHodok Aug 13, 2023
9510a49
Requirements-A7-dirt_tongue
WhiteHodok Aug 13, 2023
a4e38fc
Merge pull request #104 from Student-Labs-2023/Requirements-A7-dirt_t…
WhiteHodok Aug 13, 2023
c39780b
BugFix-A7-Validation
WhiteHodok Aug 13, 2023
bb63846
Merge pull request #105 from Student-Labs-2023/BugFix-A7-Validation
WhiteHodok Aug 13, 2023
faf34e4
Features-B7-ParseModeComplete
WhiteHodok Aug 13, 2023
a277589
Merge pull request #106 from Student-Labs-2023/Features-B7-ParseModeC…
WhiteHodok Aug 13, 2023
098ba37
Features-B7-ValidationName
Qubicool Aug 15, 2023
84ffc3e
Merge pull request #107 from Student-Labs-2023/Features-B7-Validation…
Qubicool Aug 15, 2023
5c0b835
Update main.py
Qubicool Aug 15, 2023
1947f36
Features-A7-SchemaProject
WhiteHodok Aug 16, 2023
66ebf44
Merge pull request #108 from Student-Labs-2023/Features-A7-SchemaProject
WhiteHodok Aug 16, 2023
12949de
Схема проекта
WhiteHodok Aug 16, 2023
55c5d0c
Update README.md
WhiteHodok Aug 16, 2023
a5524a6
Features-C7-EditCommentsInMain
Qubicool Aug 16, 2023
71c4c19
Merge pull request #109 from Student-Labs-2023/Features-C7-EditCommen…
Qubicool Aug 16, 2023
44cc00f
Update README.md
WhiteHodok Aug 16, 2023
e6af4ac
Update README.md
WhiteHodok Aug 16, 2023
e52ae76
Update index.puml
WhiteHodok Aug 16, 2023
acdcb4d
Features-A7-AddSchemaSimple
WhiteHodok Aug 16, 2023
dd97de3
Merge pull request #110 from Student-Labs-2023/Features-A7-AddSchemaS…
WhiteHodok Aug 16, 2023
3bdb7e3
Features-C7-StateFixOnQRScanner
WhiteHodok Aug 16, 2023
5438012
Merge pull request #111 from Student-Labs-2023/Features-C7-StateFixOn…
WhiteHodok Aug 16, 2023
30229dd
Features-A7-СollectionСreator
Goldenbarnowl Aug 16, 2023
a5e873e
Merge pull request #112 from Student-Labs-2023/Features-A7-Сollection…
Goldenbarnowl Aug 16, 2023
4c68b9d
Features-7B-TaskQuestion
Goldenbarnowl Aug 17, 2023
697fd8b
Merge pull request #113 from Student-Labs-2023/Features-7B-TaskQuestion
Goldenbarnowl Aug 17, 2023
d1f60d3
- Добавлено веб-приложение для опросов
dudava Aug 17, 2023
6dcc103
Merge pull request #114 from Student-Labs-2023/Features-A7-WebAppSurvey
dudava Aug 17, 2023
ac25a85
Features-A7-STRESSDEMO
WhiteHodok Aug 17, 2023
5f3ab19
Merge pull request #115 from Student-Labs-2023/Features-A7-STRESSDEMO
WhiteHodok Aug 17, 2023
dcb1699
Update README.md
WhiteHodok Aug 21, 2023
e0202a4
Features-A8-GetUrlWebApp
Qubicool Aug 22, 2023
6955053
Merge pull request #116 from Student-Labs-2023/Features-A8-GetUrlWebApp
Qubicool Aug 22, 2023
e020dc3
Features-A8-SurveyGenerator
Goldenbarnowl Aug 22, 2023
b4cdaf1
Merge pull request #117 from Student-Labs-2023/Features-A8-SurveyGene…
Goldenbarnowl Aug 22, 2023
09c37aa
Features-A8-TaskList
WhiteHodok Aug 22, 2023
b95b6bb
Merge pull request #118 from Student-Labs-2023/Features-A8-TaskList
WhiteHodok Aug 22, 2023
951238a
Features-A8-TaskMenuDelete
WhiteHodok Aug 22, 2023
1a98006
Merge pull request #119 from Student-Labs-2023/Features-A8-TaskMenuDe…
WhiteHodok Aug 22, 2023
f8eede9
Features-A8-GetRightAnswers
Qubicool Aug 23, 2023
4aa5196
Merge pull request #120 from Student-Labs-2023/Features-A8-GetRightAn…
Qubicool Aug 23, 2023
d1eafa2
Features-A8-FixWebAppData
Goldenbarnowl Aug 23, 2023
c0d0ff4
Merge pull request #121 from Student-Labs-2023/Features-A8-FixWebAppData
Goldenbarnowl Aug 23, 2023
9658c8a
Features-A8-UserCountAnswers
Qubicool Aug 23, 2023
952d011
Merge pull request #122 from Student-Labs-2023/Features-A8-UserCountA…
Qubicool Aug 23, 2023
a315d71
Features-A8-AddSurveyComplete
WhiteHodok Aug 23, 2023
49a926a
Merge pull request #123 from Student-Labs-2023/Features-A8-AddSurveyC…
WhiteHodok Aug 23, 2023
cc90234
Features-A8-AddEventMakerRole
WhiteHodok Aug 23, 2023
53572fd
Merge pull request #124 from Student-Labs-2023/Features-A8-AddEventMa…
WhiteHodok Aug 23, 2023
5878eec
working version for telegram bot
dudava Aug 23, 2023
632035c
Merge pull request #125 from Student-Labs-2023/Features-A8-SurveyWebA…
dudava Aug 23, 2023
de8a6fa
Features-B8-ValidationNameFieldTask
Qubicool Aug 23, 2023
1387da8
Merge pull request #126 from Student-Labs-2023/Features-B8-Validation…
Qubicool Aug 23, 2023
04c4a40
Features-A8-HotFix
WhiteHodok Aug 23, 2023
dae82d4
Merge pull request #127 from Student-Labs-2023/Features-A8-HotFix
WhiteHodok Aug 23, 2023
8a2bd61
Features-A8-HotFix
WhiteHodok Aug 23, 2023
fc2a72b
Merge pull request #128 from Student-Labs-2023/Features-A8-HotFix-1
WhiteHodok Aug 23, 2023
6001827
Update README.md
WhiteHodok Aug 23, 2023
c5c617a
Update README.md
WhiteHodok Aug 23, 2023
bdc163c
Update README.md
WhiteHodok Aug 23, 2023
9be7333
Update README.md
WhiteHodok Aug 23, 2023
c0bffef
Update README.md
WhiteHodok Aug 23, 2023
73588a1
Update README.md
WhiteHodok Aug 23, 2023
30047e8
Update README.md
WhiteHodok Aug 23, 2023
1f9ac03
Update README.md
WhiteHodok Aug 23, 2023
fd7f75c
Update README.md
WhiteHodok Aug 23, 2023
28eb905
Update README.md
WhiteHodok Aug 23, 2023
f528730
Features-A8-UpdateSQLSchema
WhiteHodok Aug 23, 2023
ff57a89
Merge pull request #129 from Student-Labs-2023/Features-A8-UpdateSQLS…
WhiteHodok Aug 23, 2023
1912bba
Update README.md
WhiteHodok Aug 23, 2023
abea2b6
Update README.md
WhiteHodok Aug 23, 2023
87b7983
Update README.md
WhiteHodok Aug 24, 2023
95b1559
Update README.md
WhiteHodok Aug 24, 2023
d771aa1
Create code_quality.yml
WhiteHodok Jan 30, 2024
3cc2f19
Qodana
WhiteHodok Jan 30, 2024
f17c04d
Qodana
WhiteHodok Jan 30, 2024
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
25 changes: 25 additions & 0 deletions .github/workflows/code_quality.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Qodana
on:
workflow_dispatch:
pull_request:
push:
branches:
- main
- 'releases/*'

jobs:
qodana:
runs-on: ubuntu-latest
permissions:
contents: write
pull-requests: write
checks: write
steps:
- uses: actions/checkout@v3
with:
ref: ${{ github.event.pull_request.head.sha }} # to check out the actual pull request commit, not the merge commit
fetch-depth: 0 # a full history is required for pull request analysis
- name: 'Qodana Scan'
uses: JetBrains/[email protected]
env:
QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
44,625 changes: 44,625 additions & 0 deletions .github/workflows/qodana.sarif.json

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ __pycache__/
# C extensions
*.so

# JSON с гугл докой
boilerpoint-393111-68b01f6645e3.json

# Distribution / packaging
.Python
build/
Expand Down
79 changes: 79 additions & 0 deletions Database/DataUsers.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
import os
from dotenv import load_dotenv
from supabase import Client , create_client



load_dotenv()

# Инициализация подключения к базе данных Supabase
url: str = os.environ.get("SUPABASE_URL")
key: str = os.environ.get("SUPABASE_KEY")
supabase: Client = create_client(url,key)
table_name = "UsersData"


def get_user_state_by_id(chat_id: int) -> str:
try:
response = supabase.table(table_name).select('user_state').eq('chat_id', chat_id).limit(1).execute()
if len(response.data) > 0:
user_state = response.data[0].get('user_state')
print(f"Retrieved user state for {chat_id}: {user_state}")
return user_state
else:
return ""
except Exception as e:
print(f"Error retrieving user state for {chat_id}: {e}")
return ""

def update_user_state_by_id(chat_id: int, state: str):
try:
chat_id_str = str(chat_id) # Преобразование chat_id в строку
response = supabase.table(table_name).update({'user_state': state}).eq('chat_id', chat_id_str).execute()
print(f"Updated user state for {chat_id}: {state}")
except Exception as e:
print(f"Error updating user state for {chat_id}: {e}")

def update_user_fullname_by_tgusr(tgusr: str, full_name: str):
try:
response = supabase.table(table_name).update({'full_name': full_name}).eq('tgusr', tgusr).execute()
print(f"Updated user fullname for {tgusr}: {full_name}")
except Exception as e:
print(f"Error updating user fullname for {tgusr}: {e}")

def update_user_age_by_tgusr(tgusr: str, age : int):
try:
response = supabase.table(table_name).update({'age': age}).eq('tgusr', tgusr).execute()
print(f"Updated user age for {tgusr}: {age}")
except Exception as e:
print(f"Error updating user age for {tgusr}: {e}")

def update_user_balance_by_tgusr(tgusr: str, balance : int):
try:
response = supabase.table(table_name).update({'balance': balance}).eq('tgusr', tgusr).execute()
print(f"Updated user balance for {tgusr}: {balance}")
except Exception as e:
print(f"Error updating user balance for {tgusr}: {e}")

def delete_user_data_by_id(chat_id: int) -> str:
try:
chat_id_str = str(chat_id)
result = supabase.table(table_name).delete().eq('chat_id', chat_id_str).execute()
if result["error"]:
print(f"Error deleting rows: {result['error']}")
else:
print(f"{result['count']} rows deleted")
except Exception as e:
print(f"Error delete user data: {chat_id}: {e}")


def get_user_info_by_id(chat_id:int ) -> str:
try:
response = supabase.table('UsersData').select('full_name','gender','age','balance','tgusr').eq('chat_id', chat_id).execute()
return response
except Exception as e:
print(f"Error get info about user: {chat_id}: {e}")




15 changes: 0 additions & 15 deletions Database/YandexDB.py

This file was deleted.

Binary file removed Database/__pycache__/YandexDB.cpython-310.pyc
Binary file not shown.
Binary file removed Database/__pycache__/YandexDB.cpython-311.pyc
Binary file not shown.
Binary file removed Database/__pycache__/state.cpython-311.pyc
Binary file not shown.
17 changes: 0 additions & 17 deletions Database/docker-compose.yml

This file was deleted.

59 changes: 59 additions & 0 deletions Documentation/BoilerPointTG.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
CREATE TABLE "DataUsers" (
"chat_id" int UNIQUE PRIMARY KEY,
"full_name" varchar,
"age" int,
"gender" bool,
"balance" int,
"user_state" varchar,
"tgusr" varchar
);

CREATE TABLE "Report" (
"tgusr" varchar UNIQUE PRIMARY KEY,
"description" varchar
);

CREATE TABLE "Promocode" (
"promo" varchar UNIQUE PRIMARY KEY,
"last" int,
"cost" int
);

CREATE TABLE "UsedPromocode" (
"id" int UNIQUE PRIMARY KEY,
"promo" varchar,
"chat_id" int
);

CREATE TABLE "Event" (
"id" int PRIMARY KEY,
"date_start" varchar,
"date_end" varchar,
"full_name" varchar
);

CREATE TABLE "TaskCollection" (
"name" varchar UNIQUE PRIMARY KEY,
"description" varchar,
"photo" varchar,
"counter" int,
"url" varchar,
"numberPoints" varchar,
"rightAnswers" varchar
);

CREATE TABLE "Passd" (
"id" int PRIMARY KEY,
"name" varchar,
"chat_id" int
);

ALTER TABLE "DataUsers" ADD FOREIGN KEY ("chat_id") REFERENCES "UsedPromocode" ("chat_id");

ALTER TABLE "DataUsers" ADD FOREIGN KEY ("tgusr") REFERENCES "Report" ("tgusr");

ALTER TABLE "Promocode" ADD FOREIGN KEY ("promo") REFERENCES "UsedPromocode" ("promo");

ALTER TABLE "TaskCollection" ADD FOREIGN KEY ("name") REFERENCES "Passd" ("name");

ALTER TABLE "DataUsers" ADD FOREIGN KEY ("chat_id") REFERENCES "Passd" ("chat_id");
154 changes: 154 additions & 0 deletions Documentation/Docs/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
# Техническая документация

## Disclaimer

Документация делается на случай того, если связь с 4-мя разрабами окончательно потеряется и нельзя будет поддерживать бота без их участия.
Вся документация пишется исключительно по доброй воле и не является 100% технической, скорее составляется на тот случай, если другого выхода не будет.


Разработчики:

1. https://github.com/WhiteHodok

2. https://github.com/Qubicool

3. https://github.com/Goldenbarnowl

4. https://github.com/dudava (Web-App)


# За что отвечает каждый импорт

![image](https://github.com/Student-Labs-2023/BoilerPoint/assets/39564937/702df1c4-5f2c-4c57-97a4-a0348799a1a7)


## json
- Работа с JSON файлами

## PIL.image
- Работа с QR

## io
- Хранение QR кода в опреативной памяти при его создании

## pyzbar
- Чтение QR кодов с текста

## aiogram
- Фреймворк на котором сделан бот

## os
- Подтягивание .env файлов в файловой системе компьютера

## buttons
- buttons.py отвечает за кнопки в боте

## src...
- UserRepostiory для удобного обращения к БД

## GoogleSheets (gspread)
- Для работы гугл-таблиц

## codegen
- Функции для генерации промокодов

## funcs
- Функции для работы бота

## ast
- Dependencies QR


# Finite State Machine

## Для чего нужны стейты (состояния)

- Стейты нужны для работы с клавиатурой
- При наличии стейтов нельзя попасть в админку не находясь в roles.json или создать ивент
- https://mastergroosha.github.io/aiogram-2-guide/fsm/

## Как объявить новое состояние

![image](https://github.com/Student-Labs-2023/BoilerPoint/assets/39564937/292b5e4b-9b61-4166-adc5-e07401b36a74)


- Создать новый класс и передать в класс от которого он наследуется StatesGroup
- Передать аргументы нового состояния следующим образом


```py
class RegistrationStates(StatesGroup):
waiting_for_age = State()
waiting_for_gender = State()
waiting_for_name = State()
final_reg = State()
```


Всё это позволит вам создать новый класс в машине состояний (FSM)


# Что делать если я вижу бота на миллион строк и не понимаю что в нём редачить

Определённые функции в боте можно идентифицировать однозначно с помощью следующих способов :


1. Способ

1.1.Мы видим в нашем боте любую красивую кнопку у которой хотим изменить функционал.

1.2.Заходим в любой IDE, открываем main.py, нажимаем CTR+F и пишем текст кнопки, которую хотим изменить.

1.3.Вы прекрасны


2. Способ

2.1. Мы знаем про существование FSM в нашем боте

2.2. Заходим в нужный класс и делаем CTR+F по этому стейту.

2.3. Profit


3. Способ

3.1. Весь код в боте разделён на тематические блоки :

![image](https://github.com/Student-Labs-2023/BoilerPoint/assets/39564937/d5934852-5efa-46ee-bd0a-daf4eb1f6ac7)

Эти блоки сообщают нам о том за что конкретно отвечает каждый блок

3.2. Все хендлеры в блоке идут последовательно и не разорваны по коду мейна, т.е каждая клавиатура идёт последовательно друг за другом и никак иначе.


## Структура .env

```
TOKEN =
SUPABASE_URL =
SUPABASE_KEY =
MALE =
FEMALE =
```

## Структура JSON

```
{
"type": "service_account",
"project_id": "boilerpoint",
"private_key_id": "",
"private_key": "-----BEGIN PRIVATE KEY-----\n-----END PRIVATE KEY-----\n",
"client_email": "",
"client_id": "",
"auth_uri": "https://accounts.google.com/o/oauth2/auth",
"token_uri": "https://oauth2.googleapis.com/token",
"auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
"client_x509_cert_url": "",
"universe_domain": "googleapis.com"
}
```


P.S. Как получить .env & JSON можно посмотреть в раниих ветках проекта, а именно в старом README.md датой около 10-21 июля 2023 года
15 changes: 15 additions & 0 deletions Documentation/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# EULA

![image](https://github.com/Student-Labs-2023/BoilerPoint/assets/39564937/3a0b8b77-e2aa-439f-8e58-972d9689501e)

## Правила

Здесь собраны необходимые для ознакомления *правила* и *рекомендации* :

1. Пользователю при вводе его имени желательно ставить его реальное ФИО, чтобы администратор был уверен в том, кому выдаёт награду.

1.1. Если ваше имя не валидируется , т.е система не даёт вам зарегистрироваться из-за вашего имени, зарегистрируйтесь под любым именем, которое пропустит система, зачем перейдите в кнопку "Помощь" , в ней создайте заявку администратору на смену имени.

2. Не используйте ругательства и оскорбления в графе ФИО, администрация следит за этим.

3. Вы прекрасны!
Loading
Loading