Skip to content

Commit 9dce3c8

Browse files
ethanandrewsethanandrews
committed
update site title, add filter for Intl Travel
1 parent b2d2f55 commit 9dce3c8

File tree

154 files changed

+624
-314
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+624
-314
lines changed

‎api/skills_matcher_db/experts/api/views.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,13 @@
99

1010
class ExpertFilter(filters.FilterSet):
1111
q = filters.CharFilter(method="multi_field_query", label="Search")
12+
international_travel = filters.BooleanFilter(
13+
field_name="expert_profile__international_travel"
14+
)
1215

1316
class Meta:
1417
model = Expert
15-
fields = ["q"]
18+
fields = ["q", "international_travel"]
1619

1720
def multi_field_query(self, queryset, name, value):
1821
return Expert.objects.filter(

‎api/skills_matcher_db/templates/base.html

+6-8
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
88
<meta
99
name="description"
10-
content="Django backend for AVAST Skills Matcher app"
10+
content="Django backend for WHOI Skills Matcher app"
1111
/>
1212
<meta name="author" content="Ethan Andrews" />
1313

@@ -33,8 +33,8 @@
3333
{% endblock %}
3434
<!-- Le javascript
3535
================================================== -->
36-
{# Placed at the top of the document so pages load faster with defer #}
37-
{% block javascript %}
36+
{# Placed at the top of the document so pages load faster with defer #} {%
37+
block javascript %}
3838
<!-- Bootstrap JS and its dependencies-->
3939
<script
4040
defer
@@ -103,10 +103,8 @@
103103
</div>
104104
<!-- /container -->
105105

106-
{% block modal %}{% endblock modal %}
107-
108-
{% block inline_javascript %}
109-
{# Script tags with only code, no src (defer by default) #}
110-
{% endblock inline_javascript %}
106+
{% block modal %}{% endblock modal %} {% block inline_javascript %} {#
107+
Script tags with only code, no src (defer by default) #} {% endblock
108+
inline_javascript %}
111109
</body>
112110
</html>

‎api/skills_matcher_db/templates/pages/home.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% extends "base.html" %} {% block content %}
2-
<p>Welcome to the AVAST Skills Matcher backend API admin site.</p>
2+
<p>Welcome to the WHOI Skills Matcher backend API admin site.</p>
33

44
{% if not request.user.is_authenticated %}
55
<p>If you're a registered admin user, login with your WHOI credentials</p>

‎api/skills_matcher_db/templates/templated_email/expert_request.email

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
{% block subject %}AVAST Skills Matcher - Request for Assistance{% endblock %}
1+
{% block subject %}WHOI Skills Matcher DB - Request for Assistance{% endblock %}
22
{% block plain %}
33
Hi {{expert_name}},
44

5-
The following WHOI community member has requested your assistance from the AVAST Skills Matcher site:
5+
The following WHOI community member has requested your assistance from the WHOI Skills Matcher DB site:
66
{{requester_name}} ({{requester_email}})
77

88
{{ message }}
@@ -12,13 +12,13 @@
1212

1313
To decline, please click here:: https://skillsdb.whoi.edu/engagements/{{engagement_id}}?response=DECLINED
1414

15-
Thanks from AVAST!
15+
Thanks from the WHOI Skills Matcher DB!
1616
{% endblock %}
1717

1818
{% block html %}
1919
<p>Hi {{expert_name}},</p>
2020

21-
<p>The following WHOI community member has requested your assistance from the AVAST Skills Matcher site:
21+
<p>The following WHOI community member has requested your assistance from the WHOI Skills Matcher DB site:
2222
<ul>
2323
<li>{{requester_name}}</li>
2424
</ul>
@@ -43,5 +43,5 @@
4343

4444
<p><a href="https://skillsdb.whoi.edu/engagements/{{engagement_id}}?response=DECLINED">No thanks.</a></p>
4545

46-
<p>Thanks from AVAST!</p>
46+
<p>Thanks from WHOI Skills Matcher DB!</p>
4747
{% endblock %}

‎api/skills_matcher_db/templates/templated_email/expert_request_receipt.email

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% block subject %}AVAST Skills Matcher - Your Request for Assistance{% endblock %}
1+
{% block subject %}WHOI Skills Matcher DB - Your Request for Assistance{% endblock %}
22
{% block plain %}
33
Hi {{requester_name}},
44

@@ -7,7 +7,7 @@
77

88
We will notify you when they accept or decline your request.
99

10-
Thanks from AVAST!
10+
Thanks from the WHOI Skills Matcher DB!
1111
{% endblock %}
1212

1313
{% block html %}
@@ -21,5 +21,5 @@
2121

2222
<p>We will notify you when they accept or decline your request.</p>
2323

24-
<p>Thanks from AVAST!</p>
24+
<p>Thanks from the WHOI Skills Matcher DB!</p>
2525
{% endblock %}

‎api/skills_matcher_db/templates/templated_email/project_request.email

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% block subject %}AVAST Skills Matcher - Request to Assist Your Project{% endblock %}
1+
{% block subject %}WHOI Skills Matcher DB - Request to Assist Your Project{% endblock %}
22
{% block plain %}
33
Hi {{project_owner}},
44

@@ -12,7 +12,7 @@
1212

1313
To decline, please click here:: https://skillsdb.whoi.edu/engagements/{{engagement_id}}?response=DECLINED
1414

15-
Thanks from AVAST!
15+
Thanks from the WHOI Skills Matcher DB!
1616
{% endblock %}
1717

1818
{% block html %}
@@ -37,5 +37,5 @@
3737

3838
<p><a href="https://skillsdb.whoi.edu/engagements/{{engagement_id}}?response=DECLINED">No thanks.</a></p>
3939

40-
<p>Thanks from AVAST!</p>
40+
<p>Thanks from the WHOI Skills Matcher DB!</p>
4141
{% endblock %}

‎api/skills_matcher_db/templates/templated_email/project_request_receipt.email

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% block subject %}AVAST Skills Matcher - Your Request to Assist a Project{% endblock %}
1+
{% block subject %}WHOI Skills Matcher DB - Your Request to Assist a Project{% endblock %}
22
{% block plain %}
33
Hi {{requester_name}},
44

@@ -7,7 +7,7 @@
77

88
We will notify you when they accept or decline your request.
99

10-
Thanks from AVAST!
10+
Thanks from WHOI Skills Matcher DB!
1111
{% endblock %}
1212

1313
{% block html %}
@@ -21,5 +21,5 @@
2121

2222
<p>We will notify you when they accept or decline your request.</p>
2323

24-
<p>Thanks from AVAST!</p>
24+
<p>Thanks from WHOI Skills Matcher DB!</p>
2525
{% endblock %}

‎api/skills_matcher_db/templates/templated_email/response_accept.email

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% block subject %}AVAST Skills Matcher - Response from {{receiver_name}}{% endblock %}
1+
{% block subject %}WHOI Skills Matcher DB - Response from {{receiver_name}}{% endblock %}
22
{% block plain %}
33
Hi {{requester_name}},
44

@@ -7,7 +7,7 @@
77
You can now contact them directly at {{receiver_email}} and get started working together,
88
they'll be expecting your message.
99

10-
Thanks for using the AVAST Skills Matcher!
10+
Thanks for using the WHOI Skills Matcher DB!
1111
{% endblock %}
1212

1313
{% block html %}
@@ -18,5 +18,5 @@
1818
<p>You can now contact them directly at <a href="mailto:{{receiver_email}}">{{receiver_email}}</a> and get started working together,
1919
they'll be expecting your message.</p>
2020

21-
<p>Thanks for using the AVAST Skills Matcher!</p>
21+
<p>Thanks for using the WHOI Skills Matcher DB!</p>
2222
{% endblock %}

‎api/skills_matcher_db/templates/templated_email/response_decline.email

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
{% block subject %}AVAST Skills Matcher - Response from {{receiver_name}}{% endblock %}
1+
{% block subject %}WHOI Skills Matcher DB - Response from {{receiver_name}}{% endblock %}
22
{% block plain %}
33
Hi {{requester_name}},
44

55
Your request for assistance has been DECLINED by {{receiver_name}} at this time.
66

7-
If you'd like to contact another SME or Project, please search the AVAST Skills Matcher again.
7+
If you'd like to contact another SME or Project, please search the WHOI Skills Matcher DB again.
88

99
https://skillsdb.whoi.edu
1010

11-
Thanks from AVAST!
11+
Thanks from the WHOI Skills Matcher DB!
1212
{% endblock %}
1313

1414
{% block html %}
@@ -17,7 +17,7 @@
1717
<p>Your request for assistance has been DECLINED by {{receiver_name}} at this time.</p>
1818

1919
<p>If you'd like to contact another SME or Project, please search the
20-
<a href="https://skillsdb.whoi.edu/">AVAST Skills Matcher</a> again.</p>
20+
<a href="https://skillsdb.whoi.edu/">WHOI Skills Matcher DB</a> again.</p>
2121

22-
<p>Thanks from AVAST!</p>
22+
<p>Thanks from the WHOI Skills Matcher DB!</p>
2323
{% endblock %}

‎api/skills_matcher_db/templates/templated_email/supervisor_expert_request.email

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
{% block subject %}AVAST Skills Matcher - Request for Assistance - Supervisor Copy{% endblock %}
1+
{% block subject %}WHOI Skills Matcher DB - Request for Assistance - Supervisor Copy{% endblock %}
22
{% block plain %}
3-
Hello from AVAST,
3+
Hello from the WHOI Skills Matcher DB,
44

5-
Your supervisee {{expert_name}} has been contacted through the AVAST Skills Matcher site.
5+
Your supervisee {{expert_name}} has been contacted through the WHOI Skills Matcher DB site.
66

77
The following WHOI community member has requested their assistance:
88
{{requester_name}} ({{requester_email}})
99

1010
Message: {{ message }}
1111

12-
Thanks from AVAST!
12+
Thanks from the WHOI Skills Matcher DB!
1313
{% endblock %}
1414

1515
{% block html %}
16-
<p>Hello from AVAST</p>
16+
<p>Hello from the WHOI Skills Matcher DB</p>
1717

18-
<p>Your supervisee {{expert_name}} has been contacted through the AVAST Skills Matcher site.</p>
18+
<p>Your supervisee {{expert_name}} has been contacted through the WHOI Skills Matcher DB site.</p>
1919

2020
<p>The following WHOI community member has requested their assistance:
2121
<ul>
@@ -34,5 +34,5 @@
3434

3535
<p>Message: {{ message }}</p>
3636

37-
<p>Thanks from AVAST!</p>
37+
<p>Thanks from the WHOI Skills Matcher DB!</p>
3838
{% endblock %}

‎frontend/.next/BUILD_ID

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
E_gHKWcvO-q20ij9uc0AO
1+
X2ruCArDxmmXb7yIAIZVs

‎frontend/.next/build-manifest.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"devFiles": [],
66
"ampDevFiles": [],
77
"lowPriorityFiles": [
8-
"static/E_gHKWcvO-q20ij9uc0AO/_buildManifest.js",
9-
"static/E_gHKWcvO-q20ij9uc0AO/_ssgManifest.js"
8+
"static/X2ruCArDxmmXb7yIAIZVs/_buildManifest.js",
9+
"static/X2ruCArDxmmXb7yIAIZVs/_ssgManifest.js"
1010
],
1111
"rootMainFiles": [],
1212
"pages": {
@@ -18,13 +18,13 @@
1818
"static/chunks/886-e4879987013f6af0.js",
1919
"static/chunks/645-991870f459f4213b.js",
2020
"static/chunks/399-94cf0f963fdccc14.js",
21-
"static/chunks/pages/index-d67d178b74c1ae55.js"
21+
"static/chunks/pages/index-af91e38bf5d9047a.js"
2222
],
2323
"/_app": [
2424
"static/chunks/webpack-fd1bc4a65a80e5c8.js",
2525
"static/chunks/framework-5f4595e5518b5600.js",
2626
"static/chunks/main-2a21a6fdfb46aa01.js",
27-
"static/chunks/pages/_app-14c5516747039d84.js"
27+
"static/chunks/pages/_app-f3bf52c2180f43f1.js"
2828
],
2929
"/_error": [
3030
"static/chunks/webpack-fd1bc4a65a80e5c8.js",
@@ -36,7 +36,7 @@
3636
"static/chunks/webpack-fd1bc4a65a80e5c8.js",
3737
"static/chunks/framework-5f4595e5518b5600.js",
3838
"static/chunks/main-2a21a6fdfb46aa01.js",
39-
"static/chunks/pages/about-63fd6fe453938bcc.js"
39+
"static/chunks/pages/about-85271fa4a7767437.js"
4040
],
4141
"/engagements/[pid]": [
4242
"static/chunks/webpack-fd1bc4a65a80e5c8.js",
@@ -50,7 +50,7 @@
5050
"static/chunks/main-2a21a6fdfb46aa01.js",
5151
"static/chunks/34-b911ba95736b691c.js",
5252
"static/chunks/645-991870f459f4213b.js",
53-
"static/chunks/pages/experts/[pid]-d604fbe4229b69c0.js"
53+
"static/chunks/pages/experts/[pid]-56574f8eca1b7797.js"
5454
],
5555
"/profile/delete_profile": [
5656
"static/chunks/webpack-fd1bc4a65a80e5c8.js",
@@ -81,8 +81,8 @@
8181
"static/chunks/framework-5f4595e5518b5600.js",
8282
"static/chunks/main-2a21a6fdfb46aa01.js",
8383
"static/chunks/645-991870f459f4213b.js",
84-
"static/chunks/194-f2d4ea2c548e776c.js",
85-
"static/chunks/pages/profile/me-c5f266f3c4e8ee84.js"
84+
"static/chunks/785-cd55c8a5cf40f0ec.js",
85+
"static/chunks/pages/profile/me-f1e3472525b97c83.js"
8686
],
8787
"/profile/projects/add": [
8888
"static/chunks/webpack-fd1bc4a65a80e5c8.js",

0 commit comments

Comments
 (0)