From 5e328a0392efd687ffc8138b9375914834d242be Mon Sep 17 00:00:00 2001 From: Alya Putri Date: Sun, 6 Oct 2019 22:14:10 +0700 Subject: [PATCH 1/5] Membuat test untuk implementasi fitur lihat deskripsi perusahaan di halaman lowongan --- assets/js/__test__/components/ApplyModal-test.jsx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/assets/js/__test__/components/ApplyModal-test.jsx b/assets/js/__test__/components/ApplyModal-test.jsx index 1119ff7..cb64014 100644 --- a/assets/js/__test__/components/ApplyModal-test.jsx +++ b/assets/js/__test__/components/ApplyModal-test.jsx @@ -49,4 +49,11 @@ describe('ApplyModal', () => { expect(modalPendaftaran.state.modalOpen).to.equal(false); }); + it('shows company description', () => { + const modalPendaftaran = ReactTestUtils.renderIntoDocument( + ); + + modalPendaftaran.handleChange({ target: { value: 'duar' } }); + expect(modalPendaftaran.props.data.companydescription).to.equal('compdesc'); + }); }); -- GitLab From 71efc5c01d821fc1666f6c1fd0c8dc5fad8a74dc Mon Sep 17 00:00:00 2001 From: Alya Putri Date: Sun, 6 Oct 2019 22:20:23 +0700 Subject: [PATCH 2/5] Mengimplementasikan fitur melihat deskripsi perusahaan di halaman lowongan --- assets/js/components/ApplyModal.jsx | 2 ++ assets/js/components/Vacancy.jsx | 1 + 2 files changed, 3 insertions(+) diff --git a/assets/js/components/ApplyModal.jsx b/assets/js/components/ApplyModal.jsx index fbd6d62..91feb81 100644 --- a/assets/js/components/ApplyModal.jsx +++ b/assets/js/components/ApplyModal.jsx @@ -78,6 +78,8 @@ export default class ApplyModal extends React.Component {

Deskripsi Lowongan

{
} +

Deskripsi Perusahaan

+ {
} {this.props.active && (
diff --git a/assets/js/components/Vacancy.jsx b/assets/js/components/Vacancy.jsx index a755cca..6f782af 100644 --- a/assets/js/components/Vacancy.jsx +++ b/assets/js/components/Vacancy.jsx @@ -88,6 +88,7 @@ export default class Vacancy extends React.Component { data={{ header: this.props.data.name, description: this.props.data.description, + companydescription: this.props.data.company.description, id: this.props.data.id, }} resume={this.props.user.data.student.resume} -- GitLab From cf44e22041ad7ca66cb28ffd0720cd6f145290b0 Mon Sep 17 00:00:00 2001 From: Alya Putri Date: Sun, 6 Oct 2019 22:30:32 +0700 Subject: [PATCH 3/5] menambahkan file migration yang sudah digabung --- core/migrations/0020_merge_20191006_2225.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 core/migrations/0020_merge_20191006_2225.py diff --git a/core/migrations/0020_merge_20191006_2225.py b/core/migrations/0020_merge_20191006_2225.py new file mode 100644 index 0000000..f059945 --- /dev/null +++ b/core/migrations/0020_merge_20191006_2225.py @@ -0,0 +1,17 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2019-10-06 15:25 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0017_vacancy_amount'), + ('core', '0019_merge_20191006_0852'), + ('core', '0014_auto_20191004_1340'), + ] + + operations = [ + ] -- GitLab From d26e6a4de8f3a21116864028a9f34b26e47f39a1 Mon Sep 17 00:00:00 2001 From: Alya Putri Date: Fri, 11 Oct 2019 17:02:46 +0700 Subject: [PATCH 4/5] memperbaharui node menjadi versi 10 dan menjalankan npm install --- package-lock.json | 60 +++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1a8e2aa..35d1ab2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -364,7 +364,7 @@ "babel-core": { "version": "6.26.3", "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz", - "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==", + "integrity": "sha1-suLwnjQtDwyI4vAuBneUEl51wgc=", "requires": { "babel-code-frame": "^6.26.0", "babel-generator": "^6.26.0", @@ -3171,7 +3171,7 @@ "estraverse": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "integrity": "sha1-OYrT88WiSUi+dyXoPRGn3ijNvR0=", "dev": true }, "fast-levenshtein": { @@ -3293,7 +3293,7 @@ "eslint-plugin-import": { "version": "2.18.2", "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz", - "integrity": "sha512-5ohpsHAiUBRNaBWAF08izwUGlbrJoJJ+W9/TBwsGoR1MnlgfwMIKrFeSjWbt6moabiXW9xNvtFz+97KHRfI4HQ==", + "integrity": "sha1-AvEYC5Cwd7M9RHoXojJs60AKzrY=", "dev": true, "requires": { "array-includes": "^3.0.3", @@ -3322,7 +3322,7 @@ "resolve": { "version": "1.12.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz", - "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==", + "integrity": "sha1-P8ZEo1yEpIVUYJ/ybsUrZvpXffY=", "dev": true, "requires": { "path-parse": "^1.0.6" @@ -3378,7 +3378,7 @@ "eslint-watch": { "version": "3.1.5", "resolved": "https://registry.npmjs.org/eslint-watch/-/eslint-watch-3.1.5.tgz", - "integrity": "sha512-6iEMRwo6RUpSaYyU7547qWQbgUKSYtkn4eGId/hZJvi+gMnRVeNfIzv/HAOPUmH6y53p1Ks9oNvWm/xZh4RPGQ==", + "integrity": "sha1-UgchNbRfByMLXk32c1SATrjW8sg=", "dev": true, "requires": { "babel-polyfill": "^6.20.0", @@ -3446,7 +3446,7 @@ "bluebird": { "version": "3.7.0", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.0.tgz", - "integrity": "sha512-aBQ1FxIa7kSWCcmKHlcHFlT2jt6J/l4FzC7KcPELkOJOsPOb/bccdhmIrKDfXhwFrmc7vDoDrrepFvGqjyXGJg==", + "integrity": "sha1-VqaohuA/auV3z/7etST48kUCk88=", "dev": true }, "braces": { @@ -3481,7 +3481,7 @@ "chalk": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=", "dev": true, "requires": { "ansi-styles": "^3.2.1", @@ -3492,7 +3492,7 @@ "chokidar": { "version": "2.1.8", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", - "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", + "integrity": "sha1-gEs6e2qZNYw8XGHnHYco8EHP+Rc=", "dev": true, "requires": { "anymatch": "^2.0.0", @@ -3512,7 +3512,7 @@ "debug": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "integrity": "sha1-6D0X3hbYp++3cX7b5fsQE17uYps=", "dev": true, "requires": { "ms": "^2.1.1" @@ -3521,7 +3521,7 @@ "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=", "dev": true } } @@ -3849,7 +3849,7 @@ "source-map-support": { "version": "0.5.13", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", - "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", + "integrity": "sha1-MbJKnC5zwt6FBmwP631Edn7VKTI=", "dev": true, "requires": { "buffer-from": "^1.0.0", @@ -4207,7 +4207,7 @@ "fetch-mock": { "version": "5.13.1", "resolved": "https://registry.npmjs.org/fetch-mock/-/fetch-mock-5.13.1.tgz", - "integrity": "sha512-eWUo2KI4sRGnRu8tKELCBfasALM5BfvrCxdI7J02j3eUM9mf+uYzJkURA0PSn/29JVapVrYFm+z+9XijXu1PdA==", + "integrity": "sha1-lVeUp389ly8WRLms5loP39YPHfc=", "dev": true, "requires": { "glob-to-regexp": "^0.3.0", @@ -5801,7 +5801,7 @@ "isparta": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/isparta/-/isparta-4.1.1.tgz", - "integrity": "sha512-kGwkNqmALQzdfGhgo5o8kOA88p14R3Lwg0nfQ/qzv4IhB4rXarT9maPMaYbo6cms4poWbeulrlFlURLUR6rDwQ==", + "integrity": "sha1-yS5JZylGkU7FQHyAEWDzN04LfLQ=", "dev": true, "requires": { "babel-core": "^6.1.4", @@ -5818,7 +5818,7 @@ "esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "integrity": "sha1-E7BM2z5sXRnfkatph6hpVhmwqnE=", "dev": true } } @@ -6253,7 +6253,7 @@ "karma": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz", - "integrity": "sha512-k5pBjHDhmkdaUccnC7gE3mBzZjcxyxYsYVaqiL2G5AqlfLyBO5nw2VdNK+O16cveEPd/gIOWULH7gkiYYwVNHg==", + "integrity": "sha1-hcwI6eCiLXzpzKN8ShvoJPaisa4=", "dev": true, "requires": { "bluebird": "^3.3.0", @@ -6288,7 +6288,7 @@ "bluebird": { "version": "3.7.0", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.0.tgz", - "integrity": "sha512-aBQ1FxIa7kSWCcmKHlcHFlT2jt6J/l4FzC7KcPELkOJOsPOb/bccdhmIrKDfXhwFrmc7vDoDrrepFvGqjyXGJg==", + "integrity": "sha1-VqaohuA/auV3z/7etST48kUCk88=", "dev": true }, "lodash": { @@ -6317,7 +6317,7 @@ "karma-chrome-launcher": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz", - "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==", + "integrity": "sha1-zxudBxNswY/iOTJ9JGVMPbw2is8=", "dev": true, "requires": { "fs-access": "^1.0.0", @@ -6327,7 +6327,7 @@ "which": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "integrity": "sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo=", "dev": true, "requires": { "isexe": "^2.0.0" @@ -6338,7 +6338,7 @@ "karma-coverage": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/karma-coverage/-/karma-coverage-1.1.2.tgz", - "integrity": "sha512-eQawj4Cl3z/CjxslYy9ariU4uDh7cCNFZHNWXWRpl0pNeblY/4wHR7M7boTYXWrn9bY0z2pZmr11eKje/S/hIw==", + "integrity": "sha1-zAnc61iagxAayl/nDCh2Re84dok=", "dev": true, "requires": { "dateformat": "^1.0.6", @@ -6361,7 +6361,7 @@ "karma-firefox-launcher": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-1.2.0.tgz", - "integrity": "sha512-j9Zp8M8+VLq1nI/5xZGfzeaEPtGQ/vk3G+Y8vpmFWLvKLNZ2TDjD6cu2dUu7lDbu1HXNgatsAX4jgCZTkR9qhQ==", + "integrity": "sha1-ZP4D3RAwD5dU1I+ev78x9slKIAw=", "dev": true, "requires": { "is-wsl": "^2.1.0" @@ -6413,7 +6413,7 @@ "chalk": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "integrity": "sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ=", "dev": true, "requires": { "ansi-styles": "^3.2.1", @@ -6453,7 +6453,7 @@ "karma-webpack": { "version": "2.0.13", "resolved": "https://registry.npmjs.org/karma-webpack/-/karma-webpack-2.0.13.tgz", - "integrity": "sha512-2cyII34jfrAabbI2+4Rk4j95Nazl98FvZQhgSiqKUDarT317rxfv/EdzZ60CyATN4PQxJdO5ucR5bOOXkEVrXw==", + "integrity": "sha1-z1bjBWwVt3R6C7IUD8mmvkHdnwI=", "dev": true, "requires": { "async": "^2.0.0", @@ -6467,7 +6467,7 @@ "async": { "version": "2.6.3", "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", - "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", + "integrity": "sha1-1yYl4jRKNlbjo61Pp0n6gymdgv8=", "dev": true, "requires": { "lodash": "^4.17.14" @@ -6491,7 +6491,7 @@ "loader-utils": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz", - "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==", + "integrity": "sha1-H/XcaRHJ8KBiUxpMBLYJQGEIwsc=", "dev": true, "requires": { "big.js": "^5.2.2", @@ -7045,7 +7045,7 @@ "mocha": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.3.tgz", - "integrity": "sha512-/6na001MJWEtYxHOV1WLfsmR4YIynkUEhBwzsb+fk2qmQ3iqsi258l/Q2MWHJMImAcNpZ8DEdYAK72NHoIQ9Eg==", + "integrity": "sha1-HgSA/jbS2lhY0etqzDhBiybqog0=", "dev": true, "requires": { "browser-stdout": "1.3.0", @@ -7120,7 +7120,7 @@ "moment": { "version": "2.24.0", "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", - "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" + "integrity": "sha1-DQVdU/UFKqZTyfbraLtdEr9cK1s=" }, "ms": { "version": "2.0.0", @@ -8170,7 +8170,7 @@ "react-ckeditor-wrapper": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/react-ckeditor-wrapper/-/react-ckeditor-wrapper-1.1.2.tgz", - "integrity": "sha512-/COVfezpSKFQxC/OjFoZf1PyzxTvUxzndlpGjEcajzjRgKPzSFZiCoh/VqqwGaaHJROO9pePQ9JxmJy2YlzDAQ==", + "integrity": "sha1-cvDGgo4X6mNxXV6YNvOrovhIfPM=", "requires": { "babel-runtime": "6.x", "classnames": "2.x", @@ -8210,7 +8210,7 @@ "react-hot-loader": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-3.1.3.tgz", - "integrity": "sha512-d7nZf78irxoGN5PY4zd6CSgZiroOhvIWzRast3qwTn4sSnBwlt08kV8WMQ9mitmxEdlCTwZt+5ClrRSjxWguMQ==", + "integrity": "sha1-b5KHcyaVjHywE0tRJHRReGkSYII=", "dev": true, "requires": { "global": "^4.3.0", @@ -8223,7 +8223,7 @@ "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", "dev": true } } @@ -8258,7 +8258,7 @@ "react-router": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/react-router/-/react-router-3.2.4.tgz", - "integrity": "sha512-5kIJXV1Yx+FYk0lDJoPQnt+qFf7HxS6XrIm2aCw0r3XQTxixFd0HSVlHenYRWKmSHlcvSQ7bpYWgdRwJGXWPKw==", + "integrity": "sha1-/dQVoGKYLgyUP4FO/eUG6uFBjQ4=", "requires": { "create-react-class": "^15.5.1", "history": "^3.0.0", -- GitLab From fee9a6fc183d79f19fe47f27fc3938151f197cc7 Mon Sep 17 00:00:00 2001 From: Alya Putri Date: Fri, 11 Oct 2019 17:49:53 +0700 Subject: [PATCH 5/5] merge migrations sesuai dengan master --- core/migrations/0051_merge_20191011_1730.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 core/migrations/0051_merge_20191011_1730.py diff --git a/core/migrations/0051_merge_20191011_1730.py b/core/migrations/0051_merge_20191011_1730.py new file mode 100644 index 0000000..8dd7d43 --- /dev/null +++ b/core/migrations/0051_merge_20191011_1730.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.17 on 2019-10-11 10:30 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0050_merge_20191011_1609'), + ('core', '0020_merge_20191006_2225'), + ] + + operations = [ + ] -- GitLab