Login page

dev-docs/plugins/hooks/get-category-threads-page-context-hook.md → dev-docs/plugins/hooks/get-category-threads-page-context-data-hook.md

@@ -1,22 +1,22 @@
-# `get_category_threads_page_context_hook`
+# `get_category_threads_page_context_data_hook`
 
-This hook wraps the standard function that Misago uses to get the template for the category threads page.
+This hook wraps the standard function that Misago uses to get the template context data for the category threads page.
 
 
 ## Location
 
 This hook can be imported from `misago.threads.hooks`:
 
 ```python
-from misago.threads.hooks import get_category_threads_page_context_hook
+from misago.threads.hooks import get_category_threads_page_context_data_hook
 ```
 
 
 ## Filter
 
 ```python
-def custom_get_category_threads_page_context_filter(
-    action: GetCategoryThreadsPageContextHookAction,
+def custom_get_category_threads_page_context_data_filter(
+    action: GetCategoryThreadsPageContextDataHookAction,
     request: HttpRequest,
     kwargs: dict,
 ) -> dict:
@@ -28,9 +28,9 @@ A function implemented by a plugin that can be registered in this hook.
 
 ### Arguments
 
-#### `action: GetCategoryThreadsPageContextHookAction`
+#### `action: GetCategoryThreadsPageContextDataHookAction`
 
-A standard Misago function used to get the template context for the category threads page.
+A standard Misago function used to get the template context data for the category threads page.
 
 See the [action](#action) section for details.
 
@@ -47,17 +47,17 @@ A Python `dict` with view's keyword arguments.
 
 ### Return value
 
-A Python `dict` with context to use to `render` the category threads page.
+A Python `dict` with context data to use to `render` the category threads page.
 
 
 ## Action
 
 ```python
-def get_category_threads_page_context_action(request: HttpRequest, kwargs: dict) -> dict:
+def get_category_threads_page_context_data_action(request: HttpRequest, kwargs: dict) -> dict:
     ...
 ```
 
-A standard Misago function used to get the template context for the category threads page.
+A standard Misago function used to get the template context data for the category threads page.
 
 
 ### Arguments
@@ -74,19 +74,19 @@ A Python `dict` with view's keyword arguments.
 
 ### Return value
 
-A Python `dict` with context to use to `render` the category threads page.
+A Python `dict` with context data to use to `render` the category threads page.
 
 
 ## Example
 
-The code below implements a custom filter function that adds custom context to the category threads page:
+The code below implements a custom filter function that adds custom context data to the category threads page:
 
 ```python
 from django.http import HttpRequest
-from misago.threads.hooks import get_category_threads_page_context_hook
+from misago.threads.hooks import get_category_threads_page_context_data_hook
 
 
-@get_category_threads_page_context_hook.append_filter
+@get_category_threads_page_context_data_hook.append_filter
 def include_custom_context(action, request: HttpRequest, kwargs: dict) -> dict:
     context = action(request, kwargs)
 

dev-docs/plugins/hooks/get-private-threads-page-context-hook.md → dev-docs/plugins/hooks/get-private-threads-page-context-data-hook.md

@@ -1,22 +1,22 @@
-# `get_private_threads_page_context_hook`
+# `get_private_threads_page_context_data_hook`
 
-This hook wraps the standard function that Misago uses to get the template for the private threads page.
+This hook wraps the standard function that Misago uses to get the template context data for the private threads page.
 
 
 ## Location
 
 This hook can be imported from `misago.threads.hooks`:
 
 ```python
-from misago.threads.hooks import get_private_threads_page_context_hook
+from misago.threads.hooks import get_private_threads_page_context_data_hook
 ```
 
 
 ## Filter
 
 ```python
-def custom_get_private_threads_page_context_filter(
-    action: GetPrivateThreadsPageContextHookAction,
+def custom_get_private_threads_page_context_data_filter(
+    action: GetPrivateThreadsPageContextDataHookAction,
     request: HttpRequest,
     kwargs: dict,
 ) -> dict:
@@ -28,9 +28,9 @@ A function implemented by a plugin that can be registered in this hook.
 
 ### Arguments
 
-#### `action: GetPrivateThreadsPageContextHookAction`
+#### `action: GetPrivateThreadsPageContextDataHookAction`
 
-A standard Misago function used to get the template context for the private threads page.
+A standard Misago function used to get the template context data for the private threads page.
 
 See the [action](#action) section for details.
 
@@ -47,17 +47,17 @@ A Python `dict` with view's keyword arguments.
 
 ### Return value
 
-A Python `dict` with context to use to `render` the private threads page.
+A Python `dict` with context data to use to `render` the private threads page.
 
 
 ## Action
 
 ```python
-def get_private_threads_page_context_action(request: HttpRequest, kwargs: dict) -> dict:
+def get_private_threads_page_context_data_action(request: HttpRequest, kwargs: dict) -> dict:
     ...
 ```
 
-A standard Misago function used to get the template context for the private threads page.
+A standard Misago function used to get the template context data for the private threads page.
 
 
 ### Arguments
@@ -74,19 +74,19 @@ A Python `dict` with view's keyword arguments.
 
 ### Return value
 
-A Python `dict` with context to use to `render` the private threads page.
+A Python `dict` with context data to use to `render` the private threads page.
 
 
 ## Example
 
-The code below implements a custom filter function that adds custom context to the private threads page:
+The code below implements a custom filter function that adds custom context data to the private threads page:
 
 ```python
 from django.http import HttpRequest
-from misago.threads.hooks import get_private_threads_page_context_hook
+from misago.threads.hooks import get_private_threads_page_context_data_hook
 
 
-@get_private_threads_page_context_hook.append_filter
+@get_private_threads_page_context_data_hook.append_filter
 def include_custom_context(action, request: HttpRequest, : dict) -> dict:
     context = action(request, kwargs)
 

dev-docs/plugins/hooks/get-threads-page-context-hook.md → dev-docs/plugins/hooks/get-threads-page-context-data-hook.md

@@ -1,22 +1,22 @@
-# `get_threads_page_context_hook`
+# `get_threads_page_context_data_hook`
 
-This hook wraps the standard function that Misago uses to get the template for the threads page.
+This hook wraps the standard function that Misago uses to get the template context data for the threads page.
 
 
 ## Location
 
 This hook can be imported from `misago.threads.hooks`:
 
 ```python
-from misago.threads.hooks import get_threads_page_context_hook
+from misago.threads.hooks import get_threads_page_context_data_hook
 ```
 
 
 ## Filter
 
 ```python
-def custom_get_threads_page_context_filter(
-    action: GetThreadsPageContextHookAction,
+def custom_get_threads_page_context_data_filter(
+    action: GetThreadsPageContextDataHookAction,
     request: HttpRequest,
     kwargs: dict,
 ) -> dict:
@@ -28,9 +28,9 @@ A function implemented by a plugin that can be registered in this hook.
 
 ### Arguments
 
-#### `action: GetThreadsPageContextHookAction`
+#### `action: GetThreadsPageContextDataHookAction`
 
-A standard Misago function used to get the template context for the threads page.
+A standard Misago function used to get the template context data for the threads page.
 
 See the [action](#action) section for details.
 
@@ -47,17 +47,17 @@ A Python `dict` with view's keyword arguments.
 
 ### Return value
 
-A Python `dict` with context to use to `render` the threads page.
+A Python `dict` with context data to use to `render` the threads page.
 
 
 ## Action
 
 ```python
-def get_threads_page_context_action(request: HttpRequest, kwargs: dict) -> dict:
+def get_threads_page_context_data_action(request: HttpRequest, kwargs: dict) -> dict:
     ...
 ```
 
-A standard Misago function used to get the template context for the threads page.
+A standard Misago function used to get the template context data for the threads page.
 
 
 ### Arguments
@@ -74,19 +74,19 @@ A Python `dict` with view's keyword arguments.
 
 ### Return value
 
-A Python `dict` with context to use to `render` the threads page.
+A Python `dict` with context data to use to `render` the threads page.
 
 
 ## Example
 
-The code below implements a custom filter function that adds custom context to the threads page:
+The code below implements a custom filter function that adds custom context data to the threads page:
 
 ```python
 from django.http import HttpRequest
-from misago.threads.hooks import get_threads_page_context_hook
+from misago.threads.hooks import get_threads_page_context_data_hook
 
 
-@get_threads_page_context_hook.append_filter
+@get_threads_page_context_data_hook.append_filter
 def include_custom_context(action, request: HttpRequest, kwargs: dict) -> dict:
     context = action(request, kwargs)
 

dev-docs/plugins/hooks/reference.md

@@ -66,17 +66,17 @@ Hooks instances are importable from the following Python modules:
 
 `misago.threads.hooks` defines the following hooks:
 
-- [`get_category_threads_page_context_hook`](./get-category-threads-page-context-hook.md)
+- [`get_category_threads_page_context_data_hook`](./get-category-threads-page-context-data-hook.md)
 - [`get_category_threads_page_filters_hook`](./get-category-threads-page-filters-hook.md)
 - [`get_category_threads_page_moderation_actions_hook`](./get-category-threads-page-moderation-actions-hook.md)
 - [`get_category_threads_page_queryset_hook`](./get-category-threads-page-queryset-hook.md)
 - [`get_category_threads_page_subcategories_hook`](./get-category-threads-page-subcategories-hook.md)
 - [`get_category_threads_page_threads_hook`](./get-category-threads-page-threads-hook.md)
-- [`get_private_threads_page_context_hook`](./get-private-threads-page-context-hook.md)
+- [`get_private_threads_page_context_data_hook`](./get-private-threads-page-context-data-hook.md)
 - [`get_private_threads_page_filters_hook`](./get-private-threads-page-filters-hook.md)
 - [`get_private_threads_page_queryset_hook`](./get-private-threads-page-queryset-hook.md)
 - [`get_private_threads_page_threads_hook`](./get-private-threads-page-threads-hook.md)
-- [`get_threads_page_context_hook`](./get-threads-page-context-hook.md)
+- [`get_threads_page_context_data_hook`](./get-threads-page-context-data-hook.md)
 - [`get_threads_page_filters_hook`](./get-threads-page-filters-hook.md)
 - [`get_threads_page_moderation_actions_hook`](./get-threads-page-moderation-actions-hook.md)
 - [`get_threads_page_queryset_hook`](./get-threads-page-queryset-hook.md)

frontend/src/components/SignInButton/SignInButton.jsx

@@ -13,20 +13,26 @@ export default function SignInButton({ block, className, onClick }) {
           "btn-block": block,
         })}
         href={settings.LOGIN_URL}
-        onClick={onClick}
+        onClick={() => {
+          if (onClick) {
+            onClick()
+          }
+        }}
       >
         {pgettext("cta", "Sign in")}
       </a>
     )
   }
 
   return (
-    <button
+    <a
       className={classnames("btn btn-sign-in", className, {
         "btn-block": block,
       })}
-      type="button"
-      onClick={() => {
+      href={settings.LOGIN_URL}
+      onClick={(event) => {
+        event.preventDefault()
+
         if (onClick) {
           onClick()
         }
@@ -35,6 +41,6 @@ export default function SignInButton({ block, className, onClick }) {
       }}
     >
       {pgettext("cta", "Sign in")}
-    </button>
+    </a>
   )
 }

frontend/src/components/reset-password-form.js

@@ -136,9 +136,9 @@ export default class extends React.Component {
   complete = (apiResponse) => {
     auth.softSignOut()
 
-    // nuke "redirect_to" field so we don't end
+    // nuke "next" field so we don't end
     // coming back to error page after sign in
-    $('#hidden-login-form input[name="redirect_to"]').remove()
+    $('#hidden-login-form input[name="next"]').remove()
 
     ReactDOM.render(
       <PasswordChangedPage user={apiResponse} />,

frontend/src/components/sign-in.js

@@ -52,7 +52,7 @@ export default class extends Form {
     // Misago to redirect user back to right page, and will trigger browser's
     // key ring feature
     form.find('input[type="hidden"]').val(ajax.getCsrfToken())
-    form.find('input[name="redirect_to"]').val(window.location.pathname)
+    form.find('input[name="next"]').val(window.location.pathname)
     form.find('input[name="username"]').val(this.state.username)
     form.find('input[name="password"]').val(this.state.password)
     form.submit()

frontend/src/style/flavor/social-buttons.less

@@ -1,63 +1,3 @@
-//
-// Social Buttons Flavor
-// --------------------------------------------------
-
-// Those buttons simply add brand color over the .btn-default
-.misago-social-btn(@color) {
-  &,
-  &:disabled,
-  &:disabled:hover {
-    color: @color;
-    font-weight: bold;
-  }
-}
-
-.btn-social-battlenet,
-.btn-social-battlenet-oauth2 {
-  .misago-social-btn(#0e86ca);
-}
-
-.btn-social-bungie {
-  .misago-social-btn(#0096db);
-}
-
-.btn-social-facebook,
-.btn-social-facebook-app {
-  .misago-social-btn(#3b5998);
-}
-
-.btn-social-github,
-.btn-social-github-team,
-.btn-social-github-enterprise,
-.btn-social-github-enterprise-org,
-.btn-social-github-enterprise-team {
-  .misago-social-btn(#000000);
-}
-
-.btn-social-gitlab {
-  .misago-social-btn(#fc6d26);
-}
-
-.btn-social-google,
-.btn-social-google-oauth,
-.btn-social-google-oauth2,
-.btn-social-google-plus,
-.btn-social-google-openidconnect {
-  .misago-social-btn(#dd4b39);
-}
-
-.btn-social-linkedin {
-  .misago-social-btn(#0077b5);
-}
-
-.btn-social-steam {
-  .misago-social-btn(#5c7e10);
-}
-
-.btn-social-twitter {
-  .misago-social-btn(#1da1f2);
-}
-
 .form-social-auth {
   .row {
     margin-top: @padding-base-vertical * -1;