Merge pull request #10 from ssysm/update

Update

client/package.json

@@ -1,7 +1,6 @@
 {
   "name": "starrysea-client",
-  "version": "1.0.1",
-  "license": "MIT",
+  "version": "1.0.5",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

client/src/app/view/about/about.component.html

@@ -1,16 +1,18 @@
 <div class="container">
-  <h1 class="text-center introh1 h1">关于我们</h1>
+  <h1 class="text-center introh1 h1">About Us</h1>
   <br>
   <br>
   <p class="text-left intro">
-    “麦克风还正常吗？Check,1,2,OK.”</p>
+    “Is the mic OK? Check,1,2,OK.”</p>
   <p class="text-left intro">
-    大家好，我们是星之海志愿者公会，致力于为校园偶像在中国国内的Event应援、向各位传递LoveLive!Sunshine!!的魅力的组织！想要成为Aqours的【第十人】，我们凭借各自微小的力量聚集在了一起，为Aqours在国内的活动多次制作了CallBook，宣传折页，徽章等纪念品，力图将校园偶像带给我们的温暖传递下去，为热爱校园偶像的每一个人留下一份温暖而珍贵的回忆！</p>
+    Hello everyone, We Are Starry Sea Volunteers Association, Dedicated to delivering the best of Love Live Sunshine Aqours events related support association in China!
+    <br>
+    Aim to be the "Tenth Person" of Aqours, We gather our own tiny strength together, made callbooks, leaflet, badges other souvenirs for Aqours events in China several times, Trying hard to pass on the warmth of school idols, and leave a warm and precious memory for everyone who loves school idols!
+  </p>
   <p class="text-left intro">
-    从组织前身的μ’S Final LoveLive Callbook制作组走来，我们制作了包括但不限于Aqours 的1st 与2nd
-    的CallBook以及BML-SP的宣传折页和其他相应的纪念徽章在内的应援物，并且还在致力于为大家提供更精美，更多样的纪念品！</p>
+    From the predecessor of the organization μ’S Final LoveLive Callbook and all the way to today, We made include but not limited to Aqours' 1st and 2nd CallBook and BML-SP's Leaflets and other related commemorative badges, And we still committed to providing with more beautiful, more diverse souvenirs!</p>
   <p class="text-left intro">
-    制作纪念品时的花销来自于成员们的众筹款，每一次的详细花销我们都记录在册，留下你与我们一同创造的故事的痕迹！我们相信，在大家共同的努力下，我们定能创造出【大家一起实现的崭新的故事】!<br>
+    The cost of making a souvenir comes from the crowdfunding of the members, we keep a record of all the detailed expenses.Leave footprint of the stories you created with us!We Believe, With the joint efforts of everyone，We can definitely create "The new story that everyone accomplishes together"!
   </p>
   <blockquote class="blockquote">
     <p>それは階段　それとも扉</p>

client/src/app/view/activity/activity.component.html

@@ -1,6 +1,6 @@
 <div class="container">
   <div class="title">
-    <h2 class="h1">活动众筹</h2>
+    <h2 class="h1">Activities</h2>
   </div>
   <div class="activity" *ngIf="activityArr">
     <div class="col-sm-12" *ngFor="let activity of activityArr">

client/src/app/view/home/home.component.css

@@ -18,6 +18,8 @@
   width: 100%;
   height: 100%;
   padding: 25px;
+  font-family: "Open Sans","Arial","Times New Roman", sans-serif;
+  font-weight: 300;
 }
 
 .title{

client/src/app/view/home/home.component.html

@@ -3,17 +3,17 @@
 </div>
 <div class="intro">
   <h1 class="lead  text-center title">
-    <small style="color:#fff">我们是</small>
-    星之海志愿者公会
+    <small style="color:#fff">We Are</small>
+    Starry Sea Volunteers Association
   </h1>
   <div style="width: 100%;height: 20vh;"></div>
-  <h2 class="lead  text-center title2">致力于传递LoveLive Sunshine的魅力<br>Aqours events相关应援</h2>
+  <h2 class="lead  text-center title2">Dedicated to delivering the best of LoveLive Sunshine<br>Aqours events related support</h2>
   <img src="/assets/img/TOW.png" class="img-fluid img-center" alt="">
   <p class="text-right about">
-    星之海的主要工作是为Aqours在国内进行的活动
-    <br>制作callbook、应援物进行免费的发放，
-    <br>并在live时为大家提供力所能及的志愿服务。<br>
-    想要以那“第十人”为目标，努力做到最好！<br>
+    The main job of Starry Sea is to make and distribute
+    <br>callbooks and other goods for Aqours' activities throughout China,
+    <br>and provide volunteer service as much as possible at live events.<br>
+    Aim for that "tenth person", strive to be the best!<br>
     <br>
     <br>
     <a routerLink="/about" class="btn btn-info btn-lg text-right" role="button">About us</a>

client/src/app/view/partical/navbar/navbar.component.css

@@ -6,12 +6,24 @@
 
 @media screen and (min-width: 991px) {
   .navbar{
-     background: none;
+    background: transparent none;
+  }
+  .navbar.scroll {
+    background-color: rgba(255,255,255,0.7);
+  }
+  .navbar{
+    font-size: xx-large;
+  }
+}
+@media screen and (max-width: 992px) {
+  .navbar-toggler-icon {
+    background-image: url("data:image/svg+xml;charset=utf8,%3Csvg viewBox='0 0 30 30' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath stroke='rgba(0, 0, 0, 0.5)' stroke-width='2' stroke-linecap='round' stroke-miterlimit='10' d='M4 7h22M4 15h22M4 23h22'/%3E%3C/svg%3E");
   }
 
 }
 
 .navbar-logo{
   height: auto;
-  width: 50px;
+  width: 55px;
 }
+

client/src/app/view/partical/navbar/navbar.component.html

@@ -1,19 +1,19 @@
-<nav class="navbar navbar-toggleable-sm navbar-light navbar-expand-lg">
+<nav class="navbar navbar-light navbar-toggleable-sm  navbar-expand-lg">
   <a class="navbar-brand" routerLink="/"><img src="/assets/img/starsea.png" class="navbar-logo" alt="Logo"></a>
   <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
     <span class="navbar-toggler-icon"></span>
   </button>
 
-  <div class="collapse navbar-collapse" id="navbarSupportedContent">
+  <div class="collapse navbar-collapse navbar-inner" id="navbarSupportedContent">
     <ul class="navbar-nav ml-auto">
       <li class="nav-item">
-        <a class="nav-link" routerLink="/work">作品</a>
+        <a class="nav-link" routerLink="/work">Work</a>
       </li>
       <li class="nav-item">
-        <a class="nav-link" routerLink="/activity">活动众筹</a>
+        <a class="nav-link" routerLink="/activity">Activity</a>
       </li>
       <li class="nav-item">
-        <a class="nav-link" routerLink="/about">关于我们</a>
+        <a class="nav-link" routerLink="/about">About Us</a>
       </li>
     </ul>
   </div>

client/src/app/view/partical/navbar/navbar.component.ts

@@ -1,15 +1,25 @@
 import { Component, OnInit } from '@angular/core';
-
+declare var jQuery:any;
 @Component({
   selector: 'app-navbar',
   templateUrl: './navbar.component.html',
   styleUrls: ['./navbar.component.css']
 })
 export class NavbarComponent implements OnInit {
 
-  constructor() { }
+  constructor(
+
+  ) { }
 
   ngOnInit() {
+    jQuery(window).scroll(function() {
+      if(jQuery(this).scrollTop() > 50)  /*height in pixels when the navbar becomes non opaque*/
+      {
+        jQuery('.navbar').addClass('scroll');
+      } else {
+        jQuery('.navbar').removeClass('scroll');
+      }
+    });
   }
 
 }

client/src/app/view/work-detail/work-detail.component.html

@@ -8,7 +8,7 @@
         <div class="card-body text-center">
           <h3 class="card-title">{{workData.name}}</h3>
           <div class="card-text">{{workData.summary}}</div>
-          <a href="{{apiBase+'/static/work/'+workData.file.pdf}}" class="btn btn-primary">下载</a>
+          <a href="{{apiBase+'/static/work/'+workData.file.pdf}}" class="btn btn-primary">Download</a>
         </div>
       </div>
     </div>

client/src/app/view/work/work.component.html

@@ -1,6 +1,6 @@
 <div class="container">
   <div class="title">
-    <h2 class="h1">作品展示</h2>
+    <h2 class="h1">Works Galley</h2>
   </div>
   <div class="work" *ngIf="workArr">
     <div class="col-sm-12" *ngFor="let work of workArr">
@@ -11,7 +11,7 @@ <h2 class="h1">作品展示</h2>
         <div class="col-sm-10 workdetail">
           <p class="h3 worktitle">{{work.name}}</p>
           <p class="p workdetail">{{work.summary}}</p>
-          <a routerLink="/work/detail/{{work._id}}" class="btn btn-primary">了解更多</a>
+          <a routerLink="/work/detail/{{work._id}}" class="btn btn-primary">Learn More</a>
         </div>
       </div>
       <hr>

client/src/ngsw-config.json

@@ -23,6 +23,9 @@
       "resources": {
         "files": [
           "/assets/**"
+        ],
+        "urls": [
+          "https://fonts.googleapis.com/**"
         ]
       }
     }
@@ -37,7 +40,7 @@
       "cacheConfig": {
         "strategy": "performance",
         "maxSize": 20,
-        "maxAge": "6h",
+        "maxAge": "3h",
         "timeout": "30s"
       }
     }

client/src/styles.css

@@ -1,4 +1,5 @@
 @import "~bootstrap/dist/css/bootstrap.min.css";
+@import "https://fonts.googleapis.com/css?family=Open+Sans:300,400";
 html {
   position: relative;
   min-height: 100%;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "starrysea",
-  "version": "1.0.1",
+  "version": "1.0.5",
   "description": "新一代星之海官网",
   "scripts": {
     "test": "echo \"Welcome to Starrysea-NextGen Project!\" && exit 0",

server/app.js

@@ -27,7 +27,6 @@ app.use('/static',express.static(path.join(__dirname, 'public')));
 app.use(ddos.express);
 //Allow CROS
 app.all('*', function(req, res, next) {
-    console.log(req.get('host'));
     res.header("Access-Control-Allow-Origin", req.get('origin'));
     res.header("Access-Control-Allow-Credentials","true");
     res.header("Access-Control-Allow-Headers", "Content-Type");

server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "server",
-  "version": "1.0.2",
+  "version": "1.0.5",
   "scripts": {
     "start": "node ./bin/www",
     "dev": "nodemon ./bin/www"