CSS file seems to disappear when moving from step 5 to 6 about node-workshop HOT 15 CLOSED

@SavageWilliam and @msachi, we did some work on this over the weekend but there are probably still bugs we haven't spotted. It's currently sitting on the branch https://github.com/node-girls/workshop-cms/tree/fix-git-flow-issues so if you have time, could you try it out and let us know if there are any problems before merging?

from node-workshop.

Aw that's great! We'll get a move on and try to do it this weekend. 😃

from node-workshop.

Hey @claireinez! Thanks for taking the time to improve this really useful tutorial. It's so much better not to have so many steps and include all assets from the beginning as you build the server. I had a look and I couldn't spot any issues. The only thing I noted is that the 'HitCount' image in the readme doesn't appear - something to do with the links maybe?...

@SavageWilliam @msachi if you have any further comments/issues, please post here.

We are planning to use this repo as a tutorial to FAC10 next Monday, so it would be great if it could be merged to master before then. If not, people could checkout this branch instead of master.

from node-workshop.

Thanks @msmichellegar - sorry I missed the email! But job done anyway:+1:

from node-workshop.

Yes, we're aware there are some issues with the git flow aspect of this repo! We are going to restructure the workshop without recommending those doing it checkout at the end of each step, and just include all the assets in the master branch (or one other branch).

from node-workshop.

Ok, great ☺️

from node-workshop.

How's progress with this issue? FAC9 would love to use this repo as a workshop for FAC10 😄

from node-workshop.

Thanks for checking it out @marisid! Wanna pull request @claireinez?

from node-workshop.

Girls, I just realised that the readme (see extract below) has not been updated accordingly after you fixed the git flow issues.

The project has been split into steps, which are documented in separate files here on the master branch.
If you run git branch on your machine, you will see there is a branch per step. Write all your code in the relevant git branch for your step.
At the start of each step, you will need to checkout to the next branch on Git.
You will be reminded to do this at the start of each step, like so:
git checkout [name of a particular branch]
git merge [name of previous branch]

Maybe wanna say that each step builds on top of the other and that there is no need to checkout to different branches but just commit your changes at the end of each step?

from node-workshop.

@marisid I'm not at a computer today so can't push changes but if you make a PR and assign me, @msmichellegar or @minaorangina, we'll be happy to review!

from node-workshop.

Hey @claireinez - no problem! I've made the changes but have no access to the repo as a contributor. Could you please give me permission to push?

from node-workshop.

@marisid Added you to this repo 👍

from node-workshop.

@msmichellegar I still don't have write access rights 😕 but it's ok, I created a PR from my forked repo 😄 - pls have a look when you can.

from node-workshop.

@marisid Think you need to accept the invite. But that's ok, I'll check out your PR!

from node-workshop.

Going to close this now!

from node-workshop.