Skip to content
Snippets Groups Projects
Commit 7f789582 authored by Jianghuan Xu's avatar Jianghuan Xu :speech_balloon:
Browse files

Merge branch 'xjhdraft' into 'main' 

pdf

See merge request !131
parents 5213291c 2df615ca
No related branches found
No related tags found
1 merge request!131pdf
Pipeline #304318 passed
Stage: deploy
Hide whitespace changes
Inline Side-by-side
assets/css/tailwind.css
+ 3
− 3
View file @ 7f789582
......@@ -20,13 +20,13 @@
@apply text-xl;
}
h4 {
@apply text-lg;
@apply text-xl;
}
h5 {
@apply text-base;
@apply text-lg;
}
h6 {
@apply text-sm;
@apply text-base;
}
body {
@apply bg-primary-50 text-black;
......
components/header.vue
+ 1
− 1
View file @ 7f789582
......@@ -121,7 +121,7 @@
<!-- nav bar -->
<nav class=" bg-transparent dark:bg-gray-800 dark:border-gray-700 fixed z-50 top-0 left-0 right-0">
<div @click.self="hideBack" class=" flex items-center justify-between flex-wrap p-4">
<a href="/peking" class="flex items-center">
<a href="/peking" class="flex ml-[4vw] scale-125 items-center">
<img src="https://static.igem.wiki/teams/4713/wiki/igem.png" class="h-8 mr-3" alt="Peking Logo" />
</a>
<div id="navBut" :class="{ 'invis': inSide }"
......
content/12.model.md
+ 1
− 1
View file @ 7f789582
......@@ -790,7 +790,7 @@ The multi-compartment model offered a profound insight into the journey of a bac
<br>
### **Citation**
### **References**
<br>
......
pages/education.vue
+ 100
− 33
View file @ 7f789582
......@@ -5,7 +5,7 @@
<Wave class=' layer parallax' data-depth='0' />
</div>
<!-- <AppSideBar /> -->
<div class="flex justify-evenly items-start">
<div class="flex justify-evenly items-start">
<MapSider class="hidden xl:block" />
<div class=" min-w-[5vw]">
<main></main>
......@@ -49,6 +49,7 @@
<strong>
<h2>Education about life and death</h2>
</strong>
<br />
<div>
In the process of preparing for iGEM, Peking2023 's project focuses on pancreatic cancer-targeting
engineered bacteria. When addressing our audience, we inevitably delve into topics related to
......@@ -64,16 +65,29 @@
majority believe that society and schools should provide life and death education for adolescents.
Therefore, through our participation in iGEM education initiatives, we hope to contribute to the
progress of life and death education in Chinese society.
<div class="flex">
<p @click="close[0] = false"
class=" font-bold text-[rgb(139,0,18)] underline hover:underline cursor-pointer">
Questionnaires Statistics</p>
<br />
<div class="flex justify-center">
<button @click="close[0] = false" type="button" class=" transition-all duration-500 text-white bg-red-700
hover:bg-red-800 focus:outline-none focus:ring-4 focus:ring-red-700 font-medium rounded-full
text-base px-5 py-2.5 text-center mr-2 mb-2">Questionnaires Statistics</button>
</div>
<div :class="{ 'close': close[0] }" class="z-50 modal-content">
<span class=" float-right cursor-pointer" @click="close[0] = true">×</span>
<div :class="{ 'close': close[0], 'w-[80%] h-[74%] top-[15%] left-[15%]': !large[0], 'top-0 left-0 w-[100%] h-[100%]': large[0] }"
class="z-[101] animate-fade fixed transition-all bg-primary-50 border border-primary-100 shadow-2xl rounded-lg pt-8 ">
<div class="absolute left-3 flex justify-between w-12 top-2.5">
<span @click="close[0] = true"
class="cursor-pointer w-3 h-3 rounded-full bg-rose-400 text-center"></span>
<span @click="()=>{large[0] = !large[0];stopScroll(large[0])}" :class="{'bg-green-400': !large[0], 'bg-amber-400': large[0]}"
class="transition cursor-pointer w-3 h-3 rounded-full text-center"></span>
</div>
<span class="absolute left-20 top-1 font-mono text-base">Questionnaires Statistics</span>
<iframe src="https://static.igem.wiki/teams/4713/wiki/edu/wenjuan.pdf"
style="width: 100%;height: 100%;"></iframe>
</div>
<br />
Due to traditional cultural taboos and other factors, research on death-related issues in mainland
China is relatively limited, and there is a significant lack of life and death education. However,
the significance of life and death is not diminished by folk taboos, and we cannot afford to avoid
......@@ -82,16 +96,28 @@
Sciences, particularly those in the Yan Fu Program, for interviews on the choices related to life
and death. Later, we invited Dr. Lei Aimin, who first acknowledged the importance of our recognition
of life and death education, and discussed the current situation of its implementation in China.
<div class="flex">
<p @click="close[1] = false"
class=" font-bold text-[rgb(139,0,18)] underline hover:underline cursor-pointer">
Dr. Lei's Interview</p>
<br />
<div class="flex justify-center">
<button @click="close[1] = false" type="button" class=" transition-all duration-500 text-white bg-red-700
hover:bg-red-800 focus:outline-none focus:ring-4 focus:ring-red-700 font-medium rounded-full
text-base px-5 py-2.5 text-center mr-2 mb-2">Dr. Lei's Interview</button>
</div>
<div :class="{ 'close': close[1] }" class="z-50 modal-content">
<span class=" float-right cursor-pointer" @click="close[1] = true">×</span>
<div :class="{ 'close': close[1], 'w-[80%] h-[74%] top-[15%] left-[15%]': !large[1], 'top-0 left-0 w-[100%] h-[100%]': large[1] }"
class="z-[101] animate-fade fixed transition-all bg-primary-50 border border-primary-100 shadow-2xl rounded-lg pt-8 ">
<div class="absolute left-3 flex justify-between w-12 top-2.5">
<span @click="close[1] = true"
class="cursor-pointer w-3 h-3 rounded-full bg-rose-400 text-center"></span>
<span @click="()=>{large[1] = !large[1];stopScroll(large[1])}" :class="{'bg-green-400': !large[1], 'bg-amber-400': large[1]}"
class="transition cursor-pointer w-3 h-3 rounded-full text-center"></span>
</div>
<span class="absolute left-20 top-1 font-mono text-base">Dr. Lei's Interview</span>
<iframe src="https://static.igem.wiki/teams/4713/wiki/edu/lei.pdf"
style="width: 100%;height: 100%;"></iframe>
</div>
<br />
Peking2023 published the interview content, which generated significant responses from fellow
students. Consequently, we decided to invite Dr. Lei to Peking University to conduct a lecture on
the subject of thanatology. Dr. Lei began his lecture by discussing the concepts of cardiac death
......@@ -100,18 +126,32 @@
ranging from denial and anger to eventual acceptance.
We were also fortunate to interview Professor Ke Yang, during which we discussed the current
situation and challenges of providing end-of-life care to terminally ill patients in China.
<div class="flex">
<p @click="close[2] = false"
class=" font-bold text-[rgb(139,0,18)] underline hover:underline cursor-pointer">
Professor Ke's Interview</p>
<div class="flex justify-center">
<button @click="close[2] = false" type="button" class=" transition-all duration-500 text-white bg-red-700
hover:bg-red-800 focus:outline-none focus:ring-4 focus:ring-red-700 font-medium rounded-full
text-base px-5 py-2.5 text-center mr-2 mb-2">Professor Ke's Interview</button>
</div>
<div :class="{ 'close': close[2] }" class="z-50 modal-content">
<span class=" float-right cursor-pointer" @click="close[2] = true">×</span>
<div :class="{ 'close': close[2], 'w-[80%] h-[74%] top-[15%] left-[15%]': !large[2], 'top-0 left-0 w-[100%] h-[100%]': large[2] }"
class="z-[101] animate-fade fixed transition-all bg-primary-50 border border-primary-100 shadow-2xl rounded-lg pt-8 ">
<div class="absolute left-3 flex justify-between w-12 top-2.5">
<span @click="close[2] = true"
class="cursor-pointer w-3 h-3 rounded-full bg-rose-400 text-center"></span>
<span @click="()=>{large[2] = !large[2];stopScroll(large[2])}" :class="{'bg-green-400': !large[2], 'bg-amber-400': large[2]}"
class="transition cursor-pointer w-3 h-3 rounded-full text-center"></span>
</div>
<span class="absolute left-20 top-1 font-mono text-base">Professor Ke's Interview</span>
<iframe src="https://static.igem.wiki/teams/4713/wiki/edu/ke.pdf"
style="width: 100%;height: 100%;"></iframe>
</div>
</div>
</div>
</div>
......@@ -172,16 +212,27 @@
<img :class="{ 'hidden': !whether[14], 'block': whether[14] }"
src="https://static.igem.wiki/teams/4713/wiki/edu/image/zhejiang.png" />
<div class="flex">
<p @click="close[3] = false"
class=" font-bold text-[rgb(139,0,18)] underline hover:underline cursor-pointer">
A question asked during a high school lecture</p>
</div>
<div :class="{ 'close': close[3] }" class="z-50 modal-content">
<span class=" float-right cursor-pointer" @click="close[3] = true">×</span>
<iframe src="https://static.igem.wiki/teams/4713/wiki/edu/highschool.pdf"
style="width: 100%;height: 100%;"></iframe>
</div>
<div class="flex justify-center">
<button @click="close[3] = false" type="button" class=" transition-all duration-500 text-white bg-red-700
hover:bg-red-800 focus:outline-none focus:ring-4 focus:ring-red-700 font-medium rounded-full
text-base px-5 py-2.5 text-center mr-2 mb-2">A question asked during a high school lecture</button>
</div>
<div :class="{ 'close': close[3], 'w-[80%] h-[74%] top-[15%] left-[15%]': !large[3], 'top-0 left-0 w-[100%] h-[100%]': large[3] }"
class="z-[101] animate-fade fixed transition-all bg-primary-50 border border-primary-100 shadow-2xl rounded-lg pt-8 ">
<div class="absolute left-3 flex justify-between w-12 top-2.5">
<span @click="close[3] = true"
class="cursor-pointer w-3 h-3 rounded-full bg-rose-400 text-center"></span>
<span @click="()=>{large[3] = !large[3];stopScroll(large[3])}" :class="{'bg-green-400': !large[3], 'bg-amber-400': large[3]}"
class="transition cursor-pointer w-3 h-3 rounded-full text-center"></span>
</div>
<span class="absolute left-20 top-1 font-mono text-base">A question asked during a high school lecture</span>
<iframe src="https://static.igem.wiki/teams/4713/wiki/edu/highschool.pdf"
style="width: 100%;height: 100%;"></iframe>
</div>
</div>
</div>
......@@ -240,17 +291,32 @@
import gsap from 'gsap';
import { onMounted, } from 'vue';
const close = ref([true, true, true, true]);
const large = ref([false, false,false,false])
let map = ref(null)
const whether = ref([])
for (let i = 0; i < 15; i++) {
whether.value.push(false)
}
function stopScroll(x){
if(x===true)
{
document.documentElement.style.overflow='hidden';
document.body.style.overflow='hidden';
}
else{
document.documentElement.style.overflow='';
document.body.style.overflow='';
}
}
function show(para) {
......@@ -391,7 +457,7 @@ function show(para) {
onMounted(() => {
const tl = gsap.timeline({
......@@ -409,7 +475,7 @@ onMounted(() => {
tl.to(layer, { y: movement, ease: "none" }, 0)
});
})
......@@ -440,4 +506,5 @@ onMounted(() => {
.close {
display: none;
}</style>
\ No newline at end of file
}
</style>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment