diff --git a/battleship/__init__.py b/battleship/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/battleship/admin.py b/battleship/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/battleship/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/battleship/apps.py b/battleship/apps.py new file mode 100644 index 0000000..943ee35 --- /dev/null +++ b/battleship/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class BattleshipConfig(AppConfig): + name = 'battleship' diff --git a/battleship/migrations/__init__.py b/battleship/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/battleship/models.py b/battleship/models.py new file mode 100644 index 0000000..22fc4fc --- /dev/null +++ b/battleship/models.py @@ -0,0 +1,23 @@ +from django.db import models + +from games.models import Room +from common.models import LameUser + +# Create your models here. +class BattleshipBoard(models.Model): + pass + +class BattleshipCell(models.Model): + class Type(models.IntegerChoices): + EMPTY = 0 + DESTORYER = 1 + SUBMARINE = 2 + CRUISER = 3 + BATTLESHIP = 4 + CARRIER = 5 + + x = models.SmallIntegerField() + y = models.SmallIntegerField() + contents = models.IntegerField(choices=Type.choices, default=Type.EMPTY) + shot = models.BooleanField() + board = models.ForeignKeyField(BattleshipBoard, on_delete=models.CASCADE, related_name='cells') \ No newline at end of file diff --git a/battleship/tests.py b/battleship/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/battleship/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/battleship/views.py b/battleship/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/battleship/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/bin/activate b/bin/activate new file mode 100644 index 0000000..036792b --- /dev/null +++ b/bin/activate @@ -0,0 +1,84 @@ +# This file must be used with "source bin/activate" *from bash* +# you cannot run it directly + + +if [ "${BASH_SOURCE-}" = "$0" ]; then + echo "You must source this script: \$ source $0" >&2 + exit 33 +fi + +deactivate () { + unset -f pydoc >/dev/null 2>&1 + + # reset old environment variables + # ! [ -z ${VAR+_} ] returns true if VAR is declared at all + if ! [ -z "${_OLD_VIRTUAL_PATH:+_}" ] ; then + PATH="$_OLD_VIRTUAL_PATH" + export PATH + unset _OLD_VIRTUAL_PATH + fi + if ! [ -z "${_OLD_VIRTUAL_PYTHONHOME+_}" ] ; then + PYTHONHOME="$_OLD_VIRTUAL_PYTHONHOME" + export PYTHONHOME + unset _OLD_VIRTUAL_PYTHONHOME + fi + + # This should detect bash and zsh, which have a hash command that must + # be called to get it to forget past commands. Without forgetting + # past commands the $PATH changes we made may not be respected + if [ -n "${BASH-}" ] || [ -n "${ZSH_VERSION-}" ] ; then + hash -r 2>/dev/null + fi + + if ! [ -z "${_OLD_VIRTUAL_PS1+_}" ] ; then + PS1="$_OLD_VIRTUAL_PS1" + export PS1 + unset _OLD_VIRTUAL_PS1 + fi + + unset VIRTUAL_ENV + if [ ! "${1-}" = "nondestructive" ] ; then + # Self destruct! + unset -f deactivate + fi +} + +# unset irrelevant variables +deactivate nondestructive + +VIRTUAL_ENV='/home/tarf/Documents/lamegames.io' +export VIRTUAL_ENV + +_OLD_VIRTUAL_PATH="$PATH" +PATH="$VIRTUAL_ENV/bin:$PATH" +export PATH + +# unset PYTHONHOME if set +if ! [ -z "${PYTHONHOME+_}" ] ; then + _OLD_VIRTUAL_PYTHONHOME="$PYTHONHOME" + unset PYTHONHOME +fi + +if [ -z "${VIRTUAL_ENV_DISABLE_PROMPT-}" ] ; then + _OLD_VIRTUAL_PS1="${PS1-}" + if [ "x" != x ] ; then + PS1="${PS1-}" + else + PS1="(`basename \"$VIRTUAL_ENV\"`) ${PS1-}" + fi + export PS1 +fi + +# Make sure to unalias pydoc if it's already there +alias pydoc 2>/dev/null >/dev/null && unalias pydoc || true + +pydoc () { + python -m pydoc "$@" +} + +# This should detect bash and zsh, which have a hash command that must +# be called to get it to forget past commands. Without forgetting +# past commands the $PATH changes we made may not be respected +if [ -n "${BASH-}" ] || [ -n "${ZSH_VERSION-}" ] ; then + hash -r 2>/dev/null +fi diff --git a/bin/activate.csh b/bin/activate.csh new file mode 100644 index 0000000..f5eb85f --- /dev/null +++ b/bin/activate.csh @@ -0,0 +1,55 @@ +# This file must be used with "source bin/activate.csh" *from csh*. +# You cannot run it directly. +# Created by Davide Di Blasi . + +set newline='\ +' + +alias deactivate 'test $?_OLD_VIRTUAL_PATH != 0 && setenv PATH "$_OLD_VIRTUAL_PATH:q" && unset _OLD_VIRTUAL_PATH; rehash; test $?_OLD_VIRTUAL_PROMPT != 0 && set prompt="$_OLD_VIRTUAL_PROMPT:q" && unset _OLD_VIRTUAL_PROMPT; unsetenv VIRTUAL_ENV; test "\!:*" != "nondestructive" && unalias deactivate && unalias pydoc' + +# Unset irrelevant variables. +deactivate nondestructive + +setenv VIRTUAL_ENV '/home/tarf/Documents/lamegames.io' + +set _OLD_VIRTUAL_PATH="$PATH:q" +setenv PATH "$VIRTUAL_ENV:q/bin:$PATH:q" + + + +if ('' != "") then + set env_name = '' +else + set env_name = '('"$VIRTUAL_ENV:t:q"') ' +endif + +if ( $?VIRTUAL_ENV_DISABLE_PROMPT ) then + if ( $VIRTUAL_ENV_DISABLE_PROMPT == "" ) then + set do_prompt = "1" + else + set do_prompt = "0" + endif +else + set do_prompt = "1" +endif + +if ( $do_prompt == "1" ) then + # Could be in a non-interactive environment, + # in which case, $prompt is undefined and we wouldn't + # care about the prompt anyway. + if ( $?prompt ) then + set _OLD_VIRTUAL_PROMPT="$prompt:q" + if ( "$prompt:q" =~ *"$newline:q"* ) then + : + else + set prompt = "$env_name:q$prompt:q" + endif + endif +endif + +unset env_name +unset do_prompt + +alias pydoc python -m pydoc + +rehash diff --git a/bin/activate.fish b/bin/activate.fish new file mode 100644 index 0000000..801718a --- /dev/null +++ b/bin/activate.fish @@ -0,0 +1,100 @@ +# This file must be used using `source bin/activate.fish` *within a running fish ( http://fishshell.com ) session*. +# Do not run it directly. + +function _bashify_path -d "Converts a fish path to something bash can recognize" + set fishy_path $argv + set bashy_path $fishy_path[1] + for path_part in $fishy_path[2..-1] + set bashy_path "$bashy_path:$path_part" + end + echo $bashy_path +end + +function _fishify_path -d "Converts a bash path to something fish can recognize" + echo $argv | tr ':' '\n' +end + +function deactivate -d 'Exit virtualenv mode and return to the normal environment.' + # reset old environment variables + if test -n "$_OLD_VIRTUAL_PATH" + # https://github.com/fish-shell/fish-shell/issues/436 altered PATH handling + if test (echo $FISH_VERSION | head -c 1) -lt 3 + set -gx PATH (_fishify_path "$_OLD_VIRTUAL_PATH") + else + set -gx PATH "$_OLD_VIRTUAL_PATH" + end + set -e _OLD_VIRTUAL_PATH + end + + if test -n "$_OLD_VIRTUAL_PYTHONHOME" + set -gx PYTHONHOME "$_OLD_VIRTUAL_PYTHONHOME" + set -e _OLD_VIRTUAL_PYTHONHOME + end + + if test -n "$_OLD_FISH_PROMPT_OVERRIDE" + and functions -q _old_fish_prompt + # Set an empty local `$fish_function_path` to allow the removal of `fish_prompt` using `functions -e`. + set -l fish_function_path + + # Erase virtualenv's `fish_prompt` and restore the original. + functions -e fish_prompt + functions -c _old_fish_prompt fish_prompt + functions -e _old_fish_prompt + set -e _OLD_FISH_PROMPT_OVERRIDE + end + + set -e VIRTUAL_ENV + + if test "$argv[1]" != 'nondestructive' + # Self-destruct! + functions -e pydoc + functions -e deactivate + functions -e _bashify_path + functions -e _fishify_path + end +end + +# Unset irrelevant variables. +deactivate nondestructive + +set -gx VIRTUAL_ENV '/home/tarf/Documents/lamegames.io' + +# https://github.com/fish-shell/fish-shell/issues/436 altered PATH handling +if test (echo $FISH_VERSION | head -c 1) -lt 3 + set -gx _OLD_VIRTUAL_PATH (_bashify_path $PATH) +else + set -gx _OLD_VIRTUAL_PATH "$PATH" +end +set -gx PATH "$VIRTUAL_ENV"'/bin' $PATH + +# Unset `$PYTHONHOME` if set. +if set -q PYTHONHOME + set -gx _OLD_VIRTUAL_PYTHONHOME $PYTHONHOME + set -e PYTHONHOME +end + +function pydoc + python -m pydoc $argv +end + +if test -z "$VIRTUAL_ENV_DISABLE_PROMPT" + # Copy the current `fish_prompt` function as `_old_fish_prompt`. + functions -c fish_prompt _old_fish_prompt + + function fish_prompt + # Run the user's prompt first; it might depend on (pipe)status. + set -l prompt (_old_fish_prompt) + + # Prompt override provided? + # If not, just prepend the environment name. + if test -n '' + printf '%s%s' '' (set_color normal) + else + printf '%s(%s) ' (set_color normal) (basename "$VIRTUAL_ENV") + end + + string join -- \n $prompt # handle multi-line prompts + end + + set -gx _OLD_FISH_PROMPT_OVERRIDE "$VIRTUAL_ENV" +end diff --git a/bin/activate.ps1 b/bin/activate.ps1 new file mode 100644 index 0000000..95504d3 --- /dev/null +++ b/bin/activate.ps1 @@ -0,0 +1,60 @@ +$script:THIS_PATH = $myinvocation.mycommand.path +$script:BASE_DIR = Split-Path (Resolve-Path "$THIS_PATH/..") -Parent + +function global:deactivate([switch] $NonDestructive) { + if (Test-Path variable:_OLD_VIRTUAL_PATH) { + $env:PATH = $variable:_OLD_VIRTUAL_PATH + Remove-Variable "_OLD_VIRTUAL_PATH" -Scope global + } + + if (Test-Path function:_old_virtual_prompt) { + $function:prompt = $function:_old_virtual_prompt + Remove-Item function:\_old_virtual_prompt + } + + if ($env:VIRTUAL_ENV) { + Remove-Item env:VIRTUAL_ENV -ErrorAction SilentlyContinue + } + + if (!$NonDestructive) { + # Self destruct! + Remove-Item function:deactivate + Remove-Item function:pydoc + } +} + +function global:pydoc { + python -m pydoc $args +} + +# unset irrelevant variables +deactivate -nondestructive + +$VIRTUAL_ENV = $BASE_DIR +$env:VIRTUAL_ENV = $VIRTUAL_ENV + +New-Variable -Scope global -Name _OLD_VIRTUAL_PATH -Value $env:PATH + +$env:PATH = "$env:VIRTUAL_ENV/bin:" + $env:PATH +if (!$env:VIRTUAL_ENV_DISABLE_PROMPT) { + function global:_old_virtual_prompt { + "" + } + $function:_old_virtual_prompt = $function:prompt + + if ("" -ne "") { + function global:prompt { + # Add the custom prefix to the existing prompt + $previous_prompt_value = & $function:_old_virtual_prompt + ("" + $previous_prompt_value) + } + } + else { + function global:prompt { + # Add a prefix to the current prompt, but don't discard it. + $previous_prompt_value = & $function:_old_virtual_prompt + $new_prompt_value = "($( Split-Path $env:VIRTUAL_ENV -Leaf )) " + ($new_prompt_value + $previous_prompt_value) + } + } +} diff --git a/bin/activate.xsh b/bin/activate.xsh new file mode 100644 index 0000000..fe87de1 --- /dev/null +++ b/bin/activate.xsh @@ -0,0 +1,46 @@ +"""Xonsh activate script for virtualenv""" +from xonsh.tools import get_sep as _get_sep + +def _deactivate(args): + if "pydoc" in aliases: + del aliases["pydoc"] + + if ${...}.get("_OLD_VIRTUAL_PATH", ""): + $PATH = $_OLD_VIRTUAL_PATH + del $_OLD_VIRTUAL_PATH + + if ${...}.get("_OLD_VIRTUAL_PYTHONHOME", ""): + $PYTHONHOME = $_OLD_VIRTUAL_PYTHONHOME + del $_OLD_VIRTUAL_PYTHONHOME + + if "VIRTUAL_ENV" in ${...}: + del $VIRTUAL_ENV + + if "VIRTUAL_ENV_PROMPT" in ${...}: + del $VIRTUAL_ENV_PROMPT + + if "nondestructive" not in args: + # Self destruct! + del aliases["deactivate"] + + +# unset irrelevant variables +_deactivate(["nondestructive"]) +aliases["deactivate"] = _deactivate + +$VIRTUAL_ENV = r"/home/tarf/Documents/lamegames.io" + +$_OLD_VIRTUAL_PATH = $PATH +$PATH = $PATH[:] +$PATH.add($VIRTUAL_ENV + _get_sep() + "bin", front=True, replace=True) + +if ${...}.get("PYTHONHOME", ""): + # unset PYTHONHOME if set + $_OLD_VIRTUAL_PYTHONHOME = $PYTHONHOME + del $PYTHONHOME + +$VIRTUAL_ENV_PROMPT = "" +if not $VIRTUAL_ENV_PROMPT: + del $VIRTUAL_ENV_PROMPT + +aliases["pydoc"] = ["python", "-m", "pydoc"] diff --git a/bin/activate_this.py b/bin/activate_this.py new file mode 100644 index 0000000..4479986 --- /dev/null +++ b/bin/activate_this.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- +"""Activate virtualenv for current interpreter: + +Use exec(open(this_file).read(), {'__file__': this_file}). + +This can be used when you must use an existing Python interpreter, not the virtualenv bin/python. +""" +import os +import site +import sys + +try: + abs_file = os.path.abspath(__file__) +except NameError: + raise AssertionError("You must use exec(open(this_file).read(), {'__file__': this_file}))") + +bin_dir = os.path.dirname(abs_file) +base = bin_dir[: -len("bin") - 1] # strip away the bin part from the __file__, plus the path separator + +# prepend bin to PATH (this file is inside the bin directory) +os.environ["PATH"] = os.pathsep.join([bin_dir] + os.environ.get("PATH", "").split(os.pathsep)) +os.environ["VIRTUAL_ENV"] = base # virtual env is right above bin directory + +# add the virtual environments libraries to the host python import mechanism +prev_length = len(sys.path) +for lib in "../lib/python3.8/site-packages".split(os.pathsep): + path = os.path.realpath(os.path.join(bin_dir, lib)) + site.addsitedir(path.decode("utf-8") if "" else path) +sys.path[:] = sys.path[prev_length:] + sys.path[0:prev_length] + +sys.real_prefix = sys.prefix +sys.prefix = base diff --git a/bin/easy_install b/bin/easy_install new file mode 100755 index 0000000..18eccbc --- /dev/null +++ b/bin/easy_install @@ -0,0 +1,8 @@ +#!/home/tarf/Documents/lamegames.io/bin/python +# -*- coding: utf-8 -*- +import re +import sys +from setuptools.command.easy_install import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/bin/easy_install-3.8 b/bin/easy_install-3.8 new file mode 100755 index 0000000..18eccbc --- /dev/null +++ b/bin/easy_install-3.8 @@ -0,0 +1,8 @@ +#!/home/tarf/Documents/lamegames.io/bin/python +# -*- coding: utf-8 -*- +import re +import sys +from setuptools.command.easy_install import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/bin/easy_install3 b/bin/easy_install3 new file mode 100755 index 0000000..18eccbc --- /dev/null +++ b/bin/easy_install3 @@ -0,0 +1,8 @@ +#!/home/tarf/Documents/lamegames.io/bin/python +# -*- coding: utf-8 -*- +import re +import sys +from setuptools.command.easy_install import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/bin/easy_install3.8 b/bin/easy_install3.8 new file mode 100755 index 0000000..18eccbc --- /dev/null +++ b/bin/easy_install3.8 @@ -0,0 +1,8 @@ +#!/home/tarf/Documents/lamegames.io/bin/python +# -*- coding: utf-8 -*- +import re +import sys +from setuptools.command.easy_install import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/bin/pip b/bin/pip new file mode 100755 index 0000000..3a6f6d6 --- /dev/null +++ b/bin/pip @@ -0,0 +1,8 @@ +#!/home/tarf/Documents/lamegames.io/bin/python +# -*- coding: utf-8 -*- +import re +import sys +from pip._internal.cli.main import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/bin/pip-3.8 b/bin/pip-3.8 new file mode 100755 index 0000000..3a6f6d6 --- /dev/null +++ b/bin/pip-3.8 @@ -0,0 +1,8 @@ +#!/home/tarf/Documents/lamegames.io/bin/python +# -*- coding: utf-8 -*- +import re +import sys +from pip._internal.cli.main import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/bin/pip3 b/bin/pip3 new file mode 100755 index 0000000..3a6f6d6 --- /dev/null +++ b/bin/pip3 @@ -0,0 +1,8 @@ +#!/home/tarf/Documents/lamegames.io/bin/python +# -*- coding: utf-8 -*- +import re +import sys +from pip._internal.cli.main import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/bin/pip3.8 b/bin/pip3.8 new file mode 100755 index 0000000..3a6f6d6 --- /dev/null +++ b/bin/pip3.8 @@ -0,0 +1,8 @@ +#!/home/tarf/Documents/lamegames.io/bin/python +# -*- coding: utf-8 -*- +import re +import sys +from pip._internal.cli.main import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/bin/python b/bin/python new file mode 120000 index 0000000..acd4152 --- /dev/null +++ b/bin/python @@ -0,0 +1 @@ +/usr/bin/python \ No newline at end of file diff --git a/bin/python3 b/bin/python3 new file mode 120000 index 0000000..d8654aa --- /dev/null +++ b/bin/python3 @@ -0,0 +1 @@ +python \ No newline at end of file diff --git a/bin/python3.8 b/bin/python3.8 new file mode 120000 index 0000000..d8654aa --- /dev/null +++ b/bin/python3.8 @@ -0,0 +1 @@ +python \ No newline at end of file diff --git a/bin/wheel b/bin/wheel new file mode 100755 index 0000000..9a4cfb4 --- /dev/null +++ b/bin/wheel @@ -0,0 +1,8 @@ +#!/home/tarf/Documents/lamegames.io/bin/python +# -*- coding: utf-8 -*- +import re +import sys +from wheel.cli import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/bin/wheel-3.8 b/bin/wheel-3.8 new file mode 100755 index 0000000..9a4cfb4 --- /dev/null +++ b/bin/wheel-3.8 @@ -0,0 +1,8 @@ +#!/home/tarf/Documents/lamegames.io/bin/python +# -*- coding: utf-8 -*- +import re +import sys +from wheel.cli import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/bin/wheel3 b/bin/wheel3 new file mode 100755 index 0000000..9a4cfb4 --- /dev/null +++ b/bin/wheel3 @@ -0,0 +1,8 @@ +#!/home/tarf/Documents/lamegames.io/bin/python +# -*- coding: utf-8 -*- +import re +import sys +from wheel.cli import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/bin/wheel3.8 b/bin/wheel3.8 new file mode 100755 index 0000000..9a4cfb4 --- /dev/null +++ b/bin/wheel3.8 @@ -0,0 +1,8 @@ +#!/home/tarf/Documents/lamegames.io/bin/python +# -*- coding: utf-8 -*- +import re +import sys +from wheel.cli import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/common/templates/common/header.html b/common/templates/common/header.html new file mode 100644 index 0000000..637d732 --- /dev/null +++ b/common/templates/common/header.html @@ -0,0 +1 @@ +

lamegames.tait.tech

\ No newline at end of file diff --git a/common/templates/common/master.html b/common/templates/common/master.html index 15d7ef0..fd58d2e 100644 --- a/common/templates/common/master.html +++ b/common/templates/common/master.html @@ -9,6 +9,10 @@
+
+ {% include 'common/header.html' %} + {% include 'common/nav.html' %} +
{% block body %} {% endblock %}
diff --git a/common/templates/common/nav.html b/common/templates/common/nav.html new file mode 100644 index 0000000..e86fe07 --- /dev/null +++ b/common/templates/common/nav.html @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/common/templates/index.html b/common/templates/index.html index 8f2ac73..bc73ccb 100644 --- a/common/templates/index.html +++ b/common/templates/index.html @@ -9,23 +9,6 @@ {% endblock %} {% block body %} -{% if user.is_authenticated %} -

Welcome, {{ user.username }}!

-

Email: {{ user.email }}.

- Chat -
- Minesweeper (Single Player) -
- Rock, Paper, Scissors -
- Logout -
-{% else %} - Login -
- Sign Up -
- Forgot Password? -
-{% endif %} +

Welcome to lamegames!

+

I basically made this site because I thought having a few example of simple game-dev work online would be cool.

{% endblock %} diff --git a/common/templates/signed_in.html b/common/templates/signed_in.html new file mode 100644 index 0000000..46378a4 --- /dev/null +++ b/common/templates/signed_in.html @@ -0,0 +1,13 @@ +{% extends 'common/master.html' %} +{% block body %} +

Welcome, {{ user.username }}!

+

Email: {{ user.email }}.

+Chat +
+Minesweeper (Single Player) +
+Rock, Paper, Scissors +
+Logout +
+{% endblock %} \ No newline at end of file diff --git a/common/views.py b/common/views.py index 917d4a1..af5d863 100644 --- a/common/views.py +++ b/common/views.py @@ -17,7 +17,10 @@ from .models import LameUser # Create your views here. def index(request): - return render(request, 'index.html') + if request.user.is_authenticated: + return render(request, 'signed_in.html') + else: + return render(request, 'index.html') def signup(request): if request.method == 'POST': diff --git a/games/static/games/js/minesweeper.js b/games/static/games/js/minesweeper.js index d42ce88..f620e8e 100644 --- a/games/static/games/js/minesweeper.js +++ b/games/static/games/js/minesweeper.js @@ -46,12 +46,12 @@ const btn_unflag = (btn) => { }; const help_menu = () => { - write_message("h: This help menu") - write_message("n: New game"); - write_message("f: Toggle flag on current tile"); - write_message('c: Read current position'); - write_message("Space/Enter: Expose current tile"); - write_message("w/a/s/d: up/left/down/right"); + write_message("h: This help menu.
\ + n: New game.
\ + f: Toggle flag on current tile.
\ + c: Read current position.
\ + Space/Enter: Expose current tile.
\ + w/a/s/d: up/left/down/right."); }; const send_click = (e, event_type) => { diff --git a/games/templates/games/gamelog.html b/games/templates/games/gamelog.html index b99eb72..51caa98 100644 --- a/games/templates/games/gamelog.html +++ b/games/templates/games/gamelog.html @@ -1,18 +1,27 @@ + +
+ Welcome!
+
-
+
Welcome!