Merge pull request #81 from SwiftGGTeam/upstream-sync

New look from official

Author: chenranj

.gitignore

@@ -22,3 +22,6 @@ xcuserdata
 
 # VS Code files
 .vscode
+
+# Npm modules
+node_modules

.prettierignore

@@ -0,0 +1 @@
+assets/javascripts/new-javascripts/vendor/

.prettierrc

@@ -1,14 +1,7 @@
 {
-  "overrides": [
-    {
-      "files": [
-        "**/*.css",
-        "**/*.scss"
-      ],
-      "options": {
-        "tabWidth": 2,
-        "useTabs": false
-      }
-    }
-  ]
+  "tabWidth": 2,
+  "useTabs": false,
+  "singleQuote": true,
+  "semi": false,
+  "endOfLine": "lf"
 }

404.md

@@ -1,8 +1,12 @@
 ---
-layout: page-wide
-title: "Not Found"
+layout: new-layouts/base
+title: 页面未找到
 permalink: /404.html
 ---
 
-The page you’re looking for can’t be found.
-
+<section id="exception">
+    <div class="content">
+        <h1>页面未找到</h1>
+        <p>抱歉，您访问的页面不存在。</p>
+    </div>
+</section>

500.md

@@ -1,7 +1,10 @@
 ---
-layout: page-wide
-title: "Internal Server Error"
+layout: new-layouts/base
+title: 服务器内部错误
 permalink: /500.html
 ---
 
-The server encountered an error and was unable to complete your request.
+<section class="section">
+    <h1>服务器内部错误</h1>
+    服务器遇到错误，无法完成您的请求。
+</section>

Gemfile.lock

@@ -12,17 +12,9 @@ GEM
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    ffi (1.17.0)
     ffi (1.17.0-arm64-darwin)
-    ffi (1.17.0-x86_64-darwin)
     forwardable-extended (2.6.0)
-    google-protobuf (4.29.2)
-      bigdecimal
-      rake (>= 13)
-    google-protobuf (4.29.2-arm64-darwin)
-      bigdecimal
-      rake (>= 13)
-    google-protobuf (4.29.2-x86_64-darwin)
+    google-protobuf (4.28.3-arm64-darwin)
       bigdecimal
       rake (>= 13)
     http_parser.rb (0.8.0)
@@ -69,34 +61,15 @@ GEM
     rexml (3.4.0)
     rouge (4.5.1)
     safe_yaml (1.0.5)
-    sass-embedded (1.83.0)
-      google-protobuf (~> 4.28)
-      rake (>= 13)
-    sass-embedded (1.83.0-aarch64-mingw-ucrt)
-      google-protobuf (~> 4.28)
-    sass-embedded (1.83.0-arm64-darwin)
-      google-protobuf (~> 4.28)
-    sass-embedded (1.83.0-x86-cygwin)
-      google-protobuf (~> 4.28)
-    sass-embedded (1.83.0-x86-mingw-ucrt)
-      google-protobuf (~> 4.28)
-    sass-embedded (1.83.0-x86_64-cygwin)
-      google-protobuf (~> 4.28)
-    sass-embedded (1.83.0-x86_64-darwin)
+    sass-embedded (1.81.0-arm64-darwin)
       google-protobuf (~> 4.28)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     unicode-display_width (2.6.0)
     webrick (1.9.1)
 
 PLATFORMS
-  aarch64-mingw-ucrt
   arm64-darwin
-  ruby
-  x86-cygwin
-  x86-mingw-ucrt
-  x86_64-cygwin
-  x86_64-darwin
 
 DEPENDENCIES
   base64
@@ -107,4 +80,4 @@ DEPENDENCIES
   webrick (~> 1.7)
 
 BUNDLED WITH
-   2.5.23
+   2.5.23

README.md

@@ -34,8 +34,20 @@ Swift.org 使用 [Jekyll](https://jekyllrb.com)，这是一个用 Ruby 编写的
 git clone https://github.com/swiftlang/swift-org-website.git
 cd swift-org-website
 bundle install
-LC_ALL=en_us.UTF-8 bundle exec jekyll serve
+LC_ALL=en_us.UTF-8 bundle exec jekyll serve --config _config.yml,_config_dev.yml
 open "http://localhost:4000"
+
+If you’d like to contribute to this project, please run Prettier before submitting your pull request to ensure consistent code style across the project.
+
+Requirements
+- [Node v18.17.1 or higher](https://nodejs.org)
+
+```shell
+npm install
+```
+
+```shell
+npm run prettify
 ```
 
 ### 在 Docker 中运行

_config.yml

@@ -2,7 +2,7 @@ url: https://swift.swiftgg.team
 title: SwiftGG
 description: "Swift 是一种通用编程语言，它采用现代方法处理安全性、性能和软件设计模式。"
 timezone: America/Lower_Princes
-exclude: ["README.md", "config.ru", "Gemfile", "Gemfile.lock", "Procfile", "vendor"]
+exclude: ["README.md", "config.ru", "Gemfile", "Gemfile.lock", "Procfile", "vendor", "get-started/storybook"]
 safe: false
 future: true
 
@@ -29,3 +29,4 @@ whitelist:
 
 include:
  - .well-known
+ - assets/fonts

_config_dev.yml

@@ -0,0 +1 @@
+exclude: []

_data/authors.yml

@@ -103,7 +103,7 @@ shahmishal:
    email: [email protected]
    github: shahmishal
    gravatar: 231cec2cc45a272aa5b341b413fdc2ed
-   about: "Mishal Shah is an engineer on the Swift Infrastructure team at Apple."
+   about: "Mishal Shah is part of the Swift Core Team, the Swift Ecosystem steering group, and the Swift Website workgroup, among other roles. He oversees a team focused on compiler developer experience tooling at Apple."
 
 mikeash:
    name: Mike Ash
@@ -505,3 +505,27 @@ chris-mcgee:
   name: Chris McGee
   github: cmcgee1024
   about: "Chris McGee is on the team at Apple working on Swift Package Manager, and Swiftly."
+
+parispittman:
+   name: Paris Pittman
+   github: parispittman
+
+rmondello:
+  name: Ricky Mondello
+  github: rmondello
+  about: "Ricky Mondello is a member of the engineering team at Apple working on the Passwords app, passkeys, and other authentication technologies."
+
+indravardhan:
+  name: Indravardhan Singh Shaktawat
+  github: indravardhan
+  about: "Indravardhan Singh Shaktawat is a member of the engineering team at Apple working on Password Monitoring and other Security Services."
+
+spencervd6:
+  name: Spencer Van Dyke
+  github: spencervd6
+  about: "Spencer Van Dyke is a member of the engineering team at Apple working on Password Monitoring and other Security Services."
+
+umeshbatra13:
+  name: Umesh Batra
+  github: umeshbatra13
+  about: "Umesh Batra is a member of the engineering team at Apple working on Password Monitoring and other Security Services."