[#140656091] [#33] [Refactor] Fixx css and add icon on application

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;*/

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 = () => (

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>

core/serializers/vacancies.py

 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