Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

welcome back partial on Code Studio and code.org #3165

Merged
merged 18 commits into from
Jul 30, 2015
Merged

welcome back partial on Code Studio and code.org #3165

merged 18 commits into from
Jul 30, 2015

Conversation

tanyaparker
Copy link
Contributor

TODO later: make it pretty with images and real data like green status dots (not blocking merge)

BEFORE: Teacher
image
image

AFTER: Teacher
image
image

If you've completed all courses, links online to /learn/beyond and local school to /learn/local:
image

BEFORE: Student
image
image

AFTER: Student
image
image

New account, no progress yet. On studio.code.org:
image

New account, no progress yet. On code.org, links back to studio.code.org:
image

AFTER: View of code.org w/ spacing between hero
image

houndci-bot
houndci-bot reviewed Jul 18, 2015
View reviewed changes
dashboard/app/models/user.rb
@@ -575,6 +575,12 @@ def reset_secret_words
save!
end

def all_advertised_scripts_completed?(advertised_scripts)
advertised_scripts.all? do |script|
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Style/SymbolProc: Pass &:completed? as an argument to all? instead of a block.

@breville
Copy link
Member

i have some thoughts on layout, font sizing etc.. can chat in person next week if you like.

houndci-bot
houndci-bot reviewed Jul 29, 2015
View reviewed changes
dashboard/test/controllers/api_controller_test.rb
end

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Style/TrailingWhitespace: Trailing whitespace detected.

breville
breville reviewed Jul 29, 2015
View reviewed changes
dashboard/app/models/user.rb
@@ -575,6 +575,13 @@ def reset_secret_words
save!
end

def all_advertised_scripts_completed?
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this could be stored as an array in the Script model so it's not duplicated in multiple places?

@breville
Copy link
Member

a couple things to address if you want, but otherwise lgtm

tanyaparker added a commit that referenced this pull request Jul 30, 2015
@tanyaparker
Merge pull request #3165 from code-dot-org/welcomeback
c784ec8 
welcome back partial on Code Studio and code.org
@tanyaparker tanyaparker merged commit c784ec8 into staging Jul 30, 2015
@tanyaparker tanyaparker deleted the welcomeback branch July 30, 2015 01:49
deploy-code-org added a commit that referenced this pull request Jul 30, 2015
@deploy-code-org
Automatically built.
7cbb593 
commit 1afd3d2
Merge: 3104572 3cef501
Author: Elijah Hamovitz <elijahhamovitz@gmail.com>
Date:   Thu Jul 30 10:10:33 2015 -0700

    Merge pull request #3265 from code-dot-org/small-footer

    Small footer

commit 3104572
Author: Continuous Integration <dev@code.org>
Date:   Thu Jul 30 17:06:07 2015 +0000

    Automatically built.

    commit 181275c
    Merge: 747fce6 1291632
    Author: Elijah Hamovitz <elijahhamovitz@gmail.com>
    Date:   Thu Jul 30 09:58:52 2015 -0700

        Merge pull request #3290 from code-dot-org/netsim-hotfix-empty-payload

        Netsim hotfix empty payload

    commit 747fce6
    Author: Tanya Parker <tanyacparker@gmail.com>
    Date:   Wed Jul 29 19:19:49 2015 -0700

        more spacing between hero buttons

    commit cf2c990
    Author: Tanya Parker <tanyacparker@gmail.com>
    Date:   Wed Jul 29 18:49:55 2015 -0700

        remove whitespace

commit 181275c
Merge: 747fce6 1291632
Author: Elijah Hamovitz <elijahhamovitz@gmail.com>
Date:   Thu Jul 30 09:58:52 2015 -0700

    Merge pull request #3290 from code-dot-org/netsim-hotfix-empty-payload

    Netsim hotfix empty payload

commit 747fce6
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Wed Jul 29 19:19:49 2015 -0700

    more spacing between hero buttons

commit cf2c990
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Wed Jul 29 18:49:55 2015 -0700

    remove whitespace

commit c784ec8
Merge: 93b3881 2849cd8
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Wed Jul 29 18:39:44 2015 -0700

    Merge pull request #3165 from code-dot-org/welcomeback

    welcome back partial on Code Studio and code.org

commit 2849cd8
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Wed Jul 29 17:58:29 2015 -0700

    add unadvertised_user_scripts method

commit 3cef501
Author: Elijah Hamovitz <elijahhamovitz@gmail.com>
Date:   Wed Jul 29 17:53:52 2015 -0700

    updates haml hashes in contributors and video_cast pages to both use exclusively : syntax

commit c03ed39
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Wed Jul 29 17:46:29 2015 -0700

    modify strings

commit 9ad6927
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Wed Jul 29 17:45:33 2015 -0700

    one list of advertised scripts

commit 93b3881
Merge: 4d9f8fd 4f8c677
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Wed Jul 29 16:43:57 2015 -0700

    Merge pull request #3292 from code-dot-org/remixProject

    singular remixProject function

commit 878610f
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Wed Jul 29 16:34:48 2015 -0700

    add unit test for all courses completed

commit 4f8c677
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Wed Jul 29 16:19:31 2015 -0700

    singular remixProject function

commit 06ab8af
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Wed Jul 29 16:18:49 2015 -0700

    adjust margins between hero and rest of code.org

commit 1291632
Author: Elijah Hamovitz <elijahhamovitz@gmail.com>
Date:   Wed Jul 29 15:42:14 2015 -0700

    Adds NetSimMessage.isValid check before adding message to router queue.

    pair bbuchanan (@islemaster)

commit 2a59f6e
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Wed Jul 29 15:35:05 2015 -0700

    hound: remove whitespace

commit 7e5e96f
Author: Tanya Parker <tanyacparker@gmail.com>
Date:   Wed Jul 29 15:31:35 2015 -0700

    update unit tests

commit d8422ea
Author: Elijah Hamovitz <elijahhamovitz@gmail.com>
Date:   Wed Jul 29 15:24:59 2015 -0700

    Refuse to send messages with invalid payload.

    Passes error to onComplete handler instead.
    Fixes bug when sending empty packets.
    pair bbuchanan

commit 4d9f8fd
Merge: 5540007 955027a
Author: Will Jordan <wjordan@users.noreply.github.com>
Date:   Wed Jul 29 13:57:55 2015 -0700

    Merge pull request #3286 from code-dot-org/levelbuilder

    levelbuilder changes

commit 5540007
Author: Continuous Integration <dev@code.org>
Date:   Wed Jul 29 20:54:14 2015 +0000

    dropbox content changes

commit 4edfa6a
Merge: 3a449bf e5af851
Author: philbogle <phil@code.org>
Date:   Wed Jul 29 13:52:00 2015 -0700

    Merge pull request #3283 from code-dot-org/redis_incr

    Added increment_counter method to RedisPropertyBag class.

commit e5af851
Author: Phil Bogle <phil@code.org>
Date:   Wed Jul 29 13:33:45 2015 -0700

    Doulble to single quotes

commit 0a47a17
Author: Phil Bogle <phil@code.org>
Date:   Wed Jul 29 13:30:25 2015 -0700

    Hound whitespace fixes

commit 3a449bf
Merge: f4474e9 2c7d43e
Author: Josh Lory <josh.lory@code.org>
Date:   Wed Jul 29 13:26:47 2015 -0700

    Merge pull request #3279 from code-dot-org/space-after-colon

    rubocop --only Style/SpaceAfterColon --auto-correct

commit f4474e9
Merge: fe22ca5 8726811
Author: Brendan Reville <brendan@code.org>
Date:   Wed Jul 29 12:48:50 2015 -0700

    Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging

commit fe22ca5
Author: Brendan Reville <brendan@code.org>
Date:   Wed Jul 29 12:48:05 2015 -0700

    Mention whitelisting pusherapp.com URLs on a couple /educate help pages.

commit 8726811
Author: Continuous Integration <dev@code.org>
Date:   Wed Jul 29 19:40:38 2015 +0000

    Automatically built.

    commit 8a80110
    Merge: ddd5a15 b1ec573
    Author: Brian Jordan <bcjordan@gmail.com>
    Date:   Wed Jul 29 12:32:05 2015 -0700

        Merge pull request #3276 from code-dot-org/fix_touch_flyout_drag

        Clear flyout blocks before show rather than on hide, fixes touch drag-from-category-flyout [fixes #69306102]

    commit ddd5a15
    Author: Continuous Integration <dev@code.org>
    Date:   Wed Jul 29 19:12:30 2015 +0000

        Automatically built.

        commit 3c02ca5
        Merge: 9aa7e99 eecbe89
        Author: Josh Lory <josh.lory@code.org>
        Date:   Wed Jul 29 12:14:14 2015 -0700

            Merge pull request #3280 from code-dot-org/only-save-project-if-owner

            Only save project before remixing if the current user is the owner

        commit 9aa7e99
        Merge: 424ab56 8485895
        Author: philbogle <phil@code.org>
        Date:   Wed Jul 29 12:10:47 2015 -0700

            Merge pull request #3277 from code-dot-org/redis

            Add RedisPropertyBag implementation.

            This is a property bag backed by Redis, which will be used in NetSim.  (Note the interface is not exactly the same as our DynamoDB and MySQL property bags. We might converge them at some point but there is no use case making us need to do that today.)

            The entire property bag is stored in a single value as a Redis hash. This makes it efficient to fetch tne entire property bag without having to make multiple requests to Redis.  Redis supports operations for getting, setting, and deleting individual fields in the bag without disturbing other fields.

            The property bag also supports named atomic counters via the increment_counter method; these can be used to generated unique, ascending sequence number for row keys, for example.

            The property bag is only as durable as the Redis instance, but all of the items in the property bag are "fate shared" which provides for some measure of consistency.

    commit 3c02ca5
    Merge: 9aa7e99 eecbe89
    Author: Josh Lory <josh.lory@code.org>
    Date:   Wed Jul 29 12:14:14 2015 -0700

        Merge pull request #3280 from code-dot-org/only-save-project-if-owner

        Only save project before remixing if the current user is the owner

    commit 9aa7e99
    Merge: 424ab56 8485895
    Author: philbogle <phil@code.org>
    Date:   Wed Jul 29 12:10:47 2015 -0700

        Merge pull request #3277 from code-dot-org/redis

        Add RedisPropertyBag implementation.

        This is a property bag backed by Redis, which will be used in NetSim.  (Note the interface is not exactly the same as our DynamoDB and MySQL property bags. We might converge them at some point but there is no use case making us need to do that today.)

        The entire property bag is stored in a single value as a Redis hash. This makes it efficient to fetch tne entire property bag without having to make multiple requests to Redis.  Redis supports operations for getting, setting, and deleting individual fields in the bag without disturbing other fields.

        The property bag also supports named atomic counters via the increment_counter method; these can be used to generated unique, ascending sequence number for row keys, for example.

        The property bag is only as durable as the Redis instance, but all of the items in the property bag are "fate shared" which provides for some measure of consistency.

commit 0394378
Author: Phil Bogle <phil@code.org>
Date:   Wed Jul 29 12:36:26 2015 -0700

    Comment fixes

commit 8a80110
Merge: ddd5a15 b1ec573
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Wed Jul 29 12:32:05 2015 -0700

    Merge pull request #3276 from code-dot-org/fix_touch_flyout_drag

    Clear flyout blocks before show rather than on hide, fixes touch drag-from-category-flyout [fixes #69306102]

commit 36add4e
Author: Phil Bogle <phil@code.org>
Date:   Wed Jul 29 12:28:19 2015 -0700

    Comment changes

commit 0ce27b7
Merge: 5a26efd ddd5a15
Author: Phil Bogle <phil@code.org>
Date:   Wed Jul 29 12:24:13 2015 -0700

    Merge with staging

commit ddd5a15
Author: Continuous Integration <dev@code.org>
Date:   Wed Jul 29 19:12:30 2015 +0000

    Automatically built.

    commit 3c02ca5
    Merge: 9aa7e99 eecbe89
    Author: Josh Lory <josh.lory@code.org>
    Date:   Wed Jul 29 12:14:14 2015 -0700

        Merge pull request #3280 from code-dot-org/only-save-project-if-owner

        Only save project before remixing if the current user is the owner

    commit 9aa7e99
    Merge: 424ab56 8485895
    Author: philbogle <phil@code.org>
    Date:   Wed Jul 29 12:10:47 2015 -0700

        Merge pull request #3277 from code-dot-org/redis

        Add RedisPropertyBag implementation.

        This is a property bag backed by Redis, which will be used in NetSim.  (Note the interface is not exactly the same as our DynamoDB and MySQL property bags. We might converge them at some point but there is no use case making us need to do that today.)

        The entire property bag is stored in a single value as a Redis hash. This makes it efficient to fetch tne entire property bag without having to make multiple requests to Redis.  Redis supports operations for getting, setting, and deleting individual fields in the bag without disturbing other fields.

        The property bag also supports named atomic counters via the increment_counter method; these can be used to generated unique, ascending sequence number for row keys, for example.

        The property bag is only as durable as the Redis instance, but all of the items in the property bag are "fate shared" which provides for some measure of consistency.
Hamms added a commit that referenced this pull request Aug 28, 2019
@Hamms
Remove 'advertised scripts' helper methods from User model
d5fdbf9 
Originally defined in
#3165, this is no
longer actually used
@Hamms Hamms mentioned this pull request Aug 28, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@tanyaparker @breville @joshlory @houndci-bot