diff --git a/old/Server/__pycache__/databasefornow.cpython-36.pyc b/Server/__pycache__/databasefornow.cpython-36.pyc similarity index 100% rename from old/Server/__pycache__/databasefornow.cpython-36.pyc rename to Server/__pycache__/databasefornow.cpython-36.pyc diff --git a/old/Server/currency.txt b/Server/currency.txt similarity index 100% rename from old/Server/currency.txt rename to Server/currency.txt diff --git a/old/Server/databasefornow.py b/Server/databasefornow.py similarity index 100% rename from old/Server/databasefornow.py rename to Server/databasefornow.py diff --git a/old/Server/websocketServer.py b/Server/websocketServer.py similarity index 100% rename from old/Server/websocketServer.py rename to Server/websocketServer.py diff --git a/old/Website/css/home.css b/Website/css/home.css similarity index 100% rename from old/Website/css/home.css rename to Website/css/home.css diff --git a/old/Website/index.html b/Website/index.html similarity index 100% rename from old/Website/index.html rename to Website/index.html diff --git a/old/Website/scripts/Cookies.js b/Website/scripts/Cookies.js similarity index 100% rename from old/Website/scripts/Cookies.js rename to Website/scripts/Cookies.js diff --git a/old/Website/scripts/getCurrentCoins.js b/Website/scripts/getCurrentCoins.js similarity index 100% rename from old/Website/scripts/getCurrentCoins.js rename to Website/scripts/getCurrentCoins.js diff --git a/currencyproj/currency.txt b/currencyproj/currency.txt deleted file mode 100644 index 7c0e0f11..00000000 --- a/currencyproj/currency.txt +++ /dev/null @@ -1 +0,0 @@ -101010 diff --git a/currencyproj/currencyproj/__init__.py b/currencyproj/currencyproj/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/currencyproj/currencyproj/__pycache__/__init__.cpython-36.pyc b/currencyproj/currencyproj/__pycache__/__init__.cpython-36.pyc deleted file mode 100644 index 330a35f8..00000000 Binary files a/currencyproj/currencyproj/__pycache__/__init__.cpython-36.pyc and /dev/null differ diff --git a/currencyproj/currencyproj/__pycache__/settings.cpython-36.pyc b/currencyproj/currencyproj/__pycache__/settings.cpython-36.pyc deleted file mode 100644 index 610df9fe..00000000 Binary files a/currencyproj/currencyproj/__pycache__/settings.cpython-36.pyc and /dev/null differ diff --git a/currencyproj/currencyproj/asgi.py b/currencyproj/currencyproj/asgi.py deleted file mode 100644 index 41f19f93..00000000 --- a/currencyproj/currencyproj/asgi.py +++ /dev/null @@ -1,16 +0,0 @@ -""" -ASGI config for currencyproj 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/3.1/howto/deployment/asgi/ -""" - -import os - -from django.core.asgi import get_asgi_application - -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'currencyproj.settings') - -application = get_asgi_application() diff --git a/currencyproj/currencyproj/settings.py b/currencyproj/currencyproj/settings.py deleted file mode 100644 index a54205a6..00000000 --- a/currencyproj/currencyproj/settings.py +++ /dev/null @@ -1,120 +0,0 @@ -""" -Django settings for currencyproj project. - -Generated by 'django-admin startproject' using Django 3.1.6. - -For more information on this file, see -https://docs.djangoproject.com/en/3.1/topics/settings/ - -For the full list of settings and their values, see -https://docs.djangoproject.com/en/3.1/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/3.1/howto/deployment/checklist/ - -# SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = '%j9h3c5ukt2mom45uiuy_paz+h1*qmqns@)-b0loxk_^bj%eg5' - -# 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', -] - -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 = 'currencyproj.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 = 'currencyproj.wsgi.application' - - -# Database -# https://docs.djangoproject.com/en/3.1/ref/settings/#databases - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': BASE_DIR / 'db.sqlite3', - } -} - - -# Password validation -# https://docs.djangoproject.com/en/3.1/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/3.1/topics/i18n/ - -LANGUAGE_CODE = 'en-us' - -TIME_ZONE = 'UTC' - -USE_I18N = True - -USE_L10N = True - -USE_TZ = True - - -# Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/3.1/howto/static-files/ - -STATIC_URL = '/static/' diff --git a/currencyproj/currencyproj/urls.py b/currencyproj/currencyproj/urls.py deleted file mode 100644 index ba234304..00000000 --- a/currencyproj/currencyproj/urls.py +++ /dev/null @@ -1,21 +0,0 @@ -"""currencyproj URL Configuration - -The `urlpatterns` list routes URLs to views. For more information please see: - https://docs.djangoproject.com/en/3.1/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 path - -urlpatterns = [ - path('admin/', admin.site.urls), -] diff --git a/currencyproj/currencyproj/wsgi.py b/currencyproj/currencyproj/wsgi.py deleted file mode 100644 index 0f54b109..00000000 --- a/currencyproj/currencyproj/wsgi.py +++ /dev/null @@ -1,16 +0,0 @@ -""" -WSGI config for currencyproj 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/3.1/howto/deployment/wsgi/ -""" - -import os - -from django.core.wsgi import get_wsgi_application - -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'currencyproj.settings') - -application = get_wsgi_application() diff --git a/currencyproj/home/__init__.py b/currencyproj/home/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/currencyproj/home/admin.py b/currencyproj/home/admin.py deleted file mode 100644 index 8c38f3f3..00000000 --- a/currencyproj/home/admin.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.contrib import admin - -# Register your models here. diff --git a/currencyproj/home/apps.py b/currencyproj/home/apps.py deleted file mode 100644 index 90dc7137..00000000 --- a/currencyproj/home/apps.py +++ /dev/null @@ -1,5 +0,0 @@ -from django.apps import AppConfig - - -class HomeConfig(AppConfig): - name = 'home' diff --git a/currencyproj/home/migrations/__init__.py b/currencyproj/home/migrations/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/currencyproj/home/models.py b/currencyproj/home/models.py deleted file mode 100644 index 4c0f90cf..00000000 --- a/currencyproj/home/models.py +++ /dev/null @@ -1,6 +0,0 @@ -from django.db import models - -class Ticker(models.Model): - f = open("../currency.txt","r") - a = f.readline() - print(a) diff --git a/currencyproj/home/tests.py b/currencyproj/home/tests.py deleted file mode 100644 index 7ce503c2..00000000 --- a/currencyproj/home/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/currencyproj/home/views.py b/currencyproj/home/views.py deleted file mode 100644 index 91ea44a2..00000000 --- a/currencyproj/home/views.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.shortcuts import render - -# Create your views here. diff --git a/currencyproj/manage.py b/currencyproj/manage.py deleted file mode 100644 index aa34add1..00000000 --- a/currencyproj/manage.py +++ /dev/null @@ -1,22 +0,0 @@ -#!/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', 'currencyproj.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()