mirror of
https://github.com/RPCS3/rpcs3-www.git
synced 2026-01-31 01:25:17 +01:00
Project fixed
* Modified project name to "website". * Configured database.
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -35,3 +35,4 @@ pip-delete-this-directory.txt
|
|||||||
|
|
||||||
# Secret settings
|
# Secret settings
|
||||||
settings_secret.py
|
settings_secret.py
|
||||||
|
*.sqlite3
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import os
|
|||||||
import sys
|
import sys
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "site.settings")
|
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "website.settings")
|
||||||
|
|
||||||
from django.core.management import execute_from_command_line
|
from django.core.management import execute_from_command_line
|
||||||
|
|
||||||
|
|||||||
17
site/urls.py
17
site/urls.py
@@ -1,17 +0,0 @@
|
|||||||
from django.conf.urls import patterns, include, url
|
|
||||||
|
|
||||||
# Uncomment the next two lines to enable the admin:
|
|
||||||
# from django.contrib import admin
|
|
||||||
# admin.autodiscover()
|
|
||||||
|
|
||||||
urlpatterns = patterns('',
|
|
||||||
# Examples:
|
|
||||||
# url(r'^$', 'site.views.home', name='home'),
|
|
||||||
# url(r'^site/', include('site.site.urls')),
|
|
||||||
|
|
||||||
# Uncomment the admin/doc line below to enable admin documentation:
|
|
||||||
# url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
|
|
||||||
|
|
||||||
# Uncomment the next line to enable the admin:
|
|
||||||
# url(r'^admin/', include(admin.site.urls)),
|
|
||||||
)
|
|
||||||
@@ -3,13 +3,19 @@
|
|||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
|
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
|
||||||
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
|
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
|
||||||
<Name>site</Name>
|
<Name>website</Name>
|
||||||
<RootNamespace>site</RootNamespace>
|
<RootNamespace>website</RootNamespace>
|
||||||
|
<CommandLineArguments />
|
||||||
|
<InterpreterPath />
|
||||||
|
<InterpreterArguments />
|
||||||
|
<DjangoSettingsModule>$(MSBuildProjectName).settings</DjangoSettingsModule>
|
||||||
|
<WebBrowserUrl />
|
||||||
|
<WebBrowserPort>8000</WebBrowserPort>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||||
<SchemaVersion>2.0</SchemaVersion>
|
<SchemaVersion>2.0</SchemaVersion>
|
||||||
<ProjectGuid>2081f287-c497-4033-84b5-ec921b6e4048</ProjectGuid>
|
<ProjectGuid>e472c92c-786b-4e30-bfb1-6c5c8e1a5855</ProjectGuid>
|
||||||
<ProjectHome>.</ProjectHome>
|
<ProjectHome>.</ProjectHome>
|
||||||
<ProjectTypeGuids>{5F0BE9CA-D677-4A4D-8806-6076C0FAAD37};{349c5851-65df-11da-9384-00065b846f21};{888888a0-9f3d-457c-b088-3a5042f75d52}</ProjectTypeGuids>
|
<ProjectTypeGuids>{5F0BE9CA-D677-4A4D-8806-6076C0FAAD37};{349c5851-65df-11da-9384-00065b846f21};{888888a0-9f3d-457c-b088-3a5042f75d52}</ProjectTypeGuids>
|
||||||
<StartupFile>manage.py</StartupFile>
|
<StartupFile>manage.py</StartupFile>
|
||||||
@@ -29,10 +35,10 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="manage.py" />
|
<Compile Include="manage.py" />
|
||||||
<Compile Include="site\__init__.py" />
|
<Compile Include="website\__init__.py" />
|
||||||
<Compile Include="site\settings.py" />
|
<Compile Include="website\settings.py" />
|
||||||
<Compile Include="site\urls.py" />
|
<Compile Include="website\urls.py" />
|
||||||
<Compile Include="site\wsgi.py" />
|
<Compile Include="website\wsgi.py" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<WebPiReference Include="https://www.microsoft.com/web/webpi/3.0/toolsproductlist.xml%3fDjango">
|
<WebPiReference Include="https://www.microsoft.com/web/webpi/3.0/toolsproductlist.xml%3fDjango">
|
||||||
@@ -46,6 +52,9 @@
|
|||||||
<FriendlyName>Python 2.7</FriendlyName>
|
<FriendlyName>Python 2.7</FriendlyName>
|
||||||
</WebPiReference>
|
</WebPiReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Folder Include="website\" />
|
||||||
|
</ItemGroup>
|
||||||
<Import Project="$(VSToolsPath)\Python Tools\Microsoft.PythonTools.Django.targets" />
|
<Import Project="$(VSToolsPath)\Python Tools\Microsoft.PythonTools.Django.targets" />
|
||||||
<ProjectExtensions>
|
<ProjectExtensions>
|
||||||
<VisualStudio>
|
<VisualStudio>
|
||||||
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
|
|||||||
# Visual Studio 2013
|
# Visual Studio 2013
|
||||||
VisualStudioVersion = 12.0.21005.1
|
VisualStudioVersion = 12.0.21005.1
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "site", "site.pyproj", "{2081F287-C497-4033-84B5-EC921B6E4048}"
|
Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "website", "website.pyproj", "{E472C92C-786B-4E30-BFB1-6C5C8E1A5855}"
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
@@ -11,10 +11,10 @@ Global
|
|||||||
Release|Any CPU = Release|Any CPU
|
Release|Any CPU = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
{2081F287-C497-4033-84B5-EC921B6E4048}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{E472C92C-786B-4E30-BFB1-6C5C8E1A5855}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{2081F287-C497-4033-84B5-EC921B6E4048}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{E472C92C-786B-4E30-BFB1-6C5C8E1A5855}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{2081F287-C497-4033-84B5-EC921B6E4048}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{E472C92C-786B-4E30-BFB1-6C5C8E1A5855}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{2081F287-C497-4033-84B5-EC921B6E4048}.Release|Any CPU.Build.0 = Release|Any CPU
|
{E472C92C-786B-4E30-BFB1-6C5C8E1A5855}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
@@ -1,6 +1,9 @@
|
|||||||
# Django settings for site project.
|
# Django settings for website project.
|
||||||
|
import os
|
||||||
from settings_secret import *
|
from settings_secret import *
|
||||||
|
|
||||||
|
BASE_DIR = os.path.dirname(os.path.dirname(__file__))
|
||||||
|
|
||||||
DEBUG = True
|
DEBUG = True
|
||||||
TEMPLATE_DEBUG = DEBUG
|
TEMPLATE_DEBUG = DEBUG
|
||||||
|
|
||||||
@@ -12,12 +15,8 @@ MANAGERS = ADMINS
|
|||||||
|
|
||||||
DATABASES = {
|
DATABASES = {
|
||||||
'default': {
|
'default': {
|
||||||
'ENGINE': 'django.db.backends.', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
|
'ENGINE': 'django.db.backends.sqlite3',
|
||||||
'NAME': '', # Or path to database file if using sqlite3.
|
'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
|
||||||
'USER': '', # Not used with sqlite3.
|
|
||||||
'PASSWORD': '', # Not used with sqlite3.
|
|
||||||
'HOST': '', # Set to empty string for localhost. Not used with sqlite3.
|
|
||||||
'PORT': '', # Set to empty string for default. Not used with sqlite3.
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -98,10 +97,10 @@ MIDDLEWARE_CLASSES = (
|
|||||||
# 'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
# 'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
||||||
)
|
)
|
||||||
|
|
||||||
ROOT_URLCONF = 'site.urls'
|
ROOT_URLCONF = 'website.urls'
|
||||||
|
|
||||||
# Python dotted path to the WSGI application used by Django's runserver.
|
# Python dotted path to the WSGI application used by Django's runserver.
|
||||||
WSGI_APPLICATION = 'site.wsgi.application'
|
WSGI_APPLICATION = 'website.wsgi.application'
|
||||||
|
|
||||||
TEMPLATE_DIRS = (
|
TEMPLATE_DIRS = (
|
||||||
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
|
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
|
||||||
@@ -116,8 +115,7 @@ INSTALLED_APPS = (
|
|||||||
'django.contrib.sites',
|
'django.contrib.sites',
|
||||||
'django.contrib.messages',
|
'django.contrib.messages',
|
||||||
'django.contrib.staticfiles',
|
'django.contrib.staticfiles',
|
||||||
# Uncomment the next line to enable the admin:
|
'django.contrib.admin',
|
||||||
# 'django.contrib.admin',
|
|
||||||
# Uncomment the next line to enable admin documentation:
|
# Uncomment the next line to enable admin documentation:
|
||||||
# 'django.contrib.admindocs',
|
# 'django.contrib.admindocs',
|
||||||
)
|
)
|
||||||
15
website/urls.py
Normal file
15
website/urls.py
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
from django.conf.urls import patterns, include, url
|
||||||
|
|
||||||
|
from django.contrib import admin
|
||||||
|
admin.autodiscover()
|
||||||
|
|
||||||
|
urlpatterns = patterns('',
|
||||||
|
# Examples:
|
||||||
|
# url(r'^$', 'website.views.home', name='home'),
|
||||||
|
# url(r'^website/', include('website.website.urls')),
|
||||||
|
|
||||||
|
# Uncomment the admin/doc line below to enable admin documentation:
|
||||||
|
# url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
|
||||||
|
|
||||||
|
url(r'^admin/', include(admin.site.urls)),
|
||||||
|
)
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
"""
|
"""
|
||||||
WSGI config for site project.
|
WSGI config for website project.
|
||||||
|
|
||||||
This module contains the WSGI application used by Django's development server
|
This module contains the WSGI application used by Django's development server
|
||||||
and any production WSGI deployments. It should expose a module-level variable
|
and any production WSGI deployments. It should expose a module-level variable
|
||||||
@@ -15,7 +15,7 @@ framework.
|
|||||||
"""
|
"""
|
||||||
import os
|
import os
|
||||||
|
|
||||||
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "site.settings")
|
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "website.settings")
|
||||||
|
|
||||||
# This application object is used by any WSGI server configured to use this
|
# This application object is used by any WSGI server configured to use this
|
||||||
# file. This includes Django's development server, if the WSGI_APPLICATION
|
# file. This includes Django's development server, if the WSGI_APPLICATION
|
||||||
Reference in New Issue
Block a user