Commit Graph

638 Commits

Author SHA1 Message Date
9cf3a7147e Merge branch 'production' 2019-03-29 15:27:58 +01:00
fb016c3e3b build wheels using the correct Docker image 2019-03-29 15:18:10 +01:00
039ab1ce70 UI Project sidebar: padding and border classes adjustment. 2019-03-28 21:12:24 +01:00
1bd1c6e5fd Merge branch 'master' into wip-breadcrumbs 2019-03-28 21:04:13 +01:00
353660c7ba UI Project: Sidebar toggle button. 2019-03-28 21:03:24 +01:00
b77f3aaa49 Breadcrumbs: clicking a breadcrumb now calls displayNode(nodeId)
Requires Pillar 1fd17303a53016c15f685deebda65bea8e71be90
2019-03-28 16:43:15 +01:00
50c0842e72 Breadcrumbs: Move from sidebar to project context.
Since we will be able to toggle the sidebar from the breadcrumbs.
2019-03-28 16:06:32 +01:00
5d2ba7fc96 Main Stylesheet: Include breadcrumbs component from Pillar. 2019-03-28 16:04:56 +01:00
6972e1662d Show breadcrumbs in project navigation
Requires Pillar 4499f911.
2019-03-28 12:41:57 +01:00
af6022c997 UI Services: Minor layout adjustments.
* Align all items to the left.
* Match header with Training and Libraries.
* Make images a link.
2019-03-27 16:00:19 +01:00
2fc1738e99 UI Libraries: Use single-column listing.
Uses component from components.pug
2019-03-27 16:00:19 +01:00
149013d64c UI Learn: Use single-column listing.
Uses component from components.pug
2019-03-27 16:00:19 +01:00
e13a1bff1b UI Navigation: Move Training after Films.
So we have categories listing grouped together (Training/Libraries/Services).
2019-03-27 16:00:19 +01:00
9ac60fe922 Tweak build-all.sh to run with bash 3.2
The ;& statement is supported in 4.0 or higher, which is not natively
provided on macOS.
2019-03-27 15:38:22 +01:00
2f78f36f61 Update package-lock.json
The previous update was not sufficient apparently.
2019-03-27 15:10:36 +01:00
5edcf931e9 Update package-lock.json
The flatmap-stream dependency was removed from NPM since it was
malicious.
2019-03-27 14:02:21 +01:00
b417f25811 UI Homepage: Single-column layout. 2019-03-27 13:08:44 +01:00
691c1411bc Added jwtkeys/README.md 2019-03-27 12:58:08 +01:00
9f3946ba9e Documented deployment scripts 2019-03-27 12:57:50 +01:00
269daa0d43 UI Navigation: Padding adjustment. 2019-03-27 12:55:08 +01:00
39516e63cc UI Navigation: Cleanup (adding comments). 2019-03-27 12:54:54 +01:00
84881743ef UI Navigation: Category title 'Open Projects' rename to 'Films' 2019-03-27 12:54:10 +01:00
e975492869 UI Navigation: Link to project category.
Without it, going from one project to another in the same category (like
going from Textures library to HDRI) is cumbersome, having to go always
through the homepage first.
2019-03-27 12:53:27 +01:00
78e1c728fa UI Landing: Cleanup 2019-03-27 12:36:39 +01:00
be18dfb985 UI Landing: Margin top of project description. 2019-03-27 12:35:58 +01:00
8797b18754 UI Landing: Cleanup, remove unused attribute. 2019-03-27 12:34:44 +01:00
727ba3fd58 UI Landing: Simplify javascript code for overlay. 2019-03-27 12:34:11 +01:00
a369c04b38 UI Landing: Remove project name and gallery title. 2019-03-27 12:31:51 +01:00
fad5f803e8 UI Landing: Fade header to background color. 2019-03-27 12:18:15 +01:00
143cd27c55 UI Landing: Use dark background. 2019-03-27 12:17:15 +01:00
2f854ebeee UI Landing: Replace Blog updates with Timeline. 2019-03-27 12:14:24 +01:00
6fa3af50cf UI Landing: Show link to project edit. 2019-03-27 12:13:36 +01:00
1fd2443bd7 UI Landing: Show project name and summary in header. 2019-03-27 12:12:59 +01:00
c5f8add5f5 Made it easier to rebuild the Docker image after someone else built it
Because we only pushed the final image to Docker Hub, it was impossible to
pull the base image someone else created and "quickly" build a new deploy
image.

Now the deploy scripts push (some) of the intermediate images as well,
making it possible to pull them later. I've added `build-pull.sh` and
`full-pull.sh` to perform this pull and built up from the pulled images.
2019-03-13 15:47:12 +01:00
a8e5d593ac Address concern rBC6cbd5ca369ed
Improvements to the deployment script.
2019-02-13 12:12:36 +01:00
fc986b0ab6 Renamed docker/4_run/deploy to docker/4_run/staging
"Staging" covers the meaning of what is actually happening better than
"deploy". I want to keep "deploy" for actually deploying onto a production
server.
2019-02-13 10:39:18 +01:00
b7b6543043 Navigation: Unified cloud navigation
* Removed main drop down menu
* Added "My cloud" to user menu
* Attract/Flamenco is found under Production Tools menu
* Attract/Flamenco has the same navigation as its project
2019-02-07 14:45:55 +01:00
d32c44e50c Navigation: Unified cloud navigation
Welcome page was missing Blender cloud logo
2019-02-06 11:42:39 +01:00
369161e29f Navigation: Unified cloud navigation
* Removed main drop down menu
* Added "My cloud" to user menu
* Attract/Flamenco is found under Production Tools menu
* Attract/Flamenco has the same navigation as its project
2019-02-06 10:31:36 +01:00
3cd55e2a83 Added two scripts to make deployment a bit easier 2019-02-06 09:34:55 +01:00
1071915f27 Gulp fix for NodeJS 10 2019-01-04 14:21:27 +01:00
5f9406edd2 Vue Comments: Comments ported to Vue + DnD fileupload
* Drag and drop files to comment editor to add a file attachment
* Using Vue to render comments

Since comments now has attachments we need to update the schemas
./manage.py maintenance replace_pillar_node_type_schemas
2018-12-12 11:45:46 +01:00
5bf1693d5b Removed RabbitMQ docker container from docker-compose.yml
Now that Celery switched to using Redis as broker, we no longer need
RabbitMQ. Celery has been running on Redis for a while now and it all seems
fine, so it's time to wave the Rabbit goodbye.
2018-12-04 17:57:49 +01:00
27caff7e6e Docker: added little list of Redis database numbers we're using 2018-12-04 11:30:48 +01:00
63d25d1dca Fix broken thumbnail in Blog index 2018-11-23 14:56:57 +01:00
2950a4347a Quick-Search: Added Quick-search in the topbar
Changed how and what we store in elastic to unify it with how we store
things in mongodb so we can have more generic javascript code
to render the data.

Elastic changes:
  Added:
  Node.project.url

  Altered to store id instead of url
  Node.picture

  Made Post searchable

./manage.py elastic reset_index
./manage.py elastic reindex

Thanks to Pablo and Sybren
2018-11-22 15:31:52 +01:00
76a707e5bf Gulp: Watch for changes in both blender-cloud and pillar folders. 2018-11-20 19:19:22 +01:00
5218bd17e3 Project-Timeline: Introduced timeline on projects
Limited to projects of category assets and film for now.
2018-11-20 16:29:01 +01:00
37fe235d47 Lazy Home: Lazy load latest blog posts and assets and group by week and
project.

Javascript tutti.js and timeline.js is needed, and then the following to
init the timeline:

$('.timeline')
    .timeline({
        url: '/api/timeline'
    });

# Javascript Notes:
## ES6 transpile:
* Files in src/scripts/js/es6/common will be transpiled from
modern es6 js to old es5 js, and then added to tutti.js
* Files in src/scripts/js/es6/individual will be transpiled from
modern es6 js to old es5 js to individual module files
## JS Testing
* Added the Jest test framework to write javascript tests.
* `npm test` will run all the javascript tests

Thanks to Sybren for reviewing
2018-11-12 12:57:24 +01:00
1a49b24f8e Blog Bug fix: Unable to render blog before first post 2018-10-23 15:09:02 +02:00