Merge pull request #216 from Sakimori/space

Space
This commit is contained in:
Sakimori 2021-03-02 21:56:30 -05:00 committed by GitHub
commit 8ed40babbc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 12 deletions

View file

@ -3,7 +3,7 @@
blaseball, blaseball, is back! in an unofficial capacity. this project is completely unaffiliated with the game band.
we have custom players (generated by onomancer), custom teams, custom leagues, all set up in discord and watchable at https://simsim.sibr.dev!
we have custom players (generated by onomancer), custom teams, custom leagues, all set up in discord and watchable at http://sim16.sakimori.space!
if you would like to add matteo to your server to be able to set up teams and games, you can do so with this link: https://discord.com/api/oauth2/authorize?client_id=789956166796574740&permissions=388160&scope=bot

View file

@ -5,9 +5,10 @@ from flask import Flask, url_for, Response, render_template, request, jsonify, s
from flask_socketio import SocketIO, emit
import database as db
app = Flask("the-prestige", static_folder='simmadome/build')
app = Flask("the-prestige", static_folder='simmadome/build/', subdomain_matching=True)
app.config['SECRET KEY'] = 'dev'
#app.config['SERVER_NAME'] = '0.0.0.0:5000'
#url = "sakimori.space:5000"
#app.config['SERVER_NAME'] = url
socketio = SocketIO(app)
# Serve React App
@ -113,7 +114,7 @@ def create_league():
### SOCKETS
thread2 = threading.Thread(target=socketio.run,args=(app,'0.0.0.0'))
thread2 = threading.Thread(target=socketio.run,args=(app,"0.0.0.0", "80"))
thread2.start()
master_games_dic = {} #key timestamp : (game game, {} state)
@ -141,8 +142,8 @@ def update_loop():
state["home_score"] = this_game.teams["home"].score #update_pause = 0
#victory_lap = False
if not this_game.play_has_begun: #weather_emoji
state["update_emoji"] = "🍿" #weather_text
state["update_text"] = "Play blall!" #they also need a timestamp
state["update_emoji"] = "🎆" #weather_text
state["update_text"] = "Play ball!" #they also need a timestamp
state["start_delay"] -= 1
state["display_top_of_inning"] = state["top_of_inning"]

View file

@ -8,10 +8,10 @@
<title>⚾ The Simmadome</title>
<meta property="og:title" content="Watch at the Simmadome" />
<meta property="og:description" content="The Simsim: Your players, your teams, your games." />
<meta property="og:title" content="Sim16 at the Observatory" />
<meta property="og:description" content="The Sim16: Your players, your teams, your games." />
<meta name="twitter:card" content="summary">
<meta name="twitter:site" content="@SIBR_XVI">
<meta name="twitter:site" content="@xvipsixteen">
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>

View file

@ -42,13 +42,13 @@ function Header() {
<a href="https://github.com/Sakimori/matteo-the-prestige" className="github_link" target="_blank" rel="noopener noreferrer">
<img className="github_logo" src={githubLogo} alt="Github"/>
</a>
<a href="https://twitter.com/intent/follow?screen_name=SIBR_XVI" className="twitter_link" target="_blank" rel="noopener noreferrer">
<a href="https://twitter.com/intent/follow?screen_name=xvipsixteen" className="twitter_link" target="_blank" rel="noopener noreferrer">
<img className="twitter_logo" src={twitterLogo} alt="Twitter"/>
</a>
</div>
</div>
<a href="/" className="page_header"><h2 className="page_header" style={{fontSize:"50px"} as React.CSSProperties}>THE SIMMADOME</h2></a>
<h2 className="page_header">Join SIBR on <a href="https://discord.gg/UhAajY2NCW" className="link"><img src={discordlogo} alt="" height="30"/></a> to start your own games!</h2>
<a href="/" className="page_header"><h2 className="page_header" style={{fontSize:"50px"} as React.CSSProperties}>THE OBSERVATORY</h2></a>
<h2 className="page_header">Join us on <a href="https://discord.gg/ux6Drk8Bp7" className="link"><img src={discordlogo} alt="" height="30"/></a> to start your own games!</h2>
</div>
);
}