Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feedback #1

Open
wants to merge 158 commits into
base: feedback
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
158 commits
Select commit Hold shift + click to select a range
6c4c936
Setting up GitHub Classroom Feedback
github-classroom[bot] Mar 2, 2021
ed8aa58
first commit
nlukic97 Mar 2, 2021
0e073f2
first commit
nlukic97 Mar 2, 2021
2b9c910
readme draft 1
nlukic97 Mar 3, 2021
4b37eb4
readme 2
nlukic97 Mar 4, 2021
5daa92d
vue ui and authentication added
nlukic97 Mar 11, 2021
be5e38e
package.json updated
nlukic97 Mar 13, 2021
07046ef
adding migrations
nlukic97 Mar 13, 2021
70b9381
users and location migration, seeder, and relationship
nlukic97 Mar 13, 2021
5c8328c
foreign key user location
nlukic97 Mar 13, 2021
201b57f
friendships displaying. Not sure how to make registration work with t…
nlukic97 Mar 13, 2021
c1ed316
registration works - I want to optimize it so it asks the user for [a…
nlukic97 Mar 13, 2021
3bce9db
somethin
nlukic97 Mar 13, 2021
bd99722
Merge pull request #26 from SAEBelgradeWeb/making_migrations
nlukic97 Mar 13, 2021
ce6eb8a
migrations and seeding for events, locations, courts, event_user...
nlukic97 Mar 15, 2021
aa787ee
more migrations and seeding
nlukic97 Mar 15, 2021
a839b8a
payments migration and seeder
nlukic97 Mar 15, 2021
3a9e02d
commenting the Payment Seeder
nlukic97 Mar 15, 2021
d2c13c8
made EventUser and Friendship statuses be enum with three possible va…
nlukic97 Mar 16, 2021
cdcb627
registration form works. Check it out later, QA.
nlukic97 Mar 17, 2021
7819709
validation for sex and locations done. Autofill for both also done. M…
nlukic97 Mar 22, 2021
4b0acdf
displaying users data to him in settings. Must add image upload somehow
nlukic97 Mar 22, 2021
152e8d6
/myAccount route calls user controller. Also, added page for editing …
nlukic97 Mar 23, 2021
beec244
UI of users profile (must make vue components for certaing things). T…
nlukic97 Mar 24, 2021
6840ed7
made some components out of the user profile page. Still have to add …
nlukic97 Mar 24, 2021
47471de
font awesome added. Profile page responsive, still have to make it lo…
nlukic97 Mar 24, 2021
20af6d4
unable to import a component (profileModal) into another component (p…
nlukic97 Mar 24, 2021
69da3fb
initial modal made
nlukic97 Mar 25, 2021
4d20412
having issues with closing the modal (prop mutation)
nlukic97 Mar 25, 2021
e54640f
problems...
nlukic97 Mar 25, 2021
14b2250
sorted out the modal - no console errors with the props.
nlukic97 Mar 25, 2021
7b82736
the data is processed on the AboutProfileModal. Just to make the POST…
nlukic97 Mar 26, 2021
24fb156
saving progress with api post request
nlukic97 Mar 28, 2021
36fe85b
testing auth
nlukic97 Mar 28, 2021
707ea64
axios push working. Still have to add authentication
nlukic97 Mar 28, 2021
1797bff
updating age, sex and city fully work. Password is next. Must add aut…
nlukic97 Mar 28, 2021
9b56c89
Merge pull request #36 from SAEBelgradeWeb/api-auth
nlukic97 Mar 28, 2021
109f408
the user id is forwarded to the views in order to make the post axios…
nlukic97 Mar 28, 2021
f06229d
removed the id prop passed to the vue - the controllers recognize Aut…
nlukic97 Mar 28, 2021
5d1f50e
sorting out the editing of the bio section
nlukic97 Mar 28, 2021
86341ce
added user bio from database
nlukic97 Mar 28, 2021
6483aa1
still working on the user bio section. Displaying text and button pro…
nlukic97 Mar 28, 2021
b0ecf91
design for bio add/edit improved. Small screen sizes supported
nlukic97 Mar 29, 2021
3aa5211
apo post request not working. userController & ProfileBio.vue
nlukic97 Mar 29, 2021
ab1c337
fixed the issue with the biography post description. The backend does…
nlukic97 Mar 29, 2021
a925283
able to submit null to the database. Upon load, having null in the bi…
nlukic97 Mar 29, 2021
f165f50
figuring out logic for bio edit/ submit/ remove
nlukic97 Mar 29, 2021
bcab449
fixed the small bug. I had to add 'bio' to the $fillable array in the…
nlukic97 Mar 30, 2021
e48c014
bio editing section works
nlukic97 Mar 30, 2021
aa12ecc
textbox focus, padding, and size adapted
nlukic97 Mar 30, 2021
f0842d2
account-settings blade page created component. Next --> create compon…
nlukic97 Mar 30, 2021
fe3d551
bio text word break added. Also, sorted out indentation in textarea w…
nlukic97 Mar 30, 2021
fcb5688
component for settings created. Validation for age input on profilePa…
nlukic97 Mar 30, 2021
0e338cb
name and username editable
nlukic97 Mar 30, 2021
e72d10c
save button only present if input data is different from the one curr…
nlukic97 Mar 31, 2021
2b60281
password updating set up. Just to set up the backend
nlukic97 Mar 31, 2021
c6c3cdc
password change works (confirms old password to db, compares new and …
nlukic97 Mar 31, 2021
bef3bfd
from text to password input. Reset password field after submission
nlukic97 Mar 31, 2021
ece1541
removing free courts option
nlukic97 Apr 12, 2021
3017135
saving components
nlukic97 Apr 12, 2021
20d91cd
sorted components into folders
nlukic97 Apr 12, 2021
1fd4e60
images working - a forward slash must be added for them to be viewable
nlukic97 Apr 12, 2021
27162e6
cancel button added to editing data
nlukic97 Apr 12, 2021
c163470
made modal for image upload
nlukic97 Apr 12, 2021
e6bcac1
added file reader and validation for it. Next step -> cropping
nlukic97 Apr 12, 2021
600ff88
unable to upload image using FormData api
nlukic97 Apr 12, 2021
e7027c3
moving from upload image modal to upload image page. Maybe I can add …
nlukic97 Apr 12, 2021
4f219cc
file upload set up. Just to sort out backend
nlukic97 Apr 12, 2021
77c28e8
image upload fully functional. Just have to set up the CSS for the pr…
nlukic97 Apr 12, 2021
464e225
new avatar upload - old avatar delete -works. Sort out CSS
nlukic97 Apr 12, 2021
2bae90d
fixed api route to be relative rather than absolute
nlukic97 Apr 13, 2021
bcb87d0
able to create a game. Work on the UI for dummy game payment
nlukic97 Apr 13, 2021
6fc6c7b
event creation done. Relationship between event and user made. Relati…
nlukic97 Apr 13, 2021
ffbec2c
bug with profile picture. The url of viewing another user messed up t…
nlukic97 Apr 13, 2021
f324701
fixed image upload. Also, the user will now be able to see other page…
nlukic97 Apr 13, 2021
102cca2
sorting out some stuff. Must work on the friends/{id} route, it only …
nlukic97 Apr 13, 2021
ca94e38
added personal timestamps for sorting of the user feed in javascript
nlukic97 Apr 13, 2021
e2a9d18
made view for showing other user profiles (non editable ones). Still …
nlukic97 Apr 13, 2021
01b2a24
event page created, results display well. Linkin done, a user can vis…
nlukic97 Apr 14, 2021
0f803c5
working on displaying friends front-end.
nlukic97 Apr 17, 2021
95ea144
issue to deal with later
nlukic97 Apr 17, 2021
6dbca8c
found solution for the display of friends images. But It might be eas…
nlukic97 Apr 17, 2021
e77e273
sorted out error handling for my vue password change. Still have to d…
nlukic97 Apr 17, 2021
6c3f4b0
Event page display logic brainstorming
nlukic97 Apr 18, 2021
571e384
working on logic for displaying the events based on game status, and …
nlukic97 Apr 18, 2021
9b027f9
fixed/ optimized the event display logic. Make sure to test it.
nlukic97 Apr 19, 2021
934b158
added some text to better understand what I can do with each event page
nlukic97 Apr 19, 2021
8e24c14
users can join games, and leave them - under certain conditions
nlukic97 Apr 19, 2021
194ae6d
users join and leave games. admin can cancel games. (both under certa…
nlukic97 Apr 19, 2021
92e3d3e
payment function works for all. Should optimize the join and leave ev…
nlukic97 Apr 19, 2021
eb13437
if a user visits a page, the server checks if 1. they own the page, o…
nlukic97 Apr 19, 2021
42d0e96
minor fix in non-friend-user.blade.php
nlukic97 Apr 19, 2021
ab98777
friendship system almost fully created. Still need to add 'reject req…
nlukic97 Apr 20, 2021
8b5d228
removed 'forgot password' option, and overrided the methods in Forgot…
nlukic97 Apr 21, 2021
c46dbb3
cleaned up seeder - admin is automatically generated with a game set …
nlukic97 Apr 21, 2021
82959d2
cleaned up seeder - admin is automatically generated with a game set …
nlukic97 Apr 21, 2021
d52fe1d
cleaned up seeder - admin is automatically generated with a game set …
nlukic97 Apr 21, 2021
1ec551f
sorted out a bug. Must remove the 'denied' option from the database m…
nlukic97 Apr 21, 2021
8e7e2df
created component for event data. Now the messages are the only thing…
nlukic97 Apr 21, 2021
bf4acd7
fixing bad refactor
nlukic97 Apr 21, 2021
5334433
displaying messages in the admin view - transfer to others
nlukic97 Apr 21, 2021
c6cdefa
displaying messages in the admin view - transfer to others
nlukic97 Apr 21, 2021
96826a3
made a v-if, so that if there was a user in a game who had sent a mes…
nlukic97 Apr 22, 2021
32f122b
components for search of users and events made. Methods for the blade…
nlukic97 Apr 22, 2021
2eafaf3
event filtering added. Must sort the results for specific cities, per…
nlukic97 Apr 22, 2021
bbcf92f
sorting of filtered events finished
nlukic97 Apr 22, 2021
f2dc4fd
search almost finished - should make it into a vue component so I can…
nlukic97 Apr 22, 2021
2edcb68
fixing bad variable compact
nlukic97 Apr 22, 2021
8bffe73
user search - the searched parameters remain in the boxes when result…
nlukic97 Apr 23, 2021
5220116
simplified the get parameter displaying to the user
nlukic97 Apr 23, 2021
0e24dd9
Able to display the friend accounts of one specific user
nlukic97 Apr 23, 2021
9e40497
I can see 9 of my friends if i am authenticated in the preview sectio…
nlukic97 Apr 23, 2021
6255756
friendships are now displaying for auth and friend users. Now to make…
nlukic97 Apr 23, 2021
f57d8eb
friendlist are working
nlukic97 Apr 23, 2021
8e117dc
updating the link to view friendlist, and passing user id as prop to …
nlukic97 Apr 23, 2021
862e7df
able to send and receive api post requests for adding messages to an …
nlukic97 Apr 23, 2021
3a78c71
messaging works. Just to add notifications of new messages
nlukic97 Apr 23, 2021
141e4f5
friendship statuses sorted
nlukic97 Apr 23, 2021
557203e
msg and friendship notifications working fully. Just the event notifi…
nlukic97 Apr 23, 2021
342d49a
notifications sortByDesc('created_at') ---> so most recent one shall …
nlukic97 Apr 24, 2021
f96bf7f
notifications fully functional
nlukic97 Apr 24, 2021
568a41a
made command to check for all the events
nlukic97 Apr 24, 2021
2fdd63d
making it up to date
nlukic97 Apr 24, 2021
67a8632
unit and feature test made
nlukic97 Apr 24, 2021
1c92d1a
tests made. Now just to make github tests.
nlukic97 Apr 24, 2021
4a112da
adding tests
nlukic97 Apr 24, 2021
57c598d
changing .yml branch name from main to MASTER
nlukic97 Apr 24, 2021
be657ad
.yml add password
nlukic97 Apr 24, 2021
971476b
changing some things to the .yml file
nlukic97 Apr 24, 2021
0837e97
laravel tests
nlukic97 Apr 24, 2021
cca8a58
laravel action
nlukic97 Apr 24, 2021
11f73c2
Laravel server tests
nlukic97 Apr 24, 2021
3ec1102
Laravel unit, feature and browser tests.
nlukic97 Apr 24, 2021
1b12f88
Server setup and tests
nlukic97 Apr 24, 2021
fd90a09
README.md action badge added
nlukic97 Apr 24, 2021
369d112
image fit works
nlukic97 Apr 25, 2021
4825bb2
Unread notifications number is displayed to the user next to the noti…
nlukic97 Apr 25, 2021
7f349d5
some styling done
nlukic97 Apr 25, 2021
b2883bc
made more style changes
nlukic97 Apr 25, 2021
65da048
deployment attempt
nlukic97 Apr 25, 2021
6913a03
deployment try AGAIN
nlukic97 Apr 25, 2021
1d883e4
deployment
nlukic97 Apr 25, 2021
c87066b
testing forge build
nlukic97 Apr 26, 2021
1030164
user search looks better
nlukic97 Apr 26, 2021
21a5470
the electricity went out for a split second... better safe than sorry
nlukic97 Apr 26, 2021
c4cb1bc
more styling on the event
nlukic97 Apr 26, 2021
eb0d015
testing the cors policy change
nlukic97 Apr 26, 2021
c2f0e08
CORS try 2nd
nlukic97 Apr 26, 2021
4218ed4
testing scheduled job
nlukic97 Apr 26, 2021
330133d
changing the file path to be fetched
nlukic97 Apr 26, 2021
b6deee6
changed picture of characters
nlukic97 Apr 26, 2021
bb63227
new add
nlukic97 Apr 26, 2021
dde1af7
name change
nlukic97 Apr 26, 2021
0e09e50
Deployment
nlukic97 Apr 26, 2021
8cf7c37
fixing image upload bug
nlukic97 Jun 10, 2021
01e4b61
added google analytics tracking tag to the app.blade.php page
nlukic97 Jun 10, 2021
6fe0fbb
sorting out website.
nlukic97 Jun 10, 2021
c92bef8
forge repo reinstall + google analytics script added to views/layouts…
nlukic97 Jun 10, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
unable to import a component (profileModal) into another component (p…
…rofileContent)
  • Loading branch information
nlukic97 committed Mar 24, 2021
commit 20af6d4af1e27bf0d6ea94526f17d2802938ed0f
185 changes: 166 additions & 19 deletions public/js/app.js
Original file line number Diff line number Diff line change
@@ -1976,9 +1976,55 @@ __webpack_require__.r(__webpack_exports__);
//
//
//
//
// import ProfileModal from './ProfileModal.vue';
/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({
name: "ProfileContent",
props: ['age', 'sex', 'city']
props: ['age', 'sex', 'city'],
// components:{
// ProfileModal
// },
data: function data() {
return {
modalOpen: false
};
},
methods: {
aboutModal: function aboutModal() {
console.log('about model open: ' + this.modalOpen);

if (this.modalOpen === false) {
this.modalOpen = true;
} else {
this.modalOpen = false;
}
}
}
});

/***/ }),

/***/ "./node_modules/babel-loader/lib/index.js??clonedRuleSet-5[0].rules[0].use[0]!./node_modules/vue-loader/lib/index.js??vue-loader-options!./resources/js/components/ProfileModal.vue?vue&type=script&lang=js&":
/*!*******************************************************************************************************************************************************************************************************************!*\
!*** ./node_modules/babel-loader/lib/index.js??clonedRuleSet-5[0].rules[0].use[0]!./node_modules/vue-loader/lib/index.js??vue-loader-options!./resources/js/components/ProfileModal.vue?vue&type=script&lang=js& ***!
\*******************************************************************************************************************************************************************************************************************/
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {

"use strict";
__webpack_require__.r(__webpack_exports__);
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
/* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__)
/* harmony export */ });
//
//
//
//
//
//
//
//
/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({
name: "ProfileModal"
});

/***/ }),
@@ -2065,6 +2111,7 @@ Vue.component('example-component', __webpack_require__(/*! ./components/ExampleC
Vue.component('profile-picture', __webpack_require__(/*! ./components/ProfilePicture.vue */ "./resources/js/components/ProfilePicture.vue").default);
Vue.component('profile-bio', __webpack_require__(/*! ./components/ProfileBio */ "./resources/js/components/ProfileBio.vue").default);
Vue.component('profile-content', __webpack_require__(/*! ./components/ProfileContent */ "./resources/js/components/ProfileContent.vue").default);
Vue.component('profile-modal', __webpack_require__(/*! ./components/ProfileModal */ "./resources/js/components/ProfileModal.vue").default);
/**
* Next, we will create a fresh Vue application instance and attach it to
* the page. Then, you may begin adding components to this application
@@ -38086,6 +38133,45 @@ component.options.__file = "resources/js/components/ProfileContent.vue"

/***/ }),

/***/ "./resources/js/components/ProfileModal.vue":
/*!**************************************************!*\
!*** ./resources/js/components/ProfileModal.vue ***!
\**************************************************/
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {

"use strict";
__webpack_require__.r(__webpack_exports__);
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
/* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__)
/* harmony export */ });
/* harmony import */ var _ProfileModal_vue_vue_type_template_id_67c9b46f_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./ProfileModal.vue?vue&type=template&id=67c9b46f&scoped=true& */ "./resources/js/components/ProfileModal.vue?vue&type=template&id=67c9b46f&scoped=true&");
/* harmony import */ var _ProfileModal_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./ProfileModal.vue?vue&type=script&lang=js& */ "./resources/js/components/ProfileModal.vue?vue&type=script&lang=js&");
/* harmony import */ var _node_modules_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! !../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js */ "./node_modules/vue-loader/lib/runtime/componentNormalizer.js");





/* normalize component */
;
var component = (0,_node_modules_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__.default)(
_ProfileModal_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__.default,
_ProfileModal_vue_vue_type_template_id_67c9b46f_scoped_true___WEBPACK_IMPORTED_MODULE_0__.render,
_ProfileModal_vue_vue_type_template_id_67c9b46f_scoped_true___WEBPACK_IMPORTED_MODULE_0__.staticRenderFns,
false,
null,
"67c9b46f",
null

)

/* hot reload */
if (false) { var api; }
component.options.__file = "resources/js/components/ProfileModal.vue"
/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (component.exports);

/***/ }),

/***/ "./resources/js/components/ProfilePicture.vue":
/*!****************************************************!*\
!*** ./resources/js/components/ProfilePicture.vue ***!
@@ -38175,6 +38261,22 @@ __webpack_require__.r(__webpack_exports__);

/***/ }),

/***/ "./resources/js/components/ProfileModal.vue?vue&type=script&lang=js&":
/*!***************************************************************************!*\
!*** ./resources/js/components/ProfileModal.vue?vue&type=script&lang=js& ***!
\***************************************************************************/
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {

"use strict";
__webpack_require__.r(__webpack_exports__);
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
/* harmony export */ "default": () => (__WEBPACK_DEFAULT_EXPORT__)
/* harmony export */ });
/* harmony import */ var _node_modules_babel_loader_lib_index_js_clonedRuleSet_5_0_rules_0_use_0_node_modules_vue_loader_lib_index_js_vue_loader_options_ProfileModal_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../node_modules/babel-loader/lib/index.js??clonedRuleSet-5[0].rules[0].use[0]!../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./ProfileModal.vue?vue&type=script&lang=js& */ "./node_modules/babel-loader/lib/index.js??clonedRuleSet-5[0].rules[0].use[0]!./node_modules/vue-loader/lib/index.js??vue-loader-options!./resources/js/components/ProfileModal.vue?vue&type=script&lang=js&");
/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (_node_modules_babel_loader_lib_index_js_clonedRuleSet_5_0_rules_0_use_0_node_modules_vue_loader_lib_index_js_vue_loader_options_ProfileModal_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__.default);

/***/ }),

/***/ "./resources/js/components/ProfilePicture.vue?vue&type=script&lang=js&":
/*!*****************************************************************************!*\
!*** ./resources/js/components/ProfilePicture.vue?vue&type=script&lang=js& ***!
@@ -38266,6 +38368,23 @@ __webpack_require__.r(__webpack_exports__);
/* harmony import */ var _node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_vue_loader_lib_index_js_vue_loader_options_ProfileContent_vue_vue_type_template_id_465065bb_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./ProfileContent.vue?vue&type=template&id=465065bb&scoped=true& */ "./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib/index.js??vue-loader-options!./resources/js/components/ProfileContent.vue?vue&type=template&id=465065bb&scoped=true&");


/***/ }),

/***/ "./resources/js/components/ProfileModal.vue?vue&type=template&id=67c9b46f&scoped=true&":
/*!*********************************************************************************************!*\
!*** ./resources/js/components/ProfileModal.vue?vue&type=template&id=67c9b46f&scoped=true& ***!
\*********************************************************************************************/
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {

"use strict";
__webpack_require__.r(__webpack_exports__);
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
/* harmony export */ "render": () => (/* reexport safe */ _node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_vue_loader_lib_index_js_vue_loader_options_ProfileModal_vue_vue_type_template_id_67c9b46f_scoped_true___WEBPACK_IMPORTED_MODULE_0__.render),
/* harmony export */ "staticRenderFns": () => (/* reexport safe */ _node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_vue_loader_lib_index_js_vue_loader_options_ProfileModal_vue_vue_type_template_id_67c9b46f_scoped_true___WEBPACK_IMPORTED_MODULE_0__.staticRenderFns)
/* harmony export */ });
/* harmony import */ var _node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_vue_loader_lib_index_js_vue_loader_options_ProfileModal_vue_vue_type_template_id_67c9b46f_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./ProfileModal.vue?vue&type=template&id=67c9b46f&scoped=true& */ "./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib/index.js??vue-loader-options!./resources/js/components/ProfileModal.vue?vue&type=template&id=67c9b46f&scoped=true&");


/***/ }),

/***/ "./resources/js/components/ProfilePicture.vue?vue&type=template&id=11a7c3c0&scoped=true&":
@@ -38397,7 +38516,16 @@ var render = function() {
_c("span", [_vm._v("About:")]),
_vm._v(" "),
_c("ul", { staticClass: "list-group position-relative" }, [
_vm._m(0),
_c("li", { staticClass: "position-absolute" }, [
_c(
"span",
{
staticClass: "btn btn-secondary rounded-circle",
on: { click: _vm.aboutModal }
},
[_c("i", { staticClass: "fas fa-pen" })]
)
]),
_vm._v(" "),
_c("li", { staticClass: "list-group-item" }, [
_vm._v("Age: " + _vm._s(this.age))
@@ -38415,7 +38543,7 @@ var render = function() {
_c("span", [_vm._v("Friends:")]),
_vm._v(" "),
_c("ul", { staticClass: "list-group position-relative" }, [
_vm._m(1),
_vm._m(0),
_vm._v(" "),
_c("li", { staticClass: "list-group-item" }, [
_vm._v("Age: " + _vm._s(this.age))
@@ -38433,7 +38561,7 @@ var render = function() {
_vm._v(" "),
_c("div", { staticClass: "col-xs-1" }),
_vm._v(" "),
_vm._m(2)
_vm._m(1)
])
])
}
@@ -38453,21 +38581,6 @@ var staticRenderFns = [
)
])
},
function() {
var _vm = this
var _h = _vm.$createElement
var _c = _vm._self._c || _h
return _c("li", { staticClass: "position-absolute" }, [
_c(
"a",
{
staticClass: "btn btn-secondary rounded-circle",
attrs: { href: "#" }
},
[_c("i", { staticClass: "fas fa-pen" })]
)
])
},
function() {
var _vm = this
var _h = _vm.$createElement
@@ -38543,6 +38656,40 @@ render._withStripped = true



/***/ }),

/***/ "./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib/index.js??vue-loader-options!./resources/js/components/ProfileModal.vue?vue&type=template&id=67c9b46f&scoped=true&":
/*!************************************************************************************************************************************************************************************************************************************!*\
!*** ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib/index.js??vue-loader-options!./resources/js/components/ProfileModal.vue?vue&type=template&id=67c9b46f&scoped=true& ***!
\************************************************************************************************************************************************************************************************************************************/
/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {

"use strict";
__webpack_require__.r(__webpack_exports__);
/* harmony export */ __webpack_require__.d(__webpack_exports__, {
/* harmony export */ "render": () => (/* binding */ render),
/* harmony export */ "staticRenderFns": () => (/* binding */ staticRenderFns)
/* harmony export */ });
var render = function() {
var _vm = this
var _h = _vm.$createElement
var _c = _vm._self._c || _h
return _vm._m(0)
}
var staticRenderFns = [
function() {
var _vm = this
var _h = _vm.$createElement
var _c = _vm._self._c || _h
return _c("div", [
_c("div", { staticClass: "row" }, [_c("h1", [_vm._v("modalddd")])])
])
}
]
render._withStripped = true



/***/ }),

/***/ "./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib/index.js??vue-loader-options!./resources/js/components/ProfilePicture.vue?vue&type=template&id=11a7c3c0&scoped=true&":
1 change: 1 addition & 0 deletions resources/js/app.js
Original file line number Diff line number Diff line change
@@ -23,6 +23,7 @@ Vue.component('example-component', require('./components/ExampleComponent.vue').
Vue.component('profile-picture', require('./components/ProfilePicture.vue').default);
Vue.component('profile-bio', require('./components/ProfileBio').default);
Vue.component('profile-content', require('./components/ProfileContent').default);
Vue.component('profile-modal', require('./components/ProfileModal').default);

/**
* Next, we will create a fresh Vue application instance and attach it to
25 changes: 23 additions & 2 deletions resources/js/components/ProfileContent.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<template>
<div>
<!-- <profile-modal></profile-modal>-->
<div class="row">
<div class="col-lg-1 col-md-1 col-1"></div> <!--phantom div -->
<div class=" col-lg-4 col-md-10 col-10">
@@ -8,7 +9,7 @@
<span>About:</span>
<ul class="list-group position-relative">
<li class="position-absolute">
<a href="#" class="btn btn-secondary rounded-circle"><i class="fas fa-pen"></i></a>
<span @click='aboutModal' class="btn btn-secondary rounded-circle"><i class="fas fa-pen"></i></span>
</li> <!--button to open popup adn edit data-->
<li class="list-group-item">Age: {{this.age}}</li>
<li class="list-group-item">sex: {{this.sex}}</li>
@@ -70,13 +71,33 @@
</template>

<script>
// import ProfileModal from './ProfileModal.vue';

export default {
name: "ProfileContent",
props:[
'age',
'sex',
'city'
]
],
// components:{
// ProfileModal
// },
data:function(){
return {
modalOpen:false
}
},
methods:{
aboutModal(){
console.log('about model open: '+ this.modalOpen)
if(this.modalOpen === false){
this.modalOpen = true
} else {
this.modalOpen = false
}
}
}
}
</script>

17 changes: 17 additions & 0 deletions resources/js/components/ProfileModal.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<template>
<div>
<div class="row">
<h1>modalddd</h1>
</div>
</div>
</template>

<script>
export default {
name: "ProfileModal"
}
</script>

<style scoped>

</style>