Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #41

Merged
merged 51 commits into from
Aug 7, 2024
Merged

Dev #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
2424aa3
made post model and almost done api
xamrm3 Jun 6, 2024
bf4ead3
Signup/login service complete (#2)
AntonioFerreras Jun 11, 2024
b060b64
Feature view posts page (#4)
suhanip1 Jun 11, 2024
58e9735
Feature create post (#3)
xamrm3 Jun 11, 2024
cd73dd3
Feature home (#5)
JoyceAng Jun 12, 2024
19f0cd7
Feature sprint1 final (#6)
xamrm3 Jun 14, 2024
3c782f6
Merge main to dev to fix tree (#9)
AntonioFerreras Jun 26, 2024
db62b01
SCRUM-5/13 Feature profiles (#11)
AntonioFerreras Jul 2, 2024
37820ed
Feature ratings reviews (#13)
xamrm3 Jul 4, 2024
057c2a2
Feature filtering and searching (#14)
suhanip1 Jul 4, 2024
59afea4
SCRUM-15 and accounts API documentation (#15)
AntonioFerreras Jul 4, 2024
f51b3b0
minor changes to fix an error
JoyceAng Jul 5, 2024
6d74441
Feature accounts worldcitites api doc (#16)
xamrm3 Jul 5, 2024
df7ff75
Finished sprint 2 and resolved conflicts
suhanip1 Jul 5, 2024
40c572f
fixed merge conflicts
xamrm3 Jul 5, 2024
942105b
fixed merge conflicts
xamrm3 Jul 5, 2024
038fbfe
update dev (#18)
JoyceAng Jul 12, 2024
c34d22e
fixed problems in dev
xamrm3 Jul 12, 2024
7c1e867
Feature filter by ratings (#19)
JoyceAng Jul 17, 2024
707e19e
Feature update homepage (#22)
JoyceAng Jul 18, 2024
a2dd5f8
Feature update homepage (#23)
JoyceAng Jul 18, 2024
02be0b3
SCRUM-61 fixed minor issues that occured after merge
JoyceAng Jul 18, 2024
3924dd7
Feature suggest posts (#25)
suhanip1 Jul 19, 2024
bbe74eb
updated api.md
JoyceAng Jul 19, 2024
ccf434e
SCRUM-13 Update profile functionality (#20)
AntonioFerreras Jul 19, 2024
488d624
Feature chat (#26)
xamrm3 Jul 19, 2024
9309d76
fixed minor bug from merge
JoyceAng Jul 19, 2024
6698ed5
added profile pictures to chat
xamrm3 Jul 19, 2024
be46337
Feature get offer list (#27)
JoyceAng Jul 19, 2024
5846c84
sprint 3 - merge dev into main, fixed merge conflicts
JoyceAng Jul 19, 2024
8aad1c9
removed unneeded files
xamrm3 Jul 19, 2024
388267f
fixed create user error
xamrm3 Jul 20, 2024
a05bc12
fixed merge conflict
xamrm3 Jul 20, 2024
b19c5a9
main to dev to keep them in sync (#29)
JoyceAng Jul 21, 2024
bae293f
Merge branch 'dev' of https://github.com/UofT-UTSC-CS-sandbox/final-t…
xamrm3 Jul 24, 2024
2efbc90
Feature chat notification (#31)
xamrm3 Jul 26, 2024
e5f4655
Feature listing status (#30)
xamrm3 Jul 26, 2024
39574e5
Feature posts images (#33)
AntonioFerreras Jul 26, 2024
8be1169
Feature save posts (#35)
AntonioFerreras Jul 26, 2024
5dd9f56
SCRUM-71 created a post page that displays all the information about …
JoyceAng Jul 27, 2024
339e5c2
SCRUM 74 finished redirection to post page (#37)
suhanip1 Jul 29, 2024
9498434
fixed merge conflicts
xamrm3 Jul 29, 2024
cbe5e2a
Merge branch 'dev' of https://github.com/UofT-UTSC-CS-sandbox/final-t…
xamrm3 Jul 29, 2024
4790eff
fixed checks to force new users to make a profile
xamrm3 Jul 29, 2024
6671f4c
fixed minor error
JoyceAng Jul 30, 2024
1961b6b
fixed filter by location front end
xamrm3 Jul 31, 2024
caee6b5
Merge branch 'dev' of https://github.com/UofT-UTSC-CS-sandbox/final-t…
xamrm3 Jul 31, 2024
8ab8857
sprint 4 docs added
xamrm3 Jul 31, 2024
35644fb
SCRUM 72 updated the save post button
JoyceAng Aug 2, 2024
d5762b7
Deploy (#40)
xamrm3 Aug 7, 2024
027fd24
Merge branch 'main' into dev
xamrm3 Aug 7, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added CICD/Docker Hub.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added CICD/System Design.pdf
Binary file not shown.
Binary file added CICD/Workflow.pdf
Binary file not shown.
18 changes: 18 additions & 0 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FROM python:3.9

ENV PYTHONDONTWRITEBYTECODE 1
ENV PYTHONUNBUFFERED 1

WORKDIR /app

RUN apt-get update && apt-get install -y gcc

COPY requirements.txt /app/
RUN pip install --upgrade pip
RUN pip install -r requirements.txt

COPY . /app/

EXPOSE 8000

CMD ["sh", "-c", "python manage.py migrate && python manage.py populate_worldcities && python manage.py runserver 0.0.0.0:8000"]
6 changes: 3 additions & 3 deletions backend/backend/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
EMAIL_PORT = 587
EMAIL_USE_TLS = True
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
CELERY_BROKER_URL = 'redis://localhost:6379/0'
CELERY_RESULT_BACKEND = 'redis://localhost:6379/0'
CELERY_BROKER_URL = 'redis://redis:6379/0'
CELERY_RESULT_BACKEND = 'redis://redis:6379/0'
CELERY_ACCEPT_CONTENT = ['json']
CELERY_TASK_SERIALIZER = 'json'
CELERY_RESULT_SERIALIZER = 'json'
Expand All @@ -49,7 +49,7 @@
},
}

ALLOWED_HOSTS = ['localhost', '127.0.0.1']
ALLOWED_HOSTS = ['localhost', '127.0.0.1', 'talenttrade-backend.onrender.com']

CORS_ORIGIN_ALLOW_ALL = True

Expand Down
23 changes: 23 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
services:
frontend:
build:
context: ./frontend
container_name: frontend
ports:
- '5173:5173'
depends_on:
- backend

backend:
build:
context: ./backend
container_name: backend
ports:
- '8000:8000'

# redis:
# container_name: redis
# image: redis:latest
# restart: always
# ports:
# - '6379:6379'
12 changes: 12 additions & 0 deletions frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
FROM node:latest

WORKDIR /app

COPY package.json .
RUN npm install

COPY . .

EXPOSE 5173

CMD ["npm", "run", "dev", "--", "--host"]
Loading
Loading