Skip to content

Commit

Permalink
Development (#301)
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

---------

Signed-off-by: usiiasirrush <[email protected]>
  • Loading branch information
UsiDiamond authored Jul 19, 2023
1 parent 6a56ecc commit a416fac
Show file tree
Hide file tree
Showing 14 changed files with 151 additions and 99 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ name: Integration Testing

on:
pull_request:
branches: ["staging","development","feature/*","maintenance/*","bugfix/*"]
branches:
["staging", "development", "feature/*", "maintenance/*", "bugfix/*"]

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
"webRoot": "${workspaceFolder}"
}
]
}
}
22 changes: 11 additions & 11 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "start",
"problemMatcher": [],
"group": {
"isDefault": true
}
"version": "2.0.0",
"tasks": [
{
"type": "npm",
"script": "start",
"problemMatcher": [],
"group": {
"isDefault": true
}
]
}
}
]
}
42 changes: 19 additions & 23 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,28 @@ If you see someone who is making an extra effort to ensure our community is welc

The following behaviors are expected and requested of all community members:

* Participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community.
* Exercise consideration and respect in your speech and actions.
* Attempt collaboration before conflict.
* Refrain from demeaning, discriminatory, or harassing behavior and speech.
* Be mindful of your surroundings and of your fellow participants. Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential.
* Remember that community event venues may be shared with members of the public; please be respectful to all patrons of these locations.
- Participate in an authentic and active way. In doing so, you contribute to the health and longevity of this community.
- Exercise consideration and respect in your speech and actions.
- Attempt collaboration before conflict.
- Refrain from demeaning, discriminatory, or harassing behavior and speech.
- Be mindful of your surroundings and of your fellow participants. Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential.
- Remember that community event venues may be shared with members of the public; please be respectful to all patrons of these locations.

## 4. Unacceptable Behavior

The following behaviors are considered harassment and are unacceptable within our community:

* Violence, threats of violence or violent language directed against another person.
* Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language.
* Posting or displaying sexually explicit or violent material.
* Posting or threatening to post other people's personally identifying information ("doxing").
* Personal insults, particularly those related to gender, sexual orientation, race, religion, or disability.
* Inappropriate photography or recording.
* Inappropriate physical contact. You should have someone's consent before touching them.
* Unwelcome sexual attention. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcomed sexual advances.
* Deliberate intimidation, stalking or following (online or in person).
* Advocating for, or encouraging, any of the above behavior.
* Sustained disruption of community events, including talks and presentations.
- Violence, threats of violence or violent language directed against another person.
- Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language.
- Posting or displaying sexually explicit or violent material.
- Posting or threatening to post other people's personally identifying information ("doxing").
- Personal insults, particularly those related to gender, sexual orientation, race, religion, or disability.
- Inappropriate photography or recording.
- Inappropriate physical contact. You should have someone's consent before touching them.
- Unwelcome sexual attention. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcomed sexual advances.
- Deliberate intimidation, stalking or following (online or in person).
- Advocating for, or encouraging, any of the above behavior.
- Sustained disruption of community events, including talks and presentations.

## 5. Weapons Policy

Expand All @@ -59,15 +59,11 @@ If a community member engages in unacceptable behavior, the community organizers

If you are subject to or witness unacceptable behavior, or have any other concerns, please notify a community organizer as soon as possible. https://neurodiversityinbusiness.org/contact-us/.



Additionally, community organizers are available to help community members engage with local law enforcement or to otherwise help those experiencing unacceptable behavior feel safe. In the context of in-person events, organizers will also provide escorts as desired by the person experiencing distress.

## 8. Addressing Grievances

If you feel you have been falsely or unfairly accused of violating this Code of Conduct, you should notify Neurodiversity-in-Business with a concise description of your grievance. Your grievance will be handled in accordance with our existing governing policies.


If you feel you have been falsely or unfairly accused of violating this Code of Conduct, you should notify Neurodiversity-in-Business with a concise description of your grievance. Your grievance will be handled in accordance with our existing governing policies.

## 9. Scope

Expand All @@ -81,7 +77,7 @@ https://neurodiversityinbusiness.org/contact-us/

## 11. License and attribution

The Citizen Code of Conduct is distributed by [Stumptown Syndicate](http://stumptownsyndicate.org) under a [Creative Commons Attribution-ShareAlike license](http://creativecommons.org/licenses/by-sa/3.0/).
The Citizen Code of Conduct is distributed by [Stumptown Syndicate](http://stumptownsyndicate.org) under a [Creative Commons Attribution-ShareAlike license](http://creativecommons.org/licenses/by-sa/3.0/).

Portions of text derived from the [Django Code of Conduct](https://www.djangoproject.com/conduct/) and the [Geek Feminism Anti-Harassment Policy](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy).

Expand Down
1 change: 1 addition & 0 deletions GETTING_STARTED.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Run `ng build` to build the project. The build artifacts will be stored in the `
Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).

# Running end-to-end tests

Make sure that you have build the application docker image running via

`npm run dockerBuild`
Expand Down
9 changes: 1 addition & 8 deletions src/app/about/about.component.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ h3 {
.card-title {
text-align: center;
color: aliceblue;
font-size: 26px;
font-weight: bold;
}
.card-text {
Expand All @@ -35,14 +36,6 @@ h3 {
background-color: magenta;
}

.card-title {
font-size: 26px;
}

.card-text {
text-align:left;
}

.blurbs {
justify-content: space-between;
flex-direction: column;
Expand Down
43 changes: 23 additions & 20 deletions src/app/about/about.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@ <h1 id="pageHeader">About Us</h1>
<div class="row">
<div class="col">
<h3>Employers</h3>
<p style="text-align: left">
<p style="text-align: left">
Create awareness as to the benefits and strengths of neurodiversity in
the workplace.
</p>
</div>
<div class="col">
<h3>The Neurodivergent</h3>
<p style="text-align: left">
<p style="text-align: left">
Empowerment, recognition, help and guidance to navigate a successful,
happy and independent career path.
</p>
</div>
<div class="col">
<h3>The Neurotypical</h3>
<p style="text-align: left">
<p style="text-align: left">
To have a better understanding and facilitate allyship and respect
with neurodivergent colleagues.
</p>
Expand Down Expand Up @@ -128,21 +128,20 @@ <h5 class="card-title">Celebrate</h5>
</div>
<div class="col">
<div class="card mx-auto">

<div class="card-body" style="text-align: center;">
<div class="card-body" style="text-align: center">
<svg
xmlns="http://www.w3.org/2000/svg"
width="68"
height="68"
fill="currentColor"
class="bi bi-lightbulb-fill"
viewBox="0 0 16 16"
style="color: antiquewhite"
>
<path
d="M2 6a6 6 0 1 1 10.174 4.31c-.203.196-.359.4-.453.619l-.762 1.769A.5.5 0 0 1 10.5 13h-5a.5.5 0 0 1-.46-.302l-.761-1.77a1.964 1.964 0 0 0-.453-.618A5.984 5.984 0 0 1 2 6zm3 8.5a.5.5 0 0 1 .5-.5h5a.5.5 0 0 1 0 1l-.224.447a1 1 0 0 1-.894.553H6.618a1 1 0 0 1-.894-.553L5.5 15a.5.5 0 0 1-.5-.5z"
/>
</svg>
xmlns="http://www.w3.org/2000/svg"
width="68"
height="68"
fill="currentColor"
class="bi bi-lightbulb-fill"
viewBox="0 0 16 16"
style="color: antiquewhite"
>
<path
d="M2 6a6 6 0 1 1 10.174 4.31c-.203.196-.359.4-.453.619l-.762 1.769A.5.5 0 0 1 10.5 13h-5a.5.5 0 0 1-.46-.302l-.761-1.77a1.964 1.964 0 0 0-.453-.618A5.984 5.984 0 0 1 2 6zm3 8.5a.5.5 0 0 1 .5-.5h5a.5.5 0 0 1 0 1l-.224.447a1 1 0 0 1-.894.553H6.618a1 1 0 0 1-.894-.553L5.5 15a.5.5 0 0 1-.5-.5z"
/>
</svg>
<h5 class="card-title">Empower</h5>
<p class="card-text">
Supporting neurodivergent individuals and guiding them in their
Expand Down Expand Up @@ -175,7 +174,9 @@ <h2>Why focus on Neurodiversity?</h2>
d="M3 14s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1H3Zm5-6a3 3 0 1 0 0-6 3 3 0 0 0 0 6Z"
/>
</svg>
<p style="text-align: left;">Only 16% of autistic adults are in full time paid employment</p>
<p style="text-align: left">
Only 16% of autistic adults are in full time paid employment
</p>
<p>(National Autistic Society)</p>
</div>
<div class="col" style="text-align: center">
Expand All @@ -194,7 +195,9 @@ <h2>Why focus on Neurodiversity?</h2>
d="M2 1a1 1 0 0 1 1-1h10a1 1 0 0 1 1 1v14a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1V1Zm11 0H3v14h3v-2.5a.5.5 0 0 1 .5-.5h3a.5.5 0 0 1 .5.5V15h3V1Z"
/>
</svg>
<p style="text-align: left;">Only 1 in 10 organisations are focusing on neurodiversity at work</p>
<p style="text-align: left">
Only 1 in 10 organisations are focusing on neurodiversity at work
</p>
<p>(CIPD Poll 2018)</p>
</div>
<div class="col" style="text-align: center">
Expand All @@ -211,7 +214,7 @@ <h2>Why focus on Neurodiversity?</h2>
/>
</svg>

<p style="text-align: left;">
<p style="text-align: left">
45% of people have lost or left their job because of challenges caused
by autism
</p>
Expand Down
43 changes: 43 additions & 0 deletions src/app/contact-us/contact-us.component.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
h1,
h2 {
font-family: "Montserrat", Sans-serif;
font-weight: bold;
background: #07a797;
color: white;
font-style: bold;
text-align: left;
padding: 40px;
}

h3 {
text-align: center;
}

.card-title {
text-align: center;
color: aliceblue;
font-size: 26px;
font-weight: bold;
}
.card-text {
text-align: left;
color: aliceblue;
font-weight: bold;
}

.card {
width: 18rem;
height: 18rem;
background-color: purple;
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
}

.card:hover {
background-color: magenta;
}

.blurbs {
justify-content: space-between;
flex-direction: column;
display: flex;
}
2 changes: 0 additions & 2 deletions src/app/home/home.component.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,10 @@ h2 {
padding: 40px;
}


h3 {
text-align: center;
}

.blurbs {
text-align: left;
}

43 changes: 43 additions & 0 deletions src/app/hub/hub.component.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
h1,
h2 {
font-family: "Montserrat", Sans-serif;
font-weight: bold;
background: #07a797;
color: white;
font-style: bold;
text-align: left;
padding: 40px;
}

h3 {
text-align: center;
}

.card-title {
text-align: center;
color: aliceblue;
font-size: 26px;
font-weight: bold;
}
.card-text {
text-align: left;
color: aliceblue;
font-weight: bold;
}

.card {
width: 18rem;
height: 18rem;
background-color: purple;
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
}

.card:hover {
background-color: magenta;
}

.blurbs {
justify-content: space-between;
flex-direction: column;
display: flex;
}
5 changes: 3 additions & 2 deletions src/app/member-start/member-start.component.css
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ h3 {
text-align: center;
}

.card-title,
.card-text {
font-size: 12;
text-align: left;
Expand All @@ -31,6 +30,8 @@ h3 {

.card-title {
font-size: 20px;
text-align: left;
color: aliceblue;
}

.blurbs {
Expand Down Expand Up @@ -65,7 +66,7 @@ button:hover {
display: flex;
}
.btn-holder {
justify-content:center;
justify-content: center;
display: flex;
}
.inner-text {
Expand Down
3 changes: 3 additions & 0 deletions src/app/member-start/member-start.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ <h1 id="pageHeader">Membership Zone</h1>
<div class="col buttonBlurb">
<h3>
<svg
tabindex="-1"
height="88px"
width="88px"
version="1.1"
Expand Down Expand Up @@ -60,6 +61,7 @@ <h3>
<div class="col buttonBlurb">
<h3>
<svg
tabindex="-1"
xmlns="http://www.w3.org/2000/svg"
width="88"
height="88"
Expand Down Expand Up @@ -90,6 +92,7 @@ <h3>
<div class="col buttonBlurb">
<h3>
<svg
tabindex="-1"
xmlns="http://www.w3.org/2000/svg"
width="88"
height="88"
Expand Down
Loading

0 comments on commit a416fac

Please sign in to comment.