Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

enhancement: collapsable side menu on small screens (#445)

Guilherme Oenningbf71ea23dc60
diff --git a/app/handlers/signin.go b/app/handlers/signin.go
index 54a5f208e..834459f40 100644
--- a/app/handlers/signin.go
+++ b/app/handlers/signin.go
@@ -145,7 +145,6 @@ func OAuthCallback(provider string) web.HandlerFunc {
// SignInByOAuth handles OAuth sign in
func SignInByOAuth(provider string) web.HandlerFunc {
return func(c web.Context) error {
- c.Logger().Info(c.QueryParam("redirect"))
authURL := c.Services().OAuth.GetAuthURL(c.AuthEndpoint(), provider, c.QueryParam("redirect"))
return c.Redirect(authURL)
}
diff --git a/main.go b/main.go
index a7350bf4a..5f4bd0586 100644
--- a/main.go
+++ b/main.go
@@ -20,7 +20,7 @@ var buildnumber = "local"
// Use this for stable releases
// var version = "x.y.z"
-var version = "0.14.0"
+var version = "0.15.0-"
func main() {
settings := &models.SystemSettings{
diff --git a/public/assets/styles/main.scss b/public/assets/styles/main.scss
index 45571104e..eb2f4a576 100644
--- a/public/assets/styles/main.scss
+++ b/public/assets/styles/main.scss
@@ -383,4 +383,16 @@ h1, h2, h3, h4, h5 {
.hidden-md {
display: none;
}
+}
+
+@include media("lg") {
+ .hidden-lg {
+ display: none;
+ }
+}
+
+@include media("xl") {
+ .hidden-xl {
+ display: none;
+ }
}
\ No newline at end of file
diff --git a/public/components/common/Heading.scss b/public/components/common/Heading.scss
index 13ba29066..fb79b5f85 100644
--- a/public/components/common/Heading.scss
+++ b/public/components/common/Heading.scss
@@ -1,7 +1,11 @@
@import '~@fider/assets/styles/variables.scss';
.c-heading {
+ display: inline-block;
margin-bottom: 10px;
+ @include media("sm") {
+ font-size: $font-size-xlarge;
+ }
.c-heading-content {
display: table-cell;
@@ -12,6 +16,10 @@
margin-top: 5px;
color: $gray-darker;
font-size: $font-size;
+
+ @include media("sm") {
+ display: none;
+ }
}
}
@@ -21,6 +29,9 @@
.c-heading-icon {
font-size: 30px;
+ @include media("sm") {
+ font-size: 20px;
+ }
display: table-cell;
vertical-align: middle;
}
diff --git a/public/pages/Administration/components/AdminBasePage.tsx b/public/pages/Administration/components/AdminBasePage.tsx
index f3291cbc7..4d8beb818 100644
--- a/public/pages/Administration/components/AdminBasePage.tsx
+++ b/public/pages/Administration/components/AdminBasePage.tsx
@@ -1,7 +1,6 @@
import * as React from "react";
-import { CurrentUser } from "@fider/models";
import { Heading } from "@fider/components";
-import { SideMenu } from "./";
+import { SideMenu, SideMenuToggler } from "./";
export abstract class AdminBasePage<P, S> extends React.Component<P, S> {
public abstract id: string;
@@ -11,16 +10,27 @@ export abstract class AdminBasePage<P, S> extends React.Component<P, S> {
public abstract subtitle: string;
public abstract content(): JSX.Element;
+ private toggleSideMenu = (active: boolean) => {
+ const el = document.querySelector(".hidden-lg .c-side-menu") as HTMLElement;
+ if (el) {
+ el.style.display = active ? "" : "none";
+ }
+ };
+
public render() {
return (
<div id={this.id} className="page container">
<Heading title={this.title} icon={this.icon} subtitle={this.subtitle} />
+ <SideMenuToggler onToggle={this.toggleSideMenu} />
<div className="row">
- <div className="col-lg-2">
- <SideMenu activeItem={this.name} />
+ <div className="col-lg-2 hidden-sm hidden-md">
+ <SideMenu visible={true} activeItem={this.name} />
+ </div>
+ <div className="col-lg-10 col-md-12">
+ <SideMenu className="hidden-lg hidden-xl" visible={false} activeItem={this.name} />
+ {this.content()}
</div>
- <div className="col-lg-10">{this.content()}</div>
</div>
</div>
);
diff --git a/public/pages/Administration/components/SideMenu.scss b/public/pages/Administration/components/SideMenu.scss
index d1039f1f4..cc608b42d 100644
--- a/public/pages/Administration/components/SideMenu.scss
+++ b/public/pages/Administration/components/SideMenu.scss
@@ -1,5 +1,39 @@
@import '~@fider/assets/styles/variables.scss';
+.c-side-menu-toggler {
+ float: right;
+ margin-top: 5px;
+ cursor: pointer;
+
+ @include media("md") {
+ margin-top: 15px;
+ }
+
+ @include media(">=lg") {
+ display: none;
+ }
+
+ > div {
+ width: 30px;
+ height: 4px;
+ background-color: $text-color;
+ margin: 4px 0;
+ transition: 0.4s;
+ }
+
+ &.active {
+ .bar1 {
+ transform: rotate(-45deg) translate(-4px, 3px);
+ }
+ .bar2 {
+ opacity: 0;
+ }
+ .bar3 {
+ transform: rotate(45deg) translate(-8px, -8px) ;
+ }
+ }
+}
+
.c-side-menu {
display: block;
border: 1px solid rgba(34, 36, 38, .1);
diff --git a/public/pages/Administration/components/SideMenu.tsx b/public/pages/Administration/components/SideMenu.tsx
index e30180bc5..5d107fb82 100644
--- a/public/pages/Administration/components/SideMenu.tsx
+++ b/public/pages/Administration/components/SideMenu.tsx
@@ -1,12 +1,13 @@
import "./SideMenu.scss";
import * as React from "react";
-import { CurrentUser } from "@fider/models";
import { classSet, Fider } from "@fider/services";
import { FiderVersion } from "@fider/components";
interface SiteMenuProps {
activeItem: string;
+ visible: boolean;
+ className?: string;
}
interface SideMenuItemProps {
@@ -39,9 +40,11 @@ const SideMenuItem = (props: SideMenuItemProps) => {
export const SideMenu = (props: SiteMenuProps) => {
const activeItem = props.activeItem || "general";
+ const style = { display: props.visible ? "" : "none" };
+
return (
- <>
- <div className="c-side-menu">
+ <div className={props.className}>
+ <div className="c-side-menu" style={style}>
<SideMenuItem name="general" title="General" href="/admin" isActive={activeItem === "general"} />
<SideMenuItem name="privacy" title="Privacy" href="/admin/privacy" isActive={activeItem === "privacy"} />
<SideMenuItem name="members" title="Members" href="/admin/members" isActive={activeItem === "members"} />
@@ -58,6 +61,45 @@ export const SideMenu = (props: SiteMenuProps) => {
)}
</div>
<FiderVersion />
- </>
+ </div>
);
};
+
+interface SideMenuTogglerProps {
+ onToggle: (active: boolean) => void;
+}
+
+interface SideMenuTogglerState {
+ active: boolean;
+}
+
+export class SideMenuToggler extends React.Component<SideMenuTogglerProps, SideMenuTogglerState> {
+ constructor(props: SideMenuTogglerProps) {
+ super(props);
+ this.state = {
+ active: false
+ };
+ }
+ private toggle = () => {
+ this.setState(
+ state => ({ active: !state.active }),
+ () => {
+ this.props.onToggle(this.state.active);
+ }
+ );
+ };
+
+ public render() {
+ const className = classSet({
+ "c-side-menu-toggler": true,
+ active: this.state.active
+ });
+ return (
+ <div className={className} onClick={this.toggle}>
+ <div className="bar1" />
+ <div className="bar2" />
+ <div className="bar3" />
+ </div>
+ );
+ }
+}