search

CSC495-2014 / TeamworkEnglewoodGit

GNU General Public License v2.0
5 stars 15 forks source link

Projects Page update #95

Closed kwpembrook closed 10 years ago

kwpembrook commented 10 years ago

Most recent updates to the projects page view along with update route for the page instead of the hack. I also added the needed library to the composer files so I can request projects from GitHub for the projects page. @mboie if you could double check and sign off.

mikeholler commented 10 years ago

Did you fix the Firefox thing? On Mar 2, 2014 4:06 PM, "Kyle Pembrook" notifications@github.com wrote:

Most recent updates to the projects page view along with update route for the page instead of the hack. I also added the needed library to the composer files so I can request projects from GitHub for the projects page.

@mboie https://github.com/mboie if you could double check and sign off.

You can merge this Pull Request by running

git pull https://github.com/kwpembrook/TeamworkEnglewoodGit master

Or view, comment on, or merge it at:

https://github.com/CSC495-2014/TeamworkEnglewoodGit/pull/95 Commit Summary

File Changes

  • M app/routes.phphttps://github.com/CSC495-2014/TeamworkEnglewoodGit/pull/95/files#diff-0(9)
  • M app/views/projectPageHack.blade.phphttps://github.com/CSC495-2014/TeamworkEnglewoodGit/pull/95/files#diff-1(2)
  • A app/views/projectsPage.blade.phphttps://github.com/CSC495-2014/TeamworkEnglewoodGit/pull/95/files#diff-2(67)
  • M composer.jsonhttps://github.com/CSC495-2014/TeamworkEnglewoodGit/pull/95/files#diff-3(5)
  • M composer.lockhttps://github.com/CSC495-2014/TeamworkEnglewoodGit/pull/95/files#diff-4(93)
  • A public/css/projectsPage.csshttps://github.com/CSC495-2014/TeamworkEnglewoodGit/pull/95/files#diff-5(208)

Patch Links:

Reply to this email directly or view it on GitHubhttps://github.com/CSC495-2014/TeamworkEnglewoodGit/pull/95 .

kwpembrook commented 10 years ago

Not yet, I can wait and request once it is fixed, but I thought having the code for everyone else might be helpful since it is only Firefox that is having the issue.

mikeholler commented 10 years ago

Yeah, that's fine. It's just important to let people know what is not working on a pull request. Thanks for answering! On Mar 2, 2014 4:12 PM, "Kyle Pembrook" notifications@github.com wrote:

Not yet, I can wait and request once it is fixed, but I thought having the code for everyone else might be helpful since it is only Firefox that is having the issue.

Reply to this email directly or view it on GitHubhttps://github.com/CSC495-2014/TeamworkEnglewoodGit/pull/95#issuecomment-36469141 .

kwpembrook commented 10 years ago

Right, well I am currently working on fixing the Firefox issue and the code that will pull the projects from GitHub, current table contents are hard coded in still.

mboie commented 10 years ago

Looks good to me.

mikeholler commented 10 years ago

Merge conflict. @kwpembrook, you need to resolve this before I can merge it.

kwpembrook commented 10 years ago

Yes I just noticed this and am fixing it. Just realized I had made some minor changes to the page and had not yet pushed them through to my master copy.

kwpembrook commented 10 years ago

@apotheos The merge conflict should be resolved now.

mikeholler commented 10 years ago

image

mikeholler commented 10 years ago

And now it's failing the travis build.

kwpembrook commented 10 years ago

I know I am working on it.

mikeholler commented 10 years ago

No worries, just making sure.

mikeholler commented 10 years ago

Still need to commit composer.lock after doing a composer update.

kwpembrook commented 10 years ago

Ok sorry I forgot I about updating.

mikeholler commented 10 years ago

I'm going to wait to accept this until Tuesday, so it doesn't confuse people that things are hardcoded.

mikeholler commented 10 years ago

That last commit messed a lot up. You have committed files you shouldn't have touched and also seem to have committed a unresolved merge conflict in composer.lock.

kwpembrook commented 10 years ago

Yes I do not know why it was telling me I modified those files when all I did was open and use as a reference. I did not think that anything would change when committing since I did not modify those files but I was obviously wrong. I am working on fixing it all right now.

kwpembrook commented 10 years ago

all files that should not have been modified from the previous commit are exactly as they appear in the course master repository, which should fix the issues.

kwpembrook commented 10 years ago

It is continuing to give me an error with the composer.lock file and I do not understand why.

mikeholler commented 10 years ago

Remove compose.lock, and all of vendor and do a composer update. Then try to commit composer.lock On Mar 3, 2014 11:21 PM, "Kyle Pembrook" notifications@github.com wrote:

It is continuing to give me an error with the composer.lock file and I do not understand why.

Reply to this email directly or view it on GitHubhttps://github.com/CSC495-2014/TeamworkEnglewoodGit/pull/95#issuecomment-36593175 .

kwpembrook commented 10 years ago

Thank you Mike. As for the progress of the projects page I was able to fix the issue with the table not showing in the Firefox window, now I just have to figure out why the table border isn't showing up correctly in Firefox. Aside from that there is a chance that I might not have the projects page fully functional and pulling projects from GitHub because of some issues I have run into but I met with professor St. Clair today and will be working on finishing up the code tonight and tomorrow if necessary.

mikeholler commented 10 years ago

When do you plan on having this done by? I don't remember getting an estimate from you on Tuesday on when you planned to have it completed.

kwpembrook commented 10 years ago

I have got it to where I am receiving the projects in my controller and have run into an error where it is telling me the projectsPage.blade.php view is not found so until I fix that I am unable to test that I am correctly calling the project variables to be displayed in the table. Once I fix that I can add that to the pull request and then I only have to make sure that there are only as many rows being created as there are projects for the user and then that they are being displayed oldest to newest. But I plan on having the page functional and displaying at least the first user project by tonight 10:00 pm. I have class until 8:30 and will be working on it with Matt right after that.

mikeholler commented 10 years ago

Excellent, thanks for the update!

kwpembrook commented 10 years ago

I have the table displaying the first project information and am currently working on displaying all of the projects and having the table still keep the visual enhancements it should be implementing. ie. striped rows and hover class.

kwpembrook commented 10 years ago

Functionality of the page so far is just displaying the first project for my personal account. Had some issues trying to get it to display all of the projects in the table tonight but will continue working on it. Also I still have to get the hover table class and row striping to work on the newly created rows. @mboie

image

mikeholler commented 10 years ago

Thanks Kyle, looks good! I'm hoping we can merge what you have tomorrow. On Mar 5, 2014 10:38 PM, "Kyle Pembrook" notifications@github.com wrote:

Functionality of the page so far is just displaying the first project for my personal account. Had some issues trying to get it to display all of the projects in the table tonight but will continue working on it. Also I still have to get the hover table class and row striping to work on the newly created rows. @mboie https://github.com/mboie

[image: image]https://f.cloud.github.com/assets/6401679/2341967/ffee53be-a4e8-11e3-8c9f-9ac345ce2d49.png

Reply to this email directly or view it on GitHubhttps://github.com/CSC495-2014/TeamworkEnglewoodGit/pull/95#issuecomment-36824555 .

mboie commented 10 years ago

I am fairly confident that you decided to wait until a more finalized version (with the corrections mentioned in class and added functionality) is ready before merging Kyle's code. However, if that is not the case, and you were just waiting for me to sign-off on this before it was merged, everything looks okay for now. As long as the necessary changes will be included in on the next pull request.

wwforg commented 10 years ago

@kwpembrook I just wanted to let you know that while I was replacing my curl request with an http request I found a slight error in your code, although you may have already fixed it. The laravel class used to make requests is located at Request::get, not Requests::get.

kwpembrook commented 10 years ago 
Request::get.....

This does not work for me. It gives me an error saying I'm trying to grab the property of a non-object. However when I keep it as php Requests::get.... the page displays the project I am trying to grab as I want it to.

wwforg commented 10 years ago

That might work locally but if you try to run requests::get on the server, you get an error. The error where you are trying to grab the property of a non-object comes from the fact that you are making the request without a user-agent, which is automatically rejected by GitHub. When it is rejected, it sends nothing back, and so when your code attempts to json_decode, it has nothing to decode. I am currently working on how to fix this now, i'll let you know when I get it going.

mikeholler commented 10 years ago

It is Requests, not Request. Will, you really have to start remembering when the server needs a composer install. On Mar 6, 2014 7:49 PM, "wwforg" notifications@github.com wrote:

That might work locally but if you try to run requests::get on the server, you get an error. The error where you are trying to grab the property of a non-object comes from the fact that you are making the request without a user-agent, which is automatically rejected by GitHub. I am currently working on how to fix this now, i'll let you know when I get it going.

Reply to this email directly or view it on GitHubhttps://github.com/CSC495-2014/TeamworkEnglewoodGit/pull/95#issuecomment-36960136 .

mikeholler commented 10 years ago

@wwforg

wwforg commented 10 years ago

Crap. My mistake, sorry @kwpembrook

wwforg commented 10 years ago

@apotheos I have installed the latest composer.json on the server and I am still getting an error where it cannot find the Requests class. What library is this located in?

wwforg commented 10 years ago

Nevermind. Going over Kyles code I see the requests library, It hadn't been merged yet, that's why I was confused on why I needed to do the composer install. If this is a library that others might need, can you merge just the composer.json file?

mikeholler commented 10 years ago

Ah, that's right... How ahead and add the same line to your composer.json and composer update. I'll resolve the resulting merge conflict when we have to. On Mar 7, 2014 12:44 AM, "wwforg" notifications@github.com wrote:

Nevermind. Going over Kyles code I see the requests library, It hadn't been merged yet, that's why I was confused on why I needed to do the composer install

Reply to this email directly or view it on GitHubhttps://github.com/CSC495-2014/TeamworkEnglewoodGit/pull/95#issuecomment-36971972 .

kwpembrook commented 10 years ago

@apotheos I am having some issues trying to figure out how to get the project_list.blade.php view to display by it self, not to mention within the projects page. I am going to talk to St. Clair and see if she can help me head in the right direction, but if you have any suggestions they would be greatly appreciated.

kwpembrook commented 10 years ago

Scratch that @apotheos I was able to get it working now and am just making some more adjustments to it visually and some additional testing.

kwpembrook commented 10 years ago

I was able to get the projects page to display all of the users projects (for now mine). Currently I am just tweaking the code to try and fix the border issues in IE and Firefox along with formatting the Date and organizing the projects from oldest to most recent. Currently they are listed in alphabetical order.

mikeholler commented 10 years ago

Excellent! @mboie we need a sign off here.

mboie commented 10 years ago

Outside of the things that Mike mentioned, everything seems to be good. There are obviously some aspects that you still need to fix up but if the goal is just to get a working version of the page into the system, this should do the trick for now.

kwpembrook commented 10 years ago

Sorry about that I am fixing them now.

mikeholler commented 10 years ago

I don't know what the status is on this but the pull request still includes files it shouldn't. Since this pull request thread got really long, it's becoming confusing to keep track of what's going on. I'm going to close this PR and wait for you to open another one whenever you have the files we mentioned here done.