Skip to content

Commit 9479291

Browse files
satyasaibhushansatyasaibhushan
committed
Merge branch 'develop' of https://github.com/processing/p5.js-web-editor into remove_find_next_options
2 parents ac829da + aa51e20 commit 9479291

File tree

13 files changed

+46
-35
lines changed

13 files changed

+46
-35
lines changed

‎.env.example

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ EXAMPLE_USER_PASSWORD=hellop5js
1010
GG_EXAMPLES_USERNAME=generativedesign
1111
GG_EXAMPLES_EMAIL=benedikt.gross@generative-gestaltung.de
1212
GG_EXAMPLES_PASS=generativedesign
13-
ML5_EXAMPLES_USERNAME=ml5
14-
ML5_EXAMPLES_EMAIL=examples@ml5js.org
15-
ML5_EXAMPLES_PASS=helloml5
13+
ML5_LIBRARY_USERNAME=ml5
14+
ML5_LIBRARY_EMAIL=examples@ml5js.org
15+
ML5_LIBRARY_PASS=helloml5
1616
GITHUB_ID=<your-github-client-id>
1717
GITHUB_SECRET=<your-github-client-secret>
1818
GOOGLE_ID=<your-google-client-id> (use google+ api)

‎client/components/__test__/Nav.test.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ describe('Nav', () => {
4646
},
4747
t: jest.fn(),
4848
setLanguage: jest.fn(),
49-
language: 'en-US'
49+
language: 'en-US',
50+
isUserOwner: true
5051
};
5152

5253
it('renders correctly', () => {

‎client/modules/IDE/components/Editor.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ class Editor extends React.Component {
284284
mode = 'javascript';
285285
} else if (fileName.match(/.+\.css$/i)) {
286286
mode = 'css';
287-
} else if (fileName.match(/.+\.html$/i)) {
287+
} else if (fileName.match(/.+\.(html|xml)$/i)) {
288288
mode = 'htmlmixed';
289289
} else if (fileName.match(/.+\.json$/i)) {
290290
mode = 'application/json';

‎client/modules/IDE/reducers/files.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ function draw() {
1212
const defaultHTML = `<!DOCTYPE html>
1313
<html lang="en">
1414
<head>
15-
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.1.9/p5.js"></script>
16-
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.1.9/addons/p5.sound.min.js"></script>
15+
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.2.0/p5.js"></script>
16+
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.2.0/addons/p5.sound.min.js"></script>
1717
<link rel="stylesheet" type="text/css" href="style.css">
1818
<meta charset="utf-8" />
1919
@@ -167,8 +167,7 @@ const files = (state, action) => {
167167
return [...action.files];
168168
case ActionTypes.RESET_PROJECT:
169169
return initialState();
170-
case ActionTypes.CREATE_FILE: // eslint-disable-line
171-
{
170+
case ActionTypes.CREATE_FILE: {
172171
const newState = [
173172
...updateParent(state, action),
174173
{

‎server/controllers/project.controller/deleteProject.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ function deleteFilesFromS3(files) {
1111
deleteObjectsFromS3(
1212
files
1313
.filter((file) => {
14-
if (file.url) {
14+
if (
15+
file.url &&
16+
(file.url.includes(process.env.S3_BUCKET_URL_BASE) ||
17+
file.url.includes(process.env.S3_BUCKET))
18+
) {
1519
if (
1620
!process.env.S3_DATE ||
1721
(process.env.S3_DATE &&

‎server/domain-objects/createDefaultFiles.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ function draw() {
99
const defaultHTML = `<!DOCTYPE html>
1010
<html>
1111
<head>
12-
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.1.9/p5.js"></script>
13-
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.1.9/addons/p5.sound.min.js"></script>
12+
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.2.0/p5.js"></script>
13+
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.2.0/addons/p5.sound.min.js"></script>
1414
<link rel="stylesheet" type="text/css" href="style.css">
1515
<meta charset="utf-8" />
1616

‎server/scripts/examples-ml5.js

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@ import rp from 'request-promise';
33
import Q from 'q';
44
import { ok } from 'assert';
55

6-
// TODO: Change branchName if necessary
7-
const branchName = 'release';
6+
const branchName = 'main';
87
const branchRef = `?ref=${branchName}`;
9-
const baseUrl = 'https://api.github.com/repos/ml5js/ml5-examples/contents';
8+
const baseUrl = 'https://api.github.com/repos/ml5js/ml5-library/contents';
109
const clientId = process.env.GITHUB_ID;
1110
const clientSecret = process.env.GITHUB_SECRET;
12-
const editorUsername = process.env.ML5_EXAMPLES_USERNAME;
11+
const editorUsername = process.env.ML5_LIBRARY_USERNAME;
1312
const personalAccessToken = process.env.EDITOR_API_ACCESS_TOKEN;
1413
const editorApiUrl = process.env.EDITOR_API_URL;
1514
const headers = {
@@ -18,7 +17,7 @@ const headers = {
1817

1918
ok(clientId, 'GITHUB_ID is required');
2019
ok(clientSecret, 'GITHUB_SECRET is required');
21-
ok(editorUsername, 'ML5_EXAMPLES_USERNAME is required');
20+
ok(editorUsername, 'ML5_LIBRARY_USERNAME is required');
2221
ok(personalAccessToken, 'EDITOR_API_ACCESS_TOKEN is required');
2322
ok(editorApiUrl, 'EDITOR_API_URL is required');
2423

@@ -79,17 +78,24 @@ async function fetchFileContent(item) {
7978
options.url !== ''
8079
) {
8180
file.content = await rp(options);
81+
8282
// NOTE: remove the URL property if there's content
8383
// Otherwise the p5 editor will try to pull from that url
8484
if (file.content !== null) delete file.url;
85+
86+
// Replace localhost references with references to the currently published version.
87+
file.content = file.content.replace(
88+
/http:\/\/localhost(:[0-9]+)\/ml5.js/g,
89+
'https://unpkg.com/ml5@latest/dist/ml5.min.js'
90+
);
8591
}
8692

8793
return file;
8894
// if it is NOT an html or js file
8995
}
9096

9197
if (file.url) {
92-
const cdnRef = `https://cdn.jsdelivr.net/gh/ml5js/ml5-examples@${branchName}${
98+
const cdnRef = `https://cdn.jsdelivr.net/gh/ml5js/ml5-library@${branchName}${
9399
file.url.split(branchName)[1]
94100
}`;
95101
file.url = cdnRef;
@@ -104,7 +110,7 @@ async function fetchFileContent(item) {
104110
async function getCategories() {
105111
try {
106112
const options = Object.assign({}, githubRequestOptions);
107-
options.url = `${options.url}/p5js${branchRef}`;
113+
options.url = `${options.url}/examples/p5js${branchRef}`;
108114
const results = await rp(options);
109115

110116
return results;
@@ -125,7 +131,7 @@ async function getCategoryExamples(sketchRootList) {
125131
// let options = Object.assign({url: `${requestOptions.url}/${categories.path}${branchRef}`}, requestOptions)
126132
const options = Object.assign({}, githubRequestOptions);
127133
options.url = `${options.url}${categories.path}${branchRef}`;
128-
// console.log(options)
134+
129135
const sketchDirs = await rp(options);
130136

131137
try {
@@ -158,7 +164,7 @@ async function traverseSketchTree(parentObject) {
158164
if (parentObject.type !== 'dir') {
159165
return output;
160166
}
161-
// let options = `https://api.github.com/repos/ml5js/ml5-examples/contents/${sketches.path}${branchRef}`
167+
// let options = `https://api.github.com/repos/ml5js/ml5-library/contents/examples/p5js/${sketches.path}${branchRef}`
162168
const options = Object.assign({}, githubRequestOptions);
163169
options.url = `${options.url}${parentObject.path}${branchRef}`;
164170

@@ -353,7 +359,7 @@ async function createProjectsInP5User(filledProjectList, user) {
353359

354360
/**
355361
* MAKE
356-
* Get all the sketches from the ml5-examples repo
362+
* Get all the sketches from the ml5-library repo
357363
* Get the p5 examples
358364
* Dive down into each sketch and get all the files
359365
* Format the sketch files to be save to the db
@@ -378,7 +384,7 @@ async function make() {
378384

379385
/**
380386
* TEST - same as make except reads from file for testing purposes
381-
* Get all the sketches from the ml5-examples repo
387+
* Get all the sketches from the ml5-library repo
382388
* Get the p5 examples
383389
* Dive down into each sketch and get all the files
384390
* Format the sketch files to be save to the db
@@ -414,7 +420,7 @@ async function test() {
414420
*/
415421

416422
if (process.env.NODE_ENV === 'development') {
417-
// test()
423+
// test();
418424
make(); // replace with test() if you don't want to run all the fetch functions over and over
419425
} else {
420426
make();

‎server/scripts/examples.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import Project from '../models/project';
99
const defaultHTML = `<!DOCTYPE html>
1010
<html lang="en">
1111
<head>
12-
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.1.9/p5.js"></script>
13-
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.1.9/addons/p5.sound.min.js"></script>
12+
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.2.0/p5.js"></script>
13+
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.2.0/addons/p5.sound.min.js"></script>
1414
<link rel="stylesheet" type="text/css" href="style.css">
1515
<meta charset="utf-8" />
1616
</head>

‎server/utils/fileUtils.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,13 @@ export const fileExtensionsArray = [
3838
'mov',
3939
'vert',
4040
'frag',
41-
'bin'
41+
'bin',
42+
'xml'
4243
];
4344

4445
export const mimeTypes = `image/*,audio/*,text/javascript,text/html,text/css,
4546
application/json,application/x-font-ttf,application/x-font-truetype,text/plain,
46-
text/csv,.obj,video/webm,video/ogg,video/quicktime,video/mp4`;
47+
text/csv,.obj,video/webm,video/ogg,video/quicktime,video/mp4,application/xml`;
4748

4849
export const fileExtensions = fileExtensionsArray
4950
.map((ext) => `.${ext}`)
@@ -64,10 +65,10 @@ export const MEDIA_FILE_QUOTED_REGEX = new RegExp(
6465

6566
export const STRING_REGEX = /(['"])((\\\1|.)*?)\1/gm;
6667
// these are files that have to be linked to with a blob url
67-
export const PLAINTEXT_FILE_REGEX = /.+\.(json|txt|csv|vert|frag|tsv)$/i;
68+
export const PLAINTEXT_FILE_REGEX = /.+\.(json|txt|csv|vert|frag|tsv|xml)$/i;
6869
// these are files that users would want to edit as text (maybe svg should be here?)
69-
export const TEXT_FILE_REGEX = /.+\.(json|txt|csv|tsv|vert|frag|js|css|html|htm|jsx)$/i;
70+
export const TEXT_FILE_REGEX = /.+\.(json|txt|csv|tsv|vert|frag|js|css|html|htm|jsx|xml)$/i;
7071
export const NOT_EXTERNAL_LINK_REGEX = /^(?!(http:\/\/|https:\/\/))/;
7172
export const EXTERNAL_LINK_REGEX = /^(http:\/\/|https:\/\/)/;
7273

73-
export const CREATE_FILE_REGEX = /.+\.(json|txt|csv|tsv|js|css|frag|vert)$/i;
74+
export const CREATE_FILE_REGEX = /.+\.(json|txt|csv|tsv|js|css|frag|vert|xml|html|htm)$/i;

‎translations/locales/en-US/translations.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@
236236
"Title": "Create File",
237237
"CloseButtonARIA": "Close New File Modal",
238238
"EnterName": "Please enter a name",
239-
"InvalidType": "Invalid file type. Valid extensions are .js, .css, .json, .txt, .csv, .tsv, .frag, and .vert."
239+
"InvalidType": "Invalid file type. Valid extensions are .js, .css, .json, .xml, .txt, .csv, .tsv, .frag, and .vert."
240240
},
241241
"NewFileForm": {
242242
"AddFileSubmit": "Add File",

‎translations/locales/es-419/translations.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@
236236
"Title": "Crear Archivo",
237237
"CloseButtonARIA": "Cerrar diálogo de crear archivo",
238238
"EnterName": "Por favor introduce un nombre",
239-
"InvalidType": "Tipo de archivo inválido. Las extensiones válidas son .js, .css, .json, .txt, .csv, .tsv, .frag y .vert."
239+
"InvalidType": "Tipo de archivo inválido. Las extensiones válidas son .js, .css, .json, .xml, .txt, .csv, .tsv, .frag y .vert."
240240
},
241241
"NewFileForm": {
242242
"AddFileSubmit": "Agregar Archivo",

‎translations/locales/hi/translations.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@
236236
"Title": "फ़ाइल बनाएँ",
237237
"CloseButtonARIA": "नई फ़ाइल मोडल बंद करें",
238238
"EnterName": "कृपया एक नाम दर्ज करें",
239-
"InvalidType": "अमान्य फ़ाइल प्रकार। मान्य एक्सटेंशन हैं .js, .css, .json, .txt, .csv, .tsv, .frag, और .vert."
239+
"InvalidType": "अमान्य फ़ाइल प्रकार। मान्य एक्सटेंशन हैं .js, .css, .json, .xml, .txt, .csv, .tsv, .frag, और .vert."
240240
},
241241
"NewFileForm": {
242242
"AddFileSubmit": "फाइल जोडें",

‎translations/locales/ja/translations.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@
236236
"Title": "ファイル作成",
237237
"CloseButtonARIA": "新規ファイルモーダルを閉じる",
238238
"EnterName": "ファイル名を入力してください",
239-
"InvalidType": "ファイルタイプが無効です。有効な拡張子は、.js、.css、.json、.txt、.csv、.tsv、.frag、.vertです。"
239+
"InvalidType": "ファイルタイプが無効です。有効な拡張子は、.js、.css、.json、.xml、.txt、.csv、.tsv、.frag、.vertです。"
240240
},
241241
"NewFileForm": {
242242
"AddFileSubmit": "ファイルを追加",

0 commit comments

Comments
 (0)