diff --git a/formdata.txt b/formdata.txt new file mode 100644 index 0000000..12b7afc --- /dev/null +++ b/formdata.txt @@ -0,0 +1 @@ +name: name, email: mymail@me.com, phone: +333333333, subject: Hello, message: hi,[name: Johhny, email: johnny@mail.com, phone: , subject: , message: hi],[name: hello, email: must@mail.com, phone: , subject: , message: Hi],[name: hello, email: must@mail.com, phone: , subject: , message: Hi],[name: hi, email: mymail@me.com, phone: , subject: , message: peace],[name: Johhny, email: johnny@mail.com, phone: , subject: , message: hey again], \ No newline at end of file diff --git a/src/build_rocket/get.rs b/src/build_rocket/get.rs index 607b5ef..1a526e0 100644 --- a/src/build_rocket/get.rs +++ b/src/build_rocket/get.rs @@ -1,6 +1,3 @@ -// Responder Type NamedFile -// serve file with Content-Type based on name -use rocket::fs::NamedFile; use crate::build_rocket::{ templates }; @@ -50,32 +47,31 @@ use rocket_dyn_templates::Template; } #[get("/contact")] - pub async fn meet() -> Template { + pub async fn contact() -> Template { let context = templates::TplPages::new(); Template::render("contact", &context) } + #[get("/about")] + pub async fn about() -> Template { + let context = templates::TplPages::new(); + Template::render("about", &context) + } + // subpages #[get("/oil")] - pub async fn oil() -> Option { - NamedFile::open("templates/oils.html").await.ok() - } - - #[get("/flower")] - pub async fn flower() -> Option { - NamedFile::open("templates/flower.html").await.ok() - } - - #[get("/spiderpi")] - pub async fn spiderpi() -> Option { - NamedFile::open("templates/spiderpi.html").await.ok() + pub async fn oil() -> Template { + let context = templates::TplPages::new(); + Template::render("oil", &context) } - #[get("/permapp")] - pub async fn permapp() -> Option { - NamedFile::open("templates/permapp.html").await.ok() + + #[get("/flower")] + pub async fn flower() -> Template { + let context = templates::TplPages::new(); + Template::render("flower", &context) } #[get("/miner")] @@ -85,14 +81,9 @@ use rocket_dyn_templates::Template; } #[get("/wohnmaschine")] - pub async fn wm() -> Option { - NamedFile::open("templates/greenlab.html").await.ok() - } - - // footer pages - #[get("/about")] - pub async fn about() -> Option { - NamedFile::open("templates/about.html").await.ok() + pub async fn wm() -> Template { + let context = templates::TplPages::new(); + Template::render("machina", &context) } // code link to gitea @@ -102,5 +93,12 @@ use rocket_dyn_templates::Template; let context = templates::TplPrivacy::new(); Template::render("privacy-policy", &context) } - + +// after submit page +#[get("/thanks")] +pub fn thanks() -> Template { + let context = templates::TplForm::new(); + Template::render("thanks", &context) +} + \ No newline at end of file diff --git a/src/build_rocket/mod.rs b/src/build_rocket/mod.rs index deebed8..b91ad20 100644 --- a/src/build_rocket/mod.rs +++ b/src/build_rocket/mod.rs @@ -1,6 +1,7 @@ // Routes pub mod get; pub mod get_static_files; +pub mod post; // Templates pub mod templates; diff --git a/src/build_rocket/post.rs b/src/build_rocket/post.rs new file mode 100644 index 0000000..b5978ae --- /dev/null +++ b/src/build_rocket/post.rs @@ -0,0 +1,39 @@ +use rocket::form::Form; +use rocket::response::Redirect; + + +use std::fs::OpenOptions; +use std::io::Write; + +#[derive(FromForm, Debug)] +pub struct UserInput<'r> { + name: &'r str, + email: &'r str, + phone: &'r str, + subject: &'r str, + message: &'r str, +} + +#[post("/submit", data = "")] +pub fn submit(user_input: Form>) -> Redirect { + + let data = format!("[name: {}, email: {}, phone: {}, subject: {}, message: {}],", + user_input.name, + user_input.email, + user_input.phone, + user_input.subject, + user_input.message); + + let mut f = OpenOptions::new() + .append(true) + .create(true) + .open("formdata.txt") + .expect("Couldn't open"); + + f.write_all(&data.as_bytes()).expect("Failed to write"); + + let redirect = Redirect::to(uri!("/contact/thanks")); + + redirect + +} \ No newline at end of file diff --git a/src/build_rocket/templates.rs b/src/build_rocket/templates.rs index 79051aa..51914e9 100644 --- a/src/build_rocket/templates.rs +++ b/src/build_rocket/templates.rs @@ -34,7 +34,23 @@ pub struct TplPages { impl TplPages { pub fn new() -> TplPages { TplPages { - title: json!(["Hanf", "Spinne", "Kaos Cube", "Cyberpreneur", "Offgrid", "Contact Us"]), + title: json!(["Hanf", "Spinne", "Kaos Cube", "Cyberpreneur", "Offgrid", "Contact Us", "About Us", "Datenschutz", "CBD Öl", "Blüten", "PermApp", "Hexapod", "WohnMachine", "GPU MIner"]), + } + } +} + +#[derive(Serialize)] +pub struct TplForm { + pub title: Value, + pub message: Value, +} + +// how to do linebreaks in JSON ? +impl TplForm { + pub fn new() -> TplForm { + TplForm { + title: json!(["Danke !"]), + message: json!(["Vielen herzlichen Dank für deine Nachricht !"]), } } } diff --git a/src/main.rs b/src/main.rs index b11c405..db3dd47 100644 --- a/src/main.rs +++ b/src/main.rs @@ -5,7 +5,7 @@ extern crate rocket; extern crate lazy_static; mod build_rocket; -use crate::build_rocket::{ get, get_static_files }; +use crate::build_rocket::{ get, get_static_files, post }; use rocket_dyn_templates::Template; @@ -27,15 +27,22 @@ async fn main() -> Result<(), rocket::Error> { .mount("/", routes![ get::index_de, get_static_files::fileserver, - get::hemp, get::spider, get::cube, get::cyber, get::offgrid, get::about, get::meet, get::privacy ]) + // add(a)about + get::hemp, get::spider, get::cube, get::cyber, get::offgrid, get::contact, get::about, get::privacy ]) .mount("/hemp", - routes! [ get::oil, get::flower]) - .mount("/spider", - routes! [ get::spiderpi, get::permapp ]) + // add(a) flower, + routes! [ get::oil, get::flower ]) + + // add (b)permapp spiderpi + // .mount("/spider", + // routes! [ get::spiderpi, get::permapp ]) .mount("/offgrid", routes! [ get::wm, get::miner ]) + .mount("/contact", + routes! [ post::submit, get::thanks ]) + // Add Tera Templating support .attach(Template::fairing()) diff --git a/templates/about.html.tera b/templates/about.html.tera new file mode 100644 index 0000000..86e0484 --- /dev/null +++ b/templates/about.html.tera @@ -0,0 +1,33 @@ +{%extends "base"%} +{%block title %} Cannabinieri | {{ title[6] }} {%endblock title %} +{%block head%} +{{super()}} + +{%endblock head%} +{%block content%} +
+
+ +

Cannabinieri

+

Unsere Mission ist konsequent biologisches CBD anzubauen und mit Hilfe von Technik mehr über sie zu.
+ All unsere Produkte sind Experimente die Auswirkungen von Wechselwirkungen in unserem Ökosystem erforschen. + Unser Dünger sind unsere Partnerpflanzen und Insekten sind unsere Helfer gegen Schädlinge. +
Entdecke unser erstes Experiment !

+
+
+ +

Vision

+

Unsere CBD Pflanzen verarbeiten wir selbst zu Vollspektrum Ölen. Jedes ein Unikat, wie die Experimente. + Unsere ersten Öle gewinnen wir durch Extraktion mit Trinkalkohol und natürlich ohne artifizielle Zusätze. + Wir experimentieren mit verschiedenen Trägerölen und Konzentration. +
Entdecke mehr über unsere Öle !
+

+
+
+ +

Modell

+

Unsere Ziel ist es unsere Experimente auch als Blüten anzubieten. Der Verkauf und die Einfuhr von Blüten ist für uns und viele andere Firmen, die ins CBD Business einsteigen wollen ohne rechtliche Absicherung zu riskant. + Hier findest du mehr zu unseren Blüten, aus denen wir auch unsere Öle herstellen.

+
+
+{%endblock content%} \ No newline at end of file diff --git a/templates/assets/components/join-content.html b/templates/assets/components/join-content.html deleted file mode 100644 index d83d95b..0000000 --- a/templates/assets/components/join-content.html +++ /dev/null @@ -1,80 +0,0 @@ -
-
-

Join

-

Join our project .

- Let's get in touch!

-
- -
-
-
-
-
-

Want to join us ?

-

Feel free to get in touch, we are looking forward to meet you and your ideas.
- SpiderPi still is in his starting shoes and we can use your help to get him up and running.

- Are you willing to contribute, learn and create the future of gardening for everyone ?

- We love to hear from you!
- #a dummy text

-
- -
-
-
-
-
-
-
-
-

Write Us

-
Adress
-

Cannabinieri Office
- Some Adress

-

Mail
-

- cannabinieri@info.de -

-
-
-

Call Us

-

Some Number
-

-
- -
-
-
-

Get in touch

-
- -
-
- -
-
- -
-
- -
-
- -
- -
-
-
-
-
-
-
- - \ No newline at end of file diff --git a/templates/assets/components/meet-content.html b/templates/assets/components/meet-content.html deleted file mode 100644 index 7f348fd..0000000 --- a/templates/assets/components/meet-content.html +++ /dev/null @@ -1,68 +0,0 @@ -
-
-

Meet Us

-

Do you have questions, comments, thoughts about us and our experiments ?

- Drop us a line or two, we love to hear from you !

- -
-
-
-
-
-

Write Us

-
Adress
-

Cannabinieri Office
- Some Adress

-

Mail
-

- cannabinieri@info.de -

-
-
-

Call Us

-

Some Number
-

-
- -
-
-
-

Meet Us

-
- -
-
- -
-
- -
-
- -
-
- -
- -
-
-
-
-
- - - - - diff --git a/templates/assets/components/oils-content.html b/templates/assets/components/oils-content.html deleted file mode 100644 index beb6c76..0000000 --- a/templates/assets/components/oils-content.html +++ /dev/null @@ -1,47 +0,0 @@ -
-
-

Oils

-

Our full-spectrum CBD oils

- Discover our first Experiment!

-
- -
-
-
-
-
-

Sauvage, the wild one

-

Sauvage is french for wild.
- Our first Experiment is a full-spectrum CBD oil made out of a local strain, grown outdoors under normal consitions and obtained through ethanol extraction .
- Since our project is about exploring how environmental factors and partnerplants influence a products taste and effect, - we found that a product grown organically and manually outdoors by one of our partners would be the perfect base to our journey of exploration.

- Find out all about her and order a sample!
- #a dummy text

-
- -
-
-
-
-
-

All CBD Oils

-
-
- -
-
Sauvage
-

A Full Spectrum CBD oil from organic grown italian hemp.
- The carrier oil is 100% organic hemp oil, ethanol extraction.
- % CBD, % THC, flavour, effect.
- Natural conditions, nothing done to influence it.

- Available as a limited sample. -

-
- - -
-
-
-
-
-
\ No newline at end of file diff --git a/templates/assets/components/partners-content.html b/templates/assets/components/partners-content.html deleted file mode 100644 index c78e85e..0000000 --- a/templates/assets/components/partners-content.html +++ /dev/null @@ -1,80 +0,0 @@ -
-
-

Partners

-

Who they are and what they do
- Find out !

-
- -
-
-
-
-
-

The wild ones

-

Our partner Tommaso gave us the opportunity to bring out our first experiment Sauvage.
- He grows organic cannabis outdoors in X for X years because X.

- This year we arrived in Italy in June, we didn't believe that we'd be able to bring out a product within that first year, Thommaso made it possible.

- We helped him with the harvest and that was when we decided that his plants will serve our first experiment bacause X.
- From Thommaso we can learn a lot about the region we'll be working in, about common disseases and local procedures.

- Find out more below ! -
- #and it goes sthn' like that -

-
- -
-
-
-
-
-

All Partners

-
-
- -
-
Tommaso Inc
-

Organic CBD Farm -

- His company goal.
- Why we work together /how we profit from each other.
- #a dummy text #button leads to partners website/social-media etc
-

-
- -
-
-
-
-
-
-

Links

- -
-
-
-
- \ No newline at end of file diff --git a/templates/assets/components/permaculture-content.html b/templates/assets/components/permaculture-content.html deleted file mode 100644 index 9735a31..0000000 --- a/templates/assets/components/permaculture-content.html +++ /dev/null @@ -1,77 +0,0 @@ -
-
-
-

Perma

-

Culture

-
-

We take part in a culture utilizing the patterns of our ecosystem.

-
- -
-
-
-

Permaculture is the way to design in synergy with nature.
- In order to use our planet's ressources in a sustainable way, we need to understand the design of nature.
- In order to find new organic solutions we created the PermApp, a way for everybody to store and explore environmental connections & utilize them for sustainable problem-solving. -

-
- - -
\ No newline at end of file diff --git a/templates/assets/components/permapp-content.html b/templates/assets/components/permapp-content.html deleted file mode 100644 index d69e154..0000000 --- a/templates/assets/components/permapp-content.html +++ /dev/null @@ -1,46 +0,0 @@ -
-
-

PermApp

-

A map of our ecosystem.

- Try it now!

-
- -
-
-
-
-
-

Let's create a database of our ecosystem!

-

Our PerMapp is an app that stores all the connections in our ecosystem.
- Everything around us is connected, every plant affects all other plants and animals and in the end us people.
- In order to keep utilizing our planets ressources, we need to understand the complex system that definines life and decay . - Add relations you found out about, keep experimenting with the ones that are already known, so in the end we got the data neccessary for a sustainable and automated future of farming.

- Let's Create!
- #a dummy text

-
- -
-
-
-
-
-

Try the App

-
-
- -
-
PermApp
-

Add and explore the relations of our ecosystem !
- The Webapp has already has most of its core functionalities.
- The mobile app is currently in developement.
- #a dummy text
-

-
- - -
-
-
-
-
-
\ No newline at end of file diff --git a/templates/assets/components/spider-content.html b/templates/assets/components/spider-content.html deleted file mode 100644 index bf84bdf..0000000 --- a/templates/assets/components/spider-content.html +++ /dev/null @@ -1,60 +0,0 @@ -
-
-
-

About a

-

Spider

-
-
-

Imagine
a spider
doing your gardening.

- -
-
- spider -
-
-
-

Spider Pi is the garden hexapod we are working on.
- He is aimed to be a helper and walking database that recognizes disseases and pests in plants and knows how to fight them.
- He will help us understand how environmental conditions and relations between plants are connected to the spread of pests and disseases.
- In order for him to understand what we don't there is a lot of work to do and we can use your help. -

-
- - -
\ No newline at end of file diff --git a/templates/assets/components/spiderpi-content.html b/templates/assets/components/spiderpi-content.html deleted file mode 100644 index 729e821..0000000 --- a/templates/assets/components/spiderpi-content.html +++ /dev/null @@ -1,48 +0,0 @@ -
-
-

SpiderPi

-

Our garden hexapod.

- Learn about SpiderPi!

-
- -
-
-
-
-
-

About a Spider

-

SpiderPi is our garden hexapod, he is aimed to be a garden helper and a walking database of our ecosystem.
- Through object detection he will recognize what is happening around him and check a plant for pests and disseases and then execute measures of biodynamic pest- and dissease management.

- Currently SpiderPi is learning to walk on uneven ground and recognize his surroundings in order to operate within them.

- Be part of the journey !
- #a dummy text

-
- -

video

-
-
-
-
-
-

Time-Line

-
-
- -
-
Eyes
-

Our first challenge is to let SpiderPi detect his surroundings and navigate through them.

- We replaced his built in camera with a 360 and wrote an object detection program that enables him to navigate through his surroundings and respond to obstacles.
- We used the software X, camera X, sensors X, made X changes on the Spider.

- Stay in touch ! - #a dummy text
-

-
- - - -
-
-
-
-
-
\ No newline at end of file diff --git a/templates/assets/components/top-nav.html b/templates/assets/components/top-nav.html deleted file mode 100644 index 4a9e8dd..0000000 --- a/templates/assets/components/top-nav.html +++ /dev/null @@ -1,8 +0,0 @@ - - \ No newline at end of file diff --git a/templates/assets/components/whatsthat-content.html b/templates/assets/components/whatsthat-content.html deleted file mode 100644 index 08d4150..0000000 --- a/templates/assets/components/whatsthat-content.html +++ /dev/null @@ -1,59 +0,0 @@ -
-
-

What's
that?

-

What Permaculture is
and why we care.

- Find out!

-
- -
-
-
-
-
-

The design of a sustainable ecosystem.

-

Permaculture is defined through
12 principles.


-
    -
  • # Observe and interact
    • -
  • # Catch and store energy
    • -
  • # Obtain a yield
    • -
  • # Apply self-regulation and accept feedback
    • -
  • # Use and value renewable services and ressources
    • -
  • # Produce no waste
    • -
  • # Design from patterns to details
    • -
  • # Integrate rather than segregate
    • -
  • # Use small and slow solutions
    • -
  • # Use and value diversity
    • -
  • # Use edges and value the marginal
    • -
  • # Creatively use and respond to change
    • -
-

- All those principles are about a optimized use of our limited ressources while creating a sustaining value - a self-sufficient system that takes care of itself.
- - In order to build such a system a lot of information is required and this information is gained with tech,
to ultimately reach the goal of an actual automatic garden that takes care of itself by the rules of nature.
This can be a longer text. It should include all info we want to share about no waste, renewable energy, fish, herbs and our experiments.
When we got the demeter seal we can also mention it here or that we are working on obtaining it now.
- This text is about what permaculture is, why it is useful, why and how we use it and how the definition can include robots, maybe no robots here and just what people need to know about us not using plastic, creating a biodynamic farm, working on renewable energy solutions and utilizing partnerplants for our experiments.
- #smthn' like that

-
- -
-
-
-
-
-

Blog

-
-
- -
-
Related post 1
-

Short description.
- Might be about a specific relation or on some study or one of our experiments.
- #a dummy text
-

-
- -
-
-
-
-
-
\ No newline at end of file diff --git a/templates/assets/components/whoweare-content.html b/templates/assets/components/whoweare-content.html deleted file mode 100644 index c8e9c5f..0000000 --- a/templates/assets/components/whoweare-content.html +++ /dev/null @@ -1,102 +0,0 @@ -
-
-

About
Us

-

We grow further.

-

- -
-
-
-
-
-

We grow our future

-

We are working actively on creating a future that is reigned by knowledge about our environment .
- It is a future that enables us to make use of the full potential of our planet and grow our crops by the principles of nature and with the help of modern technology.
- We want our projects and products to be seen as packages of knowledge - as an ability to understand how complex and exiting the system around us is.
- Our goal is to understand our ecosystem and the influence of every relation on a product. We want you to know all we know.

- Collective knowledge, heath and excitement about our environment empowers us to grow further.

- #a dummy text

-
- -
-
-
-
-
-

Working with Nature

-

We want to utilize all of natures powers and explore organic and biodynamic solutions for pest and dissease management. By that we aim to obtain the highest quality and quantity of yields by only playing with natures entities.
- We are currently aspiring to obtain the Demeteter label which proves that all principlels of biodynamic agriculture are approved .
- We want to build a self-sufficient system where each plant and each environmental factor profit from each other. - All products we use on our plants are products made out of our plants.

- #a dummy text

-
- -
-
- -
-
-
-

Exploring the full potential of CBD

-

The Cannabis plant consisists of more than 120 different cannabinoids which all affect our body and psyche in unique ways.
- All our experiments are tailored to create exquisit compositions of different tastes and effects, just by manipulating environmental factors and the use of partnerplants.
- We evaluate the results through advanced technology lab tests, that precicely determine the quantity of different cannabinoids in our experiments. - By lab testing we also find out more about pests and disseases affecting our plants.Through constant reasearch and the collection of data we find organic solutions for their prevention.

- We are experimenting with all available extraction methods and our products ship with a lab test.
- #a dummy text

-
- -
-
- -
-
-
-

Automation for the People

-

If we talk about automation we mean people automating gardening for themselves, not people being automated.
- One of the main engines of this project is to find affordable and comprehensible solutions that enable everyone to have their own organic automated garden everywhere.
- We believe that many people utilizing our products, growing different plants under different conditions, enables us, all people, to create a huge net of data about our ecosystem that we can use and share and over which we have total control. - We want everyone to have access to our projects that is why all of them are documented to be imitated and improved.

- #a dummy text

-
- -
-
- -
-
-
-

Collective Growth

-

We choose the business model of a collective for our project.
- We did start this business in X 2020, our idea was to start small in order not to have large expenses at the beginning, which enables us to make all busines decisions ourselves.
- We want to have total control over what we are doing and make collective decisions without an investor interfering and forcing us to compromise our values. - So our definition of growth is a slow but consitent growth, that lets us step by step realize each of our ideas.

- We want to share our data and every detail about what we are doing.
- We desire to know more, and so do you, so we are taking the first step by deciding to share all we do and doing it all ourselves.
- #a dummy text

-
- -
-
-
-
-
-

Social Media

- -
-
-
-
diff --git a/templates/assets/css/index.css b/templates/assets/css/index.css index b8c97c1..249d7de 100644 --- a/templates/assets/css/index.css +++ b/templates/assets/css/index.css @@ -1,25 +1,32 @@ /* small mobile */ +/* Fix overlaps */ + .banner { - height: 20vw; - background-color: #ff00ff; + background-image: url('../img/banner_img.png'); + background-repeat: no-repeat; + background-size: contain; display: flex; - align-items: center; - justify-content: center; - padding: 0 4vw; + flex-direction: column; + justify-content: flex-end; + height: 87.5vw; + padding: 0 1vw; line-height: 8vw; letter-spacing: .125vw; } .banner h6 { - color: #fff; + color: #ff00ff; font-family: 'Lato', sans-serif; font-size: 5vw; + border: 1vw solid #ff00ff; + border-radius: 5vw; + padding: 2vw 2vw; } .banner h6 a { text-decoration: none; - color: yellow; + color: #3dbd92; } .banner h6 a:active { @@ -68,9 +75,10 @@ img { cursor: pointer;; align-self: center; justify-self: center; + transition: all .4 ease-in-out; } -.link button:active { +.link button:active, .link button:hover { box-shadow: 0px 0px 10px hsl(300, 100%, 30%); } @@ -89,10 +97,12 @@ img { grid-column: 1/5; grid-row: 2/5; padding: 3vh 1vw 0 1vw; + height: 45vw; + width: 45vw; } .link .sub_container p { - font-size: 3vw; + font-size: 4.5vw; text-align: center; color: #333; background-color: rgba(255, 255, 255, 0.7); @@ -104,19 +114,32 @@ img { flex-direction: column; align-items: center; padding: 1vw 2vw; - line-height: 4.5vw; + line-height: 5.5vw; letter-spacing: .05vw; } .link .sub_container p a { color: #333; text-decoration: none; + font-size: 4.5vw; } .link .sub_container p a:active { opacity: 60%; + color: #ff00ff; +} + +.link .sub_container p a:hover { + opacity: 60%; + color: #ff00ff; +} + +.banner .banner_img { + height: 80vw; + } + @media(min-width: 300px) { #hemp { margin-left: 50vw; @@ -168,8 +191,17 @@ img { } } -@media(min-width: 600px) { - +@media(min-width: 700px) { + .banner { + height: 47.5vw; + line-height: 5vw; + background-size: 60vw; + } + + .banner h6 { + font-size: 3vw; + border: .5vw solid #ff00ff; + } } @media(min-width: 800px) { @@ -190,12 +222,24 @@ img { } .banner { - height: 10vw; + height: 32vw; + line-height: 5vw; + background-size: 40vw; + background-position: center; } .banner h6 { - font-size: 2vw; - margin-left: 10vw; + font-size: 2.25vw; + border: .45vw solid #ff00ff; + padding: 1vw 2vw; + } + + .link .sub_container p { + font-size: 3vw; + } + + #small_screen { + display: none; } } @@ -229,7 +273,12 @@ img { } #miner{ - margin-top: 230vw; + margin-top: 210vw; + } + + #miner .sub_container { + width: 68vw; + height: 40vw; } } diff --git a/templates/assets/css/navigation.css b/templates/assets/css/navigation.css index 4c1ca7e..22ec383 100644 --- a/templates/assets/css/navigation.css +++ b/templates/assets/css/navigation.css @@ -80,7 +80,8 @@ } #mobile_dropdown ul li li a { - font-weight: 400; + font-weight: 300; + letter-spacing: 1.5vw; } #mobile_dropdown ul li a:active { @@ -105,20 +106,26 @@ flex-direction: column; align-items: center; z-index: 200; - position: fixed; max-height: 30vh; margin-top: 5rem; min-width: 80%; right: 10%; border-radius: .2rem; background-color: #0cffae; - box-shadow: 0 0 10px hsl(160, 51%, 80%); - opacity: 85%; transition: all .7 ease; } -#down_3 { - margin-top: 4rem; +#down_2, #down_3{ + margin-top: 0; + box-shadow: 0 0 15px 47px #0cffae; +} + +#chevron_2, #chevron_3 { + z-index: 1000; +} + +#spider_dropdown, #offgrid_dropdown { + width: 25vw; } .desktop_navigation { diff --git a/templates/assets/css/pages.css b/templates/assets/css/pages.css index 63c1b3d..0a797bc 100644 --- a/templates/assets/css/pages.css +++ b/templates/assets/css/pages.css @@ -11,7 +11,7 @@ img { .content_container { display: grid; justify-items: center; - padding: 1vh 1vw; + padding: 5vh 1vw 2vh 1vw; } .content_container img { @@ -24,9 +24,10 @@ img { .content_container h1 { grid-row: 1; color: #333; - font-size: 8vh; + font-size: 7vh; text-transform: uppercase; padding: 1vh 0; + letter-spacing: .15vw; } .content_container h1 span { @@ -81,6 +82,11 @@ img { text-align: center; } +#small_centered { + font-size: 6vh; + text-align: center; +} + @media (min-width: 700px) { .content_container p { padding-bottom: 6vh; diff --git a/templates/assets/css/submit.css b/templates/assets/css/submit.css new file mode 100644 index 0000000..7123183 --- /dev/null +++ b/templates/assets/css/submit.css @@ -0,0 +1,41 @@ +.container { + background-color: #05f2a5; + font-family: 'Lato', sans-serif;; + background-size: cover; + background-repeat: no-repeat; + height: calc(100% - 30vh); + min-height: 55vh; + margin: 5vh 5vw; + display: flex; + align-items: center; + justify-content: space-evenly; + flex-direction: column; +} + +.container h2 { + color: #fff; + text-align: center; + padding: 0 6vw .5vh 6vw; + font-size: 8.5vw; + line-height: 7.5vh; + letter-spacing: 0.045vw; +} + +.container p { + color: #333; + letter-spacing: 0.045vw; +} + +.container a { + text-decoration: none; + background-color: #fff; + padding: 2vh 6vw; + color: #3dbd92; + letter-spacing: 0.045vw; + font-weight: 600; +} + +.container a:active, .container a:hover { + box-shadow: 0px 0px 10px #333; + color: hsl(160,51%, 39%); +} \ No newline at end of file diff --git a/templates/assets/img/ValleyOfTheFlowers.JPG b/templates/assets/img/ValleyOfTheFlowers.JPG new file mode 100644 index 0000000..c76ffc1 Binary files /dev/null and b/templates/assets/img/ValleyOfTheFlowers.JPG differ diff --git a/templates/assets/img/baby_plants.JPG b/templates/assets/img/baby_plants.JPG new file mode 100644 index 0000000..b047d54 Binary files /dev/null and b/templates/assets/img/baby_plants.JPG differ diff --git a/templates/assets/img/banner_img.png b/templates/assets/img/banner_img.png new file mode 100644 index 0000000..63ab56c Binary files /dev/null and b/templates/assets/img/banner_img.png differ diff --git a/templates/assets/img/canna_candy.JPG b/templates/assets/img/canna_candy.JPG new file mode 100644 index 0000000..a044104 Binary files /dev/null and b/templates/assets/img/canna_candy.JPG differ diff --git a/templates/assets/img/crude.jpg b/templates/assets/img/crude.jpg new file mode 100644 index 0000000..38a815c Binary files /dev/null and b/templates/assets/img/crude.jpg differ diff --git a/templates/assets/img/cube_space.png b/templates/assets/img/cube_space.png new file mode 100644 index 0000000..3c115a1 Binary files /dev/null and b/templates/assets/img/cube_space.png differ diff --git a/templates/assets/img/flower_square.JPG b/templates/assets/img/flower_square.JPG new file mode 100644 index 0000000..1a4d115 Binary files /dev/null and b/templates/assets/img/flower_square.JPG differ diff --git a/templates/assets/img/hemp.JPG b/templates/assets/img/hemp.JPG new file mode 100644 index 0000000..f552c3a Binary files /dev/null and b/templates/assets/img/hemp.JPG differ diff --git a/templates/assets/img/hemp_square.JPG b/templates/assets/img/hemp_square.JPG new file mode 100644 index 0000000..8c377de Binary files /dev/null and b/templates/assets/img/hemp_square.JPG differ diff --git a/templates/assets/img/hero.svg b/templates/assets/img/hero.svg index 42abe4e..05ce3f7 100644 --- a/templates/assets/img/hero.svg +++ b/templates/assets/img/hero.svg @@ -4,9 +4,9 @@ - - - - - - - - - - - - - - + id="g30372" + transform="translate(-1.35412,0.583899)"> + id="nodes"> + id="g1981"> - + id="g22190" + transform="matrix(0,-0.50741751,-0.50741751,0,504.91494,217.40263)"> - - - - + id="edges" + class="edges" + transform="translate(1.35412,-0.583899)" + style="stroke:#000000;stroke-opacity:0.716206"> + + + + + + + + + + + + - - + id="path57" + style="opacity:1;fill:none;stroke:#3dbd92;stroke-width:7;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1;paint-order:stroke fill markers" + d="m 279.19957,101.81481 a 62.618,62.618355 0 0 1 -62.618,62.61835 62.618,62.618355 0 0 1 -62.618,-62.61835 62.618,62.618355 0 0 1 62.618,-62.618356 62.618,62.618355 0 0 1 62.618,62.618356 z" /> - - - - + id="node2" + class="nodes" + style="stroke:#3dbd92;stroke-opacity:1"> + - - - - - - - - - - + style="opacity:0.980099;fill:none;stroke:#3dbd92;stroke-width:7;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1;paint-order:stroke fill markers" + d="m 354.85201,344.18397 a 62.618355,62.618355 0 0 1 -62.61835,62.61836 62.618355,62.618355 0 0 1 -62.61836,-62.61836 62.618355,62.618355 0 0 1 62.61836,-62.61835 62.618355,62.618355 0 0 1 62.61835,62.61835 z" /> - - - - - - - - + style="opacity:0.980099;fill:none;stroke:#3dbd92;stroke-width:7;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1;paint-order:stroke fill markers" + d="M 161.52573,470.27046 A 62.618355,62.618355 0 0 1 98.907374,532.88882 62.618355,62.618355 0 0 1 36.289018,470.27046 62.618355,62.618355 0 0 1 98.907374,407.65211 62.618355,62.618355 0 0 1 161.52573,470.27046 Z" /> + style="opacity:0.980099;fill:none;stroke:#3dbd92;stroke-width:7;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1;paint-order:stroke fill markers" + d="m 349.67614,578.31062 a 62.618355,62.618355 0 0 1 -62.61835,62.61836 62.618355,62.618355 0 0 1 -62.61836,-62.61836 62.618355,62.618355 0 0 1 62.61836,-62.61835 62.618355,62.618355 0 0 1 62.61835,62.61835 z" /> + + - - - - + id="g6986" + transform="translate(1.6788805,2.2155349)" + style="stroke:#3dbd92;stroke-opacity:1"> + + id="g22190-9" + transform="matrix(0,-0.50741751,-0.50741751,0,510.58252,339.34632)"> + + + + + + + + + + + + + + + id="path57-9" + style="opacity:1;fill:none;stroke:#3dbd92;stroke-width:7;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1;paint-order:stroke fill markers" + d="m 279.19957,101.81481 a 62.618,62.618355 0 0 1 -62.618,62.61835 62.618,62.618355 0 0 1 -62.618,-62.61835 62.618,62.618355 0 0 1 62.618,-62.618356 62.618,62.618355 0 0 1 62.618,62.618356 z" /> - - - - + id="node2-3" + class="nodes" + style="stroke:#3dbd92;stroke-opacity:1"> + - - + id="path57-3-6-0" + style="opacity:0.980099;fill:none;stroke:#3dbd92;stroke-width:7;stroke-linecap:round;stroke-linejoin:bevel;stroke-opacity:1;paint-order:stroke fill markers" + d="m 354.85201,344.18397 a 62.618355,62.618355 0 0 1 -62.61835,62.61836 62.618355,62.618355 0 0 1 -62.61836,-62.61836 62.618355,62.618355 0 0 1 62.61836,-62.61835 62.618355,62.618355 0 0 1 62.61835,62.61835 z" /> + + + + - - - - + id="g6986-9" + transform="translate(1.6788805,2.2155349)" + style="stroke:#3dbd92;stroke-opacity:1"> + + id="g22190-3" + transform="matrix(0,-0.50741751,-0.50741751,0,509.69242,498.75292)"> + id="edges-8" + class="edges" + transform="translate(1.35412,-0.583899)" + style="stroke:#000000;stroke-opacity:0.716206"> + style="fill:none;fill-opacity:0.980392;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.716206" + d="m 240,160 c 40,120 40,120 40,120 v 0" + id="path6274-5" /> + + + + + + + + + + + + + + + + + + + + - - - - + id="g6986-7" + transform="translate(1.6788805,2.2155349)" + style="stroke:#3dbd92;stroke-opacity:1"> + diff --git a/templates/assets/img/oil_bottle.JPG b/templates/assets/img/oil_bottle.JPG new file mode 100644 index 0000000..57171dc Binary files /dev/null and b/templates/assets/img/oil_bottle.JPG differ diff --git a/templates/assets/img/plants-in-bags-owned.jpeg b/templates/assets/img/plants-in-bags-owned.jpeg deleted file mode 100644 index 25911cd..0000000 Binary files a/templates/assets/img/plants-in-bags-owned.jpeg and /dev/null differ diff --git a/templates/assets/img/plants_in_bags.JPG b/templates/assets/img/plants_in_bags.JPG new file mode 100644 index 0000000..200fb31 Binary files /dev/null and b/templates/assets/img/plants_in_bags.JPG differ diff --git a/templates/assets/img/production.jpg b/templates/assets/img/production.jpg new file mode 100644 index 0000000..f83fd5e Binary files /dev/null and b/templates/assets/img/production.jpg differ diff --git a/templates/assets/img/roots.JPG b/templates/assets/img/roots.JPG new file mode 100644 index 0000000..66f958d Binary files /dev/null and b/templates/assets/img/roots.JPG differ diff --git a/templates/assets/img/sample-about.svg b/templates/assets/img/sample-about.svg deleted file mode 100644 index 308a902..0000000 --- a/templates/assets/img/sample-about.svg +++ /dev/null @@ -1,42763 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/templates/assets/img/sample-app.jpg b/templates/assets/img/sample-app.jpg deleted file mode 100644 index 92c0659..0000000 Binary files a/templates/assets/img/sample-app.jpg and /dev/null differ diff --git a/templates/assets/img/sample-sauvage.svg b/templates/assets/img/sample-sauvage.svg deleted file mode 100644 index 13a400c..0000000 --- a/templates/assets/img/sample-sauvage.svg +++ /dev/null @@ -1,21895 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/templates/assets/img/spider_web.JPG b/templates/assets/img/spider_web.JPG new file mode 100644 index 0000000..9dc80b2 Binary files /dev/null and b/templates/assets/img/spider_web.JPG differ diff --git a/templates/contact.html.tera b/templates/contact.html.tera index 368e2e4..9e2d5fb 100644 --- a/templates/contact.html.tera +++ b/templates/contact.html.tera @@ -18,7 +18,7 @@

Kontaktiert Uns

-
+

Get in touch

diff --git a/templates/cube.html.tera b/templates/cube.html.tera index 84a27a0..98791f7 100644 --- a/templates/cube.html.tera +++ b/templates/cube.html.tera @@ -7,7 +7,7 @@ {%block content%}
- +

Kaos Cube

Der Kaos Cube ist das Netzwerk, in dem sich die Spinne bewegt. Er spannt ein dezentrales und privates Netzwerk zwischen den Spinnen. Der Cube ist ein Router über den mit Cryptocurrencies Internetverbindungen geteilt werden können. Die Antenne des Kaos Cubes fängt naheliegende Netzwerke ein. Jeder Kaos Cube Besitzer ist durch einen Ether Token in der Lage sein eigenes Inernet zu teilen. @@ -15,19 +15,17 @@

- +

Die physische Infrastruktur des Internets in den Händen des Nutzers

Mit dem Kaos Cube macht es möglich sichere Internet Verbindungen mit anderen teilen. Der Ether Token lässt Contracts zu, mit denen jeder Nutzer einstellt, wie er die Kosten seiner Bandbreite auf andere verteilen möchte. Die Verschlüsselung des Kaos Cubes ist auf Cjdns aufgebaut. Das bedeutet, dass an Stelle von IPs öffentliche Schlüssel die "Identität" der Nutzer darstellen. Daher ist der gesamte Datenverkehr des Netzwerkes der Cubes standardmäßig Onion verschlüsselt. Das Prinzip von Tor, beziehungsweise das, was als Darknet bezeichnet wird.

- Mehr
-

SomeThing

-

Hier noch mehr über den cube. Mit Link

- Mehr +

Block Chain in Aktion

+

Hier noch mehr über den cube.

{%endblock content%} \ No newline at end of file diff --git a/templates/experiments.html b/templates/experiments.html deleted file mode 100644 index 5d28861..0000000 --- a/templates/experiments.html +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - Cannabinieri - Experiments - - - - - - - - - -
-
- -
- -
- - - - diff --git a/templates/flower.html.tera b/templates/flower.html.tera new file mode 100644 index 0000000..230d8e9 --- /dev/null +++ b/templates/flower.html.tera @@ -0,0 +1,41 @@ +{%extends "base"%} +{%block title %} Cannabinieri | {{ title[9] }} {%endblock title %} +{%block head%} +{{super()}} +{# Fix inheritance issues 404 #} + + + + +{%endblock head%} +{%block content%} +
+
+ +

CBD Blüten

+

Wir möchten unabhängige und nachhaltige Systeme kreieren in denen ein Leben komplett ohne den Anschluss an Versorgungsysteme möglich ist. + Mit erneuerbaren Energien, Wissen über recycling von Müll und legale Fallen ist das möglich. + +

+
+
+ +

Sera

+

+ Eine Maschine nutzt Energie um Arbeiten zu verrichten. Unsere Wohnmaschinen nutzen erneurbare Energien um Strom bereitzustellen. + Bauteile der Maschinen sind Materialien, die in großer Anzahl verfügbar sind. Materialien die ohne - oder für wenig Geld zu haben sind. + Durch die Verwendung bauen wir lebendige unabhängige und individuelle Maschinen, die einfach nach- und auszubauen sind. + Wenn es um bauen geht stellt sich immer die Frage nach dem Grund, wem gehört er, wann kann ich ihn mir nehmen. + Mit unseren Wohnmaschinen erforschen wir verschiedene Konzepte, immer mit dem Ziel eine lebendige Maschine zu bauen, die sich selbst versorgt. +

+
+
+ +

Umgebung

+

Jede Solaranlage hat Probleme mit der Überproduktion von Strom. Sobald die Recycling Stromspeicher voll sind, geht Energie verloren. Diese Energie nutzen wir zum verifizieren von Transaktionen. Transaktionen von Krypto Währungen. Dabei sehen wir vor allem Monero und Etherium als nützlich an. Etherium Token sind einfach zu Coden. ETH Token als Bestandteil des KaosCubes um mit Contracts den automatischen Tausch von Währung gegen Bandbreite zu gewährleisten. Auch der geringe Ressourcen Verbrauch durch Proof of Stake ist dabei ein Argument für diese Währung. + Monero wird die Grundlage eines sicheren Transaktionssystems innerhalb der Kooperativen. Zusätzlich ist der Mining Algorithmus so aufgebaut, dass er Unrentabilität für große Mining Farmen verspricht. +

+
+
+ +{%endblock content%} \ No newline at end of file diff --git a/templates/index_de.html.tera b/templates/index_de.html.tera index 8892b2e..be0d363 100644 --- a/templates/index_de.html.tera +++ b/templates/index_de.html.tera @@ -7,7 +7,7 @@ {{super()}} {%block content%}
@@ -32,7 +32,7 @@ i
-

Unsere Spinne beginnt bereits zu Kartografieren.
In 3D. Low-Tech.
Unterstütze unsere Vision.
Damit das remote farming zur Realität wird.

+

Unsere Spinne beginnt bereits zu Kartografieren.
In 3D. Low-Tech.
Unterstütze unsere Vision.
Damit das remote farming zur Realität wird.

diff --git a/templates/machina.html.tera b/templates/machina.html.tera new file mode 100644 index 0000000..6cfd418 --- /dev/null +++ b/templates/machina.html.tera @@ -0,0 +1,38 @@ +{%extends "base"%} +{%block title %} Cannabinieri | {{ title[12] }} {%endblock title %} +{%block head%} +{{super()}} + + + + + +{%endblock head%} +{%block content%} +
+
+ +

Wohn-Machine

+

Der Kaos Cube ist das Netzwerk, in dem sich die Spinne bewegt. Er spannt ein dezentrales und privates Netzwerk zwischen den Spinnen. + Der Cube ist ein Router über den mit Cryptocurrencies Internetverbindungen geteilt werden können. Die Antenne des Kaos Cubes fängt naheliegende Netzwerke ein. Jeder Kaos Cube Besitzer ist durch einen Ether Token in der Lage sein eigenes Inernet zu teilen. + Der Cube ist Teil der Spinne, da die große Menge an Umgebungsdaten, die die Spinne sammelt sicher und anonym bleiben müssen. +

+
+
+ +

Die physische Infrastruktur des Internets in den Händen des Nutzers

+

+ Mit dem Kaos Cube macht es möglich sichere Internet Verbindungen mit anderen teilen. + Der Ether Token lässt Contracts zu, mit denen jeder Nutzer einstellt, wie er die Kosten seiner Bandbreite auf andere verteilen möchte. Die Verschlüsselung des Kaos Cubes ist auf Cjdns aufgebaut. Das bedeutet, dass an Stelle von IPs öffentliche Schlüssel die "Identität" der Nutzer darstellen. Daher ist der gesamte Datenverkehr des Netzwerkes der Cubes standardmäßig Onion verschlüsselt. Das Prinzip von Tor, beziehungsweise das, was als Darknet bezeichnet wird. +

+ Mehr +
+
+ +

SomeThing

+

Hier noch mehr über den cube. Mit Link

+ Mehr +
+
+ +{%endblock content%} \ No newline at end of file diff --git a/templates/nav.html.tera b/templates/nav.html.tera index 7d968dc..e1a5a7c 100644 --- a/templates/nav.html.tera +++ b/templates/nav.html.tera @@ -32,8 +32,8 @@ - -
-

Wohn Machine

+

Wohn-Machine

Eine Maschine nutzt Energie um Arbeiten zu verrichten. Unsere Wohnmaschinen nutzen erneurbare Energien um Strom bereitzustellen. Bauteile der Maschinen sind Materialien, die in großer Anzahl verfügbar sind. Materialien die ohne - oder für wenig Geld zu haben sind. diff --git a/templates/oil.html.tera b/templates/oil.html.tera new file mode 100644 index 0000000..5a017df --- /dev/null +++ b/templates/oil.html.tera @@ -0,0 +1,40 @@ +{%extends "base"%} +{%block title %} Cannabinieri | {{ title[8] }} {%endblock title %} +{%block head%} +{{super()}} +{# Fix inheritance issues 404 #} + + + + +{%endblock head%} +{%block content%} +

+
+ +

CBD Öle

+

Wir möchten unabhängige und nachhaltige Systeme kreieren in denen ein Leben komplett ohne den Anschluss an Versorgungsysteme möglich ist. + Mit erneuerbaren Energien, Wissen über recycling von Müll und legale Fallen ist das möglich. + +

+
+
+ +

Unser erstes Experiment

+

+ Eine Maschine nutzt Energie um Arbeiten zu verrichten. Unsere Wohnmaschinen nutzen erneurbare Energien um Strom bereitzustellen. + Bauteile der Maschinen sind Materialien, die in großer Anzahl verfügbar sind. Materialien die ohne - oder für wenig Geld zu haben sind. + Durch die Verwendung bauen wir lebendige unabhängige und individuelle Maschinen, die einfach nach- und auszubauen sind. + Wenn es um bauen geht stellt sich immer die Frage nach dem Grund, wem gehört er, wann kann ich ihn mir nehmen. + Mit unseren Wohnmaschinen erforschen wir verschiedene Konzepte, immer mit dem Ziel eine lebendige Maschine zu bauen, die sich selbst versorgt. +

+
+
+ +

Herstellung

+

Jede Solaranlage hat Probleme mit der Überproduktion von Strom. Sobald die Recycling Stromspeicher voll sind, geht Energie verloren. Diese Energie nutzen wir zum verifizieren von Transaktionen. Transaktionen von Krypto Währungen. Dabei sehen wir vor allem Monero und Etherium als nützlich an. Etherium Token sind einfach zu Coden. ETH Token als Bestandteil des KaosCubes um mit Contracts den automatischen Tausch von Währung gegen Bandbreite zu gewährleisten. Auch der geringe Ressourcen Verbrauch durch Proof of Stake ist dabei ein Argument für diese Währung. + Monero wird die Grundlage eines sicheren Transaktionssystems innerhalb der Kooperativen. Zusätzlich ist der Mining Algorithmus so aufgebaut, dass er Unrentabilität für große Mining Farmen verspricht. +

+
+
+{%endblock content%} \ No newline at end of file diff --git a/templates/spider.html.tera b/templates/spider.html.tera index fc65c88..c9f8e3e 100644 --- a/templates/spider.html.tera +++ b/templates/spider.html.tera @@ -15,7 +15,7 @@ Die Kommunikation zwischen den Spinnen funktioniert dezentral über das Tor Netzwerk des Kaos Cubes.

-
+

Spider Pi

SpiderPi ist Raspberry-Pi betriebener Roboter. Er führt Programme in Python aus und hat eine eingebaute Kamera, über die er in der Lage ist einfache Object Detection auszuführen. @@ -23,13 +23,12 @@ Unsere Vision ist es einen bezahlbaren Gartenroboter zu entwickeln, der, während er die Gartenarbeit erledigt, Daten über alle für Pflanzen wichtigen Faktoren sammelt. Es liegt noch viel Arbeit vor uns. Dafür brauchen wir deine Unterstützung.

- Mehr
-
+

PermApp

In der PermApp werden die Informationen der Wechselwirkungen ökologischer Entitäten gespeichert. Und visualisiert. Durch Rating kommen die besten Systeme an die Oberfläche. Am Ende werden die besten Netze miteinander kombiniert.

- Mehr + Code
{%endblock content%} \ No newline at end of file diff --git a/templates/thanks.html.tera b/templates/thanks.html.tera new file mode 100644 index 0000000..c7f06db --- /dev/null +++ b/templates/thanks.html.tera @@ -0,0 +1,17 @@ +{%extends "base"%} +{%block title %} Cannabinieri | {{ title[0] }} {%endblock title %} +{%block head%} +{{super()}} + + + + +{%endblock head%} +{%block content%} +
+

{{message[0]}}

+

Wir melden uns schnellstmöglich bei dir.

+Back Home +
+ +{%endblock content%} \ No newline at end of file