Commit 181879d1 authored by Marcelo Rivera's avatar Marcelo Rivera

(feat): redirect to normal login if not on standalone

1 merge request!486WIP: (feat): Minds Pro (development branch) - Release 2
Pipeline #77378975 running with stages
......@@ -184,7 +184,7 @@ export class ProChannelComponent implements OnInit, AfterViewInit, OnDestroy {
if (!this.channel.subscribed) {
if (!this.session.isLoggedIn()) {
this.router.navigate(['/pro', this.channel.username, 'signup']);
this.router.navigate(['/login']);
return false;
}
......
@import "defaults";
m-pro--channel-signup {
m-pro--channel-login {
display: flex;
align-items: center;
justify-content: flex-end;
......@@ -10,10 +10,10 @@ m-pro--channel-signup {
}
}
.m-ProChannelSignup--hero {
.m-ProChannelLogin--hero {
position: relative;
.m-ProChannelSignup--hero--inner {
.m-ProChannelLogin--hero--inner {
display: flex;
flex-direction: row;
align-items: center;
......@@ -29,7 +29,7 @@ m-pro--channel-signup {
padding: 62px 0px;
}
.m-ProChannelSignup--app-buttons {
.m-ProChannelLogin--app-buttons {
display: flex;
justify-content: flex-start;
......@@ -37,7 +37,7 @@ m-pro--channel-signup {
margin-left: 2px;
}
.m-ProChannelSignup--app-buttons__iosBanner {
.m-ProChannelLogin--app-buttons__iosBanner {
> a > img {
height: 48px;
......@@ -55,7 +55,7 @@ m-pro--channel-signup {
}
}
.m-ProChannelSignup--hero--video {
.m-ProChannelLogin--hero--video {
position: absolute;
bottom: 0;
left: 0;
......@@ -71,7 +71,7 @@ m-pro--channel-signup {
}
}
.m-ProChannelSignup--hero--overlay {
.m-ProChannelLogin--hero--overlay {
position: absolute;
top: 0;
left: 0;
......@@ -83,7 +83,7 @@ m-pro--channel-signup {
}
}
.m-ProChannelSignup--hero--slogans {
.m-ProChannelLogin--hero--slogans {
flex: 2;
h1, h3, h4 {
......@@ -126,7 +126,7 @@ m-pro--channel-signup {
z-index: 2;
}
.m-ProChannelSignup--signup {
.m-ProChannelLogin--login {
flex: 1;
margin-left: 16px;
......@@ -135,7 +135,7 @@ m-pro--channel-signup {
margin-left: 0;
}
.m-proChannelSignup--subtext {
.m-proChannelLogin--subtext {
font-size: 20px;
margin: 8px;
color: var(--m-pro--text-color) !important;
......@@ -231,8 +231,8 @@ m-pro--channel-signup {
}
@media (max-width: $max-mobile) {
.m-ProChannelSignup--grid {
.m-ProChannelSignup--titles {
.m-ProChannelLogin--grid {
.m-ProChannelLogin--titles {
h1 {
font-size: 32px;
line-height: 32px;
......@@ -250,7 +250,7 @@ m-pro--channel-signup {
}
}
}
.m-ProChannelSignup--titles {
.m-ProChannelLogin--titles {
//display:none;
}
.m-app-links {
......
......@@ -5,23 +5,23 @@ import { Session } from "../../../../services/session";
import { ProChannelService } from "../channel.service";
@Component({
selector: 'm-pro--channel-signup',
selector: 'm-pro--channel-login',
template: `
<section class="m-ProChannelSignup--hero">
<section class="m-ProChannelLogin--hero">
<div class="m-ProChannelSignup--hero--inner">
<div class="m-ProChannelLogin--hero--inner">
<div class="m-ProChannelSignup--hero--slogans">
<div class="m-ProChannelLogin--hero--slogans">
<h2>{{ headline }}</h2>
</div>
<div class="m-ProChannelSignup--signup">
<div class="m-ProChannelLogin--login">
<ng-container *ngIf="currentSection === 'login'">
<span class="m-proChannelSignup--subtext">Not on Minds? <a (click)="currentSection = 'register'">Start a Channel</a></span>
<span class="m-proChannelLogin--subtext">Not on Minds? <a (click)="currentSection = 'register'">Start a Channel</a></span>
<minds-form-login (done)="registered()"></minds-form-login>
</ng-container>
<ng-container *ngIf="currentSection === 'register'">
<span class="m-proChannelSignup--subtext"><a (click)="currentSection = 'login'">I already have an account</a></span>
<span class="m-proChannelLogin--subtext"><a (click)="currentSection = 'login'">I already have an account</a></span>
<minds-form-register (done)="registered()"></minds-form-register>
</ng-container>
</div>
......@@ -32,7 +32,7 @@ import { ProChannelService } from "../channel.service";
`
})
export class ProChannelSignupComponent {
export class ProChannelLoginComponent {
username: string;
currentSection: 'login' | 'register' = 'login';
......
......@@ -7,7 +7,7 @@ import { ProService } from './pro.service';
import { ProMarketingComponent } from './marketing.component';
import { ProSubscriptionComponent } from './subscription.component';
import { ProChannelComponent } from "./channel/channel.component";
import { ProChannelSignupComponent } from "./channel/signup/signup.component";
import { ProChannelLoginComponent } from "./channel/login/login.component";
import { MindsFormsModule } from "../forms/forms.module";
import { ProChannelListComponent } from "./channel/list/list.component";
import { ProChannelDonateComponent } from './channel/donate/donate.component';
......@@ -41,8 +41,8 @@ const channelRoute = {
component: ProChannelDonateComponent
},
{
path: 'signup',
component: ProChannelSignupComponent
path: 'login',
component: ProChannelLoginComponent
},
{
path: ':type',
......@@ -102,7 +102,7 @@ routes.push({
ProCategoriesComponent,
ProChannelListModal,
ProChannelComponent,
ProChannelSignupComponent,
ProChannelLoginComponent,
ProChannelListComponent,
ProChannelDonateComponent,
ProUserMenuComponent,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment