Merge pull request #112 from isitvegan/simplify

Simplify to Only E Numbers
isitvegan · Mar 13, 2024 · fb6bc4d · fb6bc4d
2 parents b1e696d + f1f6e4e
commit fb6bc4d
Show file tree

Hide file tree

Showing 34 changed files with 5,244 additions and 3,576 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,50 @@
+name: CI
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./client
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.12' 
+      - name: Install Dependencies
+        run: npm ci
+      - name: Build
+        run: npm run build
+      - run: mkdir ../_site
+      - run: ./scripts/install.py --target ../_site
+      - name: Upload GitHub Pages Artifact
+        uses: actions/upload-pages-artifact@v1
+
+  deploy_pages:
+    name: Deploy to GitHub Pages
+    needs: build
+    if: github.ref_name == 'main'
+
+    permissions:
+      pages: write
+      id-token: write
+
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+
+    runs-on: ubuntu-latest
+    steps:
+    - name: Deploy to GitHub Pages
+      id: deployment
+      uses: actions/deploy-pages@v1
diff --git a/.mailmap b/.mailmap
@@ -0,0 +1,5 @@
+Jan Hohenheim <[email protected]> <[email protected]>
+Jan Hohenheim <[email protected]> <[email protected]>
+Tau <[email protected]> <[email protected]>
+Tau <[email protected]> <[email protected]>
+Tau <[email protected]> <[email protected]>
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
 name = "is-it-vegan"
 version = "0.1.0"
-authors = ["Jan Nils Ferner <[email protected]>"]
 edition = "2018"
 
 [dependencies]

diff --git a/client/.gitignore b/client/.gitignore
@@ -1,5 +1,3 @@
 /node_modules/
-yarn-debug.log*
-yarn-error.log*
 /.rpt2_cache/
 /build/
diff --git a/client/fonts/Inter-Bold.woff2 b/client/fonts/Inter-Bold.woff2
diff --git a/client/fonts/Inter-Regular.woff2 b/client/fonts/Inter-Regular.woff2
diff --git a/client/fonts/inter.css b/client/fonts/inter.css
@@ -0,0 +1,2 @@
+@font-face { font-family: "Inter"; font-style: normal; font-weight: 400; font-display: swap; src: url("Inter-Regular.woff2") format("woff2"); }
+@font-face { font-family: "Inter"; font-style: normal; font-weight: 700; font-display: swap; src: url("Inter-Bold.woff2") format("woff2"); }
diff --git a/client/index.html b/client/index.html
@@ -5,6 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>Is it Vegan?</title>
+    <link rel="stylesheet" href="/fonts/inter.css" />
     <link rel="stylesheet" href="/build/main.css" />
 </head>
 <body class="page-layout">

diff --git a/client/less/components/search-bar.less b/client/less/components/search-bar.less
@@ -16,14 +16,15 @@
         display: grid;
         align-items: center;
         grid-gap: 16px 32px;
-        grid-template-areas: 'title' 'input' 'scope-bar';
+        grid-template-areas: 'title' 'input';
         grid-template-columns: 100%;
         margin: auto;
         max-width: @content-max-width;
     }
 
     > .inner > .title {
         grid-area: title;
+        font-weight: bold;
     }
 
     > .inner > .text.-after {
@@ -34,10 +35,6 @@
         grid-area: input;
     }
 
-    > .inner > .search-scope-bar {
-        grid-area: scope-bar;
-    }
-
     > .inner > .input {
         background-color: var(--control-background-color);
         border-radius: var(--control-border-radius);

diff --git a/client/less/components/search-result-item.less b/client/less/components/search-result-item.less
@@ -37,6 +37,7 @@
 
     > .header > .title {
         font-size: 24px;
+        font-weight: bold;
         grid-area: title;
     }
 

diff --git a/client/less/components/search-scope-bar.less b/client/less/components/search-scope-bar.less
diff --git a/client/less/core/typography.less b/client/less/core/typography.less
@@ -1,13 +1,18 @@
 :root {
-    supported-color-schemes: light dark;
-    font-family: 'SF Hello', 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif;
+    color-scheme: light dark;
+    font-family: 'Inter', sans-serif;
+    // case = Case alternates
+    // cv02 = Open four
+    // cv03 = Open six
+    // cv04 = Open nine
+    // cv05 = Lower-case L with tail
+    // cv08 = Upper-case i with serif
+    // cv11 = Single-storey a
+    // dlig = Discretionary ligatures
+    // ss03 = Round quotes & comma
+    // zero = Slashed Zero
+    font-feature-settings: "case", "cv02", "cv03", "cv04", "cv05", "cv08", "cv11", "dlig", "ss03", "zero";
     font-size: 16px;
     background-color: var(--background-level-0-color);
     color: var(--text-color );
 }
-
-@supports (supported-color-schemes: light dark) {
-    :root {
-      background-color: initial;
-    }
-  }
diff --git a/client/less/main.less b/client/less/main.less
@@ -37,7 +37,6 @@
 @import './components/search-result-item.less';
 @import './components/search-results.less';
 @import './components/search-bar.less';
-@import './components/search-scope-bar.less';
 @import './components/search-result-item-status.less';
 @import './components/links-list.less';
 @import './components/page-layout.less';
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		@font-face { font-family: "Inter"; font-style: normal; font-weight: 400; font-display: swap; src: url("Inter-Regular.woff2") format("woff2"); }
		@font-face { font-family: "Inter"; font-style: normal; font-weight: 700; font-display: swap; src: url("Inter-Bold.woff2") format("woff2"); }