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

Add drf opportunities #266

Merged
merged 48 commits into from
Oct 11, 2022
Merged
Show file tree
Hide file tree
Changes from 47 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
200d48a
initial commit of docker setup for staging env
Apr 29, 2022
2d64fca
modified to use entrypoint and disable Django Debug mode
Apr 29, 2022
d4b0264
add trailing newline
Apr 29, 2022
f6669c2
add another trailing newline
Apr 29, 2022
11c7182
remove line to appease linter
Apr 29, 2022
4e22142
more linter stuff
Apr 29, 2022
5d98aae
final linting change?
Apr 29, 2022
6ac40c4
disable a linter rule linline, split requirements.txt for staging, ad…
Apr 30, 2022
036c399
linting inline rule
Apr 30, 2022
633be02
merge
May 11, 2022
4577bbc
Merge branch 'hackforla-main'
May 11, 2022
2942f4e
point to stage requirements.txt file for stage Dockerfile
May 17, 2022
7a9d202
Update app/config/settings.py
Aveline-art May 17, 2022
36e7d3f
Fix compose stage (#254)
Enzyme3 May 17, 2022
9a243c7
Merge branch 'hackforla:main' into main
Enzyme3 May 18, 2022
827f806
Merge pull request #2 from Enzyme3/fix-compose-stage
Enzyme3 May 18, 2022
2a29f04
add pre-commit and linters/formatters for python(mostly)
May 19, 2022
298d097
add README for django app piece
May 20, 2022
5f99def
refactored to move all dependencies into contianer and migrated new i…
May 22, 2022
e76ef3f
pin node version to 18
May 22, 2022
46a9cc6
fix hadolint errors plus updated developer readme on how to run it lo…
May 22, 2022
c08f1fe
consolidate RUN commands per hadolint
May 22, 2022
ddf90a2
remove reference to .venv
May 22, 2022
a50306d
move .env file to under ./dev folder
Jun 4, 2022
ca9af37
rename env file
Jun 4, 2022
db93ac7
Merge pull request #3 from Enzyme3/add-pre-commit-for-python-linter-a…
Enzyme3 Jun 4, 2022
7a47b59
Added testing framework (#232)
Aveline-art May 5, 2022
014fe89
Added accessibility tests and tools (#240)
Aveline-art May 8, 2022
5e8f0f9
migrated codebase and dependencies to React18 (#242)
Aveline-art May 10, 2022
0640da5
Added new landing bg image and fixed bug (#246)
Aveline-art May 11, 2022
45fb248
Build accessibility text into inline svgs (#247)
Aveline-art May 12, 2022
7415f8c
Created checkbox component (#260)
Aveline-art May 21, 2022
064bad1
Completed textfield component (#262)
Aveline-art Jun 4, 2022
447efb9
initial commit of docker setup for staging env
Apr 29, 2022
e471cb5
modified to use entrypoint and disable Django Debug mode
Apr 29, 2022
7ff2f23
more linter stuff
Apr 29, 2022
9697fd4
final linting change?
Apr 29, 2022
e42d41f
disable a linter rule linline, split requirements.txt for staging, ad…
Apr 30, 2022
34a9827
Update app/config/settings.py
Aveline-art May 17, 2022
d523318
add pre-commit and linters/formatters for python(mostly)
May 19, 2022
4184e58
add README for django app piece
May 20, 2022
6e4734b
refactored to move all dependencies into contianer and migrated new i…
May 22, 2022
79d8ba0
fix hadolint errors plus updated developer readme on how to run it lo…
May 22, 2022
96837d0
move .env file to under ./dev folder
Jun 4, 2022
651e83d
rename env file
Jun 4, 2022
a6281ab
add /opportunities endpoint
Jun 16, 2022
d97fe9e
Merge branch 'dev-branch-1' into add-drf-opportunities
Enzyme3 Jun 16, 2022
383c11b
fixed merge error and added --ignore-installed to linter dockerfile
Sep 23, 2022
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
18 changes: 9 additions & 9 deletions app/config/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@
"frontend",
]

COMMON_MIDDLEWARE = [
"django.middleware.security.SecurityMiddleware",
"django.contrib.sessions.middleware.SessionMiddleware",
"django.middleware.common.CommonMiddleware",
"django.middleware.csrf.CsrfViewMiddleware",
"django.contrib.auth.middleware.AuthenticationMiddleware",
"django.contrib.messages.middleware.MessageMiddleware",
"django.middleware.clickjacking.XFrameOptionsMiddleware",
]

MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change broke the Django server.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry, looks like the ] somehow got dropped. Added it, and re-ran the linter which also changed the single quotes


DEV_MIDDLEWARE = []

Expand Down
17 changes: 1 addition & 16 deletions app/config/urls.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,8 @@
"""config URL Configuration

The `urlpatterns` list routes URLs to views. For more information please see:
https://docs.djangoproject.com/en/3.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 include, path

urlpatterns = [
path("admin/", admin.site.urls),
# path('server/', include('server.urls')),
path("api/", include("server.urls")),
path("", include("frontend.urls")),
]
2 changes: 2 additions & 0 deletions app/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ Django==4.0.4
djangorestframework==3.13.1
psycopg2-binary==2.9.3
pytz==2022.1
PyYAML==6.0
requests==2.28.0
sqlparse==0.4.2
221 changes: 221 additions & 0 deletions app/server/fixtures/test_data.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,221 @@
# Skill
- model: server.Skill
pk: 92df2b94-ed1e-44cc-a664-4f80149c39f0
fields:
name: Python
- model: server.Skill
pk: c56a5f44-fcbf-45e9-a14e-e2d672fc7080
fields:
name: Django
- model: server.Skill
pk: f4be9666-4736-4fba-bf0a-7ef1d76eaca5
fields:
name: Javascript

# Role
- model: server.Role
pk: 36a18961-101e-4808-8f7d-24f143fcbb27
fields:
name: All
- model: server.Role
pk: eb4ca87e-a8d0-4118-b4c2-22b8eb5d86c2
fields:
name: Backend Developer
- model: server.Role
pk: 6e8711bf-6e24-4e6c-b2c2-e542e8616324
fields:
name: Frontend Developer
- model: server.Role
pk: 8ab6bd23-3e55-436a-b678-2f9649487cd5
fields:
name: UI/UX Designer

# Project
- model: server.Project
pk: e080d5be-52d8-4dd4-aff5-8ac5f5d21c84
fields:
name: CivicTechJobs
description: CivicTechJobs helps technology practitioners interested in having civic impact to find job opportunities from a central hub of listings
- model: server.Project
pk: e1598001-c891-4a85-970a-12b968ea57fe
fields:
name: VRMS
description: VRMS is a tool used for the engagement, support, and retention of a network of volunteers
- model: server.Project
pk: 300278d0-65aa-40e8-be01-2a61f1ff18d8
fields:
name: Hackforla.org
description: The hackforla.org website is our organization's way of communicating with new volunteers, stakeholders, and donors

# Recurring Event
- model: server.RecurringEvent
pk: 03aa9408-75c7-45f4-8e57-0b870bf428ec
fields:
name: CivicTechJobs Weekly All Hands
day_of_week: Wednesday
start_time: "17:00:00"
duration_in_minutes: 60
project: e080d5be-52d8-4dd4-aff5-8ac5f5d21c84
- model: server.RecurringEvent
pk: 2d641abe-438f-4005-9233-998d5d1b3f6f
fields:
name: CivicTechJobs Developer Meeting
day_of_week: Wednesday
start_time: "18:00:00"
duration_in_minutes: 30
project: e080d5be-52d8-4dd4-aff5-8ac5f5d21c84
- model: server.RecurringEvent
pk: 0ae12430-27ca-4864-be69-ae105f404558
fields:
name: CivicTechJobs UI/UX Meeting
day_of_week: Wednesday
start_time: "18:00:00"
duration_in_minutes: 45
project: e080d5be-52d8-4dd4-aff5-8ac5f5d21c84
- model: server.RecurringEvent
pk: 3e967708-bfe7-4c43-b46b-758420f3c8cf
fields:
name: VRMS Weekly Meeting
day_of_week: Monday
start_time: "16:00:00"
duration_in_minutes: 60
project: e1598001-c891-4a85-970a-12b968ea57fe
- model: server.RecurringEvent
pk: edee3c55-d1dd-45db-999e-99252d4994e0
fields:
name: Hackforla.org Weekly Meeting
day_of_week: Tuesday
start_time: "17:00:00"
duration_in_minutes: 45
project: 300278d0-65aa-40e8-be01-2a61f1ff18d8
- model: server.RecurringEvent
pk: 94b0d02f-5170-4950-890f-6d6e30fa17b2
fields:
name: Hackforla.org Deverloper Sync
day_of_week: Tuesday
start_time: "17:00:00"
duration_in_minutes: 15
project: 300278d0-65aa-40e8-be01-2a61f1ff18d8

# Role for Recurring Event
- model: server.RoleXRecurringEvent
fields:
role: 36a18961-101e-4808-8f7d-24f143fcbb27
recurring_event: 03aa9408-75c7-45f4-8e57-0b870bf428ec
- model: server.RoleXRecurringEvent
fields:
role: eb4ca87e-a8d0-4118-b4c2-22b8eb5d86c2
recurring_event: 2d641abe-438f-4005-9233-998d5d1b3f6f
- model: server.RoleXRecurringEvent
fields:
role: 6e8711bf-6e24-4e6c-b2c2-e542e8616324
recurring_event: 2d641abe-438f-4005-9233-998d5d1b3f6f
- model: server.RoleXRecurringEvent
fields:
role: 8ab6bd23-3e55-436a-b678-2f9649487cd5
recurring_event: 0ae12430-27ca-4864-be69-ae105f404558
- model: server.RoleXRecurringEvent
fields:
role: 36a18961-101e-4808-8f7d-24f143fcbb27
recurring_event: 3e967708-bfe7-4c43-b46b-758420f3c8cf
- model: server.RoleXRecurringEvent
fields:
role: 36a18961-101e-4808-8f7d-24f143fcbb27
recurring_event: edee3c55-d1dd-45db-999e-99252d4994e0
- model: server.RoleXRecurringEvent
fields:
role: eb4ca87e-a8d0-4118-b4c2-22b8eb5d86c2
recurring_event: 94b0d02f-5170-4950-890f-6d6e30fa17b2
- model: server.RoleXRecurringEvent
fields:
role: 6e8711bf-6e24-4e6c-b2c2-e542e8616324
recurring_event: 94b0d02f-5170-4950-890f-6d6e30fa17b2

# Opportunity
- model: server.Opportunity
pk: 1ad0916e-89f2-40d7-8d5a-1713a812a32b
fields:
project: e080d5be-52d8-4dd4-aff5-8ac5f5d21c84
role: eb4ca87e-a8d0-4118-b4c2-22b8eb5d86c2
experience_level: Trained
title: Backend developer needed for super fun oppp!
description: come build some backends with us in django
poster: [email protected]
hours_per_week: 8
num_positions_available: 2
posted_date: 2022-05-12
- model: server.Opportunity
pk: f5369dca-9f5c-44dd-9c13-bcc181226c07
fields:
project: e080d5be-52d8-4dd4-aff5-8ac5f5d21c84
role: 6e8711bf-6e24-4e6c-b2c2-e542e8616324
experience_level: Experienced
title: Frontend developer needed to jazz up our website
description: come make our website look nice!!
poster: [email protected]
hours_per_week: 16
num_positions_available: 3
posted_date: 2022-05-12
- model: server.Opportunity
pk: 95d4c490-ee43-4fcc-a7c6-79e45ea918ec
fields:
project: e080d5be-52d8-4dd4-aff5-8ac5f5d21c84
role: 8ab6bd23-3e55-436a-b678-2f9649487cd5
experience_level: Learning
title: Looking for UI/UX Designers
description: Help us create great user experiences!!
poster: [email protected]
hours_per_week: 8
num_positions_available: 1
posted_date: 2022-05-12
- model: server.Opportunity
pk: 10923df3-7afc-4201-aa04-ea17b9db25ef
fields:
project: 300278d0-65aa-40e8-be01-2a61f1ff18d8
role: 8ab6bd23-3e55-436a-b678-2f9649487cd5
experience_level: Learning
title: UI/UX Designers for Hackforla.org Website
description: If you're interested in making our site even more beautiful, reach out!!
poster: [email protected]
hours_per_week: 10
num_positions_available: 3
posted_date: 2022-06-12
- model: server.Opportunity
pk: cf009c34-611a-4d43-ae41-a789403946de
fields:
project: e1598001-c891-4a85-970a-12b968ea57fe
role: eb4ca87e-a8d0-4118-b4c2-22b8eb5d86c2
experience_level: Trained
title: Python and Django developers needed
description: Help us add more functionality to our backends
poster: [email protected]
hours_per_week: 10
num_positions_available: 3
posted_date: 2022-06-12

# Skill for Opportunity
- model: server.OpportunityXSkill
fields:
opportunity: 1ad0916e-89f2-40d7-8d5a-1713a812a32b
skill: 92df2b94-ed1e-44cc-a664-4f80149c39f0
is_required: true
- model: server.OpportunityXSkill
fields:
opportunity: 1ad0916e-89f2-40d7-8d5a-1713a812a32b
skill: c56a5f44-fcbf-45e9-a14e-e2d672fc7080
is_required: false
- model: server.OpportunityXSkill
fields:
opportunity: f5369dca-9f5c-44dd-9c13-bcc181226c07
skill: f4be9666-4736-4fba-bf0a-7ef1d76eaca5
is_required: true
- model: server.OpportunityXSkill
fields:
opportunity: cf009c34-611a-4d43-ae41-a789403946de
skill: 92df2b94-ed1e-44cc-a664-4f80149c39f0
is_required: true
- model: server.OpportunityXSkill
fields:
opportunity: cf009c34-611a-4d43-ae41-a789403946de
skill: c56a5f44-fcbf-45e9-a14e-e2d672fc7080
is_required: true
Loading