blender-cloud.git
3 days agoAddress concern rBC6cbd5ca369ed master production
Francesco Siddi [Wed, 13 Feb 2019 11:07:55 +0000 (12:07 +0100)]
Address concern rBC6cbd5ca369ed

Improvements to the deployment script.

3 days agoRenamed `docker/4_run/deploy` to `docker/4_run/staging`
Sybren A. Stüvel [Wed, 13 Feb 2019 09:39:18 +0000 (10:39 +0100)]
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.

9 days agoNavigation: Unified cloud navigation
Tobias Johansson [Thu, 7 Feb 2019 13:45:55 +0000 (14:45 +0100)]
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

10 days agoNavigation: Unified cloud navigation
Tobias Johansson [Wed, 6 Feb 2019 10:42:39 +0000 (11:42 +0100)]
Navigation: Unified cloud navigation

Welcome page was missing Blender cloud logo

10 days agoNavigation: Unified cloud navigation
Tobias Johansson [Wed, 6 Feb 2019 09:31:36 +0000 (10:31 +0100)]
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

10 days agoAdded two scripts to make deployment a bit easier
Sybren A. Stüvel [Wed, 6 Feb 2019 08:34:55 +0000 (09:34 +0100)]
Added two scripts to make deployment a bit easier

6 weeks agoGulp fix for NodeJS 10
Sybren A. Stüvel [Fri, 4 Jan 2019 13:21:27 +0000 (14:21 +0100)]
Gulp fix for NodeJS 10

2 months agoVue Comments: Comments ported to Vue + DnD fileupload
Tobias Johansson [Wed, 12 Dec 2018 10:45:46 +0000 (11:45 +0100)]
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

2 months agoRemoved RabbitMQ docker container from docker-compose.yml
Sybren A. Stüvel [Tue, 4 Dec 2018 16:57:18 +0000 (17:57 +0100)]
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.

2 months agoDocker: added little list of Redis database numbers we're using
Sybren A. Stüvel [Tue, 4 Dec 2018 10:30:48 +0000 (11:30 +0100)]
Docker: added little list of Redis database numbers we're using

2 months agoFix broken thumbnail in Blog index
Pablo Vazquez [Fri, 23 Nov 2018 13:56:57 +0000 (14:56 +0100)]
Fix broken thumbnail in Blog index

2 months agoQuick-Search: Added Quick-search in the topbar
Tobias Johansson [Thu, 22 Nov 2018 14:31:52 +0000 (15:31 +0100)]
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

2 months agoGulp: Watch for changes in both blender-cloud and pillar folders.
Pablo Vazquez [Tue, 20 Nov 2018 18:19:22 +0000 (19:19 +0100)]
Gulp: Watch for changes in both blender-cloud and pillar folders.

2 months agoProject-Timeline: Introduced timeline on projects
Tobias Johansson [Tue, 20 Nov 2018 15:29:01 +0000 (16:29 +0100)]
Project-Timeline: Introduced timeline on projects

Limited to projects of category assets and film for now.

3 months agoLazy Home: Lazy load latest blog posts and assets and group by week and
Tobias Johansson [Mon, 12 Nov 2018 11:57:24 +0000 (12:57 +0100)]
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

3 months agoBlog Bug fix: Unable to render blog before first post
Tobias Johansson [Tue, 23 Oct 2018 13:09:02 +0000 (15:09 +0200)]
Blog Bug fix: Unable to render blog before first post

3 months agoLoading bar: Introduced two event listeners on window 'pillar:workStart' and 'pillar...
Tobias Johansson [Tue, 23 Oct 2018 11:57:02 +0000 (13:57 +0200)]
Loading bar: Introduced two event listeners on window 'pillar:workStart' and 'pillar:workStop' that (de)activates the loading bar.

Reason:
* To decouple code
* Have the loading bar active until whole page stopped working
* Have local loading info

Usage:
$.('.myClass')
   .on('pillar:workStart', function(){
    ... do stuff locally while loading ...
    })
   .on('pillar:workStop', function(){
   ... stop do stuff locally while loading ...
   })

$.('.myClass .mySubClass').trigger('pillar:workStart')
... do stuff ...
$.('.myClass .mySubClass').trigger('pillar:workStop')

4 months agoRemove CELERY_BEAT_SCHEDULE from config_local
Sybren A. Stüvel [Wed, 10 Oct 2018 12:58:52 +0000 (14:58 +0200)]
Remove CELERY_BEAT_SCHEDULE from config_local

CELERY_BEAT_SCHEDULE shouldn't need any changes in config_local for
production; the default should be production-ready.

4 months agoFree assets: Assets should not be advertised as free if the user is a logged in subsc...
Tobias Johansson [Thu, 4 Oct 2018 15:44:08 +0000 (17:44 +0200)]
Free assets: Assets should not be advertised as free if the user is a logged in subscriber.

4 months agoOrganizations: Added null check to properly render new Organizations
Tobias Johansson [Thu, 4 Oct 2018 13:48:26 +0000 (15:48 +0200)]
Organizations: Added null check to properly render new Organizations

4 months agoAsset list item: Don't show user.full_name in latest and random assets
Tobias Johansson [Thu, 4 Oct 2018 10:30:05 +0000 (12:30 +0200)]
Asset list item: Don't show user.full_name in latest and random assets

4 months agoRandom asset bug fix: If 2 assets from the same project where returned, the second...
Tobias Johansson [Thu, 4 Oct 2018 08:11:38 +0000 (10:11 +0200)]
Random asset bug fix: If 2 assets from the same project where returned, the second one would get a corrupt url

4 months agoVideo Duration: The duration of a video is now shown on thumbnails and bellow the...
Tobias Johansson [Wed, 3 Oct 2018 16:30:40 +0000 (18:30 +0200)]
Video Duration: The duration of a video is now shown on thumbnails and bellow the video player

Asset nodes now have a new field called "properties.duration_seconds". This holds a copy of the duration stored on the referenced video file and stays in sync using eve hooks.

To migrate existing duration times from files to nodes you need to run the following:
./manage.py maintenance reconcile_node_video_duration -ag

There are 2 more maintenance commands to be used to determine if there are any missing durations in either files or nodes:
find_video_files_without_duration
find_video_nodes_without_duration

FFProbe is now used to detect what duration a video file has.

Reviewed by Sybren.

4 months agoHomepage: Update sidebar image for Spring
Pablo Vazquez [Wed, 3 Oct 2018 09:14:04 +0000 (11:14 +0200)]
Homepage: Update sidebar image for Spring

4 months agoTagged Asset: Added metadata
Tobias Johansson [Wed, 26 Sep 2018 09:29:15 +0000 (11:29 +0200)]
Tagged Asset: Added metadata

Video duration, Project link and pretty date

4 months agoAsset: Fix video progress not filling up correctly
Tobias Johansson [Tue, 25 Sep 2018 10:19:22 +0000 (12:19 +0200)]
Asset: Fix video progress not filling up correctly

4 months agoAssets: Fix video progress not showing
Pablo Vazquez [Mon, 24 Sep 2018 11:32:08 +0000 (13:32 +0200)]
Assets: Fix video progress not showing

4 months agoIndex collection: use gradient on header
Pablo Vazquez [Fri, 21 Sep 2018 14:56:01 +0000 (16:56 +0200)]
Index collection: use gradient on header

4 months agoTweaks to featured item in index collection
Pablo Vazquez [Fri, 21 Sep 2018 14:52:21 +0000 (16:52 +0200)]
Tweaks to featured item in index collection

4 months agoMain dropdown tweaks for responsive.
Pablo Vazquez [Fri, 21 Sep 2018 14:19:13 +0000 (16:19 +0200)]
Main dropdown tweaks for responsive.

Most of the changes are done in Pillar, in 0_navbar.js (part of tutti).

4 months agoCSS: Use bootstrap variable for button roundness
Pablo Vazquez [Fri, 21 Sep 2018 14:14:58 +0000 (16:14 +0200)]
CSS: Use bootstrap variable for button roundness

4 months agoProject Landing: cleanup unused classes
Pablo Vazquez [Fri, 21 Sep 2018 10:19:23 +0000 (12:19 +0200)]
Project Landing: cleanup unused classes

4 months agoNode details: Center only on landing
Pablo Vazquez [Fri, 21 Sep 2018 10:10:34 +0000 (12:10 +0200)]
Node details: Center only on landing

4 months agoUse node.properties.status instead of node.status
Francesco Siddi [Thu, 20 Sep 2018 17:04:43 +0000 (19:04 +0200)]
Use node.properties.status instead of node.status

4 months agoAdd post status to posts query for homepage
Francesco Siddi [Thu, 20 Sep 2018 17:03:57 +0000 (19:03 +0200)]
Add post status to posts query for homepage

4 months agoNavigation: add Art Gallery to the libraries nav
Pablo Vazquez [Thu, 20 Sep 2018 16:13:41 +0000 (18:13 +0200)]
Navigation: add Art Gallery to the libraries nav

4 months agoNavigation: Add Learn and Libraries to homepage nav
Pablo Vazquez [Thu, 20 Sep 2018 16:11:26 +0000 (18:11 +0200)]
Navigation: Add Learn and Libraries to homepage nav

Also remove Courses, Workshops

4 months agoNavigation: Move links in the main dropdown to their own macros
Pablo Vazquez [Thu, 20 Sep 2018 14:36:46 +0000 (16:36 +0200)]
Navigation: Move links in the main dropdown to their own macros

So they can be easily re-used in other templates.

4 months agoBlog: Remove unused macro
Pablo Vazquez [Thu, 20 Sep 2018 14:35:53 +0000 (16:35 +0200)]
Blog: Remove unused macro

4 months agoTagged Assets: Set the loading bar when loading images
Pablo Vazquez [Thu, 20 Sep 2018 13:27:41 +0000 (15:27 +0200)]
Tagged Assets: Set the loading bar when loading images

4 months agoTagged Assets: Initial 8, load 8 more
Pablo Vazquez [Thu, 20 Sep 2018 13:27:22 +0000 (15:27 +0200)]
Tagged Assets: Initial 8, load 8 more

4 months agoUse loadingBar utility.
Pablo Vazquez [Thu, 20 Sep 2018 13:20:58 +0000 (15:20 +0200)]
Use loadingBar utility.

4 months agoNew templates for /learn and /libraries
Pablo Vazquez [Thu, 20 Sep 2018 13:00:10 +0000 (15:00 +0200)]
New templates for /learn and /libraries

4 months agoProduction: make asset title a link
Pablo Vazquez [Thu, 20 Sep 2018 11:17:50 +0000 (13:17 +0200)]
Production: make asset title a link

4 months agoBlog: show status if not published
Pablo Vazquez [Thu, 20 Sep 2018 11:01:57 +0000 (13:01 +0200)]
Blog: show status if not published

4 months agoLanding: Center text
Pablo Vazquez [Thu, 20 Sep 2018 10:14:47 +0000 (12:14 +0200)]
Landing: Center text

4 months agoNavigation: Blender Cloud -> Homepage
Pablo Vazquez [Thu, 20 Sep 2018 10:07:08 +0000 (12:07 +0200)]
Navigation: Blender Cloud -> Homepage

4 months agoNavigation: Remove Blog entry
Pablo Vazquez [Thu, 20 Sep 2018 10:06:57 +0000 (12:06 +0200)]
Navigation: Remove Blog entry

4 months agoRename secondary_navigation to navigation_project
Pablo Vazquez [Thu, 20 Sep 2018 10:06:43 +0000 (12:06 +0200)]
Rename secondary_navigation to navigation_project

And move to _navigation.pug with the other navigations macros.

4 months agoNavigation: add custom nav for services
Pablo Vazquez [Wed, 19 Sep 2018 17:34:49 +0000 (19:34 +0200)]
Navigation: add custom nav for services

4 months agoProduction: Load 4 assets, load 4 more
Pablo Vazquez [Wed, 19 Sep 2018 17:34:07 +0000 (19:34 +0200)]
Production: Load 4 assets, load 4 more

4 months agoFooter: Production lessons
Pablo Vazquez [Wed, 19 Sep 2018 17:06:44 +0000 (19:06 +0200)]
Footer: Production lessons

Also move Art Gallery to Libraries

4 months agoImprove asset building process
Francesco Siddi [Wed, 19 Sep 2018 14:57:07 +0000 (16:57 +0200)]
Improve asset building process

After running ./gulp for every project, we delete node_modules.

4 months agoAdd more tags to NODE_TAGS
Francesco Siddi [Wed, 19 Sep 2018 14:15:31 +0000 (16:15 +0200)]
Add more tags to NODE_TAGS

4 months agoAdd digital-painting to NODE_TAGS
Francesco Siddi [Wed, 19 Sep 2018 13:53:51 +0000 (15:53 +0200)]
Add digital-painting to NODE_TAGS

4 months agoFix jumbotron in index collection
Pablo Vazquez [Wed, 19 Sep 2018 13:50:03 +0000 (15:50 +0200)]
Fix jumbotron in index collection

4 months agoNavigation: Position icons
Pablo Vazquez [Wed, 19 Sep 2018 13:42:33 +0000 (15:42 +0200)]
Navigation: Position icons

4 months agoFix navigation
Pablo Vazquez [Wed, 19 Sep 2018 13:39:49 +0000 (15:39 +0200)]
Fix navigation

4 months agoRun ./gulp in every subproject dir
Francesco Siddi [Wed, 19 Sep 2018 12:48:16 +0000 (14:48 +0200)]
Run ./gulp in every subproject dir

This is necessary since in our gulp files we reference assets in
node_modules using relative paths. This makes the asset building
process much slower, and should be addressed in the future.

4 months agoUse correct permission format for gulp-chmod
Francesco Siddi [Wed, 19 Sep 2018 12:45:56 +0000 (14:45 +0200)]
Use correct permission format for gulp-chmod

4 months agoFollow art direction for Spring banner
Pablo Vazquez [Wed, 19 Sep 2018 10:42:12 +0000 (12:42 +0200)]
Follow art direction for Spring banner

4 months agoSpring background for index collection
Pablo Vazquez [Wed, 19 Sep 2018 10:38:26 +0000 (12:38 +0200)]
Spring background for index collection

4 months agoBackground for spring project
Pablo Vazquez [Wed, 19 Sep 2018 10:37:56 +0000 (12:37 +0200)]
Background for spring project

4 months agoAdd additional dependencies to package.json
Francesco Siddi [Wed, 19 Sep 2018 10:00:37 +0000 (12:00 +0200)]
Add additional dependencies to package.json

4 months agoUpdate NODE_TAGS
Francesco Siddi [Wed, 19 Sep 2018 09:34:13 +0000 (11:34 +0200)]
Update NODE_TAGS

4 months agoMark Production Lessons as new
Pablo Vazquez [Wed, 19 Sep 2018 09:33:40 +0000 (11:33 +0200)]
Mark Production Lessons as new

4 months agoPass title to /production
Pablo Vazquez [Wed, 19 Sep 2018 09:20:32 +0000 (11:20 +0200)]
Pass title to /production

4 months agoDropdowns tweaks based on feedback
Pablo Vazquez [Wed, 19 Sep 2018 09:20:17 +0000 (11:20 +0200)]
Dropdowns tweaks based on feedback

4 months agoProduction Lessons: Added more tags
Pablo Vazquez [Tue, 18 Sep 2018 14:54:57 +0000 (16:54 +0200)]
Production Lessons: Added more tags

4 months agoHomepage: update image for Spring
Pablo Vazquez [Tue, 18 Sep 2018 11:57:44 +0000 (13:57 +0200)]
Homepage: update image for Spring

4 months agoHome project: Fix creating new projects
Pablo Vazquez [Tue, 18 Sep 2018 11:57:25 +0000 (13:57 +0200)]
Home project: Fix creating new projects

4 months agoTagged assets: Style 'load more items' button
Pablo Vazquez [Tue, 18 Sep 2018 10:55:14 +0000 (12:55 +0200)]
Tagged assets: Style 'load more items' button

4 months agoHomepage: use asset list template for random assets
Pablo Vazquez [Tue, 18 Sep 2018 10:54:57 +0000 (12:54 +0200)]
Homepage: use asset list template for random assets

4 months agoLanding: fix styling of gallery
Pablo Vazquez [Tue, 18 Sep 2018 10:54:32 +0000 (12:54 +0200)]
Landing: fix styling of gallery

4 months agoWelcome page: Styling
Pablo Vazquez [Mon, 17 Sep 2018 16:42:04 +0000 (18:42 +0200)]
Welcome page: Styling

4 months agoBlog: Edit post link
Pablo Vazquez [Mon, 17 Sep 2018 16:34:43 +0000 (18:34 +0200)]
Blog: Edit post link

4 months agoProject: Darker tree
Pablo Vazquez [Mon, 17 Sep 2018 16:15:49 +0000 (18:15 +0200)]
Project: Darker tree

4 months agoFooter: Fix broken links
Pablo Vazquez [Mon, 17 Sep 2018 16:15:36 +0000 (18:15 +0200)]
Footer: Fix broken links

4 months agoLayout: move footer and main menu into their own files
Pablo Vazquez [Mon, 17 Sep 2018 15:18:43 +0000 (17:18 +0200)]
Layout: move footer and main menu into their own files

4 months agoStyle tweaks
Pablo Vazquez [Mon, 17 Sep 2018 15:09:43 +0000 (17:09 +0200)]
Style tweaks

4 months agoUse spans for index_collection navigation
Pablo Vazquez [Mon, 17 Sep 2018 13:04:07 +0000 (15:04 +0200)]
Use spans for index_collection navigation

4 months agoProject Landing: Don't set title
Pablo Vazquez [Mon, 17 Sep 2018 13:03:53 +0000 (15:03 +0200)]
Project Landing: Don't set title

As it's set by the pages themselves using node.properties.url

5 months agoHomepage: style sidebar and cleanup CSS
Pablo Vazquez [Mon, 17 Sep 2018 10:52:01 +0000 (12:52 +0200)]
Homepage: style sidebar and cleanup CSS

homepage.sass is like 10 lines now :)

5 months agoHomepage: Style comments
Pablo Vazquez [Mon, 17 Sep 2018 10:16:52 +0000 (12:16 +0200)]
Homepage: Style comments

5 months agoGeneric classes for styling
Pablo Vazquez [Mon, 17 Sep 2018 09:36:57 +0000 (11:36 +0200)]
Generic classes for styling

5 months agoTagged Assets: Support passing arguments
Pablo Vazquez [Sun, 16 Sep 2018 04:30:48 +0000 (06:30 +0200)]
Tagged Assets: Support passing arguments

Pass LOAD_INITIAL_COUNT and LOAD_NEXT_COUNT

Also only show 'Load more' if LOAD_NEXT_COUNT is not set to 0

5 months agoTagged assets: add video progress and watched label
Pablo Vazquez [Sun, 16 Sep 2018 03:52:20 +0000 (05:52 +0200)]
Tagged assets: add video progress and watched label

5 months agoMenu: Remove columns for trainings
Pablo Vazquez [Sun, 16 Sep 2018 03:06:41 +0000 (05:06 +0200)]
Menu: Remove columns for trainings

Experiment with a more compact menu, more readable with not so much text.

5 months agoSpacing
Pablo Vazquez [Sun, 16 Sep 2018 03:03:12 +0000 (05:03 +0200)]
Spacing

5 months agoBlog: use jumbotron overlay
Pablo Vazquez [Sun, 16 Sep 2018 02:28:37 +0000 (04:28 +0200)]
Blog: use jumbotron overlay

5 months agoIndex Collection: Limit columns to 3
Pablo Vazquez [Sun, 16 Sep 2018 01:43:21 +0000 (03:43 +0200)]
Index Collection: Limit columns to 3

5 months agoBlog: Layout adjustments
Pablo Vazquez [Sun, 16 Sep 2018 01:06:08 +0000 (03:06 +0200)]
Blog: Layout adjustments

5 months agoBlog: Fix showing wrong single post
Pablo Vazquez [Sun, 16 Sep 2018 00:03:25 +0000 (02:03 +0200)]
Blog: Fix showing wrong single post

Also center comments and other minor tweaks

5 months agoProject Landing: Fix links in latest updates
Pablo Vazquez [Sat, 15 Sep 2018 20:19:47 +0000 (22:19 +0200)]
Project Landing: Fix links in latest updates

Part of T56813

5 months agoProject Landing: Center titles
Pablo Vazquez [Sat, 15 Sep 2018 20:14:58 +0000 (22:14 +0200)]
Project Landing: Center titles

Part of T56813

5 months agoBlog: name in title
Pablo Vazquez [Sat, 15 Sep 2018 20:09:12 +0000 (22:09 +0200)]
Blog: name in title

5 months agoLayout: Add Art Gallery to menu
Pablo Vazquez [Sat, 15 Sep 2018 19:36:32 +0000 (21:36 +0200)]
Layout: Add Art Gallery to menu

5 months agoBlog minor fixes and tweaks
Pablo Vazquez [Sat, 15 Sep 2018 19:33:11 +0000 (21:33 +0200)]
Blog minor fixes and tweaks

5 months agoBlog listing: Show posts as cards
Pablo Vazquez [Sat, 15 Sep 2018 19:23:45 +0000 (21:23 +0200)]
Blog listing: Show posts as cards

5 months agoOne class too much
Pablo Vazquez [Sat, 15 Sep 2018 15:26:56 +0000 (17:26 +0200)]
One class too much