Skip to content

Commit 672fb23

Browse files
akshytaakshyta
authored
Merge pull request commudle#3 from SDOS-Winter2021/feature-external-feed-dev-anushika
Feature external feed dev anushika
2 parents 22695e2 + 09a6d33 commit 672fb23

File tree

146 files changed

+2921
-2222
lines changed

Some content is hidden

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

146 files changed

+2921
-2222
lines changed

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

+4
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,10 @@ const routes: Routes = [
8484
path: 'pricing',
8585
loadChildren: () => import('./feature-modules/pricing/pricing.module').then(m => m.PricingModule)
8686
},
87+
{
88+
path: 'speaker-resources',
89+
loadChildren: () => import('./feature-modules/speaker-resources/speaker-resources.module').then(m => m.SpeakerResourcesModule)
90+
},
8791
{
8892
path: 'policies',
8993
loadChildren: () => import('./feature-modules/policies/policies.module').then(m => m.PoliciesModule)

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

+9-156
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,10 @@
11
<nb-layout class="home-navbar">
22
<nb-layout-header fixed>
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>
30-
</div>
31-
</div>
3+
<div [routerLink]="['/']" class="home-navbar-logo d-flex align-items-center clickable">
4+
<img alt="Commudle" src="/assets/images/commudle-logo72.png">
325
</div>
33-
<div class="d-flex align-items-center">
6+
<div class="home-navbar-container d-flex align-items-center">
7+
<app-search-bar></app-search-bar>
348
<div class="home-navbar-menu d-flex">
359
<app-navbar-menu [currentUser]="currentUser"></app-navbar-menu>
3610

@@ -44,11 +18,11 @@
4418
</div>
4519
</div>
4620
</div>
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>
51-
</div>
21+
</div>
22+
<div (click)="toggleSidebar()" class="home-sidebar text-right clickable">
23+
<fa-icon [icon]="faBars"></fa-icon>
24+
<nb-badge *ngIf="sideBarState == 'collapsed' && sideBarNotifications == true" [position]="'top end'"
25+
status="danger"></nb-badge>
5226
</div>
5327
</nb-layout-header>
5428

@@ -124,124 +98,3 @@
12498
<app-chats-container *ngIf="currentUser && cookieAccepted"></app-chats-container>
12599
<app-user-visit-tracker></app-user-visit-tracker>
126100
<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)