diff --git a/controllerApp/AndroidManifest.xml b/controllerApp/AndroidManifest.xml
deleted file mode 100644
index 8d4f9d398251bf82b3e978fa563191a2db54583b..0000000000000000000000000000000000000000
--- a/controllerApp/AndroidManifest.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="">
- <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="28"/>
- <application android:icon="@mipmap/ic_launcher" android:label="" android:usesCleartextTraffic="true">
- <activity android:name=".MainActivity" android:theme="@style/Theme.AppCompat.Light.NoActionBar.FullScreen">
- <intent-filter>
- <action android:name="android.intent.action.MAIN"/>
- <category android:name="android.intent.category.LAUNCHER"/>
- </intent-filter>
- </activity>
- </application>
- <uses-permission android:name="android.permission.INTERNET"/>
- <uses-permission android:name="android.permission.VIBRATE"/>
-</manifest>
diff --git a/controllerApp/BallWave.pde b/controllerApp/BallWave.pde
deleted file mode 100644
index c2469a040f97fcb64baaf944e4b7009212f94219..0000000000000000000000000000000000000000
--- a/controllerApp/BallWave.pde
+++ /dev/null
@@ -1,40 +0,0 @@
-class BallWave
-{
- PVector location;
- PVector plocation;
- String mText="";
- float life = frameRate * 1;
-
- public BallWave(String _text, float x, float y)
- {
- mText = _text;
- location = new PVector(x, y);
- }
-
- public BallWave(String _text, float x, float y, float px, float py)
- {
- mText = _text;
- location = new PVector(x, y);
- plocation = new PVector(px, py);
- }
-
- public void draw()
- {
- pushStyle();
- stroke(0);
- if (life > 0)
- noFill();
- strokeWeight(map(life,frameRate*1,0,20,width/10));
- circle(location.x,location.y,map(life,frameRate*1,0,width/20,2*width));
-
- if (plocation != null)
- line(location.x, location.y, plocation.x, plocation.y);
- popStyle();
- life--;
- }
-
- public boolean isDead()
- {
- return(life <= 0);
- }
-}
diff --git a/controllerApp/Net.pde b/controllerApp/Net.pde
deleted file mode 100644
index 68777d30434cafe5aa96b07be9c1d5c69ec4e898..0000000000000000000000000000000000000000
--- a/controllerApp/Net.pde
+++ /dev/null
@@ -1,114 +0,0 @@
-import java.io.*;
-import java.net.*;
-import java.util.UUID;
-
-class Net
-{
- JSONObject jsonParam;
- String uuid;
-
- public Net()
- {
- this.uuid = UUID.randomUUID().toString();
- }
- public void sendTap(float x, float y){
- jsonParam = new JSONObject();
- jsonParam.put("evnType", "Tap");
- jsonParam.put("x", y);
- jsonParam.put("y", x);
- sendPost();
- }
- public void sendLongPress(float x, float y){
- jsonParam = new JSONObject();
- jsonParam.put("evnType", "Long Press");
- jsonParam.put("x", y);
- jsonParam.put("y", x);
- sendPost();
- }
- public void sendRotation(float x, float y,float angle){
- jsonParam = new JSONObject();
- jsonParam.put("evnType", "Rotation");
- jsonParam.put("x", y);
- jsonParam.put("y", x);
- jsonParam.put("angle", angle);
- sendPost();
- }
- public void sendPinch(float x, float y,float d){
- jsonParam = new JSONObject();
- jsonParam.put("evnType", "Pinch");
- jsonParam.put("x", y);
- jsonParam.put("y", x);
- jsonParam.put("d", d);
- sendPost();
- }
- public void sendAccelerometer(float ax, float ay,float az){
- jsonParam = new JSONObject();
- jsonParam.put("evnType", "Accelerometer");
- jsonParam.put("ax", ay);
- jsonParam.put("ay", ax);
- jsonParam.put("az", az);
- sendPost();
- }
- public void sendGyroscope(float gx, float gy,float gz){
- jsonParam = new JSONObject();
- jsonParam.put("evnType", "Gyroscope");
- jsonParam.put("gx", gx);
- jsonParam.put("gy", gy);
- jsonParam.put("gz", gz);
- sendPost();
- }
- public void sendDoubleTap(float x, float y){
- jsonParam = new JSONObject();
- jsonParam.put("evnType", "Double Tap");
- jsonParam.put("x", y);
- jsonParam.put("y", x);
- sendPost();
- }
- public void sendFlick(float x, float y,float px, float py,float v){
- jsonParam = new JSONObject();
- jsonParam.put("evnType", "Flick");
- jsonParam.put("x", y);
- jsonParam.put("y", x);
- jsonParam.put("px", px);
- jsonParam.put("py", py);
- jsonParam.put("v", v);
- sendPost();
- }
- private void sendPost() {
-
- Thread thread = new Thread(new Runnable() {
- @Override
- public void run() {
- try {
- URL url = new URL("http://controller.viarezo.fr/multicast/"+code);
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- conn.setRequestMethod("POST");
- conn.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
- conn.setRequestProperty("Accept", "application/json");
- conn.setDoOutput(true);
- conn.setDoInput(true);
-
- jsonParam.put("id", uuid);
- println("JSON", jsonParam.toString());
- DataOutputStream os = new DataOutputStream(conn.getOutputStream());
- //os.writeBytes(URLEncoder.encode(jsonParam.toString(), "UTF-8"));
- os.writeBytes(jsonParam.toString());
-
- os.flush();
- os.close();
-
- println("STATUS", String.valueOf(conn.getResponseCode()));
- println("MSG", conn.getResponseMessage());
-
- conn.disconnect();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
- );
-
- thread.start();
- }
-}
diff --git a/controllerApp/Thing.pde b/controllerApp/Thing.pde
deleted file mode 100644
index 33e293cd9fc6a9d781449cb243bcf55145ae8955..0000000000000000000000000000000000000000
--- a/controllerApp/Thing.pde
+++ /dev/null
@@ -1,30 +0,0 @@
-class Thing
-{
- PVector location;
- PVector plocation;
- float life = frameRate * 0.5;
-
- public Thing(float x, float y,float px, float py)
- {
- location = new PVector(x, y);
- plocation = new PVector(px, py);
- }
-
-
- public void draw()
- {
- pushStyle();
- strokeWeight(map(life, frameRate/2, 0, 40, 0));
- stroke(255);
- life--;
- if (life > 0)
- line(location.x,location.y,plocation.x,plocation.y);
-
- popStyle();
- }
-
- public boolean isDead()
- {
- return(life <= 0);
- }
-}
diff --git a/controllerApp/UI.pde b/controllerApp/UI.pde
deleted file mode 100644
index 7b866aac361b2e02a16ac9561a2c4b60341088e7..0000000000000000000000000000000000000000
--- a/controllerApp/UI.pde
+++ /dev/null
@@ -1,86 +0,0 @@
-class UI
-{
- color mColor;
- PVector plocation;
- String mText="";
- float life = frameRate * 3;
-
- public UI()
- {
- mColor = color(0, 0, 0);
- }
-
- private void fade()
- {
- color black = color(0,0,0);
- mColor = lerpColor(mColor, black, 1/frameRate,1);
- }
- private void axis()
- {
- pushStyle();
- pushMatrix();
- translate(0.90*width,height-0.1*width);
- strokeWeight(4/50.0);
- scale(width/16);
- //x*cos()-y*sin(),x*sin()+y*cos()
- //cx,cy,cz
- //cy/sqrt(cx*cx+cy*cy),-cx/sqrt(cx*cx+cy*cy),0
- //
-
- float n = sqrt(1+cy*cy/(cx*cx)+(cx*cx*cx*cx+cx*cx*cy*cy+cy*cy*cy*cy)/(cx*cx*cz*cz));
- stroke(255,0,0);
- line(0,0,cx*cos(Angle)-cy*sin(Angle),cx*sin(Angle)+cy*cos(Angle));
- stroke(0,255,0);
- line(0,0,(cy/sqrt(cx*cx+cy*cy))*cos(Angle)+(cx/sqrt(cx*cx+cy*cy))*sin(Angle),(cy/sqrt(cx*cx+cy*cy))*sin(Angle)-(cx/sqrt(cx*cx+cy*cy))*cos(Angle));
- stroke(0,0,255);
- line(0,0,(1/n)*cos(Angle)-(cy/(n*cx))*sin(Angle),(1/n)*sin(Angle)+(cy/(n*cx))*cos(Angle));
- popStyle();
- popMatrix();
-
- }
- public void draw()
- {
- pushStyle();
- background(mColor);
- fade();
- axis();
- //text("Accelerometer: \n" +
- // "x: " + nfp(accelerometerX, 1, 3) + "\n" +
- // "y: " + nfp(accelerometerY, 1, 3) + "\n" +
- // "z: " + nfp(accelerometerZ, 1, 3), 0, 0, width, height);
-
- pushMatrix();
- translate(width/2, height/2);
- rotate(Angle);
- fill(255, 0, 0);
- rect( -Size/2, -Size/2, Size, Size);
- popMatrix();
- fill(255);
- circle(mouseX,mouseY,5);
-
- //if we have things lets reverse through them
- // so we can delete dead ones and draw live ones
- if (things.size() > 0) {
- for (int i = things.size()-1; i >= 0; i--)
- {
- Thing t = things.get(i);
- if (t.isDead())
- things.remove(t);
- else
- t.draw();
- }
- }
- if (ball_waves.size() > 0) {
- for (int i = ball_waves.size()-1; i >= 0; i--)
- {
- BallWave b = ball_waves.get(i);
- if (b.isDead())
- ball_waves.remove(b);
- else
- b.draw();
- }
- }
- popStyle();
-
- }
-}
diff --git a/controllerApp/code/sketch.properties b/controllerApp/code/sketch.properties
deleted file mode 100644
index cedc49b8c027bfc1f0ca6df08bda791b4c776810..0000000000000000000000000000000000000000
--- a/controllerApp/code/sketch.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-mode=Java
-component=app
-mode.id=processing.mode.java.JavaMode
diff --git a/controllerApp/controllerApp.pde b/controllerApp/controllerApp.pde
deleted file mode 100644
index d033b1d8502fd5e9bbb9c7bbb791689661cc07d5..0000000000000000000000000000000000000000
--- a/controllerApp/controllerApp.pde
+++ /dev/null
@@ -1,133 +0,0 @@
-import ketai.sensors.*;
-import android.view.MotionEvent;
-import ketai.ui.*;
-
-KetaiVibrate vibe;
-KetaiGesture gesture;
-KetaiSensor sensor;
-KetaiKeyboard keyboard;
-UI ui;
-Net net;
-float accelerometerX, accelerometerY, accelerometerZ;
-float rotationX, rotationY, rotationZ;
-float cx, cy, cz;
-float Size = 10;
-float Angle = 0;
-PImage img;
-String code = "a1b2c3";
-Boolean keyboard_flag = false;
-ArrayList<Thing> things = new ArrayList<Thing>();
-ArrayList<BallWave> ball_waves = new ArrayList<BallWave>();
-
-
-void onDoubleTap(float x, float y)
-{
- net.sendDoubleTap(x, y);
-}
-
-void onTap(float x, float y)
-{
- ball_waves.add(new BallWave("SINGLE", x, y));
- ui.mColor = color(random(255), random(255), random(255));
- net.sendTap(x, y);
-}
-
-void onLongPress(float x, float y)
-{
- ball_waves.add(new BallWave("LONG", x, y));
- ui.mColor = color(random(255), random(255), random(255));
- vibe.vibrate(50);
- net.sendLongPress(x, y);
-}
-
-//the coordinates of the start of the gesture,
-// end of gesture and velocity in pixels/sec
-void onFlick( float x, float y, float px, float py, float v)
-{
- //things.add(new Thing("FLICK:"+v, x, y, px, py));
- net.sendFlick(x, y, px, py, v);
-}
-
-void onPinch(float x, float y, float d)
-{
- if (d != 0){
- Size = constrain(Size+d, 1, 2000);
- net.sendPinch(x, y, d);
- }
-}
-
-void onRotate(float x, float y, float ang)
-{
- if (ang != 0){
- Angle += ang;
- net.sendRotation(x, y, ang);
- }
-}
-
-//these still work if we forward MotionEvents below
-void mouseDragged()
-{
- things.add(new Thing(mouseX, mouseY, pmouseX, pmouseY));
-}
-
-void mousePressed()
-{
-}
-
-
-public boolean surfaceTouchEvent(MotionEvent event) {
-
- //call to keep mouseX, mouseY, etc updated
- super.surfaceTouchEvent(event);
-
- //forward event to class for processing
- return gesture.surfaceTouchEvent(event);
-}
-
-
-
-void setup()
-{
- net = new Net();
- sensor = new KetaiSensor(this);
- gesture = new KetaiGesture(this);
- vibe = new KetaiVibrate(this);
- keyboard = new KetaiKeyboard();
- ui = new UI();
- sensor.start();
- orientation(PORTRAIT);
- textAlign(CENTER, CENTER);
- imageMode(CENTER);
- textSize(36);
-}
-
-void draw()
-{
- ui.draw();
- if (Size<=2 && !keyboard_flag) {
- keyboard.show(this);
- keyboard_flag = true;
- } else if (Size>2 && keyboard_flag) {
- keyboard.hide(this);
- keyboard_flag = false;
- }
-}
-
-void onAccelerometerEvent(float x, float y, float z)
-{
- accelerometerX = x;
- accelerometerY = y;
- accelerometerZ = z;
- float n = sqrt(x*x+y*y+z*z);
- cx = x/n;
- cy = y/n;
- cz = z/n;
- net.sendAccelerometer(x, y, z);
-}
-void onGyroscopeEvent(float x, float y, float z)
-{
- rotationX = x;
- rotationY = y;
- rotationZ = z;
- net.sendGyroscope(x, y, z);
-}
diff --git a/controllerApp/sketch.properties b/controllerApp/sketch.properties
deleted file mode 100644
index 6c0182c2b4b1bb939862b17d7f2d22ffeda4e7cf..0000000000000000000000000000000000000000
--- a/controllerApp/sketch.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-mode=Android
-mode.id=processing.mode.android.AndroidMode
diff --git a/controllerPackage/controller/__init__.py b/controllerPackage/controller/__init__.py
index 88ecaddf5b64e9176d0478df247565b08f8e3f19..e6a6fe3969e9828e35db336b28f44b93a75ba945 100644
--- a/controllerPackage/controller/__init__.py
+++ b/controllerPackage/controller/__init__.py
@@ -1,4 +1,4 @@
from controller.controller import Controller as Controller_
def Controller(*args):
- c = Controller_()
+ c = Controller_(*args)
return c
\ No newline at end of file
diff --git a/controllerPackage/controller/__pycache__/__init__.cpython-37.pyc b/controllerPackage/controller/__pycache__/__init__.cpython-37.pyc
index 276b01bc680971d39bcbf8ee4716ba2195832032..e7df5ed7d30212e11b5d90647473d33b4a8a84c9 100644
Binary files a/controllerPackage/controller/__pycache__/__init__.cpython-37.pyc and b/controllerPackage/controller/__pycache__/__init__.cpython-37.pyc differ
diff --git a/controllerPackage/controller/__pycache__/controller.cpython-37.pyc b/controllerPackage/controller/__pycache__/controller.cpython-37.pyc
index d55901fbc43f7cf94cebcd9427a17d7526ff5a66..d13ba17a598f1dc69c31adaec1fc07ef457616ee 100644
Binary files a/controllerPackage/controller/__pycache__/controller.cpython-37.pyc and b/controllerPackage/controller/__pycache__/controller.cpython-37.pyc differ
diff --git a/controllerPackage/controller/__pycache__/mobile.cpython-37.pyc b/controllerPackage/controller/__pycache__/mobile.cpython-37.pyc
index c7e68533618099ffeb6886ebbd11b1af8b7fa96f..399ce1a27fea57d2c51623aa22bd8e0bb066fd2a 100644
Binary files a/controllerPackage/controller/__pycache__/mobile.cpython-37.pyc and b/controllerPackage/controller/__pycache__/mobile.cpython-37.pyc differ
diff --git a/controllerPackage/controller/controller.py b/controllerPackage/controller/controller.py
index 9a55122199222688b1c1be3ad6cc5d64dce32232..b6816d7ff0964dc23437293be97d43499a866a19 100644
--- a/controllerPackage/controller/controller.py
+++ b/controllerPackage/controller/controller.py
@@ -5,7 +5,7 @@ import json
class Controller:
def __init__(self,code = 'a1b2c3',single_mobile = True):
-
+
# Room Code
self.code = code
self.single_mobile = single_mobile
diff --git a/controllerPackage/controller/mobile.py b/controllerPackage/controller/mobile.py
index b3f85a261bb5948d51bc6e63c114694adf56bb13..de349b1154d81506c5fe9bbca53a7b93541679a0 100644
--- a/controllerPackage/controller/mobile.py
+++ b/controllerPackage/controller/mobile.py
@@ -6,6 +6,7 @@ class Mobile:
self.gx, self.gy, self.gz = 0, 0, 0
self.ax, self.ay, self.az = 0, 0 ,0
self.angle = 0
+ self.text = ''
def handle(self,data):
try:
@@ -33,6 +34,11 @@ class Mobile:
y = data['y']
d = data['d']
self.onPinch(x,y,d)
+
+ elif evnType == 'Text':
+ text = data['text']
+ self.text = text
+ self.onText(text)
elif evnType == 'Gyroscope':
gx = data['gx']
@@ -120,4 +126,8 @@ class Mobile:
def on_down_swipe(self):
if self.help:
print('[DOWN SWIPE DETECTED] You can overwrite on_down_swipe to handle it.')
+
+ def onText(self,text):
+ if self.help:
+ print('[TEXT DETECTED] You can overwrite onText(text) to handle it.')
\ No newline at end of file
diff --git a/controllerPackage/dist/controller-0.0.2-py3-none-any.whl b/controllerPackage/dist/controller-0.0.2-py3-none-any.whl
index 60573c94d441b1c6fc2bb358ba8e65d954035d5b..4146b2b3b678a0518e2b9e03fa2276bfd4a7cb09 100644
Binary files a/controllerPackage/dist/controller-0.0.2-py3-none-any.whl and b/controllerPackage/dist/controller-0.0.2-py3-none-any.whl differ
diff --git a/controllerPackage/test.py b/controllerPackage/test.py
index c18a2bb814a025a270c15121f3f18aca1f8752a1..23255beae89942d03cefe69e22ebc64a27b8748d 100644
--- a/controllerPackage/test.py
+++ b/controllerPackage/test.py
@@ -1,10 +1,11 @@
from controller import Controller
-c = Controller('a1b2c3')
+c = Controller('fabric')
-while(True):
+def onRotation(x,y,ang):
print(c.mobile.getAngle())
+c.mobile.onRotation = onRotation
diff --git a/controllerSite/static/css/style.css b/controllerSite/static/css/style.css
index 130e3648ef7c2d7d7b7a8cdff9aebfcef05bca17..b27c90229e1cb4e3eb1b1df5e62e3012ce3b91db 100644
--- a/controllerSite/static/css/style.css
+++ b/controllerSite/static/css/style.css
@@ -848,6 +848,12 @@ section {
margin-bottom: 0;
}
+.details .content .badge-box {
+ font-size: 28px;
+ font-weight: 700;
+ color: #010483;
+ margin-bottom: 15px;
+}
/*--------------------------------------------------------------
# Gallery
--------------------------------------------------------------*/
diff --git a/controllerSite/static/img/hero-img.png b/controllerSite/static/img/hero-img.png
index ac34ec94c98d3e75e4b4f43a80dfe7fc0eba8f6d..9a17716aab80ab044ed23929fb61751b60429372 100644
Binary files a/controllerSite/static/img/hero-img.png and b/controllerSite/static/img/hero-img.png differ
diff --git a/controllerSite/templates/index.html b/controllerSite/templates/index.html
index f9c8b0c819c4d8d4383b837348ea34cd423c754c..3d2f8338c366f7f851d5e18fa18cd4fa9f4fb3a3 100644
--- a/controllerSite/templates/index.html
+++ b/controllerSite/templates/index.html
@@ -53,8 +53,9 @@
<li class="active"><a href="#header">Home</a></li>
<li><a href="#about">About</a></li>
<li><a href="#features">Features</a></li>
- <li><a href="#gallery">Gallery</a></li>
- <li><a href="#team">Team</a></li>
+ <li><a href="#installation">Installation</a></li>
+ <!--<li><a href="#gallery">Gallery</a></li>-->
+ <!--<li><a href="#team">Team</a></li>-->
<li><a href="https://viarezo.fr/en/">ViaRézo</a></li>
<!--
<li><a href="#pricing">Pricing</a></li>
@@ -78,7 +79,7 @@
</ul>
</li>
-->
- <li><a href="#contact">Contact</a></li>
+ <!--<li><a href="#contact">Contact</a></li>-->
</ul>
</nav><!-- .nav-menu -->
@@ -130,25 +131,25 @@
</div>
<div class="col-xl-7 col-lg-6 icon-boxes d-flex flex-column align-items-stretch justify-content-center py-5 px-lg-5" data-aos="fade-left">
- <h3>Enim quis est voluptatibus aliquid consequatur fugiat</h3>
- <p>Esse voluptas cumque vel exercitationem. Reiciendis est hic accusamus. Non ipsam et sed minima temporibus laudantium. Soluta voluptate sed facere corporis dolores excepturi. Libero laboriosam sint et id nulla tenetur. Suscipit aut voluptate.</p>
+ <h3>Catch all sorts of UI events from your phone</h3>
+ <p>With ControllerApp, now it's possible to detect an event like a simple tap in your mobile's screen or a device's acceleration, directly in your python code.</p>
<div class="icon-box" data-aos="zoom-in" data-aos-delay="100">
- <div class="icon"><i class="bx bx-fingerprint"></i></div>
- <h4 class="title"><a href="">Lorem Ipsum</a></h4>
- <p class="description">Voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident</p>
+ <div class="icon"><i class="bx bx-gift"></i></div>
+ <h4 class="title"><a href="">Really easy to use</a></h4>
+ <p class="description">ControllerApp was designed for begginners, you can connect to your phone in one line of code.</p>
</div>
<div class="icon-box" data-aos="zoom-in" data-aos-delay="200">
- <div class="icon"><i class="bx bx-gift"></i></div>
- <h4 class="title"><a href="">Nemo Enim</a></h4>
- <p class="description">At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque</p>
+ <div class="icon"><i class="bx bx-fingerprint"></i></div>
+ <h4 class="title"><a href="">Receive data from several devices (or in several computers)</a></h4>
+ <p class="description">Controller works with a 'room code', that means you can catch data from several devices or in several computers only by using the same code.</p>
</div>
<div class="icon-box" data-aos="zoom-in" data-aos-delay="300">
<div class="icon"><i class="bx bx-atom"></i></div>
- <h4 class="title"><a href="">Dine Pad</a></h4>
- <p class="description">Explicabo est voluptatum asperiores consequatur magnam. Et veritatis odit. Sunt aut deserunt minus aut eligendi omnis</p>
+ <h4 class="title"><a href="">It's fast!</a></h4>
+ <p class="description">We refresh your's Gyroscope and acceleration values 5 times per second!</p>
</div>
</div>
@@ -170,7 +171,7 @@
<div class="col-lg-3 col-md-4">
<div class="icon-box" data-aos="zoom-in" data-aos-delay="50">
<i class="ri-store-line" style="color: #ffbb2c;"></i>
- <h3><a href="">Tap</a></h3>
+ <h3><a href="">Single/Double Tap</a></h3>
</div>
</div>
<div class="col-lg-3 col-md-4 mt-4 mt-md-0">
@@ -206,7 +207,7 @@
<div class="col-lg-3 col-md-4 mt-4">
<div class="icon-box" data-aos="zoom-in" data-aos-delay="350">
<i class="ri-file-list-3-line" style="color: #11dbcf;"></i>
- <h3><a href="">Double Tap</a></h3>
+ <h3><a href="">Long Press</a></h3>
</div>
</div>
<div class="col-lg-3 col-md-4 mt-4">
@@ -215,6 +216,7 @@
<h3><a href="">Keyboard</a></h3>
</div>
</div>
+ <!--
<div class="col-lg-3 col-md-4 mt-4">
<div class="icon-box" data-aos="zoom-in" data-aos-delay="450">
<i class="ri-anchor-line" style="color: #b2904f;"></i>
@@ -240,11 +242,12 @@
</div>
</div>
</div>
-
+ -->
</div>
</section><!-- End Features Section -->
- <!-- ======= Counts Section ======= -->
+ <!-- ======= Counts Section =======
+
<section id="counts" class="counts">
<div class="container">
@@ -285,9 +288,9 @@
</div>
</div>
- </section><!-- End Counts Section -->
-
- <!-- ======= Details Section ======= -->
+ </section><!- End Counts Section -->
+
+ <!-- ======= Details Section ======= --
<section id="details" class="details">
<div class="container">
@@ -379,9 +382,42 @@
</div>
</div>
- </section><!-- End Details Section -->
+ </section><!- End Details Section -->
- <!-- ======= Gallery Section ======= -->
+ <!-- ======= Intallation Section ======= -->
+ <section id="installation" class="details">
+ <div class="container">
+ <div class="section-title" data-aos="fade-up">
+ <h2>Installation</h2>
+ <p>Start Using Now</p>
+ </div>
+ <div class="row content">
+ <div class="col-md-8 pt-4" data-aos="fade-up">
+ <h3>Installing the python package.</h3>
+ <p class="font-italic">
+ The Controller package can be installed using pip package installer:
+ </p>
+ <div class="alert alert-dark" role="alert">
+ $ pip install controller
+ </div>
+ <p>
+ If you don't have pip installed, check the <a href="https://pip.pypa.io/en/stable/installing/">website</a>
+ </p>
+ </div>
+ <div class="col-md-8 pt-4" data-aos="fade-up">
+ <h3>Installing the ControllerApp.</h3>
+ <p class="font-italic">
+ The ControllerApp is available on GooglePlay:
+ </p>
+ <div class="badge-box">
+ <a href='http://play.google.com/store/?pcampaignid=pcampaignidMKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png'/></a>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </section><!-- End Installation Section -->
+ <!-- ======= Gallery Section ======= ->
<section id="gallery" class="gallery">
<div class="container">
@@ -459,9 +495,9 @@
</div>
</div>
- </section><!-- End Gallery Section -->
+ </section><!- End Gallery Section -->
- <!-- ======= Testimonials Section ======= -->
+ <!-- ======= Testimonials Section ======= ->
<section id="testimonials" class="testimonials">
<div class="container">
@@ -525,9 +561,9 @@
</div>
</div>
- </section><!-- End Testimonials Section -->
+ </section><!- End Testimonials Section -->
- <!-- ======= Team Section ======= -->
+ <!-- ======= Team Section ======= ->
<section id="team" class="team">
<div class="container">
@@ -553,7 +589,7 @@
</div>
</div>
</div>
- <!--
+
<div class="col-lg-3 col-md-6 mt-5 mt-md-0">
<div class="member" data-aos="zoom-in" data-aos-delay="200">
<div class="pic"><img src="static/img/team/team-2.jpg" class="img-fluid" alt=""></div>
@@ -601,12 +637,12 @@
</div>
</div>
</div>
- -->
+
</div>
</div>
- </section><!-- End Team Section -->
+ </section><!- End Team Section -->
<!-- ======= Pricing Section =======
@@ -705,18 +741,10 @@
<div class="faq-list">
<ul>
- <li data-aos="fade-up">
- <i class="bx bx-help-circle icon-help"></i> <a data-toggle="collapse" class="collapse" href="#faq-list-1">How can I Install the package? <i class="bx bx-chevron-down icon-show"></i><i class="bx bx-chevron-up icon-close"></i></a>
- <div id="faq-list-1" class="collapse show" data-parent=".faq-list">
- <p>
- You only need to tap 'pip install controller' in your command line to have it.
- </p>
- </div>
- </li>
<li data-aos="fade-up" data-aos-delay="100">
- <i class="bx bx-help-circle icon-help"></i> <a data-toggle="collapse" href="#faq-list-2" class="collapsed">How much it costs? <i class="bx bx-chevron-down icon-show"></i><i class="bx bx-chevron-up icon-close"></i></a>
- <div id="faq-list-2" class="collapse" data-parent=".faq-list">
+ <i class="bx bx-help-circle icon-help"></i> <a data-toggle="collapse" href="#faq-list-1" class="collapsed">How much it costs? <i class="bx bx-chevron-down icon-show"></i><i class="bx bx-chevron-up icon-close"></i></a>
+ <div id="faq-list-1" class="collapse" data-parent=".faq-list">
<p>
Actually, it's totally free.
</p>
@@ -724,31 +752,14 @@
</li>
<li data-aos="fade-up" data-aos-delay="200">
- <i class="bx bx-help-circle icon-help"></i> <a data-toggle="collapse" href="#faq-list-3" class="collapsed">Where is this service located? <i class="bx bx-chevron-down icon-show"></i><i class="bx bx-chevron-up icon-close"></i></a>
- <div id="faq-list-3" class="collapse" data-parent=".faq-list">
+ <i class="bx bx-help-circle icon-help"></i> <a data-toggle="collapse" href="#faq-list-2" class="collapsed">Where is this service located? <i class="bx bx-chevron-down icon-show"></i><i class="bx bx-chevron-up icon-close"></i></a>
+ <div id="faq-list-2" class="collapse" data-parent=".faq-list">
<p>
The site (and API) are hosted by ViaRézo (A CentraleSupelec's students' Association)
</p>
</div>
</li>
- <li data-aos="fade-up" data-aos-delay="300">
- <i class="bx bx-help-circle icon-help"></i> <a data-toggle="collapse" href="#faq-list-4" class="collapsed">Tempus quam pellentesque nec nam aliquam sem et tortor consequat? <i class="bx bx-chevron-down icon-show"></i><i class="bx bx-chevron-up icon-close"></i></a>
- <div id="faq-list-4" class="collapse" data-parent=".faq-list">
- <p>
- Molestie a iaculis at erat pellentesque adipiscing commodo. Dignissim suspendisse in est ante in. Nunc vel risus commodo viverra maecenas accumsan. Sit amet nisl suscipit adipiscing bibendum est. Purus gravida quis blandit turpis cursus in.
- </p>
- </div>
- </li>
-
- <li data-aos="fade-up" data-aos-delay="400">
- <i class="bx bx-help-circle icon-help"></i> <a data-toggle="collapse" href="#faq-list-5" class="collapsed">Tortor vitae purus faucibus ornare. Varius vel pharetra vel turpis nunc eget lorem dolor? <i class="bx bx-chevron-down icon-show"></i><i class="bx bx-chevron-up icon-close"></i></a>
- <div id="faq-list-5" class="collapse" data-parent=".faq-list">
- <p>
- Laoreet sit amet cursus sit amet dictum sit amet justo. Mauris vitae ultricies leo integer malesuada nunc vel. Tincidunt eget nullam non nisi est sit amet. Turpis nunc eget lorem dolor sed. Ut venenatis tellus in metus vulputate eu scelerisque.
- </p>
- </div>
- </li>
</ul>
</div>
@@ -756,7 +767,7 @@
</div>
</section><!-- End F.A.Q Section -->
- <!-- ======= Contact Section ======= -->
+ <!-- ======= Contact Section ======= ->
<section id="contact" class="contact">
<div class="container">
@@ -825,7 +836,7 @@
</div>
</div>
- </section><!-- End Contact Section -->
+ </section><!- End Contact Section -->
</main><!-- End #main -->
@@ -879,7 +890,7 @@
<div class="col-lg-4 col-md-6 footer-newsletter">
<h4>Our Newsletter</h4>
- <p>Tamen quem nulla quae legam multos aute sint culpa legam noster magna</p>
+ <p>Receive information about our updates</p>
<form action="" method="post">
<input type="email" name="email"><input type="submit" value="Subscribe">
</form>