Skip to content

Commit

Permalink
Merge pull request #3 from SDOS-Winter2021/feature-external-feed-dev-…
Browse files Browse the repository at this point in the history 
…anushika

Feature external feed dev anushika
  • Loading branch information
@akshyta
akshyta authored Apr 29, 2021
2 parents f6ef416 + 33d5e74 commit 8909229
Show file tree
Hide file tree
Showing 146 changed files with 2,921 additions and 2,222 deletions.
4 changes: 4 additions & 0 deletions projects/commudle-admin/src/app/app-routing.module.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,10 @@ const routes: Routes = [
path: 'pricing',
loadChildren: () => import('./feature-modules/pricing/pricing.module').then(m => m.PricingModule)
},
{
path: 'speaker-resources',
loadChildren: () => import('./feature-modules/speaker-resources/speaker-resources.module').then(m => m.SpeakerResourcesModule)
},
{
path: 'policies',
loadChildren: () => import('./feature-modules/policies/policies.module').then(m => m.PoliciesModule)
Expand Down
165 changes: 9 additions & 156 deletions projects/commudle-admin/src/app/app.component.html
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,10 @@
<nb-layout class="home-navbar">
<nb-layout-header fixed>
<div class="d-flex align-items-center">
<div [routerLink]="['/']" class="home-navbar-logo d-flex align-items-center clickable">
<img alt="Commudle" src="/assets/images/commudle-logo72.png">
</div>
<div (clickOutside)="toggleSearchSuffix(false)" appClickOutside class="home-navbar-search">
<nb-form-field (click)="toggleSearchSuffix(true)" class="home-navbar-search-form">
<nb-icon icon="search" nbPrefix></nb-icon>
<input (ngModelChange)="searchQueryChanged.next($event)" [ngModel]="searchQuery" nbInput
placeholder="Search events, labs, communities, people" type="text">
</nb-form-field>

<div class="home-navbar-search-suffix">
<div [ngClass]="{'active': showSearchResults}" class="home-navbar-search-results d-flex flex-column">
<div *ngFor="let result of searchResults | keyvalue">
<div *ngIf="result.value.length !== 0" class="home-navbar-search-result">
<div class="search-result-heading">{{result.key}}</div>
<div *ngFor="let value of result.value"
[routerLink]="result.key === 'events' ? ['communities', value['kommunity_slug'], 'events', value['slug']] : [result.key, value['slug'] || value['username']]"
class="search-result-name clickable">
{{value.name}}
</div>
</div>
</div>
<div *ngIf="showPlaceholder" class="placeholder-text d-flex justify-content-center align-items-center">
Quickly search your favorite topics, labs by industry experts or find an event you missed
</div>
</div>
</div>
</div>
<div [routerLink]="['/']" class="home-navbar-logo d-flex align-items-center clickable">
<img alt="Commudle" src="/assets/images/commudle-logo72.png">
</div>
<div class="d-flex align-items-center">
<div class="home-navbar-container d-flex align-items-center">
<app-search-bar></app-search-bar>
<div class="home-navbar-menu d-flex">
<app-navbar-menu [currentUser]="currentUser"></app-navbar-menu>

Expand All @@ -44,11 +18,11 @@
</div>
</div>
</div>
<div (click)="toggleSidebar()" class="home-sidebar clickable">
<fa-icon [icon]="faBars"></fa-icon>
<nb-badge *ngIf="sideBarState == 'collapsed' && sideBarNotifications == true" [position]="'top end'"
status="danger"></nb-badge>
</div>
</div>
<div (click)="toggleSidebar()" class="home-sidebar text-right clickable">
<fa-icon [icon]="faBars"></fa-icon>
<nb-badge *ngIf="sideBarState == 'collapsed' && sideBarNotifications == true" [position]="'top end'"
status="danger"></nb-badge>
</div>
</nb-layout-header>

Expand Down Expand Up @@ -124,124 +98,3 @@
<app-chats-container *ngIf="currentUser && cookieAccepted"></app-chats-container>
<app-user-visit-tracker></app-user-visit-tracker>
<app-sw-update></app-sw-update>


<!--<nb-layout>-->

<!-- <nb-layout-header fixed>-->
<!-- <div class="container">-->
<!-- <div class="menu-left-container">-->
<!-- <div (click)="toggleSidebar()" class="sidebar-toggle">-->
<!-- <fa-icon [icon]="faBars" size="1x"></fa-icon>-->
<!-- <nb-badge *ngIf="sideBarState == 'collapsed' && sideBarNotifications == true" [position]="'top end'"-->
<!-- status="danger"></nb-badge>-->
<!-- </div>-->
<!-- <div [routerLink]="['/']" class="main-logo clickable">-->
<!-- <img alt="logo" src="/assets/images/commudle-logo72.png">-->
<!-- <p>-->
<!-- Commudle-->
<!-- </p>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="menu-right-container">-->
<!-- <a [routerLink]="['/']" class="hide-mobile" ghost nbButton>Home</a>-->
<!-- <a [routerLink]="['/about']" class="hide-mobile" ghost nbButton>About</a>-->
<!-- <a [routerLink]="['/communities']" class="hide-mobile" ghost nbButton>Communities</a>-->
<!-- <a [routerLink]="['/labs']" class="hide-mobile" ghost nbButton>Labs</a>-->
<!-- <a [routerLink]="['/builds']" class="hide-mobile" ghost nbButton>Builds</a>-->
<!-- <nb-user-->
<!-- *ngIf="currentUser"-->
<!-- [nbContextMenu]="userContextMenu"-->
<!-- name=""-->
<!-- picture="{{ currentUser.avatar }}"-->
<!-- size="medium"-->
<!-- >-->
<!-- </nb-user>-->
<!-- <button (click)="login()"-->
<!-- *ngIf="!currentUser" ghost nbButton status="info">-->
<!-- <nb-icon icon="log-in-outline"></nb-icon>-->
<!-- Log in / Sign Up-->
<!-- </button>-->

<!-- </div>-->
<!-- </div>-->

<!-- </nb-layout-header>-->

<!-- <nb-sidebar [tag]="'mainMenu'" id="commudleSidebar" responsive="true" state="collapsed">-->
<!-- <app-sidebar-menu></app-sidebar-menu>-->
<!-- </nb-sidebar>-->

<!-- <nb-layout-column (click)="closeSidebarMobile()">-->
<!-- <router-outlet></router-outlet>-->
<!-- </nb-layout-column>-->


<!-- <nb-layout-footer *ngIf="footerStatus">-->

<!-- <div class="footer">-->
<!-- <div class="page-links">-->
<!-- <div [routerLink]="['/']" class="logo">-->
<!-- <img alt="Logo" class="clickable" src="/assets/images/commudle-logo128.png">-->
<!-- </div>-->

<!-- <div class="links">-->
<!-- <div class="one">-->
<!-- <a [routerLink]="['/']">HOME</a>-->
<!-- <a [routerLink]="['/about']">ABOUT</a>-->
<!-- <a [routerLink]="['/features']">FEATURES</a>-->
<!-- </div>-->

<!-- <div class="two">-->
<!-- <a [routerLink]="['/communities']">ALL COMMUNITIES</a>-->
<!-- <a [routerLink]="['/labs']">LABS</a>-->
<!-- <a [routerLink]="['/builds']">COMMUNITY BUILDS</a>-->
<!-- </div>-->

<!-- <div class="three">-->
<!-- <a [routerLink]="['/policies/privacy-policy']">PRIVACY POLICY</a>-->
<!-- <a [routerLink]="['/policies/terms-and-conditions']">TERMS & CONDITIONS</a>-->
<!-- </div>-->

<!-- <div class="four">-->
<!-- <a [routerLink]="['/about']">FAQ</a>-->
<!-- </div>-->
<!-- </div>-->

<!-- </div>-->


<!-- <div class="social-links">-->
<!-- <hr/>-->

<!-- <div class="links">-->
<!-- <a href="https://twitter.com/commudle" target="_blank">-->
<!-- <nb-icon icon="twitter"></nb-icon>-->
<!-- </a>-->
<!-- <a href="https://linkedin.com/company/commudle" target="_blank">-->
<!-- <nb-icon icon="linkedin"></nb-icon>-->
<!-- </a>-->
<!-- <a href="https://facebook.com/commudle" target="_blank">-->
<!-- <nb-icon icon="facebook"></nb-icon>-->
<!-- </a>-->
<!-- <a href="https://github.com/commudle/commudle-ng" target="_blank">-->
<!-- <nb-icon icon="github"></nb-icon>-->
<!-- </a>-->
<!-- </div>-->

<!-- <div class="tech-stack">-->
<!-- <p>Made with Angular, Ruby on Rails, Postgres, Redis and Love</p>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="ellipse-large"></div>-->
<!-- <div class="ellipse-small"></div>-->
<!-- </div>-->

<!-- </nb-layout-footer>-->

<!--</nb-layout>-->

<!--<app-chats-container *ngIf="currentUser && cookieAccepted"></app-chats-container>-->

<!--<app-user-visit-tracker></app-user-visit-tracker>-->
<!--<app-sw-update></app-sw-update>-->
Loading

0 comments on commit 8909229

Please sign in to comment.