Skip to content

Commit 33f55f8

Browse files
committed
fixing config in dev and prod
1 parent 3246b46 commit 33f55f8

File tree

7 files changed

+43
-15
lines changed

7 files changed

+43
-15
lines changed

.env.example

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
GITHUB_CLIENT_ID="xxx000x0x0x0x0x00xx0"
22
GITHUB_CLIENT_SECRET="00xx0xx00x0x0xxx00xx00000x000x00x0x00xxx"
33
SESSION_SECRET="x00x0x00x0x0x0x0000xx"
4-
HOST="https://127.0.0.1"
4+
5+
# test 127.0.0.1 deploy microwebstacks.github.io
6+
PROTOCOL="https"
7+
HOST="127.0.0.1"
58
PORT=3000
6-
USE_HTTPS=true
9+
710
CERT_FILE="cert/cert.pem"
811
KEY_FILE="cert/key.pem"
9-
BASE='astro-big-doc'
12+
OUT_DIR="./temp"
13+
14+
#optional
1015
SITE='http://microwebstacks.github.io'

config.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,19 @@ import * as dotenv from 'dotenv'
33

44
dotenv.config()
55

6+
let outdir = (process.env.OUT_DIR==null)?"./temp":process.env.OUT_DIR
7+
let protocol = process.env.PROTOCOL
8+
9+
if(import.meta.env.MODE == "development"){
10+
protocol = "http"
11+
}
12+
613
const config = {
714
site:process.env.SITE,
815
port:process.env.PORT,
16+
url:`${protocol}://${process.env.HOST}:${process.env.PORT}`,
917
rootdir: (process.env.ROOT_DIR==null)?process.cwd():process.env.ROOT_DIR,
10-
outdir: (process.env.OUT_DIR==null)?"./temp":process.env.OUT_DIR
18+
outdir: outdir
1119
}
1220

1321
export {

integrations/nav_menu/menu_utils.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ import {dirname,join} from 'node:path'
33
import {promises as fs} from 'fs';
44

55
async function save_json(root_path,data){
6-
await fs.writeFile(join(config.rootdir,root_path),JSON.stringify(data,undefined, 2))
6+
const filepath = join(config.rootdir,root_path)
7+
await fs.writeFile(filepath,JSON.stringify(data,undefined, 2))
8+
console.log(` saved json file ${filepath}`)
79
}
810

911
function trim_ext(filename){

server/auth/auth_router.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dotenv.config()
1010

1111
const GitHubStrategy = Strategy;
1212

13-
const callbackURL = process.env.HOST+":"+process.env.PORT+"/auth/github/callback"
13+
const callbackURL = process.env.PROTOCOL+"://"+process.env.HOST+":"+process.env.PORT+"/auth/github/callback"
1414
const strategyConfig = {
1515
clientID: process.env.GITHUB_CLIENT_ID,
1616
clientSecret: process.env.GITHUB_CLIENT_SECRET,

server/server.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,12 @@ app.use((req, res, next) => {
2323
})
2424

2525

26-
const use_https = ["true","1"].includes(process.env.USE_HTTPS.toLowerCase())
26+
console.log(`listening on ${process.env.PROTOCOL}://${process.env.HOST}:${process.env.PORT}`)
2727

28-
if(use_https){
28+
if(process.env.PROTOCOL == "https"){
2929
const key = readFileSync(join(__dirname, process.env.KEY_FILE),'utf8')
3030
const cert = readFileSync(join(__dirname, process.env.CERT_FILE),'utf8')
3131
const httpsServer = https.createServer({key,cert},app)
32-
console.log(`listening on ${process.env.HOST}:${process.env.PORT}`)
3332
httpsServer.listen(process.env.PORT);//443 for clear url
3433
}else{
3534
app.listen(process.env.PORT);

src/libs/utils.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@ function isNewer(filepath,targetfile){
1515

1616
function cache_file_url(source_file){
1717
const source_dir = dirname(source_file)
18-
const targetroot = join(config.rootdir,config.outdir,"raw")
18+
let outdir = config.outdir
19+
if(import.meta.env.MODE == "development"){
20+
outdir = "public"
21+
}
22+
const targetroot = join(config.rootdir,outdir,"raw")
1923
const source_file_base_name = basename(source_file)
2024
const file_rel_to_root = relative(config.rootdir,source_dir)
2125
const targetpath = resolve(targetroot,file_rel_to_root)
@@ -34,7 +38,11 @@ function relAssetToUrl(relativepath,refdir,baseUrl){
3438
if(existsSync(filepath)){
3539
//console.log(` * impo*rt.me*ta.ur*l = ${import.meta.url}`)
3640

37-
const targetroot = join(config.rootdir,config.outdir,"raw")
41+
let outdir = config.outdir
42+
if(import.meta.env.MODE == "development"){
43+
outdir = "public"
44+
}
45+
const targetroot = join(config.rootdir,outdir,"raw")
3846
const filerootrel = relative(config.rootdir,refdir)
3947
const targetpath = resolve(targetroot,filerootrel)
4048
const targetfile = join(targetpath,relativepath)

src/pages/about/index.astro

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
11
---
22
import Layout from "@/layout/Layout.astro";
3+
import { config } from "@/config";
34
const title = "About"
45
console.log("Hello About")
5-
66
---
77
<Layout title={title}>
88
<h1>About</h1>
99
<a>This is 'About' page</a>
1010
</Layout>
11-
11+
<div id="data-url" style="display: none;" data-url={config.url}></div>
1212

1313
<script>
14-
if(false){//test forward api
15-
const test_api = await fetch("https://127.0.0.1:3000/api/test")
14+
if(import.meta.env.MODE != "development"){
15+
console.log("production mode")
16+
const url = document.getElementById("data-url").getAttribute("data-url")
17+
console.log(url)
18+
const test_api = await fetch(`${url}/api/test`)
1619
const data = await test_api.json()
1720
console.log(data)
1821
}
22+
else{
23+
console.log("development mode")
24+
}
1925
</script>

0 commit comments

Comments
 (0)