diff --git a/components/Chart.vue b/components/Chart.vue
index 29cfc8e0dc42a57af142904bd0ce4e1bc310aa09..c0e291e4c8bcfe259c7f9b848ac8a3b1fd0d27d0 100644
--- a/components/Chart.vue
+++ b/components/Chart.vue
@@ -7,7 +7,7 @@
:theme="theme"
autoresize
/>
- <div class="chart-note">
+ <div class="chart-note" v-if="number > 0">
<span class="chart-note-num" v-if="number">Figure {{ number }}</span>
<span class="chart-note-text"><slot></slot></span>
</div>
@@ -25,7 +25,7 @@ export default defineComponent({
},
props: {
number: {
- type: String,
+ type: [String, Number],
default: "1",
},
option: {
diff --git a/components/Menu.vue b/components/Menu.vue
index 5d4e3213c5c840f47664bd90b01f7aa3518036ff..5a76f409f41e16106489bf5ec09ad15808e892e0 100644
--- a/components/Menu.vue
+++ b/components/Menu.vue
@@ -107,7 +107,7 @@ export default {
},
{
text: "Parts",
- url: 'parts',
+ url: "parts",
/*
children: [
{
@@ -159,6 +159,10 @@ export default {
},
],*/
},
+ {
+ text: "Entrepreneurship",
+ url: "entrepreneurship",
+ },
{
text: "Safety",
url: "safety",
diff --git a/components/page/IHP/PageIHPTimeline.vue b/components/page/IHP/PageIHPTimeline.vue
index 5611d39a44a4eb72364633a9270baa48ba5fe280..62fc5a8e2b483778a349032e2a3ef3da008de990 100644
--- a/components/page/IHP/PageIHPTimeline.vue
+++ b/components/page/IHP/PageIHPTimeline.vue
@@ -137,7 +137,7 @@
<p><span class="conetnt-no">2. </span>Social responsibility</p>
<p class="line-2">T-shirt selling campaign to raise money for NGO</p>
<p><span class="conetnt-no">3. </span>Entrepreneurship</p>
- <p class="line-2">Healthy Future Challenge</p>
+ <p class="line-2">Health Future Challenge</p>
</div>
<div class="img">
<img
diff --git a/components/page/index/PageIndexMap.vue b/components/page/index/PageIndexMap.vue
index 06625932ec37c97e0d225e5b38c6812b8c13e623..6cf87051f09874f031a4439a5a7df6cf64556b48 100644
--- a/components/page/index/PageIndexMap.vue
+++ b/components/page/index/PageIndexMap.vue
@@ -4876,7 +4876,6 @@ export default {
};
const whellAnimation = (e) => {
- e.preventDefault();
if (e.deltaY > 0 && !this.scrolled) {
playStartingAnimation();
window.removeEventListener("wheel", whellListener);
@@ -4884,6 +4883,9 @@ export default {
};
const whellListener = (e) => {
+ e.preventDefault();
+ whellAnimation(e)
+ return
if (timer) {
clearTimeout(timer);
}
diff --git a/layouts/default.vue b/layouts/default.vue
index 1d1a3249d4899f94961c2b51e216a6deedd99372..aae06d8d7ed6cfff1629bbf3b1460913faf5e831 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -30,7 +30,9 @@ export default {
this.isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
// https://2023.igem.wiki/hkpolyu/<page>?st=<Element id>
if (this.$route.query.st) {
- this.$scrollTo(`#${this.$route.query.st}`);
+ setTimeout(()=>{
+ this.$scrollTo(`#${this.$route.query.st}`);
+ }, 1000)
}
this.$refs.container.classList.remove("loading");
},
diff --git a/pages/contribution.vue b/pages/contribution.vue
index 34b2788d984a90436309dc9f9df1cb70811e9097..19ff2892de7e8490e5a0aeb6e60cff01e3761203 100644
--- a/pages/contribution.vue
+++ b/pages/contribution.vue
@@ -54,7 +54,6 @@
<template #subtitle>
One-step Cyclization and Purification Intein System
</template>
- <!--TODO: Figure-->
<Figure
number="0"
size="60%"
diff --git a/pages/engineering.vue b/pages/engineering.vue
index 25b7996a6f5e1c9e526f1b9c77ddadb31af92499..baaf517a26aeea92b91eabfecfd071edcf09ae61 100644
--- a/pages/engineering.vue
+++ b/pages/engineering.vue
@@ -209,7 +209,7 @@
</p>
<Figure
number="0"
- url="https://static.igem.wiki/teams/4774/wiki/static/img/engineering/engineering-figure-6.png"
+ url="https://static.igem.wiki/teams/4774/wiki/static/img/engineering/engineering-figure-6-2.png"
></Figure>
<div class="content-wrap-2">
<p class="subtitle-2">Phase 1: Design and Build</p>
diff --git a/pages/human-practices.vue b/pages/human-practices.vue
index f47a3ddd1921576fc9e666b5935220de563f08f1..85128bcd3f166aead9c50b55fd245a1cad17ec2c 100644
--- a/pages/human-practices.vue
+++ b/pages/human-practices.vue
@@ -137,7 +137,6 @@
engagement with diverse stakeholders and how their input drives our
project's progression.
</p>
-
</ContentBlock>
<ContentBlock :id="4">
<template #subtitle> Social Engagement </template>
@@ -172,6 +171,47 @@
meet the specific needs of the public while also highlighting
the urgency of our goal to educate about NSCLC.
</p>
+
+ <Chart
+ number="0"
+ id="chart-1"
+ height="50vh"
+ :option="{
+ title: {
+ text: 'Age',
+
+ left: 'center',
+ },
+ tooltip: {
+ trigger: 'item',
+ },
+ legend: {
+ orient: 'vertical',
+ left: 'left',
+ },
+ series: [
+ {
+ name: 'Access From',
+ type: 'pie',
+ radius: '50%',
+ data: [
+ { value: 4.8, name: 'Under 18' },
+ { value: 80.4, name: '18-34' },
+ { value: 13.6, name: '35-54' },
+ { value: 1.1, name: '55-74' },
+ { value: 0, name: '75 or older' },
+ ],
+ emphasis: {
+ itemStyle: {
+ shadowBlur: 10,
+ shadowOffsetX: 0,
+ shadowColor: 'rgba(0, 0, 0, 0.5)',
+ },
+ },
+ },
+ ],
+ }"
+ ></Chart>
<p>
A total of 189 respondents participated in the survey, with a
@@ -181,7 +221,43 @@
remaining 19.6% fell within the 35 to 74 age range.
</p>
- <!--TODO: Survey Graph 1-->
+ <Chart
+ number="0"
+ id="chart-2"
+ height="50vh"
+ :option="{
+ title: {
+ text: 'Confidence level of people regarding the knowledge of NSCLC',
+ },
+ dataset: [
+ {
+ dimensions: ['name', 'age'],
+ source: [
+ ['Not at all confident ', 44.4],
+ ['Not very confiden', 34.9],
+ ['Somewhat confiden ', 15.9],
+ ['Very Confident', 4.7],
+ ],
+ },
+ {
+ transform: {
+ type: 'sort',
+ config: { dimension: 'age', order: 'desc' },
+ },
+ },
+ ],
+ xAxis: {
+ type: 'category',
+ axisLabel: { interval: 0, rotate: 30 },
+ },
+ yAxis: {},
+ series: {
+ type: 'bar',
+ encode: { x: 'name', y: 'age' },
+ datasetIndex: 1,
+ },
+ }"
+ ></Chart>
<p>
The survey results revealed an alarming
@@ -194,7 +270,73 @@
educational initiatives to bridge the information gap.
</p>
- <!--TODO: Survey Graph 2-->
+ <Chart
+ number="0"
+ id="chart-3"
+ height="50vh"
+ :option="{
+ title: {
+ text: 'Which of the following is the most common treatment strategy\nfor different stages of NSCLC',
+ left:'center'
+ },
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow',
+ },
+ },
+ legend: {
+ top: '11%',
+ },
+ grid: {
+ left: '3%',
+ right: '4%',
+ bottom: '3%',
+ containLabel: true,
+ },
+ xAxis: {
+ type: 'value',
+ },
+ yAxis: {
+ type: 'category',
+ data: [
+ 'Surgery',
+ 'Radiation therapy',
+ 'Chemotherapy',
+ 'Immunotherapy',
+ 'Targetted Therapy',
+ 'I do not Know',
+ ],
+ },
+ series: [
+ {
+ name: 'Early-Stage',
+ type: 'bar',
+ stack: 'total',
+
+ label: {
+ show: true,
+ },
+ emphasis: {
+ focus: 'series',
+ },
+ data: [28.6, 9, 18, 3.7, 0, 40.7],
+ },
+ {
+ name: 'Advanced-Stage',
+ type: 'bar',
+ stack: 'total',
+ label: {
+ show: true,
+ },
+ emphasis: {
+ focus: 'series',
+ },
+ data: [9, 7.9, 16, 5.2, 20.6, 40.8],
+ },
+ ],
+ }"
+ ></Chart>
<p>
Regarding treatment options, the survey revealed that 40.8% of
@@ -211,7 +353,59 @@
>
</p>
- <!--TODO: Survey Graph 3-->
+ <Chart
+ number="0"
+ id="chart-4"
+ height="50vh"
+ :option="{
+ title: {
+ text: 'A potential side effect of two kinds therapies',
+ left:'center'
+ },
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow',
+ },
+ },
+ legend: {
+ top: '5%',
+ },
+ grid: {
+ left: '3%',
+ right: '4%',
+ bottom: '3%',
+ containLabel: true,
+ },
+ xAxis: {
+ type: 'value',
+ boundaryGap: [0, 0.01],
+ },
+ yAxis: {
+ type: 'category',
+ data: [
+ 'Nausea and vomiting',
+ 'Hair loss',
+ 'Fatigue',
+ 'All if the above',
+ 'Non of the above',
+ 'I do not know',
+ ],
+ },
+ series: [
+ {
+ name: 'Chemotherapy%',
+ type: 'bar',
+ data: [2.1, 7.9, 1, 58.8, 0.5, 30.1],
+ },
+ {
+ name: 'Targetted%',
+ type: 'bar',
+ data: [6.3, 3.2, 4.2, 29.4, 10.6, 46.6],
+ },
+ ],
+ }"
+ ></Chart>
<p>
In terms of side effects, 85% of those surveyed correctly
@@ -220,7 +414,48 @@
the potential side effects of chemotherapy, including hair loss.
</p>
- <!--TODO: Survey Graph 4-->
+ <Chart
+ number="0"
+ id="chart-5"
+ height="50vh"
+ :option="{
+ title: {
+ text: 'Which of the following sources do you typically rely on\nfor health information?',
+ left:'center'
+ },
+ legend: {
+ top: '11%',
+ },
+ toolbox: {
+ show: true,
+ feature: {
+ mark: { show: true },
+ dataView: { show: true, readOnly: false },
+ restore: { show: true },
+ saveAsImage: { show: true },
+ },
+ },
+ series: [
+ {
+ name: 'Nightingale Chart',
+ type: 'pie',
+ radius: [50, 100],
+ center: ['50%', '50%'],
+ roseType: 'area',
+ itemStyle: {
+ borderRadius: 8,
+ },
+ data: [
+ { value: 54.5, name: 'Healthcare providers' },
+ { value: 58.7, name: 'Internet' },
+ { value: 35.9, name: 'Friends and family' },
+ { value: 20.7, name: 'Television' },
+ { value: 2, name: 'Others' },
+ ],
+ },
+ ],
+ }"
+ ></Chart>
<p>
The survey's results were insightful. They revealed that while
@@ -238,8 +473,6 @@
internet to educate and raise awareness about NSCLC.
</p>
- <!--TODO: Survey Graph 5-->
-
<p>
Understanding that a substantial number of individuals turn to
the internet for basic health information, we saw the
@@ -834,7 +1067,13 @@
Go to our iGEM Video Universe Channel to watch the videos
</p>
<div class="page-card-wrap">
- <PageCard url="https://video.igem.org/c/polyneer/videos" :blank="true" img-url="https://static.igem.wiki/teams/4774/wiki/static/svg/pages/video.svg"> iGEM Video Universe </PageCard>
+ <PageCard
+ url="https://video.igem.org/c/polyneer/videos"
+ :blank="true"
+ img-url="https://static.igem.wiki/teams/4774/wiki/static/svg/pages/video.svg"
+ >
+ iGEM Video Universe
+ </PageCard>
</div>
</div>
</div>
@@ -1074,7 +1313,8 @@
name="Prof. Lee Kin-wah, Terence"
>
Associate Head of Applied Biology and Chemical
- Technology Assoc. DoULS & Professor at The Hong Kong
+ Technology
+ <br />Assoc. DoULS & Professor at The Hong Kong
Polytechnic University
</Profile>
</template>
@@ -1540,7 +1780,7 @@
<template v-slot:right>
<Profile
url="https://static.igem.wiki/teams/4774/wiki/static/img/ihp/profiles/clarence.png"
- name="Dr. Wong Tsun-ting, Clarence"
+ name="Dr. Wong Tsun-Ting, Clarence"
>
Assistant Professor at The Hong Kong Polytechnic
University
@@ -1686,8 +1926,12 @@
information about NSCLC and educate people on how to care
for patients and prevent the worsening of their condition.
For a detailed overview of our activities, please visit
- our <a href="" @click="scrollTo('el-top')"><b>Human Practices</b></a> Page. This marks the
- completion of the fifth milestone in our project.
+ our
+ <a href="" @click="scrollTo('el-top')"
+ ><b>Human Practices</b></a
+ >
+ Page. This marks the completion of the fifth milestone in
+ our project.
</p>
<p>
@@ -1791,6 +2035,37 @@
</div>
</div>
</ContentBlock>
+ <ContentBlock :id="8">
+ <template #subtitle> References </template>
+ Â <Reference number="1">
+ <i
+ >Centre for Health Protection, Department of Health - Lung
+ Cancer</i
+ >. (n.d.). WCRF International. Â Â Â
+ <i
+ >https://www.chp.gov.hk/en/healthtopics/content/25/49.html
+ (accessed 2023).</i
+ >
+ </Reference>
+ Â Â
+ <Reference number="2">
+ K. C. Thandra, A. Barsouk, K. Saginala, J. S. Aluru, and A. Barsouk,
+ ‘Epidemiology of lung cancer’,
+ <i
+ >‘Epidemiology of lung cancer’, Contemporary oncology (Poznan,
+ Poland)</i
+ >, vol. 25, no. 1, pp. 45–52, 2021, doi:
+ 10.5114/wo.2021.103829.(accessed 2023).
+ </Reference>
+ Â Â
+ <Reference number="3">
+ J. R. Molina MD, PhD, P. Yang MD, PhD, S. D. Cassivi MD, S. E.
+ Schild MD, and A. A. Adjei MD, PhD, Non-Small CellLung Cancer:
+ Epidemiology, Risk Factors, Treatment, and Survivorship’,
+ <i>Mayo Clinic proceedings</i> vol. 83, no.5, pp. 584–594, 2008,
+ doi: 10.4065/83.5.584. Â Â
+ </Reference>
+ </ContentBlock>
</div>
</div>
</div>
diff --git a/pages/judging.vue b/pages/judging.vue
index 9a2329bedfe7996dda08ac2699c8993e5330d81d..9388caee5ce67a22e88378cfd3fd872d6de64621 100644
--- a/pages/judging.vue
+++ b/pages/judging.vue
@@ -100,7 +100,6 @@
<div class="page-card-wrap">
<PageCard url="/hkpolyu/contribution" img-url="https://static.igem.wiki/teams/4774/wiki/static/svg/pages/contribution.svg"> Contribution </PageCard>
</div>
- <!--TODO: Part name: -->
</div>
</div>
</ContentBlock>
@@ -141,26 +140,6 @@
<div class="content-wrap-2">
<p class="subtitle-2">S2. Human Practices</p>
<div class="content-2">
- <p>
- We have completed the Engineering page for our Wiki, detailing
- our project's journey through the entire engineering cycle in
- pursuit of our primary objective: developing a cost-effective
- and highly efficient production method for a bispecific antibody
- to combat Osimertinib resistance in NSCLC. We have explained how
- we iterated the cycle several times: we illustrated how we
- changed our design from the linear EGFR binding peptide to the
- cyclic peptide (DESIGN), assembled the genetic material we
- needed (BUILD), tested it according to our protocol (TEST), and
- realized that the linear peptide is insoluble in the extraction
- buffer in protein expression and that it is prone to degradation
- and instability (LEARN). Consequently, we developed a one-step
- cyclization and purification intein system in a subsequent
- iteration of the engineering cycle. Although time constraints
- limited us from obtaining full results, the positive control
- result, the cyclizing eGFP, successfully validated the
- functionality of our intein system for cyclizing and purifying
- short peptide chains in a single step.
- </p>
<p>
We have completed a Human Practices page that demonstrates our
progress and achievements in actively engaging with the wider
@@ -313,7 +292,7 @@
Go to Integrated Human Practices Page for details
</p>
<div class="page-card-wrap">
- <PageCard url="/hkpolyu/human-practices" img-url="https://static.igem.wiki/teams/4774/wiki/static/img/ihp/ihp.png"> Integrated Human Practices </PageCard>
+ <PageCard url="/hkpolyu/human-practices?st=content-7" img-url="https://static.igem.wiki/teams/4774/wiki/static/img/ihp/ihp.png"> Integrated Human Practices </PageCard>
</div>
</div>
</div>
diff --git a/pages/results.vue b/pages/results.vue
index 6b46eec79f78a4c1f651ff787c920a1f51ff2098..c4bc6f707ff7484a56a697fb34cd2724263f3f1a 100644
--- a/pages/results.vue
+++ b/pages/results.vue
@@ -29,7 +29,7 @@
url="https://static.igem.wiki/teams/4774/wiki/static/img/results/results-figure-1.png"
data-scrollent="fade-left"
>
- ector design of pET-24d(+)-Ebp
+ Vector design of pET-24d(+)-Ebp
</Figure>
</div>
</div>
@@ -147,14 +147,14 @@
<div class="content-2">
<Figure
number="4"
- url="https://static.igem.wiki/teams/4774/wiki/static/img/results/results-figure-4.png"
+ url="https://static.igem.wiki/teams/4774/wiki/static/img/results/results-figure-4-2.png"
data-scrollent="fade-left"
>
Vector design of pET-24d(+)-Ebp-Ssp-Mxe (ES)
</Figure>
<Figure
number="5"
- url="https://static.igem.wiki/teams/4774/wiki/static/img/results/results-figure-5.png"
+ url="https://static.igem.wiki/teams/4774/wiki/static/img/results/results-figure-5-2.png"
data-scrollent="fade-left"
>Vector design of pET-24d(+)-Scrb-Ssp-Mxe (SS)
</Figure>
@@ -475,13 +475,13 @@
<Figure
number="16"
- url="https://static.igem.wiki/teams/4774/wiki/static/img/results/results-figure-16.png"
+ url="https://static.igem.wiki/teams/4774/wiki/static/img/results/results-figure-16-2.png"
data-scrollent="fade-left"
>Vector design of pET-24d(+)-Scrb-Npu-SsrA (SN).
</Figure>
<Figure
number="17"
- url="https://static.igem.wiki/teams/4774/wiki/static/img/results/results-figure-17.png"
+ url="https://static.igem.wiki/teams/4774/wiki/static/img/results/results-figure-17-2.png"
data-scrollent="fade-left"
>Vector design of pET-24d(+)-GFP-Npu-SsrA (GN).
</Figure>
@@ -874,6 +874,7 @@
number="30"
url="https://static.igem.wiki/teams/4774/wiki/static/img/results/results-figure-30.png"
data-scrollent="fade-left"
+ size="50%"
>TGX stain free native gel showing protein expression of
GFP-Npu-SsrA (GN). Lane 1 , Biorad Precision Plus Proteinâ„¢
Unstained Protein Standards; lane 2, IPTG induced soluble
@@ -1014,6 +1015,7 @@
<p>Polyneerab binds to both c-MET and EGFR.</p>
<Figure
number="34"
+ size="50%"
url="https://static.igem.wiki/teams/4774/wiki/static/img/results/results-figure-34.png"
data-scrollent="fade-left"
>
diff --git a/plugins/echarts.js b/plugins/echarts.js
index 91ed0555d5576ea985748dfcd272960e318568bd..db6f62b04289c25822a680f9ff5e2a1e4d23619b 100644
--- a/plugins/echarts.js
+++ b/plugins/echarts.js
@@ -5,9 +5,11 @@ import {
TitleComponent,
TooltipComponent,
GridComponent,
- LegendComponent
+ LegendComponent,
+ DatasetComponent,
+ TransformComponent
} from 'echarts/components';
export default defineNuxtPlugin((nuxtApp) => {
- use([CanvasRenderer, BarChart, PieChart, GridComponent, TitleComponent, TooltipComponent, LegendComponent]);
+ use([CanvasRenderer, BarChart, PieChart, GridComponent, TitleComponent, TooltipComponent, LegendComponent, DatasetComponent, TransformComponent]);
});
\ No newline at end of file