diff --git a/docs/todo.todo b/docs/todo.todo
index 416480a..e0f26dc 100644
--- a/docs/todo.todo
+++ b/docs/todo.todo
@@ -1,32 +1,13 @@
-ToDo:
- ☐ push to gh pages
- ☐ document div with background instead of img
- ☐ document vite importing assets
- ☐ importing an image
- ☐ fix link to homepage (loading into new tab)
- ☐ doc this
- ☐ create interface under models.ts for production-chains.ts
- ☐ use v-for to loop over object
-Notes:
-
-watchEffect(() => {
- if (mermaidGraph.value != null) {
- mermaid.render(
- 'test',
- "flowchart LR; Wood((
1
))-->Icon((1
)); classDef mermaid-height height:50px; class Wood mermaid-height",
- (svgCode: string) => {
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- mermaidGraph.value!.innerHTML = svgCode;
- }
- );
- } else {
- console.log('null value');
- }
- });
-
- .timber-icon {
- background: no-repeat center/100% url('../assets/annoIcons/Timber.webp');
- width: 40px;
- height: 40px;
- }
+Archive:
+✘ push to gh pages @cancelled(22-09-25 22:01) @project(ToDo)
+✔ document div with background instead of img @done(22-09-25 21:08) @project(ToDo)
+✔ document vite importing assets @done(22-09-25 21:04) @project(ToDo)
+✔ importing an image @done(22-09-25 21:04) @project(ToDo)
+✔ fix link to homepage (loading into new tab) @done(22-09-25 22:01) @project(ToDo)
+✘ doc this @cancelled(22-09-25 22:01) @project(ToDo)
+✔ create interface under models.ts for production-chains.ts @done(22-09-25 20:36) @project(ToDo)
+✔ use v-for to loop over object @done(22-09-25 20:36) @project(ToDo)
+✔ aliases for vite @done(22-09-25 20:58) @project(ToDo)
+✔ filename cases @done(22-09-25 20:59) @project(ToDo)
+✔ custom fonts (google font) @done(22-09-25 21:04) @project(ToDo)
diff --git a/src/App.vue b/src/App.vue
index f661c02..adcbf06 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/src/assets/fonts/rubik/rubik-v21-latin-300.eot b/src/assets/fonts/rubik/rubik-v21-latin-300.eot
new file mode 100644
index 0000000..6b404ef
Binary files /dev/null and b/src/assets/fonts/rubik/rubik-v21-latin-300.eot differ
diff --git a/src/assets/fonts/rubik/rubik-v21-latin-300.svg b/src/assets/fonts/rubik/rubik-v21-latin-300.svg
new file mode 100644
index 0000000..32ef9d3
--- /dev/null
+++ b/src/assets/fonts/rubik/rubik-v21-latin-300.svg
@@ -0,0 +1,453 @@
+
+
+
diff --git a/src/assets/fonts/rubik/rubik-v21-latin-300.ttf b/src/assets/fonts/rubik/rubik-v21-latin-300.ttf
new file mode 100644
index 0000000..6185a4b
Binary files /dev/null and b/src/assets/fonts/rubik/rubik-v21-latin-300.ttf differ
diff --git a/src/assets/fonts/rubik/rubik-v21-latin-300.woff b/src/assets/fonts/rubik/rubik-v21-latin-300.woff
new file mode 100644
index 0000000..c9028e2
Binary files /dev/null and b/src/assets/fonts/rubik/rubik-v21-latin-300.woff differ
diff --git a/src/assets/fonts/rubik/rubik-v21-latin-300.woff2 b/src/assets/fonts/rubik/rubik-v21-latin-300.woff2
new file mode 100644
index 0000000..73bb0a7
Binary files /dev/null and b/src/assets/fonts/rubik/rubik-v21-latin-300.woff2 differ
diff --git a/src/assets/fonts/rubik/rubik-v21-latin-600.eot b/src/assets/fonts/rubik/rubik-v21-latin-600.eot
new file mode 100644
index 0000000..6ed2349
Binary files /dev/null and b/src/assets/fonts/rubik/rubik-v21-latin-600.eot differ
diff --git a/src/assets/fonts/rubik/rubik-v21-latin-600.svg b/src/assets/fonts/rubik/rubik-v21-latin-600.svg
new file mode 100644
index 0000000..1b374d4
--- /dev/null
+++ b/src/assets/fonts/rubik/rubik-v21-latin-600.svg
@@ -0,0 +1,456 @@
+
+
+
diff --git a/src/assets/fonts/rubik/rubik-v21-latin-600.ttf b/src/assets/fonts/rubik/rubik-v21-latin-600.ttf
new file mode 100644
index 0000000..b44e477
Binary files /dev/null and b/src/assets/fonts/rubik/rubik-v21-latin-600.ttf differ
diff --git a/src/assets/fonts/rubik/rubik-v21-latin-600.woff b/src/assets/fonts/rubik/rubik-v21-latin-600.woff
new file mode 100644
index 0000000..fa7e648
Binary files /dev/null and b/src/assets/fonts/rubik/rubik-v21-latin-600.woff differ
diff --git a/src/assets/fonts/rubik/rubik-v21-latin-600.woff2 b/src/assets/fonts/rubik/rubik-v21-latin-600.woff2
new file mode 100644
index 0000000..be3bd15
Binary files /dev/null and b/src/assets/fonts/rubik/rubik-v21-latin-600.woff2 differ
diff --git a/src/assets/fonts/rubik/rubik-v21-latin-700.eot b/src/assets/fonts/rubik/rubik-v21-latin-700.eot
new file mode 100644
index 0000000..e59ffbf
Binary files /dev/null and b/src/assets/fonts/rubik/rubik-v21-latin-700.eot differ
diff --git a/src/assets/fonts/rubik/rubik-v21-latin-700.svg b/src/assets/fonts/rubik/rubik-v21-latin-700.svg
new file mode 100644
index 0000000..fc14e0b
--- /dev/null
+++ b/src/assets/fonts/rubik/rubik-v21-latin-700.svg
@@ -0,0 +1,456 @@
+
+
+
diff --git a/src/assets/fonts/rubik/rubik-v21-latin-700.ttf b/src/assets/fonts/rubik/rubik-v21-latin-700.ttf
new file mode 100644
index 0000000..d60e649
Binary files /dev/null and b/src/assets/fonts/rubik/rubik-v21-latin-700.ttf differ
diff --git a/src/assets/fonts/rubik/rubik-v21-latin-700.woff b/src/assets/fonts/rubik/rubik-v21-latin-700.woff
new file mode 100644
index 0000000..94a6c3c
Binary files /dev/null and b/src/assets/fonts/rubik/rubik-v21-latin-700.woff differ
diff --git a/src/assets/fonts/rubik/rubik-v21-latin-700.woff2 b/src/assets/fonts/rubik/rubik-v21-latin-700.woff2
new file mode 100644
index 0000000..53f3bdd
Binary files /dev/null and b/src/assets/fonts/rubik/rubik-v21-latin-700.woff2 differ
diff --git a/src/assets/fonts/rubik/rubik-v21-latin-800.eot b/src/assets/fonts/rubik/rubik-v21-latin-800.eot
new file mode 100644
index 0000000..53281e8
Binary files /dev/null and b/src/assets/fonts/rubik/rubik-v21-latin-800.eot differ
diff --git a/src/assets/fonts/rubik/rubik-v21-latin-800.svg b/src/assets/fonts/rubik/rubik-v21-latin-800.svg
new file mode 100644
index 0000000..42d108c
--- /dev/null
+++ b/src/assets/fonts/rubik/rubik-v21-latin-800.svg
@@ -0,0 +1,457 @@
+
+
+
diff --git a/src/assets/fonts/rubik/rubik-v21-latin-800.ttf b/src/assets/fonts/rubik/rubik-v21-latin-800.ttf
new file mode 100644
index 0000000..6fe9564
Binary files /dev/null and b/src/assets/fonts/rubik/rubik-v21-latin-800.ttf differ
diff --git a/src/assets/fonts/rubik/rubik-v21-latin-800.woff b/src/assets/fonts/rubik/rubik-v21-latin-800.woff
new file mode 100644
index 0000000..98c4552
Binary files /dev/null and b/src/assets/fonts/rubik/rubik-v21-latin-800.woff differ
diff --git a/src/assets/fonts/rubik/rubik-v21-latin-800.woff2 b/src/assets/fonts/rubik/rubik-v21-latin-800.woff2
new file mode 100644
index 0000000..78ce11d
Binary files /dev/null and b/src/assets/fonts/rubik/rubik-v21-latin-800.woff2 differ
diff --git a/src/assets/fonts/rubik/rubik-v21-latin-regular.eot b/src/assets/fonts/rubik/rubik-v21-latin-regular.eot
new file mode 100644
index 0000000..f125730
Binary files /dev/null and b/src/assets/fonts/rubik/rubik-v21-latin-regular.eot differ
diff --git a/src/assets/fonts/rubik/rubik-v21-latin-regular.svg b/src/assets/fonts/rubik/rubik-v21-latin-regular.svg
new file mode 100644
index 0000000..8f46548
--- /dev/null
+++ b/src/assets/fonts/rubik/rubik-v21-latin-regular.svg
@@ -0,0 +1,453 @@
+
+
+
diff --git a/src/assets/fonts/rubik/rubik-v21-latin-regular.ttf b/src/assets/fonts/rubik/rubik-v21-latin-regular.ttf
new file mode 100644
index 0000000..63380ab
Binary files /dev/null and b/src/assets/fonts/rubik/rubik-v21-latin-regular.ttf differ
diff --git a/src/assets/fonts/rubik/rubik-v21-latin-regular.woff b/src/assets/fonts/rubik/rubik-v21-latin-regular.woff
new file mode 100644
index 0000000..bf23d68
Binary files /dev/null and b/src/assets/fonts/rubik/rubik-v21-latin-regular.woff differ
diff --git a/src/assets/fonts/rubik/rubik-v21-latin-regular.woff2 b/src/assets/fonts/rubik/rubik-v21-latin-regular.woff2
new file mode 100644
index 0000000..3379519
Binary files /dev/null and b/src/assets/fonts/rubik/rubik-v21-latin-regular.woff2 differ
diff --git a/src/components/DiagramRenderer.vue b/src/components/DiagramRenderer.vue
index 0ee842b..8a4ef10 100644
--- a/src/components/DiagramRenderer.vue
+++ b/src/components/DiagramRenderer.vue
@@ -50,6 +50,7 @@ onMounted(() => {
flex: 1 0 100% !important;
width: 0 !important;
}
+
$x: 5;
@for $i from 1 through ($x - 1) {
diff --git a/src/components/EssentialLink.vue b/src/components/EssentialLink.vue
index 13205c2..05ca4b3 100644
--- a/src/components/EssentialLink.vue
+++ b/src/components/EssentialLink.vue
@@ -1,14 +1,6 @@
-
-
+
+
@@ -29,6 +21,13 @@ export interface EssentialLinkProps {
withDefaults(defineProps(), {
caption: '',
link: '#',
- icon: '',
+ icon: ''
});
+
+
diff --git a/src/components/ExampleComponent.vue b/src/components/ExampleComponent.vue
deleted file mode 100644
index bc03c3d..0000000
--- a/src/components/ExampleComponent.vue
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
{{ title }}
-
- -
- {{ todo.id }} - {{ todo.content }}
-
-
-
Count: {{ todoCount }} / {{ meta.totalCount }}
-
Active: {{ active ? 'yes' : 'no' }}
-
Clicks on todos: {{ clickCount }}
-
-
-
-
diff --git a/src/components/production-chains.ts b/src/components/production-chains.ts
index 42017c6..cbbee57 100644
--- a/src/components/production-chains.ts
+++ b/src/components/production-chains.ts
@@ -1,132 +1,132 @@
import { TieredProductionChain } from './models';
// Icons
-import lightningIcon from '../assets/annoIcons/Lightning.png';
+import lightningIcon from 'assets/annoIcons/Lightning.png';
// Building Materials
-import woodIcon from '../assets/annoIcons/Wood.webp';
-import timberIcon from '../assets/annoIcons/Timber.webp';
-import clayIcon from '../assets/annoIcons/Clay.webp';
-import bricksIcon from '../assets/annoIcons/Bricks.webp';
-import charcoalKilnIcon from '../assets/annoIcons/Charcoal_kiln.webp';
-import coalIcon from '../assets/annoIcons/Coal.webp';
-import ironIcon from '../assets/annoIcons/Iron.webp';
-import steelIcon from '../assets/annoIcons/Steel.webp';
-import steelBeamsIcon from '../assets/annoIcons/Steel_beams.webp';
-import sandIcon from '../assets/annoIcons/Quartz_sand.webp';
-import glassMakersIcon from '../assets/annoIcons/Glass.webp';
-import windowMakersIcon from '../assets/annoIcons/Windows.webp';
-import cementIcon from '../assets/annoIcons/Cement.webp';
-import concreteFactory from '../assets/annoIcons/Reinforced_concrete.webp';
-import teffIcon from '../assets/annoIcons/Icon_teff_grass_0.webp';
-import mudBricksIcon from '../assets/annoIcons/Icon_mud_bricks_0.webp';
+import woodIcon from 'assets/annoIcons/Wood.webp';
+import timberIcon from 'assets/annoIcons/Timber.webp';
+import clayIcon from 'assets/annoIcons/Clay.webp';
+import bricksIcon from 'assets/annoIcons/Bricks.webp';
+import charcoalKilnIcon from 'assets/annoIcons/Charcoal_kiln.webp';
+import coalIcon from 'assets/annoIcons/Coal.webp';
+import ironIcon from 'assets/annoIcons/Iron.webp';
+import steelIcon from 'assets/annoIcons/Steel.webp';
+import steelBeamsIcon from 'assets/annoIcons/Steel_beams.webp';
+import sandIcon from 'assets/annoIcons/Quartz_sand.webp';
+import glassMakersIcon from 'assets/annoIcons/Glass.webp';
+import windowMakersIcon from 'assets/annoIcons/Windows.webp';
+import cementIcon from 'assets/annoIcons/Cement.webp';
+import concreteFactory from 'assets/annoIcons/Reinforced_concrete.webp';
+import teffIcon from 'assets/annoIcons/Icon_teff_grass_0.webp';
+import mudBricksIcon from 'assets/annoIcons/Icon_mud_bricks_0.webp';
// Farmers & Workers
-import potatoIcon from '../assets/annoIcons/Potato.webp';
-import schnappsIcon from '../assets/annoIcons/Schnapps.webp';
-import woolIcon from '../assets/annoIcons/Wool.webp';
-import workClothesIcon from '../assets/annoIcons/Work_clothes.webp';
-import pigIcon from '../assets/annoIcons/Pigs.webp';
-import sausageIcon from '../assets/annoIcons/Sausages.webp';
-import grainIcon from '../assets/annoIcons/Grain.webp';
-import flourIcon from '../assets/annoIcons/Flour.webp';
-import breadIcon from '../assets/annoIcons/Bread.webp';
-import pigsIcon from '../assets/annoIcons/Pigs.webp';
-import tallowIcon from '../assets/annoIcons/Tallow.webp';
-import soapIcon from '../assets/annoIcons/Soap.webp';
-import breweryIcon from '../assets/annoIcons/Beer.webp';
-import malthouseIcon from '../assets/annoIcons/Malt.webp';
-import hopFarmIcon from '../assets/annoIcons/Hops.webp';
-import sailmakersIcon from '../assets/annoIcons/Sails.webp';
+import potatoIcon from 'assets/annoIcons/Potato.webp';
+import schnappsIcon from 'assets/annoIcons/Schnapps.webp';
+import woolIcon from 'assets/annoIcons/Wool.webp';
+import workClothesIcon from 'assets/annoIcons/Work_clothes.webp';
+import pigIcon from 'assets/annoIcons/Pigs.webp';
+import sausageIcon from 'assets/annoIcons/Sausages.webp';
+import grainIcon from 'assets/annoIcons/Grain.webp';
+import flourIcon from 'assets/annoIcons/Flour.webp';
+import breadIcon from 'assets/annoIcons/Bread.webp';
+import pigsIcon from 'assets/annoIcons/Pigs.webp';
+import tallowIcon from 'assets/annoIcons/Tallow.webp';
+import soapIcon from 'assets/annoIcons/Soap.webp';
+import breweryIcon from 'assets/annoIcons/Beer.webp';
+import malthouseIcon from 'assets/annoIcons/Malt.webp';
+import hopFarmIcon from 'assets/annoIcons/Hops.webp';
+import sailmakersIcon from 'assets/annoIcons/Sails.webp';
// Artisans
-import beefIcon from '../assets/annoIcons/Beef.webp';
-import redPeppersIcon from '../assets/annoIcons/Red_peppers.webp';
-import artisnalKitchenIcon from '../assets/annoIcons/Goulash.webp';
-import cannedFoodIcon from '../assets/annoIcons/Canned_food.webp';
-import sewingMachinesIcon from '../assets/annoIcons/Sewing_machines.webp';
-import fursIcon from '../assets/annoIcons/Furs.webp';
-import furCoatsIcon from '../assets/annoIcons/Fur_Coats.webp';
-import sugarCaneIcon from '../assets/annoIcons/Sugar_cane.webp';
-import rumIcon from '../assets/annoIcons/Rum.webp';
+import beefIcon from 'assets/annoIcons/Beef.webp';
+import redPeppersIcon from 'assets/annoIcons/Red_peppers.webp';
+import artisnalKitchenIcon from 'assets/annoIcons/Goulash.webp';
+import cannedFoodIcon from 'assets/annoIcons/Canned_food.webp';
+import sewingMachinesIcon from 'assets/annoIcons/Sewing_machines.webp';
+import fursIcon from 'assets/annoIcons/Furs.webp';
+import furCoatsIcon from 'assets/annoIcons/Fur_Coats.webp';
+import sugarCaneIcon from 'assets/annoIcons/Sugar_cane.webp';
+import rumIcon from 'assets/annoIcons/Rum.webp';
// Engineers
-import copperIcon from '../assets/annoIcons/Copper.webp';
-import zincIcon from '../assets/annoIcons/Zinc.webp';
-import brassIcon from '../assets/annoIcons/Brass.webp';
-import glassesIcon from '../assets/annoIcons/Glasses.webp';
-import caoutchoucIcon from '../assets/annoIcons/Caoutchouc.webp';
-import highWheelerIcon from '../assets/annoIcons/High_wheeler.webp';
-import goldOreIcon from '../assets/annoIcons/Gold_Ore.webp';
-import goldIcon from '../assets/annoIcons/Gold.webp';
-import pocketWatchesIcon from '../assets/annoIcons/Pocket_watch.webp';
-import filamentIcon from '../assets/annoIcons/Carbon_filament.webp';
-import lightBulbIcon from '../assets/annoIcons/Light_bulb.webp';
+import copperIcon from 'assets/annoIcons/Copper.webp';
+import zincIcon from 'assets/annoIcons/Zinc.webp';
+import brassIcon from 'assets/annoIcons/Brass.webp';
+import glassesIcon from 'assets/annoIcons/Glasses.webp';
+import caoutchoucIcon from 'assets/annoIcons/Caoutchouc.webp';
+import highWheelerIcon from 'assets/annoIcons/High_wheeler.webp';
+import goldOreIcon from 'assets/annoIcons/Gold_Ore.webp';
+import goldIcon from 'assets/annoIcons/Gold.webp';
+import pocketWatchesIcon from 'assets/annoIcons/Pocket_watch.webp';
+import filamentIcon from 'assets/annoIcons/Carbon_filament.webp';
+import lightBulbIcon from 'assets/annoIcons/Light_bulb.webp';
// Investors
-import grapesIcon from '../assets/annoIcons/Grapes.webp';
-import champagneIcon from '../assets/annoIcons/Champagne.webp';
-import pearlsIcon from '../assets/annoIcons/Pearls.webp';
-import jewelryIcon from '../assets/annoIcons/Jewelry.webp';
-import gramophoneIcon from '../assets/annoIcons/Gramophone.webp';
+import grapesIcon from 'assets/annoIcons/Grapes.webp';
+import champagneIcon from 'assets/annoIcons/Champagne.webp';
+import pearlsIcon from 'assets/annoIcons/Pearls.webp';
+import jewelryIcon from 'assets/annoIcons/Jewelry.webp';
+import gramophoneIcon from 'assets/annoIcons/Gramophone.webp';
// Jornaleros & Obreros
-import cottonIcon from '../assets/annoIcons/Cotton.webp';
-import cottonMillIcon from '../assets/annoIcons/Cotton_fabric.webp';
-import plantainPlantationIcon from '../assets/annoIcons/Plantains.webp';
-import fishOilIcon from '../assets/annoIcons/Fish_Oil.webp';
-import friedPlantainsIcon from '../assets/annoIcons/Fried_plantains.webp';
-import alpacaWoolIcon from '../assets/annoIcons/Alpaca_wool.webp';
-import ponchosIcon from '../assets/annoIcons/Poncho.webp';
-import cornIcon from '../assets/annoIcons/Corn.webp';
-import tortillasIcon from '../assets/annoIcons/Tortilla.webp';
-import coffeeBeansIcon from '../assets/annoIcons/Coffee_beans.webp';
-import coffeeIcon from '../assets/annoIcons/Coffee.webp';
-import feltIcon from '../assets/annoIcons/Felt.webp';
-import bowlerHatsIcon from '../assets/annoIcons/Bowler_hats.webp';
-import woodVeneersIcon from '../assets/annoIcons/Wood_veneers.webp';
-import tobaccoIcon from '../assets/annoIcons/Tobacco.webp';
-import cigarIcon from '../assets/annoIcons/Cigars.webp';
-import sugarIcon from '../assets/annoIcons/Sugar.webp';
-import cocoaIcon from '../assets/annoIcons/Cocoa.webp';
-import chocolateIcon from '../assets/annoIcons/Chocolate.webp';
+import cottonIcon from 'assets/annoIcons/Cotton.webp';
+import cottonMillIcon from 'assets/annoIcons/Cotton_fabric.webp';
+import plantainPlantationIcon from 'assets/annoIcons/Plantains.webp';
+import fishOilIcon from 'assets/annoIcons/Fish_Oil.webp';
+import friedPlantainsIcon from 'assets/annoIcons/Fried_plantains.webp';
+import alpacaWoolIcon from 'assets/annoIcons/Alpaca_wool.webp';
+import ponchosIcon from 'assets/annoIcons/Poncho.webp';
+import cornIcon from 'assets/annoIcons/Corn.webp';
+import tortillasIcon from 'assets/annoIcons/Tortilla.webp';
+import coffeeBeansIcon from 'assets/annoIcons/Coffee_beans.webp';
+import coffeeIcon from 'assets/annoIcons/Coffee.webp';
+import feltIcon from 'assets/annoIcons/Felt.webp';
+import bowlerHatsIcon from 'assets/annoIcons/Bowler_hats.webp';
+import woodVeneersIcon from 'assets/annoIcons/Wood_veneers.webp';
+import tobaccoIcon from 'assets/annoIcons/Tobacco.webp';
+import cigarIcon from 'assets/annoIcons/Cigars.webp';
+import sugarIcon from 'assets/annoIcons/Sugar.webp';
+import cocoaIcon from 'assets/annoIcons/Cocoa.webp';
+import chocolateIcon from 'assets/annoIcons/Chocolate.webp';
// Explorers
-import whalingIcon from '../assets/annoIcons/Whaling_Station.webp';
-import caribouIcon from '../assets/annoIcons/Caribou_Hunting_Cabin.webp';
-import pemmicanIcon from '../assets/annoIcons/Pemmican_Cookhouse.webp';
-import sealIcon from '../assets/annoIcons/Seal_Hunting_Docks.webp';
-import gooseIcon from '../assets/annoIcons/Goose_Farm.webp';
-import sleepingBagIcon from '../assets/annoIcons/Sleeping_Bag_Factory.webp';
-import oilLampIcon from '../assets/annoIcons/Oil_Lamp_Factory.webp';
+import whalingIcon from 'assets/annoIcons/Whaling_Station.webp';
+import caribouIcon from 'assets/annoIcons/Caribou_Hunting_Cabin.webp';
+import pemmicanIcon from 'assets/annoIcons/Pemmican_Cookhouse.webp';
+import sealIcon from 'assets/annoIcons/Seal_Hunting_Docks.webp';
+import gooseIcon from 'assets/annoIcons/Goose_Farm.webp';
+import sleepingBagIcon from 'assets/annoIcons/Sleeping_Bag_Factory.webp';
+import oilLampIcon from 'assets/annoIcons/Oil_Lamp_Factory.webp';
// Technicians
-import bearIcon from '../assets/annoIcons/Bear_Hunting_Cabin.webp';
-import parkasIcon from '../assets/annoIcons/Parka_Factory.webp';
-import sledFrameIcon from '../assets/annoIcons/Sled_Frame_Factory.webp';
-import huskyIcon from '../assets/annoIcons/Husky_Farm.webp';
-import huskySledIcon from '../assets/annoIcons/Husky_Sled_Factory.webp';
+import bearIcon from 'assets/annoIcons/Bear_Hunting_Cabin.webp';
+import parkasIcon from 'assets/annoIcons/Parka_Factory.webp';
+import sledFrameIcon from 'assets/annoIcons/Sled_Frame_Factory.webp';
+import huskyIcon from 'assets/annoIcons/Husky_Farm.webp';
+import huskySledIcon from 'assets/annoIcons/Husky_Sled_Factory.webp';
// Shepherds
-import linseedIcon from '../assets/annoIcons/Icon_linen_farm_0.webp';
-import linenIcon from '../assets/annoIcons/Icon_linen_fabric_0.webp';
-import embroidererIcon from '../assets/annoIcons/Icon_traditional_clothing_0.webp';
-import saltIcon from '../assets/annoIcons/Salt.webp';
-import sangaIcon from '../assets/annoIcons/Icon_watusi_0.webp';
-import dryHouseIcon from '../assets/annoIcons/Icon_dried_meat_0.webp';
-import hibiscusFarmIcon from '../assets/annoIcons/Icon_hibiscus_farm_0.webp';
-import hibiscusTeaIcon from '../assets/annoIcons/Icon_hibiscus_tea_0.webp';
+import linseedIcon from 'assets/annoIcons/Icon_linen_farm_0.webp';
+import linenIcon from 'assets/annoIcons/Icon_linen_fabric_0.webp';
+import embroidererIcon from 'assets/annoIcons/Icon_traditional_clothing_0.webp';
+import saltIcon from 'assets/annoIcons/Salt.webp';
+import sangaIcon from 'assets/annoIcons/Icon_watusi_0.webp';
+import dryHouseIcon from 'assets/annoIcons/Icon_dried_meat_0.webp';
+import hibiscusFarmIcon from 'assets/annoIcons/Icon_hibiscus_farm_0.webp';
+import hibiscusTeaIcon from 'assets/annoIcons/Icon_hibiscus_tea_0.webp';
// Weapons
-import weaponsIcon from '../assets/annoIcons/Weapons.webp';
-import saltpeterIcon from '../assets/annoIcons/Saltpeter.webp';
-import dynamiteIcon from '../assets/annoIcons/Dynamite.webp';
-import heavyWeaponsIcon from '../assets/annoIcons/Advanced_weapons.webp';
+import weaponsIcon from 'assets/annoIcons/Weapons.webp';
+import saltpeterIcon from 'assets/annoIcons/Saltpeter.webp';
+import dynamiteIcon from 'assets/annoIcons/Dynamite.webp';
+import heavyWeaponsIcon from 'assets/annoIcons/Advanced_weapons.webp';
// Machinery
-import steamMotorsIcon from '../assets/annoIcons/Steam_motors.webp';
-import coachMakersIcon from '../assets/annoIcons/Chassis.webp';
-import steamCarriagesIcon from '../assets/annoIcons/Steam_carriages.webp';
+import steamMotorsIcon from 'assets/annoIcons/Steam_motors.webp';
+import coachMakersIcon from 'assets/annoIcons/Chassis.webp';
+import steamCarriagesIcon from 'assets/annoIcons/Steam_carriages.webp';
// Production Chains
export const productionChains: TieredProductionChain[] = [
diff --git a/src/css/app.scss b/src/css/app.scss
index 8043f0a..9fe2668 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -1,4 +1,5 @@
// app global css in SCSS form
+@import 'src/css/rubik-font.scss';
@font-face {
font-family: Soleil;
@@ -24,13 +25,13 @@
}
.toolbar-background {
- background-color: #8f6c40;
+ background-color: $burnt-dark;
}
.page-background {
- background-color: #fff1d1;
+ background-color: $burnt;
}
.card-background {
- background-color: #fbf1dc;
+ background-color: $burnt-light;
}
diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss
index eae5779..331f28d 100644
--- a/src/css/quasar.variables.scss
+++ b/src/css/quasar.variables.scss
@@ -18,7 +18,6 @@ $accent: #9c27b0;
$dark: #1d1d1d;
$dark-page: #121212;
-
$positive: #21ba45;
$negative: #c10015;
$info: #31ccec;
@@ -28,3 +27,5 @@ $off-black: #2e3f4e;
$burnt-dark: #8f6c40;
$burnt: #fff1d1;
$burnt-light: #fbf1dc;
+
+$typography-font-family: 'Rubik';
diff --git a/src/css/rubik-font.scss b/src/css/rubik-font.scss
new file mode 100644
index 0000000..fd43f05
--- /dev/null
+++ b/src/css/rubik-font.scss
@@ -0,0 +1,90 @@
+/* rubik-300 - latin */
+@font-face {
+ font-family: 'Rubik';
+ font-style: normal;
+ font-weight: 300;
+ src: url('assets/fonts/rubik/rubik-v21-latin-300.eot'); /* IE9 Compat Modes */
+ src: local(''),
+ url('assets/fonts/rubik/rubik-v21-latin-300.eot?#iefix')
+ format('embedded-opentype'),
+ /* IE6-IE8 */ url('assets/fonts/rubik/rubik-v21-latin-300.woff2')
+ format('woff2'),
+ /* Super Modern Browsers */
+ url('assets/fonts/rubik/rubik-v21-latin-300.woff') format('woff'),
+ /* Modern Browsers */ url('assets/fonts/rubik/rubik-v21-latin-300.ttf')
+ format('truetype'),
+ /* Safari, Android, iOS */
+ url('assets/fonts/rubik/rubik-v21-latin-300.svg#Rubik') format('svg'); /* Legacy iOS */
+}
+/* rubik-regular - latin */
+@font-face {
+ font-family: 'Rubik';
+ font-style: normal;
+ font-weight: 400;
+ src: url('assets/fonts/rubik/rubik-v21-latin-regular.eot'); /* IE9 Compat Modes */
+ src: local(''),
+ url('assets/fonts/rubik/rubik-v21-latin-regular.eot?#iefix')
+ format('embedded-opentype'),
+ /* IE6-IE8 */ url('assets/fonts/rubik/rubik-v21-latin-regular.woff2')
+ format('woff2'),
+ /* Super Modern Browsers */
+ url('assets/fonts/rubik/rubik-v21-latin-regular.woff') format('woff'),
+ /* Modern Browsers */ url('assets/fonts/rubik/rubik-v21-latin-regular.ttf')
+ format('truetype'),
+ /* Safari, Android, iOS */
+ url('assets/fonts/rubik/rubik-v21-latin-regular.svg#Rubik') format('svg'); /* Legacy iOS */
+}
+/* rubik-600 - latin */
+@font-face {
+ font-family: 'Rubik';
+ font-style: normal;
+ font-weight: 600;
+ src: url('assets/fonts/rubik/rubik-v21-latin-600.eot'); /* IE9 Compat Modes */
+ src: local(''),
+ url('assets/fonts/rubik/rubik-v21-latin-600.eot?#iefix')
+ format('embedded-opentype'),
+ /* IE6-IE8 */ url('assets/fonts/rubik/rubik-v21-latin-600.woff2')
+ format('woff2'),
+ /* Super Modern Browsers */
+ url('assets/fonts/rubik/rubik-v21-latin-600.woff') format('woff'),
+ /* Modern Browsers */ url('assets/fonts/rubik/rubik-v21-latin-600.ttf')
+ format('truetype'),
+ /* Safari, Android, iOS */
+ url('assets/fonts/rubik/rubik-v21-latin-600.svg#Rubik') format('svg'); /* Legacy iOS */
+}
+/* rubik-700 - latin */
+@font-face {
+ font-family: 'Rubik';
+ font-style: normal;
+ font-weight: 700;
+ src: url('assets/fonts/rubik/rubik-v21-latin-700.eot'); /* IE9 Compat Modes */
+ src: local(''),
+ url('assets/fonts/rubik/rubik-v21-latin-700.eot?#iefix')
+ format('embedded-opentype'),
+ /* IE6-IE8 */ url('assets/fonts/rubik/rubik-v21-latin-700.woff2')
+ format('woff2'),
+ /* Super Modern Browsers */
+ url('assets/fonts/rubik/rubik-v21-latin-700.woff') format('woff'),
+ /* Modern Browsers */ url('assets/fonts/rubik/rubik-v21-latin-700.ttf')
+ format('truetype'),
+ /* Safari, Android, iOS */
+ url('assets/fonts/rubik/rubik-v21-latin-700.svg#Rubik') format('svg'); /* Legacy iOS */
+}
+/* rubik-800 - latin */
+@font-face {
+ font-family: 'Rubik';
+ font-style: normal;
+ font-weight: 800;
+ src: url('assets/fonts/rubik/rubik-v21-latin-800.eot'); /* IE9 Compat Modes */
+ src: local(''),
+ url('assets/fonts/rubik/rubik-v21-latin-800.eot?#iefix')
+ format('embedded-opentype'),
+ /* IE6-IE8 */ url('assets/fonts/rubik/rubik-v21-latin-800.woff2')
+ format('woff2'),
+ /* Super Modern Browsers */
+ url('assets/fonts/rubik/rubik-v21-latin-800.woff') format('woff'),
+ /* Modern Browsers */ url('assets/fonts/rubik/rubik-v21-latin-800.ttf')
+ format('truetype'),
+ /* Safari, Android, iOS */
+ url('assets/fonts/rubik/rubik-v21-latin-800.svg#Rubik') format('svg'); /* Legacy iOS */
+}
diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue
index 337b800..7b1300c 100644
--- a/src/layouts/MainLayout.vue
+++ b/src/layouts/MainLayout.vue
@@ -23,9 +23,12 @@
-
+
- Navigation
+
+ Navigation
+
+
-