Skip to content

Commit 5d4b061

Browse files
quinta-blipquinta-blip
committed
update link problems
1 parent 3694dd6 commit 5d4b061

File tree

13 files changed

+964
-1119
lines changed

13 files changed

+964
-1119
lines changed

‎blog.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ <h1 class="page-title__heading">Our Blog</h1>
7575

7676
<aside class="blog-aside">
7777

78-
<h2 class="blog-aside__title">Categories</h2>
78+
<h2 class="blog-aside__title">Categories</h2>
7979

8080
<ul class="blog-aside__list">
8181
<li>
@@ -94,7 +94,7 @@ <h2 class="blog-aside__title">Categories</h2>
9494
<a href="/robot" class="blog-aside__link"> Robot(24)</a>
9595
</li>
9696
<li>
97-
<a href="/lauchpad"class="blog-aside__link"> Launchpad(24)</a>
97+
<a href="/lauchpad" class="blog-aside__link"> Launchpad(24)</a>
9898
</li>
9999
<li>
100100
<a href="/crypto" class="blog-aside__link"> Crypto(430)</a>

‎package-lock.json‎

Lines changed: 763 additions & 759 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/data/blog.json‎

Lines changed: 0 additions & 66 deletions
This file was deleted.

‎src/main.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import './styles/style.scss';
2+
3+
// Import main Twig pages so Vite compiles them
4+
import './pages/index.twig'; // my main page
5+
import './templates/pages/blog.twig';

‎src/pages/blog.twig‎

Lines changed: 43 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,63 @@
1-
{% extends "layouts/base.twig" %}
1+
{% extends "src/templates/layouts/base.twig" %}
22

33
{% block title %}BINABOX Blog Page{% endblock %}
44

5-
{% block head %}
6-
<link href="https://fonts.googleapis.com/css2?family=Bakbak+One&family=Black+Han+Sans&family=Candal&family=Lalezar&family=Roboto:ital,wght@0,100..900;1,100..900&display=swap" rel="stylesheet">
7-
<link href="https://fonts.googleapis.com/css2?family=Bakbak+One&family=Black+Han+Sans&family=Candal&family=Lalezar&family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&family=Roboto:ital,wght@0,100..900;1,100..900&display=swap" rel="stylesheet">
8-
{% endblock %}
9-
105
{% block header %}
11-
{% include "partials/header.twig" %}
6+
{% include "partials/header.twig" %}
127
{% endblock %}
138

149
{% block content %}
15-
<main class="blog-page__main">
16-
<!-- Page Title Section -->
17-
<section class="page-title">
18-
<h1 class="page-title__heading">{{ page_title }}</h1>
19-
<ul class="page-title__breadcrumbs">
20-
{% for breadcrumb in breadcrumbs %}
10+
<main class="blog-page__main">
11+
<!-- Page Title Section -->
12+
<section class="page-title">
13+
<h1 class="page-title__heading">{{ page_title }}</h1>
14+
<ul class="page-title__breadcrumbs">
15+
{% for breadcrumb in breadcrumbs %}
16+
<li>
17+
<a href="{{ breadcrumb.href }}" class="breadcrumbs__link">{{ breadcrumb.text }}</a>
18+
</li>
19+
{% endfor %}
20+
</ul>
21+
</section>
22+
23+
<!-- Content Wrapper -->
24+
<div class="content-wrapper">
25+
26+
<!-- Sidebar -->
27+
<aside class="blog-aside">
28+
<h2 class="blog-aside__title">Categories</h2>
29+
<ul class="blog-aside__list">
30+
{% for category in categories %}
2131
<li>
22-
<a href="{{ breadcrumb.href }}" class="breadcrumbs__link">{{ breadcrumb.text }}</a>
32+
<a href="{{ category.href }}" class="blog-aside__link">
33+
{{ category.text }} ({{ category.count }})
34+
</a>
2335
</li>
2436
{% endfor %}
2537
</ul>
26-
</section>
2738

28-
<!-- Content Wrapper -->
29-
<div class="content-wrapper">
30-
<!-- Aside Section -->
31-
<aside class="blog-aside">
32-
<h2 class="blog-aside__title">Categories</h2>
33-
<ul class="blog-aside__list">
34-
{% for category in categories %}
35-
<li>
36-
<a href="{{ category.href }}" class="blog-aside__link">
37-
{{ category.text }} ({{ category.count }})
38-
</a>
39-
</li>
39+
<div class="blog-aside__tags">
40+
<h3 class="tags__title">Tag</h3>
41+
<ul class="tags__list">
42+
{% for tag in tags %}
43+
<li><button class="tags__btn">{{ tag }}</button></li>
4044
{% endfor %}
4145
</ul>
46+
</div>
47+
</aside>
4248

43-
<div class="blog-aside__tags">
44-
<h3 class="tags__title">Tag</h3>
45-
<ul class="tags__list">
46-
{% for tag in tags %}
47-
<li><button class="tags__btn">{{ tag }}</button></li>
48-
{% endfor %}
49-
</ul>
50-
</div>
51-
</aside>
49+
<!-- Blog Articles -->
50+
{% for article in articles %}
51+
{% include "partials/blog-article.twig" with { article: article } %}
52+
{% endfor %}
5253

53-
<!-- Blog Article Section (Partial) -->
54-
{% include 'blog-article.twig' with { article: article } %}
54+
<!-- Blog Content Blocks -->
55+
{% for content_block in content_blocks %}
56+
{% include "partials/blog-content.twig" with { content: content_block } %}
57+
{% endfor %}
5558

56-
<!-- Blog Content Section (Partial) -->
57-
{% include 'blog-content.twig' with { content: content } %}
58-
</div>
59-
</main>
59+
</div>
60+
</main>
6061
{% endblock %}
6162

6263
{% block footer %}

‎src/pages/index.twig‎

Lines changed: 100 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,113 @@
1-
{% extends "src/templates/layouts/base.twig"%}
1+
{% extends "src/templates/layouts/base.twig" %}
22

3-
{% block title %}BINABOX Home Page{% endblock %}
43

5-
{% block header %}
6-
<link href="https://fonts.googleapis.com/css2?family=Bakbak+One&family=Black+Han+Sans&family=Candal&family=Lalezar&family=Roboto:ital,wght@0,100..900;1,100..900&display=swap" rel="stylesheet">
7-
<link href="https://fonts.googleapis.com/css2?family=Bakbak+One&family=Black+Han+Sans&family=Candal&family=Lalezar&family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&family=Roboto:ital,wght@0,100..900;1,100..900&display=swap" rel="stylesheet">
8-
{% endblock %}
4+
{% block content %}
95

10-
{% block header %}
11-
{% include "partials/header.twig" %}
12-
{% endblock %}
6+
<!-- ============== BANNER ============== -->
7+
<section class="banner">
8+
<h1 class="banner__title">{{ common.site.title }}: Explore NFT Collections</h1>
9+
<p class="banner__text">{{ page.banner_text }}</p>
1310

14-
{% block content %}
15-
<main>
16-
<!-- Banner Section -->
17-
<section class="banner">
18-
<h1 class="banner__title">WITH <span class="BINABOX">BINABOX</span> EXPLORE NFT COLLECTION</h1>
19-
<p class="banner__text">{{ banner_text }}</p>
20-
<div class="banner-section">
21-
{% for stat in banner_stats %}
22-
<div class="banner-section__item">
23-
<span class="banner-section__value">{{ stat.value }}</span>
24-
<p class="banner-section__text">{{ stat.text }}</p>
25-
</div>
26-
{% endfor %}
27-
</div>
28-
<div class="banner__actions">
29-
<button class="banner__button banner__button--primary" type="button">Connect Wallet</button>
30-
<button class="banner__button banner__button--disable" type="button">Whitelist now</button>
11+
<div class="banner-section">
12+
{% for stat in page.banner_stats %}
13+
<div class="banner-section__item">
14+
<span class="banner-section__value">{{ stat.value }}</span>
15+
<p class="banner-section__text">{{ stat.text }}</p>
3116
</div>
32-
<img src="{{ banner_image }}" class="banner__image" alt="Binabox Cube">
33-
</section>
17+
{% endfor %}
18+
</div>
3419

35-
<!-- Catalog Section -->
36-
<section class="catalog">
37-
<div class="catalog__header">
38-
<h2 class="catalog__title">Catalog</h2>
39-
<button class="catalog__button catalog__button--default" type="button">see all</button>
40-
<div class="catalog__controls">
41-
<button class="catalog__button catalog__button-left" type="button" aria-label="Previous"></button>
42-
<button class="catalog__button catalog__button-right" type="button" aria-label="Next"></button>
43-
</div>
20+
<div class="banner__actions">
21+
<button class="banner__button banner__button--primary">Connect Wallet</button>
22+
<button class="banner__button banner__button--disable">Whitelist now</button>
23+
</div>
24+
25+
<img src="{{ page.banner_image }}" class="banner__image" alt="Banner Image">
26+
</section>
27+
28+
<!-- ============== CATALOG ============== -->
29+
<section class="catalog">
30+
<div class="catalog__header">
31+
<h2 class="catalog__title">Catalog</h2>
32+
<button class="catalog__button catalog__button--default">See All</button>
33+
</div>
34+
35+
<ul class="catalog__list">
36+
{% for product in page.catalog_products %}
37+
<li class="catalog__item">
38+
<article class="catalog__product">
39+
<img src="{{ product.image }}" class="catalog__image" alt="{{ product.title }}">
40+
{% if product.badge %}
41+
<span class="catalog__badge">{{ product.badge }}</span>
42+
{% endif %}
43+
<span class="catalog__value">{{ product.price }}</span>
44+
<p class="catalog__title">{{ product.title }}</p>
45+
</article>
46+
</li>
47+
{% endfor %}
48+
</ul>
49+
</section>
50+
51+
<!-- ============== BLOG ============== -->
52+
<section class="blog">
53+
<h2 class="blog__title">Our Blog</h2>
54+
{% for post in page.blog_posts %}
55+
<article class="blog__post">
56+
<img src="{{ post.image }}" class="blog__image" alt="{{ post.title }}">
57+
<div class="blog__meta">
58+
<span class="blog__subtitle">{{ post.author }}</span> |
59+
<span class="blog__date">{{ post.date }}</span>
60+
{% if post.badge %} | <span class="blog__badge">{{ post.badge }}</span>{% endif %}
4461
</div>
45-
<ul class="catalog__list">
46-
{% for product in catalog_products %}
47-
<li class="catalog__item">
48-
{% include "partials/catalog.twig" with { product: product } %}
49-
</li>
50-
{% endfor %}
51-
</ul>
52-
</section>
62+
<h3 class="blog__title">{{ post.title }}</h3>
63+
<p class="blog__description">{{ post.description }}</p>
64+
<button class="blog__btn blog__btn--read-more">Read more</button>
65+
</article>
66+
{% endfor %}
67+
</section>
5368

54-
<!-- Blog Section -->
55-
<section class="blog">
56-
<h2 class="blog__title">Our Blog</h2>
57-
{% for post in blog_posts %}
58-
{% include "partials/blog-card.twig" with { post: post }%}
69+
<!-- ============== ABOUT ============== -->
70+
<section class="about">
71+
<h2 class="about__title">About Us</h2>
72+
<p class="about__intro">{{ page.about_intro }}</p>
73+
<ol class="about__list">
74+
{% for item in page.about_items %}
75+
<li class="about__item">
76+
<h3 class="about__subtitle">{{ item.subtitle }}</h3>
77+
<p class="about__text">{{ item.text }}</p>
78+
</li>
5979
{% endfor %}
60-
</section>
80+
</ol>
81+
</section>
6182

62-
<!-- About Section -->
63-
<section class="about">
64-
<h2 class="about__title">About us</h2>
65-
{% include "partials/about.twig" with { about_intro: about_intro, about_items: about_items } %}
66-
<button class="btn load-more">Read more</button>
67-
</section>
83+
<!-- ============== TEAM ============== -->
84+
<section class="team">
85+
<h2 class="team__title">Our Team</h2>
86+
{% for member in page.team_members %}
87+
<div class="team__card">
88+
<img src="{{ member.image }}" alt="{{ member.name }}" class="team__image">
89+
<h3 class="team__name">{{ member.name }}</h3>
90+
<p class="team__role">{{ member.role }}</p>
91+
<ul class="team__social">
92+
{% for social in member.social %}
93+
<li class="team__social-item">
94+
<a href="{{ social.link }}" class="team__social-link" target="_blank">{{ social.platform }}</a>
95+
</li>
96+
{% endfor %}
97+
</ul>
98+
</div>
99+
{% endfor %}
100+
</section>
68101

69-
<!-- Team Section -->
70-
<section class="team">
71-
<h2 class="team__title">Our Team</h2>
72-
{% for member in team_members %}
73-
{% include "partials/team-card.twig" with { member: member } %}
74-
{% endfor %}
75-
</section>
102+
<!-- ============== FAQ ============== -->
103+
<section class="faq">
104+
<h2 class="faq__title">FAQs</h2>
105+
{% for faq in page.faqs %}
106+
<details class="faq__item">
107+
<summary class="faq__question">{{ faq.question }}</summary>
108+
<p class="faq__answer">{{ faq.answer }}</p>
109+
</details>
110+
{% endfor %}
111+
</section>
76112

77-
<!-- FAQ Section -->
78-
<section class="faq">
79-
<h2 class="faq__title">FAQs</h2>
80-
{% for faq in faqs %}
81-
{% include "partials/faq.twig" with { faq: faq } %}
82-
{% endfor %}
83-
</section>
84-
</main>
85113
{% endblock %}
86-
87-
{% block footer %}
88-
{% include "partials/footer.twig" %}
89-
{% endblock %}

0 commit comments

Comments
 (0)