From 502ab39200b3d209c02527ae2baca6395bd3984b Mon Sep 17 00:00:00 2001 From: s457957 Date: Mon, 23 Nov 2020 21:31:14 +0100 Subject: [PATCH] first template rendered --- .../migrations/0002_auto_20201123_1941.py | 18 +++++++++++++++ .../migrations/0003_auto_20201123_1943.py | 18 +++++++++++++++ .../migrations/0004_auto_20201123_1943.py | 22 +++++++++++++++++++ static/css/base.css | 8 +++++++ templates/base.html | 10 +++++++++ 5 files changed, 76 insertions(+) create mode 100644 hr_module/migrations/0002_auto_20201123_1941.py create mode 100644 hr_module/migrations/0003_auto_20201123_1943.py create mode 100644 hr_module/migrations/0004_auto_20201123_1943.py create mode 100644 static/css/base.css create mode 100644 templates/base.html diff --git a/hr_module/migrations/0002_auto_20201123_1941.py b/hr_module/migrations/0002_auto_20201123_1941.py new file mode 100644 index 0000000..a94e546 --- /dev/null +++ b/hr_module/migrations/0002_auto_20201123_1941.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.3 on 2020-11-23 19:41 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('hr_module', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='timemodel', + name='weekly_hours', + field=models.DecimalField(decimal_places=2, max_digits=4), + ), + ] diff --git a/hr_module/migrations/0003_auto_20201123_1943.py b/hr_module/migrations/0003_auto_20201123_1943.py new file mode 100644 index 0000000..893dcc3 --- /dev/null +++ b/hr_module/migrations/0003_auto_20201123_1943.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.3 on 2020-11-23 19:43 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('hr_module', '0002_auto_20201123_1941'), + ] + + operations = [ + migrations.AlterField( + model_name='timemodel', + name='time_model_id', + field=models.IntegerField(unique=True), + ), + ] diff --git a/hr_module/migrations/0004_auto_20201123_1943.py b/hr_module/migrations/0004_auto_20201123_1943.py new file mode 100644 index 0000000..3dba8a1 --- /dev/null +++ b/hr_module/migrations/0004_auto_20201123_1943.py @@ -0,0 +1,22 @@ +# Generated by Django 3.1.3 on 2020-11-23 19:43 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('hr_module', '0003_auto_20201123_1943'), + ] + + operations = [ + migrations.RemoveField( + model_name='timemodel', + name='id', + ), + migrations.AlterField( + model_name='timemodel', + name='time_model_id', + field=models.IntegerField(primary_key=True, serialize=False), + ), + ] diff --git a/static/css/base.css b/static/css/base.css new file mode 100644 index 0000000..b248c23 --- /dev/null +++ b/static/css/base.css @@ -0,0 +1,8 @@ + + +.top-bar { + height: 150; + background: #C0C0C0; + margin-left: auto; + margin-right: auto; +} \ No newline at end of file diff --git a/templates/base.html b/templates/base.html new file mode 100644 index 0000000..4bdcfcb --- /dev/null +++ b/templates/base.html @@ -0,0 +1,10 @@ + + + + + $Title$ + + +$END$ + + \ No newline at end of file