Skip to content

Design update #190

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Design update #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c648d4
New design, all in one commit for now
jancborchardt Jan 12, 2021
f23343e
Merge branch 'develop' into design-update
xMartin Jan 15, 2021
2290582
Update test snapshots
xMartin Jan 15, 2021
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
4 changes: 4 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ The app is based on [Create React App](https://github.com/facebook/create-react-

In the project directory, you can run:

### `npm install`

Set up the development mode requirements.

### `npm start`

Runs the app in the development mode.<br />
Expand Down
70 changes: 70 additions & 0 deletions public/favicon-mask.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/favicon.ico
View file
Open in desktop
Binary file not shown.
Binary file added public/grouptabs-logo-192.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/grouptabs-logo-512.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no">
<meta name="theme-color" content="#131313">
<meta name="apple-mobile-web-app-capable" content="yes">
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/grouptabs-logo-192.png" />
<link rel="mask-icon" sizes="any" href="%PUBLIC_URL%/favicon-mask.svg" color="#ff4444">
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<title>Grouptabs</title>
</head>
Expand All @@ -16,7 +17,7 @@

<div id="loader" class="loader app-loader">
<div></div>
Grouptabs
<h1 style="display:none;">Grouptabs</h1>
</div>
</body>
</html>
Binary file removed public/logo192.png
View file
Open in desktop
Binary file not shown.
Binary file removed public/logo512.png
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions public/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
"type": "image/x-icon"
},
{
"src": "logo192.png",
"src": "grouptabs-logo-192.png",
"type": "image/png",
"sizes": "192x192"
},
{
"src": "logo512.png",
"src": "grouptabs-logo-512.png",
"type": "image/png",
"sizes": "512x512"
}
Expand Down
6 changes: 4 additions & 2 deletions src/components/__snapshots__/createform.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ exports[`renders form 1`] = `
>
<input
className="full-width"
onBlur={[Function]}
onChange={[Function]}
placeholder="Tab name …"
onFocus={[Function]}
placeholder="Create new tab"
type="text"
value="Badminton"
/>
<button
className="create"
className="create-tab"
>
Create
</button>
Expand Down
1 change: 1 addition & 0 deletions src/components/__snapshots__/dateinput.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ exports[`renders prefilled input 1`] = `
</button>
<input
onChange={[Function]}
required={true}
type="date"
value="2020-03-22"
/>
Expand Down
8 changes: 4 additions & 4 deletions src/components/__snapshots__/directtransactioninput.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ exports[`renders empty 1`] = `
<option
value="NEW_PARTICIPANT"
>
New participant…
New participant …
</option>
</select>
</div>
Expand Down Expand Up @@ -68,7 +68,7 @@ exports[`renders empty 1`] = `
<option
value="NEW_PARTICIPANT"
>
New participant…
New participant …
</option>
</select>
</div>
Expand Down Expand Up @@ -100,7 +100,7 @@ exports[`renders prefilled 1`] = `
<option
value="NEW_PARTICIPANT"
>
New participant…
New participant …
</option>
</select>
</div>
Expand Down Expand Up @@ -144,7 +144,7 @@ exports[`renders prefilled 1`] = `
<option
value="NEW_PARTICIPANT"
>
New participant…
New participant …
</option>
</select>
</div>
Expand Down
22 changes: 13 additions & 9 deletions src/components/__snapshots__/editentry.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ Array [
</button>
<input
onChange={[Function]}
required={true}
type="date"
value="2020-02-20"
/>
Expand Down Expand Up @@ -140,7 +141,7 @@ Array [
<option
value="NEW_PARTICIPANT"
>
New participant…
New participant …
</option>
</select>
</div>
Expand Down Expand Up @@ -198,7 +199,7 @@ Array [
<option
value="NEW_PARTICIPANT"
>
New participant…
New participant …
</option>
</select>
</div>
Expand Down Expand Up @@ -316,10 +317,11 @@ Array [
className="form-row-input"
>
<button
className="add-participant"
onClick={[MockFunction]}
type="button"
>
+ new participant
+ Add participant
</button>
</div>
</div>
Expand Down Expand Up @@ -363,7 +365,7 @@ Array [
>
<img
alt=""
src="logo.png"
src="grouptabs-logo.svg"
/>
<h2>
Grouptabs
Expand All @@ -375,7 +377,7 @@ Array [
className="create"
onClick={[Function]}
>
OK
Refresh
</button>
</div>
</div>,
Expand Down Expand Up @@ -516,6 +518,7 @@ Array [
</button>
<input
onChange={[Function]}
required={true}
type="date"
value="2020-03-24"
/>
Expand Down Expand Up @@ -674,10 +677,11 @@ Array [
className="form-row-input"
>
<button
className="add-participant"
onClick={[MockFunction]}
type="button"
>
+ new participant
+ Add participant
</button>
</div>
</div>
Expand All @@ -686,12 +690,12 @@ Array [
<div
className="row button-row"
>
<span
className="fake-link delete"
<button
className="delete"
onClick={[Function]}
>
Delete transaction
</span>
</button>
</div>
</form>
</div>,
Expand Down
22 changes: 13 additions & 9 deletions src/components/__snapshots__/form.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ exports[`renders empty form 1`] = `
</button>
<input
onChange={[Function]}
required={true}
type="date"
value="2020-02-20"
/>
Expand Down Expand Up @@ -102,7 +103,7 @@ exports[`renders empty form 1`] = `
<option
value="NEW_PARTICIPANT"
>
New participant…
New participant …
</option>
</select>
</div>
Expand Down Expand Up @@ -160,7 +161,7 @@ exports[`renders empty form 1`] = `
<option
value="NEW_PARTICIPANT"
>
New participant…
New participant …
</option>
</select>
</div>
Expand Down Expand Up @@ -278,10 +279,11 @@ exports[`renders empty form 1`] = `
className="form-row-input"
>
<button
className="add-participant"
onClick={[MockFunction]}
type="button"
>
+ new participant
+ Add participant
</button>
</div>
</div>
Expand Down Expand Up @@ -359,6 +361,7 @@ exports[`renders prefilled form 1`] = `
</button>
<input
onChange={[Function]}
required={true}
type="date"
value="2020-03-24"
/>
Expand Down Expand Up @@ -396,7 +399,7 @@ exports[`renders prefilled form 1`] = `
<option
value="NEW_PARTICIPANT"
>
New participant…
New participant …
</option>
</select>
</div>
Expand Down Expand Up @@ -440,7 +443,7 @@ exports[`renders prefilled form 1`] = `
<option
value="NEW_PARTICIPANT"
>
New participant…
New participant …
</option>
</select>
</div>
Expand Down Expand Up @@ -532,10 +535,11 @@ exports[`renders prefilled form 1`] = `
className="form-row-input"
>
<button
className="add-participant"
onClick={[MockFunction]}
type="button"
>
+ new participant
+ Add participant
</button>
</div>
</div>
Expand All @@ -544,12 +548,12 @@ exports[`renders prefilled form 1`] = `
<div
className="row button-row"
>
<span
className="fake-link delete"
<button
className="delete"
onClick={[Function]}
>
Delete transaction
</span>
</button>
</div>
</form>
`;
12 changes: 4 additions & 8 deletions src/components/__snapshots__/importform.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,17 @@ exports[`renders form 1`] = `
className="import-form"
onSubmit={[Function]}
>
<div
className="row-label"
>
Open shared tab:
</div>
<input
autoFocus={true}
className="full-width"
onBlur={[Function]}
onChange={[Function]}
placeholder="Tab ID …"
onFocus={[Function]}
placeholder="Open shared tab"
type="text"
value="xy123hq"
/>
<button>
Open
Open shared tab
</button>
<div
className="error-message"
Expand Down
Loading