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

Develop #1

Open
wants to merge 64 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
28fe972
update homepage
piouson Jul 18, 2020
ede3e1c
Merge pull request #3 from microapidev/update-homepage
piouson Jul 18, 2020
e9de0d3
Merge pull request #4 from microapidev/develop
piouson Jul 18, 2020
53bd261
feat: fix CRUD operations and refactor code
piouson Jul 19, 2020
1e29c5d
Refactor and setup linting
piouson Jul 19, 2020
3090fc7
Merge pull request #7 from piouson/crud-operations
piouson Jul 19, 2020
f60b0b2
Merge pull request #8 from microapidev/master
piouson Jul 19, 2020
f2a0180
Update README.md
piouson Jul 21, 2020
6bb6ff8
Add for draft PR
piouson Jul 21, 2020
08468fe
chore: install cypress
simply-alliv Jul 21, 2020
1314dce
feat: add settings page - view only
piouson Jul 21, 2020
3c3bb4b
feat: drop settings edit page due to error
piouson Jul 22, 2020
f4ee651
Merge pull request #10 from piouson/crud-operations
simply-alliv Jul 22, 2020
be178e8
feat: fix admin list view responsiveness
piouson Jul 22, 2020
1374124
Merge pull request #13 from piouson/fix-admin-view
simply-alliv Jul 22, 2020
dce2b70
feat: add initial setup for e2e tests
simply-alliv Jul 22, 2020
0886d7e
Merge branch 'develop' of https://github.com/microapidev/comment-micr…
simply-alliv Jul 22, 2020
e73a774
Merge pull request #14 from simply-alliv/end-to-end-testing
piouson Jul 22, 2020
7200c22
Create node.js.yml
piouson Jul 22, 2020
6b29fb0
test: add enzyme and snapshot test
piouson Jul 22, 2020
f910317
test: add snapshot test
piouson Jul 22, 2020
dcdb311
test: drop npm build in ci workflow
piouson Jul 22, 2020
77d5e7d
Merge pull request #15 from microapidev/github-actions-1
simply-alliv Jul 22, 2020
cda519f
Update litmus tests and snapshot (#17)
piouson Jul 23, 2020
faf7974
chore: add gitpod for continuous development (#19)
piouson Jul 23, 2020
c2de9cb
Update gitpod config file (#21)
piouson Jul 23, 2020
054e281
Update data provider to match new response (#22)
piouson Jul 24, 2020
03c5e5d
feat: add applications page
piouson Jul 24, 2020
c637cf0
feat: add get many and pagination
piouson Jul 24, 2020
8eced60
feat: add delete many feature
piouson Jul 24, 2020
9435137
feat: add show page for single application
piouson Jul 24, 2020
0ffe240
feat: fix data provider array checks
piouson Jul 24, 2020
2b4bc41
Merge pull request #24 from piouson/add-applications-page
simply-alliv Jul 24, 2020
8b9b7ef
Merge develop branch into master branch (#25)
piouson Jul 24, 2020
de300fb
chore: add travis ci (#26)
piouson Jul 24, 2020
f3d1223
[FEATURE] Add Organizations Page (#9)
simply-alliv Jul 25, 2020
6d2c4b5
Merge develop branch into master branch (#28)
piouson Jul 25, 2020
9e5a735
feat: add dashboard cards for stats
piouson Jul 25, 2020
d18fb4e
Merge pull request #30 from piouson/add-dashboard-items
simply-alliv Jul 25, 2020
018c3f9
Merge develop branch into master branch (#31)
piouson Jul 25, 2020
b0d81aa
Update dashboard styling (#32)
simply-alliv Jul 25, 2020
03ae4e9
Implement plans page (#33)
simply-alliv Jul 25, 2020
94f2d48
fix: eslint peer dependencies
simply-alliv Jul 25, 2020
3c638a5
chore: add missing dependencies
simply-alliv Jul 25, 2020
2a25a35
Merge pull request #36 from simply-alliv/fix-eslint-peer-dependencies
simply-alliv Jul 25, 2020
eb1f582
chore: rename github_token to token
simply-alliv Jul 25, 2020
b613b0f
chore: rename token to github_token
simply-alliv Jul 25, 2020
8696b60
Create github-pages.yml
simply-alliv Jul 25, 2020
da45920
Create ci.yml
simply-alliv Jul 25, 2020
4151699
chore: delete other CI/CD yml files
simply-alliv Jul 25, 2020
c99d99d
Merge pull request #38 from simply-alliv/gh-actions-v1
simply-alliv Jul 25, 2020
fb638ae
Merge branch 'master' of https://github.com/microapidev/comment-micro…
simply-alliv Jul 25, 2020
eb3b8a5
chore: fix peer dependencies
simply-alliv Jul 25, 2020
e4dbbcc
Merge pull request #40 from simply-alliv/develop
simply-alliv Jul 25, 2020
8f971f8
Merge pull request #41 from microapidev/develop
simply-alliv Jul 25, 2020
bfe9e8c
Update github-pages.yml
simply-alliv Jul 25, 2020
c5d53fd
Update github-pages.yml
simply-alliv Jul 25, 2020
8ff4d78
Update github-pages.yml
simply-alliv Jul 25, 2020
203d3a6
Update ci.yml
simply-alliv Jul 25, 2020
dab27dc
Merge pull request #42 from microapidev/master
simply-alliv Jul 25, 2020
2d906ea
Update README.md
simply-alliv Jul 25, 2020
0741d83
Update README.md
simply-alliv Jul 25, 2020
42653de
[TEST] Login Page E2E tests (#44)
simply-alliv Jul 26, 2020
aa36bdb
[CHORE] Add templates (#45)
simply-alliv Jul 26, 2020
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
38 changes: 38 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
name: Bug report 🐞
about: Create a report to help us improve
title: "[BUG]"
labels: bug
assignees: ''

---

### Describe the bug
A clear and concise description of what the bug is.

### To Reproduce
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

### Expected behavior
A clear and concise description of what you expected to happen.

### Screenshots
If applicable, add screenshots to help explain your problem.

### Desktop (please complete the following information):
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

### Smartphone (please complete the following information):
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

### Additional context
Add any other context about the problem here.
19 changes: 19 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
name: Feature request 💡
about: Suggest an idea for this project
title: "[FEATURE REQUEST]"
labels: enhancement
assignees: ''

---
### Is your feature request related to a problem? Please describe.
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

### Describe the solution you'd like
A clear and concise description of what you want to happen.

### Describe alternatives you've considered
A clear and concise description of any alternative solutions or features you've considered.

### Additional context
Add any other context or screenshots about the feature request here.
21 changes: 21 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
**What does this PR do?**

Fixes #issue_number (replace issue_number with the issue number this PR solves)

Summarise the main tasks handled in the pull request

**description of Task to be completed?**

Describe (in detail) what the task completed in the pull request does as per the relevant task

**How should this be manually tested?**

Give bullet point instructions on how to setup the code and test it manually (Assume no prior experience on JS or code)

**Any background context you want to provide?**

Any pertinent information that should be considered

**Questions:**

If something is unclear or you want some questions to be addressed by your peers, mention them here
32 changes: 32 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions

name: Node.js CI

on:
push:
branches:
- develop
pull_request:
branches:
- develop
- master

jobs:
build:

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [10.x, 12.x, 14.x]

steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: npm ci
- run: npm test
- run: npm run test:e2e
24 changes: 24 additions & 0 deletions .github/workflows/github-pages.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: GitHub Pages

on:
push:
branches:
- master

jobs:
deploy:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2

- name: Install and Build 🔧
run: |
npm install
npm run build

- name: Deploy 🚀
uses: JamesIves/[email protected]
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BRANCH: gh-pages # The branch the action should deploy to.
FOLDER: build # The folder the action should deploy.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
# Comments Microservice Dashboard

![GitHub Pages](https://github.com/microapidev/comment-microapi-admin-dashboard/workflows/GitHub%20Pages/badge.svg?branch=master) ![Node.js CI](https://github.com/microapidev/comment-microapi-admin-dashboard/workflows/Node.js%20CI/badge.svg?branch=master) ![license: MIT](https://img.shields.io/github/license/microapidev/comment-microapi-admin-dashboard)

> [Live Page](https://microapidev.github.io/comment-microapi-admin-dashboard)
8 changes: 8 additions & 0 deletions cypress.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"baseUrl": "http://localhost:3000",
"integrationFolder": "cypress/integration",
"screenshotsFolder": "cypress/screenshots",
"supportFile": false,
"pluginsFile": false,
"video": false
}
5 changes: 5 additions & 0 deletions cypress/fixtures/example.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"name": "Using fixtures to represent data",
"email": "[email protected]",
"body": "Fixtures are a great way to mock data for responses to routes"
}
40 changes: 40 additions & 0 deletions cypress/integration/login/login.e2e.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/// <reference types="cypress" />

describe("Login Page", () => {
beforeEach(() => {
cy.visit("/");
});

describe("Queries", () => {
it("should redirect to the login page", () => {
cy.url().should("include", "#/login");
});

it("should focus on username input", () => {
cy.get("#username").should("be.focused");
});

it("should require username and password", () => {
cy.get("#username-helper-text").should("not.exist");
cy.get("#password-helper-text").should("not.exist");
cy.get("#username").blur();
cy.get("button[type=submit]").click();
cy.get("#username-helper-text").should("contain.text", "Required");
cy.get("#password-helper-text").should("contain.text", "Required");
});
});

describe("Actions", () => {
it("should have the inputted username value", () => {
cy.get("#username")
.type("[email protected]")
.should("have.value", "[email protected]");
});

it("should have the inputted password value", () => {
cy.get("#password")
.type("fakepassword")
.should("have.value", "fakepassword");
});
});
});
19 changes: 19 additions & 0 deletions cypress/plugins/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
/// <reference types="cypress" />

// This function is called when a project is opened or re-opened (e.g. due to
// the project's config changing)

/**
* @type {Cypress.PluginConfig}
*/
module.exports = (on, config) => {
// `on` is used to hook into various events Cypress emits
// `config` is the resolved Cypress config

// custom tasks for sending and reporting code coverage
require("@cypress/code-coverage/task")(on, config);

// It's IMPORTANT to return the config object
// with any changed environment variables
return config;
};
25 changes: 25 additions & 0 deletions cypress/support/commands.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// ***********************************************
// This example commands.js shows you how to
// create various custom commands and overwrite
// existing commands.
//
// For more comprehensive examples of custom
// commands please read more here:
// https://on.cypress.io/custom-commands
// ***********************************************
//
//
// -- This is a parent command --
// Cypress.Commands.add("login", (email, password) => { ... })
//
//
// -- This is a child command --
// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
//
//
// -- This is a dual command --
// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
//
//
// -- This will overwrite an existing command --
// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
22 changes: 22 additions & 0 deletions cypress/support/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// ***********************************************************
// This example support/index.js is processed and
// loaded automatically before your test files.
//
// This is a great place to put global configuration and
// behavior that modifies Cypress.
//
// You can change the location of this file or turn off
// automatically serving support files with the
// 'supportFile' configuration option.
//
// You can read more here:
// https://on.cypress.io/configuration
// ***********************************************************

import "@cypress/code-coverage/support";

// Import commands.js using ES2015 syntax:
import "./commands";

// Alternatively you can use CommonJS syntax:
// require('./commands')
Loading