From 2600035511858780e80d9e8de084d7815e7bdd85 Mon Sep 17 00:00:00 2001 From: Adrian Amaglio Date: Fri, 26 Feb 2021 09:47:45 +0100 Subject: [PATCH] apdate --- public/index.html | 15 +++- src/App.vue | 119 ++++++++++++++++++++++++++++++-- src/components/HelloWorld.vue | 58 ---------------- src/components/Ingredients.vue | 48 +++++++++++++ src/components/MoleculeList.vue | 33 +++++++++ src/components/SegerField.vue | 43 ++++++++++++ src/data/amphoteres.js | 2 + src/data/ingredients.js | 76 ++++++++++++++++++++ src/data/oxydes_acide.js | 2 + src/data/oxydes_basique.js | 2 + src/main.js | 2 + 11 files changed, 333 insertions(+), 67 deletions(-) delete mode 100644 src/components/HelloWorld.vue create mode 100644 src/components/Ingredients.vue create mode 100644 src/components/MoleculeList.vue create mode 100644 src/components/SegerField.vue create mode 100644 src/data/amphoteres.js create mode 100644 src/data/ingredients.js create mode 100644 src/data/oxydes_acide.js create mode 100644 src/data/oxydes_basique.js diff --git a/public/index.html b/public/index.html index 3e5a139..e859c20 100644 --- a/public/index.html +++ b/public/index.html @@ -5,13 +5,22 @@ - <%= htmlWebpackPlugin.options.title %> + + SEC 2003 +

Super Émail Calculator 2003

- + diff --git a/src/App.vue b/src/App.vue index 55df315..31f5be0 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,18 +1,122 @@ @@ -25,4 +129,7 @@ export default { color: #2c3e50; margin-top: 60px; } +button { + cursor:pointer; +} diff --git a/src/components/HelloWorld.vue b/src/components/HelloWorld.vue deleted file mode 100644 index 879051a..0000000 --- a/src/components/HelloWorld.vue +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - diff --git a/src/components/Ingredients.vue b/src/components/Ingredients.vue new file mode 100644 index 0000000..2eb51b5 --- /dev/null +++ b/src/components/Ingredients.vue @@ -0,0 +1,48 @@ + + + + + diff --git a/src/components/MoleculeList.vue b/src/components/MoleculeList.vue new file mode 100644 index 0000000..bde4075 --- /dev/null +++ b/src/components/MoleculeList.vue @@ -0,0 +1,33 @@ + + + + + \ No newline at end of file diff --git a/src/components/SegerField.vue b/src/components/SegerField.vue new file mode 100644 index 0000000..699ef98 --- /dev/null +++ b/src/components/SegerField.vue @@ -0,0 +1,43 @@ + + + + + diff --git a/src/data/amphoteres.js b/src/data/amphoteres.js new file mode 100644 index 0000000..0e829e0 --- /dev/null +++ b/src/data/amphoteres.js @@ -0,0 +1,2 @@ +const amphoteres = ["a"]; +export default amphoteres; \ No newline at end of file diff --git a/src/data/ingredients.js b/src/data/ingredients.js new file mode 100644 index 0000000..119f1c2 --- /dev/null +++ b/src/data/ingredients.js @@ -0,0 +1,76 @@ +const ingredients = [ + { + "label": "Kaolin", + "id": "kaolin", + "origine": "Ceradel 2019", + "composition": [ + { + "label":"Al2O3", + "quantity": 1, + "type": "amphotere" + },{ + "label":"SiO2", + "quantity": 1, + "type": "oxyde_acide" + } + ], + "commentaire": "c'est cool", + "masse_molaire": 258 + }, + { + "label": "Syenite", + "id": "syenite", + "origine": "", + "composition": [ + { + "label":"KNaO", + "quantity": 0.4, + "type": "oxyde_basique" + },{ + "label":"Al2O3", + "quantity": 0.2, + "type": "amphotere" + },{ + "label":"SiO2", + "quantity": 3, + "type": "oxyde_acide" + } + ], + "commentaire": "c'est cool", + "masse_molaire": 120 + }, + { + "label": "Talc", + "id": "talc", + "origine": "", + "composition": [ + { + "label":"BULLSHIT 500", + "quantity": 1, + "type": "oxyde_basique" + },{ + "label":"SiO2", + "quantity": 3, + "type": "oxyde_acide" + } + ], + "commentaire": "c'est cool", + "masse_molaire": 120 + }, + { + "label": "Craie", + "id": "craie", + "origine": "", + "composition": [ + { + "label":"CAO", + "quantity": 1, + "type": "oxyde_basique" + } + ], + "commentaire": "c'est cool", + "masse_molaire": 120 + } +]; + +export default ingredients; diff --git a/src/data/oxydes_acide.js b/src/data/oxydes_acide.js new file mode 100644 index 0000000..5d1169e --- /dev/null +++ b/src/data/oxydes_acide.js @@ -0,0 +1,2 @@ +const oxydes_acide = ["a"]; +export default oxydes_acide; \ No newline at end of file diff --git a/src/data/oxydes_basique.js b/src/data/oxydes_basique.js new file mode 100644 index 0000000..1394cb6 --- /dev/null +++ b/src/data/oxydes_basique.js @@ -0,0 +1,2 @@ +const liste_oxydes_basique = ["a"]; +export default liste_oxydes_basique; \ No newline at end of file diff --git a/src/main.js b/src/main.js index 63eb05f..9ca1f12 100644 --- a/src/main.js +++ b/src/main.js @@ -6,3 +6,5 @@ Vue.config.productionTip = false new Vue({ render: h => h(App), }).$mount('#app') + +