Skip to content

Commit

Permalink
Code and Package Cleanup (#305)
Browse files Browse the repository at this point in the history
* automated testing

* chrome headless

* remove test output

* fix navigation on refresh

* finish about us content

* Delete tests_output/nightwatch-html-report directory

Signed-off-by: usiiasirrush <[email protected]>

* Update docker-image.yml

Signed-off-by: usiiasirrush <[email protected]>

* use reporter

* coveratge report

* Update docker-image.yml

Signed-off-by: usiiasirrush <[email protected]>

* fix screen display issue

* Update and rename docker-image.yml to integration-testing.yml

Signed-off-by: usiiasirrush <[email protected]>

* fix builds

* Update README.md

Signed-off-by: usiiasirrush <[email protected]>

* Update README.md

Signed-off-by: usiiasirrush <[email protected]>

* add developer tools

* prune

* Create CODE_OF_CONDUCT.md

Signed-off-by: usiiasirrush <[email protected]>

* Update docker-build.yml

Signed-off-by: usiiasirrush <[email protected]>

* cleanup

* Create dependabot.yml

Signed-off-by: usiiasirrush <[email protected]>

* Update and rename GETTING-STARTED.md to GETTING_STARTED.md

Signed-off-by: usiiasirrush <[email protected]>

* Delete codeql.yml

Signed-off-by: usiiasirrush <[email protected]>

* Make Membership Zone page

* fit text in card

* Link unfinished pages to current site

* add research and format

* Center buttons on membership zone

* Accessibility enhancements and icons

* left align all cards

* Fix Floating icons on Membership Zone (#290)

* Staging (#288) (#294)

* automated testing

* chrome headless

* remove test output

* fix navigation on refresh

* finish about us content

* Delete tests_output/nightwatch-html-report directory



* Update docker-image.yml



* use reporter

* coveratge report

* Update docker-image.yml



* fix screen display issue

* Update and rename docker-image.yml to integration-testing.yml



* fix builds

* Update README.md



* Update README.md



* add developer tools

* prune

* Create CODE_OF_CONDUCT.md



* Update docker-build.yml



* cleanup

* Create dependabot.yml



* Update and rename GETTING-STARTED.md to GETTING_STARTED.md



* Delete codeql.yml



* Make Membership Zone page

* fit text in card

* Link unfinished pages to current site

* add research and format

* Center buttons on membership zone

* Accessibility enhancements and icons

* left align all cards

---------

Signed-off-by: usiiasirrush <[email protected]>

* Update staging.yml

Signed-off-by: usiiasirrush <[email protected]>

* Research Page (#299)

* Code Cleanup

* unsaved

* SEO and Accessibility (#302)

SEO meta tag and Accessibility for images by changing them to svg

* Code Cleanup

* Code Cleanup

* Package Cleanup

* Package pruning

* more package pruning

---------

Signed-off-by: usiiasirrush <[email protected]>
  • Loading branch information
UsiDiamond authored Jul 20, 2023
1 parent 3d88740 commit 7878e81
Show file tree
Hide file tree
Showing 18 changed files with 26 additions and 397 deletions.
6 changes: 0 additions & 6 deletions integration-testing/step_definitions/basic.steps.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
// Import the cucumber operators we need
const { Before, Given, Then, When } = require("@cucumber/cucumber");
const { HomePage } = require("../pages/home.po");
var chai = require("chai");
var expect = chai.expect;

var chaiAsPromised = require("chai-as-promised");
const { assert } = require("console");
chai.use(chaiAsPromised);

var expect = chai.expect;
Before(function (scenario, callback) {
Expand Down
187 changes: 1 addition & 186 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 0 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,8 @@
"@angular/platform-browser": "^16.1.4",
"@angular/platform-browser-dynamic": "^16.1.4",
"@angular/router": "^16.1.4",
"@fortawesome/angular-fontawesome": "^0.13.0",
"@fortawesome/fontawesome": "^1.1.8",
"@fortawesome/fontawesome-free-brands": "^5.0.13",
"@fortawesome/fontawesome-svg-core": "^6.4.0",
"@fortawesome/free-brands-svg-icons": "^6.4.0",
"@fortawesome/free-regular-svg-icons": "^6.4.0",
"@fortawesome/free-solid-svg-icons": "^6.4.0",
"@ng-bootstrap/ng-bootstrap": "^15.1.0",
"@popperjs/core": "^2.11.6",
"bootstrap": "^5.3.0",
"bootstrap-icons": "^1.10.5",
"express-rate-limit": "^6.7.0",
"express.js": "^1.0.0",
"jquery": "^3.7.0",
Expand All @@ -62,8 +53,6 @@
"@types/cucumber": "^6.0.1",
"@types/jasmine": "~4.0.0",
"@types/node": "^20.4.1",
"chai": "^4.3.7",
"chai-as-promised": "^7.1.1",
"chromedriver": "^114.0.2",
"cucumber": "^6.0.7",
"cucumber-html-reporter": "^7.1.1",
Expand Down
40 changes: 20 additions & 20 deletions src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
OnInit,
ViewChild,
} from '@angular/core';
import { Router } from '@angular/router';
import { DisplayContentService } from './display-content.service';

@Component({
Expand All @@ -13,10 +14,28 @@ import { DisplayContentService } from './display-content.service';
styleUrls: ['./app.component.css'],
})
export class AppComponent implements OnInit, AfterViewInit {
@ViewChild('nav') nav: ElementRef;
title = 'Neurodiversity in Business';
navActiveId = 1;
isContentShown = true;
isMenuCollapsed = window.innerWidth <= 991;
public isMobileLayout = false;

constructor(
private displayContentService: DisplayContentService,
private router: Router
) {}

ngOnInit() {
if (window.innerWidth <= 991) {
this.isMobileLayout = true;
}
window.onresize = () => {
this.isMobileLayout = window.innerWidth <= 991;
this.isMenuCollapsed = this.isMobileLayout;
};
}

ngAfterViewInit(): void {
let this$ = this;

Expand All @@ -39,21 +58,7 @@ export class AppComponent implements OnInit, AfterViewInit {
},
});
}
@ViewChild('nav') nav: ElementRef;
title = 'Neurodiversity in Business';
navActiveId = 1;
isContentShown = true;
isMenuCollapsed = window.innerWidth <= 991;
public isMobileLayout = false;
ngOnInit() {
if (window.innerWidth <= 991) {
this.isMobileLayout = true;
}
window.onresize = () => {
this.isMobileLayout = window.innerWidth <= 991;
this.isMenuCollapsed = this.isMobileLayout;
};
}

toggleContent(flag: string) {
if (flag == 'hide') {
this.isContentShown = false;
Expand All @@ -62,8 +67,3 @@ export class AppComponent implements OnInit, AfterViewInit {
}
}
}
import fontawesome from '@fortawesome/fontawesome';
import brands from '@fortawesome/fontawesome-free-brands';
import { NavigationStart, Router } from '@angular/router';

fontawesome.library.add(brands);
Loading

0 comments on commit 7878e81

Please sign in to comment.