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

Capstone testing #225

Open
wants to merge 65 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
29445ad
migrations simplified
hellsayenci Oct 4, 2019
e817c4f
Init for jobposting
Oct 4, 2019
e5738c9
Update listening port
Oct 4, 2019
7a90a7c
Fix User type selection
Oct 4, 2019
3cbd54e
add back the jobapps module
yonglinzhong Oct 17, 2019
c4fff64
rename jobapps to employerapps
yonglinzhong Oct 18, 2019
05ef564
rename to positionapps
yonglinzhong Oct 18, 2019
dd47d6c
database changes for positionapps module
yonglinzhong Oct 19, 2019
853c230
fix update position application status api issue
yonglinzhong Oct 26, 2019
11fdd3b
Merge pull request #209 from yonglinzhong/capstone
sakows Oct 27, 2019
07d2dfe
add settings
Oct 27, 2019
05e26fc
Merge branch 'capstone' of https://github.com/job-hax/backend into ca…
Oct 27, 2019
9f86b16
capstone: company table changes
yonglinzhong Nov 1, 2019
2272d12
Merge pull request #210 from yonglinzhong/capstone
yonglinzhong Nov 1, 2019
ce4ab08
Merge branch 'capstone' of https://github.com/job-hax/backend into ca…
Nov 1, 2019
4dc1a56
1. fix company api bug 2. create position api 3. delete position api
yonglinzhong Nov 7, 2019
9c450f4
Merge pull request #212 from yonglinzhong/capstone
sakomws Nov 9, 2019
544be17
Merge branch 'capstone' of https://github.com/job-hax/backend into ca…
Nov 9, 2019
d485608
rearrange the code; add update company position api; add get company …
yonglinzhong Nov 14, 2019
f198d47
add pagination
yonglinzhong Nov 14, 2019
95cd844
Merge pull request #213 from yonglinzhong/capstone
sakomws Nov 14, 2019
39b0444
small changes
yonglinzhong Nov 16, 2019
182e6ec
position migration file
yonglinzhong Nov 16, 2019
93a5475
Merge pull request #214 from yonglinzhong/capstone
yonglinzhong Nov 16, 2019
63c295c
Merge branch 'capstone' of https://github.com/job-hax/backend into ca…
sakows Nov 16, 2019
b40652b
position job title search change
yonglinzhong Nov 19, 2019
8e97ae6
Merge pull request #215 from yonglinzhong/capstone
yonglinzhong Nov 19, 2019
9df623e
Merge branch 'capstone' of https://github.com/job-hax/backend into ca…
sakows Nov 20, 2019
c8c5956
return the position ordering by updated_date
yonglinzhong Nov 21, 2019
44fc569
position department and job type filter changes
yonglinzhong Nov 21, 2019
4e57f93
Merge pull request #216 from yonglinzhong/capstone
sakows Nov 21, 2019
9b6ecb0
Merge branch 'capstone' of https://github.com/job-hax/backend into ca…
sakows Nov 21, 2019
d8e349c
position application database schema changes
yonglinzhong Nov 23, 2019
14f7424
fix dashboard position application notes api
yonglinzhong Nov 23, 2019
425a7e6
Merge pull request #217 from yonglinzhong/capstone
sakomws Nov 24, 2019
47bab60
Merge branch 'capstone' of https://github.com/job-hax/backend into ca…
sakows Nov 25, 2019
76b29c5
create apis for fetch a company and update a company
yonglinzhong Nov 25, 2019
bd14227
position application interview feedback
yonglinzhong Nov 26, 2019
94afafa
Merge pull request #218 from yonglinzhong/capstone
sakomws Nov 26, 2019
edbbdb2
Merge branch 'capstone' of https://github.com/job-hax/backend into ca…
sakows Nov 26, 2019
0864ebf
migration fix
hellsayenci Nov 28, 2019
96fa4d1
Merge branch 'capstone' of https://github.com/job-hax/backend into ca…
sakows Nov 28, 2019
3cf92be
Init cvparser linkedin
sakows Dec 2, 2019
cad4ea6
Add model
sakows Dec 2, 2019
48061d1
add new fields to the company table
yonglinzhong Dec 2, 2019
31df8a9
Merge pull request #219 from yonglinzhong/capstone
sakomws Dec 3, 2019
86c88cb
Update the API
Dec 3, 2019
4cc21d2
Update the API
Dec 3, 2019
fd8a5aa
Update the Url
Dec 3, 2019
058b36d
Update the Url
Dec 3, 2019
87449c8
Add model
Dec 3, 2019
21c4c31
update
sakows Dec 3, 2019
c23c8bb
add ignore files for virtualenv
yonglinzhong Dec 4, 2019
5d436e0
fix cvparser error
yonglinzhong Dec 5, 2019
083fda3
Merge pull request #220 from yonglinzhong/capstone
sakomws Dec 5, 2019
7abf161
resume GET and POST apis' changes
yonglinzhong Dec 5, 2019
3304b5c
Merge pull request #221 from yonglinzhong/capstone
sakomws Dec 5, 2019
abf29b5
create metrics api
yonglinzhong Dec 6, 2019
12a3ca1
Merge branch 'capstone' of https://github.com/job-hax/backend into ca…
yonglinzhong Dec 6, 2019
0eb5189
Merge pull request #222 from yonglinzhong/capstone
sakomws Dec 6, 2019
d615b3f
small changes to metric: add percentage to the response
yonglinzhong Dec 6, 2019
0891015
Merge pull request #223 from yonglinzhong/capstone
sakomws Dec 6, 2019
40aff5a
add "certification" into the response
yonglinzhong Dec 6, 2019
4f78eed
Merge pull request #224 from yonglinzhong/capstone
sakomws Dec 6, 2019
ff6ea2e
Update README.md
sakomws Dec 7, 2019
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
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -476,3 +476,7 @@ code.style.schemes.xml
# Pyre type checker

# End of https://www.gitignore.io/api/pycharm,python,django

# virtualenv
bin
include
22 changes: 10 additions & 12 deletions JH_RestAPI/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,26 +39,21 @@
'django.contrib.messages',
'django.contrib.staticfiles',
'background_task',
'rest_framework', # new
'rest_framework', # new\
'corsheaders',
'oauth2_provider',
'social_django',
'rest_framework_social_oauth2',
'users',
'alumni',
'event',
'major',
'college',
'jobapps',
'metrics',
'blog',
'poll',
'positionapps',
'company',
'position',
'notifications',
'review',
'faq',
'utils',
'cvparser',
]

MIDDLEWARE = [
Expand Down Expand Up @@ -119,8 +114,10 @@
'JH_RestAPI.backends.ModelBackend',
)

SOCIAL_AUTH_LINKEDIN_OAUTH2_KEY = os.environ.get('JOBHAX_LINKEDIN_CLIENT_KEY', '')
SOCIAL_AUTH_LINKEDIN_OAUTH2_SECRET = os.environ.get('JOBHAX_LINKEDIN_CLIENT_SECRET', '')
SOCIAL_AUTH_LINKEDIN_OAUTH2_KEY = os.environ.get(
'JOBHAX_LINKEDIN_CLIENT_KEY', '')
SOCIAL_AUTH_LINKEDIN_OAUTH2_SECRET = os.environ.get(
'JOBHAX_LINKEDIN_CLIENT_SECRET', '')

SOCIAL_AUTH_LINKEDIN_OAUTH2_SCOPE = ['r_emailaddress', 'r_liteprofile']
SOCIAL_AUTH_LINKEDIN_OAUTH2_FIELD_SELECTORS = [
Expand All @@ -129,7 +126,8 @@
if DEBUG:
SOCIAL_AUTH_LOGIN_REDIRECT_URL = 'http://localhost:8080/action-linkedin-oauth2'
else:
SOCIAL_AUTH_LOGIN_REDIRECT_URL = 'https://' + SITE_URL + '/action-linkedin-oauth2'
SOCIAL_AUTH_LOGIN_REDIRECT_URL = 'https://' + \
SITE_URL + '/action-linkedin-oauth2'

SOCIAL_AUTH_PIPELINE = (
'social_core.pipeline.social_auth.social_details',
Expand Down Expand Up @@ -190,7 +188,7 @@
'ENGINE': 'django.db.backends.postgresql',
'NAME': 'jobhaxdb',
'USER': 'jobhaxdbuser',
'PASSWORD': '123456',
'PASSWORD': 'Proddb1234#',
'HOST': 'localhost'
}
}
Expand Down
12 changes: 4 additions & 8 deletions JH_RestAPI/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,18 @@
urlpatterns = [
path('admin/', admin.site.urls),
path('api/users/', include('users.urls')),
path('api/jobapps/', include('jobapps.urls')),
path('api/metrics/', include('metrics.urls')),
path('api/polls/', include('poll.urls')),
path('api/positionapps/', include('positionapps.urls')),
path('api/faqs/', include('faq.urls')),
path('api/blogs/', include('blog.urls')),
path('api/notifications/', include('notifications.urls')),
path('api/companies/', include('company.urls')),
path('api/events/', include('event.urls')),
path('api/colleges/', include('college.urls')),
path('api/majors/', include('major.urls')),
path('api/alumni/', include('alumni.urls')),
path('api/positions/', include('position.urls')),
path('api/reviews/', include('review.urls')),
path('api/parser/', include('cvparser.urls')),
path('api/', include('utils.urls')),
re_path(r'^auth/', include('rest_framework_social_oauth2.urls')),
]

if settings.DEBUG:
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
urlpatterns += static(settings.MEDIA_URL,
document_root=settings.MEDIA_ROOT)
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
### Quickstart
![JobHax Website](https://img.shields.io/website?label=jobposting-be.jobhax.com/admin&up_message=Up%20and%20Running&url=https%3A%2F%2Fjobposting.jobhax.com)
![Alt text](https://img.shields.io/github/issues-raw/job-hax/backend.svg)
![GitHub commit activity](https://img.shields.io/github/commit-activity/w/job-hax/backend.svg?style=plastic)
![GitHub contributors](https://img.shields.io/github/contributors/job-hax/backend.svg)
Expand Down Expand Up @@ -42,7 +43,7 @@ export JOBHAX_LINKEDIN_CLIENT_SECRET=/*linkedin application client_secret*/ #to

7. To use Rest API you need to create oauth2 credentials.
```
- Under http://localhost:8000/admin/oauth2_provider/application/ click 'ADD APPLICATION'
- Under http://localhost:8001/admin/oauth2_provider/application/ click 'ADD APPLICATION'

- Do not change 'client_id' & 'client_secret' (They will be used for generate access token to use in your requests header)

Expand Down
1 change: 0 additions & 1 deletion alumni/admin.py

This file was deleted.

5 changes: 0 additions & 5 deletions alumni/apps.py

This file was deleted.

1 change: 0 additions & 1 deletion alumni/models.py

This file was deleted.

30 changes: 0 additions & 30 deletions alumni/serializers.py

This file was deleted.

15 changes: 0 additions & 15 deletions alumni/urls.py

This file was deleted.

111 changes: 0 additions & 111 deletions alumni/views.py

This file was deleted.

10 changes: 0 additions & 10 deletions blog/admin.py

This file was deleted.

5 changes: 0 additions & 5 deletions blog/apps.py

This file was deleted.

23 changes: 0 additions & 23 deletions blog/migrations/0001_initial.py

This file was deleted.

27 changes: 0 additions & 27 deletions blog/migrations/0002_auto_20190422_2110.py

This file was deleted.

27 changes: 0 additions & 27 deletions blog/migrations/0003_auto_20190423_1935.py

This file was deleted.

Loading