Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
'main_game_app',
]

MIDDLEWARE = [
Expand Down Expand Up @@ -115,7 +116,7 @@
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/4.1/howto/static-files/

STATIC_URL = 'static/'
STATIC_URL = 'main_game_app/static/'

# Default primary key field type
# https://docs.djangoproject.com/en/4.1/ref/settings/#default-auto-field
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,18 @@
"""
from django.contrib import admin
from django.urls import path
from main_game_app import views
from main_game_app.views import inventory
from django.conf import settings
from django.conf.urls.static import static

urlpatterns = [
path('admin/', admin.site.urls),
]
path('',views.landing, name='landing'),
path('inventory/', inventory.as_view(), name='inventory_page'),
path('fight/', views.fight, name='fight_page'),
path('move_data/', views.move_data, name="move_data"),
path('login/', views.login_page, name="login" ),
path('register/', views.register, name="register"),
path('profile/', views.profile, name='profile'),
] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
from django.contrib import admin
from .models import item

# Register your models here.
admin.site.register(item)
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Generated by Django 4.1.4 on 2022-12-15 03:43

from django.db import migrations, models


class Migration(migrations.Migration):

initial = True

dependencies = [
]

operations = [
migrations.CreateModel(
name='item',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=500)),
],
),
migrations.CreateModel(
name='player',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=30)),
],
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Generated by Django 4.1.4 on 2022-12-29 01:03

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('main_game_app', '0001_initial'),
]

operations = [
migrations.CreateModel(
name='attack_item',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=500)),
('attack', models.IntegerField()),
],
),
migrations.CreateModel(
name='defense_item',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=500)),
('defense', models.IntegerField()),
],
),
migrations.DeleteModel(
name='item',
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Generated by Django 4.1.4 on 2022-12-29 23:12

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('main_game_app', '0002_attack_item_defense_item_delete_item'),
]

operations = [
migrations.AddField(
model_name='player',
name='attack_items',
field=models.ManyToManyField(related_name='players', to='main_game_app.attack_item'),
),
migrations.AddField(
model_name='player',
name='defense_items',
field=models.ManyToManyField(related_name='players', to='main_game_app.defense_item'),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# Generated by Django 4.1.4 on 2023-01-02 20:02

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('main_game_app', '0003_player_attack_items_player_defense_items'),
]

operations = [
migrations.CreateModel(
name='item',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=500)),
('defense', models.IntegerField()),
('attack', models.IntegerField()),
],
),
migrations.RemoveField(
model_name='player',
name='attack_items',
),
migrations.RemoveField(
model_name='player',
name='defense_items',
),
migrations.DeleteModel(
name='attack_item',
),
migrations.DeleteModel(
name='defense_item',
),
migrations.AddField(
model_name='player',
name='items',
field=models.ManyToManyField(related_name='players', to='main_game_app.item'),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Generated by Django 4.1.4 on 2023-01-16 08:04

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('main_game_app', '0004_item_remove_player_attack_items_and_more'),
]

operations = [
migrations.DeleteModel(
name='player',
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Generated by Django 4.1.4 on 2023-01-16 08:23

from django.db import migrations, models
import django.utils.timezone


class Migration(migrations.Migration):

dependencies = [
('main_game_app', '0005_delete_player'),
]

operations = [
migrations.AddField(
model_name='item',
name='image',
field=models.ImageField(default=django.utils.timezone.now, upload_to='images/'),
preserve_default=False,
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 4.1.4 on 2023-01-16 08:58

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('main_game_app', '0006_item_image'),
]

operations = [
migrations.AlterField(
model_name='item',
name='image',
field=models.ImageField(upload_to='static/images'),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 4.1.4 on 2023-01-16 09:07

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('main_game_app', '0007_alter_item_image'),
]

operations = [
migrations.AlterField(
model_name='item',
name='image',
field=models.ImageField(upload_to='static/'),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Generated by Django 4.1.4 on 2023-01-16 10:20

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('main_game_app', '0008_alter_item_image'),
]

operations = [
migrations.RemoveField(
model_name='item',
name='image',
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Generated by Django 4.1.4 on 2023-01-18 01:11

from django.db import migrations, models
import django.utils.timezone


class Migration(migrations.Migration):

dependencies = [
('main_game_app', '0009_remove_item_image'),
]

operations = [
migrations.AddField(
model_name='item',
name='image',
field=models.ImageField(default=django.utils.timezone.now, upload_to='images/'),
preserve_default=False,
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 4.1.4 on 2023-01-18 01:23

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('main_game_app', '0010_item_image'),
]

operations = [
migrations.AlterField(
model_name='item',
name='image',
field=models.ImageField(upload_to='static/'),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 4.1.4 on 2023-01-18 01:25

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('main_game_app', '0011_alter_item_image'),
]

operations = [
migrations.AlterField(
model_name='item',
name='image',
field=models.ImageField(upload_to='main_game_app/static/'),
),
]
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
from django.db import models

# Create your models here.

class item(models.Model):
name = models.CharField(max_length=500)
defense = models.IntegerField()
attack = models.IntegerField()
image = models.ImageField(upload_to='main_game_app/static/')
def __str__(self):
return self.name
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<!doctype html>
<html lang="en">

<head>
<!-- Required meta tags -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="csrf-token" content="{{ csrf_token }}">

<!-- Bootstrap CSS -->
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">

<title>landing page</title>
</head>

<body>
<nav class="navbar navbar-expand-lg bg-light">
<div class="container-fluid">
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link active" aria-current="page" href="{% url 'landing' %}">Home</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{% url 'inventory_page' %}">inventory</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{% url 'register' %}">register</a>
</li>
</ul>
</div>
</div>
</nav>

{% block content %}
{% endblock %}


<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"
integrity="sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM"
crossorigin="anonymous"></script>
</body>

</html>
Loading