Skip to content

Commit

Permalink
Console redesign (#125)
Browse files Browse the repository at this point in the history
Co-authored-by: Sebastian Florek <[email protected]>
Co-authored-by: Chris Klink <[email protected]>
Co-authored-by: michaeljguarino <[email protected]>
  • Loading branch information
4 people authored Feb 7, 2023
1 parent f76fced commit c0c2146
Show file tree
Hide file tree
Showing 498 changed files with 31,380 additions and 40,211 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/assets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
env:
CYPRESS_EMAIL: ${{ secrets.CYPRESS_EMAIL }}
CYPRESS_PASSWORD: ${{ secrets.CYPRESS_PASSWORD }}
BASE_URL: https://console.gcp.onplural.sh/
BASE_URL: console.gcp.onplural.sh
defaults:
run:
working-directory: assets
Expand Down
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,10 @@ watchman-*.tar
/.vscode/**/*
!/.vscode/settings.json
/.idea

# misc
.DS_Store

# yalc
.yalc
yalc.lock
7 changes: 6 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,10 @@
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
},
"eslint.validate": ["javascript"]
"eslint.validate": ["javascript", "typescript"],
"eslint.workingDirectories": [
{
"mode": "auto"
}
]
}
6 changes: 0 additions & 6 deletions assets/.babelrc

This file was deleted.

2 changes: 2 additions & 0 deletions assets/.env
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
EXTEND_ESLINT=true
DISABLE_ESLINT_PLUGIN=true
SKIP_PREFLIGHT_CHECK=true
14 changes: 14 additions & 0 deletions assets/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
module.exports = {
parserOptions: {
project: './tsconfig.eslint.json',
},
extends: [
'@pluralsh/eslint-config-typescript',
],
globals: {
JSX: true,
},
rules: {
'@typescript-eslint/consistent-type-exports': 'error',
},
}
23 changes: 0 additions & 23 deletions assets/.eslintrc.yml

This file was deleted.

546 changes: 546 additions & 0 deletions assets/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions assets/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
nodeLinker: node-modules

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"

yarnPath: .yarn/releases/yarn-3.2.1.cjs
23 changes: 15 additions & 8 deletions assets/codegen.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
overwrite: true
schema: "https://console.plural.sh/gql"
generates:
src/generated/fragments.json:
src/generated/graphql.ts:
plugins:
- fragment-matcher
config:
apolloClientVersion: 2
./graphql.schema.json:
plugins:
- "introspection"

- "typescript"
- "typescript-operations"
- "typescript-react-apollo"
- add:
content: '/* eslint-disable */'
config:
scalars:
Map: Map<string, unknown>
UploadOrUrl: string
DateTime: Date
Yaml: unknown
hooks:
afterAllFileWrite:
- eslint --fix
7 changes: 0 additions & 7 deletions assets/config-overrides.js

This file was deleted.

3 changes: 1 addition & 2 deletions assets/e2e/cypress/e2e/stories/bounce.cy.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import { BuildsPage } from '@pages/builds'
import { LoginPage } from '@pages/login'
import { RootPage } from '@pages/root'

context('Bounce story', () => {
describe('bounce the first installed app', () => {
beforeEach(() => LoginPage.login())

it('should bounce the application', () => {
RootPage.visit()
BuildsPage.visit()
BuildsPage.bounce()
})
})
Expand Down
3 changes: 1 addition & 2 deletions assets/e2e/cypress/e2e/stories/deploy.cy.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
import { BuildsPage } from '@pages/builds'
import { LoginPage } from '@pages/login'
import { RootPage } from '@pages/root'

context('Deploy story', () => {
describe('deploy the first installed app', () => {
beforeEach(() => LoginPage.login())

it('should deploy the application', () => {
RootPage.visit()
BuildsPage.visit()
BuildsPage.deploy()
})
})
Expand Down
7 changes: 4 additions & 3 deletions assets/e2e/cypress/pages/builds.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { Time } from '@ctypes/time'
import { GQLInterceptor } from '@intercept/graphql'
import { CreateBuildQueryResponse } from '@intercept/query/build'
import { BasePage } from '@pages/base'
import { RootPage } from '@pages/root'

enum BuildStatus {
Running = 'Running',
Expand All @@ -14,14 +13,16 @@ enum BuildStatus {
}

export class BuildsPage extends BasePage {
private static readonly _url = '/builds'

static visit(buildID?: string): void {
if (buildID) {
cy.visit(`/build/${buildID}`)
cy.visit(`/builds/${buildID}`)

return
}

RootPage.visit()
cy.visit(this._url)
}

static deploy(): void {
Expand Down
12 changes: 7 additions & 5 deletions assets/e2e/webpack.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@ export const options = {
rules: [
{
test: /\.ts?$/,
use: [{
loader: 'ts-loader',
options: {
configFile: path.resolve(__dirname, 'tsconfig.json'),
use: [
{
loader: 'ts-loader',
options: {
configFile: path.resolve(__dirname, 'tsconfig.json'),
},
},
}],
],
exclude: /node_modules/,
},
],
Expand Down
Loading

0 comments on commit c0c2146

Please sign in to comment.