Skip to content
This repository has been archived by the owner on Jan 2, 2024. It is now read-only.

Implement screen ui #20

Merged
merged 15 commits into from
Aug 7, 2017
Merged

Implement screen ui #20

merged 15 commits into from
Aug 7, 2017

Conversation

manolobevia
Copy link
Contributor

Use susy 2 for layout, but this will change after using CSS grid layout module

@manolobevia manolobevia self-assigned this Aug 7, 2017
Copy link
Contributor

@cappadona cappadona left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great. Will you just make the two changes to dependencies in package.json?

<li><span>{{ phoneChargers[location].iphoneAvailable}}</span> iPhone 5 &amp; up available</li>
<li><span>{{ phoneChargers[location].microUsbAvailable }}</span> Micro USB available</li>
<li><span>{{ phoneChargers[location].usbCAvailable }}</span> Micro USB-C available</li>
<li class="device-type__info">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ripe for DRYing up via loop, but we can save that for later improvement

</ul>
</section>
</div>
</template>

<script>
import _ from 'lodash'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well played 😄

<style lang="scss">

@import '~susy';
@import '~font-awesome/css/font-awesome.min.css';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Once Nuxt v1.0 is released, we should be able to switch over to the Font Awesome module

package.json Outdated
"axios": "^0.16.1",
"lodash": "^4.17.4",
"nuxt": "latest",
"nuxt-helpers": "^0.10.0"
"nuxt-helpers": "^0.10.0",
"susy": "^2.2.12",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Susy should be a devDependency

package.json Outdated
"nuxt-helpers": "^0.10.0"
"nuxt-helpers": "^0.10.0",
"susy": "^2.2.12",
"yarn": "^0.24.5"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not necessary to include Yarn as a dependency

@manolobevia
Copy link
Contributor Author

I have removed yarn as dependency, and added susy as dev dependency.

@cappadona cappadona merged commit 1a5c130 into master Aug 7, 2017
@cappadona cappadona deleted the implement-screen-ui branch August 7, 2017 18:00
cappadona added a commit that referenced this pull request Mar 20, 2018
Never used. Mistakenly introduced in ca06ecd as part of #20.
cappadona added a commit that referenced this pull request Mar 21, 2018
* Jump to node 9.8.0

Use .nvmrc to indicate desired version for now. The `engines` object is
pretty much useless to anything outside of Heroku since it doesn't
enforce a strict requirement.

Investigated using the node package [1] to install a specific version of
the node binary as a requirement, but there's controversy over bloat
factor [2, 3] and it is not yet fully compatible with yarn [4].

[1] https://www.npmjs.com/package/node
[2] https://twitter.com/housecor/status/962347301456015360
[3] https://twitter.com/maybekatz/status/958157474397171712
[4] aredridel/node-bin-gen#44

* Bump to node-sass 4.7.2

Node 9.8.0 was not happy with previous version lock (4.5.3).

* Upgrade to Nuxt 1.4.0

Previously running pre-production release.

Includes following adjustments:

* Tweak Nuxt config for eslint (passing context)

* Swap in `eslint-plugin-vue` for `eslint-plugin-html` & use it along
  with standard for base rules

* Fix alias for components to align with Nuxt 1.x [1]

* Export state as function for Vuex store, since using modules mode [2]

[1] https://nuxtjs.org/guide/directory-structure#aliases
[2] https://nuxtjs.org/guide/vuex-store#modules-mode

* Replace nuxt-helpers/axios with axios module

As indicated in initial implementation of fetching data back in 42d0f7e.

Nuxt modules have come a long way in the past year. Basically follow
the documentation [1] to swap out the helper for the module.

The module makes axios widely available across the app:

* plugins
* vuex store
* pages
* middleware
* other modules

But notice this does not include external utility files, which is a
necessity here for `utils/libcal.js`. The workaround was to pass
`this.$axios` from the store to the util as a param. Not sure this will
be the longterm solution since there are ongoing discussions in the
module repo on potential options on better sharing the configured axios
instance with external files.

[1] https://axios.nuxtjs.org

* Drop add package

Never used. Mistakenly introduced in ca06ecd as part of #20.

* Upgrade packages to latest

And satisfy unmet peer dependencies.

* Bump app version to 0.2.0
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants