diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7b256e17811380e181adf8dce4f8126e2a2748d4..c23fe8083b4539ea6d53f80b767a12319f45fbb7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,6 +9,7 @@ cache: stages: - install - build + - test install_dependencies: stage: install @@ -32,3 +33,34 @@ build_project: paths: - node_modules/ policy: pull + +vitest_unit-tests: + stage: test + script: + - npm ci + - npm run test:unit + dependencies: + - install_dependencies + cache: + key: ${CI_COMMIT_REF_SLUG} + paths: + - node_modules/ + policy: pull + +eslint_run-lint: + stage: test + script: + - npm ci + - npm run lint + dependencies: + - install_dependencies + cache: + key: ${CI_COMMIT_REF_SLUG} + paths: + - node_modules/ + policy: pull + allow_failure: true + + + + diff --git a/src/views/ShopView.vue b/src/views/ShopView.vue index 86c22ee13bdac2ab935a2bb0dce6c1712aeab55d..01db9badfb1f2b6910e809dd2465e9558c1eff23 100644 --- a/src/views/ShopView.vue +++ b/src/views/ShopView.vue @@ -5,6 +5,25 @@ </div> <div class="container"> <div class="row"> + <div class="col-md-12"> + <h1>Stash</h1> + <div class="category row justify-content-between mb-5 m-2"> + <div class="card text-center" style="width: 16rem; border: none"> + <img src="@/assets/items/adfree.png" class="card-img-top" alt="..."> + <div class="card-body"> + <h5 class="card-title">Adfree</h5> + <button type="button" class="btn btn-primary" id="buttonStyle"> +35kr</button> + </div> + </div> + <div class="card text-center" style="width: 16rem; border: none"> + <img src="@/assets/items/piggybank.webp" class="card-img-top" alt="..."> + <div class="card-body"> + <h5 class="card-title">Premium</h5> + <button type="button" class="btn btn-primary" id="buttonStyle">+50kr</button> + </div> + </div> + </div> + </div> <div class="col-md-12"> <h1>Fantacy</h1> <div class="category row justify-content-between mb-5 m-2"> @@ -66,25 +85,6 @@ </div> </div> </div> - <div class="col-md-12"> - <h1>Stash</h1> - <div class="category row justify-content-between mb-5 m-2"> - <div class="card text-center" style="width: 16rem; border: none"> - <img src="@/assets/items/adfree.png" class="card-img-top" alt="..."> - <div class="card-body"> - <h5 class="card-title">Adfree</h5> - <button type="button" class="btn btn-primary" id="buttonStyle"> +35kr</button> - </div> - </div> - <div class="card text-center" style="width: 16rem; border: none"> - <img src="@/assets/items/piggybank.webp" class="card-img-top" alt="..."> - <div class="card-body"> - <h5 class="card-title">Premium</h5> - <button type="button" class="btn btn-primary" id="buttonStyle">+50kr</button> - </div> - </div> - </div> - </div> </div> </div>