diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/src/.gitignore b/src/.gitignore old mode 100644 new mode 100755 diff --git a/src/.pypirc b/src/.pypirc old mode 100644 new mode 100755 diff --git a/src/.travis.yml b/src/.travis.yml old mode 100644 new mode 100755 diff --git a/src/AUTHORS.rst b/src/AUTHORS.rst old mode 100644 new mode 100755 diff --git a/src/CHANGES.rst b/src/CHANGES.rst old mode 100644 new mode 100755 diff --git a/src/LICENSE.txt b/src/LICENSE.txt old mode 100644 new mode 100755 diff --git a/src/MANIFEST.in b/src/MANIFEST.in old mode 100644 new mode 100755 diff --git a/src/README.md b/src/README.md old mode 100644 new mode 100755 diff --git a/src/README.rst b/src/README.rst old mode 100644 new mode 100755 diff --git a/src/app/__init__.py b/src/app/__init__.py old mode 100644 new mode 100755 index b51ea6a..595c88e --- a/src/app/__init__.py +++ b/src/app/__init__.py @@ -23,7 +23,8 @@ class ConfigClass(object): # Flask-SQLAlchemy settings - SQLALCHEMY_DATABASE_URI = 'mysql+mysqldb://luisasantus:password@localhost/scimatch2?charset=utf8' # File-based SQL database' # File-based SQL database + SQLALCHEMY_DATABASE_URI = 'mysql+mysqldb://root:Aina100995@@localhost/data2?charset=utf8' # File-based SQL database' # File-based SQL database + SQLALCHEMY_COMMIT_ON_TEARDOWN = False SQLALCHEMY_TRACK_MODIFICATIONS = False # Avoids SQLAlchemy warning diff --git a/src/app/activate.sh b/src/app/activate.sh old mode 100644 new mode 100755 diff --git a/src/app/static/favicon.ico b/src/app/static/favicon.ico old mode 100644 new mode 100755 diff --git a/src/app/static/images/Laboratorio.jpg b/src/app/static/images/Laboratorio.jpg new file mode 100644 index 0000000..ae67e18 Binary files /dev/null and b/src/app/static/images/Laboratorio.jpg differ diff --git a/src/app/static/images/accept.png b/src/app/static/images/accept.png old mode 100644 new mode 100755 diff --git a/src/app/static/images/aina.png b/src/app/static/images/aina.png old mode 100644 new mode 100755 diff --git a/src/app/static/images/applicant.png b/src/app/static/images/applicant.png old mode 100644 new mode 100755 diff --git a/src/app/static/images/fondo.png b/src/app/static/images/fondo.png new file mode 100644 index 0000000..f783ded Binary files /dev/null and b/src/app/static/images/fondo.png differ diff --git a/src/app/static/images/fondo2.png b/src/app/static/images/fondo2.png new file mode 100644 index 0000000..52b95ac Binary files /dev/null and b/src/app/static/images/fondo2.png differ diff --git a/src/app/static/images/fons.png b/src/app/static/images/fons.png new file mode 100644 index 0000000..78984a1 Binary files /dev/null and b/src/app/static/images/fons.png differ diff --git a/src/app/static/images/fons2.png b/src/app/static/images/fons2.png new file mode 100644 index 0000000..4e85346 Binary files /dev/null and b/src/app/static/images/fons2.png differ diff --git a/src/app/static/images/gab.png b/src/app/static/images/gab.png old mode 100644 new mode 100755 diff --git a/src/app/static/images/group.png b/src/app/static/images/group.png old mode 100644 new mode 100755 diff --git a/src/app/static/images/icon.jpg b/src/app/static/images/icon.jpg new file mode 100644 index 0000000..3059acd Binary files /dev/null and b/src/app/static/images/icon.jpg differ diff --git a/src/app/static/images/iconopersonas.png b/src/app/static/images/iconopersonas.png old mode 100644 new mode 100755 diff --git a/src/app/static/images/logo.png b/src/app/static/images/logo.png old mode 100644 new mode 100755 diff --git a/src/app/static/images/luisa.png b/src/app/static/images/luisa.png old mode 100644 new mode 100755 diff --git a/src/app/static/images/mail.png b/src/app/static/images/mail.png old mode 100644 new mode 100755 diff --git a/src/app/static/images/marc.png b/src/app/static/images/marc.png new file mode 100644 index 0000000..335bea6 Binary files /dev/null and b/src/app/static/images/marc.png differ diff --git a/src/app/static/images/question.png b/src/app/static/images/question.png old mode 100644 new mode 100755 diff --git a/src/app/static/images/reject.png b/src/app/static/images/reject.png old mode 100644 new mode 100755 diff --git a/src/app/static/images/remove-button.png b/src/app/static/images/remove-button.png old mode 100644 new mode 100755 diff --git a/src/app/static/images/user_image.png b/src/app/static/images/user_image.png old mode 100644 new mode 100755 diff --git a/src/app/static/images/why.png b/src/app/static/images/why.png old mode 100644 new mode 100755 diff --git a/src/app/static/images/woman.png b/src/app/static/images/woman.png new file mode 100644 index 0000000..16bef0f Binary files /dev/null and b/src/app/static/images/woman.png differ diff --git a/src/app/static/my_style.css b/src/app/static/my_style.css old mode 100644 new mode 100755 diff --git a/src/app/static/style.css b/src/app/static/style.css old mode 100644 new mode 100755 diff --git a/src/app/templates/_rendering_utils.html b/src/app/templates/_rendering_utils.html old mode 100644 new mode 100755 diff --git a/src/app/templates/change_pref.html b/src/app/templates/change_pref.html old mode 100644 new mode 100755 diff --git a/src/app/templates/chat_applicant.html b/src/app/templates/chat_applicant.html old mode 100644 new mode 100755 index 4011ff0..7eba88e --- a/src/app/templates/chat_applicant.html +++ b/src/app/templates/chat_applicant.html @@ -189,7 +189,7 @@
- +

{{position['position_name']}}

diff --git a/src/app/templates/chat_group.html b/src/app/templates/chat_group.html old mode 100644 new mode 100755 index 11a9eb9..9bd89cd --- a/src/app/templates/chat_group.html +++ b/src/app/templates/chat_group.html @@ -195,7 +195,7 @@

Your applicants:

- +

{{request['applicant_first_name']}} {{request['applicant_last_name']}}

diff --git a/src/app/templates/home_page.html b/src/app/templates/home_page.html old mode 100644 new mode 100755 index c7580b3..6c11cc5 --- a/src/app/templates/home_page.html +++ b/src/app/templates/home_page.html @@ -37,6 +37,7 @@ .container .btn:hover { background-color: black; + } @@ -44,8 +45,13 @@
-

Find your job, anywhere.

+

Find your job, anywhere.

+
@@ -58,32 +64,31 @@

Find your job, anywhere.

- + Card image cap - + +
Card image cap - +
-
+ -
+
-
-
-
-

Why SciMatch?

-

If you are bored of looking at thousands of websites to find interesting research groups or if you are tired of sending emails without receiving any answer...

-

The faster and more efficient way to put in contact people wanting to work and research groups looking for new incorporations.

+

Why SciMatch??

+

If you are bored of looking at thousands of websites to find interesting research groups or if you are tired of

+

sending emails without receiving any answer...

+

SciMatch is the faster and more efficient way to put in contact people wanting to work and research groups

+

looking for new incorporations.

-
-
+
@@ -91,14 +96,19 @@

The faster and more efficient way to put in contact
- - diff --git a/src/app/templates/home_page_applicant.html b/src/app/templates/home_page_applicant.html old mode 100644 new mode 100755 index c7d5e2e..1ba544c --- a/src/app/templates/home_page_applicant.html +++ b/src/app/templates/home_page_applicant.html @@ -18,16 +18,18 @@

Your Matches

{% for each in matches %}
-
-

{{ each['name'] }}

+
+
+

{{ each['name'] }}


Salary: {{ each['salary'] }} €
Start Date: {{ each['start_date'] }}

+
{% if each['id'] not in requested %}
- +
@@ -62,7 +64,7 @@
{% else %} - +