Skip to content

Commit

Permalink
Merge pull request #24 from vjchoir/fix-bugs-remove-names
Browse files Browse the repository at this point in the history 
Fix bugs remove names
  • Loading branch information
@jumpcutfindo
jumpcutfindo authored Aug 3, 2021
2 parents 963d9f6 + 8550d7c commit 5f2ae6a
Show file tree
Hide file tree
Showing 4 changed files with 120 additions and 22 deletions.
5 changes: 3 additions & 2 deletions src/app/navigation/nav-controller/nav-controller.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ export class NavControllerComponent implements OnInit {
this.router.events.subscribe((val) => {
if (val instanceof NavigationEnd) {
this.loadingService.setLoading(true);
console.log(val);
this.navControllerService.onRouteUpdate(val);
this.navigateToLink(val.url);
}
Expand Down Expand Up @@ -94,7 +93,9 @@ export class NavControllerComponent implements OnInit {
pages = ['home', 'about', 'batches', 'sov', 'listen', 'contribute', 'misc']
navigateToLink(url: string) {
for(let i = 0; i < this.pages.length; i ++) {
if(url.toLowerCase().includes(this.pages[i])) {
let sourceUrl = url.split("#")[0];

if(sourceUrl.toLowerCase().includes(this.pages[i])) {
let temp = this.menu.filter(x => x.linkName.includes(this.pages[i]));
this.navigateTo(temp[0]);
return;
Expand Down
2 changes: 1 addition & 1 deletion src/assets/data/about.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"link": "../../../assets/images/about/about.jpg",
"styles": "col-12 col-md-6 col-lg-8 col-xl-8"
},
"content": "<p>I started this project back in 2014 when I was bored and studying for 'A' Levels. A lot of the free time I had during that period was spent on making the first iteration of the website (which was one based off Google Sites, it looked quite terrible but it got the job done). I used to study a lot in the choir room and I'd browse through all the abandoned documents below the lockers and I'd think to myself why not just store it online.</br></br>So I did, and came the first iteration of the website. It wasn't just like old photos and documents or whatever though, I wanted to be able to look back at my own SOV in the future and enjoy it once again, so I decided to do it for videos, and it extended to audio as well. Making all the album art, cutting up audio and videos etc. may seem pretty boring to some but for me it was quite enjoyable.</br></br>It's my hope that this project will help you bring back fond memories of your time in VJChoir. The friends I made in choir have become what I believe will be my lifelong friends, and you may not have the same idea about those in your batch, but in the end the music you guys produced is something precious and should be kept well and shared. Hopefully this website, and my YouTube account jumpcutfindo can help you relive some of those memories, of a time simpler than probably what is currently. Thanks for reading, and enjoy.</br></br> PS. The project is mainly being managed by me (<b>@themeef</b> / <b>jumpcutfindo</b>), so if you do want to contribute you're completely welcome to. The main struggle with this website is finding the content and I would really appreciate it if you dropped me an email or submitted suggestions to me (you can email me at <b>[email protected]</b> OR <b>[email protected]</b>).</p>"
"content": "<p>I started this project back in 2014 when I was bored and studying for 'A' Levels. A lot of the free time I had during that period was spent on making the first iteration of the website (which was one based off Google Sites, it looked quite terrible but it got the job done). I used to study a lot in the choir room and I'd browse through all the abandoned documents below the lockers and I'd think to myself why not just store it online.</br></br>So I did, and came the first iteration of the website. It wasn't just like old photos and documents or whatever though, I wanted to be able to look back at my own SOV in the future and enjoy it once again, so I decided to do it for videos, and it extended to audio as well. Making all the album art, cutting up audio and videos etc. may seem pretty boring to some but for me it was quite enjoyable.</br></br>It's my hope that this project will help you bring back fond memories of your time in VJChoir. The friends I made in choir have become what I believe will be my lifelong friends, and you may not have the same idea about those in your batch, but in the end the music you guys produced is something precious and should be kept well and shared. Hopefully this website, and my YouTube account jumpcutfindo can help you relive some of those memories, of a time simpler than probably what is currently. Thanks for reading, and enjoy.</br></br> PS. The project is mainly being managed by me Daniel Hoe, a.k.a. @jumpcutfindo, so if you do want to contribute you're completely welcome to. The main struggle with this website is finding the content and I would really appreciate it if you dropped me an email or submitted suggestions to me (you can email me at [email protected]).</p>"
},

{
Expand Down
133 changes: 115 additions & 18 deletions src/assets/data/batches.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,94 @@
"title": "Welcome to the Batches page!",
"msg": "<p>Hello! Welcome to the landing page for Batches! In this part of the website, the details of the previous batches of VJChoir are kept so that you can see how the past batches looked like.</br></br>Use the navigation buttons above to browse through the different batches. In each page, the general information of the choir's committees and members are included. Photos from the various batches are also there so that you can kinda get a look of how lupsup or noob everyone looked back in their hey-day.</br></br><b>Contributing / fixing:</b></br>Seeing as I'm not from any batches after my own, the information provided above has been sent to me over the years by the various members of the various batches. If you want to contribute, or you've spotted an error, head over to the \"Contribute\" part of the archives to send in the relevant information. Thanks very much! :)</p>"
},
"batches": [{
"batches": [
{
"id": "2122",
"name": "2021 / 2022",
"image": "",
"desc": "Hi there! This page contains information pertaining to the batch of 2021 - 2022.",
"comms": [
{
"name": "Exco",
"img": "",
"members": [
"Tan Xuan Lin, Claire (P)",
"Lyu Mingze (VP)",
"Kyla Frances Yew (S)",
"Mohamed Samir (Welfare Head)",
"Bolliger Andrea Shijia (QM)",
"Phua Sin Yi Venice (T)"

]
},
{
"name": "Musico",
"img": "",
"members": [
"Jin Yucheng (SC)",
"Matt Tan Yong (SC & B)",
"Ng Sin Yee (S)",
"Katherine Fontanilla (A)",
"Nathan Sivali Sudikarman (T)"
]
}
],
"sections": [
{
"name": "Sopranos",
"members": [
"Ng Sin Yee",
"Phua Sin Yi Venice",
"Uy Alexa Denise Mejia",
"Balachandar Srividya",
"Keisha Mehar",
"Kimberly Tsang Li Ting",
"Tan Keng Yee, Jolene",
"Charmaine Liong Shuen Meng",
"Kang Kai Xin"
]
},
{
"name": "Altos",
"members": [
"Katherine Fontanilla",
"Tan Xuan Lin, Claire",
"Kyla Frances Yew",
"Bolliger Andrea Shijia",
"Ang Kai Li Cally",
"Tai Wing Xin",
"Shannon Lu Tianmo",
"Wong Liang Min Hannah"
]
},
{
"name": "Tenors",
"members": [
"Nathan Sivali Sudikarman",
"Lyu Mingze",
"Jin Yucheng",
"Ee Yong Kang Darren",
"Leroy Sear Zheng Zhan"
]
},
{
"name": "Basses",
"members": [
"Matt Tan Yong",
"Mohamed Samir",
"Arthur Lee Zheng Yang",
"Huang Yifan"
]
}
]
},
{
"id": "2021",
"name": "2020 / 2021",
"image": "../../../assets/images/batches/2021/batch.jpg",
"desc": "Hi there! This page contains information pertaining to the batch of 2020 - 2021.",
"comms": [{
"comms": [
{
"name": "Exco",
"img": "../../../assets/images/batches/2021/exco.jpg",
"members": [
Expand All @@ -32,7 +114,8 @@
]
}
],
"sections": [{
"sections": [
{
"name": "Sopranos",
"members": [
"Natalie Jian Liting",
Expand Down Expand Up @@ -90,7 +173,8 @@
"name": "2019 / 2020",
"image": "../../../assets/images/batches/1920/batch.jpeg",
"desc": "Hi there! This page contains information pertaining to the batch of 2019 - 2020.",
"comms": [{
"comms": [
{
"name": "Exco",
"img": "../../../assets/images/batches/1920/exco.jpg",
"members": [
Expand All @@ -115,7 +199,8 @@
]
}
],
"sections": [{
"sections": [
{
"name": "Sopranos",
"members": [
"Jewel Lee",
Expand Down Expand Up @@ -183,7 +268,8 @@
"name": "2018 / 2019",
"image": "../../../assets/images/batches/1819/batch.jpg",
"desc": "Hi there! This page contains information pertaining to the batch of 2018 - 2019.",
"comms": [{
"comms": [
{
"name": "Exco",
"img": "../../../assets/images/batches/1819/exco.jpg",
"members": [
Expand All @@ -208,7 +294,8 @@
]
}
],
"sections": [{
"sections": [
{
"name": "Sopranos",
"members": [
"Magdeleine",
Expand Down Expand Up @@ -260,7 +347,8 @@
"name": "2017 / 2018",
"image": "../../../assets/images/batches/1718/batch.jpg",
"desc": "Hi there! This page contains information pertaining to the batch of 2017 - 2018.",
"comms": [{
"comms": [
{
"name": "Exco",
"img": "../../../assets/images/batches/1718/exco.jpg",
"members": [
Expand All @@ -285,7 +373,8 @@
]
}
],
"sections": [{
"sections": [
{
"name": "Sopranos",
"members": [
"Lee Yu Xian",
Expand Down Expand Up @@ -356,7 +445,8 @@
"name": "2016 / 2017",
"image": "../../../assets/images/batches/1617/batch.jpg",
"desc": "Hi there! This page contains information pertaining to the batch of 2016 - 2017.",
"comms": [{
"comms": [
{
"name": "Exco",
"img": "../../../assets/images/batches/1617/exco.jpg",
"members": [
Expand Down Expand Up @@ -392,7 +482,8 @@
]
}
],
"sections": [{
"sections": [
{
"name": "Sopranos",
"members": [
"Cherylene",
Expand Down Expand Up @@ -455,7 +546,8 @@
"name": "2015 / 2016",
"image": "../../../assets/images/batches/1516/batch.jpg",
"desc": "Hi there! This page contains information pertaining to the batch of 2015 - 2016.",
"comms": [{
"comms": [
{
"name": "Exco",
"img": "../../../assets/images/batches/1516/exco.jpg",
"members": [
Expand Down Expand Up @@ -493,7 +585,8 @@
]
}
],
"sections": [{
"sections": [
{
"name": "Sopranos",
"members": [
"Sheryl Chow",
Expand Down Expand Up @@ -552,7 +645,8 @@
"name": "2014 / 2015",
"image": "../../../assets/images/batches/1415/batch.jpg",
"desc": "Hi there! This page contains information pertaining to the batch of 2014 - 2015.",
"comms": [{
"comms": [
{
"name": "Exco",
"img": "../../../assets/images/batches/1415/exco.jpg",
"members": [
Expand Down Expand Up @@ -590,7 +684,8 @@
]
}
],
"sections": [{
"sections": [
{
"name": "Sopranos",
"members": [
"Vanessa Kee",
Expand Down Expand Up @@ -665,7 +760,8 @@
"name": "2013 / 2014",
"image": "../../../assets/images/batches/1314/batch.jpg",
"desc": "Hi there! This page contains information pertaining to the batch of 2013 - 2014.",
"comms": [{
"comms": [
{
"name": "Exco",
"img": "../../../assets/images/batches/1314/exco.jpg",
"members": [
Expand Down Expand Up @@ -702,7 +798,8 @@
]
}
],
"sections": [{
"sections": [
{
"name": "Sopranos",
"members": [
"Kiang Wen Jen",
Expand Down Expand Up @@ -758,4 +855,4 @@
]
}
]
}
}
2 changes: 1 addition & 1 deletion src/assets/data/contribute.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"sections": [{
"id": "home",
"title": "Contributing to the archives",
"content": "<p>Hello! Welcome to the page where you can share your ideas and feedback about the website! This is also the page where I'm looking for people to contribute to the website in many ways, and I'll let you know what help I need! To get in touch with me, Daniel, you can either email <b>[email protected]</b> or fill up the form below!</br></br><b>Batch Information</b></br>This is straightforward enough, I try to keep an updated page on the current batch and students who comprise that batch, and the only way to obtain such information is to contact people directly from that batch! If your batch's information isn't available here, feel free to drop me a message to contribute that information!</br></br><b>Writers (for write-ups)</b></br>One of the ideas I had (but don't have any time to collect info. for) is to obtain writeups for all the songs we have on the website. Like from the booklets and everything, and I need help to do this! If you're interested, drop me a message!</br></br><b>Developers</b></br>This one is a bit of a long shot, but if you have ideas that you know how to implement using HTML, CSS and Angular, please don't hestitate to drop me a message! You can gain access to the repository and make your own changes to the website! :)"
"content": "<p>Hello! Welcome to the page where you can share your ideas and feedback about the website! This is also the page where I'm looking for people to contribute to the website in many ways, and I'll let you know what help I need! To get in touch with me, Daniel, you can either email <b>[email protected]</b> or fill up the form below!</br></br><b>Batch Information</b></br>This is straightforward enough, I try to keep an updated page on the current batch and students who comprise that batch, and the only way to obtain such information is to contact people directly from that batch! If your batch's information isn't available here, feel free to drop me a message to contribute that information!</br></br><b>Writers (for write-ups)</b></br>One of the ideas I had (but don't have any time to collect info. for) is to obtain writeups for all the songs we have on the website. Like from the booklets and everything, and I need help to do this! If you're interested, drop me a message!</br></br><b>Developers</b></br>This one is a bit of a long shot, but if you have ideas that you know how to implement using HTML, CSS and Angular, please don't hestitate to drop me a message! You can gain access to the repository and make your own changes to the website! :)"
}]
}

0 comments on commit 5f2ae6a

Please sign in to comment.