The_Grits
ac9717a095
Whoops
...
Seems like Travis would rather not have the guidelines route included
2016-04-25 08:00:36 -04:00
The_Grits
c657a4b5f9
Squash and Merge
2016-04-25 07:52:20 -04:00
The_Grits
4a31a7882b
Add DMCA route
...
I also included the guidelines route to avoid future branch conflict.
2016-04-25 07:44:57 -04:00
Ray Schamp
19a0ed3f4b
Remove spaces from condition
...
This condition exceeded 512 characters. We will have to rethink how to construct this.
2016-04-22 09:54:14 -04:00
Matthew Taylor
e1a6be55c9
Merge pull request #429 from mewtaylor/feature/conference
...
Add initial site for Scratch Conference
2016-04-22 09:27:36 -04:00
Matthew Taylor
3c487163a0
Last minute copy updates
2016-04-22 09:07:32 -04:00
Matthew Taylor
14bb35e330
missed one view
-> name
change
2016-04-22 09:07:12 -04:00
Matthew Taylor
bf1a99fd63
use route name now with updated strucutre
...
Thanks @rschamp for this!
2016-04-21 18:16:49 -04:00
Matthew Taylor
2eb62e8ab3
move component convention back to what it was
...
formerly presentation components such as `navigation` and `footer` have been nested, and renamed to `container` inside their respective component subdirs
2016-04-21 18:13:21 -04:00
Matthew Taylor
9b52097c38
Update lint paths for new component structure
2016-04-21 16:49:32 -04:00
Matthew Taylor
66113e1c58
Add conference sub-site
2016-04-21 16:22:39 -04:00
Matthew Taylor
017d58fb1b
Split out footer container/presentation
2016-04-21 16:22:16 -04:00
Matthew Taylor
f05cb39501
Add flex-row component
...
Just a container with some default flexbox formatting.
2016-04-21 16:21:22 -04:00
Matthew Taylor
3c8a7db834
Take margins out of typography
...
They won't be the same margins for text-heavy and text-lite pages, so we should make thess view-specific for now
2016-04-21 16:19:20 -04:00
Matthew Taylor
38c4566e2b
Split out name and view for routes
...
This will help for the conference urls, which will be sub-urls, all under `conference`
2016-04-21 16:16:59 -04:00
Matthew Taylor
eed6f1fc08
Restructure src
...
1. Put formatting-specific components into the `presentation` subdir of `components`
2. Put content-specific components into the `container` subdir of `components`
3. Put views that are sub-urls of the site into a subdir of `views` (i.e. `microworlds`, and eventually `conference`)
2016-04-21 15:46:32 -04:00
Ray Schamp
d3d8d34848
Merge pull request #425 from LLK/s3
...
Move app to S3 hosting
2016-04-21 15:27:51 -04:00
Ray Schamp
39be1b2085
Prepend env to avoid error 127, remove s3 branch
...
Using env provides the environment needed by the script provider to run make.
Removing s3 branch from the staging deployment list so that this is ready to merge.
2016-04-21 09:50:17 -04:00
Ray Schamp
5cd3998c1c
Use after_success for deployment
...
The script provider seems to be unusable right now: https://github.com/travis-ci/travis-ci/issues/5538
2016-04-20 09:47:55 -04:00
Ray Schamp
b8bfe46890
Configure redirect routes in Fastly
2016-04-19 18:42:03 -04:00
Ray Schamp
b4a7a2884f
Rename to dev-server after merge
2016-04-19 16:57:02 -04:00
Ray Schamp
59227e3272
Merge branch 'add_redirects' of github.com:sclements/scratch-www into s3
...
# Conflicts:
# .eslintrc
# server/handler.js
2016-04-19 16:56:22 -04:00
Ray Schamp
27cd27c35f
WIP rename for merge
2016-04-19 16:50:44 -04:00
Ray Schamp
ff70324fb5
Use s3 module to deploy to S3
2016-04-19 16:35:51 -04:00
Ray Schamp
494085247d
Activate after configuring Fastly
2016-04-19 13:04:45 -04:00
Ray Schamp
f90adfcadb
Be explicit, direct app requests to S3
2016-04-19 10:50:57 -04:00
Ray Schamp
303b5c44a8
Lint bin subdirectories
2016-04-19 10:47:33 -04:00
Ray Schamp
eb5edc293d
Linting
2016-04-18 14:07:27 -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
707af8dbe9
Use async.auto to make dependencies clearer
...
Thanks @thisandagain — now I know why you said async.auto is so awesome.
Also throw the error so we get a stacktrace, and make the bucket name and service ID into constants.
2016-04-18 13:23:23 -04:00
Ray Schamp
32611c9cba
Fix rewrite priority
...
The order of the rewrite conditions needs to be internally consistent so we can control specificity with routes.json
2016-04-16 14:08:53 -04:00
Ray Schamp
c6abc2ae7b
Fix cache_settings request
2016-04-16 14:05:16 -04:00
Ray Schamp
ab0979b958
Add docstrings
2016-04-16 13:46:03 -04:00
Ray Schamp
5846dcacc8
Use constants instead of functions for strings
2016-04-16 13:01:39 -04:00
Ray Schamp
0aa9b7c587
Untangle the requests a bit with help from async
2016-04-16 12:49:48 -04:00
Ray Schamp
87da93f9ea
Move some fastly-specific stuff into a module
2016-04-16 10:17:20 -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
Matthew Taylor
a6e199b5f4
Merge pull request #414 from TheGrits/patch-4
...
Fix gh-413: Update supporting organizations
2016-04-15 16:22:54 -04:00
The_Grits
c9492ae38b
Update l10n.json
2016-04-15 16:12:17 -04:00
The_Grits
08ccaa7721
Spaces and Intel
2016-04-15 15:59:32 -04:00
The_Grits
1a2e30fccd
mailto anchor
2016-04-15 15:58:11 -04:00
Ray Schamp
c8c681f8c0
Use S3 to deploy
...
Temporarily deploy s3 branch to staging
2016-04-14 16:22:13 -04:00
Ray Schamp
3bdb95d40d
Set up static view rendering
2016-04-14 16:22:13 -04:00
Ray Schamp
0ee2234c08
Merge pull request #422 from rschamp/feature/upgrade-css-loader
...
Upgrade css-loader and autoprefixer-loader
2016-04-14 16:19:40 -04:00
The_Grits
d6b08a0bff
Add Chris and Julia
...
As per https://github.com/LLK/scratch-www/issues/413#issuecomment-209889924
2016-04-14 12:36:20 -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
The_Grits
174b351845
Delete the extra space
2016-04-09 14:28:05 -04:00
Shane M. Clements
32e2fb5516
Fixed another lint issue.
2016-04-09 11:07:21 -06:00
Shane M. Clements
a6be92448b
Fixed linting errors and webpack config for redirect routes.
2016-04-09 10:39:55 -06:00
Shane M. Clements
cbc58d2f11
Added code for redirects and now redirecting the donation URL to the proper location. Fixes #412 .
2016-04-09 10:04:39 -06:00