Skip to content

Update/Updated Generative Design Examples #774

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.

Sign up for GitHub

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

Merged
merged 28 commits into from
Dec 7, 2018
Merged

Update/Updated Generative Design Examples #774

Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
86706f5
replaced () with {} to fix implicit return error
joeyklee Sep 5, 2017
22b1d7a
added first version of fetching generative-design examples
Feb 2, 2018
d8a895f
ignore local testing files
Feb 2, 2018
ec0b879
formatting
Feb 2, 2018
43d66be
updated examples-gg-latest
Feb 2, 2018
b006ee9
updated examples-gg-latest.js
Feb 2, 2018
0236b0e
updated p5 version
Feb 2, 2018
4190fe3
refactoring and code cleanup
Feb 2, 2018
215a18f
added comment
Feb 7, 2018
ac89954
comment out link to svgFiles - unused
Feb 7, 2018
5ee9a6a
moved commented code
Feb 7, 2018
d0fed06
Merge remote-tracking branch 'upstream/master'
Feb 7, 2018
e3a0675
fixed conflicts
Feb 7, 2018
69830b3
linted examples-gg-latest
Feb 7, 2018
572a4a7
pulled upstream master
Feb 9, 2018
814ae76
changed branch ref to master
Feb 20, 2018
cb4e899
rm spaces
Feb 20, 2018
1f16566
Merge branch 'master' into gg4editor
Feb 20, 2018
4c1de3f
Merge remote-tracking branch 'upstream/master'
Sep 15, 2018
6207d03
Merge branch 'master' into gg4editor
Sep 15, 2018
2d06771
updated url links with https for jquery and set branch to dev-updates…
Sep 25, 2018
9c5cc20
changed branched ref to master
Nov 1, 2018
da69ff2
Merge remote-tracking branch 'upstream/master'
Nov 1, 2018
331c4c4
removed console.log of response.data to prevent logging user data to …
Nov 1, 2018
f927792
fixed linting error
Nov 1, 2018
41391c2
Merge remote-tracking branch 'upstream/master'
joeyklee Dec 3, 2018
d799140
updated rawgit to githack
joeyklee Dec 3, 2018
e261b50
updated p5 version from 0.7.1 to 0.7.2
joeyklee Dec 7, 2018
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
21 changes: 9 additions & 12 deletions server/scripts/examples-gg-latest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,23 @@ const defaultHTML =
`<!DOCTYPE html>
<html>
<head>
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.6.1/p5.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.6.1/addons/p5.dom.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.6.1/addons/p5.sound.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.7.2/p5.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.7.2/addons/p5.dom.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.7.2/addons/p5.sound.min.js"></script>

<!-- Generative Design Dependencies here -->
<!-- GG Bundled -->
<script src=
"https://rawgit.com/generative-design/Code-Package-p5.js/${branchName}/libraries/gg-dep-bundle/gg-dep-bundle.js">
</script>

<script src="https://raw.githack.com/generative-design/Code-Package-p5.js/${branchName}/libraries/gg-dep-bundle/gg-dep-bundle.js"></script>
<!-- Opentype -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/opentype.js/0.7.3/opentype.min.js"></script>
<!-- Rita -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/rita/1.3.11/rita-small.min.js"></script>
<!-- Chroma -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/chroma-js/1.3.6/chroma.min.js"></script>
<!-- Jquery -->
<script src="http://code.jquery.com/jquery-3.3.1.min.js"
integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8="
crossorigin="anonymous"></script>
<script src="https://code.jquery.com/jquery-3.3.1.min.js"
integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8="
crossorigin="anonymous"></script>

<!-- sketch additions -->

Expand Down Expand Up @@ -432,10 +429,10 @@ function getAllSketchContent(newProjectList) {
console.log(sketchFile.name);
// https://cdn.rawgit.com/opensourcedesign/fonts/2f220059/gnu-freefont_freesans/FreeSans.otf?raw=true
// "https://raw.githubusercontent.com/generative-design/Code-Package-p5.js/gg4editor/01_P/P_3_2_1_01/data/FreeSans.otf",
const rawGitRef = `https://cdn.rawgit.com/${newProject.files[i].url.split('.com/')[1]}`;
const rawGitRef = `https://raw.githack.com/${newProject.files[i].url.split('.com/')[1]}`;
sketchFile.content = rawGitRef;
sketchFile.url = rawGitRef;

// https://raw.githack.com/generative-design/Code-Package-p5.js/master/libraries/gg-dep-bundle/gg-dep-bundle.js
// replace ref in sketch.js ==> should serve from the file?
// newProject.files[1].content = newProject.files[1].content.replace(`'data/${sketchFile.name}'`, `'${rawGitRef}'`);
resolve(newProject);
Expand Down