Skip to content

Commit 4ffeb4d

Browse files
harshita2216harshita2216
committed
m
2 parents 278cc0a + 5c30848 commit 4ffeb4d

File tree

223 files changed

+29607
-2557
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

223 files changed

+29607
-2557
lines changed

‎google-chrome-stable_current_amd64.deb

-69.4 MB
Binary file not shown.

‎package-lock.json

+22,514-41
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎projects/commudle-admin/src/app/app-routing.module.ts

+16-22
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
1-
import { CommunityDetailsResolver } from './resolvers/community-details.resolver';
2-
import { NgModule } from '@angular/core';
3-
import { Routes, RouterModule } from '@angular/router';
4-
import { AuthGuard } from 'projects/shared-services/lib-authwatch.guard';
5-
import { LibErrorHandlerComponent } from 'projects/lib-error-handler/src/public-api';
6-
import { HomeComponent } from './components/home/home.component';
7-
import { FillDataFormComponent } from './components/fill-data-form/fill-data-form.component';
8-
import { EUserRoles } from 'projects/shared-models/enums/user_roles.enum';
9-
import { LogoutComponent } from './components/logout/logout.component';
10-
import { SpeakerResourceFormComponent } from './components/speaker-resource-form/speaker-resource-form.component';
11-
import { InitResolver } from './resolvers/init.resolver';
12-
import { EditProfileComponent } from './components/edit-profile/edit-profile.component';
13-
import { CommunitiesComponent } from './components/home/communities/communities.component';
14-
import { FeaturesComponent } from './components/home/features/features.component';
15-
import { AboutComponent } from './components/home/about/about.component';
1+
import {NgModule} from '@angular/core';
2+
import {RouterModule, Routes} from '@angular/router';
3+
import {AuthGuard} from 'projects/shared-services/lib-authwatch.guard';
4+
import {LibErrorHandlerComponent} from 'projects/lib-error-handler/src/public-api';
5+
import {HomeComponent} from './components/home/home.component';
6+
import {FillDataFormComponent} from './components/fill-data-form/fill-data-form.component';
7+
import {EUserRoles} from 'projects/shared-models/enums/user_roles.enum';
8+
import {LogoutComponent} from './components/logout/logout.component';
9+
import {SpeakerResourceFormComponent} from './components/speaker-resource-form/speaker-resource-form.component';
10+
import {InitResolver} from './resolvers/init.resolver';
11+
import {CommunitiesComponent} from './components/home/communities/communities.component';
12+
import {FeaturesComponent} from './components/home/features/features.component';
13+
import {AboutComponent} from './components/home/about/about.component';
1614

1715
const routes: Routes = [
1816
{
@@ -56,11 +54,6 @@ const routes: Routes = [
5654
component: FillDataFormComponent,
5755
canActivate: [AuthGuard]
5856
},
59-
{
60-
path: 'my-profile/edit',
61-
component: EditProfileComponent,
62-
canActivate: [AuthGuard]
63-
},
6457
{
6558
path: 'email-confirmations',
6659
loadChildren: () => import('./feature-modules/email-confirmations/email-confirmations.module').then(m => m.EmailConfirmationsModule)
@@ -134,11 +127,12 @@ const routes: Routes = [
134127
imports: [RouterModule.forRoot(routes, {
135128
initialNavigation: 'enabled',
136129
relativeLinkResolution: 'legacy'
137-
})],
130+
})],
138131
exports: [RouterModule],
139132
providers: [InitResolver]
140133
})
141-
export class AppRoutingModule { }
134+
export class AppRoutingModule {
135+
}
142136

143137

144138
// NAMED ROUTER OUTLETS

‎projects/commudle-admin/src/app/app.component.html

+174-47
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,68 @@
1-
<nb-layout>
2-
1+
<nb-layout class="home-navbar">
32
<nb-layout-header fixed>
4-
<div class="container">
5-
<div class="menu-left-container">
6-
<div (click)="toggleSidebar()" class="sidebar-toggle">
7-
<fa-icon [icon]="faBars" size="1x"></fa-icon>
8-
<nb-badge *ngIf="sideBarState == 'collapsed' && sideBarNotifications == true" [position]="'top end'"
9-
status="danger"></nb-badge>
3+
<div class="d-flex align-items-center">
4+
<div [routerLink]="['/']" class="home-navbar-logo d-flex align-items-center clickable">
5+
<img alt="Commudle" src="/assets/images/commudle-logo72.png">
6+
</div>
7+
<div (clickOutside)="toggleSearchSuffix(false)" appClickOutside class="home-navbar-search">
8+
<nb-form-field (click)="toggleSearchSuffix(true)" class="home-navbar-search-form">
9+
<nb-icon icon="search" nbPrefix></nb-icon>
10+
<input (ngModelChange)="searchQueryChanged.next($event)" [ngModel]="searchQuery" nbInput
11+
placeholder="Search events, labs, communities, people" type="text">
12+
</nb-form-field>
13+
14+
<div class="home-navbar-search-suffix">
15+
<div [ngClass]="{'active': showSearchResults}" class="home-navbar-search-results d-flex flex-column">
16+
<div *ngFor="let result of searchResults | keyvalue">
17+
<div *ngIf="result.value.length !== 0" class="home-navbar-search-result">
18+
<div class="search-result-heading">{{result.key}}</div>
19+
<div *ngFor="let value of result.value"
20+
[routerLink]="result.key === 'events' ? ['communities', value['kommunity_slug'], 'events', value['slug']] : [result.key, value['slug'] || value['username']]"
21+
class="search-result-name clickable">
22+
{{value.name}}
23+
</div>
24+
</div>
25+
</div>
26+
<div *ngIf="showPlaceholder" class="placeholder-text d-flex justify-content-center align-items-center">
27+
Quickly search your favorite topics, labs by industry experts or find an event you missed
28+
</div>
29+
</div>
1030
</div>
11-
<div [routerLink]="['/']" class="main-logo clickable">
12-
<img alt="logo" src="/assets/images/commudle-logo72.png">
13-
<p>
14-
Commudle
15-
</p>
31+
</div>
32+
</div>
33+
<div class="d-flex align-items-center">
34+
<div class="home-navbar-menu d-flex">
35+
<app-navbar-menu [currentUser]="currentUser"></app-navbar-menu>
36+
37+
<div class="home-navbar-menu-user">
38+
<nb-user *ngIf="currentUser" [nbContextMenu]="userContextMenu" class="menu-user-avatar" onlyPicture
39+
picture="{{currentUser.avatar}}"></nb-user>
40+
<div *ngIf="!currentUser" class="menu-user-options d-flex flex-row">
41+
<button (click)="login()" class="menu-login" nbButton size="small">Login</button>
42+
<button (click)="login()" class="menu-signup" nbButton size="small">Signup</button>
43+
<button (click)="login()" class="menu-login-signup" nbButton size="small">Login/Signup</button>
44+
</div>
1645
</div>
1746
</div>
18-
<div class="menu-right-container">
19-
<a [routerLink]="['/']" class="hide-mobile" ghost nbButton>Home</a>
20-
<a [routerLink]="['/about']" class="hide-mobile" ghost nbButton>About</a>
21-
<a [routerLink]="['/communities']" class="hide-mobile" ghost nbButton>Communities</a>
22-
<a [routerLink]="['/labs']" class="hide-mobile" ghost nbButton>Labs</a>
23-
<a [routerLink]="['/builds']" class="hide-mobile" ghost nbButton>Builds</a>
24-
<nb-user
25-
*ngIf="currentUser"
26-
[nbContextMenu]="userContextMenu"
27-
name=""
28-
picture="{{ currentUser.avatar }}"
29-
size="medium"
30-
>
31-
</nb-user>
32-
<button (click)="login()"
33-
*ngIf="!currentUser" ghost nbButton status="info">
34-
<nb-icon icon="log-in-outline"></nb-icon>
35-
Log in / Sign Up
36-
</button>
37-
47+
<div (click)="toggleSidebar()" class="home-sidebar clickable">
48+
<fa-icon [icon]="faBars"></fa-icon>
49+
<nb-badge *ngIf="sideBarState == 'collapsed' && sideBarNotifications == true" [position]="'top end'"
50+
status="danger"></nb-badge>
3851
</div>
3952
</div>
40-
4153
</nb-layout-header>
4254

43-
<nb-sidebar [tag]="'mainMenu'" id="commudleSidebar" responsive="true" state="collapsed">
55+
<nb-sidebar [tag]="'mainMenu'" id="commudleSidebar" responsive="true" right state="collapsed">
4456
<app-sidebar-menu></app-sidebar-menu>
4557
</nb-sidebar>
4658

47-
<nb-layout-column (click)="closeSidebarMobile()">
59+
<nb-layout-column>
4860
<router-outlet></router-outlet>
4961
</nb-layout-column>
5062

51-
5263
<nb-layout-footer *ngIf="footerStatus">
53-
5464
<div class="footer">
55-
<div class="page-links">
65+
<div class="page-links d-flex flex-column">
5666
<div [routerLink]="['/']" class="logo">
5767
<img alt="Logo" class="clickable" src="/assets/images/commudle-logo128.png">
5868
</div>
@@ -68,7 +78,7 @@
6878
<div class="two">
6979
<a [routerLink]="['/communities']">ALL COMMUNITIES</a>
7080
<a [routerLink]="['/labs']">LABS</a>
71-
<a [routerLink]="['/builds']">COMMUNITY BUILDS</a>
81+
<a [routerLink]="['/builds']">BUILDS</a>
7282
</div>
7383

7484
<div class="three">
@@ -80,11 +90,9 @@
8090
<a [routerLink]="['/about']">FAQ</a>
8191
</div>
8292
</div>
83-
8493
</div>
8594

86-
87-
<div class="social-links">
95+
<div class="social-links d-flex flex-column-reverse align-items-center">
8896
<hr/>
8997

9098
<div class="links">
@@ -102,19 +110,138 @@
102110
</a>
103111
</div>
104112

105-
<div class="tech-stack">
113+
<div class="tech-stack text-center">
106114
<p>Made with Angular, Ruby on Rails, Postgres, Redis and Love</p>
107115
</div>
108116
</div>
117+
109118
<div class="ellipse-large"></div>
110119
<div class="ellipse-small"></div>
111120
</div>
112-
113121
</nb-layout-footer>
114-
115122
</nb-layout>
116123

117124
<app-chats-container *ngIf="currentUser && cookieAccepted"></app-chats-container>
118-
119125
<app-user-visit-tracker></app-user-visit-tracker>
120126
<app-sw-update></app-sw-update>
127+
128+
129+
<!--<nb-layout>-->
130+
131+
<!-- <nb-layout-header fixed>-->
132+
<!-- <div class="container">-->
133+
<!-- <div class="menu-left-container">-->
134+
<!-- <div (click)="toggleSidebar()" class="sidebar-toggle">-->
135+
<!-- <fa-icon [icon]="faBars" size="1x"></fa-icon>-->
136+
<!-- <nb-badge *ngIf="sideBarState == 'collapsed' && sideBarNotifications == true" [position]="'top end'"-->
137+
<!-- status="danger"></nb-badge>-->
138+
<!-- </div>-->
139+
<!-- <div [routerLink]="['/']" class="main-logo clickable">-->
140+
<!-- <img alt="logo" src="/assets/images/commudle-logo72.png">-->
141+
<!-- <p>-->
142+
<!-- Commudle-->
143+
<!-- </p>-->
144+
<!-- </div>-->
145+
<!-- </div>-->
146+
<!-- <div class="menu-right-container">-->
147+
<!-- <a [routerLink]="['/']" class="hide-mobile" ghost nbButton>Home</a>-->
148+
<!-- <a [routerLink]="['/about']" class="hide-mobile" ghost nbButton>About</a>-->
149+
<!-- <a [routerLink]="['/communities']" class="hide-mobile" ghost nbButton>Communities</a>-->
150+
<!-- <a [routerLink]="['/labs']" class="hide-mobile" ghost nbButton>Labs</a>-->
151+
<!-- <a [routerLink]="['/builds']" class="hide-mobile" ghost nbButton>Builds</a>-->
152+
<!-- <nb-user-->
153+
<!-- *ngIf="currentUser"-->
154+
<!-- [nbContextMenu]="userContextMenu"-->
155+
<!-- name=""-->
156+
<!-- picture="{{ currentUser.avatar }}"-->
157+
<!-- size="medium"-->
158+
<!-- >-->
159+
<!-- </nb-user>-->
160+
<!-- <button (click)="login()"-->
161+
<!-- *ngIf="!currentUser" ghost nbButton status="info">-->
162+
<!-- <nb-icon icon="log-in-outline"></nb-icon>-->
163+
<!-- Log in / Sign Up-->
164+
<!-- </button>-->
165+
166+
<!-- </div>-->
167+
<!-- </div>-->
168+
169+
<!-- </nb-layout-header>-->
170+
171+
<!-- <nb-sidebar [tag]="'mainMenu'" id="commudleSidebar" responsive="true" state="collapsed">-->
172+
<!-- <app-sidebar-menu></app-sidebar-menu>-->
173+
<!-- </nb-sidebar>-->
174+
175+
<!-- <nb-layout-column (click)="closeSidebarMobile()">-->
176+
<!-- <router-outlet></router-outlet>-->
177+
<!-- </nb-layout-column>-->
178+
179+
180+
<!-- <nb-layout-footer *ngIf="footerStatus">-->
181+
182+
<!-- <div class="footer">-->
183+
<!-- <div class="page-links">-->
184+
<!-- <div [routerLink]="['/']" class="logo">-->
185+
<!-- <img alt="Logo" class="clickable" src="/assets/images/commudle-logo128.png">-->
186+
<!-- </div>-->
187+
188+
<!-- <div class="links">-->
189+
<!-- <div class="one">-->
190+
<!-- <a [routerLink]="['/']">HOME</a>-->
191+
<!-- <a [routerLink]="['/about']">ABOUT</a>-->
192+
<!-- <a [routerLink]="['/features']">FEATURES</a>-->
193+
<!-- </div>-->
194+
195+
<!-- <div class="two">-->
196+
<!-- <a [routerLink]="['/communities']">ALL COMMUNITIES</a>-->
197+
<!-- <a [routerLink]="['/labs']">LABS</a>-->
198+
<!-- <a [routerLink]="['/builds']">COMMUNITY BUILDS</a>-->
199+
<!-- </div>-->
200+
201+
<!-- <div class="three">-->
202+
<!-- <a [routerLink]="['/policies/privacy-policy']">PRIVACY POLICY</a>-->
203+
<!-- <a [routerLink]="['/policies/terms-and-conditions']">TERMS & CONDITIONS</a>-->
204+
<!-- </div>-->
205+
206+
<!-- <div class="four">-->
207+
<!-- <a [routerLink]="['/about']">FAQ</a>-->
208+
<!-- </div>-->
209+
<!-- </div>-->
210+
211+
<!-- </div>-->
212+
213+
214+
<!-- <div class="social-links">-->
215+
<!-- <hr/>-->
216+
217+
<!-- <div class="links">-->
218+
<!-- <a href="https://twitter.com/commudle" target="_blank">-->
219+
<!-- <nb-icon icon="twitter"></nb-icon>-->
220+
<!-- </a>-->
221+
<!-- <a href="https://linkedin.com/company/commudle" target="_blank">-->
222+
<!-- <nb-icon icon="linkedin"></nb-icon>-->
223+
<!-- </a>-->
224+
<!-- <a href="https://facebook.com/commudle" target="_blank">-->
225+
<!-- <nb-icon icon="facebook"></nb-icon>-->
226+
<!-- </a>-->
227+
<!-- <a href="https://github.com/commudle/commudle-ng" target="_blank">-->
228+
<!-- <nb-icon icon="github"></nb-icon>-->
229+
<!-- </a>-->
230+
<!-- </div>-->
231+
232+
<!-- <div class="tech-stack">-->
233+
<!-- <p>Made with Angular, Ruby on Rails, Postgres, Redis and Love</p>-->
234+
<!-- </div>-->
235+
<!-- </div>-->
236+
<!-- <div class="ellipse-large"></div>-->
237+
<!-- <div class="ellipse-small"></div>-->
238+
<!-- </div>-->
239+
240+
<!-- </nb-layout-footer>-->
241+
242+
<!--</nb-layout>-->
243+
244+
<!--<app-chats-container *ngIf="currentUser && cookieAccepted"></app-chats-container>-->
245+
246+
<!--<app-user-visit-tracker></app-user-visit-tracker>-->
247+
<!--<app-sw-update></app-sw-update>-->

0 commit comments

Comments
 (0)