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

Update contribution interactive #11

Merged
merged 1 commit into from May 3, 2016

Conversation

glasnt
Copy link
Contributor

@glasnt glasnt commented Feb 26, 2016

I've also cleaned up the i10n code, so it only feeds the static 'show me something else' and other buttons.

The logic for the flow should show be self-evident: a next-group id links to the next group by id, and the question and extra divs show above and below the choice being displayed

@mithro
Copy link
Member

mithro commented Feb 29, 2016

Is this deployed somewhere I can have a quick look at? Sadly my brain isn't very good at rendering HTML :)

@glasnt
Copy link
Contributor Author

glasnt commented Mar 5, 2016

So I'm not sure how you've hooked up the publishing side of things, but it's not allowing me to view the code as is in my fork with the configurations.

What I've done is load my branch locally, and exported that from the browser (jekyll-created content) and host that up temporarily here: http://glasnt-archive.github.io/static_test/contribute-interactive.html

That should give you a good view of what the site will look like once this is merged.

@mithro
Copy link
Member

mithro commented Mar 6, 2016

Sorry for taking so long to get back to you!

So I'm not sure how you've hooked up the publishing side of things, but it's not allowing me to view the code as is in my fork with the configurations.
That should give you a good view of what the site will look like once this is merged.

Thanks for doing that.

Sounds like we have a terrible developer experience at the moment -- we should really figure out a way to get pull requests published somewhere... Any advice / thoughts on that would be useful.

What I've done is load my branch locally, and exported that from the browser (jekyll-created content) and host that up temporarily here: http://glasnt-archive.github.io/static_test/contribute-interactive.html

Looking at the content at http://glasnt-archive.github.io/static_test/contribute-interactive.html, I think it isn't currently working correctly on the initial load. I'm seeing both the Chips and Bits options and then the Chips section stays shown. Once I click the "try another option" button, things seem to work (see below);

image

I'm getting the following on the javascript console;

GET http://glasnt-archive.github.io/static_test/img/bg.png 404 (Not Found)
contribute-interactive.html:258 GET http://glasnt-archive.github.io/static_test/fonts/fontawesome-webfont.woff?v=4.1.0 
contribute-interactive.html:1 XMLHttpRequest cannot load http://localhost:4000/js/locales.ini. No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://glasnt-archive.github.io' is therefore not allowed access.
contribute-interactive.html:1 GET http://glasnt-archive.github.io/static_test/fonts/fontawesome-webfont.ttf?v=4.1.0 
contribute-interactive.html:1 GET http://glasnt-archive.github.io/static_test/contribute-interactive_files/fontawesome-webfont.woff-v-4.0.3 
contribute-interactive_files/fontawesome-webfont.ttf-v-4.0.3:1 GET http://glasnt-archive.github.io/static_test/contribute-interactive_files/fontawesome-webfont.ttf-v-4.0.3 

@glasnt
Copy link
Contributor Author

glasnt commented Mar 6, 2016

Ok, it looks like my export failed.

I'd have to take some time to work out how your publishing works (the Rakefile is custom) and then work out some sure-fire way of ensuring a local publish to gh-pages works on a fork (there is some code that looks related in there, but it wasn't working for me)

@mparuszewski
Copy link
Contributor

@glasnt Do you need any help from my side? I can offer you my help here if you want.

@glasnt
Copy link
Contributor Author

glasnt commented Mar 6, 2016

@pinoss That'd be great!

I see you've played with the Rakefile in the past.

Ideally the use case I need here is: I want the PR in my fork to publish somewhere that can be seen for testing.

I've just merged my topic changes into my master branch, which does possibly publish to gh-pages, but navigating to http://glasnt.com/website redirects to a 404 on http://glasnt.com/website/home/.

(I have a CNAME setup myself, so glasnt.github.io/website --> glasnt.com/website. I assumed that the CNAME may have been making things harder, hence I tried a new account glasnt-archive, but that didn't work, so I defaulted back to a manual Save As..., which failed for @mithro)

@mparuszewski
Copy link
Contributor

I'll take a look and let you know as soon as I find out. :) Thanks for the explanation.

@mparuszewski
Copy link
Contributor

Sorry @glasnt that it took so long, but finally I've got answers to your questions.

Make sure that you have repository with name glasnt.github.io, that is not empty and has master branch and:

First of all you have to have 2 environment variables: GIT_NAME and GH_TOKEN where GIT_NAME will be "glasnt" and GH_TOKEN should be generated with (https://help.github.com/articles/creating-an-access-token-for-command-line-use/). Just keep those values in your .bash_rc/.bash_profile file.

Second you have to change your _config.yml file: Change username: timvideos to username: glasnt
and in Rakefile change line 21 (this change should be applied to this timvideos/website repository to make it easier for you and others to deploy) to:

if DESTINATION_REPO == "#{USERNAME}/#{USERNAME}.github.io"

Run command with bundle exec rake site:deploy

After few minutes it will be ready. :)

@glasnt
Copy link
Contributor Author

glasnt commented Apr 9, 2016

Thanks @pinoss! Sorry I took so long to respond.

Since I have my own website hosted on my domain, and this site assumes it's hosted on the toplevel of a domain, I couldn't get this hosted on my own account.

@mithro the branch should be rendered and available up at http://glasnt-archive.github.io/contribute-interactive/

@mithro mithro merged commit e8ac9b7 into timvideos:master May 3, 2016
@mithro
Copy link
Member

mithro commented May 10, 2016

Hi @glasnt,

I'm really sorry this took so long to merge. I merged it last week and it was auto deployed on the live site.

Thanks for your contribution.

Tim 'mithro' Ansell

@glasnt glasnt deleted the topic/update-interactive branch May 10, 2016 07:17
@glasnt
Copy link
Contributor Author

glasnt commented May 10, 2016

@mithro no worries; I'm sorry it took me so long to work out how to wrangle your build system. At least things are fixed now 👍

@mithro
Copy link
Member

mithro commented May 10, 2016

We should make the build system a bit more self explanatory. #15

@mithro
Copy link
Member

mithro commented May 10, 2016

@glasnt If you have more time to spare, it would be awesome if we could get the kind of graphical pictures which now appear on https://code.timvideos.us/contribute-diagram/ in the interactive version.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants