diff --git a/README.md b/README.md index 950abf9..c1ffdd8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,3 @@ -# battle-vision -ポケモンのパーティ編成画面をブラウザで管理出来るツールです - # Usege ## Frontend diff --git a/package.json b/package.json index f956065..f710dfa 100644 --- a/package.json +++ b/package.json @@ -1,14 +1,11 @@ { "name": "battle-vision", "version": "1.0.0", - "description": "ポケモンのパーティ編成画面をブラウザで管理出来るツールです", + "description": "None", "main": "test.tsx", "scripts": { - "build": "webpack --config ./webpack.config.dev.js", - "build:test": "webpack --config ./webpack.config.test.js", - "start": "webpack serve --config ./webpack.config.dev.js", - "start:test": "webpack serve --config ./webpack.config.test.js", - "build:pro": "webpack --mode production", + "build": "webpack --config ./webpack.config.test.js", + "start": "webpack serve --config ./webpack.config.test.js", "tsc": "tsc" }, "author": "", diff --git a/src/backend/ServerSide/__init__.py b/src/backend/ServerSide/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/src/backend/ServerSide/admin.py b/src/backend/ServerSide/admin.py deleted file mode 100644 index 91ee91c..0000000 --- a/src/backend/ServerSide/admin.py +++ /dev/null @@ -1,6 +0,0 @@ -from django.contrib import admin -from .models import User - -# Register your models here. - -admin.site.register(User) \ No newline at end of file diff --git a/src/backend/ServerSide/apps.py b/src/backend/ServerSide/apps.py deleted file mode 100644 index 6dcd7d2..0000000 --- a/src/backend/ServerSide/apps.py +++ /dev/null @@ -1,6 +0,0 @@ -from django.apps import AppConfig - - -class ServersideConfig(AppConfig): - default_auto_field = 'django.db.models.BigAutoField' - name = 'ServerSide' diff --git a/src/backend/ServerSide/migrations/__init__.py b/src/backend/ServerSide/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/src/backend/ServerSide/models.py b/src/backend/ServerSide/models.py deleted file mode 100644 index b3b1b16..0000000 --- a/src/backend/ServerSide/models.py +++ /dev/null @@ -1,12 +0,0 @@ -from django.db import models - -# Create your models here. -class User(models.Model): - name = models.CharField(max_length=20) - age = models.IntegerField() - - def __str__(self): - return self.name - - class Meta: - db_table = 'user' \ No newline at end of file diff --git a/src/backend/ServerSide/serializers.py b/src/backend/ServerSide/serializers.py deleted file mode 100644 index 33dae97..0000000 --- a/src/backend/ServerSide/serializers.py +++ /dev/null @@ -1,7 +0,0 @@ -from rest_framework import serializers -from .models import User - -class UserSerializer(serializers.ModelSerializer): - class Meta: - model = User - fields = ('id','name','age') \ No newline at end of file diff --git a/src/backend/ServerSide/tests.py b/src/backend/ServerSide/tests.py deleted file mode 100644 index 7ce503c..0000000 --- a/src/backend/ServerSide/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/src/backend/ServerSide/urls.py b/src/backend/ServerSide/urls.py deleted file mode 100644 index 9d04b57..0000000 --- a/src/backend/ServerSide/urls.py +++ /dev/null @@ -1,11 +0,0 @@ -from django.urls import path -from .views import ( - HomeView, User_Create -) - -app_name = 'ServerSide' - -urlpatterns = [ - path('home/' , HomeView.as_view() , name="home" ), - path('add/' , User_Create.as_view() , name="add" ), -] \ No newline at end of file diff --git a/src/backend/ServerSide/views.py b/src/backend/ServerSide/views.py deleted file mode 100644 index 41f5604..0000000 --- a/src/backend/ServerSide/views.py +++ /dev/null @@ -1,26 +0,0 @@ -from django.shortcuts import render -from django.views.generic.base import TemplateView -from django.views.generic.edit import CreateView - -from django.urls import reverse_lazy - -from rest_framework import viewsets -from .serializers import UserSerializer - -from .models import User - -# Create your views here. - -class HomeView(TemplateView): - template_name = 'dj-home.html' - -class User_Create(CreateView): - template_name = 'dj-add.html' - model = User - fields = ['name','age'] - - success_url = reverse_lazy('ServerSide:home') - -class UserView(viewsets.ModelViewSet): - serializer_class = UserSerializer - queryset = User.objects.all() \ No newline at end of file diff --git a/src/backend/djangoEnv/__init__.py b/src/backend/djangoEnv/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/src/backend/djangoEnv/asgi.py b/src/backend/djangoEnv/asgi.py deleted file mode 100644 index 0850ba4..0000000 --- a/src/backend/djangoEnv/asgi.py +++ /dev/null @@ -1,16 +0,0 @@ -""" -ASGI config for djangoEnv 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', 'djangoEnv.settings') - -application = get_asgi_application() diff --git a/src/backend/djangoEnv/settings.py b/src/backend/djangoEnv/settings.py deleted file mode 100644 index 5a516ce..0000000 --- a/src/backend/djangoEnv/settings.py +++ /dev/null @@ -1,146 +0,0 @@ -""" -Django settings for djangoEnv project. - -Generated by 'django-admin startproject' using Django 4.2.1. - -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 -import os - -import environ - -ENV = environ.Env() -ENV.read_env('Dev.env') - -# Build paths inside the project like this: BASE_DIR / 'subdir'. -BASE_DIR = Path(__file__).resolve().parent.parent - -TEMPLATE_DIR = os.path.join(BASE_DIR , 'templates') - -# 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-qx^r7qofrsv)mp3%mu2$^un%didey+3%5k0o!hzvi^=l4ds+*w' - -# 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', - 'rest_framework', - 'corsheaders', - 'ServerSide', -] - -MIDDLEWARE = [ - 'django.middleware.security.SecurityMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', - "corsheaders.middleware.CorsMiddleware", - 'django.middleware.common.CommonMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', - 'django.middleware.clickjacking.XFrameOptionsMiddleware', -] - -# リクエストの許可 -CORS_ALLOWED_ORIGINS = [ - 'http://localhost:8080' -] - -ROOT_URLCONF = 'djangoEnv.urls' - -TEMPLATES = [ - { - 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [TEMPLATE_DIR,], - '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 = 'djangoEnv.wsgi.application' - - -# Database -# https://docs.djangoproject.com/en/4.2/ref/settings/#databases - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.mysql', - 'USER': ENV('MYSQL_ROOT_USER'), - 'PASSWORD': ENV('MYSQL_PASSWORD'), - 'HOST': ENV('MYSQL_HOST'), - 'NAME': ENV('MYSQL_USE_DATABASE'), - 'PORT': ENV('MYSQL_POOT') - } -} - - -# 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/' -STATICFILES_DIRS = [ - os.path.join(BASE_DIR,'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/src/backend/djangoEnv/urls.py b/src/backend/djangoEnv/urls.py deleted file mode 100644 index 97fd848..0000000 --- a/src/backend/djangoEnv/urls.py +++ /dev/null @@ -1,35 +0,0 @@ -""" -URL configuration for djangoEnv 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 path , include - -from django.conf import settings -from django.conf.urls.static import static - -from rest_framework import routers -from ServerSide import views - -router = routers.DefaultRouter() -router.register(r'users',views.UserView,'ServerSide') - -urlpatterns = [ - path('admin/', admin.site.urls), - path('django/', include('ServerSide.urls')), - path('api/',include(router.urls)), -] - -urlpatterns += static(settings.STATIC_URL , document_root=settings.STATICFILES_DIRS) \ No newline at end of file diff --git a/src/backend/djangoEnv/wsgi.py b/src/backend/djangoEnv/wsgi.py deleted file mode 100644 index 744c186..0000000 --- a/src/backend/djangoEnv/wsgi.py +++ /dev/null @@ -1,16 +0,0 @@ -""" -WSGI config for djangoEnv 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', 'djangoEnv.settings') - -application = get_wsgi_application() diff --git a/src/backend/manage.py b/src/backend/manage.py deleted file mode 100755 index c28b603..0000000 --- a/src/backend/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', 'djangoEnv.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/src/backend/templates/dj-add.html b/src/backend/templates/dj-add.html deleted file mode 100644 index c0034c8..0000000 --- a/src/backend/templates/dj-add.html +++ /dev/null @@ -1,5 +0,0 @@ -
- {% csrf_token %} - {{ form.as_p }} - -
\ No newline at end of file diff --git a/src/backend/templates/dj-base.html b/src/backend/templates/dj-base.html deleted file mode 100644 index c4c5b99..0000000 --- a/src/backend/templates/dj-base.html +++ /dev/null @@ -1,12 +0,0 @@ -{% load static %} - - - - - - - {% block content %}{% endblock content %} -
- - - \ No newline at end of file diff --git a/src/backend/templates/dj-home.html b/src/backend/templates/dj-home.html deleted file mode 100644 index 988aa1c..0000000 --- a/src/backend/templates/dj-home.html +++ /dev/null @@ -1,4 +0,0 @@ -{% extends 'dj-base.html' %} -{% block content %} -
Hello World Django!!
-{% endblock content %} \ No newline at end of file diff --git a/src/frontend/css/sample.css b/src/frontend/css/sample.css deleted file mode 100644 index 53e2282..0000000 --- a/src/frontend/css/sample.css +++ /dev/null @@ -1,3 +0,0 @@ -.test { - color: blue; -} \ No newline at end of file diff --git a/src/frontend/html/index.html b/src/frontend/html/index.html deleted file mode 100644 index deaf913..0000000 --- a/src/frontend/html/index.html +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - -
- - \ No newline at end of file diff --git a/src/frontend/html/sample.html b/src/frontend/html/sample.html deleted file mode 100644 index 0b63f81..0000000 --- a/src/frontend/html/sample.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - -
Hello Webpack!!
- - - \ No newline at end of file diff --git a/src/frontend/json/Message.json b/src/frontend/json/Message.json deleted file mode 100644 index e5ddcf8..0000000 --- a/src/frontend/json/Message.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "Server": { - "BackendFetchError": { - "01": "バックエンドのサーバーを起動してください" - } - } -} \ No newline at end of file diff --git a/src/frontend/json/testdata.json b/src/frontend/json/testdata.json deleted file mode 100644 index bd6272e..0000000 --- a/src/frontend/json/testdata.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "datas": [ - { - "data": 1, - "id": 1 - }, - { - "data": 2, - "id": 5 - }, - { - "data": 4, - "id": 5 - } - ] -} \ No newline at end of file diff --git a/src/frontend/scss/sample.scss b/src/frontend/scss/sample.scss deleted file mode 100644 index 36837d2..0000000 --- a/src/frontend/scss/sample.scss +++ /dev/null @@ -1,3 +0,0 @@ -body { - background-color: steelblue; -} \ No newline at end of file diff --git a/webpack.config.dev.js b/webpack.config.dev.js deleted file mode 100644 index fee9b86..0000000 --- a/webpack.config.dev.js +++ /dev/null @@ -1,71 +0,0 @@ -const PATH = require('path'); - -//const DIST_PATH = 'dist'; -const DIST_PATH = 'src/backend/static'; - -const OUTPUT_PATH = PATH.resolve(__dirname , DIST_PATH); -const HTML_WEBPACK_PLUGIN = require('html-webpack-plugin'); -const MINI_CSS_EXTRACT_PLUGIN = require('mini-css-extract-plugin'); - -module.exports = { - entry: './src/frontend/ts/index.tsx', - output: { - // jsx は対応していない - //filename: '[name]_[hash].js', - filename: 'main.js', - //* すべて同じ場所に統一する場合 - path: OUTPUT_PATH, - }, - module: { - rules: [ - { - test: /\.js?x$/, - exclude: /node_modules/, - loader: 'babel-loader' - }, - { - test: /\.ts?x$/, - use: 'ts-loader' - }, - { - test: /\.html$/, - loader: 'html-loader' - }, - { - test: /\.s?css$/, - use: [ - MINI_CSS_EXTRACT_PLUGIN.loader, - 'css-loader', - 'sass-loader' - ] - }, - { - test: /\.png$/, - loader: 'file-loader', - options: { - limit: 0, - name: './images/[name].[ext]' - } - } - ] - }, - resolve: { - extensions: [".ts",".tsx",".js",".jsx",".json"] - }, - plugins: [ - new HTML_WEBPACK_PLUGIN({ - template: "./src/frontend/html/index.html", - filename: "index.html" - }), - new MINI_CSS_EXTRACT_PLUGIN({ - filename: '[name].[hash].css' - }), - ], - devServer: { - static: { - directory: PATH.join(__dirname, DIST_PATH) - } - }, - target: ["web", "es5"], - mode: "development" -}; \ No newline at end of file diff --git a/webpack.config.test.js b/webpack.config.test.js index 0a57352..21e4cdd 100644 --- a/webpack.config.test.js +++ b/webpack.config.test.js @@ -1,9 +1,5 @@ module.exports = { - // モード値を production に設定すると最適化された状態で、 - // development に設定するとソースマップ有効でJSファイルが出力される mode: "development", - - // メインとなるJavaScriptファイル(エントリーポイント) entry: { main: { import: './src/frontend/ts/test.tsx', @@ -11,29 +7,22 @@ module.exports = { }, shared: ['lodash'] }, - // ファイルの出力設定 output: { - // 出力ファイルのディレクトリ名 path: `${__dirname}/dist`, - // 出力ファイル名 filename: "[name].js", }, module: { rules: [ { - // 拡張子 .ts もしくは .tsx の場合 test: /\.tsx?$/, - // TypeScript をコンパイルする use: "ts-loader", exclude: /node_modules/ }, ], }, - // import 文で .ts や .tsx ファイルを解決するため resolve: { extensions: [".ts", ".tsx", ".js", ".json"], }, - // ES5(IE11等)向けの指定 target: ["web", "es5"], devServer: { static: {