Skip to content
Snippets Groups Projects
Commit cc9ba636 authored by Morris, Sophie E (UG - Comp Sci & Elec Eng)'s avatar Morris, Sophie E (UG - Comp Sci & Elec Eng)
Browse files

minor errors with files and urls fixed

parent b5bb6fe9
No related branches found
No related tags found
No related merge requests found
...@@ -2,9 +2,9 @@ services: ...@@ -2,9 +2,9 @@ services:
register: register:
build: . build: .
container_name: register container_name: register
command: bash -c "python register/manage.py makemigrations && python register/manage.py migrate && python register/manage.py runserver 0.0.0.0:8001" command: bash -c "python src/register/manage.py makemigrations && python src/register/manage.py migrate && python src/register/manage.py runserver 0.0.0.0:8001"
volumes: volumes:
- .:/src/ - .:/src
ports: ports:
- "8001:8001" - "8001:8001"
depends_on: depends_on:
...@@ -12,9 +12,9 @@ services: ...@@ -12,9 +12,9 @@ services:
main: main:
build: . build: .
container_name: main container_name: main
command: bash -c "python main/manage.py makemigrations contact && python main/manage.py migrate contact && python main/manage.py runserver 0.0.0.0:8000" command: bash -c "python src/main/manage.py makemigrations contact && python src/main/manage.py migrate contact && python src/main/manage.py runserver 0.0.0.0:8000"
volumes: volumes:
- .:/src/ - .:/src
ports: ports:
- "8000:8000" - "8000:8000"
depends_on: depends_on:
...@@ -22,9 +22,9 @@ services: ...@@ -22,9 +22,9 @@ services:
posts: posts:
build: . build: .
container_name: posts container_name: posts
command: bash -c "python post/manage.py makemigrations postapp && python post/manage.py migrate postapp && python post/manage.py runserver 0.0.0.0:8002" command: bash -c "python src/post/manage.py makemigrations postapp && python src/post/manage.py migrate postapp && python src/post/manage.py runserver 0.0.0.0:8002"
volumes: volumes:
- .:/src/ - .:/src
ports: ports:
- "8002:8002" - "8002:8002"
depends_on: depends_on:
...@@ -32,9 +32,9 @@ services: ...@@ -32,9 +32,9 @@ services:
profiles: profiles:
build: . build: .
container_name: profiles container_name: profiles
command: bash -c "python profiles/manage.py makemigrations profileapp && python profiles/manage.py migrate profileapp && python profiles/manage.py runserver 0.0.0.0:8003" command: bash -c "python src/profiles/manage.py makemigrations profileapp && python src/profiles/manage.py migrate profileapp && python src/profiles/manage.py runserver 0.0.0.0:8003"
volumes: volumes:
- .:/src/ - .:/src
ports: ports:
- "8003:8003" - "8003:8003"
depends_on: depends_on:
......
No preview for this file type
...@@ -16,11 +16,11 @@ from pathlib import Path ...@@ -16,11 +16,11 @@ from pathlib import Path
# Build paths inside the project like this: BASE_DIR / 'subdir'. # Build paths inside the project like this: BASE_DIR / 'subdir'.
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
sys.path.append('/') sys.path.append('/src/')
STATIC_ROOT = os.path.join("static_root") STATIC_ROOT = os.path.join("static_root")
MEDIA_URL = '/media/' MEDIA_URL = '/media/'
MEDIA_ROOT = os.path.join('media') MEDIA_ROOT = os.path.join('/src/media')
# Quick-start development settings - unsuitable for production # Quick-start development settings - unsuitable for production
...@@ -32,7 +32,7 @@ SECRET_KEY = 'django-insecure-72ga@80_fve=s&97y(m-+68w$)$lt-@$r20eq&h6tm6w-o)&$@ ...@@ -32,7 +32,7 @@ SECRET_KEY = 'django-insecure-72ga@80_fve=s&97y(m-+68w$)$lt-@$r20eq&h6tm6w-o)&$@
# SECURITY WARNING: don't run with debug turned on in production! # SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True DEBUG = True
ALLOWED_HOSTS = ['*'] ALLOWED_HOSTS = ['*', '0.0.0.0', 'localhost']
# Application definition # Application definition
...@@ -66,7 +66,7 @@ ROOT_URLCONF = 'main.urls' ...@@ -66,7 +66,7 @@ ROOT_URLCONF = 'main.urls'
TEMPLATES = [ TEMPLATES = [
{ {
'BACKEND': 'django.template.backends.django.DjangoTemplates', 'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [os.path.join('templates'),], 'DIRS': [os.path.join('/src/templates'),],
'APP_DIRS': True, 'APP_DIRS': True,
'OPTIONS': { 'OPTIONS': {
'context_processors': [ 'context_processors': [
...@@ -144,7 +144,7 @@ STATIC_URL = '/static/' ...@@ -144,7 +144,7 @@ STATIC_URL = '/static/'
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
STATIC_ROOT = os.path.join('static') STATIC_ROOT = os.path.join('/src/static')
SASS_PROCESSOR_ROOT=STATIC_ROOT SASS_PROCESSOR_ROOT=STATIC_ROOT
STATICFILES_FINDERS=[ STATICFILES_FINDERS=[
'django.contrib.staticfiles.finders.FileSystemFinder', 'django.contrib.staticfiles.finders.FileSystemFinder',
......
No preview for this file type
...@@ -16,11 +16,11 @@ from pathlib import Path ...@@ -16,11 +16,11 @@ from pathlib import Path
# Build paths inside the project like this: BASE_DIR / 'subdir'. # Build paths inside the project like this: BASE_DIR / 'subdir'.
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
sys.path.append('/') sys.path.append('/src/')
STATIC_ROOT = os.path.join("static_root") STATIC_ROOT = os.path.join("static_root")
MEDIA_URL = '/media/' MEDIA_URL = '/media/'
MEDIA_ROOT = os.path.join('media') MEDIA_ROOT = os.path.join('/src/media')
# Quick-start development settings - unsuitable for production # Quick-start development settings - unsuitable for production
...@@ -32,7 +32,7 @@ SECRET_KEY = 'django-insecure-72ga@80_fve=s&97y(m-+68w$)$lt-@$r20eq&h6tm6w-o)&$@ ...@@ -32,7 +32,7 @@ SECRET_KEY = 'django-insecure-72ga@80_fve=s&97y(m-+68w$)$lt-@$r20eq&h6tm6w-o)&$@
# SECURITY WARNING: don't run with debug turned on in production! # SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True DEBUG = True
ALLOWED_HOSTS = ['*'] ALLOWED_HOSTS = ['*', '0.0.0.0', 'localhost']
# Application definition # Application definition
...@@ -68,7 +68,7 @@ ROOT_URLCONF = 'post.urls' ...@@ -68,7 +68,7 @@ ROOT_URLCONF = 'post.urls'
TEMPLATES = [ TEMPLATES = [
{ {
'BACKEND': 'django.template.backends.django.DjangoTemplates', 'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [os.path.join('templates'),], 'DIRS': [os.path.join('/src/templates'),],
'APP_DIRS': True, 'APP_DIRS': True,
'OPTIONS': { 'OPTIONS': {
'context_processors': [ 'context_processors': [
...@@ -146,7 +146,7 @@ STATIC_URL = '/static/' ...@@ -146,7 +146,7 @@ STATIC_URL = '/static/'
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
STATIC_ROOT = os.path.join('static') STATIC_ROOT = os.path.join('/src/static')
SASS_PROCESSOR_ROOT=STATIC_ROOT SASS_PROCESSOR_ROOT=STATIC_ROOT
STATICFILES_FINDERS=[ STATICFILES_FINDERS=[
'django.contrib.staticfiles.finders.FileSystemFinder', 'django.contrib.staticfiles.finders.FileSystemFinder',
......
No preview for this file type
...@@ -16,11 +16,11 @@ from pathlib import Path ...@@ -16,11 +16,11 @@ from pathlib import Path
# Build paths inside the project like this: BASE_DIR / 'subdir'. # Build paths inside the project like this: BASE_DIR / 'subdir'.
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
sys.path.append('/') sys.path.append('/src/')
STATIC_ROOT = os.path.join("static_root") STATIC_ROOT = os.path.join("static_root")
MEDIA_URL = '/media/' MEDIA_URL = '/media/'
MEDIA_ROOT = os.path.join('media') MEDIA_ROOT = os.path.join('/src/media')
# Quick-start development settings - unsuitable for production # Quick-start development settings - unsuitable for production
...@@ -32,7 +32,7 @@ SECRET_KEY = 'django-insecure-72ga@80_fve=s&97y(m-+68w$)$lt-@$r20eq&h6tm6w-o)&$@ ...@@ -32,7 +32,7 @@ SECRET_KEY = 'django-insecure-72ga@80_fve=s&97y(m-+68w$)$lt-@$r20eq&h6tm6w-o)&$@
# SECURITY WARNING: don't run with debug turned on in production! # SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True DEBUG = True
ALLOWED_HOSTS = ['*'] ALLOWED_HOSTS = ['*', '0.0.0.0', 'localhost']
# Application definition # Application definition
...@@ -66,7 +66,7 @@ ROOT_URLCONF = 'profiles.urls' ...@@ -66,7 +66,7 @@ ROOT_URLCONF = 'profiles.urls'
TEMPLATES = [ TEMPLATES = [
{ {
'BACKEND': 'django.template.backends.django.DjangoTemplates', 'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [os.path.join('templates'),], 'DIRS': [os.path.join('/src/templates'),],
'APP_DIRS': True, 'APP_DIRS': True,
'OPTIONS': { 'OPTIONS': {
'context_processors': [ 'context_processors': [
...@@ -144,7 +144,7 @@ STATIC_URL = '/static/' ...@@ -144,7 +144,7 @@ STATIC_URL = '/static/'
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
STATIC_ROOT = os.path.join('static') STATIC_ROOT = os.path.join('/src/static')
SASS_PROCESSOR_ROOT=STATIC_ROOT SASS_PROCESSOR_ROOT=STATIC_ROOT
STATICFILES_FINDERS=[ STATICFILES_FINDERS=[
'django.contrib.staticfiles.finders.FileSystemFinder', 'django.contrib.staticfiles.finders.FileSystemFinder',
......
No preview for this file type
...@@ -16,11 +16,11 @@ from pathlib import Path ...@@ -16,11 +16,11 @@ from pathlib import Path
# Build paths inside the project like this: BASE_DIR / 'subdir'. # Build paths inside the project like this: BASE_DIR / 'subdir'.
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
sys.path.append('/') sys.path.append('/src/')
STATIC_ROOT = os.path.join("static_root") STATIC_ROOT = os.path.join("static_root")
MEDIA_URL = '/media/' MEDIA_URL = '/media/'
MEDIA_ROOT = os.path.join('media') MEDIA_ROOT = os.path.join('/src/media')
# Quick-start development settings - unsuitable for production # Quick-start development settings - unsuitable for production
...@@ -32,7 +32,7 @@ SECRET_KEY = 'django-insecure-72ga@80_fve=s&97y(m-+68w$)$lt-@$r20eq&h6tm6w-o)&$@ ...@@ -32,7 +32,7 @@ SECRET_KEY = 'django-insecure-72ga@80_fve=s&97y(m-+68w$)$lt-@$r20eq&h6tm6w-o)&$@
# SECURITY WARNING: don't run with debug turned on in production! # SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True DEBUG = True
ALLOWED_HOSTS = ['*'] ALLOWED_HOSTS = ['*', '0.0.0.0', 'localhost']
# Application definition # Application definition
...@@ -64,7 +64,7 @@ ROOT_URLCONF = 'register.urls' ...@@ -64,7 +64,7 @@ ROOT_URLCONF = 'register.urls'
TEMPLATES = [ TEMPLATES = [
{ {
'BACKEND': 'django.template.backends.django.DjangoTemplates', 'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [os.path.join('templates'),], 'DIRS': [os.path.join('/src/templates'),],
'APP_DIRS': True, 'APP_DIRS': True,
'OPTIONS': { 'OPTIONS': {
'context_processors': [ 'context_processors': [
...@@ -142,7 +142,7 @@ STATIC_URL = '/static/' ...@@ -142,7 +142,7 @@ STATIC_URL = '/static/'
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
STATIC_ROOT = os.path.join('static') STATIC_ROOT = os.path.join('src/static')
SASS_PROCESSOR_ROOT=STATIC_ROOT SASS_PROCESSOR_ROOT=STATIC_ROOT
STATICFILES_FINDERS=[ STATICFILES_FINDERS=[
'django.contrib.staticfiles.finders.FileSystemFinder', 'django.contrib.staticfiles.finders.FileSystemFinder',
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
function confirmLogoff() { function confirmLogoff() {
var confirmation = confirm("Are you sure you want to log out?"); var confirmation = confirm("Are you sure you want to log out?");
if (confirmation) { if (confirmation) {
window.location.href = "http://127.0.0.1:8001"; // Redirect to home after logoff window.location.href = "http://localhost:8001"; // Redirect to home after logoff
} }
} }
</script> </script>
...@@ -24,12 +24,12 @@ ...@@ -24,12 +24,12 @@
<div class="username">{{ username }}</div> <div class="username">{{ username }}</div>
</div> </div>
<div class="navbar-right"> <div class="navbar-right">
<a href="http://127.0.0.1:8001/register/welcome">Home</a> <a href="http://localhost:8001/register/welcome">Home</a>
<a href="http://127.0.0.1:8002/post/feed">Feed</a> <a href="http://localhost:8002/post/feed">Feed</a>
<a href="http://127.0.0.1:8002/post/newPost">Add Photos</a> <a href="http://localhost:8002/post/newPost">Add Photos</a>
<a href="http://127.0.0.1:8003/profile">Profile</a> <a href="http://localhost:8003/profile">Profile</a>
<a href="http://127.0.0.1:8000/contact">Contact</a> <a href="http://localhost:8000/contact">Contact</a>
<a href="http://127.0.0.1:8000/about">About Us</a> <a href="http://localhost:8000/about">About Us</a>
<a href="#" onclick="confirmLogoff()">Log Off</a> <a href="#" onclick="confirmLogoff()">Log Off</a>
</div> </div>
</div> </div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment