Merge pull request #5 from chriseugenerodriguez/ci-cd

Ci cd
chriseugenerodriguez · Jan 1, 2024 · 3e35b83 · 3e35b83
2 parents 52fc684 + d9374bf
commit 3e35b83
Show file tree

Hide file tree

Showing 957 changed files with 1,291 additions and 278 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,12 +1,29 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
 version: 2
 updates:
-  - package-ecosystem: "" # See documentation for possible values
-    directory: "/" # Location of package manifests
+  - package-ecosystem: "github-actions"
+    directory: "/" 
     schedule:
       interval: "weekly"
 
+name: Dependabot fetch metadata
+'on':
+  push:
+    branches:
+      - master
+
+permissions:
+  pull-requests: write
+  issues: write
+  repository-projects: write
+  checks: write
+  contents: read
+
+name: Dependabot fetch metadata
+on: pull_request
+
+permissions:
+  pull-requests: write
+  issues: write
+  repository-projects: write
+  checks: write
+  contents: read
diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml
@@ -6,6 +6,12 @@ name: Deploy to Firebase Hosting on merge
   push:
     branches:
       - master
+permissions:
+  pull-requests: write
+  issues: write
+  repository-projects: write
+  checks: write
+  contents: read
 jobs:
   build_and_deploy:
     runs-on: ubuntu-latest
@@ -18,3 +24,5 @@ jobs:
           firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_GRCERI_C3702 }}'
           channelId: live
           projectId: grceri-c3702
+        env:
+          FIREBASE_CLI_EXPERIMENTS: webframeworks
diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml
@@ -3,6 +3,12 @@
 
 name: Deploy to Firebase Hosting on PR
 'on': pull_request
+permissions:
+  pull-requests: write
+  issues: write
+  repository-projects: write
+  checks: write
+  contents: read
 jobs:
   build_and_preview:
     if: '${{ github.event.pull_request.head.repo.full_name == github.repository }}'
@@ -15,3 +21,5 @@ jobs:
           repoToken: '${{ secrets.GITHUB_TOKEN }}'
           firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_GRCERI_C3702 }}'
           projectId: grceri-c3702
+        env:
+          FIREBASE_CLI_EXPERIMENTS: webframeworks
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,45 @@
-*.psd
-designs/*
-scraper/*
-sql/*
-utils/*
-mobile/*
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+dist
+tmp
+/out-tsc
+
+# dependencies
+node_modules
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+*.firebase
+*firebase-debug.log
+*firebase-debug
+*./firebase-debug
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+yarn-error.log
+testem.log
+/typings
+
+# System Files
+.DS_Store
+Thumbs.db
+
+.angular
diff --git a/website/CHANGELOG.md → CHANGELOG.md b/website/CHANGELOG.md → CHANGELOG.md
diff --git a/website/CONTRIBUTING.md → CONTRIBUTING.md b/website/CONTRIBUTING.md → CONTRIBUTING.md
diff --git a/website/LICENSE → LICENSE b/website/LICENSE → LICENSE
diff --git a/website/README.md → README.md b/website/README.md → README.md
diff --git a/website/SECURITY.md → SECURITY.md b/website/SECURITY.md → SECURITY.md
diff --git a/website/angular.json → angular.json b/website/angular.json → angular.json
@@ -34,8 +34,12 @@
               "src/assets/css/main.scss"
             ],
             "scripts": [
+              "node_modules/chart.js/dist/chart.min.js",
+              "node_modules/prismic-dom/dist/prismic-dom.min.js",
               "src/assets/js/annyang.min.js",
-              "src/assets/js/hammer.min.js"
+              "src/assets/js/hammer.min.js",
+              "src/assets/js/quagga.min.js",
+              "src/assets/js/googlelogin.js"
             ]
           },
           "configurations": {
@@ -58,7 +62,16 @@
                 "src/robots.txt",
                 "src/ads.txt",
                 "src/sitemap.xml",
-                "src/manifest.json"
+                "src/manifest.json",
+                "src/assets"
+              ],
+              "scripts": [
+                "node_modules/chart.js/dist/chart.min.js",
+                "node_modules/prismic-dom/dist/prismic-dom.min.js",
+                "src/assets/js/annyang.min.js",
+                "src/assets/js/hammer.min.js",
+                "src/assets/js/quagga.min.js",
+                "src/assets/js/googlelogin.js"
               ],
               "ngswConfigPath": "ngsw-config.json"
             },
@@ -85,7 +98,16 @@
                 "src/robots.txt",
                 "src/ads.txt",
                 "src/sitemap.xml",
-                "src/manifest.json"
+                "src/manifest.json",
+                "src/assets"
+              ],
+              "scripts": [
+                "node_modules/chart.js/dist/chart.min.js",
+                "node_modules/prismic-dom/dist/prismic-dom.min.js",
+                "src/assets/js/annyang.min.js",
+                "src/assets/js/hammer.min.js",
+                "src/assets/js/quagga.min.js",
+                "src/assets/js/googlelogin.js"
               ],
               "ngswConfigPath": "ngsw-config.json"
             }
@@ -122,10 +144,11 @@
               "src/assets/css/main.scss"
             ],
             "scripts": [
-              "node_modules/chart.js/dist/Chart.min.js",
-              "node_modules/quagga/dist/quagga.min.js",
+              "node_modules/chart.js/dist/chart.min.js",
+              "node_modules/prismic-dom/dist/prismic-dom.min.js",
               "src/assets/js/annyang.min.js",
               "src/assets/js/hammer.min.js",
+              "src/assets/js/quagga.min.js",
               "src/assets/js/googlelogin.js"
             ]
           },

diff --git a/website/api/functions/lists.functions.ts → api/functions/lists.functions.ts b/website/api/functions/lists.functions.ts → api/functions/lists.functions.ts
diff --git a/website/api/functions/misc.functions.ts → api/functions/misc.functions.ts b/website/api/functions/misc.functions.ts → api/functions/misc.functions.ts
diff --git a/website/api/functions/products.functions.ts → api/functions/products.functions.ts b/website/api/functions/products.functions.ts → api/functions/products.functions.ts
diff --git a/website/api/functions/register.functions.ts → api/functions/register.functions.ts b/website/api/functions/register.functions.ts → api/functions/register.functions.ts
diff --git a/website/api/functions/search.functions.ts → api/functions/search.functions.ts b/website/api/functions/search.functions.ts → api/functions/search.functions.ts
diff --git a/...e/api/functions/transactions.functions.ts → api/functions/transactions.functions.ts b/...e/api/functions/transactions.functions.ts → api/functions/transactions.functions.ts
diff --git a/website/api/functions/users.functions.ts → api/functions/users.functions.ts b/website/api/functions/users.functions.ts → api/functions/users.functions.ts
diff --git a/website/api/misc/constants.ts → api/misc/constants.ts b/website/api/misc/constants.ts → api/misc/constants.ts
diff --git a/website/api/misc/error-handler.ts → api/misc/error-handler.ts b/website/api/misc/error-handler.ts → api/misc/error-handler.ts
diff --git a/website/api/routes.ts → api/routes.ts b/website/api/routes.ts → api/routes.ts
diff --git a/website/api/routes/lists.route.ts → api/routes/lists.route.ts b/website/api/routes/lists.route.ts → api/routes/lists.route.ts
diff --git a/website/api/routes/misc.route.ts → api/routes/misc.route.ts b/website/api/routes/misc.route.ts → api/routes/misc.route.ts
diff --git a/website/api/routes/product.route.ts → api/routes/product.route.ts b/website/api/routes/product.route.ts → api/routes/product.route.ts
diff --git a/website/api/routes/register.route.ts → api/routes/register.route.ts b/website/api/routes/register.route.ts → api/routes/register.route.ts
diff --git a/website/api/routes/search.route.ts → api/routes/search.route.ts b/website/api/routes/search.route.ts → api/routes/search.route.ts
diff --git a/website/api/routes/transaction.route.ts → api/routes/transaction.route.ts b/website/api/routes/transaction.route.ts → api/routes/transaction.route.ts
diff --git a/website/api/routes/user.route.ts → api/routes/user.route.ts b/website/api/routes/user.route.ts → api/routes/user.route.ts
diff --git a/website/config/browser.config.js → config/browser.config.js b/website/config/browser.config.js → config/browser.config.js
diff --git a/website/config/mobile.config.js → config/mobile.config.js b/website/config/mobile.config.js → config/mobile.config.js
diff --git a/firebase.json b/firebase.json
@@ -1,13 +1,23 @@
 {
   "hosting": {
-    "source": "website",
+    "public": "dist/browser",
     "ignore": [
       "firebase.json",
       "**/.*",
       "**/node_modules/**"
     ],
     "frameworksBackend": {
       "region": "us-central1"
-    }
+    },
+    "rewrites": [
+      {
+        "source": "/public/**",
+        "destination": "/public.html"
+      },
+      {
+        "source": "**",
+        "destination": "/index.html"
+      }
+    ]
   }
-}
+}
diff --git a/website/ngsw-config.json → ngsw-config.json b/website/ngsw-config.json → ngsw-config.json
diff --git a/website/npm → npm b/website/npm → npm
diff --git a/website/package-lock.json → package-lock.json b/website/package-lock.json → package-lock.json
diff --git a/website/package.json → package.json b/website/package.json → package.json
@@ -24,6 +24,7 @@
     "@nguniversal/builders": "^15.2.0",
     "@nguniversal/express-engine": "^15.2.0",
     "@ntegral/ngx-universal-window": "^1.0.2",
+    "@prismicio/client": "^5.0.0",
     "rxjs": "*7.6.0",
     "tslib": "^2.3.0",
     "zone.js": "~0.12.0"
@@ -52,7 +53,6 @@
     "fingerprintjs2": "^2.1.4",
     "font-awesome": "^4.7.0",
     "hammerjs": "^2.0.8",
-    "json-easy-filter": "^0.3.1",
     "jwt-decode": "^4.0.0",
     "md5-typescript": "^1.0.5",
     "ng-lazyload-image": "^9.1.3",

diff --git a/website/proxy.conf.json → proxy.conf.json b/website/proxy.conf.json → proxy.conf.json
diff --git a/website/sass-lint.yml → sass-lint.yml b/website/sass-lint.yml → sass-lint.yml
diff --git a/website/server.config.js → server.config.js b/website/server.config.js → server.config.js
diff --git a/website/server.ts → server.ts b/website/server.ts → server.ts
diff --git a/website/src/ads.txt → src/ads.txt b/website/src/ads.txt → src/ads.txt
diff --git a/website/src/app/app-routing.module.ts → src/app/app-routing.module.ts b/website/src/app/app-routing.module.ts → src/app/app-routing.module.ts
diff --git a/website/src/app/app.browser.module.ts → src/app/app.browser.module.ts b/website/src/app/app.browser.module.ts → src/app/app.browser.module.ts
@@ -78,3 +78,4 @@ import { ProductsService } from './core/services/product.service';
 })
 
 export class AppBrowserModule { }
+
diff --git a/website/src/app/app.component.html → src/app/app.component.html b/website/src/app/app.component.html → src/app/app.component.html
diff --git a/website/src/app/app.component.ts → src/app/app.component.ts b/website/src/app/app.component.ts → src/app/app.component.ts
diff --git a/website/src/app/app.server.module.ts → src/app/app.server.module.ts b/website/src/app/app.server.module.ts → src/app/app.server.module.ts
diff --git a/website/src/app/core/index.ts → src/app/core/index.ts b/website/src/app/core/index.ts → src/app/core/index.ts
diff --git a/...src/app/core/interfaces/blog.interface.ts → src/app/core/interfaces/blog.interface.ts b/...src/app/core/interfaces/blog.interface.ts → src/app/core/interfaces/blog.interface.ts
diff --git a/...app/core/interfaces/dropdown.interface.ts → ...app/core/interfaces/dropdown.interface.ts b/...app/core/interfaces/dropdown.interface.ts → ...app/core/interfaces/dropdown.interface.ts
diff --git a/...c/app/core/interfaces/filter.interface.ts → src/app/core/interfaces/filter.interface.ts b/...c/app/core/interfaces/filter.interface.ts → src/app/core/interfaces/filter.interface.ts
diff --git a/...src/app/core/interfaces/food.interface.ts → src/app/core/interfaces/food.interface.ts b/...src/app/core/interfaces/food.interface.ts → src/app/core/interfaces/food.interface.ts
diff --git a/...pp/core/interfaces/mailchimp.interface.ts → ...pp/core/interfaces/mailchimp.interface.ts b/...pp/core/interfaces/mailchimp.interface.ts → ...pp/core/interfaces/mailchimp.interface.ts
diff --git a/.../app/core/interfaces/product.interface.ts → src/app/core/interfaces/product.interface.ts b/.../app/core/interfaces/product.interface.ts → src/app/core/interfaces/product.interface.ts
diff --git a/...c/app/core/interfaces/social.interface.ts → src/app/core/interfaces/social.interface.ts b/...c/app/core/interfaces/social.interface.ts → src/app/core/interfaces/social.interface.ts
diff --git a/...src/app/core/interfaces/user.interface.ts → src/app/core/interfaces/user.interface.ts b/...src/app/core/interfaces/user.interface.ts → src/app/core/interfaces/user.interface.ts
diff --git a/...ules/breadcrumb/breadcrumb.component.html → ...ules/breadcrumb/breadcrumb.component.html b/...ules/breadcrumb/breadcrumb.component.html → ...ules/breadcrumb/breadcrumb.component.html
diff --git a/...odules/breadcrumb/breadcrumb.component.ts → ...odules/breadcrumb/breadcrumb.component.ts b/...odules/breadcrumb/breadcrumb.component.ts → ...odules/breadcrumb/breadcrumb.component.ts
@@ -2,7 +2,9 @@ import { ActivatedRoute, Router } from "@angular/router";
 import { Component, OnInit } from "@angular/core";
 import { HttpClient } from "@angular/common/http";
 
-let fi = require('json-easy-filter').JefNode;
+// let fi = require('json-easy-filter').JefNode;
+
+// declare var JefNode;
 
 @Component({
 	selector: 'breadcrumb',
@@ -71,11 +73,18 @@ export class BreadcrumbComponent implements OnInit {
 					let e;
 					let g;
 
-					const b = new fi(res).filter((node) => {
-						if (node.has('name') && this.formatted(node.value.name) === this.cat) {
-							return node.pathArray;
+					// const b = new JefNode(res).filter((node) => {
+					// 	if (node.has('name') && this.formatted(node.value.name) === this.cat) {
+					// 		return node.pathArray;
+					// 	}
+					// });
+
+					console.log("res", res);
+					const b = res.filter((v) => {
+						if (v.has('name') && this.formatted(v.value.name) === this.cat) {
+							return v.pathArray;
 						}
-					});
+					})
 
 					for (let i = 0; i < b.length; i++) {
 						c.push(b[i]);

diff --git a/...ore/modules/form/blog/form.component.html → ...ore/modules/form/blog/form.component.html b/...ore/modules/form/blog/form.component.html → ...ore/modules/form/blog/form.component.html
diff --git a/.../core/modules/form/blog/form.component.ts → .../core/modules/form/blog/form.component.ts b/.../core/modules/form/blog/form.component.ts → .../core/modules/form/blog/form.component.ts
diff --git a/...odules/form/solutions/form.component.html → ...odules/form/solutions/form.component.html b/...odules/form/solutions/form.component.html → ...odules/form/solutions/form.component.html
diff --git a/.../modules/form/solutions/form.component.ts → .../modules/form/solutions/form.component.ts b/.../modules/form/solutions/form.component.ts → .../modules/form/solutions/form.component.ts
diff --git a/...te/src/app/core/modules/modules.module.ts → src/app/core/modules/modules.module.ts b/...te/src/app/core/modules/modules.module.ts → src/app/core/modules/modules.module.ts
diff --git a/...p/core/modules/search/search.component.ts → ...p/core/modules/search/search.component.ts b/...p/core/modules/search/search.component.ts → ...p/core/modules/search/search.component.ts
diff --git a/...e/src/app/core/modules/search/search.html → src/app/core/modules/search/search.html b/...e/src/app/core/modules/search/search.html → src/app/core/modules/search/search.html
diff --git a/...p/core/modules/slider/slider.component.ts → ...p/core/modules/slider/slider.component.ts b/...p/core/modules/slider/slider.component.ts → ...p/core/modules/slider/slider.component.ts
diff --git a/...p/core/modules/slider/slider.directive.ts → ...p/core/modules/slider/slider.directive.ts b/...p/core/modules/slider/slider.directive.ts → ...p/core/modules/slider/slider.directive.ts
diff --git a/...e/src/app/core/modules/slider/slider.html → src/app/core/modules/slider/slider.html b/...e/src/app/core/modules/slider/slider.html → src/app/core/modules/slider/slider.html
diff --git a/website/src/app/core/services/api.service.ts → src/app/core/services/api.service.ts b/website/src/app/core/services/api.service.ts → src/app/core/services/api.service.ts
diff --git a/...c/app/core/services/auth-guard.service.ts → src/app/core/services/auth-guard.service.ts b/...c/app/core/services/auth-guard.service.ts → src/app/core/services/auth-guard.service.ts
diff --git a/...ite/src/app/core/services/auth.service.ts → src/app/core/services/auth.service.ts b/...ite/src/app/core/services/auth.service.ts → src/app/core/services/auth.service.ts
diff --git a/...ite/src/app/core/services/cart.service.ts → src/app/core/services/cart.service.ts b/...ite/src/app/core/services/cart.service.ts → src/app/core/services/cart.service.ts
diff --git a/website/src/app/core/services/cms.service.ts → src/app/core/services/cms.service.ts b/website/src/app/core/services/cms.service.ts → src/app/core/services/cms.service.ts
@@ -1,11 +1,15 @@
 import { Injectable } from "@angular/core";
 
 // CMS
-let Prismic = require('prismic-javascript');
+// let Prismic = require('prismic-javascript');
+// declare var Prismic;
 let api = 'https://grceri.cdn.prismic.io/api/v2';
+import * as prismic from "@prismicio/client";
+const Prismic = prismic.default;
 
 // HTML FORMATTER
-let PrismicDOM = require('prismic-dom');
+// let PrismicDOM = require('prismic-dom');
+declare var PrismicDOM;
 let Elements = PrismicDOM.RichText.Elements;
 
 

diff --git a/website/src/app/core/services/db.service.ts → src/app/core/services/db.service.ts b/website/src/app/core/services/db.service.ts → src/app/core/services/db.service.ts
diff --git a/...app/core/services/localstorage.service.ts → ...app/core/services/localstorage.service.ts b/...app/core/services/localstorage.service.ts → ...app/core/services/localstorage.service.ts
diff --git a/...rc/app/core/services/logged-in.service.ts → src/app/core/services/logged-in.service.ts b/...rc/app/core/services/logged-in.service.ts → src/app/core/services/logged-in.service.ts
Original file line number	Diff line number	Diff line change
Expand Up		@@ -78,3 +78,4 @@ import { ProductsService } from './core/services/product.service';
		})

		export class AppBrowserModule { }