Skip to content
Next
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
Minds Frontend
Project
Project
Details
Activity
Releases
Cycle Analytics
Insights
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
870
Issues
870
List
Boards
Labels
Service Desk
Milestones
Merge Requests
55
Merge Requests
55
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
List
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Minds
Minds Frontend
Commits
181879d1
Commit
181879d1
authored
7 minutes ago
by
Marcelo Rivera
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(feat): redirect to normal login if not on standalone
parent
13406213
epic/minds-pro
1 merge request
!486
WIP: (feat): Minds Pro (development branch) - Release 2
Pipeline
#77378975
running with stages
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
26 deletions
+26
-26
channel.component.ts
src/app/modules/pro/channel/channel.component.ts
+1
-1
login.component.scss
src/app/modules/pro/channel/login/login.component.scss
+13
-13
login.component.ts
src/app/modules/pro/channel/login/login.component.ts
+8
-8
pro.module.ts
src/app/modules/pro/pro.module.ts
+4
-4
No files found.
src/app/modules/pro/channel/channel.component.ts
View file @
181879d1
...
...
@@ -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
;
}
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/pro/channel/
signup/signup
.component.scss
→
src/app/modules/pro/channel/
login/login
.component.scss
View file @
181879d1
@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-ProChannel
Signup
--hero
{
.m-ProChannel
Login
--hero
{
position
:
relative
;
.m-ProChannel
Signup
--hero--inner
{
.m-ProChannel
Login
--hero--inner
{
display
:
flex
;
flex-direction
:
row
;
align-items
:
center
;
...
...
@@ -29,7 +29,7 @@ m-pro--channel-signup {
padding
:
62px
0px
;
}
.m-ProChannel
Signup
--app-buttons
{
.m-ProChannel
Login
--app-buttons
{
display
:
flex
;
justify-content
:
flex-start
;
...
...
@@ -37,7 +37,7 @@ m-pro--channel-signup {
margin-left
:
2px
;
}
.m-ProChannel
Signup
--app-buttons__iosBanner
{
.m-ProChannel
Login
--app-buttons__iosBanner
{
>
a
>
img
{
height
:
48px
;
...
...
@@ -55,7 +55,7 @@ m-pro--channel-signup {
}
}
.m-ProChannel
Signup
--hero--video
{
.m-ProChannel
Login
--hero--video
{
position
:
absolute
;
bottom
:
0
;
left
:
0
;
...
...
@@ -71,7 +71,7 @@ m-pro--channel-signup {
}
}
.m-ProChannel
Signup
--hero--overlay
{
.m-ProChannel
Login
--hero--overlay
{
position
:
absolute
;
top
:
0
;
left
:
0
;
...
...
@@ -83,7 +83,7 @@ m-pro--channel-signup {
}
}
.m-ProChannel
Signup
--hero--slogans
{
.m-ProChannel
Login
--hero--slogans
{
flex
:
2
;
h1
,
h3
,
h4
{
...
...
@@ -126,7 +126,7 @@ m-pro--channel-signup {
z-index
:
2
;
}
.m-ProChannel
Signup--signup
{
.m-ProChannel
Login--login
{
flex
:
1
;
margin-left
:
16px
;
...
...
@@ -135,7 +135,7 @@ m-pro--channel-signup {
margin-left
:
0
;
}
.m-proChannel
Signup
--subtext
{
.m-proChannel
Login
--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-ProChannel
Signup
--grid
{
.m-ProChannel
Signup
--titles
{
.m-ProChannel
Login
--grid
{
.m-ProChannel
Login
--titles
{
h1
{
font-size
:
32px
;
line-height
:
32px
;
...
...
@@ -250,7 +250,7 @@ m-pro--channel-signup {
}
}
}
.m-ProChannel
Signup
--titles
{
.m-ProChannel
Login
--titles
{
//display:none;
}
.m-app-links
{
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/pro/channel/
signup/signup
.component.ts
→
src/app/modules/pro/channel/
login/login
.component.ts
View file @
181879d1
...
...
@@ -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-ProChannel
Signup
--hero">
<section class="m-ProChannel
Login
--hero">
<div class="m-ProChannel
Signup
--hero--inner">
<div class="m-ProChannel
Login
--hero--inner">
<div class="m-ProChannel
Signup
--hero--slogans">
<div class="m-ProChannel
Login
--hero--slogans">
<h2>{{ headline }}</h2>
</div>
<div class="m-ProChannel
Signup--signup
">
<div class="m-ProChannel
Login--login
">
<ng-container *ngIf="currentSection === 'login'">
<span class="m-proChannel
Signup
--subtext">Not on Minds? <a (click)="currentSection = 'register'">Start a Channel</a></span>
<span class="m-proChannel
Login
--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-proChannel
Signup
--subtext"><a (click)="currentSection = 'login'">I already have an account</a></span>
<span class="m-proChannel
Login
--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
ProChannel
Signup
Component
{
export
class
ProChannel
Login
Component
{
username
:
string
;
currentSection
:
'
login
'
|
'
register
'
=
'
login
'
;
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/pro/pro.module.ts
View file @
181879d1
...
...
@@ -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
{
ProChannel
SignupComponent
}
from
"
./channel/signup/signup
.component
"
;
import
{
ProChannel
LoginComponent
}
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
:
ProChannel
Signup
Component
path
:
'
login
'
,
component
:
ProChannel
Login
Component
},
{
path
:
'
:type
'
,
...
...
@@ -102,7 +102,7 @@ routes.push({
ProCategoriesComponent
,
ProChannelListModal
,
ProChannelComponent
,
ProChannel
Signup
Component
,
ProChannel
Login
Component
,
ProChannelListComponent
,
ProChannelDonateComponent
,
ProUserMenuComponent
,
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment