This commit is contained in:
parent
8d4ebee3a1
commit
bce19e3dc1
2
.vscode/c_cpp_properties.json
vendored
2
.vscode/c_cpp_properties.json
vendored
@ -6,7 +6,7 @@
|
|||||||
"${workspaceFolder}/**",
|
"${workspaceFolder}/**",
|
||||||
"${workspaceFolder}/build/_deps/kylin-src/Universal",
|
"${workspaceFolder}/build/_deps/kylin-src/Universal",
|
||||||
"/opt/Libraries/boost_1_86_0/include",
|
"/opt/Libraries/boost_1_86_0/include",
|
||||||
"/opt/Libraries/wt-4.11.0/include",
|
"/opt/Libraries/wt-4.11.1/include",
|
||||||
"/opt/Libraries/ZLMediaKit/include"
|
"/opt/Libraries/ZLMediaKit/include"
|
||||||
],
|
],
|
||||||
"defines": [],
|
"defines": [],
|
||||||
|
@ -20,9 +20,9 @@ Hello::Hello(const Wt::WEnvironment &env, Wt::Dbo::SqlConnectionPool &connection
|
|||||||
m_session = std::make_unique<Session>(connectionPool);
|
m_session = std::make_unique<Session>(connectionPool);
|
||||||
m_session->login().changed().connect(this, &Hello::authEvent);
|
m_session->login().changed().connect(this, &Hello::authEvent);
|
||||||
setTitle("Hello world");
|
setTitle("Hello world");
|
||||||
setTheme(std::make_shared<Wt::WBootstrap2Theme>());
|
|
||||||
Wt::WContainerWidget *top = nullptr;
|
Wt::WContainerWidget *top = nullptr;
|
||||||
if (!embedded) {
|
if (!embedded) {
|
||||||
|
setTheme(std::make_shared<Wt::WBootstrap2Theme>());
|
||||||
top = root();
|
top = root();
|
||||||
} else {
|
} else {
|
||||||
std::unique_ptr<Wt::WContainerWidget> topPtr = std::make_unique<Wt::WContainerWidget>();
|
std::unique_ptr<Wt::WContainerWidget> topPtr = std::make_unique<Wt::WContainerWidget>();
|
||||||
@ -62,7 +62,7 @@ Hello::Hello(const Wt::WEnvironment &env, Wt::Dbo::SqlConnectionPool &connection
|
|||||||
auto app = Amass::Singleton<WebApplication>::instance();
|
auto app = Amass::Singleton<WebApplication>::instance();
|
||||||
auto authWidget =
|
auto authWidget =
|
||||||
std::make_unique<Wt::Auth::AuthWidget>(app->authService(), m_session->users(), m_session->login());
|
std::make_unique<Wt::Auth::AuthWidget>(app->authService(), m_session->users(), m_session->login());
|
||||||
authWidget-> setInternalBasePath("/");
|
authWidget->setInternalBasePath("/");
|
||||||
authWidget->model()->addPasswordAuth(&app->passwordService());
|
authWidget->model()->addPasswordAuth(&app->passwordService());
|
||||||
authWidget->setRegistrationEnabled(true);
|
authWidget->setRegistrationEnabled(true);
|
||||||
authWidget->processEnvironment();
|
authWidget->processEnvironment();
|
||||||
|
@ -23,7 +23,7 @@ function cmake_scan() {
|
|||||||
function build() {
|
function build() {
|
||||||
# reset
|
# reset
|
||||||
# pkill -9 HttpServer
|
# pkill -9 HttpServer
|
||||||
# cp -r /opt/Libraries/wt-4.11.0/share/Wt/* ./build
|
# cp -r /opt/Libraries/wt-4.11.1/share/Wt/* ./build
|
||||||
|
|
||||||
if [ ! -f "${build_path}/CMakeCache.txt" ]; then
|
if [ ! -f "${build_path}/CMakeCache.txt" ]; then
|
||||||
cmake_scan
|
cmake_scan
|
||||||
|
Loading…
Reference in New Issue
Block a user