Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Ember-Migration] Github Workflow and PR Template Improvements #336

Merged
merged 25 commits into from
Dec 18, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
201033f
Created a navbar
rohan09-raj Nov 29, 2022
de2342a
minor refactoring and fixes
rohan09-raj Nov 29, 2022
37ea549
Created header component
rohan09-raj Nov 30, 2022
0c91c40
created description component
rohan09-raj Nov 30, 2022
242689c
resolved over simplications and minor fixes
rohan09-raj Dec 2, 2022
5504083
created cards
rohan09-raj Dec 2, 2022
4d865ee
made cards and modals responsive
rohan09-raj Dec 3, 2022
9fadee9
minor fix
rohan09-raj Dec 3, 2022
51c8151
created more about component
rohan09-raj Dec 3, 2022
f0ea60d
created scroll to top button
rohan09-raj Dec 4, 2022
3f7e949
CI updated and made minor fixes in PR template
rohan09-raj Dec 5, 2022
6ff17f4
Created a navbar
rohan09-raj Nov 29, 2022
8feb8d8
minor refactoring and fixes
rohan09-raj Nov 29, 2022
ef8cdc8
Created a navbar
rohan09-raj Nov 29, 2022
0ed8f4e
[Ember-Migration] Created a navbar (#325)
rohan09-raj Dec 7, 2022
8052020
minor fixes
rohan09-raj Dec 7, 2022
6cf67ca
Removed repetition of code
rohan09-raj Dec 8, 2022
14574d3
[Ember-Migration] Created a navbar (#325)
rohan09-raj Dec 7, 2022
937820c
created more about component
rohan09-raj Dec 3, 2022
faca654
[Ember-Migration] Created a navbar (#325)
rohan09-raj Dec 7, 2022
ed30104
Merge branch 'develop-ember' into github/workflow
rohan09-raj Dec 8, 2022
f9f367e
Merge branch 'develop-ember' into github/workflow
rohan09-raj Dec 14, 2022
a656803
Merge branch 'develop-ember' into github/workflow
rohan09-raj Dec 15, 2022
f1f94e1
removed redundant code
rohan09-raj Dec 15, 2022
66910f4
Merge branch 'develop-ember' into github/workflow
rohan09-raj Dec 17, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
created more about component
  • Loading branch information
rohan09-raj committed Dec 3, 2022
commit 51c815176ba9d7c3e3977fc4826aa0a906492ea4
29 changes: 29 additions & 0 deletions app/components/more-about.hbs
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<section class='info-video'>
<section class='info__section'>
<span class='info__note'>
To know how this page is getting developed, join our Discord Channel.
Contact one of our existing
<a class='info__note__link' href={{this.MEMBERS_URL}}>members</a>
for the invitation link or check our
<a class='info__note__link' href={{this.FAQ_URL}}>FAQ</a>
section.
</span>
<span class='info__img'>
<img
class='info__img-market'
src='assets/images/mobile-marketing.png'
alt='infoNoteImg'
/>
</span>
</section>
<section class='video__section'>
<h1 class='video__heading'>Check out what Real Dev Squad is :</h1>
<iframe
src='https://www.youtube.com/embed/8UPjK1wLnTk?controls=0'
frameborder='0'
allow='accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture'
allowfullscreen
>
</iframe>
</section>
</section>
7 changes: 7 additions & 0 deletions app/components/more-about.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import Component from '@glimmer/component';
import { APPS } from '../constants/urls';

export default class MoreAboutComponent extends Component {
MEMBERS_URL = APPS.MEMBERS;
FAQ_URL = APPS.FAQ;
}
1 change: 1 addition & 0 deletions app/constants/urls.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export const APPS = {
CRYPTO: 'https://crypto.realdevsquad.com/',
STATUS: 'https://status.realdevsquad.com/',
PROFILE: 'https://my.realdevsquad.com/',
FAQ: 'https://welcome.realdevsquad.com/faq.html',
};

export const AUTH = {
Expand Down
1 change: 1 addition & 0 deletions app/styles/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
@import 'header.module.css';
@import 'description.module.css';
@import 'cards.module.css';
@import 'more-about.module.css';

* {
margin: 0px;
Expand Down
111 changes: 111 additions & 0 deletions app/styles/more-about.module.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
.info-video {
width: 100%;
margin: 30px 0px;
}

.info__section {
margin: 40px 0px;
display: flex;
align-items: center;
justify-content: center;
}

.info__note {
width: 40%;
font-size: 2rem;
font-weight: 700;
line-height: 3rem;
text-align: left;
color: var(--color-darkblack);
}

.info__note__link {
color: var(--color-pink);
text-decoration: none;
}

.info__img {
width: 40%;
}

.info__img-market {
width: 90%;
}

.video__section {
text-align: center;
width: 95%;
margin: auto;
}

.video__heading {
color: var(--color-darkblack);
font-weight: 700;
font-size: 2.5rem;
padding: 40px 0px;
}

iframe {
width: 700px;
height: 350px;
}

@media (max-width: 1024px) {
.info__section {
margin: 20px 0px;
display: flex;
flex-direction: column-reverse;
}

.info__note {
padding: 30px 0px;
width: 70%;
text-align: center;
}

.info__img {
width: 70%;
}

.info__img-market {
width: 100%;
}

iframe {
width: 70%;
height: 250px;
}
}

@media (max-width: 768px) {
.info__note {
font-size: 1.5rem;
line-height: 2rem;
text-align: justify;
}

.video__heading {
font-size: 2rem;
}

iframe {
width: 90%;
}
}

@media (max-width: 425px) {
.info-video {
margin: 20px 0px;
}

.info__note,
.info__img {
line-height: 2rem;
text-align: justify;
width: 90%;
}

iframe {
height: 200px;
}
}
3 changes: 2 additions & 1 deletion app/templates/index.hbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<Header />
<Description />
<Cards />
<Cards />
<MoreAbout />
26 changes: 26 additions & 0 deletions tests/integration/components/more-about-test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import { module, test } from 'qunit';
import { setupRenderingTest } from 'website-www/tests/helpers';
import { render } from '@ember/test-helpers';
import { hbs } from 'ember-cli-htmlbars';

module('Integration | Component | more-about', function (hooks) {
setupRenderingTest(hooks);

test('it renders', async function (assert) {
// Set any properties with this.set('myProperty', 'value');
// Handle any actions with this.set('myAction', function(val) { ... });

await render(hbs`<MoreAbout />`);

assert.dom(this.element).hasText('');

// Template block usage:
await render(hbs`
<MoreAbout>
template block text
</MoreAbout>
`);

assert.dom(this.element).hasText('template block text');
});
});