Skip to content

Commit

Permalink
👏 Merge improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
pierrechls committed Mar 18, 2017
2 parents c068b2b + 9c8007c commit e527890
Show file tree
Hide file tree
Showing 24 changed files with 520 additions and 83 deletions.
36 changes: 30 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,26 @@
# tweetscape
<p align="center" style="text-align:center;">
<a href="https://github.com/pierrechls/tweetscape"><img src="https://img.shields.io/badge/version-1.1.0-green.svg?style=flat-square"></a>
<a href="https://img.shields.io/badge/build-passing-green.svg?style=flat-square"><img src="https://img.shields.io/badge/build-passing-green.svg?style=flat-square"></a>
<a href="http://vuejs.org/"><img src="https://img.shields.io/badge/front--end%20framework-vue.js-lightgrey.svg?style=flat-square"></a>
<a href="https://aframe.io/"><img src="https://img.shields.io/badge/vr%20framework-a--frame-lightgrey.svg?style=flat-square"></a>
<a href="http://standardjs.com/"><img src="https://img.shields.io/badge/code_style-standard-lightgrey.svg?style=flat-square"></a>
</p>

## How to use it
<h1 align="center" style="text-align:center; border: 0;">T W E E T S C A P E</h1>

<h6 align="center" style="text-align:center;">A WebVR experience displaying tweets along a 3D timeline</h6>

<p align="center" style="text-align:center;">
<img src="http://cdn.rawgit.com/pierrechls/tweetscape/master/static/preview.gif" style="width:100%;">
</p>

## 🚀 How to use it

### Clone the repo

```bash
$ git clone [email protected]:pierrechls/tweetscape.git
```

### Connect your Twitter API

Expand All @@ -21,7 +41,6 @@ $ npm install
$ npm run dev
```


### Serve the API port

```bash
Expand All @@ -42,12 +61,17 @@ $ npm run lint

### Deploy your build

Before, you have to build for production.

```bash
$ npm run deploy
```

## Prior installation
Set API production URL from the `default.json` file into `settings` folder.

## 🛠 Prior installation

You have to download [Node.js](https://nodejs.org/en/download/)


## 🎉 Credits

Project developed by [Pierre Charles](https://github.com/pierrechls/), [Jules Tantot](https://github.com/lujlujluj) and [Victor Viale](https://github.com/Koroeskohr), 3 students of [IMAC](http://www.ingenieur-imac.fr/) Engineering school.
32 changes: 32 additions & 0 deletions client/assets/icons/cardboard.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 41 additions & 0 deletions client/assets/icons/move-mouse.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions client/assets/icons/smarthphone-orientation.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 39 additions & 0 deletions client/assets/icons/spacebar.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions client/assets/icons/touch.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions client/components/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@
@import url('https://fonts.googleapis.com/css?family=Source+Sans+Pro:200,200i,300,300i,400i,600,600i,700,700i,900,900i');
html {
font-size: 100%;
}
body {
margin: 0;
font-size: 2rem;
Expand Down Expand Up @@ -68,4 +72,34 @@
-ms-user-select: none;
}
@media screen and (min-width: 1200px) {
html {
font-size: 110%;
}
}
@media screen and (min-width: 1400px) {
html {
font-size: 120%;
}
}
@media screen and (min-width: 1600px) {
html {
font-size: 130%;
}
}
@media screen and (min-width: 1800px) {
html {
font-size: 140%;
}
}
@media screen and (min-width: 1900px) {
html {
font-size: 150%;
}
}
</style>
2 changes: 1 addition & 1 deletion client/components/Camera.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<a-entity camera :position="attributify(position)" :look-controls="controlsEnabled ? '' : 'enabled: false; hmdEnabled: false;'">
<a-entity id="camera" camera :position="attributify(position)" :look-controls="controlsEnabled ? '' : 'enabled: false; hmdEnabled: false;'">
<end-message></end-message>
</a-entity>
</template>
Expand Down
Loading

0 comments on commit e527890

Please sign in to comment.