From 0ab3b0360867edba319571f2c7af7587e51c7c0c Mon Sep 17 00:00:00 2001 From: Rohan Raj Gupta <78433013+rohan09-raj@users.noreply.github.com> Date: Wed, 7 Dec 2022 22:29:40 +0530 Subject: [PATCH] [Ember-Migration] Created a navbar (#325) * Created a navbar * minor refactoring and fixes * resolved over simplications and minor fixes --- app/adapters/application.js | 15 ++ app/components/navbar.hbs | 56 +++++ app/components/navbar.js | 30 +++ app/constants/urls.js | 14 ++ app/controllers/.gitkeep | 0 app/controllers/application.js | 21 ++ app/index.html | 56 ++--- app/models/.gitkeep | 0 app/models/user.js | 20 ++ app/routes/.gitkeep | 0 app/routes/application.js | 21 ++ app/serializers/application.js | 3 + app/styles/app.css | 20 ++ app/styles/navbar.module.css | 185 ++++++++++++++++ app/styles/variables.css | 16 ++ app/templates/application.hbs | 14 +- .../.gitkeep => templates/index.hbs} | 0 app/transforms/json.js | 11 + config/environment.js | 2 + jsconfig.json | 14 ++ package.json | 8 +- public/assets/icons/cross-icon.png | Bin 0 -> 7749 bytes public/assets/icons/facebook-logo.png | Bin 0 -> 438 bytes public/assets/icons/github-logo.png | Bin 0 -> 13669 bytes public/assets/icons/instagram-logo.png | Bin 0 -> 1272 bytes public/assets/icons/linkedIn-logo.png | Bin 0 -> 503 bytes public/assets/icons/twitter-logo.png | Bin 0 -> 760 bytes .../assets/images/cards/constant-coaching.png | Bin 0 -> 16135 bytes .../cards/engineering-for-evolution.png | Bin 0 -> 11046 bytes public/assets/images/cards/learning.png | Bin 0 -> 15237 bytes .../assets/images/cards/real-development.png | Bin 0 -> 16742 bytes .../images/cards/smart-squad-members.png | Bin 0 -> 25705 bytes public/assets/images/cards/soft-skills.png | Bin 0 -> 20766 bytes public/assets/images/header-rds-logo.png | Bin 0 -> 7786 bytes public/assets/images/mobile-marketing.png | Bin 0 -> 63258 bytes public/assets/images/question-mark.png | Bin 0 -> 31950 bytes public/assets/images/rds-logo-2x.png | Bin 0 -> 487724 bytes public/assets/images/rds-logo.png | Bin 0 -> 7876 bytes public/assets/images/welcome-image.png | Bin 0 -> 124499 bytes tests/integration/.gitkeep | 0 tests/integration/components/navbar-test.js | 26 +++ tests/unit/controllers/application-test.js | 12 + yarn.lock | 208 +++++++++++++++++- 43 files changed, 708 insertions(+), 44 deletions(-) create mode 100644 app/adapters/application.js create mode 100644 app/components/navbar.hbs create mode 100644 app/components/navbar.js create mode 100644 app/constants/urls.js delete mode 100644 app/controllers/.gitkeep create mode 100644 app/controllers/application.js delete mode 100644 app/models/.gitkeep create mode 100644 app/models/user.js delete mode 100644 app/routes/.gitkeep create mode 100644 app/routes/application.js create mode 100644 app/serializers/application.js create mode 100644 app/styles/navbar.module.css create mode 100644 app/styles/variables.css rename app/{components/.gitkeep => templates/index.hbs} (100%) create mode 100644 app/transforms/json.js create mode 100644 jsconfig.json create mode 100644 public/assets/icons/cross-icon.png create mode 100644 public/assets/icons/facebook-logo.png create mode 100644 public/assets/icons/github-logo.png create mode 100644 public/assets/icons/instagram-logo.png create mode 100644 public/assets/icons/linkedIn-logo.png create mode 100644 public/assets/icons/twitter-logo.png create mode 100644 public/assets/images/cards/constant-coaching.png create mode 100644 public/assets/images/cards/engineering-for-evolution.png create mode 100644 public/assets/images/cards/learning.png create mode 100644 public/assets/images/cards/real-development.png create mode 100644 public/assets/images/cards/smart-squad-members.png create mode 100644 public/assets/images/cards/soft-skills.png create mode 100644 public/assets/images/header-rds-logo.png create mode 100644 public/assets/images/mobile-marketing.png create mode 100644 public/assets/images/question-mark.png create mode 100644 public/assets/images/rds-logo-2x.png create mode 100644 public/assets/images/rds-logo.png create mode 100644 public/assets/images/welcome-image.png delete mode 100644 tests/integration/.gitkeep create mode 100644 tests/integration/components/navbar-test.js create mode 100644 tests/unit/controllers/application-test.js diff --git a/app/adapters/application.js b/app/adapters/application.js new file mode 100644 index 00000000..1b5041f5 --- /dev/null +++ b/app/adapters/application.js @@ -0,0 +1,15 @@ +import JSONAPIAdapter from '@ember-data/adapter/json-api'; +import ENV from 'website-www/config/environment'; +export default class ApplicationAdapter extends JSONAPIAdapter { + host = ENV.BASE_API_URL; + + ajaxOptions() { + const options = super.ajaxOptions(...arguments); + options.credentials = 'include'; + return options; + } + + buildURL(...args) { + return `${super.buildURL(...args)}`; + } +} diff --git a/app/components/navbar.hbs b/app/components/navbar.hbs new file mode 100644 index 00000000..345d4731 --- /dev/null +++ b/app/components/navbar.hbs @@ -0,0 +1,56 @@ + \ No newline at end of file diff --git a/app/components/navbar.js b/app/components/navbar.js new file mode 100644 index 00000000..a4f12ff1 --- /dev/null +++ b/app/components/navbar.js @@ -0,0 +1,30 @@ +import Component from '@glimmer/component'; +import { tracked } from '@glimmer/tracking'; +import { action } from '@ember/object'; +import { APPS, AUTH } from '../constants/urls'; + +export default class NavbarComponent extends Component { + @tracked isNavOpen = false; + @tracked isMenuOpen = false; + + AUTH_URL = AUTH.SIGN_IN; + HOME_URL = APPS.HOME; + WELCOME_URL = APPS.WELCOME; + EVENTS_URL = APPS.EVENTS; + MEMBERS_URL = APPS.MEMBERS; + CRYPTO_URL = APPS.CRYPTO; + STATUS_URL = APPS.STATUS; + PROFILE_URL = APPS.PROFILE; + + @action toggleNavbar() { + this.isNavOpen = !this.isNavOpen; + } + + @action toggleMenu() { + this.isMenuOpen = !this.isMenuOpen; + } + + @action outsideClickMenu() { + this.isMenuOpen = false; + } +} diff --git a/app/constants/urls.js b/app/constants/urls.js new file mode 100644 index 00000000..7721ef3a --- /dev/null +++ b/app/constants/urls.js @@ -0,0 +1,14 @@ +export const APPS = { + HOME: 'http://realdevsquad.com/', + WELCOME: 'https://welcome.realdevsquad.com/', + EVENTS: 'http://realdevsquad.com/events.html', + MEMBERS: 'https://members.realdevsquad.com/', + CRYPTO: 'https://crypto.realdevsquad.com/', + STATUS: 'https://status.realdevsquad.com/', + PROFILE: 'https://my.realdevsquad.com/', +}; + +export const AUTH = { + SIGN_IN: + 'https://github.com/login/oauth/authorize?client_id=23c78f66ab7964e5ef97', +}; diff --git a/app/controllers/.gitkeep b/app/controllers/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/app/controllers/application.js b/app/controllers/application.js new file mode 100644 index 00000000..cde856ff --- /dev/null +++ b/app/controllers/application.js @@ -0,0 +1,21 @@ +import Controller from '@ember/controller'; +import { action } from '@ember/object'; +import { tracked } from '@glimmer/tracking'; +import ENV from 'website-www/config/environment'; + +export default class ApplicationController extends Controller { + @tracked isLoggedIn = false; + + @action async signOut() { + try { + fetch(`${ENV.BASE_API_URL}/auth/signout`, { + method: 'GET', + credentials: 'include', + }).then(() => { + location.reload(); + }); + } catch (error) { + console.error(error); + } + } +} diff --git a/app/index.html b/app/index.html index bb1a2a61..849d5be8 100644 --- a/app/index.html +++ b/app/index.html @@ -2,35 +2,27 @@ -
- - - -