ultimate mashed potatoes
This commit is contained in:
parent
daec714f80
commit
091b0af347
12 changed files with 79 additions and 9 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -5,4 +5,5 @@ connectionStrings.config
|
||||||
*.kdev4
|
*.kdev4
|
||||||
.kdev4/
|
.kdev4/
|
||||||
.idea/
|
.idea/
|
||||||
cmake-build-*/
|
cmake-build-*/
|
||||||
|
*.db-journal
|
|
@ -45,6 +45,7 @@ if(_CMP)
|
||||||
PRIVATE ${PROJECT_SOURCE_DIR}/include/client)
|
PRIVATE ${PROJECT_SOURCE_DIR}/include/client)
|
||||||
|
|
||||||
install(TARGETS client RUNTIME DESTINATION bin/client)
|
install(TARGETS client RUNTIME DESTINATION bin/client)
|
||||||
|
|
||||||
else()
|
else()
|
||||||
|
|
||||||
##################
|
##################
|
||||||
|
|
6
README.md
Normal file
6
README.md
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
# imagine a world
|
||||||
|
sock scape is an interneet game played over the telesockets
|
||||||
|
|
||||||
|
### Thanks mom !
|
||||||
|
|
||||||
|
e
|
|
@ -10,6 +10,7 @@
|
||||||
#include "ctx/master.hpp"
|
#include "ctx/master.hpp"
|
||||||
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include <mutex>
|
||||||
|
|
||||||
namespace sosc {
|
namespace sosc {
|
||||||
/** MASTER -> CLIENT **/
|
/** MASTER -> CLIENT **/
|
||||||
|
|
|
@ -1,9 +1,13 @@
|
||||||
#include "master.hpp"
|
#include "master.hpp"
|
||||||
|
|
||||||
|
static struct {
|
||||||
|
std::mutex user_key_mtx;
|
||||||
|
} _ctx;
|
||||||
|
|
||||||
/** MASTERCLIENTPOOL CODE **/
|
/** MASTERCLIENTPOOL CODE **/
|
||||||
|
|
||||||
void sosc::MasterClientPool::SetupQueries(Queries *queries) {
|
void sosc::MasterClientPool::SetupQueries(Queries *queries) {
|
||||||
|
#define QRY_
|
||||||
}
|
}
|
||||||
|
|
||||||
/** MASTERCLIENT CODE **/
|
/** MASTERCLIENT CODE **/
|
|
@ -1,6 +1,4 @@
|
||||||
#include "master.hpp"
|
#include "master.hpp"
|
||||||
#include "db/database.hpp"
|
|
||||||
#include <mutex>
|
|
||||||
|
|
||||||
static struct {
|
static struct {
|
||||||
std::mutex license_check_mtx;
|
std::mutex license_check_mtx;
|
||||||
|
|
|
@ -58,6 +58,8 @@ bool master_intra(uint16_t port, const sosc::poolinfo_t& info) {
|
||||||
bool master_client(uint16_t port, const sosc::poolinfo_t& info) {
|
bool master_client(uint16_t port, const sosc::poolinfo_t& info) {
|
||||||
using namespace sosc;
|
using namespace sosc;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#include "tcpsock.hpp"
|
#include "tcpsock.hpp"
|
||||||
|
|
||||||
static struct {
|
struct {
|
||||||
SSL_CTX* server;
|
SSL_CTX* server;
|
||||||
std::mutex server_mtx;
|
std::mutex server_mtx;
|
||||||
|
|
||||||
|
|
|
@ -3,12 +3,44 @@
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<title>client</title>
|
<title>client</title>
|
||||||
<style type="text/css">
|
<link href="style.css" rel="stylesheet" type="text/css" />
|
||||||
|
|
||||||
</style>
|
|
||||||
<script type="text/javascript" src="script.js"></script>
|
<script type="text/javascript" src="script.js"></script>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
<div id="loading">
|
||||||
|
Connecting to<br />master server...
|
||||||
|
</div>
|
||||||
|
<div id="login" class="hidden">
|
||||||
|
<h1>Log In</h1>
|
||||||
|
<label>
|
||||||
|
Username: <br/>
|
||||||
|
<input type="text" id="login-user" />
|
||||||
|
</label>
|
||||||
|
<label>
|
||||||
|
Password: <br/>
|
||||||
|
<input type="password" id="login-pwd" />
|
||||||
|
</label>
|
||||||
|
<input type="button" value="Log In" />
|
||||||
|
<input type="button" value="Register" />
|
||||||
|
</div>
|
||||||
|
<div id="register" class="hidden">
|
||||||
|
<h1>Register</h1>
|
||||||
|
<label>
|
||||||
|
Username: <br/>
|
||||||
|
<input type="text" id="reg-user" />
|
||||||
|
</label>
|
||||||
|
<label>
|
||||||
|
Email: <br/>
|
||||||
|
<input type="password" id="reg-email" />
|
||||||
|
</label>
|
||||||
|
<label>
|
||||||
|
Password: <br/>
|
||||||
|
<input type="password" id="reg-pwd" />
|
||||||
|
</label>
|
||||||
|
<label>
|
||||||
|
Confirm Password: <br/>
|
||||||
|
<input type="password" id="reg-conf-pwd" />
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
|
@ -0,0 +1,5 @@
|
||||||
|
var ws;
|
||||||
|
|
||||||
|
window.onload = function() {
|
||||||
|
ws = new WebSocket("wss://localhost:")
|
||||||
|
};
|
20
src/web/style.css
Normal file
20
src/web/style.css
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
body {
|
||||||
|
padding-top: 36px;
|
||||||
|
font-family: monospace;
|
||||||
|
text-align: center;
|
||||||
|
background: #000;
|
||||||
|
color: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.hidden {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
#loading {
|
||||||
|
font-size: 36px;
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
|
||||||
|
#login label, #register label {
|
||||||
|
display: block;
|
||||||
|
}
|
Loading…
Reference in a new issue