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.

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

Combine marketing and product homepage #156

Merged
merged 78 commits into from Oct 5, 2018
Merged

Conversation

slimsag
Copy link
Member

@slimsag slimsag commented Oct 1, 2018

from sourcegraph/sourcegraph-intermediate-2018@0df1ccd

fixes https://github.com/sourcegraph/enterprise/issues/13480

cc @francisschmaltz this is your new branch :)

This PR updates the CHANGELOG.md file to describe any user-facing changes.
This PR does not need to update the CHANGELOG because ...

@francisschmaltz francisschmaltz changed the title import fs/marketing-homepage Combine marketing and product homepage Oct 1, 2018
@francisschmaltz
Copy link
Contributor

francisschmaltz commented Oct 1, 2018

New marketing homepage

This branch combines the marketing homepage – currently on about.sourcegraph.com – and the product homepage on sourcegraph.com/search.

This solves a problem of users not knowing how to get to our product from our marketing page.

This page is only visible on sourcegraph.com and when a no users are signed-in out. A user that is signed-in will get the normal product homepage.

@@ -212,15 +212,10 @@ func serveHome(w http.ResponseWriter, r *http.Request) error {

if (r.Host == "sourcegraph.com" || r.Host == "www.sourcegraph.com") && !actor.FromContext(r.Context()).IsAuthenticated() {
Copy link
Member Author

Choose a reason for hiding this comment

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

@vanesa for having the ability to test, change this line to become:

if envvar.SourcegraphDotComMode() && !actor.FromContext(r.Context()).IsAuthenticated() {

@codecov-io
Copy link

codecov-io commented Oct 5, 2018

Codecov Report

Merging #156 into master will increase coverage by 0.32%.
The diff coverage is 15.38%.

Impacted Files Coverage Δ
cmd/frontend/internal/app/ui/handlers.go 6.83% <0%> (-0.37%) ⬇️
cmd/frontend/internal/app/ui/router.go 51.96% <100%> (+0.42%) ⬆️
cmd/symbols/internal/symbols/index.go 39.34% <0%> (-9.84%) ⬇️
cmd/gitserver/server/cleanup.go 63.72% <0%> (-1.48%) ⬇️
cmd/symbols/internal/symbols/fetch.go 53.33% <0%> (+48%) ⬆️
cmd/symbols/internal/symbols/parse.go 63.93% <0%> (+53.27%) ⬆️

@francisschmaltz francisschmaltz merged commit 6fe8201 into master Oct 5, 2018
francisschmaltz pushed a commit that referenced this pull request Oct 5, 2018
New marketing homepage for sourcegraph.com!

Router users visiting about.sourcegraph.com/ and sourcegraph.com/ to the new homepage based off the following conditions:

If a user is logged out -> / -> /start and gets the new homepage
If a user is logged in -> / -> /search and gets the normal search page

Users that visit either /start or /search will get the page without redirections

This is not implemented on non-sourcegraph.com instances.
francisschmaltz added a commit that referenced this pull request Oct 5, 2018
* Combine marketing and product homepage (#156)

New marketing homepage for sourcegraph.com!

Router users visiting about.sourcegraph.com/ and sourcegraph.com/ to the new homepage based off the following conditions:

If a user is logged out -> / -> /start and gets the new homepage
If a user is logged in -> / -> /search and gets the normal search page

Users that visit either /start or /search will get the page without redirections

This is not implemented on non-sourcegraph.com instances.

* Invert check of sourcegraph.com for 404
@francisschmaltz francisschmaltz deleted the fs/marketing-homepage branch October 5, 2018 21:32
.layout {
display: block !important;
}
* {
Copy link
Contributor

Choose a reason for hiding this comment

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

This looks like a severe change that could break many things?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants