Skip to content

Commit

Permalink
merge conflict resolved
Browse files Browse the repository at this point in the history
  • Loading branch information
Pratiyushkumar committed Oct 27, 2023
2 parents 9bf06aa + 55dfac0 commit b779742
Show file tree
Hide file tree
Showing 44 changed files with 1,431 additions and 209 deletions.
24 changes: 24 additions & 0 deletions app/components/events.hbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<section data-test-events-section class='events-section'>
<h2 data-test-events-section-header class='events-section__heading'>You can
check out all our events below!!</h2>
{{#each-in this.EVENTS_CATEGORIES as |category events|}}
<div class='events-section__category'>
<h3
data-test-events-category={{category}}
class='events-section__category-heading'
>{{category}}:</h3>
<div class='events-section__links-container'>
{{#each events as |event index|}}
{{#if (not-eq index 0)}}
<span>|</span>
{{/if}}
<a
data-test-events-link={{event.name}}
href={{event.link}}
class='events-section__link'
>{{event.name}}</a>
{{/each}}
</div>
</div>
{{/each-in}}
</section>
6 changes: 6 additions & 0 deletions app/components/events.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import Component from '@glimmer/component';
import { EVENTS_CATEGORIES } from '../constants/events-data';

export default class EventsComponent extends Component {
EVENTS_CATEGORIES = EVENTS_CATEGORIES;
}
26 changes: 26 additions & 0 deletions app/components/events/logs-page.hbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<div class='logs' data-test-logs-page-container>
<h2 class='logs__heading' data-test-logs-heading>
Event logs
</h2>
<div class='logs__main' data-test-logs-main>
{{!TODO added dummy cards as of now, will integrate api for data }}
{{#each this.EVENT_LOGS_DATA as |data|}}
<div class='log-card' data-test-log-card>
<span
class='log-card__time log-card__text'
data-test-log-card-time='{{data.id}}'
>{{data.time}}</span>
<span
class='log-card__removed-peer log-card__text'
data-test-log-card-removed-peer='{{data.id}}'
>{{data.removedPeer}}</span>
<span class='log-card__text' data-test-log-card='{{data.id}}'>was
removed by</span>
<span
class='log-card__removed-by log-card__text'
data-test-log-removed-by='{{data.id}}'
>{{data.removedBy}}</span>
</div>
{{/each}}
</div>
</div>
85 changes: 85 additions & 0 deletions app/components/events/logs-page.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
import Component from '@glimmer/component';

export default class LogsPageComponent extends Component {
// TODO added dummy data as of now, will integrate api for data
EVENT_LOGS_DATA = [
{
id: 1,
time: '[9:00PM]',
removedPeer: 'xyz',
removedBy: 'Satyam Bajpai',
},
{
id: 2,
time: '[9:00PM]',
removedPeer: 'xyz',
removedBy: 'Satyam Bajpai',
},
{
id: 3,
time: '[9:00PM]',
removedPeer: 'xyz',
removedBy: 'Satyam Bajpai',
},
{
id: 4,
time: '[9:00PM]',
removedPeer: 'xyz',
removedBy: 'Satyam Bajpai',
},
{
id: 5,
time: '[9:00PM]',
removedPeer: 'xyz',
removedBy: 'Satyam Bajpai',
},
{
id: 6,
time: '[9:00PM]',
removedPeer: 'xyz',
removedBy: 'Satyam Bajpai',
},
{
id: 7,
time: '[9:00PM]',
removedPeer: 'xyz',
removedBy: 'Satyam Bajpai',
},
{
id: 8,
time: '[9:00PM]',
removedPeer: 'xyz',
removedBy: 'Satyam Bajpai',
},
{
id: 9,
time: '[9:00PM]',
removedPeer: 'xyz',
removedBy: 'Satyam Bajpai',
},
{
id: 10,
time: '[9:00PM]',
removedPeer: 'xyz',
removedBy: 'Satyam Bajpai',
},
{
id: 11,
time: '[9:00PM]',
removedPeer: 'xyz',
removedBy: 'Satyam Bajpai',
},
{
id: 12,
time: '[9:00PM]',
removedPeer: 'xyz',
removedBy: 'Satyam Bajpai',
},
{
id: 13,
time: '[9:00PM]',
removedPeer: 'xyz',
removedBy: 'Satyam Bajpai',
},
];
}
193 changes: 121 additions & 72 deletions app/components/footer.hbs
Original file line number Diff line number Diff line change
@@ -1,81 +1,130 @@
<footer class='footer'>
<div class='footer__container'>
<div class='footer__sites-about'>
<div class='col'>
<h3 data-test-sites-title class='col__title'>Sites</h3>
<span data-test-underline class='col__underline'></span>
{{#if this.isDevMode}}
<footer aria-label='footer under dev feature flag' class='footer--dev'>
<Events />
<h3 data-test-footer-info class='footer__info'>
To know how this page is developed, join our Discord channel by contacting
one of
<a
data-test-footer-info-members-link
href={{this.MEMBERS_URL}}
class='footer__info__link'
>our existing members</a>
or our
<a
data-test-footer-info-faq-link
href={{this.FAQ_URL}}
class='footer__info__link'
> FAQ section</a>.
</h3>
<p data-test-footer-repo-text-dev class='footer__repo--dev'>The contents of
the website are deployed from this
<a
data-test-footer-repo-link-dev
href={{this.REPOSITORY_URL}}
class='footer__repo__link'
>open sourced repo</a>
</p>
</footer>
{{else}}
<footer class='footer'>
<div class='footer__container'>
<div class='footer__sites-about'>
<div class='col'>
<h3 data-test-sites-title class='col__title'>Sites</h3>
<span data-test-underline class='col__underline'></span>
</div>
<ul class='col__list'>
{{#each this.APPS_PROPERTIES as |app|}}
<li><a
data-test-sites-link={{app.name}}
href={{app.url}}
>{{app.name}}</a></li>
{{/each}}
</ul>
</div>
<ul class='col__list'>
{{#each this.APPS_PROPERTIES as |app|}}
<li><a data-test-sites-link={{app.name}} href={{app.url}}>{{app.name}}</a></li>
{{/each}}
</ul>
</div>
<div class='footer__sites-about'>
<div class='col'>
<h3 data-test-about-title class='col__title'>About</h3>
<span data-test-underline class='col__underline'></span>
<div class='footer__sites-about'>
<div class='col'>
<h3 data-test-about-title class='col__title'>About</h3>
<span data-test-underline class='col__underline'></span>
</div>
<ul class='col__list'>
{{#each this.ABOUT_PROPERTIES as |about|}}
<li><a
data-test-about-link={{about.name}}
href={{about.url}}
>{{about.name}}</a></li>
{{/each}}
</ul>
</div>
<ul class='col__list'>
{{#each this.ABOUT_PROPERTIES as |about|}}
<li><a data-test-about-link={{about.name}} href={{about.url}}>{{about.name}}</a></li>
{{/each}}
</ul>
</div>
<div class='footer__col'>
<div class='col left'>
<h3 data-test-social-media-title class='col__title'>Social Media</h3>
<span data-test-underline class='col__underline'></span>
<div class='footer__col'>
<div class='col left'>
<h3 data-test-social-media-title class='col__title'>Social Media</h3>
<span data-test-underline class='col__underline'></span>
</div>
<div>
{{#each this.SOCIAL_LINK_PROPERTIES as |social|}}
<a
data-test-social-link={{social.title}}
href={{social.url}}
target='_blank'
class='social__links'
rel='noopener noreferrer'
>
<img
data-test-social-icon={{social.title}}
class='social__icons'
src={{social.white_icon}}
alt={{social.alt}}
/>
</a>
{{/each}}
</div>
</div>
<div>
{{#each this.SOCIAL_LINK_PROPERTIES as |social|}}
<a
data-test-social-link={{social.title}}
href={{social.url}}
target='_blank'
class='social__links'
rel='noopener noreferrer'
<div class='footer__col'>
<div class='col'>
<h3 data-test-newsletter-title class='col__title'>Newsletter</h3>
<span data-test-underline class='col__underline'></span>
</div>
<div class='newsletter'>
<label for='email'></label>
<input
data-test-newsletter-input
id='email'
type='text'
class='newsletter__input'
placeholder='Enter your email'
/>
<button
data-test-newsletter-button
type='button'
class='newsletter__button'
>
<img
data-test-social-icon={{social.title}}
class='social__icons'
src={{social.white_icon}}
alt={{social.alt}}
data-test-newsletter-button-icon
src='assets/icons/right-arrow.png'
alt='Right Arrow'
height='20px'
width='20px'
/>
</a>
{{/each}}
</button>
</div>
</div>
</div>
<div class='footer__col'>
<div class='col'>
<h3 data-test-newsletter-title class='col__title'>Newsletter</h3>
<span data-test-underline class='col__underline'></span>
</div>
<div class='newsletter'>
<label for='email'></label>
<input
data-test-newsletter-input
id='email'
type='text'
class='newsletter__input'
placeholder='Enter your email'
/>
<button data-test-newsletter-button type='button' class='newsletter__button'>
<img
data-test-newsletter-button-icon
src='assets/icons/right-arrow.png'
alt='Right Arrow'
height='20px'
width='20px'
/>
</button>
</div>
<div class='footer__repo'>
<img
data-footer-repo-github-img
class='repo__img'
src='assets/icons/github-white.png'
alt='GitHub'
/>
<p data-footer-repo-text class='repo__text'>The contents of the website
are deployed from this
<a
data-footer-repo-link
href={{this.REPOSITORY_URL}}
class='repo__link'
>open sourced repo</a>
</p>
</div>
</div>
<div class='footer__repo'>
<img data-footer-repo-github-img class='repo__img' src='assets/icons/github-white.png' alt='GitHub' />
<p data-footer-repo-text class='repo__text'>The contents of the website are deployed from this
<a data-footer-repo-link href={{this.REPOSITORY_URL}} class='repo__link'>open sourced repo</a>
</p>
</div>
</footer>
</footer>
{{/if}}
10 changes: 9 additions & 1 deletion app/components/footer.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
import Component from '@glimmer/component';
import { ABOUT } from '../constants/urls';
import { ABOUT, APPS } from '../constants/urls';
import { APPS_PROPERTIES, ABOUT_PROPERTIES } from '../constants/footer-data';
import { SOCIAL_LINK_PROPERTIES } from '../constants/social-data';
import { inject as service } from '@ember/service';

export default class FooterComponent extends Component {
@service featureFlag;
REPOSITORY_URL = ABOUT.REPOSITORY;
APPS_PROPERTIES = APPS_PROPERTIES;
ABOUT_PROPERTIES = ABOUT_PROPERTIES;
SOCIAL_LINK_PROPERTIES = SOCIAL_LINK_PROPERTIES;
MEMBERS_URL = APPS.MEMBERS;
FAQ_URL = ABOUT.FAQ;

get isDevMode() {
return this.featureFlag.isDevMode;
}
}
Loading

0 comments on commit b779742

Please sign in to comment.