diff --git a/HW2/myworld/db.sqlite3 b/HW2/myworld/db.sqlite3 new file mode 100644 index 00000000..041f71b9 Binary files /dev/null and b/HW2/myworld/db.sqlite3 differ diff --git a/HW2/myworld/docker-compose.yml b/HW2/myworld/docker-compose.yml new file mode 100644 index 00000000..4c456742 --- /dev/null +++ b/HW2/myworld/docker-compose.yml @@ -0,0 +1,30 @@ + version: "3" + services: + web_service: + build: + context: ./ + dockerfile: ./dockerfiles/Dockerfile + image: workshop1_web + container_name: workshop_web_container1 + stdin_open: true # docker attach container_id + tty: true + ports: + - "8000:8000" + volumes: + - .:/app + + psql-db: + image: 'postgres:14' + container_name: psql-db + environment: + - PGPASSWORD=123456 + - POSTGRES_USER=postgres + - POSTGRES_PASSWORD=123456 + ports: + - '5446:5432' + volumes: + - db:/var/lib/postgresql/data + + volumes: + db: + driver: local diff --git a/HW2/myworld/dockerfiles/Dockerfile b/HW2/myworld/dockerfiles/Dockerfile new file mode 100644 index 00000000..18b62b1a --- /dev/null +++ b/HW2/myworld/dockerfiles/Dockerfile @@ -0,0 +1,14 @@ + FROM python:3.10.2-alpine3.15 + # Install required packages + # For psycopg2 + RUN apk update && \ + apk --no-cache add --virtual build-deps-alpine build-base && \ + apk --no-cache add --virtual postgresql-deps libpq-dev + # Install requirements + RUN pip install --upgrade pip + RUN pip install Django psycopg2==2.9.3 + # Create directories + RUN mkdir -p /root/workspace/src + COPY ./ /root/workspace/site + # Switch to project directory + WORKDIR /root/workspace/site diff --git a/HW2/myworld/manage.py b/HW2/myworld/manage.py new file mode 100755 index 00000000..ffd27b10 --- /dev/null +++ b/HW2/myworld/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +"""Django's command-line utility for administrative tasks.""" +import os +import sys + + +def main(): + """Run administrative tasks.""" + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'myworld.settings') + try: + from django.core.management import execute_from_command_line + except ImportError as exc: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) from exc + execute_from_command_line(sys.argv) + + +if __name__ == '__main__': + main() diff --git a/HW2/myworld/members/__init__.py b/HW2/myworld/members/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/HW2/myworld/members/__pycache__/__init__.cpython-310.pyc b/HW2/myworld/members/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 00000000..5f24d523 Binary files /dev/null and b/HW2/myworld/members/__pycache__/__init__.cpython-310.pyc differ diff --git a/HW2/myworld/members/__pycache__/admin.cpython-310.pyc b/HW2/myworld/members/__pycache__/admin.cpython-310.pyc new file mode 100644 index 00000000..1dfa1878 Binary files /dev/null and b/HW2/myworld/members/__pycache__/admin.cpython-310.pyc differ diff --git a/HW2/myworld/members/__pycache__/apps.cpython-310.pyc b/HW2/myworld/members/__pycache__/apps.cpython-310.pyc new file mode 100644 index 00000000..21799666 Binary files /dev/null and b/HW2/myworld/members/__pycache__/apps.cpython-310.pyc differ diff --git a/HW2/myworld/members/__pycache__/models.cpython-310.pyc b/HW2/myworld/members/__pycache__/models.cpython-310.pyc new file mode 100644 index 00000000..1a46e2f7 Binary files /dev/null and b/HW2/myworld/members/__pycache__/models.cpython-310.pyc differ diff --git a/HW2/myworld/members/__pycache__/urls.cpython-310.pyc b/HW2/myworld/members/__pycache__/urls.cpython-310.pyc new file mode 100644 index 00000000..a077cc75 Binary files /dev/null and b/HW2/myworld/members/__pycache__/urls.cpython-310.pyc differ diff --git a/HW2/myworld/members/__pycache__/views.cpython-310.pyc b/HW2/myworld/members/__pycache__/views.cpython-310.pyc new file mode 100644 index 00000000..02ff82e0 Binary files /dev/null and b/HW2/myworld/members/__pycache__/views.cpython-310.pyc differ diff --git a/HW2/myworld/members/admin.py b/HW2/myworld/members/admin.py new file mode 100644 index 00000000..43915dd9 --- /dev/null +++ b/HW2/myworld/members/admin.py @@ -0,0 +1,9 @@ + +from django.contrib import admin +from .models import Members + +class PersonAdmin(admin.ModelAdmin): + list_display = ('firstname', 'lastname') + +admin.site.register(Members,PersonAdmin) +# Register your models here. diff --git a/HW2/myworld/members/apps.py b/HW2/myworld/members/apps.py new file mode 100644 index 00000000..c775af84 --- /dev/null +++ b/HW2/myworld/members/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class MembersConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'members' diff --git a/HW2/myworld/members/migrations/0001_initial.py b/HW2/myworld/members/migrations/0001_initial.py new file mode 100644 index 00000000..ca4c7525 --- /dev/null +++ b/HW2/myworld/members/migrations/0001_initial.py @@ -0,0 +1,22 @@ +# Generated by Django 4.2 on 2023-05-19 15:16 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Members', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('firstname', models.CharField(max_length=255)), + ('lastname', models.CharField(max_length=255)), + ], + ), + ] diff --git a/HW2/myworld/members/migrations/__init__.py b/HW2/myworld/members/migrations/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/HW2/myworld/members/migrations/__pycache__/0001_initial.cpython-310.pyc b/HW2/myworld/members/migrations/__pycache__/0001_initial.cpython-310.pyc new file mode 100644 index 00000000..7250935d Binary files /dev/null and b/HW2/myworld/members/migrations/__pycache__/0001_initial.cpython-310.pyc differ diff --git a/HW2/myworld/members/migrations/__pycache__/__init__.cpython-310.pyc b/HW2/myworld/members/migrations/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 00000000..c0ef39c8 Binary files /dev/null and b/HW2/myworld/members/migrations/__pycache__/__init__.cpython-310.pyc differ diff --git a/HW2/myworld/members/models.py b/HW2/myworld/members/models.py new file mode 100644 index 00000000..ea614c5c --- /dev/null +++ b/HW2/myworld/members/models.py @@ -0,0 +1,6 @@ +from django.db import models + + +class Members(models.Model): + firstname = models.CharField(max_length=255) + lastname = models.CharField(max_length=255) diff --git a/HW2/myworld/members/templates/myfirst.html b/HW2/myworld/members/templates/myfirst.html new file mode 100644 index 00000000..ef1398d2 --- /dev/null +++ b/HW2/myworld/members/templates/myfirst.html @@ -0,0 +1,9 @@ + + + + +

Hello World!

+

Welcome to my first Django project!

+ + + diff --git a/HW2/myworld/members/tests.py b/HW2/myworld/members/tests.py new file mode 100644 index 00000000..7ce503c2 --- /dev/null +++ b/HW2/myworld/members/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/HW2/myworld/members/urls.py b/HW2/myworld/members/urls.py new file mode 100644 index 00000000..6e21aeb2 --- /dev/null +++ b/HW2/myworld/members/urls.py @@ -0,0 +1,6 @@ +from django.urls import path +from . import views + +urlpatterns = [ + path('', views.index, name='index'), +] diff --git a/HW2/myworld/members/views.py b/HW2/myworld/members/views.py new file mode 100644 index 00000000..4fa1cd1b --- /dev/null +++ b/HW2/myworld/members/views.py @@ -0,0 +1,7 @@ +from django.shortcuts import render +from django.http import HttpResponse +from django.template import loader + +def index(request): + template = loader.get_template('myfirst.html') + return HttpResponse(template.render()) diff --git a/HW2/myworld/myworld/__init__.py b/HW2/myworld/myworld/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/HW2/myworld/myworld/__pycache__/__init__.cpython-310.pyc b/HW2/myworld/myworld/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 00000000..5e766280 Binary files /dev/null and b/HW2/myworld/myworld/__pycache__/__init__.cpython-310.pyc differ diff --git a/HW2/myworld/myworld/__pycache__/settings.cpython-310.pyc b/HW2/myworld/myworld/__pycache__/settings.cpython-310.pyc new file mode 100644 index 00000000..2771d42e Binary files /dev/null and b/HW2/myworld/myworld/__pycache__/settings.cpython-310.pyc differ diff --git a/HW2/myworld/myworld/__pycache__/urls.cpython-310.pyc b/HW2/myworld/myworld/__pycache__/urls.cpython-310.pyc new file mode 100644 index 00000000..0695b870 Binary files /dev/null and b/HW2/myworld/myworld/__pycache__/urls.cpython-310.pyc differ diff --git a/HW2/myworld/myworld/__pycache__/wsgi.cpython-310.pyc b/HW2/myworld/myworld/__pycache__/wsgi.cpython-310.pyc new file mode 100644 index 00000000..b61a942c Binary files /dev/null and b/HW2/myworld/myworld/__pycache__/wsgi.cpython-310.pyc differ diff --git a/HW2/myworld/myworld/asgi.py b/HW2/myworld/myworld/asgi.py new file mode 100644 index 00000000..36404b33 --- /dev/null +++ b/HW2/myworld/myworld/asgi.py @@ -0,0 +1,16 @@ +""" +ASGI config for myworld project. + +It exposes the ASGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/4.2/howto/deployment/asgi/ +""" + +import os + +from django.core.asgi import get_asgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'myworld.settings') + +application = get_asgi_application() diff --git a/HW2/myworld/myworld/settings.py b/HW2/myworld/myworld/settings.py new file mode 100644 index 00000000..ee867810 --- /dev/null +++ b/HW2/myworld/myworld/settings.py @@ -0,0 +1,127 @@ +""" +Django settings for myworld project. + +Generated by 'django-admin startproject' using Django 4.2. + +For more information on this file, see +https://docs.djangoproject.com/en/4.2/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/4.2/ref/settings/ +""" + +from pathlib import Path + +# Build paths inside the project like this: BASE_DIR / 'subdir'. +BASE_DIR = Path(__file__).resolve().parent.parent + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/4.2/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = 'django-insecure-4uoq^=sez*2s@@)dc=z!wj(2h++g(zu*3__w)=1_!+rif*19n9' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +ALLOWED_HOSTS = ['*'] + + +# Application definition + +INSTALLED_APPS = [ + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', + 'members.apps.MembersConfig' +] +MIDDLEWARE = [ + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +] + +ROOT_URLCONF = 'myworld.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'myworld.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/4.2/ref/settings/#databases + + DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.postgresql', + 'NAME': 'member_db', + 'USER': 'postgres', + 'PASSWORD': '123456', + 'HOST': 'psql-db', + 'PORT': 5432, + } + } + + +# Password validation +# https://docs.djangoproject.com/en/4.2/ref/settings/#auth-password-validators + +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + + +# Internationalization +# https://docs.djangoproject.com/en/4.2/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/4.2/howto/static-files/ + +STATIC_URL = 'static/' + +# Default primary key field type +# https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field + +DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' diff --git a/HW2/myworld/myworld/urls.py b/HW2/myworld/myworld/urls.py new file mode 100644 index 00000000..e5fce6f6 --- /dev/null +++ b/HW2/myworld/myworld/urls.py @@ -0,0 +1,24 @@ +""" +URL configuration for myworld project. + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/4.2/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: path('', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: path('', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.urls import include, path + 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) +""" + +from django.contrib import admin +from django.urls import include, path + +urlpatterns = [ + path('members/', include('members.urls')), + path('admin/', admin.site.urls), +] diff --git a/HW2/myworld/myworld/wsgi.py b/HW2/myworld/myworld/wsgi.py new file mode 100644 index 00000000..cb3f79d3 --- /dev/null +++ b/HW2/myworld/myworld/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for myworld project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/4.2/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'myworld.settings') + +application = get_wsgi_application() diff --git a/myworld/members/admin.py b/myworld/members/admin.py index 0487b5cb..7f8d1df2 100644 --- a/myworld/members/admin.py +++ b/myworld/members/admin.py @@ -2,8 +2,8 @@ from .models import Students class DjStudentAdmin(admin.ModelAdmin): - list_display = ("first_name", "last_name", "address", "roll_number", "mobile", "branch") + list_display = ("first_name", "last_name", "address", "emp_number", "mobile", "branch") list_filter = ("branch",) # Register your models here. -admin.site.register(Students, DjStudentAdmin) \ No newline at end of file +admin.site.register(Students, DjStudentAdmin) diff --git a/myworld/members/models.py b/myworld/members/models.py index f81736a8..223a1870 100644 --- a/myworld/members/models.py +++ b/myworld/members/models.py @@ -1,10 +1,10 @@ from django.db import models BRANCH_CHOICES = ( - ("BA", "BA"), - ("B.COM", "B.COM"), - ("MBA", "MBA"), - ("CA", "CA"), + ("sales", "sales"), + ("marketting", "marketting"), + ("accounting", "accounting"), + ("case_study", "case_study"), ) # Create your models here. @@ -12,9 +12,9 @@ class Students(models.Model): first_name = models.CharField(max_length=200) last_name = models.CharField(max_length=200) address = models.CharField(max_length=200) - roll_number = models.IntegerField() + emp_number = models.IntegerField() mobile = models.CharField(max_length=10) branch = models.CharField(max_length=10, choices=BRANCH_CHOICES) def __str__(self): - return self.first_name + " " + self.last_name \ No newline at end of file + return self.first_name + " " + self.last_name