Merge pull request #3 from HideyoshiNakazone/devel

Adds Cors to server.js
This commit is contained in:
2022-11-11 02:31:10 -03:00
committed by GitHub
5 changed files with 13 additions and 6 deletions

View File

@@ -18,6 +18,9 @@
"main": "src/main.ts", "main": "src/main.ts",
"polyfills": "src/polyfills.ts", "polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json", "tsConfig": "tsconfig.app.json",
"allowedCommonJsDependencies": [
"ts-interface-checker"
],
"assets": [ "assets": [
"src/assets", "src/assets",
"src/manifest.webmanifest", "src/manifest.webmanifest",

7
package-lock.json generated
View File

@@ -26,6 +26,7 @@
"@fortawesome/free-regular-svg-icons": "^6.1.1", "@fortawesome/free-regular-svg-icons": "^6.1.1",
"@fortawesome/free-solid-svg-icons": "^6.1.1", "@fortawesome/free-solid-svg-icons": "^6.1.1",
"bootstrap": "^4.6.1", "bootstrap": "^4.6.1",
"cors": "^2.8.5",
"express": "^4.18.1", "express": "^4.18.1",
"jquery": "^3.6.0", "jquery": "^3.6.0",
"normalize.css": "^8.0.1", "normalize.css": "^8.0.1",
@@ -5828,7 +5829,6 @@
"version": "2.8.5", "version": "2.8.5",
"resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
"integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
"dev": true,
"dependencies": { "dependencies": {
"object-assign": "^4", "object-assign": "^4",
"vary": "^1" "vary": "^1"
@@ -10584,7 +10584,6 @@
"version": "4.1.1", "version": "4.1.1",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
"integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
"dev": true,
"engines": { "engines": {
"node": ">=0.10.0" "node": ">=0.10.0"
} }
@@ -18611,7 +18610,6 @@
"version": "2.8.5", "version": "2.8.5",
"resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
"integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
"dev": true,
"requires": { "requires": {
"object-assign": "^4", "object-assign": "^4",
"vary": "^1" "vary": "^1"
@@ -22109,8 +22107,7 @@
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
"integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
"dev": true
}, },
"object-inspect": { "object-inspect": {
"version": "1.12.2", "version": "1.12.2",

View File

@@ -5,6 +5,11 @@
"start": "node ./server.js", "start": "node ./server.js",
"postinstall": "ng build --configuration=production" "postinstall": "ng build --configuration=production"
}, },
"proxy": {
"/callback": {
"target": "http://localhost:8070"
}
},
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "^14.0.3", "@angular/animations": "^14.0.3",
@@ -24,6 +29,7 @@
"@fortawesome/free-regular-svg-icons": "^6.1.1", "@fortawesome/free-regular-svg-icons": "^6.1.1",
"@fortawesome/free-solid-svg-icons": "^6.1.1", "@fortawesome/free-solid-svg-icons": "^6.1.1",
"bootstrap": "^4.6.1", "bootstrap": "^4.6.1",
"cors": "^2.8.5",
"express": "^4.18.1", "express": "^4.18.1",
"jquery": "^3.6.0", "jquery": "^3.6.0",
"normalize.css": "^8.0.1", "normalize.css": "^8.0.1",

View File

@@ -1,9 +1,11 @@
const express = require('express'); const express = require('express');
var cors = require('cors');
const path = require('path'); const path = require('path');
const PKG_NAME = "frontend-hideyoshi.com"; const PKG_NAME = "frontend-hideyoshi.com";
const app = express(); const app = express();
app.use(cors());
app.use(express.static(`${__dirname}/dist/${PKG_NAME}`)); app.use(express.static(`${__dirname}/dist/${PKG_NAME}`));

View File

@@ -49,7 +49,6 @@
background-color: #ffffff; background-color: #ffffff;
} }
.separator-line { .separator-line {
justify-content: center; justify-content: center;
align-content: center; align-content: center;