scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-15 10:02:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
12379 commits 220 branches 1 tag 511 MiB
Commit graph

2236 commits

Author SHA1 Message Date
picklesrus
f4774f229c
pin babel dependency 
Co-Authored-By: Ray Schamp <rschamp@users.noreply.github.com>
 2019-08-02 09:57:08 -04:00
greenkeeper[bot]
767dd6b9a3 chore(package): update scratch-gui to version 0.1.0-prerelease.20190802124055 2019-08-02 13:09:28 +00:00
picklesrus
98a25068d6 Enable react linting and move test file to .jsx instead of .js. 2019-08-01 16:16:42 -04:00
greenkeeper[bot]
ae04f20b75 chore(package): update scratch-gui to version 0.1.0-prerelease.20190801170416 2019-08-01 17:18:05 +00:00
picklesrus
0e09e29c80 Add Enzyme to www and add a test for the NextStepButton. This takes our enzyme helpers from gui and copies them here. It also requires a babel plugin to play nicely with jest. 2019-07-31 17:35:57 -04:00
greenkeeper[bot]
5859b28c06 chore(package): update scratch-gui to version 0.1.0-prerelease.20190731192641 2019-07-31 19:40:52 +00:00
greenkeeper[bot]
5b870fdf02 chore(package): update scratch-gui to version 0.1.0-prerelease.20190731154138 
Closes #3193
 2019-07-31 16:06:05 +00:00
greenkeeper[bot]
96c6a9c546 chore(package): update scratch-gui to version 0.1.0-prerelease.20190730192808 2019-07-30 19:46:58 +00:00
greenkeeper[bot]
02c2f44b34 chore(package): update scratch-gui to version 0.1.0-prerelease.20190729162318 2019-07-29 16:39:09 +00:00
greenkeeper[bot]
a65fc35545 chore(package): update scratch-gui to version 0.1.0-prerelease.20190725155313 
Closes #3175
 2019-07-25 16:06:59 +00:00
greenkeeper[bot]
3d0c445138 chore(package): update scratch-gui to version 0.1.0-prerelease.20190724175453 
Closes #3168
 2019-07-24 18:16:30 +00:00
greenkeeper[bot]
9485ab9405 chore(package): update scratch-gui to version 0.1.0-prerelease.20190723203336 
Closes #3165
 2019-07-23 20:47:01 +00:00
Ben Wheeler
f180d4f395 update eslint-related package versions 2019-07-22 21:24:37 -04:00
Benjamin Wheeler
32368a99be
Merge pull request #3162 from benjiwheeler/jest-validation-tests 
rewrote validate legacy unit test from using tap, to using jest
 2019-07-22 17:36:35 -04:00
Karishma Chadha
f97400e324
Merge pull request #3164 from LLK/hotfix/custom-proc-params 
[Develop] - Hotfix/custom proc params
 2019-07-22 16:02:49 -04:00
Ben Wheeler
a6dc573f30 rewrote validate legacy unit test from using tap, to using jest 2019-07-22 14:54:25 -04:00
Karishma Chadha
80ac3a774f Pull in gui hotfix reverting vm PR that introduces regression in custom procedure parameters. 2019-07-22 14:38:08 -04:00
BryceLTaylor
d3b003c2bb Merge branch 'Add-Jest' into develop 
# Conflicts:
#	package-lock.json
 2019-07-22 09:54:15 -04:00
BryceLTaylor
53fc6e57fd Make npm run test run all unit tests 2019-07-18 16:18:27 -04:00
picklesrus
d52b65f6f8 Update gui version with revert of PR from scratch-svg-renderer 2019-07-18 14:43:20 -04:00
greenkeeper[bot]
9dbd789b86 chore(package): update url-loader to version 2.1.0 2019-07-18 12:59:56 +00:00
picklesrus
7ca9c4bd69 Bump gui version for release. 2019-07-18. 2019-07-17 18:22:38 -04:00
BryceLTaylor
7f6a316224 remove enzyme since we don't use it yet 2019-07-17 16:20:11 -04:00
BryceLTaylor
b63d64d03e Run Jest tests alongside Tap tests 2019-07-17 15:33:01 -04:00
BryceLTaylor
c56f488b33 Add Jest, Enzyme, and sample tests 2019-07-17 15:27:13 -04:00
BryceLTaylor
dd6b7ba4e2 Move tap tests into legacy folders 2019-07-17 14:56:48 -04:00
Benjamin Wheeler
9df814846f
Merge pull request #3096 from LLK/greenkeeper/react-modal-3.8.2 
Update react-modal to the latest version 🚀
 2019-07-16 23:52:22 -04:00
Ray Schamp
5e868575c6
Merge pull request #3137 from LLK/hotfix/remove-makefile 
Move Makefile into package.json, remove Docker config
 2019-07-15 16:54:08 -04:00
Ray Schamp
cccb908221 Remove remaining references to Docker 2019-07-15 10:55:56 -04:00
Andrew Sliwinski
4483b6d5a2
Merge pull request #2918 from LLK/greenkeeper/lodash.range-3.2.0 
Update lodash.range to the latest version 🚀
 2019-07-15 10:23:06 -04:00
Ray Schamp
065b808815 Fix lint script 2019-07-15 10:10:52 -04:00
Ray Schamp
7e284ba6db Fix deploy scripts 2019-07-15 10:03:43 -04:00
Ray Schamp
6be82960f0 Fix tap scripts 2019-07-15 09:52:17 -04:00
Ray Schamp
3e6982ff9d Move remaining Makefile entries to package.json 
Remove Docker since it wasn’t really being used.
 2019-07-15 09:24:47 -04:00
Benjamin Wheeler
a848a0f60e
Merge pull request #3094 from LLK/greenkeeper/google-libphonenumber-3.2.3 
Update google-libphonenumber to the latest version 🚀
 2019-07-14 16:39:09 -04:00
Ray Schamp
3c76849077 Merge branch 'Remove-Make-From-Tests' of https://github.com/BryceLTaylor/scratch-www into remove-makefile 2019-07-12 13:52:12 -04:00
Ray Schamp
5a6fb64d4a Upgrade async to v3 2019-07-12 13:09:09 -04:00
Ray Schamp
287b2de09d Downgrade async 2019-07-12 10:45:03 -04:00
Ray Schamp
cdd8752c8c Merge branch 'greenkeeper/async-3.1.0' of github.com:LLK/scratch-www into upgrade-dependencies 2019-07-12 10:06:33 -04:00
Ray Schamp
cc606ee461 Merge branch 'greenkeeper/file-loader-4.0.0' of github.com:LLK/scratch-www into upgrade-dependencies 
# Conflicts:
#	package.json
 2019-07-12 10:06:18 -04:00
Ray Schamp
86c9cfe455 Merge branch 'greenkeeper/url-loader-2.0.1' of github.com:LLK/scratch-www into upgrade-dependencies 
# Conflicts:
#	package.json
 2019-07-12 10:05:14 -04:00
DD Liu
2a84a4d592
Update gui dep 2019-07-10 21:45:46 -04:00
BryceLTaylor
a92abd4910 Use npm exclusively (not make) to run tests 2019-07-09 14:49:44 -04:00
Paul Kaplan
53f72ae153 Bump GUI to fix asset errors 2019-07-03 10:30:08 -04:00
greenkeeper[bot]
1786e2d9f7 chore(package): update react-modal to version 3.8.2 2019-06-30 20:48:54 +00:00
greenkeeper[bot]
d07d4515da chore(package): update google-libphonenumber to version 3.2.3 2019-06-28 14:39:38 +00:00
greenkeeper[bot]
7c575a3aee chore(package): update scratch-gui to version 0.1.0-prerelease.20190626180304 
Closes #3064
 2019-06-26 18:22:15 +00:00
picklesrus
2e52f462d0
Merge pull request #3063 from LLK/release/2019-06-20 
[Develop] Release 2019-06-20
 2019-06-25 17:56:17 -04:00
greenkeeper[bot]
0df8d034f2 chore(package): update url-loader to version 2.0.1 
Closes #3032
 2019-06-25 11:28:43 +00:00
Ben Wheeler
69164a5f53 added formik dependency, join flow steps using it 2019-06-24 13:35:01 -04:00
greenkeeper[bot]
dc30aac2c5 chore(package): update async to version 3.1.0 
Closes #3016
 2019-06-23 05:35:43 +00:00
picklesrus
0506df192b
Put GUI version back to what it was originally. 
Essentially undo edffa47f65 since it wasn't the cause of any problems.
 2019-06-21 12:37:14 -04:00
picklesrus
edffa47f65
Update gui version to take out e16n changes 2019-06-20 11:59:24 -04:00
Ray Schamp
94c7bb827a
Merge pull request #3025 from BryceLTaylor/Skip-Flakey-Tests 
Skip flakey tests
 2019-06-19 21:48:04 -04:00
Eric Rosenbaum
12aab66d1c
Update GUI 2019-06-19 18:34:41 -04:00
BryceLTaylor
6c21431162 Update the other smoke tests to not use new test report 2019-06-19 15:50:05 -04:00
Christopher Willis-Ford
2b0ba34cee update scratch-gui for e16n features 2019-06-18 23:51:46 -07:00
Karishma Chadha
d239979926
Revert "Pull in latest scratch-gui" 2019-06-18 23:51:53 -04:00
Karishma Chadha
e338be2bfb
Pull in latest scratch-gui 2019-06-18 23:06:23 -04:00
greenkeeper[bot]
419de4d8da chore(package): update scratch-gui to version 0.1.0-prerelease.20190612160757 2019-06-12 16:21:28 +00:00
greenkeeper[bot]
c2686024ff chore(package): update scratch-gui to version 0.1.0-prerelease.20190610172350 2019-06-10 17:36:42 +00:00
greenkeeper[bot]
15d5fbb152 chore(package): update scratch-gui to version 0.1.0-prerelease.20190610133056 2019-06-10 13:57:52 +00:00
greenkeeper[bot]
f5c16181a7 chore(package): update scratch-gui to version 0.1.0-prerelease.20190605185254 
Closes #3033
 2019-06-05 19:05:04 +00:00
greenkeeper[bot]
772ab75b12 chore(package): update scratch-gui to version 0.1.0-prerelease.20190605144936 2019-06-05 15:09:39 +00:00
greenkeeper[bot]
6ba308fc66 chore(package): update file-loader to version 4.0.0 2019-06-05 13:04:30 +00:00
greenkeeper[bot]
7673bf9086 chore(package): update scratch-gui to version 0.1.0-prerelease.20190604202002 2019-06-04 20:41:19 +00:00
BryceLTaylor
55756f93bd Update tap to the most recent version 2019-06-03 16:27:34 -04:00
Benjamin Wheeler
2cbe9b16a7
Merge pull request #2987 from benjiwheeler/update-react-modal 
update react-modal
 2019-05-31 11:38:52 -04:00
Ben Wheeler
d32dc86508 updated to correct scratch-gui release 2019-05-30 14:24:56 -04:00
Ben Wheeler
b2a22c6a11 update gui version with 4 reversions 2019-05-30 13:02:20 -04:00
Colby Gutierrez-Kraybill
e788d2d77b Update scratch-gui 2019-05-29 16:50:55 -04:00
Ben Wheeler
1b995908a2 update react-modal 2019-05-29 15:29:52 -04:00
greenkeeper[bot]
a258208c2f chore(package): update scratch-gui to version 0.1.0-prerelease.20190522232752 2019-05-23 00:02:51 +00:00
greenkeeper[bot]
b2dfe404bb chore(package): update scratch-gui to version 0.1.0-prerelease.20190522193014 
Closes #2995
 2019-05-22 19:43:34 +00:00
Chris Garrity
da231ccf6a update gui 
get fixes for rapa nui:
* music extension instrument block
* hide (long) labels on paint editor buttons
 2019-05-16 13:41:01 -04:00
greenkeeper[bot]
3fa1b3cf79 chore(package): update scratch-gui to version 0.1.0-prerelease.20190515193432 
Closes #2972
 2019-05-15 19:46:56 +00:00
Paul Kaplan
4836157e64
Bump scratch-gui dep 2019-05-08 14:57:13 -04:00
greenkeeper[bot]
f3be5600bd chore(package): update scratch-gui to version 0.1.0-prerelease.20190508123954 
Closes #2949
 2019-05-08 12:52:43 +00:00
greenkeeper[bot]
6e0b592f55 chore(package): update scratch-gui to version 0.1.0-prerelease.20190501211108 
Closes #2931
 2019-05-01 21:24:06 +00:00
Eric Rosenbaum
11a9363e69
update GUI 2019-04-24 17:30:08 -04:00
greenkeeper[bot]
d338ffc8ff chore(package): update lodash.range to version 3.2.0 2019-04-20 16:39:11 +00:00
Paul Kaplan
8c5ae63030
Bump GUI 2019-04-19 17:28:25 -04:00
Paul Kaplan
d39af45caa
Bump GUI version 2019-04-19 16:39:41 -04:00
Paul Kaplan
fbf6e612b6
Bring in svg renderer fix 2019-04-19 15:20:43 -04:00
Benjamin Wheeler
bfe658748b
Updated to gui release with fixed upload confirm 2019-04-18 12:05:50 -04:00
Karishma Chadha
9aab911d67
Pull in latest scratch-gui 2019-04-17 18:31:50 -04:00
chrisgarrity
e4aac09f0f Update react-intl to bring in māori locale-data 2019-04-17 11:43:35 -04:00
Karishma Chadha
7f0f1f6035
Update gui version to pull in latest build on hotfix channel. 2019-04-16 16:40:48 -04:00
Karishma Chadha
bec4e95adc
Update scratch-gui to pull in fix for saving assets to asset server before putting them in the backpack 2019-04-16 11:22:09 -04:00
Paul Kaplan
9466074d0b
Update GUI to get reverts for storage and render 2019-04-11 11:51:59 -04:00
greenkeeper[bot]
6ee66216ee chore(package): update scratch-gui to version 0.1.0-prerelease.20190410204045 2019-04-10 20:53:01 +00:00
greenkeeper[bot]
f59fc3c0df chore(package): update scratch-gui to version 0.1.0-prerelease.20190410183725 2019-04-10 18:52:24 +00:00
greenkeeper[bot]
486ad353a1 chore(package): update scratch-gui to version 0.1.0-prerelease.20190410173132 
Closes #2884
 2019-04-10 18:36:53 +00:00
greenkeeper[bot]
17f9c5a5a5 chore(package): update scratch-gui to version 0.1.0-prerelease.20190404100408 
Closes #2867
 2019-04-04 10:16:36 +00:00
chrisgarrity
f3d60a1a2d Remove dependency on scratchr2_translations 2019-03-27 11:08:09 +01:00
greenkeeper[bot]
ca57f4a312 chore(package): update scratch-gui to version 0.1.0-prerelease.20190326161126 
Closes #2862
 2019-03-26 17:25:40 +00:00
picklesrus
cc8efab57c
Update to new GUI 
Removes Hindi from speech to text list while some bugs get fixed.
 2019-03-21 11:38:42 -04:00
greenkeeper[bot]
26cc75510d chore(package): update scratch-gui to version 0.1.0-prerelease.20190320192801 2019-03-20 19:40:03 +00:00
Paul Kaplan
35aff3592b
Merge pull request #2850 from LLK/greenkeeper/scratch-gui-0.1.0-prerelease.20190320190756 
chore(package): update scratch-gui to version 0.1.0-prerelease.201903…
 2019-03-20 15:26:31 -04:00
Paul Kaplan
24cb6edcf6
Merge pull request #2846 from LLK/greenkeeper/scratch-parser-5.0.0 
Update scratch-parser to the latest version 🚀
 2019-03-20 15:26:04 -04:00
greenkeeper[bot]
2c1147195a chore(package): update scratch-gui to version 0.1.0-prerelease.20190320190756 
Closes #2848
 2019-03-20 19:20:03 +00:00
greenkeeper[bot]
b740997d9e chore(package): update scratch-gui to version 0.1.0-prerelease.20190318205056 
Closes #2843
 2019-03-18 21:07:27 +00:00
greenkeeper[bot]
33390aa63c fix(package): update scratch-parser to version 5.0.0 2019-03-18 21:06:36 +00:00
Paul Kaplan
d8580f1967
Downgrade to leave out the VM microbit queue 2019-03-14 12:04:07 -04:00
greenkeeper[bot]
d103b81617 chore(package): update scratch-gui to version 0.1.0-prerelease.20190314120510 
Closes #2836
 2019-03-14 12:20:15 +00:00
greenkeeper[bot]
2b737c7b8d chore(package): update scratch-gui to version 0.1.0-prerelease.20190311150203 
Closes #2829
 2019-03-11 17:13:12 +00:00
greenkeeper[bot]
fb2eab0e4f chore(package): update scratch-gui to version 0.1.0-prerelease.20190306221121 
Closes #2816
 2019-03-07 00:13:38 +00:00
Paul Kaplan
6e568ceae9
Bump GUI 2019-02-28 09:20:25 -05:00
greenkeeper[bot]
90c9136400 chore(package): update scratch-gui to version 0.1.0-prerelease.20190220184137 
Closes #2786
 2019-02-20 18:52:48 +00:00
greenkeeper[bot]
e3f10968a2 chore(package): update scratch-gui to version 0.1.0-prerelease.20190214204000 
Closes #2779
 2019-02-14 22:04:41 +00:00
greenkeeper[bot]
05cb8cbb52 chore(package): update scratch-gui to version 0.1.0-prerelease.20190213213304 
Closes #2775
 2019-02-13 23:39:08 +00:00
greenkeeper[bot]
de9f2c7cf7 chore(package): update scratch-gui to version 0.1.0-prerelease.20190213180412 
Closes #2770
 2019-02-13 18:28:25 +00:00
Ray Schamp
62d6515a39
Merge branch 'develop' into greenkeeper/initial 2019-02-11 09:56:18 -05:00
Ray Schamp
35753dc78d
Only update gui 2019-02-11 09:53:54 -05:00
Paul Kaplan
942771f825
Update GUI to remove touching color fixes 2019-02-07 16:57:12 -05:00
Paul Kaplan
134bf4ed1f
Bump GUI to bring in VM and file export fixes 2019-02-07 14:57:33 -05:00
greenkeeper[bot]
74bb2b9f2d chore(package): update dependencies 2019-02-07 16:46:16 +00:00
greenkeeper[bot]
7a85771440 chore(package): update scratch-gui to version 0.1.0-prerelease.20190207141026 
Closes #2752
 2019-02-07 14:12:20 +00:00
Paul Kaplan
6d7adc9081 Revert all updates except gui 2019-02-06 14:39:37 -05:00
greenkeeper[bot]
292461b591 chore(package): update dependencies 2019-02-06 16:22:18 +00:00
chrisgarrity
c9a47c96df Bump gui again for blocks translation update 2019-01-31 14:09:26 +01:00
Paul Kaplan
8163eb84af
Bump GUI 2019-01-30 15:19:53 -05:00
picklesrus
0019532c38
Bump Gui 2019-01-23 18:25:21 -05:00
Paul Kaplan
45a6779a32
Bump GUI 2019-01-23 16:44:25 -05:00
Paul Kaplan
b547432451
Bump GUI to fix sound reordering bug 2019-01-18 15:33:23 -05:00
Paul Kaplan
23be323a00
Bump GUI 2019-01-17 15:48:45 -05:00
Paul Kaplan
8df6a9033f
Bump GUI with new languages from blocks 2019-01-17 09:48:16 -05:00
Karishma Chadha
2453278466
Update package.json 
Co-Authored-By: paulkaplan <pkaplan@media.mit.edu>
 2019-01-16 17:14:09 -05:00
Paul Kaplan
2d56e16f51
Bump GUI 2019-01-16 17:03:47 -05:00
Ben Wheeler
40e26ab636 bump gui version so that scratch-gui #4319 
bump gui version so that scratch-gui #4319 can land (resolve name conflict in project-fetcher-hoc)
 2019-01-11 09:40:53 -05:00
chrisgarrity
cc6bd38b2d
Merge pull request #2659 from chrisgarrity/bump-gui-ver 
Bump gui version…
 2019-01-10 14:41:18 -05:00
chrisgarrity
e9899a7acb Bump gui version… 
so that https://github.com/LLK/scratch-www/pull/2656 can land (disable remixing until project loaded)
 2019-01-10 14:38:36 -05:00
Paul Kaplan
16391f25ee Strip out duplicates from replies and comments. 
Fixes https://github.com/LLK/scratch-www/issues/2575
 2019-01-10 13:49:07 -05:00
Paul Kaplan
f7e8922757 Allow loading more than 20 replies 2019-01-10 10:46:01 -05:00
Paul Kaplan
e2b51daa63
Bump GUI to bring in performance and BSOD fixes 2019-01-09 15:39:46 -05:00
Paul Kaplan
66739fedf4
Bump GUI to bring in unsupported browser error states 2019-01-09 14:57:16 -05:00
Ray Schamp
1873d0ce81
Bump scratch-gui to bring in reversions after smoke testing 2019-01-08 17:36:44 -05:00
Paul Kaplan
54d42a309c
Bump scratch-gui to bring in renderer and audio fixes 2019-01-08 14:53:46 -05:00
Paul Kaplan
e4ef0b3367
Bump GUI version to bring in asset saving race condition fixing 2019-01-08 09:04:11 -05:00
Paul Kaplan
2c9fdc97eb
Update to latest GUI 2019-01-07 14:19:12 -05:00
Ray Schamp
0f5b32c467
Bump scratch-gui 
Brings in font loading fixes
 2019-01-03 16:54:19 -05:00
Paul Kaplan
e9fd0e5539
Update package.json 2019-01-03 14:55:12 -05:00
Paul Kaplan
e10f4953b4 Update to latest gui 2019-01-03 12:34:03 -05:00
Ray Schamp
58b7a0cb78
Bump scratch-gui 2019-01-02 13:16:54 -05:00
Paul Kaplan
76618a355c
Pin to a specific version of scratch-gui 
This will enable us to have more confidence/control over updates to scratch-gui, be able to test updates individually and allow us to rollback if needed.
 2018-12-27 16:53:43 -05:00
Paul Kaplan
0f4b20d5f6
Merge pull request #2530 from colbygk/integrate-sentry-webpack 
Use sentry webpack instead of Raven
 2018-12-20 15:36:46 -05:00
Paul Kaplan
93e9f950c2 Remove webpack step for now 2018-12-20 15:14:28 -05:00
chrisgarrity
54ae001e72
Merge pull request #2480 from chrisgarrity/issue/consistent-languages 
Make list of languages on www consistent with gui
 2018-12-20 13:28:19 -05:00
Colby Gutierrez-Kraybill
6a946b99fc Update to new sentry API pattern 
Use current Sentry browser package and forward errorId into eventId
Fix up errorInfo reference
Put Sentry on the window object for GUI to use
Remove unneeded reference to old style Raven and raven-js
Move Sentry webpack config into production only

Add GA tracker ID to window

Allows scratch-gui to use same GA id
 2018-12-20 12:56:33 -05:00
Paul Kaplan
d9b30d96d1 Remove approx liking/favoriting format 2018-12-18 09:50:17 -05:00
chrisgarrity
94a8396713 Make list of languages on www consistent with gui 
start to depend on `scratch-l10n`

So far only the supported locales is used.

There is one small difference between scratch-l10n and the `languages.json` that was removed.
languages was:
`{locale: ‘languagename’, …}` key value pairs.

l10n exports:
`{locale: {name: ‘languagename’},…}

That required an additional change to the language chooser.
 2018-12-13 16:00:41 -05:00
Paul Kaplan
ef217b96a1 Use custom meta tag info for project page. 
Note this _will not_ work until the page uses a template that does not include these meta tags. That is because react-helmet does not override any existing info in the head.

Thus, this was tested by removing that info from the template and seeing it work, then putting the template back.
 2018-12-12 19:30:48 -05:00
Ray Schamp
1e52879148 Don't lint CSS 
It's doesn't help much. And nobody's editor supports it. And nobody likes it and it's annoying.
 2018-12-12 14:37:36 -05:00
Paul Kaplan
aa10db8cf6
Point scratch-gui dependency back to develop tag 
This was accidentally changed to "latest" when the merge from @rschamp's latest hotfix to master was made.
 2018-12-03 14:53:55 -05:00
Ray Schamp
7d816ac5e7
Merge branch 'develop' into hotfix/fix-adventure-game 2018-12-03 13:28:27 -05:00
Paul Kaplan
f025407818 Use a more popular clipboard manager 2018-11-26 10:22:55 -05:00
Paul Kaplan
1c09bdf7b0 Implement the copy link functionality 
This does not implement any further design, like showing a confirmation popover, but just makes sure the button works. I used a very slim package to implement copy that does not include any fallbacks for IE, since we do not need to support that here.
 2018-11-26 10:22:34 -05:00
chrisgarrity
decb250dd5 Initial version 2018-11-26 09:43:05 -05:00
Ben Wheeler
c6654106e4 point to scratch-gui latest npm release, not develop 2018-11-08 15:36:57 -05:00
Benjamin Wheeler
f935374571
Revert "Track scratch-gui@latest " 2018-11-01 16:37:57 -04:00
Ben Wheeler
792f1addb3 use latest scratch-gui, not develop, temporarily 2018-10-26 13:57:47 -04:00
Ray Schamp
d04dc8aad1 Track scratch-gui@develop 
The lag between releases for scratch-gui@latest hinders testing scratch-gui/www integration changes
 2018-09-26 21:48:08 -04:00
Colby Gutierrez-Kraybill
56fd5c7ed7
Merge pull request #2033 from LLK/use_docker_up 
Recongfigure docker external network usage
 2018-09-19 10:21:26 -04:00
Linda
68c7616a25 remove now obsolete truncate library 2018-08-22 15:10:19 -04:00
Colby Gutierrez-Kraybill
4749bd1bbd Add docker-up and docker-down rules to Makefile. Now depends on a npm module 'scratch-docker' which brings a network configuration script that handles creating a named docker network that all other scratch repos that have docker configurations depend on 2018-08-21 13:09:38 -04:00
Ben Wheeler
a59d533a1c merged changes in report modal and add to studio handling 2018-07-16 13:39:29 -04:00
BryceLTaylor
ba5ac92b00 Adjust how smoke tests are called in package.json 2018-07-06 10:32:59 -04:00
Ray Schamp
bdc2260531
Merge pull request #1944 from BryceLTaylor/Selenium-Helper-Update 
Selenium helper update
 2018-07-05 15:55:22 -04:00
BryceLTaylor
5edb9fe425 remove path to tap in package.json 2018-07-05 13:24:31 -04:00
BryceLTaylor
3d42cefae2 Make NPM script have sauce defaults 2018-06-25 16:01:57 -04:00
Connor Hudson
7fb7e9146b Merge upstream/develop, move logic to preview instead of presentation 2018-06-20 09:28:41 -04:00
Ray Schamp
011c90d595
Pin scratch-gui to latest 
Now that GUI deploys "stable" builds to the `latest` tag, we can pin to latest, so rebuilds pull in the latest stable GUI.
 2018-06-19 12:59:28 -04:00
Connor Hudson
11738f9a31 Add scratch-parser, scratch-storage dependencies 2018-06-19 11:26:51 -04:00
Ben Wheeler
4c657a1e80 showing actual studio membership, though not unadded studios yet 2018-06-18 23:36:20 -04:00
Ray Schamp
ee23bbf1b5
Update scratch-gui version 2018-06-05 13:21:37 -04:00
chrisgarrity
56c2da5ff7 Update to latest gui 2018-06-05 10:08:53 -04:00
chrisgarrity
6872cfc51f FIxing PR #1900 comments 
addresses most comments except modal refactor, and error response from sumitting report.
* restore gui as a dev dependency
* better separation of view container/presentation
* replace absolute heights for textareas with making all sub components `display: flex`
* start to make presentation more modular added subcomponents to the view folder:
  * share-banner (moved from components)
  * remix-credit
  * remix-list
  * studio-list
 2018-05-31 21:04:11 -04:00
chrisgarrity
285b2dbcff Updated styles 2018-05-31 15:02:45 -04:00
chrisgarrity
0bc5bf745d Fix up stats line 
* Update for newer version of API - remix count in stats
* create projectShape to remove duplication
* add approximate-number to limit the size of the stats row.
 2018-05-31 15:02:45 -04:00
chrisgarrity
80de164d02
Handle See inside button (#1890) 
* Handle See inside button

Import GUI reducers, initial state and middleware (throttle).

Update render to handle state and middleware.

Remove preview mode state and use scratchGui.mode from redux instead.

URL is getting updated, and mode will be updated based on URL. However, the history needs work - it doesn’t work with the modal back.

* Update to latest GUI

This is the minimum version of GUI that is needed for see-inside

* Really remove cruft.
 2018-05-24 16:23:07 -04:00
Bryce Taylor
fe1ef5a750
Merge pull request #1879 from BryceLTaylor/Verbose-Testing 
Verbose testing
 2018-05-14 11:31:39 -04:00
BryceLTaylor
e88d5f8745 Add verbose method of running integration tests to output results of each test. 2018-05-08 16:43:41 -04:00
chrisgarrity
d1420862ea
Initial GUI embed (#1869) 
- `/preview/editor` will load GUI with an empty project
- `/preview/:id/editor` will load GUI with a project from the projects server (not local data)
- passes intl object to GUI
- `/preview/:id` with show the project page with an embedded player
- `/preview/:id/fullscreen` will load the project page with the player in fullscreen mode.

* Note that we needed to Increase memory for the build to avoid running out of heap space, and build time increases by about 2 minutes
 2018-05-02 15:27:49 -04:00
chrisgarrity
b8326a3d57
Feature/preview project2 (#1856) 
* Add user-session awareness
  - only show remix button if user is logged in (TBD: probably will want to hide if project creator == user)
* decorate text with @mentions and #hashtags
* Add studios, loves, favs
* In-place editing of title and description if current user is author and project shared (with validation)
 2018-04-24 11:00:47 -04:00
chrisgarrity
6f775b4293 revise react-slick and slick-carousel versions 2018-04-03 20:28:17 -04:00
Ray Schamp
8d634c7f22 Update formsy-react-component to 1.0 
It's out of beta!
 2018-04-02 15:02:54 -04:00
Ray Schamp
3ff3236b70 Fix ajv version 
Previously I was seeing a warning that ajv@5 was required, so I downgraded. I was mistaken, because now the warning says 6 is required...
 2018-04-02 15:02:34 -04:00
Ray Schamp
41780fb7cb Finish updating react-telephone-input 2018-03-30 12:11:21 -04:00
chrisgarrity
3c8fb99c44 eslint dependency 
Someday: remove this when updating eslint
 2018-03-30 10:51:23 -04:00
Ray Schamp
34f39b1c0b Update to React 16, and dependent packages 
The Splash page renders with this commit.
 2018-03-30 10:49:58 -04:00
Ray Schamp
61c2bb148a Use country data from an NPM package 
To prepare to upgrade react-telephone-input which removed this module
 2018-03-30 10:49:58 -04:00
Bryce Taylor
c198c66066
Merge pull request #1836 from BryceLTaylor/addCypressTests 
Add cypress tests
 2018-03-23 09:19:38 -04:00
BryceLTaylor
88de06f61b Setup Cypress linting 2018-03-22 15:01:51 -04:00
chrisgarrity
feda4416f3 Temporarily remove gui dependencies 2018-03-20 14:44:47 -04:00
chrisgarrity
79199d6d32 Placeholders for everything ‘above the fold’ 2018-03-08 15:57:19 -05:00
chrisgarrity
ea6de54104 [WIP]: embed GUI in a preview page 2018-02-21 14:39:21 -05:00
Ray Schamp
590f505a61 Revert "Merge pull request #1788 from LLK/revert-1775-hotfix/es6-upgrade" 
This reverts commit 1b1b396e92, reversing
changes made to a144bab0e6.
 2018-01-30 11:53:12 -05:00
Ray Schamp
46511e1253
Revert "[Develop] Upgrade to ES6" 2018-01-30 09:54:45 -05:00
Matthew Taylor
6d1f2fbccd initial es6 commit 2018-01-19 14:06:26 -05:00
Matthew Taylor
e4611088ff extract faq from published page 
after review from @thisandagain – thanks!
 2018-01-09 12:55:36 -05:00
Matthew Taylor
b584bb80e7 Upgrade compatibility to node 8 
This fixes an issue in compilation by upgrading node-sass to v4.6, and also upgrades express in the process.

Callback added to `writeFile` in `get-localized-urls` in order to avoid a deprecation warning during `make translations`.
 2017-11-15 13:28:10 -05:00
chrisgarrity
10623c3857 Add dependency for node-dir 0.1.16 (#1354) 
FIxes problem where webpack wasn’t copying static or intl to the build directory.

Gory details:
node-dir is a dependency of copy-webpack-plugin. If you don’t already have it installed, the latest version (0.1.17) gets installed and that one breaks copy-webpack (https://github.com/fshost/node-dir/issues/50). Webpack build will complete. but there will be an error `ERROR in this is not a typed array.` We didn’t see it earlier because node-modules are cached.
 2017-06-20 12:17:39 -04:00
jwzimmer
56b46fd861 Issue/gh 1013 remove end to end testing package dependencies from repo (#1319) 
* remove selenium from package.json

* Add package.json & README for the integration directory

* add newline at end of file

* add chromedriver dependency
 2017-05-24 10:12:37 -07:00
jwzimmer
de78abbea2 Issue/gh 1167 test splash page (#1185) 
* automated tests for footer links

* renamed navbar test file and removed footer links to separate file

* run with make smoke

* added tests for join scratch and sign in in navbar

* fix linter errors & update www links

* addressed some of ray's comments

* fix failing test - projects row link

* maybe fix error?

* continue switching to click, convert so it runs with disabled selenium promise manager, and refactor to be less location dependent

* finish switching off of implicit reliance on selenium promise manager
 2017-04-19 17:14:02 -04:00
Matthew Taylor
4621b25ed8 remove transifex module 
no longer use this, since we removed our dependency on pulling translations from transifex during builds
 2017-02-24 08:41:17 -05:00
chrisgarrity
82785435bf New scripts to generate translations from Transifex 
Added tx-import, expects TX_TOKEN environment variable to be set to an API token for Transifex. If no API token exists it’ll just use the default English strings for everything.

Removed the localization spot checks because they were checking tha json got built from po files. With Tx-import the files are already json, and may possibly be missing.
 2017-02-15 22:51:15 -05:00
Matthew Taylor
25f61fdb77 Merge pull request #1008 from mewtaylor/issue/gh-980 
Implement GH-980: add new TTT modal component
 2016-11-14 10:09:00 -05:00
Matthew Taylor
c9de1d73d9 Refactor modal components 
1. Split out base modal stylings from iframe modal stylings
2. Move iframe-specific stylings into a separate copmonent
3. Move width/height iframe stylings to scss
4. Change global stylings for modals to match #980
5. Update styles to use trello style guide
 2016-11-08 14:44:03 -05:00
Jesse Zoldak
838925cca0 Output coverage data only when make coverage is executed 2016-10-28 17:56:41 -04:00
Jesse Zoldak
8260e40385 Measure test coverage 2016-10-24 20:47:38 -04:00
chrisgarrity
5b2ff1a4ca Update md5map fixtures for tests 
Also cleaned up comments from @mewtaylor
 2016-10-11 19:28:13 -04:00
chrisgarrity
1339683a73 Fix #940 
Most problems were due to strings being duplicated and overwriting each other. Updated the build-locales script to keep track of duplicates.
Project Curated by on the splash page was just missing the formatMessage call.
 2016-10-11 12:33:31 -04:00
jwzimmer
579ec72818 removed ^ prefix from selenium dev dependency 2016-09-15 14:10:47 -04:00
jwzimmer
e21a2eadb1 Added selenium to devDependencies using npm install --save-dev 2016-09-15 11:40:46 -04:00
Ray Schamp
3fbd9fab36 Use html-webpack-plugin for html rendering 
This plugin will likely be updated when webpack is updated.
 2016-09-08 09:59:37 -04:00
Connor Hudson
f49d6e6a83 Merge pull request #767 from technoboy10/mobile-nav-footer 
Fix GH-217: Implement responsive nav and footer (woohoo!)
 2016-08-09 15:09:01 -04:00
Technoboy10
25402113bf tweak a few things before WIP PR 2016-07-27 09:26:33 -04:00
Technoboy10
daf803d4a3 experiment with the react-responsive library 2016-07-25 10:53:57 -04:00
Ray Schamp
2065bc91a4 Parse with babel-eslint 
Allows us to use the now-available es6 features without lint errors.
 2016-07-19 16:46:08 -04:00
Ray Schamp
1db52c4e3b Use babel-loader for jsx transpilation 
This is to remove the deprecation warning about React.__spread. It will give us other nice things too, though.
 2016-07-03 15:57:13 -04:00
Ray Schamp
f126a71336 Use iso-31660-2 package for country data 2016-06-14 17:29:29 -04:00
Ray Schamp
fe74208f32 Add international phone validation 2016-06-14 17:29:29 -04:00
Ray Schamp
b5c615b1fa Use formsy-react for validation 
Complete validation for username/password form (except for checking if a username exists).
 2016-06-14 17:27:53 -04:00
Ray Schamp
c9b37c848b Upgrade React to 15 
Also upgrade dependencies incompatible with React 15.
 2016-05-26 16:00:28 -04:00
Ray Schamp
f7e9b7ca38 Merge pull request #473 from rschamp/feature/lint 
Lint JSON and all of our .js and .scss
 2016-05-17 16:01:55 -04:00
Ray Schamp
b0b520fe18 Lint JSON, expand and simplify lint step 2016-05-16 13:02:55 -04:00
Ray Schamp
8f2697b7f1 Move externals, polyfill and init to common chunk 
This should allow us to define and update our dependencies more easily (via npm) as well as reducing the number of requests.

Additionally, when we add common packages this will avoid the issue after deploys where a user may get a cached HTML page, but new Javascript, leading to the dreaded blank page because the browser didn't download all dependencies.

Using mangle with UglifyJS also made the total file size for the common chunk bundle smaller than the current total for all of our external/polyfill scripts (1.18MB vs 1.55MB).
 2016-05-16 12:59:58 -04:00
Ray Schamp
0f33ec836c Use published version of po2icu 
Version 0.0.2 has i18next-conv 2.2.5 which uses iconv-lite rather than iconv. So this means we don't have to patch gcc.
 2016-05-13 15:33:46 -04:00
Ray Schamp
dd1c2c1627 Use s3cmd to sync with S3 2016-04-29 15:52:15 -04:00
Ray Schamp
669a8c9ae3 Mark version with webpack 2016-04-28 15:40:50 -04:00
Ray Schamp
ff70324fb5 Use s3 module to deploy to S3 2016-04-19 16:35:51 -04:00
Ray Schamp
43788eb7d8 Split server and routes/config 
Turn HtmlGeneratorPlugin into a module
Turn server into dev-server and simplify it
 2016-04-18 14:07:11 -04:00
Ray Schamp
0aa9b7c587 Untangle the requests a bit with help from async 2016-04-16 12:49:48 -04:00
Ray Schamp
de5f36b649 Add script for configuring Fastly for S3 
* Builds the Pass condition based on the static directory and view routes.
* Updates Fastly with new header and conditions based on the view routes.
* Uses a nice module for interacting with fastly :)

Needs some major cleanup but it works. Hopefully Travis will work too.
 2016-04-15 19:42:57 -04:00
Ray Schamp
7aa05b1784 Upgrade css-loader and autoprefixer-loader 
These depended on postcss < 5, which caused the errors like

Container#eachAtRule is deprecated. Use Container#walkAtRules instead.
Container#eachRule is deprecated. Use Container#walkRules instead.
Container#eachDecl is deprecated. Use Container#walkDecls instead.
Node#style() is deprecated. Use Node#raw()
Node#_value was deprecated. Use Node#raws.value
Container#remove is deprecated. Use Container#removeChild

The autoprefixer-loader package is deprecated now and recommends using postcss-loader + autoprefixer itself.
 2016-04-13 15:21:25 -04:00
Ray Schamp
29fa914b9a Merge pull request #391 from rschamp/feature/token-from-cookie 
Add method to retrieve token from session cookie and use it
 2016-03-24 12:27:07 -04:00
Ray Schamp
19f469db48 Upgrade and quiet sass-linter 
These warnings were annoying me because the noise makes it easy to miss real issues.

The `no-mergeable-selectors` rule is one that we do want to have, but right now it asks that you merge selectors in different `@media` blocks.  When the next release happens we should put that back.

https://github.com/sasstools/sass-lint/issues/307

Similarly, we want `force-element-nesting` but there is a problem with that because there's no easy way to have a nested selector in a list of selectors.
https://github.com/sasstools/sass-lint/issues/575

Finally, until they implement per-line overrides, we have to silence `class-name-format` because we don't have control over the ReactModal class names.  It's a useful rule to keep class names consistent though.  Per-line ignores should be coming soon: https://github.com/sasstools/sass-lint/issues/70
 2016-03-23 18:34:54 -04:00
Ray Schamp
96bc1b1ab1 Add method for reading session cookie 
Assumes the session cookie is stored as JSON which may or may not have been compressed via zlib (indicated by a leading `.`), which is then base64-encoded, and made URL-safe by replacing all `+` and `/` characters with `-` and `_` respectively.
 2016-03-22 09:11:09 -04:00
Ray Schamp
a5e336a175 Use redux for session handling 2016-03-18 11:51:22 -04:00
Andrew Sliwinski
9cbe1c8498 Update devDependencies and remove redundant / unused modules. Re GH-351 2016-03-02 10:14:05 -05:00
Andrew Sliwinski
5ae65979dd Update dependencies. Re GH-351 2016-03-02 10:03:22 -05:00
Andrew Sliwinski
c76533bf38 Update license and add trademark notice 2016-01-31 13:07:21 -05:00
Matthew Taylor
ceec694b2a Revert "Migrate to using a loader method" 
This reverts commit 214430b0c4.
 2016-01-08 13:50:58 -05:00
Matthew Taylor
214430b0c4 Migrate to using a loader method 
This moves all locale/translation building to a dependency, `scratch-www-intl-loader`, as well as tests associated with it. Also gets rid of the `make translations` step.
 2016-01-07 17:01:57 -05:00
Matthew Taylor
8ae98d703f Make localizations view-based 
1. Load locale strings into `window._messages` in a separate file added to `template.html`, which contains view-specific and general strings
2. Update build-locales to compile separate files
 2016-01-06 14:09:32 -05:00
Matthew Taylor
40b41a0227 Merge pull request #285 from mewtaylor/bugfix/update-translations-dependency-repo-develop 
Update translations dependency repo (for develop branch)
 2015-12-09 09:52:49 -05:00
Matthew Taylor
42672378dd Update where scratchr2_translations points to 
I forgot that I had a PR opened to do this, my bad.
 2015-12-08 18:52:13 -05:00
Ray Schamp
ae8d4d8990 Use webpack-dev-middleware for assets in dev 2015-11-19 15:25:39 -05:00
Ray Schamp
c065df3faa Use webpack for static assets 2015-11-19 15:25:39 -05:00
Matthew Taylor
133e42de06 Update to beta 1 
locales configuration not loaded automatically anymore, so we need to load react-intl with locales included into the browser ahead of time
 2015-11-19 15:25:39 -05:00
Matthew Taylor
ebd2c080c8 Upgrade react modules for 0.14 
They are now completely 0.14 compatible, so we can remove our port'd versions now.
 2015-11-16 09:58:18 -05:00
Ray Schamp
7c0363e99b Merge pull request #211 from rschamp/bugfix/GH-195 
Fix GH-195: Use a spinner component to convey activity while logging in
 2015-11-11 11:11:02 -05:00
Ray Schamp
ae8c25e2c4 Update sass-lint 
This reverts commit bad6e1cca6.
 2015-11-06 11:52:16 -05:00
Ray Schamp
f97e3f51ee Add Spinner component 
Using one found on http://tobiasahlin.com/spinkit/ for now. @carljbowman please help
 2015-11-03 18:45:38 -05:00
Ray Schamp
6bc767dc15 Use the Travis build artifact for deployment 2015-10-29 13:04:42 -04:00
Ray Schamp
14fd4c5860 Fix GH-168: Rehabilitate the Modal props.style 
This makes it more sane, and consistent with the way the react-modal `Modal` works.  The old way made multiple modals on the page have the same `style` prop.
 2015-10-24 17:15:03 -04:00
Colby Gutierrez-Kraybill
9e9dc0221d Merge pull request #132 from colbygk/feature/sentry-integration 
Feature/sentry integration
 2015-10-23 14:26:28 -04:00
Colby Gutierrez-Kraybill
b33645beda Handle sentry config and express routing/page handling errors, to do: handle uncaughtExceptions 2015-10-22 15:05:55 -04:00
Andrew Sliwinski
d86703e5db Add window.Intl polyfill. Resolves GH-96 2015-10-21 20:49:31 -04:00
Ray Schamp
65734a9577 Adapt to upgraded react-modal style handling 2015-10-20 19:28:28 -04:00
Colby Gutierrez-Kraybill
d39b691c46 Adding newrelic integration 2015-10-20 12:54:48 -04:00
Matthew Taylor
be5d8cd3eb use po2icu to get po files as json icu files 2015-10-15 23:02:57 -04:00
Matthew Taylor
3d8ae43391 Use forks of react-modal and react-slick 
They're not 0.14 compatible completely yet, so use forks that make use of outstanding PRs for 0.14 compatibility until they release an npm module with support
 2015-10-14 23:01:19 -04:00
Matthew Taylor
c3b62c8f05 Update core react dependencies 2015-10-14 22:59:38 -04:00
Andrew Sliwinski
f3d6a273fb Resolve merge conflict 2015-10-13 15:57:55 -04:00
Ray Schamp
ecbf770ea4 Move watch & start behavior to npm run dev 2015-10-09 10:52:43 -06:00
Ray Schamp
4fdc4dc49d Make start also watch, and allow stop to kill it 2015-10-08 16:21:39 -06:00
Ray Schamp
621c32a605 Handle API errors by logging them 
Upgrade of bunyan required for use with webpack
 2015-10-07 11:29:17 -04:00
Ray Schamp
4b4482f1fe Allow logging in and out 
On scratchr2, the /session/ endpoint also sets the csrf cookie to allow this.
 2015-10-02 16:58:08 -04:00
Ray Schamp
e0d17005e4 Get session from scratchr2 via proxy 
Cookies aren't shared across ports, so the proxy is necessary to share the session between scratchr2 and www.
 2015-10-02 16:58:08 -04:00
Ray Schamp
c3bc59fee2 Add a Sass linter 2015-09-24 18:32:21 -04:00
Ray Schamp
d6576409f1 Something like session handling 2015-09-22 10:26:19 -04:00
Andrew Sliwinski
5eca8d03ae Add deployment configuration 2015-09-19 19:25:54 -04:00
Colby Gutierrez-Kraybill
1cf6cedaee Initial nginx config generation, can use environment variabes PORT and SERVER_NAME. Dynamically figures out static regex based on build directory 2015-09-16 15:09:15 -04:00
Ray Schamp
271dfa2fd9 Use classnames package to manage classnames 
https://facebook.github.io/react/docs/class-name-manipulation.html
 2015-09-16 10:14:00 -04:00
Ray Schamp
a4a96c9cc0 Add a dropdown component to the nav 2015-09-14 16:14:40 -04:00
Colby Gutierrez-Kraybill
393552bd46 Adding annotations to routes.json and correct interpreting code to include information about static assets. Will be used by routes-to-nginx-conf for building nginx regex patterns 2015-09-14 12:16:58 -04:00
Ray Schamp
27fc9ff012 Add a modal component, extending react-modal 
Also fix some z-index quirks
 2015-09-09 22:26:06 -04:00
Ray Schamp
b4147a8d53 Resolve feedback from PR, fix stylistic issues 2015-09-09 10:01:10 -04:00
Ray Schamp
a02c73ddf2 Add carousel component 2015-09-08 14:56:54 -04:00
Ray Schamp
2b2029f335 Add a command to stop the watch command 2015-09-08 14:56:54 -04:00
Andrew Sliwinski
3716d0462c Merge and resolve feedback from review 2015-09-04 08:26:18 -07:00
Andrew Sliwinski
41176aaee1 Extend build process to support multiple views 2015-09-03 22:26:56 -07:00
Andrew Sliwinski
121b0e106f Use linux compatible glob strings in makefile 2015-09-02 14:40:14 -07:00
Andrew Sliwinski
ec2ad70ab0 Downgrade eslint and patch makefile 2015-09-02 13:45:58 -07:00
Andrew Sliwinski
fa4fce1b1c Initial commit 2015-09-02 12:08:58 -07:00