Skip to content

Commit

Permalink
Merge pull request #53 from webgem-xyz/v2.0---Alpha
Browse files Browse the repository at this point in the history
Added all the changes for V2.0.0

## Changes
❌ Remove button from measurement and media

✨ Edit Component
✨ EditMedia Component
✨ EditLink Component
✨ Footer Component
✨ FormItem Component
✨ DatePicker Component
✨ Map component
✨ LocationPopup component
✨ LinkRequestButton Component
✨ CreateAccount Component

✏️ Changed filter button from invisible padding to visible (For UX test to demonstrate that the height of button is not finger friendly)
✏️ Changes to styling for V2.0.0
✏️ Item now also shows date left to edit
✏️ Icon changes
✏️ Made buttons from filled background to border outline
✏️ Header now has a bottom border
✏️ Header text is now aligned to the left
✏️ Changes button styling on certain points
✏️ Changed logo to the logo in wireframes

🐛 Filter button now shows active state

## Notes
Changes still need to be added to README and CHANGELOG!
  • Loading branch information
Yannick authored Jan 21, 2018
2 parents 2c05a16 + fd4d8ec commit 6640955
Show file tree
Hide file tree
Showing 55 changed files with 1,924 additions and 282 deletions.
58 changes: 47 additions & 11 deletions firebase.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"headers": [
{
"key": "Link",
"value": "</bundle.f7598.js>; rel=preload; as=script, </style.02afd.css>; rel=preload; as=style"
"value": "</bundle.41dec.js>; rel=preload; as=script, </style.e075b.css>; rel=preload; as=style"
}
]
},
Expand All @@ -51,7 +51,25 @@
"headers": [
{
"key": "Link",
"value": "</bundle.f7598.js>; rel=preload; as=script, </style.02afd.css>; rel=preload; as=style, </route-account.chunk.f77b6.js>; rel=preload; as=script"
"value": "</bundle.41dec.js>; rel=preload; as=script, </style.e075b.css>; rel=preload; as=style, </route-account.chunk.c5840.js>; rel=preload; as=script"
}
]
},
{
"source": "/addMedia",
"headers": [
{
"key": "Link",
"value": "</bundle.41dec.js>; rel=preload; as=script, </style.e075b.css>; rel=preload; as=style, </route-addMedia.chunk.1d412.js>; rel=preload; as=script"
}
]
},
{
"source": "/add",
"headers": [
{
"key": "Link",
"value": "</bundle.41dec.js>; rel=preload; as=script, </style.e075b.css>; rel=preload; as=style, </route-add.chunk.2af82.js>; rel=preload; as=script"
}
]
},
Expand All @@ -60,16 +78,16 @@
"headers": [
{
"key": "Link",
"value": "</bundle.f7598.js>; rel=preload; as=script, </style.02afd.css>; rel=preload; as=style, </route-measurement.chunk.d31ca.js>; rel=preload; as=script"
"value": "</bundle.41dec.js>; rel=preload; as=script, </style.e075b.css>; rel=preload; as=style, </route-measurement.chunk.41dac.js>; rel=preload; as=script"
}
]
},
{
"source": "/addMedia",
"source": "/Media",
"headers": [
{
"key": "Link",
"value": "</bundle.f7598.js>; rel=preload; as=script, </style.02afd.css>; rel=preload; as=style, </route-addMedia.chunk.0993d.js>; rel=preload; as=script"
"value": "</bundle.41dec.js>; rel=preload; as=script, </style.e075b.css>; rel=preload; as=style, </route-Media.chunk.f52e3.js>; rel=preload; as=script"
}
]
},
Expand All @@ -78,16 +96,25 @@
"headers": [
{
"key": "Link",
"value": "</bundle.f7598.js>; rel=preload; as=script, </style.02afd.css>; rel=preload; as=style, </route-overview.chunk.ac036.js>; rel=preload; as=script"
"value": "</bundle.41dec.js>; rel=preload; as=script, </style.e075b.css>; rel=preload; as=style, </route-overview.chunk.42821.js>; rel=preload; as=script"
}
]
},
{
"source": "/Media",
"source": "/edit",
"headers": [
{
"key": "Link",
"value": "</bundle.41dec.js>; rel=preload; as=script, </style.e075b.css>; rel=preload; as=style, </route-edit.chunk.64519.js>; rel=preload; as=script"
}
]
},
{
"source": "/notifications",
"headers": [
{
"key": "Link",
"value": "</bundle.f7598.js>; rel=preload; as=script, </style.02afd.css>; rel=preload; as=style, </route-Media.chunk.fcf75.js>; rel=preload; as=script"
"value": "</bundle.41dec.js>; rel=preload; as=script, </style.e075b.css>; rel=preload; as=style, </route-notifications.chunk.ddcaa.js>; rel=preload; as=script"
}
]
},
Expand All @@ -96,16 +123,25 @@
"headers": [
{
"key": "Link",
"value": "</bundle.f7598.js>; rel=preload; as=script, </style.02afd.css>; rel=preload; as=style, </route-login.chunk.b8935.js>; rel=preload; as=script"
"value": "</bundle.41dec.js>; rel=preload; as=script, </style.e075b.css>; rel=preload; as=style, </route-login.chunk.cd540.js>; rel=preload; as=script"
}
]
},
{
"source": "/add",
"source": "/createAccount",
"headers": [
{
"key": "Link",
"value": "</bundle.41dec.js>; rel=preload; as=script, </style.e075b.css>; rel=preload; as=style, </route-createAccount.chunk.2172c.js>; rel=preload; as=script"
}
]
},
{
"source": "/editMedia",
"headers": [
{
"key": "Link",
"value": "</bundle.f7598.js>; rel=preload; as=script, </style.02afd.css>; rel=preload; as=style, </route-add.chunk.d9d39.js>; rel=preload; as=script"
"value": "</bundle.41dec.js>; rel=preload; as=script, </style.e075b.css>; rel=preload; as=style, </route-editMedia.chunk.a86ea.js>; rel=preload; as=script"
}
]
}
Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "uva-preact",
"version": "1.0.0",
"version": "1.0.3",
"description": "",
"main": "index.js",
"scripts": {
Expand All @@ -11,8 +11,8 @@
"dev": "preact watch"
},
"keywords": [],
"author": "",
"license": "ISC",
"author": "Yannick Frisart",
"license": "AGPL-3.0",
"eslintConfig": {
"extends": "eslint-config-synacor"
},
Expand Down Expand Up @@ -42,6 +42,7 @@
"preact-compat": "^3.17.0",
"preact-router": "^2.6.0",
"re-base": "^3.2.1",
"react-datepicker": "^1.0.4",
"react-firebase-file-uploader": "^2.4.1",
"react-gmaps": "^1.7.0",
"react-router": "^4.2.0",
Expand Down
20 changes: 11 additions & 9 deletions src/assets/black/arrow.svg
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 src/assets/black/media.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 6640955

Please sign in to comment.