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

Packages redesign #415

Merged
merged 42 commits into from
Aug 19, 2022
Merged
Show file tree
Hide file tree
Changes from 36 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
93501e8
Add "Edit" page to Repository tab (#375)
dogmar Jul 21, 2022
1747b09
Redesign packages screen (#376)
maciaszczykm Jul 22, 2022
e2acb7e
Merge remote-tracking branch 'origin/master' into packages-redesign
maciaszczykm Jul 25, 2022
7b6b076
Packages improvements (#382)
maciaszczykm Jul 25, 2022
5ab5ddb
Packages improvements (#383)
maciaszczykm Jul 25, 2022
96466b8
Grid layout (#378)
dherault Jul 26, 2022
436ee33
Add typescript linter (#384)
dherault Jul 26, 2022
a2977cd
Package improvements (#385)
maciaszczykm Jul 26, 2022
5344766
Update deps (#389)
dherault Jul 27, 2022
c50bff8
Packages improvements (#392)
maciaszczykm Jul 28, 2022
9890406
Fix markeplace layout (#388)
dherault Jul 28, 2022
a42405c
ENG-310 - Redesign cluster view (#387)
floreks Aug 1, 2022
fe7e1bd
My profile refinement (#393)
maciaszczykm Aug 2, 2022
6a29f64
Merge remote-tracking branch 'origin/master' into packages-redesign
maciaszczykm Aug 3, 2022
2763c8b
Format files
maciaszczykm Aug 3, 2022
76b516f
Design improvements (#401)
maciaszczykm Aug 3, 2022
3c58cc5
Add empty states and other design improvements (#403)
maciaszczykm Aug 7, 2022
390ce3a
ENG-311 - Repository refinement (#399)
floreks Aug 8, 2022
e7c775d
New notifications system (#396)
dherault Aug 9, 2022
bbb21e8
Setup Firebase hosting for plural
michaeljguarino Aug 9, 2022
f3a74ef
Add run and entryPoint to workflow
dherault Aug 9, 2022
d9e5fb2
Use yarn
dherault Aug 9, 2022
238bff5
Remove entrypoint
dherault Aug 9, 2022
a6d79f8
fix apiHost function for firebase
michaeljguarino Aug 9, 2022
700090a
disable service worker on previews
michaeljguarino Aug 9, 2022
e373b99
Merge branch 'add-firebase-actions' into packages-redesign
dherault Aug 9, 2022
9b1c289
Update design system and add ThemeProvider for new styled-components …
dogmar Aug 10, 2022
00f0812
Fix build issue (#414)
maciaszczykm Aug 10, 2022
0b41116
Merge branch 'master' into packages-redesign
dherault Aug 10, 2022
65593d9
Lint
dherault Aug 10, 2022
3963ea9
Merge branch 'packages-redesign' of github.com:pluralsh/plural into p…
dherault Aug 10, 2022
ae172a5
Redesign package version picker (#409)
maciaszczykm Aug 13, 2022
1fea44d
Use code and markdown components (#424)
maciaszczykm Aug 16, 2022
2b3b6e6
Login view refinement (#425)
floreks Aug 16, 2022
b47e83d
ENG-481/ENG-310 - Use new select component on clusters view (#417)
floreks Aug 16, 2022
c7a951b
Merge remote-tracking branch 'origin/master' into packages-redesign
floreks Aug 16, 2022
d85939e
Design improvements (#430)
maciaszczykm Aug 17, 2022
00fcc59
ENG-480 - Update login view and skip demo button styling (#429)
floreks Aug 18, 2022
c6b9e38
Design improvements (#433)
maciaszczykm Aug 19, 2022
56efa2e
Merge branch 'master' into packages-redesign
michaeljguarino Aug 19, 2022
6fa416c
fix yarn lock
michaeljguarino Aug 19, 2022
8917285
fix lint
michaeljguarino Aug 19, 2022
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,5 @@ yarn-error.log*

cert.pem
key.pem

.vscode
9 changes: 0 additions & 9 deletions .vscode/settings.json

This file was deleted.

8 changes: 8 additions & 0 deletions www/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
module.exports = {
extends: [
'@pluralsh/eslint-config-typescript',
],
globals: {
JSX: true,
},
}
14 changes: 0 additions & 14 deletions www/.eslintrc.yml

This file was deleted.

9 changes: 9 additions & 0 deletions www/.yarn/plugins/@yarnpkg/plugin-typescript.cjs

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion www/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
yarnPath: .yarn/releases/yarn-3.2.1.cjs
nodeLinker: node-modules

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

yarnPath: .yarn/releases/yarn-3.2.1.cjs
34 changes: 19 additions & 15 deletions www/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"dependencies": {
"@absinthe/socket": "0.2.1",
"@apollo/client": "3.6.9",
"@emotion/react": "11.9.3",
"@emotion/styled": "11.9.3",
"@emotion/react": "11.10.0",
"@emotion/styled": "11.10.0",
"@gitbeaker/browser": "35.7.0",
"@jest/types": "28.1.3",
"@nivo/core": "0.79.0",
Expand All @@ -44,19 +44,19 @@
"fuse.js": "6.6.2",
"graphql": "16.5.0",
"graphql-ws": "5.9.1",
"grommet": "2.25.0",
"grommet": "2.25.1",
"grommet-icons": "4.7.0",
"highlight.js": "11.6.0",
"honorable": "0.129.0",
"honorable": "0.135.0",
"honorable-recipe-mp": "0.3.0",
"honorable-theme-default": "0.63.0",
"honorable-theme-default": "0.65.0",
"js-yaml": "4.1.0",
"lodash": "4.17.21",
"memoize-one": "6.0.0",
"moment": "2.29.4",
"phoenix": "1.6.11",
"pluralsh-absinthe-socket-apollo-link": "0.2.0",
"pluralsh-design-system": "1.118.0",
"pluralsh-design-system": "1.155.0",
"prop-types": "15.8.1",
"query-string": "7.1.1",
"react": "18.2.0",
Expand All @@ -69,12 +69,13 @@
"react-dnd": "16.0.1",
"react-dnd-html5-backend": "16.0.1",
"react-dom": "18.2.0",
"react-file-icon": "1.1.0",
"react-file-icon": "1.2.0",
"react-file-picker": "0.0.6",
"react-highlight.js": "1.0.7",
"react-icons": "4.4.0",
"react-json-view": "1.21.3",
"react-markdown": "8.0.3",
"react-multiline-clamp": "2.0.0",
"react-portal": "4.2.2",
"react-resize-detector": "7.1.2",
"react-router-dom": "6.3.0",
Expand All @@ -83,15 +84,15 @@
"react-spinners": "0.13.3",
"react-stripe-elements": "6.1.2",
"react-sweet-progress": "1.1.2",
"react-toggle": "4.1.2",
"react-toggle": "4.1.3",
"react-transition-group": "4.4.2",
"react-use-intercom": "1.5.2",
"react-virtualized-auto-sizer": "1.0.6",
"react-window": "1.8.7",
"react-window-reversed": "1.4.1",
"rehype-raw": "6.1.1",
"slate": "0.81.1",
"slate-history": "0.66.0",
"slate": "0.81.3",
"slate-history": "0.81.3",
"slate-react": "0.81.0",
"styled-components": "5.3.5",
"uuid": "8.3.2",
Expand All @@ -100,15 +101,18 @@
"xterm-theme": "1.1.0"
},
"devDependencies": {
"@babel/core": "7.18.6",
"@babel/eslint-parser": "7.18.2",
"@babel/preset-env": "7.18.6",
"@babel/core": "7.18.10",
"@babel/eslint-parser": "7.18.9",
"@babel/preset-env": "7.18.10",
"@babel/preset-react": "7.18.6",
"@pluralsh/eslint-config-typescript": "2.3.0",
"@pluralsh/stylelint-config": "1.0.0",
"eslint": "8.19.0",
"@typescript-eslint/eslint-plugin": "5.33.1",
"@typescript-eslint/parser": "5.33.1",
"eslint": "8.22.0",
"eslint-config-pluralsh": "3.1.0",
"postcss-import": "8.2.0",
"stylelint": "14.9.1",
"stylelint": "14.10.0",
"typescript": "4.7.4"
},
"jest": {
Expand Down
Binary file added www/public/ABCMonumentGroteskMono-Heavy.woff
Binary file not shown.
Binary file added www/public/ABCMonumentGroteskMono-Medium.woff
Binary file not shown.
Binary file added www/public/ABCMonumentGroteskMono-Regular.woff
Binary file not shown.
Binary file added www/public/DINAMO EULA.pdf
Binary file not shown.
18 changes: 18 additions & 0 deletions www/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,24 @@
src: url("/ABCMonumentGroteskSemi-Mono-Heavy.woff") format("woff");
font-weight: 600;
}

@font-face {
font-family: 'Monument Mono';
src: url("/ABCMonumentGroteskMono-Regular.woff") format("woff");
font-weight: 400;
}

@font-face {
font-family: 'Monument Mono';
src: url("/ABCMonumentGroteskMono-Medium.woff") format("woff");
font-weight: 500;
}

@font-face {
font-family: 'Monument Mono';
src: url("/ABCMonumentGroteskMono-Heavy.woff") format("woff");
font-weight: 600;
}
</style>
<!-- Fix Hljs background color so it can be overriden -->
<style>
Expand Down
146 changes: 77 additions & 69 deletions www/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@ import { BrowserRouter, Route, Routes } from 'react-router-dom'
import { ApolloProvider } from '@apollo/client'
import { IntercomProvider } from 'react-use-intercom'
import { Box, Grommet } from 'grommet'
import { theme } from 'pluralsh-design-system'
import { GlobalStyle, styledTheme, theme } from 'pluralsh-design-system'
import { CssBaseline, ThemeProvider, mergeTheme } from 'honorable'
import { ThemeProvider as StyledThemeProvider } from 'styled-components'
import { mergeDeep } from '@apollo/client/utilities'

import mpRecipe from 'honorable-recipe-mp'

import { client } from './helpers/client'
Expand All @@ -29,79 +32,84 @@ const honorableTheme = mergeTheme(theme, {
})

function App() {
const mergedStyledTheme = mergeDeep(DEFAULT_THEME, styledTheme)

return (
<ApolloProvider client={client}>
<IntercomProvider appId={INTERCOM_APP_ID}>
<ThemeProvider theme={honorableTheme}>
<CssBaseline />
<Grommet
full
theme={DEFAULT_THEME}
themeMode="dark"
>
<Box
width="100vw"
height="100vh"
background="#171A21"
<StyledThemeProvider theme={mergedStyledTheme}>
<CssBaseline />
<GlobalStyle />
<Grommet
full
theme={mergedStyledTheme}
themeMode="dark"
>
<BrowserRouter>
<Routes>
<Route
path="/reset-password/:id"
element={<ResetPassword />}
/>
<Route
path="/password-reset"
element={<PasswordReset />}
/>
<Route
path="/confirm-email/:id"
element={<EmailConfirmed />}
/>
<Route
path="/invite/:inviteId"
element={<Invite />}
/>
<Route
path="/passwordless-login/:token"
element={<PasswordlessLogin />}
/>
<Route
path="/oauth/callback/github/shell"
element={<Plural />}
/>
<Route
path="/oauth/callback/gitlab/shell"
element={<Plural />}
/>
<Route
path="/oauth/callback/:service"
element={<OAuthCallback />}
/>
<Route
path="/sso/callback"
element={<SSOCallback />}
/>
<Route
path="/login"
element={<Login />}
/>
<Route
path="/signup"
element={<Signup />}
/>
<Route
path="/oauth/consent"
element={<OAuthConsent />}
/>
<Route
path="*"
element={<Plural />}
/>
</Routes>
</BrowserRouter>
</Box>
</Grommet>
<Box
width="100vw"
height="100vh"
background="#171A21"
>
<BrowserRouter>
<Routes>
<Route
path="/reset-password/:id"
element={<ResetPassword />}
/>
<Route
path="/password-reset"
element={<PasswordReset />}
/>
<Route
path="/confirm-email/:id"
element={<EmailConfirmed />}
/>
<Route
path="/invite/:inviteId"
element={<Invite />}
/>
<Route
path="/passwordless-login/:token"
element={<PasswordlessLogin />}
/>
<Route
path="/oauth/callback/github/shell"
element={<Plural />}
/>
<Route
path="/oauth/callback/gitlab/shell"
element={<Plural />}
/>
<Route
path="/oauth/callback/:service"
element={<OAuthCallback />}
/>
<Route
path="/sso/callback"
element={<SSOCallback />}
/>
<Route
path="/login"
element={<Login />}
/>
<Route
path="/signup"
element={<Signup />}
/>
<Route
path="/oauth/consent"
element={<OAuthConsent />}
/>
<Route
path="*"
element={<Plural />}
/>
</Routes>
</BrowserRouter>
</Box>
</Grommet>
</StyledThemeProvider>
</ThemeProvider>
</IntercomProvider>
</ApolloProvider>
Expand Down
1 change: 1 addition & 0 deletions www/src/App.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import App from './App'
describe('App', () => {
it('should render', () => {
const container = render(<App />)

expect(container).not.toBeNull()
})
})
9 changes: 6 additions & 3 deletions www/src/components/Breadcrumbs.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import { createContext, useContext, useMemo, useState } from 'react'
import {
createContext, useContext, useMemo, useState,
} from 'react'
import { useNavigate } from 'react-router-dom'
import { Anchor, Box, Text } from 'grommet'

Expand All @@ -11,6 +13,7 @@ export const BreadcrumbsContext = createContext({

function CrumbLink({ crumb: { url, text, disable } }) {
const navigate = useNavigate()

// TODO: new design does not cover the "disabled" state. Should it be removed?
if (disable) {
return (
Expand All @@ -35,6 +38,7 @@ function CrumbLink({ crumb: { url, text, disable } }) {

export function Breadcrumbs() {
const { breadcrumbs } = useContext(BreadcrumbsContext)

if (breadcrumbs.length === 0) return null

const children = Array.from(lookahead(breadcrumbs, (crumb, next) => {
Expand All @@ -60,8 +64,7 @@ export function Breadcrumbs() {
>{crumb.text}
</Text>
)
})
).flat()
})).flat()

return (
<Box
Expand Down
Loading