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

DBAS usable on mobile through responsive UI (Only with RIPE removals now) #22

Draft
wants to merge 36 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
9dce208
Proper default
av-alexander May 21, 2023
d5af64b
Welcome is responsive
av-alexander May 21, 2023
af5b274
Welcome screen is responsive + global vars
av-alexander May 21, 2023
9faa5da
add av logo in public place
av-martin May 21, 2023
9ebe51e
reduce compact header padding
av-martin May 21, 2023
1262f11
remove status info
av-martin May 21, 2023
a20f64e
change to column on mobile
av-martin May 21, 2023
b02f0a0
make entire section clickable
av-martin May 21, 2023
a364972
fix list
av-martin May 21, 2023
ecd691d
Nav bar responsive and proper body scaling
av-alexander May 21, 2023
375766a
Merge branch 'screen-responsiveness' of github.com:aion-dk/dbas into …
av-alexander May 21, 2023
78c2973
Verifier flow responsive + more
av-alexander May 21, 2023
481cb7a
fix logs view
av-martin May 21, 2023
390f9f6
Merge remote-tracking branch 'origin/screen-responsiveness' into scre…
av-martin May 21, 2023
ffdf5a2
fix button
av-martin May 21, 2023
54480d8
Remove help faq and contact
av-alexander May 21, 2023
c6d9a50
Lint
av-alexander May 21, 2023
1f22a58
fav logo
av-martin May 21, 2023
f0c9b15
restrict tooltip size further
av-martin May 21, 2023
1c6e9eb
Fix specs
av-alexander May 22, 2023
8f974fb
remove console.log and adjust size of button to allow cleaner centeri…
av-martin May 22, 2023
1e732e5
Hamburger as ts
av-alexander May 22, 2023
5b2f6bd
Merge branch 'screen-responsiveness' of github.com:aion-dk/dbas into …
av-alexander May 22, 2023
40f11b0
fix about view
av-martin May 22, 2023
db8df5f
add links back in
av-martin May 22, 2023
93db77d
Merge branch 'screen-responsiveness' into screen-responsiveness-us
av-martin May 22, 2023
f4b3054
return ballot status
av-martin May 22, 2023
b2401d4
fix text translation not reacting to locale switch
av-martin May 22, 2023
37df5a3
re add spec
av-martin May 22, 2023
cc52ce9
Lint it
av-alexander May 22, 2023
c15b145
prettier and hide column descriptions on mobile
av-martin May 22, 2023
bea9f46
re re remove stuff
av-martin May 22, 2023
a823822
Merge remote-tracking branch 'origin/screen-responsiveness' into scre…
av-martin May 22, 2023
3d68df9
Update trackBallot.spec.ts
av-alexander May 22, 2023
fc779d3
return of the comment
av-martin May 22, 2023
5a63a2d
Merge branch 'main' into screen-responsiveness
av-alexander May 23, 2023
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: 2 additions & 2 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"test:e2e:ci": "playwright test --output test-results/artifacts",
"build-only": "vite build",
"type-check": "vue-tsc --noEmit -p tsconfig.vitest.json --composite false",
"prettier:ci": "npx prettier -c ./",
"prettier": " npx prettier -w ./",
"prettier:ci": "npx prettier -c ./",
"prettier": "npx prettier -w ./",
"lint": "eslint ./src/**/* --fix",
"lint:ci": "eslint ./src/**/*"
},
Expand Down
Binary file added client/public/av-logo-blue.png
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 client/public/av-logo-horizontal.png
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 client/public/favicon.ico
Binary file not shown.
9 changes: 9 additions & 0 deletions client/public/favicon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 27 additions & 3 deletions client/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -148,20 +148,29 @@ const setTheme = async (conferenceClient: any) => {
</template>

<style type="text/css">
:root {
--av-padding: 2.5rem;
--av-margin-bottom: 2.5rem;
}

body {
padding: 0;
margin: 0;
}

.AVCard--default {
padding: var(--av-padding) !important;
}

.DBAS {
height: 100vh;
height: 100dvh;
display: flex;
flex-direction: column;
}

.DBAS__Content {
height: calc(100vh - 120px);
margin-top: 80px;
flex-grow: 1;
overflow-y: scroll;
}

Expand All @@ -172,7 +181,7 @@ body {
}

.popper-content-wrapper {
max-width: 400px;
max-width: calc(min(400px, 90vw));
--vue-popper-bg: #000;
--vue-popper-padding: 6px;
--vue-popper-text-color: #fff;
Expand All @@ -191,4 +200,19 @@ body {
.DBAS_SkipToContentLink:focus {
margin-top: 100px;
}

@media (max-width: 992px) {
:root {
--av-padding: 1.5rem;
--av-margin-bottom: 1.5rem;
}

.DBAS__InnerContent {
width: 90vw;
}

.AVCard {
padding: var(--av-padding) !important;
}
}
</style>
2 changes: 1 addition & 1 deletion client/src/components/CompactHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const area = computed(() =>

<style type="text/css" scoped>
.CompactHeader {
margin: 47px 0;
margin: var(--av-margin-bottom) 0;
display: flex;
align-items: center;
font-family: "Open Sans";
Expand Down
24 changes: 18 additions & 6 deletions client/src/components/ExpandableSection.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ function toggle() {

<template>
<div
@click="toggle"
class="ExpandableSection"
:class="{
ExpandableSection: true,
['ExpandableSection--expanded']: _expanded,
}"
>
Expand All @@ -36,11 +37,7 @@ function toggle() {
<slot name="expanded"></slot>
</div>

<button
class="ExpandableSection__Expander"
@click="toggle"
:aria-label="_label"
>
<button class="ExpandableSection__Expander" :aria-label="_label">
av-martin marked this conversation as resolved.
Show resolved Hide resolved
<font-awesome-icon v-if="_expanded" icon="fa-solid fa-minus" />

<font-awesome-icon v-else icon="fa-solid fa-plus" />
Expand All @@ -57,12 +54,27 @@ function toggle() {
margin-bottom: 20px;
flex-direction: column;
position: relative;
cursor: pointer;
}

.ExpandableSection:hover,
.ExpandableSection:focus-within {
background-color: rgba(0, 0, 0, 10%);
}
.ExpandableSection:focus-within {
outline: #317be7 2px solid;
}

.ExpandableSection__Line {
display: flex;
}

@media (max-width: 992px) {
.ExpandableSection__Line {
flex-direction: column;
}
}

.ExpandableSection__Expander {
background-color: #343a40;
border-radius: 100%;
Expand Down
4 changes: 2 additions & 2 deletions client/src/components/Footer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<span class="Footer__Text">Technology by</span>
<img
class="Footer__Image"
src="https://s3-alpha-sig.figma.com/img/3286/65ed/aba97ebfe8b64e1207282fe003f1931f?Expires=1679875200&Signature=Xo9hK~xacO6wIPt-nnpcywi7cskam~S-jHxkemuQRicUndLmNuUAx0ZO-afnoaLq8KOaYZMSsZ16Aoc~vYJvu6NYeB~oVogr4Vv7hqiEieEjhjxpCFm6l~QGYPveJO8zXS3VDJWw7lg0eWP4mf5Ugci8eqd646EMy~l9j-l2W4eKF414DhvxKNKlD5daqMleAs~4PZAUxJCy0~nTo0nL3b4RCFoZ6AobjiXbCNMZZtPR01fei9A~ckeb4HhrN6GN7sAZltDf71v~aeOfvCvODlMxU1t8drd75pCm0hDDt~LmDkp-CTDeE5SCDNApHS~MQd0SQFBCc6getEuwXkqUIA__&Key-Pair-Id=APKAQ4GOSFWCVNEHN3O4"
src="/av-logo-horizontal.png"
alt="Assembly Voting Logo"
/>
</a>
Expand All @@ -13,6 +13,7 @@

<style type="text/css" scoped>
.Footer {
box-sizing: border-box;
background-color: #fff;
font-family: "Open Sans";
display: flex;
Expand All @@ -22,7 +23,6 @@
padding: 10px;
font-weight: 400;
box-shadow: 0 0 15px rgba(0, 0, 0, 0.15);
position: fixed;
bottom: 0;
left: 0;
width: 100%;
Expand Down
53 changes: 53 additions & 0 deletions client/src/components/HamburgerIcon.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<template>
<svg viewBox="0,0,6,6" height="1em" :stroke="stroke" stroke-linecap="square">
<line
:x1="lines.l1x1"
:y1="lines.l1y1"
:x2="lines.l1x2"
:y2="lines.l1y2"
></line>
<line
:x1="lines.l2x1"
:y1="lines.l2y1"
:x2="lines.l2x2"
:y2="lines.l2y2"
></line>
<line
:x1="lines.l3x1"
:y1="lines.l3y1"
:x2="lines.l3x2"
:y2="lines.l3y2"
></line>
</svg>
</template>
<script>
export default {
name: "HamburgerIcon",
props: {
expanded: {
type: Boolean,
default: false,
},
stroke: {
type: String,
default: "black",
},
},
data: () => ({
lines: {
l1x1: 1,
l1y1: 1,
l1x2: 5,
l1y2: 1,
l2x1: 1,
l2y1: 3,
l2x2: 5,
l2y2: 3,
l3x1: 1,
l3y1: 5,
l3x2: 5,
l3y2: 5,
},
}),
};
</script>
Loading