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

Killer feature update #14

Open
wants to merge 89 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
9d3aa41
Create client.h
IlyaKasiutin May 4, 2023
d98ff39
Добавлены заголовочные файлы клиента
IlyaKasiutin May 4, 2023
a32b29f
Create client.cpp
IlyaKasiutin May 4, 2023
44795e2
Добавлены исполняемые файлы клиента
IlyaKasiutin May 4, 2023
552ae81
Create main.cpp
IlyaKasiutin May 4, 2023
9188517
Добавлены тесты клиента
IlyaKasiutin May 4, 2023
a895939
Add files via upload
SanExpett May 4, 2023
bca94f6
add user control
SanExpett May 14, 2023
cacbffd
Add files via upload
IlyaKasiutin May 16, 2023
98ddbcb
Delete peermanager.h
IlyaKasiutin May 16, 2023
deba43f
Delete connection.h
IlyaKasiutin May 16, 2023
e83d402
Delete chatdialog.h
IlyaKasiutin May 16, 2023
300ffcf
Delete client.h
IlyaKasiutin May 16, 2023
18d5d09
Add files via upload
IlyaKasiutin May 16, 2023
2d2b12a
Delete chatdialog.cpp
IlyaKasiutin May 16, 2023
e9daeaa
Delete client.cpp
IlyaKasiutin May 16, 2023
05791bf
Delete connection.cpp
IlyaKasiutin May 16, 2023
75354db
Delete peermanager.cpp
IlyaKasiutin May 16, 2023
798d86f
Delete server.cpp
IlyaKasiutin May 16, 2023
6df13e9
Delete main.cpp
IlyaKasiutin May 16, 2023
b10003d
Delete tst_mycasename.cpp
IlyaKasiutin May 16, 2023
6d7ad34
Create main.cpp
IlyaKasiutin May 16, 2023
2cd1e6f
Add files via upload
IlyaKasiutin May 16, 2023
69486a6
Add files via upload
IlyaKasiutin May 16, 2023
dae3f86
updated usercontrol
SanExpett May 16, 2023
b7816d1
Update loginwindow.cpp
SanExpett May 16, 2023
b7174a6
Delete qclient.cpp
SanExpett May 16, 2023
89b19ff
Delete qclient.h
SanExpett May 16, 2023
23d528a
Добавлен Qt-клиент
IlyaKasiutin May 17, 2023
e9b8586
Сервер для тестирования
IlyaKasiutin May 17, 2023
c2d8017
Add files via upload
IlyaKasiutin May 18, 2023
5938af7
Merge pull request #5 from cpp-park-vk-education/authorization
nickdemiman May 18, 2023
8ec4cc3
Merge pull request #4 from cpp-park-vk-education/Ilya
nickdemiman May 18, 2023
404de78
Файлы разбиты по папкам
IlyaKasiutin May 18, 2023
dda3b78
Изменены пути в qmake
IlyaKasiutin May 18, 2023
29f0cdd
Добавлен ресурсный файл с виджетами
IlyaKasiutin May 18, 2023
c1519c6
Добавлены виджеты
IlyaKasiutin May 18, 2023
0c0016b
Добавлен исполняемый файл для виджетов
IlyaKasiutin May 18, 2023
b621233
Add files via upload
IlyaKasiutin May 18, 2023
69e4ad8
rework
nickdemiman May 18, 2023
b9716af
Начало работы над main process
IlyaKasiutin May 18, 2023
8102580
Исправлен main_window
IlyaKasiutin May 18, 2023
bfae4d3
fixed MainProccess auth
SanExpett May 18, 2023
0be5706
Изменен main process
IlyaKasiutin May 18, 2023
c3078bb
Удаление ненужных частей
IlyaKasiutin May 19, 2023
ab015cf
Обновлен клиент. Теперь для нескольких пользователей все хорошо работает
IlyaKasiutin May 20, 2023
4ffbc6e
Изменения в клиенте
IlyaKasiutin May 21, 2023
56e0547
Добавлена функциональность каналов
IlyaKasiutin May 21, 2023
7b06f70
Подготовка к демонстрации
IlyaKasiutin May 25, 2023
e0acb35
Добавление user
IlyaKasiutin May 25, 2023
ca95ea1
Исправленное окно регистрации
IlyaKasiutin May 25, 2023
fa41bb4
Начальная привязка к Request
IlyaKasiutin May 25, 2023
b4b8b13
custom request
SanExpett May 26, 2023
ab9ca37
change dir name
nickdemiman May 27, 2023
d1d7a1b
init
nickdemiman May 26, 2023
0773267
debug state
nickdemiman May 26, 2023
264eed7
ext
nickdemiman May 27, 2023
097c2a1
прикрутил вход
nickdemiman May 27, 2023
ca4bf4e
registration worked
nickdemiman May 27, 2023
e2d2c1e
немного UI Design
nickdemiman May 27, 2023
4cb7645
UserManager
SanExpett May 27, 2023
16dd09f
docker changes
nickdemiman May 27, 2023
642b1fc
ui reg change
nickdemiman May 27, 2023
5c6912f
автовход
nickdemiman May 28, 2023
1b6a7b9
merge guild_implementation
nickdemiman May 28, 2023
5d9b0d7
guild add window
nickdemiman May 28, 2023
d1cb340
Добавлены диалоговые окна
IlyaKasiutin May 28, 2023
c9920f2
settings
nickdemiman May 28, 2023
5001600
Guild add
IlyaKasiutin May 28, 2023
5109c32
Channel add
IlyaKasiutin May 28, 2023
21708ef
Channel add
IlyaKasiutin May 28, 2023
6ba48c7
build config + requests
nickdemiman May 28, 2023
08d5146
Merge branch 'killer-feature-update' of https://github.com/cpp-park-v…
nickdemiman May 28, 2023
7dafb1c
changes
nickdemiman May 28, 2023
431b7a3
response to fetch guild
nickdemiman May 28, 2023
6a0a813
paigjjnpiqemgj
nickdemiman May 31, 2023
eb71262
Все заработало
IlyaKasiutin Jun 1, 2023
64025c5
Немного изменены размеры элементов
IlyaKasiutin Jun 1, 2023
87e2544
Сообщения загружаются, все хорошо
IlyaKasiutin Jun 1, 2023
20b9599
Работает обновление сообщений
IlyaKasiutin Jun 1, 2023
5942d53
Добавление существующих гильдий
nickdemiman Jun 1, 2023
6c40221
Добавил фетчинг каналов
nickdemiman Jun 1, 2023
bbf47d9
Update data_types.hpp
nickdemiman Jun 1, 2023
285b5b4
join to server
nickdemiman Jun 1, 2023
f40b1fc
Добавлено подключение к каналам
IlyaKasiutin Jun 1, 2023
f888e9a
some changes
nickdemiman Jun 1, 2023
2618c5a
Merge branch 'killer-feature-update' of https://github.com/cpp-park-v…
nickdemiman Jun 1, 2023
dcee7c3
работает*
nickdemiman Jun 1, 2023
de67b3b
Исправлен баг
IlyaKasiutin Jun 2, 2023
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
77 changes: 77 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
# This file is used to ignore files which are generated
# ----------------------------------------------------------------------------
debug
release
*~
*.autosave
*.a
*.core
*.moc
*.o
*.obj
*.orig
*.rej
*.so
*.so.*
*_pch.h.cpp
*_resource.rc
*.qm
.#*
*.*#
core
!core/
tags
.DS_Store
.directory
*.debug
Makefile*
*.prl
*.app
moc_*.cpp
ui_*.h
Thumbs.db
*.res
*.rc
/.qmake.cache
/.qmake.stash

# qtcreator generated files
*.pro.user*

# xemacs temporary files
*.flc

# Vim temporary files
.*.swp

# Visual Studio generated files
*.ib_pdb_index
*.idb
*.ilk
*.pdb
*.sln
*.suo
*.vcproj
*vcproj.*.*.user
*.ncb
*.sdf
*.opensdf
*.vcxproj
*vcxproj.*

# MinGW generated files
*.Debug
*.Release

# Python byte code
*.pyc

# Binaries
# --------
*.dll
*.exe

.vscode/settings.json
env
venv
__pycache__
151 changes: 151 additions & 0 deletions client/ITSwarm/ITSwarm.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
QT += core gui network

greaterThan(QT_MAJOR_VERSION, 4): QT += widgets

CONFIG += c++20
QMAKE_CXXFLAGS += -std=c++20

# You can make your code fail to compile if it uses deprecated APIs.
# In order to do so, uncomment the following line.
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0

#SUBDIRS += \
# windows \
# controls

SOURCES += \
controls/channel_control/channelcontrol.cpp \
controls/message_control/messagecontrol.cpp \
controls/serverbutton.cpp \
controls/user_control/user_control.cpp \
main.cpp \
windows/connect_to_guild/guildconnector.cpp \
windows/channel_add/channel_add.cpp \
windows/channel_widget/channelsidebar.cpp \
windows/content_widget/contentwindow.cpp \
windows/gitconnection/gitconnection.cpp \
windows/guild_add/guild_add.cpp \
windows/guildbar/guildbar.cpp \
windows/login_window/loginwindow.cpp \
windows/main_window/main_window.cpp \
windows/reg_window/reg_window.cpp \
windows/settings_window/settingswindow.cpp \
# windows/sidebar/sidebar.cpp \
windows/user_options/useroptions.cpp \
windows/user_settings/usersettings.cpp \
windows/userbar/userbar.cpp

HEADERS += \
controls/serverbutton.h \
external/data_types.hpp \
external/json.hpp \
controls/channel_control/channelcontrol.h \
controls/message_control/messagecontrol.h \
controls/user_control/user_control.h \
windows/connect_to_guild/guildconnector.h \
windows/channel_add/channel_add.h \
windows/channel_widget/channelsidebar.h \
windows/content_widget/contentwindow.h \
windows/gitconnection/gitconnection.h \
windows/guild_add/guild_add.hpp \
windows/guildbar/guildbar.h \
windows/login_window/loginwindow.hpp \
windows/main_window/main_window.h \
windows/reg_window/reg_window.h \
windows/settings_window/settingswindow.h \
# windows/sidebar/sidebar.h \
windows/user_options/useroptions.h \
windows/user_settings/usersettings.h \
windows/userbar/userbar.h

FORMS += \
controls/serverbutton.ui \
windows/connect_to_guild/guildconnector.ui \
windows/channel_add/channel_add.ui \
windows/channel_widget/channelsidebar.ui \
windows/content_widget/contentwindow.ui \
windows/gitconnection/gitconnection.ui \
windows/guild_add/guild_add.ui \
windows/guildbar/guildbar.ui \
windows/login_window/loginwindow.ui \
windows/main_window/main_window.ui \
windows/reg_window/reg_window.ui \
windows/settings_window/settingswindow.ui \
windows/sidebar/sidebar.ui \
windows/user_options/useroptions.ui \
windows/user_settings/usersettings.ui \
windows/userbar/userbar.ui

# Default rules for deployment.
qnx: target.path = /tmp/$${TARGET}/bin
else: unix:!android: target.path = /opt/$${TARGET}/bin
!isEmpty(target.path): INSTALLS += target

RESOURCES += \
static/icons.qrc \
static/images.qrc \

DISTFILES += \
static/icons/close.png \
static/icons/free-icon-hammer-and-sickle-7352591.png:Zone.Identifier \
static/icons/logo.png \
static/icons/server_hover.png \
static/icons/server_idle.png \
static/icons/server_selected.png \
static/images/Channels-Iconhovered.png \
static/images/Channels-Iconselected.png \
static/images/Channels-Iconvoice hovered.png \
static/images/Channels-Iconvoice_selected.png \
static/images/WF Icon Button.png \
static/images/icons8-automatic-50.png \
static/images/icons8-git-50.png \
static/images/icons8-git-75.png \
static/images/icons8-more-24.png \
static/images/icons8-search-30.png \
static/images/icons8-settings-50.png \
static/images/settings.png \
static/images/user.png \
static/images/user_settings.png \

INCLUDEPATH += \
"windows/channel_widget" \
"windows/content_widget" \
"windows/gitconnection" \
"windows/login_window" \
"windows/main_window" \
"windows/reg_window" \
"windows/settings_window" \
"windows/sidebar" \
"windows/userbar" \
"windows/guildbar" \
"windows/guild_add" \
"windows/channel_add" \
"windows/user_settings" \
"windows/user_options" \
"windows/connect_to_guild" \
"controls/channel_control" \
"controls/client" \
"controls/message_control" \
"controls/user_control" \
"external" \
"static"


win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../../../../../../usr/local/lib/release/ -lcpr
else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../../../../usr/local/lib/debug/ -lcpr
else:unix: LIBS += -L/usr/local/lib/ -lcpr

#Release:DESTDIR = release
#Release:OBJECTS_DIR = release/obj/.obj
#Release:MOC_DIR = release/moc/.moc
#Release:RCC_DIR = release/rcc/.rcc
#Release:UI_DIR = release/ui/.ui

Debug:DESTDIR = debug
Debug:OBJECTS_DIR = debug/obj/.obj
Debug:MOC_DIR = debug/moc/.moc
Debug:RCC_DIR = debug/rcc/.rcc
Debug:UI_DIR = debug/ui/.ui

INCLUDEPATH += /usr/local/lib
DEPENDPATH += /usr/local/lib
26 changes: 26 additions & 0 deletions client/ITSwarm/Tests/Google_tests/Google_tests.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
include(gtest_dependency.pri)

TEMPLATE = app
CONFIG += console c++11
CONFIG -= app_bundle
CONFIG += thread
QT += core gui widgets

INCLUDEPATH += \
"../../" \
"../../controls/json_parser" \
"../../controls/data_types/message"

HEADERS += \
../../controls/json_parser/json_parser.h \
../../controls/data_types/message/message.h \
json_test.h


SOURCES += \
json_test.cpp \
main.cpp \
../../controls/json_parser/json_parser.cpp \
../../controls/data_types/message/message.cpp


41 changes: 41 additions & 0 deletions client/ITSwarm/Tests/Google_tests/gtest_dependency.pri
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
isEmpty(GOOGLETEST_DIR):GOOGLETEST_DIR=$$(GOOGLETEST_DIR)

isEmpty(GOOGLETEST_DIR) {
GOOGLETEST_DIR = /usr/src/googletest
!isEmpty(GOOGLETEST_DIR) {
warning("Using googletest src dir specified at Qt Creator wizard")
message("set GOOGLETEST_DIR as environment variable or qmake variable to get rid of this message")
}
}

!isEmpty(GOOGLETEST_DIR): {
GTEST_SRCDIR = $$GOOGLETEST_DIR/googletest
GMOCK_SRCDIR = $$GOOGLETEST_DIR/googlemock
} else: unix {
exists(/usr/src/gtest):GTEST_SRCDIR=/usr/src/gtest
exists(/usr/src/gmock):GMOCK_SRCDIR=/usr/src/gmock
!isEmpty(GTEST_SRCDIR): message("Using gtest from system")
}

requires(exists($$GTEST_SRCDIR):exists($$GMOCK_SRCDIR))

DEFINES += \
GTEST_LANG_CXX11

!isEmpty(GTEST_SRCDIR) {
INCLUDEPATH *= \
$$GTEST_SRCDIR \
$$GTEST_SRCDIR/include

SOURCES += \
$$GTEST_SRCDIR/src/gtest-all.cc
}

!isEmpty(GMOCK_SRCDIR) {
INCLUDEPATH *= \
$$GMOCK_SRCDIR \
$$GMOCK_SRCDIR/include

SOURCES += \
$$GMOCK_SRCDIR/src/gmock-all.cc
}
11 changes: 11 additions & 0 deletions client/ITSwarm/Tests/Google_tests/json_test.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
//#include <gtest/gtest.h>
//#include <gmock/gmock-matchers.h>

//using namespace testing;

//TEST(Test1, Case1)
//{
// EXPECT_EQ(1, 1);
// ASSERT_THAT(0, Eq(0));
//}

Loading