From cc9ba636a83574362a733f81e16c38042edbd1f1 Mon Sep 17 00:00:00 2001
From: Sophie Morris <sm02810@surrey.ac.uk>
Date: Thu, 2 May 2024 16:41:38 +0100
Subject: [PATCH] minor errors with files and urls fixed
---
docker-compose.yml | 16 ++++++++--------
.../main/__pycache__/settings.cpython-312.pyc | Bin 3589 -> 3619 bytes
main/main/settings.py | 10 +++++-----
.../post/__pycache__/settings.cpython-312.pyc | Bin 3565 -> 3595 bytes
post/post/settings.py | 10 +++++-----
.../__pycache__/settings.cpython-312.pyc | Bin 3601 -> 3631 bytes
profiles/profiles/settings.py | 10 +++++-----
.../__pycache__/settings.cpython-312.pyc | Bin 3555 -> 3585 bytes
register/register/settings.py | 10 +++++-----
templates/base.html | 14 +++++++-------
10 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index 6e1f9b2..e0ccc0b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,9 +2,9 @@ services:
register:
build: .
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:
- - .:/src/
+ - .:/src
ports:
- "8001:8001"
depends_on:
@@ -12,9 +12,9 @@ services:
main:
build: .
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:
- - .:/src/
+ - .:/src
ports:
- "8000:8000"
depends_on:
@@ -22,9 +22,9 @@ services:
posts:
build: .
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:
- - .:/src/
+ - .:/src
ports:
- "8002:8002"
depends_on:
@@ -32,9 +32,9 @@ services:
profiles:
build: .
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:
- - .:/src/
+ - .:/src
ports:
- "8003:8003"
depends_on:
diff --git a/main/main/__pycache__/settings.cpython-312.pyc b/main/main/__pycache__/settings.cpython-312.pyc
index 4bd63f4723e16926e951b1c6b7a663cde7c4fcc0..59b6b26d9549366b7c54263b9655b2b101db3869 100644
GIT binary patch
delta 411
zcmZpbSuDeQnwOW00SGEK8>g+9$ScX1w^2QxQ6YtE5o45KIztLKkQPeei4q2~d4X(^
z6uv0Y6#mHpOxpDVs~JIB85q(TQ#eyVs)ZIYW-_J-&tXYtj1o%`i4so{O%Y2G2SbSz
z$rPzMY?+Kv5-HLtGC+0GDY9Tv4ou2tGN!XcNv0?O^-85EMoFhAMaiUaM#%!PT#9m(
ze2PkxLMmex*tsBEC&w_!ORK`%5XF<q6Qu}rgBsA4N|j8S>YJxA*)p=R>K7L!>rZ~b
zEXH2N1!4bS_LgA2#i&)qZlDK-w>We1lM{0?@{3D0JF%={Vz1%@tK9sK?JbbQ4dLA7
z^kZU`0<kAs@F;TG0G$BxfAQ?e$vi<U>{l2hChz1?me9G(tKPu%fscVNh!IG$F>vxW
zus#ydo&1GIpYwv8-ep1k3j&6dwRsOp+Fs_<Y~a2jB7cEF_!AS0DAPp-;UX)bnE*e$
BXGQ=3
delta 418
zcmZ21(<;MznwOW00SK0U)ktfe$ScX1wNX8vQ6@?-ogsy55o4543U`z+kj(>Ri=^;I
ziKg&PTp&I<mr<mie>EdWCj&z|V+v=A08o+OBF0R{6rnjR>5NfgDZ)|WDIzJNDPmwK
zo+6PVIfpHiF-jsuDn%NoPAWwPOv-{uxlG1%mMF;-d7xgY6on}16vZf+6wWAFAeKu}
zijq%Jj#5Zv%mTX>Wb4E=+#qL2tH7KQ#gobtr3iF}D$uP;l}wsyn`bfEGOF_EmlhZ4
z7Z)Y#Cl(ak;w~;pEXhocFUrp^sbbg9O-;#6)W5|#`4_YI<~Wv>OiZ^pH}kQ-W#YNT
z22rWWTxC4jkxO~AK9?dBuM)ChlS6qFxom-M0R=?ytjP^LK`eY%8005k<58ASzs#%D
z!1aNTfiH*=NV73;@;0zO5D=Oy$g9sWBm1(T)&&8b$)3CiB`q%VsWfok5Rt#YApD7m
OMU?3xgK&{G&`1Cnjcix|
diff --git a/main/main/settings.py b/main/main/settings.py
index d85ea32..9d9c99c 100644
--- a/main/main/settings.py
+++ b/main/main/settings.py
@@ -16,11 +16,11 @@ from pathlib import Path
# Build paths inside the project like this: BASE_DIR / 'subdir'.
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")
MEDIA_URL = '/media/'
-MEDIA_ROOT = os.path.join('media')
+MEDIA_ROOT = os.path.join('/src/media')
# 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)&$@
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
-ALLOWED_HOSTS = ['*']
+ALLOWED_HOSTS = ['*', '0.0.0.0', 'localhost']
# Application definition
@@ -66,7 +66,7 @@ ROOT_URLCONF = 'main.urls'
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
- 'DIRS': [os.path.join('templates'),],
+ 'DIRS': [os.path.join('/src/templates'),],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
@@ -144,7 +144,7 @@ STATIC_URL = '/static/'
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
STATICFILES_FINDERS=[
'django.contrib.staticfiles.finders.FileSystemFinder',
diff --git a/post/post/__pycache__/settings.cpython-312.pyc b/post/post/__pycache__/settings.cpython-312.pyc
index 8c0dc434be86130365954cc8c42c67de2b6a0303..16d80e622bfa98cf2585b0e53f909d11aff37096 100644
GIT binary patch
delta 429
zcmXw#zfZzI6vyw50%>V0P<|B3j{+*eAE03~y123!#*2&LDPo8uz+xAPtCL>hB8#j}
zrvHG>E*Ok4#KE|m7~<gQwZ?n7_r90+eRrSSr*WQA9u-AGe4W|VgYOF^fsgNs9c+R$
z!Zg%G5a2ZoGS#?NxQ>8IqcF#I$nt6M7CWN|H8F_bxWgmd!k`U>CZ;in&^SaP25~oZ
zNI-JvYhkK`0V(b?AnoRio3kz46lelWKAVIbH6Tw@AksA787R;!%u{n8AGx^Bt8ABK
zjfH;(D(}lQ#~BtmW&VVeiuM)R!ai@M*KJhTyC>$iq(A-Rsp+06Ub6gaWjCf`yVKZf
zA9i|udt109eoJ+o_KWY6gsgyj==JydtwzaXRoT6eWEn}cXJU?clTMeJa!%UhP|lC^
zu31g43;t)Mvm3dfuS}HUK>AXVTF1Qlkf;p2AHh}jCRfC9raTE%#=&)_DG!OQiCP*2
TUL)Bt(q=@6k|(5fH~5{u;z(@E
delta 404
zcmYk1ze~eV5Xaw(X*54x?C+mx)26Le5rUf_{R;$#j&D#(uf|kLOIinA?Cun@Na-M5
zb&>9ZvxAj7NGE5ZAP#~~z7_=UxF5rP?>={_%~Ir%5D78s&(@EgT#~?zyHX2lG+-f+
zhL{FHrXkiVtPcaB5m4RhnAgPNi`5%ES0ZF#5W&xe0z+(L2o87)(<p>!48jnB=)z+V
zhr~dzF^xkKQfw{>+9IbHIb&msrwP!RHVIjpf*jRAq-hozFsKfBnyur;f_8q@y_M$}
zslp!yRq6`OF^nQ(HO{z=wNald<Dz1ob{w<g)XZwTJ(WA%YS*qEI;~dseA#T)!LFK9
zpZBx0H#*>5j+=_3FJZ>2FnSmFIb!^mdu1gjmD%<A>z%%LtW<dQ1?k?sl8=`r#OO&M
zDpD($RRM{l=X>)9y>G=_xjLByHpl)gZ<{<Mb|z|}C%=aEF$#The1v;OA!nDZ`~{eP
BYOw$S
diff --git a/post/post/settings.py b/post/post/settings.py
index 5aa93d4..70687a0 100644
--- a/post/post/settings.py
+++ b/post/post/settings.py
@@ -16,11 +16,11 @@ from pathlib import Path
# Build paths inside the project like this: BASE_DIR / 'subdir'.
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")
MEDIA_URL = '/media/'
-MEDIA_ROOT = os.path.join('media')
+MEDIA_ROOT = os.path.join('/src/media')
# 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)&$@
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
-ALLOWED_HOSTS = ['*']
+ALLOWED_HOSTS = ['*', '0.0.0.0', 'localhost']
# Application definition
@@ -68,7 +68,7 @@ ROOT_URLCONF = 'post.urls'
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
- 'DIRS': [os.path.join('templates'),],
+ 'DIRS': [os.path.join('/src/templates'),],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
@@ -146,7 +146,7 @@ STATIC_URL = '/static/'
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
STATICFILES_FINDERS=[
'django.contrib.staticfiles.finders.FileSystemFinder',
diff --git a/profiles/profiles/__pycache__/settings.cpython-312.pyc b/profiles/profiles/__pycache__/settings.cpython-312.pyc
index a343a80fa0ce5e222621d5eba59d817925824e14..9cca8bf8d4aae59af749c65c7b250ff757bb8a87 100644
GIT binary patch
delta 410
zcmbOzvtEYxG%qg~0}ym>HcneJkyny2Z=-rXqe2STBE~4ebcPgeAT5-_6D15}^8(o-
zDST0)Dg2WIn6&E!Rx^UMGBBhwrf{Z!R0}O)%w$Xvp2L#P7$ue>5+$A@nj)4W4u%pb
zk||Pi*fJTTBvPbPWPs|VQ)I!U9GH~PWK3s?l1xzm>Xk}SjFL`Kijqm;jFJUnxfJCn
z`4p8Xg;d5YuyaASPL5%cmsW+jA&MuJCrT0M1~s57l`5Gu)i+OLvSnmr)h{ke)}Q=<
zS&Y4k3&Q@v>@C53i&3kJ-9QfvZ*k`2Cnx4)<QJE0c4Aq@#9qY*R=N2d+eaXW8^U?W
z>Bq#X1Y%FN;nC!>0XhNX|Kiz`^Lc_;*sm~1Og_q^ETMCmSG|Gj10Mrl5F?OgW8ma%
zV0|Q@JBe4H^Mah-WkLN50)~^#c@Ik3Ugpzm;JzUue}O^x6BCOl(?tg1A}gSg02W4O
AzW@LL
delta 404
zcmZ24Gf{^3G%qg~0}wF%&`4{a$ScX1wNX8vQ6@?-ogsy55o4543U`z+kj(>Ri=^;I
ziKg&PTp&I<mr<mie>EdWCj&z|V+v=A08o+OBF0R{6rnjR>5NfgDZ)|WDIzJNDPmwK
zo+6PVIfpHiF-jsuDn%NoPAWwPOv-{uxlG1%mMF;-d7xgY6on}16vZf+6wWAFAeKu}
zijq%Jj#5Zv%mTX>Wb4E=+#qL2tH7KQ#gobtr3iF}D$uP;l}wsyn`bfEGOF_EmlhZ4
z7Z)Y#Cl(ak;w~;pEXhocFUrp^sbbg9O-;#6)W5|#`4_YI<~Wv>OiZ^pH}kQ71k!Aq
z*|_|ec(stVPmbi#<gx|Y4)S{OtjRq*K`eY%8005E;!&1Rzs#%D!1aNTfiH*=NV73;
z@;0zO5D=Oy%d5{ZBm1(T)&&8b$)UUlB`q%VsWfok5Rt#YApD7mMU?3xgK&{G&`1D2
C(r2^)
diff --git a/profiles/profiles/settings.py b/profiles/profiles/settings.py
index 4c62f70..0ff8c64 100644
--- a/profiles/profiles/settings.py
+++ b/profiles/profiles/settings.py
@@ -16,11 +16,11 @@ from pathlib import Path
# Build paths inside the project like this: BASE_DIR / 'subdir'.
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")
MEDIA_URL = '/media/'
-MEDIA_ROOT = os.path.join('media')
+MEDIA_ROOT = os.path.join('/src/media')
# 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)&$@
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
-ALLOWED_HOSTS = ['*']
+ALLOWED_HOSTS = ['*', '0.0.0.0', 'localhost']
# Application definition
@@ -66,7 +66,7 @@ ROOT_URLCONF = 'profiles.urls'
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
- 'DIRS': [os.path.join('templates'),],
+ 'DIRS': [os.path.join('/src/templates'),],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
@@ -144,7 +144,7 @@ STATIC_URL = '/static/'
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
STATICFILES_FINDERS=[
'django.contrib.staticfiles.finders.FileSystemFinder',
diff --git a/register/register/__pycache__/settings.cpython-312.pyc b/register/register/__pycache__/settings.cpython-312.pyc
index aa69ae853d8cf4ab764806edb5bf98b1d95efcec..c396ce197d2a0c7802cc66be91ba229c374450ce 100644
GIT binary patch
delta 474
zcmXw#zi-n}5XaxSj$J!`PFg#SUFTPmmH;AkX<<R_goKcgI&@%o3yN~Vb=Als$$}Ts
zKcEuP+fWCT2?-YDiNB#sP#B_&@DCtn2A(Z(ckk|`cVFE{_shGg&|6A%B5aTxy?!~R
zE)2i6BWR#L1GW(m%!|5-2D3y@MQ@|YN?4eFEb{@_?~0!xRTB~bYM2T(XAlBfH*x@M
z3vE`$5^iBRa|d1AzEMJ84tiJ-a~@W+T+4Djgg|C)x(*vczl}T0!zQbs#;W4gu*K@Q
z%Nl*S$f&2E3Mq!S_aB29eS_@?j5~t0`Bu8uPCiH{(8~FvVb5RXN8|1|?7bRB(KuH9
zK_A1eAM4pC|GW0WSzE#VSUuR!e5GARz3%0CG#V$*<TsKUo7rUYO*sW+B|m<2bjXeM
zj$(-e#LxMGYV(?AC&BttP+~pZn0(PrrCc+Wan(448GmA&$?6Z{@b^Z`d9a}EiT>Lp
z<{5~p5RFc9KZ_lHYxvr{w!hf$=f#Iyq8+o~E=5??WuYX3pU`Xfcwye1<d=4RPOLwY
NT#~*MYj`YJ{sE8fdPM*L
delta 414
zcmY+AOG^S#6vywmj^gOtX>?}PQS+6(BoT_BMSX(6g`42Es!oXoB}$7{*#~GLche%G
zTm{i0=3}%mY+<g7HZ3D)8(jxlbl!{e=lnQl>Gu?SWGqCaEq%}JEq9p%hYzzykmiv(
z!B7u)6vNz<vnFQ?8MjgIUdP1|wN5AQV5}sh4yd9bmm)oA07fsBI`9~pJdPIH81p=i
z33M(44d4k(VoL5MG40h!uVxxhSGY4ihgqplVveUU&(o;#Ntqce@GMU8+%D{U#NFG8
zF-EHRhrzX7jprrCv}7%u(D@nnimn0ED#z_srQO=8Y&DzW%@?C1zxeU3yW2{W(vj-E
z1ghX~tk{Hza<B|hcQe=oItsW?YL&9mKY3AGgd4G;)fD}iWW~KUm6#o{LMQa86TJqq
z2Z+i#{#PR^KD0{k;$RRd^^FCQV`be)4rN%Gp%EJzme^$H&dNY9cEUp|+b8B1Rc!i1
J%+{)W>MtA4YApZ&
diff --git a/register/register/settings.py b/register/register/settings.py
index ca257eb..cd481da 100644
--- a/register/register/settings.py
+++ b/register/register/settings.py
@@ -16,11 +16,11 @@ from pathlib import Path
# Build paths inside the project like this: BASE_DIR / 'subdir'.
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")
MEDIA_URL = '/media/'
-MEDIA_ROOT = os.path.join('media')
+MEDIA_ROOT = os.path.join('/src/media')
# 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)&$@
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
-ALLOWED_HOSTS = ['*']
+ALLOWED_HOSTS = ['*', '0.0.0.0', 'localhost']
# Application definition
@@ -64,7 +64,7 @@ ROOT_URLCONF = 'register.urls'
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
- 'DIRS': [os.path.join('templates'),],
+ 'DIRS': [os.path.join('/src/templates'),],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
@@ -142,7 +142,7 @@ STATIC_URL = '/static/'
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
STATICFILES_FINDERS=[
'django.contrib.staticfiles.finders.FileSystemFinder',
diff --git a/templates/base.html b/templates/base.html
index c42b8ca..e830139 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -12,7 +12,7 @@
function confirmLogoff() {
var confirmation = confirm("Are you sure you want to log out?");
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>
@@ -24,12 +24,12 @@
<div class="username">{{ username }}</div>
</div>
<div class="navbar-right">
- <a href="http://127.0.0.1:8001/register/welcome">Home</a>
- <a href="http://127.0.0.1:8002/post/feed">Feed</a>
- <a href="http://127.0.0.1:8002/post/newPost">Add Photos</a>
- <a href="http://127.0.0.1:8003/profile">Profile</a>
- <a href="http://127.0.0.1:8000/contact">Contact</a>
- <a href="http://127.0.0.1:8000/about">About Us</a>
+ <a href="http://localhost:8001/register/welcome">Home</a>
+ <a href="http://localhost:8002/post/feed">Feed</a>
+ <a href="http://localhost:8002/post/newPost">Add Photos</a>
+ <a href="http://localhost:8003/profile">Profile</a>
+ <a href="http://localhost:8000/contact">Contact</a>
+ <a href="http://localhost:8000/about">About Us</a>
<a href="#" onclick="confirmLogoff()">Log Off</a>
</div>
</div>
--
GitLab