From ff4d6c374bd6cd9803ff790b1b84f26da9055bbb Mon Sep 17 00:00:00 2001
From: Zamil Majdy <z.majdy1996@gmail.com>
Date: Wed, 26 Apr 2017 07:34:57 +0700
Subject: [PATCH] [#140656091] [#33] [Refactor] Fixx css and add icon on
application
---
assets/css/custom.css | 12 ------------
assets/js/components/ConfirmationModal.jsx | 2 +-
assets/js/components/LoginForm.jsx | 2 +-
core/serializers/vacancies.py | 7 ++-----
4 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/assets/css/custom.css b/assets/css/custom.css
index 952d5128..2277100c 100755
--- a/assets/css/custom.css
+++ b/assets/css/custom.css
@@ -106,18 +106,6 @@ font-size: 32px;
margin-top:10px;
}
-.coverLetter{
- margin-top:30px;
-
-}
-
-.linkCV{
- float: right;
- margin-top: 30px;
- margin-bottom: 10px;
-}
-
-
.registerForm{
margin: 0 auto;
/*padding:50px;*/
diff --git a/assets/js/components/ConfirmationModal.jsx b/assets/js/components/ConfirmationModal.jsx
index a8a0ee47..800e3017 100644
--- a/assets/js/components/ConfirmationModal.jsx
+++ b/assets/js/components/ConfirmationModal.jsx
@@ -37,7 +37,7 @@ export default class ConfirmationModal extends React.Component {
handleYes = () => { this.state.callback(); this.handleClose(); }
open = (header = this.state.header, content = this.state.content, icon = this.state.icon, callback = this.state.callback()) => {
- this.setState({ modalOpen: true, header, content, callback });
+ this.setState({ modalOpen: true, header, content, callback, icon });
};
render = () => (
diff --git a/assets/js/components/LoginForm.jsx b/assets/js/components/LoginForm.jsx
index eb120ba3..265d1665 100644
--- a/assets/js/components/LoginForm.jsx
+++ b/assets/js/components/LoginForm.jsx
@@ -60,7 +60,7 @@ export default class LoginForm extends React.Component {
<Form loading={this.state.loading} onSubmit={e => this.handleSubmit(e)} error={this.state.errorFlag}>
<Form.Group widths="equal">
<Form.Field>
- <label htmlFor="id"> Username </label>
+ <label htmlFor="id"> Email </label>
<Input type="text" id="username" icon="user" iconPosition="left" placeholder="username" onChange={e => this.handleChange(e, 'username')} required />
</Form.Field>
</Form.Group>
diff --git a/core/serializers/vacancies.py b/core/serializers/vacancies.py
index 77a1e84c..c1ffaf65 100644
--- a/core/serializers/vacancies.py
+++ b/core/serializers/vacancies.py
@@ -1,14 +1,11 @@
from rest_framework import serializers
-from core.models import Company
from core.models.vacancies import Vacancy, Application
-from core.serializers.accounts import StudentSerializer
+from core.serializers.accounts import StudentSerializer, CompanySerializer
class VacancySerializer(serializers.ModelSerializer):
- company = serializers.PrimaryKeyRelatedField(
- queryset=Company.objects.all()
- )
+ company = CompanySerializer()
class Meta:
model = Vacancy
--
GitLab