Commit graph

135 commits

Author SHA1 Message Date
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